(4) Rename files to snake_case: update BUILD.gn, include paths, header guards, and DEPS entries
Mechanically generated by running this command:
tools_webrtc/do-renames.sh update all-renames.txt && git cl format
Then manually updating:
tools_webrtc/sanitizers/tsan_suppressions_webrtc.cc
Bug: webrtc:10159
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Change-Id: I54824cd91dada8fc3ee3d098f971bc319d477833
Reviewed-on: https://webrtc-review.googlesource.com/c/115653
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#26226}diff --git a/sdk/android/BUILD.gn b/sdk/android/BUILD.gn
index 03d3d0e..ed0bdc4 100644
--- a/sdk/android/BUILD.gn
+++ b/sdk/android/BUILD.gn
@@ -127,7 +127,7 @@
rtc_static_library("libjingle_peerconnection_metrics_default_jni") {
visibility = [ "*" ]
sources = [
- "src/jni/androidmetrics.cc",
+ "src/jni/android_metrics.cc",
]
deps = [
":base_jni",
@@ -535,11 +535,11 @@
rtc_source_set("base_jni") {
visibility = [ "*" ]
sources = [
- "src/jni/androidhistogram.cc",
- "src/jni/androidnetworkmonitor.cc",
- "src/jni/androidnetworkmonitor.h",
+ "src/jni/android_histogram.cc",
+ "src/jni/android_network_monitor.cc",
+ "src/jni/android_network_monitor.h",
"src/jni/class_loader.h",
- "src/jni/classreferenceholder.h",
+ "src/jni/class_reference_holder.h",
"src/jni/jni_common.cc",
"src/jni/jni_helpers.cc",
"src/jni/jni_helpers.h",
@@ -581,8 +581,8 @@
rtc_static_library("builtin_audio_codecs_jni") {
sources = [
- "src/jni/builtinaudiodecoderfactoryfactory.cc",
- "src/jni/builtinaudioencoderfactoryfactory.cc",
+ "src/jni/builtin_audio_decoder_factory_factory.cc",
+ "src/jni/builtin_audio_encoder_factory_factory.cc",
]
deps = [
@@ -600,9 +600,9 @@
visibility = [ "*" ]
allow_poison = [ "software_video_codecs" ]
sources = [
- "src/jni/androidmediacodeccommon.h",
- "src/jni/androidmediadecoder.cc",
- "src/jni/androidmediaencoder.cc",
+ "src/jni/android_media_codec_common.h",
+ "src/jni/android_media_decoder.cc",
+ "src/jni/android_media_encoder.cc",
]
deps = [
":base_jni",
@@ -630,38 +630,38 @@
rtc_static_library("video_jni") {
sources = [
- "src/jni/androidvideotracksource.cc",
- "src/jni/androidvideotracksource.h",
- "src/jni/encodedimage.cc",
- "src/jni/encodedimage.h",
- "src/jni/h264utils.cc",
- "src/jni/javai420buffer.cc",
+ "src/jni/android_video_track_source.cc",
+ "src/jni/android_video_track_source.h",
+ "src/jni/encoded_image.cc",
+ "src/jni/encoded_image.h",
+ "src/jni/h264_utils.cc",
+ "src/jni/java_i420_buffer.cc",
"src/jni/jni_generator_helper.h",
- "src/jni/nativecapturerobserver.cc",
- "src/jni/nativecapturerobserver.h",
- "src/jni/nv12buffer.cc",
- "src/jni/nv21buffer.cc",
+ "src/jni/native_capturer_observer.cc",
+ "src/jni/native_capturer_observer.h",
+ "src/jni/nv12_buffer.cc",
+ "src/jni/nv21_buffer.cc",
"src/jni/pc/video.cc",
- "src/jni/timestampaligner.cc",
- "src/jni/videocodecinfo.cc",
- "src/jni/videocodecinfo.h",
- "src/jni/videocodecstatus.cc",
- "src/jni/videocodecstatus.h",
- "src/jni/videodecoderfactorywrapper.cc",
- "src/jni/videodecoderfactorywrapper.h",
- "src/jni/videodecoderfallback.cc",
- "src/jni/videodecoderwrapper.cc",
- "src/jni/videodecoderwrapper.h",
- "src/jni/videoencoderfactorywrapper.cc",
- "src/jni/videoencoderfactorywrapper.h",
- "src/jni/videoencoderfallback.cc",
- "src/jni/videoencoderwrapper.cc",
- "src/jni/videoencoderwrapper.h",
- "src/jni/videosink.cc",
- "src/jni/videosink.h",
- "src/jni/videosource.cc",
- "src/jni/videotrack.cc",
- "src/jni/yuvhelper.cc",
+ "src/jni/timestamp_aligner.cc",
+ "src/jni/video_codec_info.cc",
+ "src/jni/video_codec_info.h",
+ "src/jni/video_codec_status.cc",
+ "src/jni/video_codec_status.h",
+ "src/jni/video_decoder_factory_wrapper.cc",
+ "src/jni/video_decoder_factory_wrapper.h",
+ "src/jni/video_decoder_fallback.cc",
+ "src/jni/video_decoder_wrapper.cc",
+ "src/jni/video_decoder_wrapper.h",
+ "src/jni/video_encoder_factory_wrapper.cc",
+ "src/jni/video_encoder_factory_wrapper.h",
+ "src/jni/video_encoder_fallback.cc",
+ "src/jni/video_encoder_wrapper.cc",
+ "src/jni/video_encoder_wrapper.h",
+ "src/jni/video_sink.cc",
+ "src/jni/video_sink.h",
+ "src/jni/video_source.cc",
+ "src/jni/video_track.cc",
+ "src/jni/yuv_helper.cc",
]
deps = [
@@ -694,52 +694,52 @@
visibility = [ "*" ]
sources = [
- "src/jni/androidnetworkmonitor_jni.h",
- "src/jni/pc/androidnetworkmonitor.h",
- "src/jni/pc/audiotrack.cc",
- "src/jni/pc/callsessionfilerotatinglogsink.cc",
- "src/jni/pc/cryptooptions.cc",
- "src/jni/pc/cryptooptions.h",
- "src/jni/pc/datachannel.cc",
- "src/jni/pc/datachannel.h",
- "src/jni/pc/dtmfsender.cc",
- "src/jni/pc/icecandidate.cc",
- "src/jni/pc/icecandidate.h",
- "src/jni/pc/mediaconstraints.cc",
- "src/jni/pc/mediaconstraints.h",
- "src/jni/pc/mediasource.cc",
- "src/jni/pc/mediastream.cc",
- "src/jni/pc/mediastream.h",
- "src/jni/pc/mediastreamtrack.cc",
- "src/jni/pc/mediastreamtrack.h",
- "src/jni/pc/ownedfactoryandthreads.cc",
- "src/jni/pc/ownedfactoryandthreads.h",
- "src/jni/pc/peerconnection.cc",
- "src/jni/pc/peerconnection.h",
- "src/jni/pc/peerconnectionfactory.cc",
- "src/jni/pc/peerconnectionfactory.h",
- "src/jni/pc/rtccertificate.cc",
- "src/jni/pc/rtccertificate.h",
- "src/jni/pc/rtcstatscollectorcallbackwrapper.cc",
- "src/jni/pc/rtcstatscollectorcallbackwrapper.h",
- "src/jni/pc/rtpparameters.cc",
- "src/jni/pc/rtpparameters.h",
- "src/jni/pc/rtpreceiver.cc",
- "src/jni/pc/rtpreceiver.h",
- "src/jni/pc/rtpsender.cc",
- "src/jni/pc/rtpsender.h",
- "src/jni/pc/rtptransceiver.cc",
- "src/jni/pc/rtptransceiver.h",
- "src/jni/pc/sdpobserver.cc",
- "src/jni/pc/sdpobserver.h",
- "src/jni/pc/sessiondescription.cc",
- "src/jni/pc/sessiondescription.h",
- "src/jni/pc/sslcertificateverifierwrapper.cc",
- "src/jni/pc/sslcertificateverifierwrapper.h",
- "src/jni/pc/statsobserver.cc",
- "src/jni/pc/statsobserver.h",
- "src/jni/pc/turncustomizer.cc",
- "src/jni/pc/turncustomizer.h",
+ "src/jni/android_network_monitor_jni.h",
+ "src/jni/pc/android_network_monitor.h",
+ "src/jni/pc/audio_track.cc",
+ "src/jni/pc/call_session_file_rotating_log_sink.cc",
+ "src/jni/pc/crypto_options.cc",
+ "src/jni/pc/crypto_options.h",
+ "src/jni/pc/data_channel.cc",
+ "src/jni/pc/data_channel.h",
+ "src/jni/pc/dtmf_sender.cc",
+ "src/jni/pc/ice_candidate.cc",
+ "src/jni/pc/ice_candidate.h",
+ "src/jni/pc/media_constraints.cc",
+ "src/jni/pc/media_constraints.h",
+ "src/jni/pc/media_source.cc",
+ "src/jni/pc/media_stream.cc",
+ "src/jni/pc/media_stream.h",
+ "src/jni/pc/media_stream_track.cc",
+ "src/jni/pc/media_stream_track.h",
+ "src/jni/pc/owned_factory_and_threads.cc",
+ "src/jni/pc/owned_factory_and_threads.h",
+ "src/jni/pc/peer_connection.cc",
+ "src/jni/pc/peer_connection.h",
+ "src/jni/pc/peer_connection_factory.cc",
+ "src/jni/pc/peer_connection_factory.h",
+ "src/jni/pc/rtc_certificate.cc",
+ "src/jni/pc/rtc_certificate.h",
+ "src/jni/pc/rtc_stats_collector_callback_wrapper.cc",
+ "src/jni/pc/rtc_stats_collector_callback_wrapper.h",
+ "src/jni/pc/rtp_parameters.cc",
+ "src/jni/pc/rtp_parameters.h",
+ "src/jni/pc/rtp_receiver.cc",
+ "src/jni/pc/rtp_receiver.h",
+ "src/jni/pc/rtp_sender.cc",
+ "src/jni/pc/rtp_sender.h",
+ "src/jni/pc/rtp_transceiver.cc",
+ "src/jni/pc/rtp_transceiver.h",
+ "src/jni/pc/sdp_observer.cc",
+ "src/jni/pc/sdp_observer.h",
+ "src/jni/pc/session_description.cc",
+ "src/jni/pc/session_description.h",
+ "src/jni/pc/ssl_certificate_verifier_wrapper.cc",
+ "src/jni/pc/ssl_certificate_verifier_wrapper.h",
+ "src/jni/pc/stats_observer.cc",
+ "src/jni/pc/stats_observer.h",
+ "src/jni/pc/turn_customizer.cc",
+ "src/jni/pc/turn_customizer.h",
]
deps = [
@@ -795,7 +795,7 @@
visibility = [ "*" ]
allow_poison = [ "software_video_codecs" ]
sources = [
- "src/jni/vp8codec.cc",
+ "src/jni/vp8_codec.cc",
]
deps = [
":base_jni",
@@ -809,7 +809,7 @@
visibility = [ "*" ]
allow_poison = [ "software_video_codecs" ]
sources = [
- "src/jni/vp9codec.cc",
+ "src/jni/vp9_codec.cc",
]
deps = [
":base_jni",
@@ -867,8 +867,8 @@
sources = [
"native_api/base/init.cc",
"native_api/base/init.h",
- "native_api/base/networkmonitor.cc",
- "native_api/base/networkmonitor.h",
+ "native_api/base/network_monitor.cc",
+ "native_api/base/network_monitor.h",
]
deps = [
@@ -931,8 +931,8 @@
rtc_static_library("native_api_peerconnection") {
visibility = [ "*" ]
sources = [
- "native_api/peerconnection/peerconnectionfactory.cc",
- "native_api/peerconnection/peerconnectionfactory.h",
+ "native_api/peerconnection/peer_connection_factory.cc",
+ "native_api/peerconnection/peer_connection_factory.h",
]
deps = [
":base_jni",
@@ -949,8 +949,8 @@
visibility = [ "*" ]
allow_poison = [ "audio_codecs" ] # TODO(bugs.webrtc.org/8396): Remove.
sources = [
- "native_api/video/videosource.cc",
- "native_api/video/videosource.h",
+ "native_api/video/video_source.cc",
+ "native_api/video/video_source.h",
"native_api/video/wrapper.cc",
"native_api/video/wrapper.h",
]
@@ -1045,8 +1045,8 @@
rtc_static_library("videoframe_jni") {
sources = [
- "src/jni/videoframe.cc",
- "src/jni/videoframe.h",
+ "src/jni/video_frame.cc",
+ "src/jni/video_frame.h",
"src/jni/wrapped_native_i420_buffer.cc",
"src/jni/wrapped_native_i420_buffer.h",
]
@@ -1066,8 +1066,8 @@
rtc_static_library("logging_jni") {
visibility = [ "*" ]
sources = [
- "src/jni/logging/logsink.cc",
- "src/jni/logging/logsink.h",
+ "src/jni/logging/log_sink.cc",
+ "src/jni/logging/log_sink.h",
]
deps = [
@@ -1471,9 +1471,9 @@
"native_unittests/audio_device/audio_device_unittest.cc",
"native_unittests/codecs/wrapper_unittest.cc",
"native_unittests/java_types_unittest.cc",
- "native_unittests/peerconnection/peerconnectionfactory_unittest.cc",
+ "native_unittests/peerconnection/peer_connection_factory_unittest.cc",
"native_unittests/test_jni_onload.cc",
- "native_unittests/video/videosource_unittest.cc",
+ "native_unittests/video/video_source_unittest.cc",
]
data = [
diff --git a/sdk/android/native_api/audio_device_module/audio_device_android.cc b/sdk/android/native_api/audio_device_module/audio_device_android.cc
index 89ffeb6..fb7ce91 100644
--- a/sdk/android/native_api/audio_device_module/audio_device_android.cc
+++ b/sdk/android/native_api/audio_device_module/audio_device_android.cc
@@ -15,8 +15,8 @@
#include "absl/memory/memory.h"
#include "rtc_base/logging.h"
-#include "rtc_base/refcount.h"
-#include "rtc_base/refcountedobject.h"
+#include "rtc_base/ref_count.h"
+#include "rtc_base/ref_counted_object.h"
#if defined(AUDIO_DEVICE_INCLUDE_ANDROID_AAUDIO)
#include "sdk/android/src/jni/audio_device/aaudio_player.h"
diff --git a/sdk/android/native_api/base/network_monitor.cc b/sdk/android/native_api/base/network_monitor.cc
index 5d33ab7..822fab9 100644
--- a/sdk/android/native_api/base/network_monitor.cc
+++ b/sdk/android/native_api/base/network_monitor.cc
@@ -8,12 +8,12 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "sdk/android/native_api/base/networkmonitor.h"
+#include "sdk/android/native_api/base/network_monitor.h"
#include <memory>
#include "absl/memory/memory.h"
-#include "sdk/android/src/jni/androidnetworkmonitor.h"
+#include "sdk/android/src/jni/android_network_monitor.h"
namespace webrtc {
diff --git a/sdk/android/native_api/base/network_monitor.h b/sdk/android/native_api/base/network_monitor.h
index 537a247..135ebb1 100644
--- a/sdk/android/native_api/base/network_monitor.h
+++ b/sdk/android/native_api/base/network_monitor.h
@@ -8,14 +8,14 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef SDK_ANDROID_NATIVE_API_BASE_NETWORKMONITOR_H_
-#define SDK_ANDROID_NATIVE_API_BASE_NETWORKMONITOR_H_
+#ifndef SDK_ANDROID_NATIVE_API_BASE_NETWORK_MONITOR_H_
+#define SDK_ANDROID_NATIVE_API_BASE_NETWORK_MONITOR_H_
#include <jni.h>
#include <memory>
-#include "rtc_base/networkmonitor.h"
+#include "rtc_base/network_monitor.h"
namespace webrtc {
@@ -33,4 +33,4 @@
} // namespace webrtc
-#endif // SDK_ANDROID_NATIVE_API_BASE_NETWORKMONITOR_H_
+#endif // SDK_ANDROID_NATIVE_API_BASE_NETWORK_MONITOR_H_
diff --git a/sdk/android/native_api/codecs/wrapper.cc b/sdk/android/native_api/codecs/wrapper.cc
index 3c5fb3d..6b78e7e 100644
--- a/sdk/android/native_api/codecs/wrapper.cc
+++ b/sdk/android/native_api/codecs/wrapper.cc
@@ -12,9 +12,9 @@
#include "absl/memory/memory.h"
#include "sdk/android/native_api/jni/scoped_java_ref.h"
-#include "sdk/android/src/jni/videocodecinfo.h"
-#include "sdk/android/src/jni/videodecoderfactorywrapper.h"
-#include "sdk/android/src/jni/videoencoderfactorywrapper.h"
+#include "sdk/android/src/jni/video_codec_info.h"
+#include "sdk/android/src/jni/video_decoder_factory_wrapper.h"
+#include "sdk/android/src/jni/video_encoder_factory_wrapper.h"
namespace webrtc {
diff --git a/sdk/android/native_api/jni/scoped_java_ref.h b/sdk/android/native_api/jni/scoped_java_ref.h
index b26ef2c..e37a992 100644
--- a/sdk/android/native_api/jni/scoped_java_ref.h
+++ b/sdk/android/native_api/jni/scoped_java_ref.h
@@ -17,7 +17,7 @@
#include <jni.h>
#include <utility>
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
#include "sdk/android/native_api/jni/jvm.h"
namespace webrtc {
diff --git a/sdk/android/native_api/peerconnection/peer_connection_factory.cc b/sdk/android/native_api/peerconnection/peer_connection_factory.cc
index 892905b..e683975 100644
--- a/sdk/android/native_api/peerconnection/peer_connection_factory.cc
+++ b/sdk/android/native_api/peerconnection/peer_connection_factory.cc
@@ -7,14 +7,14 @@
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "sdk/android/native_api/peerconnection/peerconnectionfactory.h"
+#include "sdk/android/native_api/peerconnection/peer_connection_factory.h"
#include <jni.h>
#include <memory>
#include <utility>
-#include "sdk/android/src/jni/pc/peerconnectionfactory.h"
+#include "sdk/android/src/jni/pc/peer_connection_factory.h"
namespace webrtc {
diff --git a/sdk/android/native_api/peerconnection/peer_connection_factory.h b/sdk/android/native_api/peerconnection/peer_connection_factory.h
index 652be7a..889d609 100644
--- a/sdk/android/native_api/peerconnection/peer_connection_factory.h
+++ b/sdk/android/native_api/peerconnection/peer_connection_factory.h
@@ -8,14 +8,14 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef SDK_ANDROID_NATIVE_API_PEERCONNECTION_PEERCONNECTIONFACTORY_H_
-#define SDK_ANDROID_NATIVE_API_PEERCONNECTION_PEERCONNECTIONFACTORY_H_
+#ifndef SDK_ANDROID_NATIVE_API_PEERCONNECTION_PEER_CONNECTION_FACTORY_H_
+#define SDK_ANDROID_NATIVE_API_PEERCONNECTION_PEER_CONNECTION_FACTORY_H_
#include <jni.h>
#include <memory>
-#include "api/peerconnectioninterface.h"
+#include "api/peer_connection_interface.h"
#include "rtc_base/thread.h"
namespace webrtc {
@@ -31,4 +31,4 @@
} // namespace webrtc
-#endif // SDK_ANDROID_NATIVE_API_PEERCONNECTION_PEERCONNECTIONFACTORY_H_
+#endif // SDK_ANDROID_NATIVE_API_PEERCONNECTION_PEER_CONNECTION_FACTORY_H_
diff --git a/sdk/android/native_api/video/video_source.cc b/sdk/android/native_api/video/video_source.cc
index aae1de7..a813f40 100644
--- a/sdk/android/native_api/video/video_source.cc
+++ b/sdk/android/native_api/video/video_source.cc
@@ -8,10 +8,10 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "sdk/android/native_api/video/videosource.h"
+#include "sdk/android/native_api/video/video_source.h"
-#include "sdk/android/src/jni/androidvideotracksource.h"
-#include "sdk/android/src/jni/nativecapturerobserver.h"
+#include "sdk/android/src/jni/android_video_track_source.h"
+#include "sdk/android/src/jni/native_capturer_observer.h"
namespace webrtc {
diff --git a/sdk/android/native_api/video/video_source.h b/sdk/android/native_api/video/video_source.h
index 75ebdbc..d46f3e8 100644
--- a/sdk/android/native_api/video/video_source.h
+++ b/sdk/android/native_api/video/video_source.h
@@ -8,12 +8,12 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef SDK_ANDROID_NATIVE_API_VIDEO_VIDEOSOURCE_H_
-#define SDK_ANDROID_NATIVE_API_VIDEO_VIDEOSOURCE_H_
+#ifndef SDK_ANDROID_NATIVE_API_VIDEO_VIDEO_SOURCE_H_
+#define SDK_ANDROID_NATIVE_API_VIDEO_VIDEO_SOURCE_H_
#include <jni.h>
-#include "api/mediastreaminterface.h"
+#include "api/media_stream_interface.h"
#include "rtc_base/thread.h"
#include "sdk/android/native_api/jni/scoped_java_ref.h"
@@ -38,4 +38,4 @@
} // namespace webrtc
-#endif // SDK_ANDROID_NATIVE_API_VIDEO_VIDEOSOURCE_H_
+#endif // SDK_ANDROID_NATIVE_API_VIDEO_VIDEO_SOURCE_H_
diff --git a/sdk/android/native_api/video/wrapper.cc b/sdk/android/native_api/video/wrapper.cc
index fe2d45a..7b87ad6 100644
--- a/sdk/android/native_api/video/wrapper.cc
+++ b/sdk/android/native_api/video/wrapper.cc
@@ -12,8 +12,8 @@
#include "absl/memory/memory.h"
#include "sdk/android/native_api/jni/scoped_java_ref.h"
-#include "sdk/android/src/jni/videoframe.h"
-#include "sdk/android/src/jni/videosink.h"
+#include "sdk/android/src/jni/video_frame.h"
+#include "sdk/android/src/jni/video_sink.h"
namespace webrtc {
diff --git a/sdk/android/native_api/video/wrapper.h b/sdk/android/native_api/video/wrapper.h
index fc670ea..e32cf34 100644
--- a/sdk/android/native_api/video/wrapper.h
+++ b/sdk/android/native_api/video/wrapper.h
@@ -14,7 +14,7 @@
#include <jni.h>
#include <memory>
-#include "api/mediastreaminterface.h"
+#include "api/media_stream_interface.h"
#include "api/video/video_frame.h"
#include "sdk/android/native_api/jni/scoped_java_ref.h"
diff --git a/sdk/android/native_unittests/audio_device/audio_device_unittest.cc b/sdk/android/native_unittests/audio_device/audio_device_unittest.cc
index 8774119..6f52880 100644
--- a/sdk/android/native_unittests/audio_device/audio_device_unittest.cc
+++ b/sdk/android/native_unittests/audio_device/audio_device_unittest.cc
@@ -14,11 +14,11 @@
#include "modules/audio_device/include/audio_device.h"
#include "modules/audio_device/include/mock_audio_transport.h"
#include "rtc_base/arraysize.h"
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/critical_section.h"
#include "rtc_base/event.h"
#include "rtc_base/format_macros.h"
#include "rtc_base/scoped_ref_ptr.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
#include "sdk/android/generated_native_unittests_jni/jni/ApplicationContextProvider_jni.h"
#include "sdk/android/generated_native_unittests_jni/jni/BuildInfo_jni.h"
#include "sdk/android/native_api/audio_device_module/audio_device_android.h"
@@ -28,7 +28,7 @@
#include "sdk/android/src/jni/jni_helpers.h"
#include "test/gmock.h"
#include "test/gtest.h"
-#include "test/testsupport/fileutils.h"
+#include "test/testsupport/file_utils.h"
using std::cout;
using std::endl;
diff --git a/sdk/android/native_unittests/codecs/DEPS b/sdk/android/native_unittests/codecs/DEPS
index 5c7289d..fb2c30f 100644
--- a/sdk/android/native_unittests/codecs/DEPS
+++ b/sdk/android/native_unittests/codecs/DEPS
@@ -1,3 +1,3 @@
include_rules = [
- "+media/base/mediaconstants.h",
+ "+media/base/media_constants.h",
]
diff --git a/sdk/android/native_unittests/codecs/wrapper_unittest.cc b/sdk/android/native_unittests/codecs/wrapper_unittest.cc
index 453b7da..53efd22 100644
--- a/sdk/android/native_unittests/codecs/wrapper_unittest.cc
+++ b/sdk/android/native_unittests/codecs/wrapper_unittest.cc
@@ -9,7 +9,7 @@
*/
#include "sdk/android/native_api/codecs/wrapper.h"
-#include "media/base/mediaconstants.h"
+#include "media/base/media_constants.h"
#include "sdk/android/generated_native_unittests_jni/jni/CodecsWrapperTestHelper_jni.h"
#include "test/gtest.h"
diff --git a/sdk/android/native_unittests/peerconnection/peer_connection_factory_unittest.cc b/sdk/android/native_unittests/peerconnection/peer_connection_factory_unittest.cc
index 5b902b7..de02071 100644
--- a/sdk/android/native_unittests/peerconnection/peer_connection_factory_unittest.cc
+++ b/sdk/android/native_unittests/peerconnection/peer_connection_factory_unittest.cc
@@ -7,16 +7,16 @@
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "sdk/android/native_api/peerconnection/peerconnectionfactory.h"
+#include "sdk/android/native_api/peerconnection/peer_connection_factory.h"
#include "absl/memory/memory.h"
#include "api/audio_codecs/builtin_audio_decoder_factory.h"
#include "api/audio_codecs/builtin_audio_encoder_factory.h"
#include "logging/rtc_event_log/rtc_event_log_factory.h"
-#include "media/base/mediaengine.h"
-#include "media/engine/internaldecoderfactory.h"
-#include "media/engine/internalencoderfactory.h"
-#include "media/engine/webrtcmediaengine.h"
+#include "media/base/media_engine.h"
+#include "media/engine/internal_decoder_factory.h"
+#include "media/engine/internal_encoder_factory.h"
+#include "media/engine/webrtc_media_engine.h"
#include "modules/audio_processing/include/audio_processing.h"
#include "rtc_base/logging.h"
#include "sdk/android/generated_native_unittests_jni/jni/PeerConnectionFactoryInitializationHelper_jni.h"
diff --git a/sdk/android/native_unittests/video/video_source_unittest.cc b/sdk/android/native_unittests/video/video_source_unittest.cc
index 7ecf9f8..17d1df9 100644
--- a/sdk/android/native_unittests/video/video_source_unittest.cc
+++ b/sdk/android/native_unittests/video/video_source_unittest.cc
@@ -12,7 +12,7 @@
#include "api/video/video_sink_interface.h"
#include "sdk/android/generated_native_unittests_jni/jni/JavaVideoSourceTestHelper_jni.h"
-#include "sdk/android/native_api/video/videosource.h"
+#include "sdk/android/native_api/video/video_source.h"
#include "test/gtest.h"
namespace webrtc {
diff --git a/sdk/android/src/jni/android_media_codec_common.h b/sdk/android/src/jni/android_media_codec_common.h
index cc418ee..55955b0 100644
--- a/sdk/android/src/jni/android_media_codec_common.h
+++ b/sdk/android/src/jni/android_media_codec_common.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef SDK_ANDROID_SRC_JNI_ANDROIDMEDIACODECCOMMON_H_
-#define SDK_ANDROID_SRC_JNI_ANDROIDMEDIACODECCOMMON_H_
+#ifndef SDK_ANDROID_SRC_JNI_ANDROID_MEDIA_CODEC_COMMON_H_
+#define SDK_ANDROID_SRC_JNI_ANDROID_MEDIA_CODEC_COMMON_H_
#include <string>
@@ -84,4 +84,4 @@
} // namespace jni
} // namespace webrtc
-#endif // SDK_ANDROID_SRC_JNI_ANDROIDMEDIACODECCOMMON_H_
+#endif // SDK_ANDROID_SRC_JNI_ANDROID_MEDIA_CODEC_COMMON_H_
diff --git a/sdk/android/src/jni/android_media_decoder.cc b/sdk/android/src/jni/android_media_decoder.cc
index 70d5b58..a73167d 100644
--- a/sdk/android/src/jni/android_media_decoder.cc
+++ b/sdk/android/src/jni/android_media_decoder.cc
@@ -16,7 +16,7 @@
#include "api/video_codecs/sdp_video_format.h"
#include "common_video/h264/h264_bitstream_parser.h"
#include "common_video/include/i420_buffer_pool.h"
-#include "media/base/mediaconstants.h"
+#include "media/base/media_constants.h"
#include "modules/video_coding/include/video_codec_interface.h"
#include "modules/video_coding/utility/vp8_header_parser.h"
#include "rtc_base/bind.h"
@@ -25,11 +25,11 @@
#include "rtc_base/numerics/safe_conversions.h"
#include "rtc_base/scoped_ref_ptr.h"
#include "rtc_base/thread.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
#include "sdk/android/generated_video_jni/jni/MediaCodecVideoDecoder_jni.h"
#include "sdk/android/native_api/jni/java_types.h"
-#include "sdk/android/src/jni/androidmediacodeccommon.h"
-#include "sdk/android/src/jni/videoframe.h"
+#include "sdk/android/src/jni/android_media_codec_common.h"
+#include "sdk/android/src/jni/video_frame.h"
#include "third_party/libyuv/include/libyuv/convert.h"
#include "third_party/libyuv/include/libyuv/planar_functions.h"
#include "third_party/libyuv/include/libyuv/video_common.h"
diff --git a/sdk/android/src/jni/android_media_encoder.cc b/sdk/android/src/jni/android_media_encoder.cc
index 0bf7186..aaa2d9a 100644
--- a/sdk/android/src/jni/android_media_encoder.cc
+++ b/sdk/android/src/jni/android_media_encoder.cc
@@ -21,8 +21,8 @@
#include "common_video/h264/h264_common.h"
#include "common_video/h264/profile_level_id.h"
#include "media/base/codec.h"
-#include "media/base/mediaconstants.h"
-#include "media/engine/internalencoderfactory.h"
+#include "media/base/media_constants.h"
+#include "media/engine/internal_encoder_factory.h"
#include "modules/video_coding/include/video_codec_interface.h"
#include "modules/video_coding/utility/quality_scaler.h"
#include "modules/video_coding/utility/vp8_header_parser.h"
@@ -33,14 +33,14 @@
#include "rtc_base/sequenced_task_checker.h"
#include "rtc_base/task_queue.h"
#include "rtc_base/thread.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
#include "rtc_base/weak_ptr.h"
#include "sdk/android/generated_video_jni/jni/MediaCodecVideoEncoder_jni.h"
#include "sdk/android/native_api/jni/java_types.h"
-#include "sdk/android/src/jni/androidmediacodeccommon.h"
+#include "sdk/android/src/jni/android_media_codec_common.h"
#include "sdk/android/src/jni/jni_helpers.h"
-#include "sdk/android/src/jni/videocodecinfo.h"
-#include "sdk/android/src/jni/videoframe.h"
+#include "sdk/android/src/jni/video_codec_info.h"
+#include "sdk/android/src/jni/video_frame.h"
#include "system_wrappers/include/field_trial.h"
#include "third_party/libyuv/include/libyuv/convert.h"
#include "third_party/libyuv/include/libyuv/convert_from.h"
diff --git a/sdk/android/src/jni/android_network_monitor.cc b/sdk/android/src/jni/android_network_monitor.cc
index 7ac1728..b45d177 100644
--- a/sdk/android/src/jni/android_network_monitor.cc
+++ b/sdk/android/src/jni/android_network_monitor.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "sdk/android/src/jni/androidnetworkmonitor.h"
+#include "sdk/android/src/jni/android_network_monitor.h"
#include <dlfcn.h>
#ifndef RTLD_NOLOAD
@@ -18,7 +18,7 @@
#include "rtc_base/bind.h"
#include "rtc_base/checks.h"
-#include "rtc_base/ipaddress.h"
+#include "rtc_base/ip_address.h"
#include "rtc_base/logging.h"
#include "rtc_base/strings/string_builder.h"
#include "sdk/android/generated_base_jni/jni/NetworkMonitorAutoDetect_jni.h"
diff --git a/sdk/android/src/jni/android_network_monitor.h b/sdk/android/src/jni/android_network_monitor.h
index 563d5bd..898ddc9 100644
--- a/sdk/android/src/jni/android_network_monitor.h
+++ b/sdk/android/src/jni/android_network_monitor.h
@@ -8,15 +8,15 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef SDK_ANDROID_SRC_JNI_ANDROIDNETWORKMONITOR_H_
-#define SDK_ANDROID_SRC_JNI_ANDROIDNETWORKMONITOR_H_
+#ifndef SDK_ANDROID_SRC_JNI_ANDROID_NETWORK_MONITOR_H_
+#define SDK_ANDROID_SRC_JNI_ANDROID_NETWORK_MONITOR_H_
#include <stdint.h>
#include <map>
#include <string>
#include <vector>
-#include "rtc_base/networkmonitor.h"
+#include "rtc_base/network_monitor.h"
#include "rtc_base/thread_checker.h"
#include "sdk/android/src/jni/jni_helpers.h"
@@ -136,4 +136,4 @@
} // namespace webrtc_jni
-#endif // SDK_ANDROID_SRC_JNI_ANDROIDNETWORKMONITOR_H_
+#endif // SDK_ANDROID_SRC_JNI_ANDROID_NETWORK_MONITOR_H_
diff --git a/sdk/android/src/jni/android_network_monitor_jni.h b/sdk/android/src/jni/android_network_monitor_jni.h
index 407e6f6..e703974 100644
--- a/sdk/android/src/jni/android_network_monitor_jni.h
+++ b/sdk/android/src/jni/android_network_monitor_jni.h
@@ -11,4 +11,4 @@
// TODO(deadbeef): Remove this file when clients are updated to new include
// path.
-#include "sdk/android/src/jni/pc/androidnetworkmonitor.h"
+#include "sdk/android/src/jni/pc/android_network_monitor.h"
diff --git a/sdk/android/src/jni/android_video_track_source.cc b/sdk/android/src/jni/android_video_track_source.cc
index f573eda..4fbbffb 100644
--- a/sdk/android/src/jni/android_video_track_source.cc
+++ b/sdk/android/src/jni/android_video_track_source.cc
@@ -8,11 +8,11 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "sdk/android/src/jni/androidvideotracksource.h"
+#include "sdk/android/src/jni/android_video_track_source.h"
#include <utility>
-#include "api/videosourceproxy.h"
+#include "api/video_track_source_proxy.h"
#include "rtc_base/logging.h"
namespace webrtc {
diff --git a/sdk/android/src/jni/android_video_track_source.h b/sdk/android/src/jni/android_video_track_source.h
index 4f8442e..c68f8d1 100644
--- a/sdk/android/src/jni/android_video_track_source.h
+++ b/sdk/android/src/jni/android_video_track_source.h
@@ -15,12 +15,12 @@
#include "common_video/include/i420_buffer_pool.h"
#include "common_video/libyuv/include/webrtc_libyuv.h"
-#include "media/base/adaptedvideotracksource.h"
-#include "rtc_base/asyncinvoker.h"
+#include "media/base/adapted_video_track_source.h"
+#include "rtc_base/async_invoker.h"
#include "rtc_base/checks.h"
#include "rtc_base/thread_checker.h"
-#include "rtc_base/timestampaligner.h"
-#include "sdk/android/src/jni/videoframe.h"
+#include "rtc_base/timestamp_aligner.h"
+#include "sdk/android/src/jni/video_frame.h"
namespace webrtc {
namespace jni {
diff --git a/sdk/android/src/jni/audio_device/aaudio_player.h b/sdk/android/src/jni/audio_device/aaudio_player.h
index b43b5b3..e6146d0 100644
--- a/sdk/android/src/jni/audio_device/aaudio_player.h
+++ b/sdk/android/src/jni/audio_device/aaudio_player.h
@@ -17,7 +17,7 @@
#include "absl/types/optional.h"
#include "modules/audio_device/audio_device_buffer.h"
#include "modules/audio_device/include/audio_device_defines.h"
-#include "rtc_base/messagehandler.h"
+#include "rtc_base/message_handler.h"
#include "rtc_base/thread.h"
#include "rtc_base/thread_annotations.h"
#include "rtc_base/thread_checker.h"
diff --git a/sdk/android/src/jni/audio_device/aaudio_recorder.cc b/sdk/android/src/jni/audio_device/aaudio_recorder.cc
index 8134d3c..7393275 100644
--- a/sdk/android/src/jni/audio_device/aaudio_recorder.cc
+++ b/sdk/android/src/jni/audio_device/aaudio_recorder.cc
@@ -15,7 +15,7 @@
#include "modules/audio_device/fine_audio_buffer.h"
#include "rtc_base/checks.h"
#include "rtc_base/logging.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
#include "system_wrappers/include/sleep.h"
diff --git a/sdk/android/src/jni/audio_device/aaudio_recorder.h b/sdk/android/src/jni/audio_device/aaudio_recorder.h
index ec38083..0ed0fa2 100644
--- a/sdk/android/src/jni/audio_device/aaudio_recorder.h
+++ b/sdk/android/src/jni/audio_device/aaudio_recorder.h
@@ -16,7 +16,7 @@
#include "modules/audio_device/audio_device_buffer.h"
#include "modules/audio_device/include/audio_device_defines.h"
-#include "rtc_base/messagehandler.h"
+#include "rtc_base/message_handler.h"
#include "rtc_base/thread.h"
#include "rtc_base/thread_checker.h"
#include "sdk/android/src/jni/audio_device/aaudio_wrapper.h"
diff --git a/sdk/android/src/jni/audio_device/aaudio_wrapper.cc b/sdk/android/src/jni/audio_device/aaudio_wrapper.cc
index a9d647f..99a2a7f 100644
--- a/sdk/android/src/jni/audio_device/aaudio_wrapper.cc
+++ b/sdk/android/src/jni/audio_device/aaudio_wrapper.cc
@@ -12,7 +12,7 @@
#include "rtc_base/logging.h"
#include "rtc_base/strings/string_builder.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
#define LOG_ON_ERROR(op) \
do { \
diff --git a/sdk/android/src/jni/audio_device/audio_device_module.cc b/sdk/android/src/jni/audio_device/audio_device_module.cc
index 36bd70c..61be7def 100644
--- a/sdk/android/src/jni/audio_device/audio_device_module.cc
+++ b/sdk/android/src/jni/audio_device/audio_device_module.cc
@@ -16,7 +16,7 @@
#include "modules/audio_device/audio_device_buffer.h"
#include "rtc_base/checks.h"
#include "rtc_base/logging.h"
-#include "rtc_base/refcountedobject.h"
+#include "rtc_base/ref_counted_object.h"
#include "rtc_base/thread_checker.h"
#include "sdk/android/generated_audio_device_module_base_jni/jni/WebRtcAudioManager_jni.h"
#include "system_wrappers/include/metrics.h"
diff --git a/sdk/android/src/jni/audio_device/audio_record_jni.cc b/sdk/android/src/jni/audio_device/audio_record_jni.cc
index 390cec0..74c0f36 100644
--- a/sdk/android/src/jni/audio_device/audio_record_jni.cc
+++ b/sdk/android/src/jni/audio_device/audio_record_jni.cc
@@ -18,7 +18,7 @@
#include "rtc_base/format_macros.h"
#include "rtc_base/logging.h"
#include "rtc_base/platform_thread.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
#include "sdk/android/generated_java_audio_device_module_native_jni/jni/WebRtcAudioRecord_jni.h"
#include "sdk/android/src/jni/audio_device/audio_common.h"
#include "sdk/android/src/jni/jni_helpers.h"
diff --git a/sdk/android/src/jni/audio_device/opensles_player.cc b/sdk/android/src/jni/audio_device/opensles_player.cc
index 00a5f1e..67d6c1f 100644
--- a/sdk/android/src/jni/audio_device/opensles_player.cc
+++ b/sdk/android/src/jni/audio_device/opensles_player.cc
@@ -19,7 +19,7 @@
#include "rtc_base/checks.h"
#include "rtc_base/format_macros.h"
#include "rtc_base/platform_thread.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
#include "sdk/android/src/jni/audio_device/audio_common.h"
#define TAG "OpenSLESPlayer"
diff --git a/sdk/android/src/jni/audio_device/opensles_recorder.cc b/sdk/android/src/jni/audio_device/opensles_recorder.cc
index 32d9e5c..4f14907 100644
--- a/sdk/android/src/jni/audio_device/opensles_recorder.cc
+++ b/sdk/android/src/jni/audio_device/opensles_recorder.cc
@@ -19,7 +19,7 @@
#include "rtc_base/checks.h"
#include "rtc_base/format_macros.h"
#include "rtc_base/platform_thread.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
#include "sdk/android/src/jni/audio_device/audio_common.h"
#define TAG "OpenSLESRecorder"
diff --git a/sdk/android/src/jni/class_reference_holder.h b/sdk/android/src/jni/class_reference_holder.h
index 51759fc..4702f5e 100644
--- a/sdk/android/src/jni/class_reference_holder.h
+++ b/sdk/android/src/jni/class_reference_holder.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef SDK_ANDROID_SRC_JNI_CLASSREFERENCEHOLDER_H_
-#define SDK_ANDROID_SRC_JNI_CLASSREFERENCEHOLDER_H_
+#ifndef SDK_ANDROID_SRC_JNI_CLASS_REFERENCE_HOLDER_H_
+#define SDK_ANDROID_SRC_JNI_CLASS_REFERENCE_HOLDER_H_
// TODO(magjed): Update external clients to call webrtc::jni::InitClassLoader
// immediately instead.
@@ -38,4 +38,4 @@
} // namespace webrtc_jni
-#endif // SDK_ANDROID_SRC_JNI_CLASSREFERENCEHOLDER_H_
+#endif // SDK_ANDROID_SRC_JNI_CLASS_REFERENCE_HOLDER_H_
diff --git a/sdk/android/src/jni/encoded_image.cc b/sdk/android/src/jni/encoded_image.cc
index 21f8336..daa7788 100644
--- a/sdk/android/src/jni/encoded_image.cc
+++ b/sdk/android/src/jni/encoded_image.cc
@@ -8,10 +8,10 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "sdk/android/src/jni/encodedimage.h"
+#include "sdk/android/src/jni/encoded_image.h"
#include "api/video/encoded_image.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
#include "sdk/android/generated_video_jni/jni/EncodedImage_jni.h"
#include "sdk/android/native_api/jni/java_types.h"
#include "sdk/android/src/jni/jni_helpers.h"
diff --git a/sdk/android/src/jni/encoded_image.h b/sdk/android/src/jni/encoded_image.h
index 66c226b..02047aa 100644
--- a/sdk/android/src/jni/encoded_image.h
+++ b/sdk/android/src/jni/encoded_image.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef SDK_ANDROID_SRC_JNI_ENCODEDIMAGE_H_
-#define SDK_ANDROID_SRC_JNI_ENCODEDIMAGE_H_
+#ifndef SDK_ANDROID_SRC_JNI_ENCODED_IMAGE_H_
+#define SDK_ANDROID_SRC_JNI_ENCODED_IMAGE_H_
#include <jni.h>
#include "common_types.h" // NOLINT(build/include)
@@ -33,4 +33,4 @@
} // namespace jni
} // namespace webrtc
-#endif // SDK_ANDROID_SRC_JNI_ENCODEDIMAGE_H_
+#endif // SDK_ANDROID_SRC_JNI_ENCODED_IMAGE_H_
diff --git a/sdk/android/src/jni/h264_utils.cc b/sdk/android/src/jni/h264_utils.cc
index 12324b5..c067abd 100644
--- a/sdk/android/src/jni/h264_utils.cc
+++ b/sdk/android/src/jni/h264_utils.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "sdk/android/src/jni/videocodecinfo.h"
+#include "sdk/android/src/jni/video_codec_info.h"
#include "common_video/h264/profile_level_id.h"
#include "sdk/android/generated_video_jni/jni/H264Utils_jni.h"
diff --git a/sdk/android/src/jni/jni_common.cc b/sdk/android/src/jni/jni_common.cc
index 8129b1e..915a935 100644
--- a/sdk/android/src/jni/jni_common.cc
+++ b/sdk/android/src/jni/jni_common.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "rtc_base/refcount.h"
+#include "rtc_base/ref_count.h"
#include "sdk/android/generated_base_jni/jni/JniCommon_jni.h"
#include "sdk/android/src/jni/jni_helpers.h"
diff --git a/sdk/android/src/jni/jni_generator_helper.cc b/sdk/android/src/jni/jni_generator_helper.cc
index 24a6212..d26c992 100644
--- a/sdk/android/src/jni/jni_generator_helper.cc
+++ b/sdk/android/src/jni/jni_generator_helper.cc
@@ -10,7 +10,7 @@
#include "sdk/android/src/jni/jni_generator_helper.h"
-#include "rtc_base/atomicops.h"
+#include "rtc_base/atomic_ops.h"
#include "sdk/android/native_api/jni/class_loader.h"
namespace webrtc {
diff --git a/sdk/android/src/jni/jni_onload.cc b/sdk/android/src/jni/jni_onload.cc
index 83c61d6..88730ea 100644
--- a/sdk/android/src/jni/jni_onload.cc
+++ b/sdk/android/src/jni/jni_onload.cc
@@ -12,8 +12,8 @@
#undef JNIEXPORT
#define JNIEXPORT __attribute__((visibility("default")))
-#include "rtc_base/ssladapter.h"
-#include "sdk/android/src/jni/classreferenceholder.h"
+#include "rtc_base/ssl_adapter.h"
+#include "sdk/android/src/jni/class_reference_holder.h"
#include "sdk/android/src/jni/jni_helpers.h"
namespace webrtc {
diff --git a/sdk/android/src/jni/logging/log_sink.cc b/sdk/android/src/jni/logging/log_sink.cc
index cfa3c60..eebe668 100644
--- a/sdk/android/src/jni/logging/log_sink.cc
+++ b/sdk/android/src/jni/logging/log_sink.cc
@@ -7,7 +7,7 @@
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "sdk/android/src/jni/logging/logsink.h"
+#include "sdk/android/src/jni/logging/log_sink.h"
#include "sdk/android/generated_logging_jni/jni/JNILogging_jni.h"
diff --git a/sdk/android/src/jni/logging/log_sink.h b/sdk/android/src/jni/logging/log_sink.h
index bac51a0..e48b88d 100644
--- a/sdk/android/src/jni/logging/log_sink.h
+++ b/sdk/android/src/jni/logging/log_sink.h
@@ -7,8 +7,8 @@
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef SDK_ANDROID_SRC_JNI_LOGGING_LOGSINK_H_
-#define SDK_ANDROID_SRC_JNI_LOGGING_LOGSINK_H_
+#ifndef SDK_ANDROID_SRC_JNI_LOGGING_LOG_SINK_H_
+#define SDK_ANDROID_SRC_JNI_LOGGING_LOG_SINK_H_
#include <string>
@@ -36,4 +36,4 @@
} // namespace jni
} // namespace webrtc
-#endif // SDK_ANDROID_SRC_JNI_LOGGING_LOGSINK_H_
+#endif // SDK_ANDROID_SRC_JNI_LOGGING_LOG_SINK_H_
diff --git a/sdk/android/src/jni/native_capturer_observer.cc b/sdk/android/src/jni/native_capturer_observer.cc
index c332343..fe6f836 100644
--- a/sdk/android/src/jni/native_capturer_observer.cc
+++ b/sdk/android/src/jni/native_capturer_observer.cc
@@ -8,13 +8,13 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "sdk/android/src/jni/nativecapturerobserver.h"
+#include "sdk/android/src/jni/native_capturer_observer.h"
-#include "api/videosourceproxy.h"
+#include "api/video_track_source_proxy.h"
#include "rtc_base/logging.h"
#include "sdk/android/generated_video_jni/jni/NativeCapturerObserver_jni.h"
#include "sdk/android/native_api/jni/java_types.h"
-#include "sdk/android/src/jni/androidvideotracksource.h"
+#include "sdk/android/src/jni/android_video_track_source.h"
namespace webrtc {
namespace jni {
diff --git a/sdk/android/src/jni/native_capturer_observer.h b/sdk/android/src/jni/native_capturer_observer.h
index 57ddc07..51acf41 100644
--- a/sdk/android/src/jni/native_capturer_observer.h
+++ b/sdk/android/src/jni/native_capturer_observer.h
@@ -8,13 +8,13 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef SDK_ANDROID_SRC_JNI_NATIVECAPTUREROBSERVER_H_
-#define SDK_ANDROID_SRC_JNI_NATIVECAPTUREROBSERVER_H_
+#ifndef SDK_ANDROID_SRC_JNI_NATIVE_CAPTURER_OBSERVER_H_
+#define SDK_ANDROID_SRC_JNI_NATIVE_CAPTURER_OBSERVER_H_
#include <jni.h>
#include "sdk/android/native_api/jni/scoped_java_ref.h"
-#include "sdk/android/src/jni/androidvideotracksource.h"
+#include "sdk/android/src/jni/android_video_track_source.h"
namespace webrtc {
namespace jni {
@@ -26,4 +26,4 @@
} // namespace jni
} // namespace webrtc
-#endif // SDK_ANDROID_SRC_JNI_NATIVECAPTUREROBSERVER_H_
+#endif // SDK_ANDROID_SRC_JNI_NATIVE_CAPTURER_OBSERVER_H_
diff --git a/sdk/android/src/jni/pc/android_network_monitor.h b/sdk/android/src/jni/pc/android_network_monitor.h
index 3eee11b..609c1b0 100644
--- a/sdk/android/src/jni/pc/android_network_monitor.h
+++ b/sdk/android/src/jni/pc/android_network_monitor.h
@@ -9,4 +9,4 @@
*/
// TODO(sakal): Remove this file once clients have update to the native API.
-#include "sdk/android/src/jni/androidnetworkmonitor.h"
+#include "sdk/android/src/jni/android_network_monitor.h"
diff --git a/sdk/android/src/jni/pc/audio_track.cc b/sdk/android/src/jni/pc/audio_track.cc
index ed1d0bc..355df39 100644
--- a/sdk/android/src/jni/pc/audio_track.cc
+++ b/sdk/android/src/jni/pc/audio_track.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "api/mediastreaminterface.h"
+#include "api/media_stream_interface.h"
#include "sdk/android/generated_peerconnection_jni/jni/AudioTrack_jni.h"
namespace webrtc {
diff --git a/sdk/android/src/jni/pc/call_session_file_rotating_log_sink.cc b/sdk/android/src/jni/pc/call_session_file_rotating_log_sink.cc
index d933daa..bc65c3a 100644
--- a/sdk/android/src/jni/pc/call_session_file_rotating_log_sink.cc
+++ b/sdk/android/src/jni/pc/call_session_file_rotating_log_sink.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "rtc_base/logsinks.h"
+#include "rtc_base/log_sinks.h"
#include "sdk/android/generated_peerconnection_jni/jni/CallSessionFileRotatingLogSink_jni.h"
#include "sdk/android/native_api/jni/java_types.h"
#include "sdk/android/src/jni/jni_helpers.h"
diff --git a/sdk/android/src/jni/pc/crypto_options.cc b/sdk/android/src/jni/pc/crypto_options.cc
index 0f38b13..a592df8 100644
--- a/sdk/android/src/jni/pc/crypto_options.cc
+++ b/sdk/android/src/jni/pc/crypto_options.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "sdk/android/src/jni/pc/cryptooptions.h"
+#include "sdk/android/src/jni/pc/crypto_options.h"
#include "sdk/android/generated_peerconnection_jni/jni/CryptoOptions_jni.h"
diff --git a/sdk/android/src/jni/pc/crypto_options.h b/sdk/android/src/jni/pc/crypto_options.h
index 9890264..a9c8f26 100644
--- a/sdk/android/src/jni/pc/crypto_options.h
+++ b/sdk/android/src/jni/pc/crypto_options.h
@@ -8,13 +8,13 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef SDK_ANDROID_SRC_JNI_PC_CRYPTOOPTIONS_H_
-#define SDK_ANDROID_SRC_JNI_PC_CRYPTOOPTIONS_H_
+#ifndef SDK_ANDROID_SRC_JNI_PC_CRYPTO_OPTIONS_H_
+#define SDK_ANDROID_SRC_JNI_PC_CRYPTO_OPTIONS_H_
#include <jni.h>
#include "absl/types/optional.h"
-#include "api/crypto/cryptooptions.h"
+#include "api/crypto/crypto_options.h"
#include "sdk/android/native_api/jni/scoped_java_ref.h"
namespace webrtc {
@@ -27,4 +27,4 @@
} // namespace jni
} // namespace webrtc
-#endif // SDK_ANDROID_SRC_JNI_PC_CRYPTOOPTIONS_H_
+#endif // SDK_ANDROID_SRC_JNI_PC_CRYPTO_OPTIONS_H_
diff --git a/sdk/android/src/jni/pc/data_channel.cc b/sdk/android/src/jni/pc/data_channel.cc
index d07e00e..4f704e2 100644
--- a/sdk/android/src/jni/pc/data_channel.cc
+++ b/sdk/android/src/jni/pc/data_channel.cc
@@ -13,12 +13,12 @@
#include <limits>
#include "absl/memory/memory.h"
-#include "api/datachannelinterface.h"
+#include "api/data_channel_interface.h"
#include "rtc_base/logging.h"
#include "sdk/android/generated_peerconnection_jni/jni/DataChannel_jni.h"
#include "sdk/android/native_api/jni/java_types.h"
#include "sdk/android/src/jni/jni_helpers.h"
-#include "sdk/android/src/jni/pc/datachannel.h"
+#include "sdk/android/src/jni/pc/data_channel.h"
namespace webrtc {
namespace jni {
diff --git a/sdk/android/src/jni/pc/data_channel.h b/sdk/android/src/jni/pc/data_channel.h
index c6786f6..9da1b67 100644
--- a/sdk/android/src/jni/pc/data_channel.h
+++ b/sdk/android/src/jni/pc/data_channel.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef SDK_ANDROID_SRC_JNI_PC_DATACHANNEL_H_
-#define SDK_ANDROID_SRC_JNI_PC_DATACHANNEL_H_
+#ifndef SDK_ANDROID_SRC_JNI_PC_DATA_CHANNEL_H_
+#define SDK_ANDROID_SRC_JNI_PC_DATA_CHANNEL_H_
namespace webrtc {
namespace jni {
@@ -24,4 +24,4 @@
} // namespace jni
} // namespace webrtc
-#endif // SDK_ANDROID_SRC_JNI_PC_DATACHANNEL_H_
+#endif // SDK_ANDROID_SRC_JNI_PC_DATA_CHANNEL_H_
diff --git a/sdk/android/src/jni/pc/dtmf_sender.cc b/sdk/android/src/jni/pc/dtmf_sender.cc
index 0dad8bd..a9c1995 100644
--- a/sdk/android/src/jni/pc/dtmf_sender.cc
+++ b/sdk/android/src/jni/pc/dtmf_sender.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "api/dtmfsenderinterface.h"
+#include "api/dtmf_sender_interface.h"
#include "sdk/android/generated_peerconnection_jni/jni/DtmfSender_jni.h"
#include "sdk/android/native_api/jni/java_types.h"
#include "sdk/android/src/jni/jni_helpers.h"
diff --git a/sdk/android/src/jni/pc/ice_candidate.cc b/sdk/android/src/jni/pc/ice_candidate.cc
index b9d66a4..ee4a4cd 100644
--- a/sdk/android/src/jni/pc/ice_candidate.cc
+++ b/sdk/android/src/jni/pc/ice_candidate.cc
@@ -8,14 +8,14 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "sdk/android/src/jni/pc/icecandidate.h"
+#include "sdk/android/src/jni/pc/ice_candidate.h"
#include <string>
-#include "pc/webrtcsdp.h"
+#include "pc/webrtc_sdp.h"
#include "sdk/android/generated_peerconnection_jni/jni/IceCandidate_jni.h"
#include "sdk/android/native_api/jni/java_types.h"
-#include "sdk/android/src/jni/pc/mediastreamtrack.h"
+#include "sdk/android/src/jni/pc/media_stream_track.h"
namespace webrtc {
namespace jni {
diff --git a/sdk/android/src/jni/pc/ice_candidate.h b/sdk/android/src/jni/pc/ice_candidate.h
index 662b649..0feeeb4 100644
--- a/sdk/android/src/jni/pc/ice_candidate.h
+++ b/sdk/android/src/jni/pc/ice_candidate.h
@@ -8,17 +8,17 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef SDK_ANDROID_SRC_JNI_PC_ICECANDIDATE_H_
-#define SDK_ANDROID_SRC_JNI_PC_ICECANDIDATE_H_
+#ifndef SDK_ANDROID_SRC_JNI_PC_ICE_CANDIDATE_H_
+#define SDK_ANDROID_SRC_JNI_PC_ICE_CANDIDATE_H_
#include <vector>
-#include "api/datachannelinterface.h"
+#include "api/data_channel_interface.h"
#include "api/jsep.h"
-#include "api/jsepicecandidate.h"
-#include "api/peerconnectioninterface.h"
-#include "api/rtpparameters.h"
-#include "rtc_base/sslidentity.h"
+#include "api/jsep_ice_candidate.h"
+#include "api/peer_connection_interface.h"
+#include "api/rtp_parameters.h"
+#include "rtc_base/ssl_identity.h"
#include "sdk/android/src/jni/jni_helpers.h"
namespace webrtc {
@@ -82,4 +82,4 @@
} // namespace jni
} // namespace webrtc
-#endif // SDK_ANDROID_SRC_JNI_PC_ICECANDIDATE_H_
+#endif // SDK_ANDROID_SRC_JNI_PC_ICE_CANDIDATE_H_
diff --git a/sdk/android/src/jni/pc/media.cc b/sdk/android/src/jni/pc/media.cc
index d1d9627..e2da4ec 100644
--- a/sdk/android/src/jni/pc/media.cc
+++ b/sdk/android/src/jni/pc/media.cc
@@ -11,11 +11,11 @@
#include <utility>
-#include "api/call/callfactoryinterface.h"
+#include "api/call/call_factory_interface.h"
#include "api/video_codecs/video_decoder_factory.h"
#include "api/video_codecs/video_encoder_factory.h"
#include "logging/rtc_event_log/rtc_event_log_factory.h"
-#include "media/engine/webrtcmediaengine.h"
+#include "media/engine/webrtc_media_engine.h"
#include "modules/audio_device/include/audio_device.h"
#include "modules/audio_processing/include/audio_processing.h"
diff --git a/sdk/android/src/jni/pc/media_constraints.cc b/sdk/android/src/jni/pc/media_constraints.cc
index e7a4bb5..8c7d173 100644
--- a/sdk/android/src/jni/pc/media_constraints.cc
+++ b/sdk/android/src/jni/pc/media_constraints.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "sdk/android/src/jni/pc/mediaconstraints.h"
+#include "sdk/android/src/jni/pc/media_constraints.h"
#include "absl/memory/memory.h"
#include "sdk/android/generated_peerconnection_jni/jni/MediaConstraints_jni.h"
diff --git a/sdk/android/src/jni/pc/media_constraints.h b/sdk/android/src/jni/pc/media_constraints.h
index 2fbf34e..e29b900 100644
--- a/sdk/android/src/jni/pc/media_constraints.h
+++ b/sdk/android/src/jni/pc/media_constraints.h
@@ -8,13 +8,13 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef SDK_ANDROID_SRC_JNI_PC_MEDIACONSTRAINTS_H_
-#define SDK_ANDROID_SRC_JNI_PC_MEDIACONSTRAINTS_H_
+#ifndef SDK_ANDROID_SRC_JNI_PC_MEDIA_CONSTRAINTS_H_
+#define SDK_ANDROID_SRC_JNI_PC_MEDIA_CONSTRAINTS_H_
#include <jni.h>
#include <memory>
-#include "api/mediaconstraintsinterface.h"
+#include "api/media_constraints_interface.h"
#include "sdk/android/native_api/jni/scoped_java_ref.h"
namespace webrtc {
@@ -27,4 +27,4 @@
} // namespace jni
} // namespace webrtc
-#endif // SDK_ANDROID_SRC_JNI_PC_MEDIACONSTRAINTS_H_
+#endif // SDK_ANDROID_SRC_JNI_PC_MEDIA_CONSTRAINTS_H_
diff --git a/sdk/android/src/jni/pc/media_source.cc b/sdk/android/src/jni/pc/media_source.cc
index 6a7f47b..83cdfb7 100644
--- a/sdk/android/src/jni/pc/media_source.cc
+++ b/sdk/android/src/jni/pc/media_source.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "api/mediastreaminterface.h"
+#include "api/media_stream_interface.h"
#include "sdk/android/generated_peerconnection_jni/jni/MediaSource_jni.h"
namespace webrtc {
diff --git a/sdk/android/src/jni/pc/media_stream.cc b/sdk/android/src/jni/pc/media_stream.cc
index 35efc17..deb4252 100644
--- a/sdk/android/src/jni/pc/media_stream.cc
+++ b/sdk/android/src/jni/pc/media_stream.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "sdk/android/src/jni/pc/mediastream.h"
+#include "sdk/android/src/jni/pc/media_stream.h"
#include "absl/memory/memory.h"
#include "sdk/android/generated_peerconnection_jni/jni/MediaStream_jni.h"
diff --git a/sdk/android/src/jni/pc/media_stream.h b/sdk/android/src/jni/pc/media_stream.h
index 479ab11..135a349 100644
--- a/sdk/android/src/jni/pc/media_stream.h
+++ b/sdk/android/src/jni/pc/media_stream.h
@@ -8,14 +8,14 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef SDK_ANDROID_SRC_JNI_PC_MEDIASTREAM_H_
-#define SDK_ANDROID_SRC_JNI_PC_MEDIASTREAM_H_
+#ifndef SDK_ANDROID_SRC_JNI_PC_MEDIA_STREAM_H_
+#define SDK_ANDROID_SRC_JNI_PC_MEDIA_STREAM_H_
#include <jni.h>
#include <memory>
-#include "api/mediastreaminterface.h"
-#include "pc/mediastreamobserver.h"
+#include "api/media_stream_interface.h"
+#include "pc/media_stream_observer.h"
#include "sdk/android/src/jni/jni_helpers.h"
namespace webrtc {
@@ -51,4 +51,4 @@
} // namespace jni
} // namespace webrtc
-#endif // SDK_ANDROID_SRC_JNI_PC_MEDIASTREAM_H_
+#endif // SDK_ANDROID_SRC_JNI_PC_MEDIA_STREAM_H_
diff --git a/sdk/android/src/jni/pc/media_stream_track.cc b/sdk/android/src/jni/pc/media_stream_track.cc
index 67044cc..19ce610 100644
--- a/sdk/android/src/jni/pc/media_stream_track.cc
+++ b/sdk/android/src/jni/pc/media_stream_track.cc
@@ -8,9 +8,9 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "sdk/android/src/jni/pc/mediastreamtrack.h"
+#include "sdk/android/src/jni/pc/media_stream_track.h"
-#include "api/mediastreaminterface.h"
+#include "api/media_stream_interface.h"
#include "sdk/android/generated_peerconnection_jni/jni/MediaStreamTrack_jni.h"
#include "sdk/android/native_api/jni/java_types.h"
#include "sdk/android/src/jni/jni_helpers.h"
diff --git a/sdk/android/src/jni/pc/media_stream_track.h b/sdk/android/src/jni/pc/media_stream_track.h
index 8af425c..8bfe302 100644
--- a/sdk/android/src/jni/pc/media_stream_track.h
+++ b/sdk/android/src/jni/pc/media_stream_track.h
@@ -8,12 +8,12 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef SDK_ANDROID_SRC_JNI_PC_MEDIASTREAMTRACK_H_
-#define SDK_ANDROID_SRC_JNI_PC_MEDIASTREAMTRACK_H_
+#ifndef SDK_ANDROID_SRC_JNI_PC_MEDIA_STREAM_TRACK_H_
+#define SDK_ANDROID_SRC_JNI_PC_MEDIA_STREAM_TRACK_H_
#include <jni.h>
-#include "api/mediatypes.h"
+#include "api/media_types.h"
#include "sdk/android/native_api/jni/scoped_java_ref.h"
namespace webrtc {
@@ -28,4 +28,4 @@
} // namespace jni
} // namespace webrtc
-#endif // SDK_ANDROID_SRC_JNI_PC_MEDIASTREAMTRACK_H_
+#endif // SDK_ANDROID_SRC_JNI_PC_MEDIA_STREAM_TRACK_H_
diff --git a/sdk/android/src/jni/pc/owned_factory_and_threads.cc b/sdk/android/src/jni/pc/owned_factory_and_threads.cc
index 2d62ea3..5d7a0bb 100644
--- a/sdk/android/src/jni/pc/owned_factory_and_threads.cc
+++ b/sdk/android/src/jni/pc/owned_factory_and_threads.cc
@@ -8,10 +8,10 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "sdk/android/src/jni/pc/ownedfactoryandthreads.h"
+#include "sdk/android/src/jni/pc/owned_factory_and_threads.h"
#include "sdk/android/src/jni/jni_helpers.h"
-#include "sdk/android/src/jni/pc/peerconnectionfactory.h"
+#include "sdk/android/src/jni/pc/peer_connection_factory.h"
namespace webrtc {
namespace jni {
diff --git a/sdk/android/src/jni/pc/owned_factory_and_threads.h b/sdk/android/src/jni/pc/owned_factory_and_threads.h
index bacd42d..cc71001 100644
--- a/sdk/android/src/jni/pc/owned_factory_and_threads.h
+++ b/sdk/android/src/jni/pc/owned_factory_and_threads.h
@@ -8,14 +8,14 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef SDK_ANDROID_SRC_JNI_PC_OWNEDFACTORYANDTHREADS_H_
-#define SDK_ANDROID_SRC_JNI_PC_OWNEDFACTORYANDTHREADS_H_
+#ifndef SDK_ANDROID_SRC_JNI_PC_OWNED_FACTORY_AND_THREADS_H_
+#define SDK_ANDROID_SRC_JNI_PC_OWNED_FACTORY_AND_THREADS_H_
#include <jni.h>
#include <memory>
#include <utility>
-#include "api/peerconnectioninterface.h"
+#include "api/peer_connection_interface.h"
#include "rtc_base/thread.h"
namespace webrtc {
@@ -60,4 +60,4 @@
} // namespace jni
} // namespace webrtc
-#endif // SDK_ANDROID_SRC_JNI_PC_OWNEDFACTORYANDTHREADS_H_
+#endif // SDK_ANDROID_SRC_JNI_PC_OWNED_FACTORY_AND_THREADS_H_
diff --git a/sdk/android/src/jni/pc/peer_connection.cc b/sdk/android/src/jni/pc/peer_connection.cc
index 142454a..50a48c4 100644
--- a/sdk/android/src/jni/pc/peer_connection.cc
+++ b/sdk/android/src/jni/pc/peer_connection.cc
@@ -25,7 +25,7 @@
// return to the Java frame that called code in this file, at which point it's
// impossible to tell which JNI call broke).
-#include "sdk/android/src/jni/pc/peerconnection.h"
+#include "sdk/android/src/jni/pc/peer_connection.h"
#include <limits>
#include <memory>
@@ -33,28 +33,28 @@
#include <utility>
#include "absl/memory/memory.h"
-#include "api/mediaconstraintsinterface.h"
-#include "api/peerconnectioninterface.h"
-#include "api/rtpreceiverinterface.h"
-#include "api/rtpsenderinterface.h"
-#include "api/rtptransceiverinterface.h"
+#include "api/media_constraints_interface.h"
+#include "api/peer_connection_interface.h"
+#include "api/rtp_receiver_interface.h"
+#include "api/rtp_sender_interface.h"
+#include "api/rtp_transceiver_interface.h"
#include "rtc_base/checks.h"
#include "rtc_base/logging.h"
#include "sdk/android/generated_peerconnection_jni/jni/PeerConnection_jni.h"
#include "sdk/android/native_api/jni/java_types.h"
#include "sdk/android/src/jni/jni_helpers.h"
-#include "sdk/android/src/jni/pc/cryptooptions.h"
-#include "sdk/android/src/jni/pc/datachannel.h"
-#include "sdk/android/src/jni/pc/icecandidate.h"
-#include "sdk/android/src/jni/pc/mediaconstraints.h"
-#include "sdk/android/src/jni/pc/mediastreamtrack.h"
-#include "sdk/android/src/jni/pc/rtccertificate.h"
-#include "sdk/android/src/jni/pc/rtcstatscollectorcallbackwrapper.h"
-#include "sdk/android/src/jni/pc/rtpsender.h"
-#include "sdk/android/src/jni/pc/sdpobserver.h"
-#include "sdk/android/src/jni/pc/sessiondescription.h"
-#include "sdk/android/src/jni/pc/statsobserver.h"
-#include "sdk/android/src/jni/pc/turncustomizer.h"
+#include "sdk/android/src/jni/pc/crypto_options.h"
+#include "sdk/android/src/jni/pc/data_channel.h"
+#include "sdk/android/src/jni/pc/ice_candidate.h"
+#include "sdk/android/src/jni/pc/media_constraints.h"
+#include "sdk/android/src/jni/pc/media_stream_track.h"
+#include "sdk/android/src/jni/pc/rtc_certificate.h"
+#include "sdk/android/src/jni/pc/rtc_stats_collector_callback_wrapper.h"
+#include "sdk/android/src/jni/pc/rtp_sender.h"
+#include "sdk/android/src/jni/pc/sdp_observer.h"
+#include "sdk/android/src/jni/pc/session_description.h"
+#include "sdk/android/src/jni/pc/stats_observer.h"
+#include "sdk/android/src/jni/pc/turn_customizer.h"
namespace webrtc {
namespace jni {
diff --git a/sdk/android/src/jni/pc/peer_connection.h b/sdk/android/src/jni/pc/peer_connection.h
index 7a282bf..15465e4 100644
--- a/sdk/android/src/jni/pc/peer_connection.h
+++ b/sdk/android/src/jni/pc/peer_connection.h
@@ -8,20 +8,20 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef SDK_ANDROID_SRC_JNI_PC_PEERCONNECTION_H_
-#define SDK_ANDROID_SRC_JNI_PC_PEERCONNECTION_H_
+#ifndef SDK_ANDROID_SRC_JNI_PC_PEER_CONNECTION_H_
+#define SDK_ANDROID_SRC_JNI_PC_PEER_CONNECTION_H_
#include <map>
#include <memory>
#include <vector>
-#include "api/peerconnectioninterface.h"
-#include "pc/mediastreamobserver.h"
+#include "api/peer_connection_interface.h"
+#include "pc/media_stream_observer.h"
#include "sdk/android/src/jni/jni_helpers.h"
-#include "sdk/android/src/jni/pc/mediaconstraints.h"
-#include "sdk/android/src/jni/pc/mediastream.h"
-#include "sdk/android/src/jni/pc/rtpreceiver.h"
-#include "sdk/android/src/jni/pc/rtptransceiver.h"
+#include "sdk/android/src/jni/pc/media_constraints.h"
+#include "sdk/android/src/jni/pc/media_stream.h"
+#include "sdk/android/src/jni/pc/rtp_receiver.h"
+#include "sdk/android/src/jni/pc/rtp_transceiver.h"
namespace webrtc {
namespace jni {
@@ -125,4 +125,4 @@
} // namespace jni
} // namespace webrtc
-#endif // SDK_ANDROID_SRC_JNI_PC_PEERCONNECTION_H_
+#endif // SDK_ANDROID_SRC_JNI_PC_PEER_CONNECTION_H_
diff --git a/sdk/android/src/jni/pc/peer_connection_factory.cc b/sdk/android/src/jni/pc/peer_connection_factory.cc
index 726295c..293031f 100644
--- a/sdk/android/src/jni/pc/peer_connection_factory.cc
+++ b/sdk/android/src/jni/pc/peer_connection_factory.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "sdk/android/src/jni/pc/peerconnectionfactory.h"
+#include "sdk/android/src/jni/pc/peer_connection_factory.h"
#include <memory>
#include <utility>
@@ -16,7 +16,7 @@
#include "absl/memory/memory.h"
#include "api/video_codecs/video_decoder_factory.h"
#include "api/video_codecs/video_encoder_factory.h"
-#include "media/base/mediaengine.h"
+#include "media/base/media_engine.h"
#include "modules/audio_device/include/audio_device.h"
#include "modules/utility/include/jvm_android.h"
// We don't depend on the audio processing module implementation.
@@ -27,14 +27,14 @@
#include "sdk/android/generated_peerconnection_jni/jni/PeerConnectionFactory_jni.h"
#include "sdk/android/native_api/jni/java_types.h"
#include "sdk/android/src/jni/jni_helpers.h"
-#include "sdk/android/src/jni/logging/logsink.h"
-#include "sdk/android/src/jni/pc/androidnetworkmonitor.h"
+#include "sdk/android/src/jni/logging/log_sink.h"
+#include "sdk/android/src/jni/pc/android_network_monitor.h"
#include "sdk/android/src/jni/pc/audio.h"
-#include "sdk/android/src/jni/pc/icecandidate.h"
+#include "sdk/android/src/jni/pc/ice_candidate.h"
#include "sdk/android/src/jni/pc/media.h"
-#include "sdk/android/src/jni/pc/ownedfactoryandthreads.h"
-#include "sdk/android/src/jni/pc/peerconnection.h"
-#include "sdk/android/src/jni/pc/sslcertificateverifierwrapper.h"
+#include "sdk/android/src/jni/pc/owned_factory_and_threads.h"
+#include "sdk/android/src/jni/pc/peer_connection.h"
+#include "sdk/android/src/jni/pc/ssl_certificate_verifier_wrapper.h"
#include "sdk/android/src/jni/pc/video.h"
#include "system_wrappers/include/field_trial.h"
diff --git a/sdk/android/src/jni/pc/peer_connection_factory.h b/sdk/android/src/jni/pc/peer_connection_factory.h
index 6f09776..ba8dbe6 100644
--- a/sdk/android/src/jni/pc/peer_connection_factory.h
+++ b/sdk/android/src/jni/pc/peer_connection_factory.h
@@ -8,11 +8,11 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef SDK_ANDROID_SRC_JNI_PC_PEERCONNECTIONFACTORY_H_
-#define SDK_ANDROID_SRC_JNI_PC_PEERCONNECTIONFACTORY_H_
+#ifndef SDK_ANDROID_SRC_JNI_PC_PEER_CONNECTION_FACTORY_H_
+#define SDK_ANDROID_SRC_JNI_PC_PEER_CONNECTION_FACTORY_H_
#include <jni.h>
-#include "api/peerconnectioninterface.h"
+#include "api/peer_connection_interface.h"
#include "rtc_base/thread.h"
namespace webrtc {
@@ -34,4 +34,4 @@
} // namespace jni
} // namespace webrtc
-#endif // SDK_ANDROID_SRC_JNI_PC_PEERCONNECTIONFACTORY_H_
+#endif // SDK_ANDROID_SRC_JNI_PC_PEER_CONNECTION_FACTORY_H_
diff --git a/sdk/android/src/jni/pc/rtc_certificate.cc b/sdk/android/src/jni/pc/rtc_certificate.cc
index af5b076..d46faaf 100644
--- a/sdk/android/src/jni/pc/rtc_certificate.cc
+++ b/sdk/android/src/jni/pc/rtc_certificate.cc
@@ -8,12 +8,12 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "sdk/android/src/jni/pc/rtccertificate.h"
-#include "sdk/android/src/jni/pc/icecandidate.h"
+#include "sdk/android/src/jni/pc/rtc_certificate.h"
+#include "sdk/android/src/jni/pc/ice_candidate.h"
-#include "rtc_base/refcount.h"
-#include "rtc_base/rtccertificate.h"
-#include "rtc_base/rtccertificategenerator.h"
+#include "rtc_base/ref_count.h"
+#include "rtc_base/rtc_certificate.h"
+#include "rtc_base/rtc_certificate_generator.h"
#include "sdk/android/generated_peerconnection_jni/jni/RtcCertificatePem_jni.h"
#include "sdk/android/native_api/jni/java_types.h"
#include "sdk/android/src/jni/jni_helpers.h"
diff --git a/sdk/android/src/jni/pc/rtc_certificate.h b/sdk/android/src/jni/pc/rtc_certificate.h
index f7d1f75..91a413c 100644
--- a/sdk/android/src/jni/pc/rtc_certificate.h
+++ b/sdk/android/src/jni/pc/rtc_certificate.h
@@ -8,11 +8,11 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef SDK_ANDROID_SRC_JNI_PC_RTCCERTIFICATE_H_
-#define SDK_ANDROID_SRC_JNI_PC_RTCCERTIFICATE_H_
+#ifndef SDK_ANDROID_SRC_JNI_PC_RTC_CERTIFICATE_H_
+#define SDK_ANDROID_SRC_JNI_PC_RTC_CERTIFICATE_H_
-#include "rtc_base/refcount.h"
-#include "rtc_base/rtccertificate.h"
+#include "rtc_base/ref_count.h"
+#include "rtc_base/rtc_certificate.h"
#include "sdk/android/native_api/jni/java_types.h"
#include "sdk/android/src/jni/jni_helpers.h"
@@ -30,4 +30,4 @@
} // namespace jni
} // namespace webrtc
-#endif // SDK_ANDROID_SRC_JNI_PC_RTCCERTIFICATE_H_
+#endif // SDK_ANDROID_SRC_JNI_PC_RTC_CERTIFICATE_H_
diff --git a/sdk/android/src/jni/pc/rtc_stats_collector_callback_wrapper.cc b/sdk/android/src/jni/pc/rtc_stats_collector_callback_wrapper.cc
index 966d2ef..9443b5d 100644
--- a/sdk/android/src/jni/pc/rtc_stats_collector_callback_wrapper.cc
+++ b/sdk/android/src/jni/pc/rtc_stats_collector_callback_wrapper.cc
@@ -8,12 +8,12 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "sdk/android/src/jni/pc/rtcstatscollectorcallbackwrapper.h"
+#include "sdk/android/src/jni/pc/rtc_stats_collector_callback_wrapper.h"
#include <string>
#include <vector>
-#include "rtc_base/stringencode.h"
+#include "rtc_base/string_encode.h"
#include "sdk/android/generated_external_classes_jni/jni/BigInteger_jni.h"
#include "sdk/android/generated_peerconnection_jni/jni/RTCStatsCollectorCallback_jni.h"
#include "sdk/android/generated_peerconnection_jni/jni/RTCStatsReport_jni.h"
diff --git a/sdk/android/src/jni/pc/rtc_stats_collector_callback_wrapper.h b/sdk/android/src/jni/pc/rtc_stats_collector_callback_wrapper.h
index a2794ff..50fad18 100644
--- a/sdk/android/src/jni/pc/rtc_stats_collector_callback_wrapper.h
+++ b/sdk/android/src/jni/pc/rtc_stats_collector_callback_wrapper.h
@@ -8,12 +8,12 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef SDK_ANDROID_SRC_JNI_PC_RTCSTATSCOLLECTORCALLBACKWRAPPER_H_
-#define SDK_ANDROID_SRC_JNI_PC_RTCSTATSCOLLECTORCALLBACKWRAPPER_H_
+#ifndef SDK_ANDROID_SRC_JNI_PC_RTC_STATS_COLLECTOR_CALLBACK_WRAPPER_H_
+#define SDK_ANDROID_SRC_JNI_PC_RTC_STATS_COLLECTOR_CALLBACK_WRAPPER_H_
#include <jni.h>
-#include "api/peerconnectioninterface.h"
+#include "api/peer_connection_interface.h"
#include "sdk/android/src/jni/jni_helpers.h"
namespace webrtc {
@@ -38,4 +38,4 @@
} // namespace jni
} // namespace webrtc
-#endif // SDK_ANDROID_SRC_JNI_PC_RTCSTATSCOLLECTORCALLBACKWRAPPER_H_
+#endif // SDK_ANDROID_SRC_JNI_PC_RTC_STATS_COLLECTOR_CALLBACK_WRAPPER_H_
diff --git a/sdk/android/src/jni/pc/rtp_parameters.cc b/sdk/android/src/jni/pc/rtp_parameters.cc
index 3c7a9a9..25adb4c 100644
--- a/sdk/android/src/jni/pc/rtp_parameters.cc
+++ b/sdk/android/src/jni/pc/rtp_parameters.cc
@@ -8,12 +8,12 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "sdk/android/src/jni/pc/rtpparameters.h"
+#include "sdk/android/src/jni/pc/rtp_parameters.h"
#include "sdk/android/generated_peerconnection_jni/jni/RtpParameters_jni.h"
#include "sdk/android/native_api/jni/java_types.h"
#include "sdk/android/src/jni/jni_helpers.h"
-#include "sdk/android/src/jni/pc/mediastreamtrack.h"
+#include "sdk/android/src/jni/pc/media_stream_track.h"
namespace webrtc {
namespace jni {
diff --git a/sdk/android/src/jni/pc/rtp_parameters.h b/sdk/android/src/jni/pc/rtp_parameters.h
index ae79793..3bcd343 100644
--- a/sdk/android/src/jni/pc/rtp_parameters.h
+++ b/sdk/android/src/jni/pc/rtp_parameters.h
@@ -8,12 +8,12 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef SDK_ANDROID_SRC_JNI_PC_RTPPARAMETERS_H_
-#define SDK_ANDROID_SRC_JNI_PC_RTPPARAMETERS_H_
+#ifndef SDK_ANDROID_SRC_JNI_PC_RTP_PARAMETERS_H_
+#define SDK_ANDROID_SRC_JNI_PC_RTP_PARAMETERS_H_
#include <jni.h>
-#include "api/rtpparameters.h"
+#include "api/rtp_parameters.h"
#include "sdk/android/native_api/jni/scoped_java_ref.h"
namespace webrtc {
@@ -32,4 +32,4 @@
} // namespace jni
} // namespace webrtc
-#endif // SDK_ANDROID_SRC_JNI_PC_RTPPARAMETERS_H_
+#endif // SDK_ANDROID_SRC_JNI_PC_RTP_PARAMETERS_H_
diff --git a/sdk/android/src/jni/pc/rtp_receiver.cc b/sdk/android/src/jni/pc/rtp_receiver.cc
index 28e2f6e..bc82ca8 100644
--- a/sdk/android/src/jni/pc/rtp_receiver.cc
+++ b/sdk/android/src/jni/pc/rtp_receiver.cc
@@ -8,13 +8,13 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "sdk/android/src/jni/pc/rtpreceiver.h"
+#include "sdk/android/src/jni/pc/rtp_receiver.h"
#include "sdk/android/generated_peerconnection_jni/jni/RtpReceiver_jni.h"
#include "sdk/android/native_api/jni/java_types.h"
#include "sdk/android/src/jni/jni_helpers.h"
-#include "sdk/android/src/jni/pc/mediastreamtrack.h"
-#include "sdk/android/src/jni/pc/rtpparameters.h"
+#include "sdk/android/src/jni/pc/media_stream_track.h"
+#include "sdk/android/src/jni/pc/rtp_parameters.h"
namespace webrtc {
namespace jni {
diff --git a/sdk/android/src/jni/pc/rtp_receiver.h b/sdk/android/src/jni/pc/rtp_receiver.h
index c2e9c31..dd8ba0e 100644
--- a/sdk/android/src/jni/pc/rtp_receiver.h
+++ b/sdk/android/src/jni/pc/rtp_receiver.h
@@ -8,12 +8,12 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef SDK_ANDROID_SRC_JNI_PC_RTPRECEIVER_H_
-#define SDK_ANDROID_SRC_JNI_PC_RTPRECEIVER_H_
+#ifndef SDK_ANDROID_SRC_JNI_PC_RTP_RECEIVER_H_
+#define SDK_ANDROID_SRC_JNI_PC_RTP_RECEIVER_H_
#include <jni.h>
-#include "api/rtpreceiverinterface.h"
+#include "api/rtp_receiver_interface.h"
#include "sdk/android/native_api/jni/scoped_java_ref.h"
namespace webrtc {
@@ -38,4 +38,4 @@
} // namespace jni
} // namespace webrtc
-#endif // SDK_ANDROID_SRC_JNI_PC_RTPRECEIVER_H_
+#endif // SDK_ANDROID_SRC_JNI_PC_RTP_RECEIVER_H_
diff --git a/sdk/android/src/jni/pc/rtp_sender.cc b/sdk/android/src/jni/pc/rtp_sender.cc
index 4120466..42edb01 100644
--- a/sdk/android/src/jni/pc/rtp_sender.cc
+++ b/sdk/android/src/jni/pc/rtp_sender.cc
@@ -8,12 +8,12 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "sdk/android/src/jni/pc/rtpsender.h"
+#include "sdk/android/src/jni/pc/rtp_sender.h"
#include "sdk/android/generated_peerconnection_jni/jni/RtpSender_jni.h"
#include "sdk/android/native_api/jni/java_types.h"
#include "sdk/android/src/jni/jni_helpers.h"
-#include "sdk/android/src/jni/pc/rtpparameters.h"
+#include "sdk/android/src/jni/pc/rtp_parameters.h"
namespace webrtc {
namespace jni {
diff --git a/sdk/android/src/jni/pc/rtp_sender.h b/sdk/android/src/jni/pc/rtp_sender.h
index 5d30ed5..d782ca9 100644
--- a/sdk/android/src/jni/pc/rtp_sender.h
+++ b/sdk/android/src/jni/pc/rtp_sender.h
@@ -8,12 +8,12 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef SDK_ANDROID_SRC_JNI_PC_RTPSENDER_H_
-#define SDK_ANDROID_SRC_JNI_PC_RTPSENDER_H_
+#ifndef SDK_ANDROID_SRC_JNI_PC_RTP_SENDER_H_
+#define SDK_ANDROID_SRC_JNI_PC_RTP_SENDER_H_
#include <jni.h>
-#include "api/rtpsenderinterface.h"
+#include "api/rtp_sender_interface.h"
#include "sdk/android/native_api/jni/scoped_java_ref.h"
namespace webrtc {
@@ -26,4 +26,4 @@
} // namespace jni
} // namespace webrtc
-#endif // SDK_ANDROID_SRC_JNI_PC_RTPSENDER_H_
+#endif // SDK_ANDROID_SRC_JNI_PC_RTP_SENDER_H_
diff --git a/sdk/android/src/jni/pc/rtp_transceiver.cc b/sdk/android/src/jni/pc/rtp_transceiver.cc
index e7ec769..50844fd 100644
--- a/sdk/android/src/jni/pc/rtp_transceiver.cc
+++ b/sdk/android/src/jni/pc/rtp_transceiver.cc
@@ -8,17 +8,17 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "sdk/android/src/jni/pc/rtptransceiver.h"
+#include "sdk/android/src/jni/pc/rtp_transceiver.h"
#include <string>
#include "sdk/android/generated_peerconnection_jni/jni/RtpTransceiver_jni.h"
#include "sdk/android/native_api/jni/java_types.h"
#include "sdk/android/src/jni/jni_helpers.h"
-#include "sdk/android/src/jni/pc/mediastreamtrack.h"
-#include "sdk/android/src/jni/pc/rtpparameters.h"
-#include "sdk/android/src/jni/pc/rtpreceiver.h"
-#include "sdk/android/src/jni/pc/rtpsender.h"
+#include "sdk/android/src/jni/pc/media_stream_track.h"
+#include "sdk/android/src/jni/pc/rtp_parameters.h"
+#include "sdk/android/src/jni/pc/rtp_receiver.h"
+#include "sdk/android/src/jni/pc/rtp_sender.h"
namespace webrtc {
namespace jni {
diff --git a/sdk/android/src/jni/pc/rtp_transceiver.h b/sdk/android/src/jni/pc/rtp_transceiver.h
index 61f3e0c..e96276c 100644
--- a/sdk/android/src/jni/pc/rtp_transceiver.h
+++ b/sdk/android/src/jni/pc/rtp_transceiver.h
@@ -8,12 +8,12 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef SDK_ANDROID_SRC_JNI_PC_RTPTRANSCEIVER_H_
-#define SDK_ANDROID_SRC_JNI_PC_RTPTRANSCEIVER_H_
+#ifndef SDK_ANDROID_SRC_JNI_PC_RTP_TRANSCEIVER_H_
+#define SDK_ANDROID_SRC_JNI_PC_RTP_TRANSCEIVER_H_
#include <jni.h>
-#include "api/rtptransceiverinterface.h"
+#include "api/rtp_transceiver_interface.h"
#include "sdk/android/native_api/jni/scoped_java_ref.h"
namespace webrtc {
@@ -43,4 +43,4 @@
} // namespace jni
} // namespace webrtc
-#endif // SDK_ANDROID_SRC_JNI_PC_RTPTRANSCEIVER_H_
+#endif // SDK_ANDROID_SRC_JNI_PC_RTP_TRANSCEIVER_H_
diff --git a/sdk/android/src/jni/pc/sdp_observer.cc b/sdk/android/src/jni/pc/sdp_observer.cc
index 87989ab..47d13fa 100644
--- a/sdk/android/src/jni/pc/sdp_observer.cc
+++ b/sdk/android/src/jni/pc/sdp_observer.cc
@@ -8,11 +8,11 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "sdk/android/src/jni/pc/sdpobserver.h"
+#include "sdk/android/src/jni/pc/sdp_observer.h"
#include <utility>
-#include "api/mediaconstraintsinterface.h"
+#include "api/media_constraints_interface.h"
#include "sdk/android/generated_peerconnection_jni/jni/SdpObserver_jni.h"
#include "sdk/android/native_api/jni/java_types.h"
#include "sdk/android/src/jni/jni_helpers.h"
diff --git a/sdk/android/src/jni/pc/sdp_observer.h b/sdk/android/src/jni/pc/sdp_observer.h
index 6673fec..e23792c 100644
--- a/sdk/android/src/jni/pc/sdp_observer.h
+++ b/sdk/android/src/jni/pc/sdp_observer.h
@@ -8,15 +8,15 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef SDK_ANDROID_SRC_JNI_PC_SDPOBSERVER_H_
-#define SDK_ANDROID_SRC_JNI_PC_SDPOBSERVER_H_
+#ifndef SDK_ANDROID_SRC_JNI_PC_SDP_OBSERVER_H_
+#define SDK_ANDROID_SRC_JNI_PC_SDP_OBSERVER_H_
#include <memory>
#include <string>
-#include "api/peerconnectioninterface.h"
+#include "api/peer_connection_interface.h"
#include "sdk/android/src/jni/jni_helpers.h"
-#include "sdk/android/src/jni/pc/sessiondescription.h"
+#include "sdk/android/src/jni/pc/session_description.h"
namespace webrtc {
namespace jni {
@@ -58,4 +58,4 @@
} // namespace jni
} // namespace webrtc
-#endif // SDK_ANDROID_SRC_JNI_PC_SDPOBSERVER_H_
+#endif // SDK_ANDROID_SRC_JNI_PC_SDP_OBSERVER_H_
diff --git a/sdk/android/src/jni/pc/session_description.cc b/sdk/android/src/jni/pc/session_description.cc
index bd3806d..aa648fe 100644
--- a/sdk/android/src/jni/pc/session_description.cc
+++ b/sdk/android/src/jni/pc/session_description.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "sdk/android/src/jni/pc/sessiondescription.h"
+#include "sdk/android/src/jni/pc/session_description.h"
#include <string>
diff --git a/sdk/android/src/jni/pc/session_description.h b/sdk/android/src/jni/pc/session_description.h
index a7ef667..fe30847 100644
--- a/sdk/android/src/jni/pc/session_description.h
+++ b/sdk/android/src/jni/pc/session_description.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef SDK_ANDROID_SRC_JNI_PC_SESSIONDESCRIPTION_H_
-#define SDK_ANDROID_SRC_JNI_PC_SESSIONDESCRIPTION_H_
+#ifndef SDK_ANDROID_SRC_JNI_PC_SESSION_DESCRIPTION_H_
+#define SDK_ANDROID_SRC_JNI_PC_SESSION_DESCRIPTION_H_
#include <jni.h>
#include <memory>
@@ -31,4 +31,4 @@
} // namespace jni
} // namespace webrtc
-#endif // SDK_ANDROID_SRC_JNI_PC_SESSIONDESCRIPTION_H_
+#endif // SDK_ANDROID_SRC_JNI_PC_SESSION_DESCRIPTION_H_
diff --git a/sdk/android/src/jni/pc/ssl_certificate_verifier_wrapper.cc b/sdk/android/src/jni/pc/ssl_certificate_verifier_wrapper.cc
index 2ff9a46..0f21fd3 100644
--- a/sdk/android/src/jni/pc/ssl_certificate_verifier_wrapper.cc
+++ b/sdk/android/src/jni/pc/ssl_certificate_verifier_wrapper.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "sdk/android/src/jni/pc/sslcertificateverifierwrapper.h"
+#include "sdk/android/src/jni/pc/ssl_certificate_verifier_wrapper.h"
#include "sdk/android/generated_peerconnection_jni/jni/SSLCertificateVerifier_jni.h"
#include "sdk/android/native_api/jni/class_loader.h"
#include "sdk/android/native_api/jni/java_types.h"
diff --git a/sdk/android/src/jni/pc/ssl_certificate_verifier_wrapper.h b/sdk/android/src/jni/pc/ssl_certificate_verifier_wrapper.h
index 719fa44..8c883f4 100644
--- a/sdk/android/src/jni/pc/ssl_certificate_verifier_wrapper.h
+++ b/sdk/android/src/jni/pc/ssl_certificate_verifier_wrapper.h
@@ -8,13 +8,13 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef SDK_ANDROID_SRC_JNI_PC_SSLCERTIFICATEVERIFIERWRAPPER_H_
-#define SDK_ANDROID_SRC_JNI_PC_SSLCERTIFICATEVERIFIERWRAPPER_H_
+#ifndef SDK_ANDROID_SRC_JNI_PC_SSL_CERTIFICATE_VERIFIER_WRAPPER_H_
+#define SDK_ANDROID_SRC_JNI_PC_SSL_CERTIFICATE_VERIFIER_WRAPPER_H_
#include <jni.h>
#include <vector>
-#include "rtc_base/sslcertificate.h"
+#include "rtc_base/ssl_certificate.h"
#include "sdk/android/src/jni/jni_helpers.h"
namespace webrtc {
@@ -38,4 +38,4 @@
} // namespace jni
} // namespace webrtc
-#endif // SDK_ANDROID_SRC_JNI_PC_SSLCERTIFICATEVERIFIERWRAPPER_H_
+#endif // SDK_ANDROID_SRC_JNI_PC_SSL_CERTIFICATE_VERIFIER_WRAPPER_H_
diff --git a/sdk/android/src/jni/pc/stats_observer.cc b/sdk/android/src/jni/pc/stats_observer.cc
index f30a34c..c7534ec 100644
--- a/sdk/android/src/jni/pc/stats_observer.cc
+++ b/sdk/android/src/jni/pc/stats_observer.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "sdk/android/src/jni/pc/statsobserver.h"
+#include "sdk/android/src/jni/pc/stats_observer.h"
#include <vector>
diff --git a/sdk/android/src/jni/pc/stats_observer.h b/sdk/android/src/jni/pc/stats_observer.h
index d21fb98..0cfd433 100644
--- a/sdk/android/src/jni/pc/stats_observer.h
+++ b/sdk/android/src/jni/pc/stats_observer.h
@@ -8,10 +8,10 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef SDK_ANDROID_SRC_JNI_PC_STATSOBSERVER_H_
-#define SDK_ANDROID_SRC_JNI_PC_STATSOBSERVER_H_
+#ifndef SDK_ANDROID_SRC_JNI_PC_STATS_OBSERVER_H_
+#define SDK_ANDROID_SRC_JNI_PC_STATS_OBSERVER_H_
-#include "api/peerconnectioninterface.h"
+#include "api/peer_connection_interface.h"
#include "sdk/android/src/jni/jni_helpers.h"
namespace webrtc {
@@ -33,4 +33,4 @@
} // namespace jni
} // namespace webrtc
-#endif // SDK_ANDROID_SRC_JNI_PC_STATSOBSERVER_H_
+#endif // SDK_ANDROID_SRC_JNI_PC_STATS_OBSERVER_H_
diff --git a/sdk/android/src/jni/pc/turn_customizer.cc b/sdk/android/src/jni/pc/turn_customizer.cc
index d1432af..e756313 100644
--- a/sdk/android/src/jni/pc/turn_customizer.cc
+++ b/sdk/android/src/jni/pc/turn_customizer.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "api/turncustomizer.h"
+#include "api/turn_customizer.h"
#include "sdk/android/generated_peerconnection_jni/jni/TurnCustomizer_jni.h"
#include "sdk/android/native_api/jni/java_types.h"
#include "sdk/android/src/jni/jni_helpers.h"
diff --git a/sdk/android/src/jni/pc/turn_customizer.h b/sdk/android/src/jni/pc/turn_customizer.h
index ea69973..359234f 100644
--- a/sdk/android/src/jni/pc/turn_customizer.h
+++ b/sdk/android/src/jni/pc/turn_customizer.h
@@ -8,10 +8,10 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef SDK_ANDROID_SRC_JNI_PC_TURNCUSTOMIZER_H_
-#define SDK_ANDROID_SRC_JNI_PC_TURNCUSTOMIZER_H_
+#ifndef SDK_ANDROID_SRC_JNI_PC_TURN_CUSTOMIZER_H_
+#define SDK_ANDROID_SRC_JNI_PC_TURN_CUSTOMIZER_H_
-#include "api/turncustomizer.h"
+#include "api/turn_customizer.h"
#include "sdk/android/native_api/jni/scoped_java_ref.h"
namespace webrtc {
@@ -24,4 +24,4 @@
} // namespace jni
} // namespace webrtc
-#endif // SDK_ANDROID_SRC_JNI_PC_TURNCUSTOMIZER_H_
+#endif // SDK_ANDROID_SRC_JNI_PC_TURN_CUSTOMIZER_H_
diff --git a/sdk/android/src/jni/pc/video.cc b/sdk/android/src/jni/pc/video.cc
index c7c6e76..0d168eb 100644
--- a/sdk/android/src/jni/pc/video.cc
+++ b/sdk/android/src/jni/pc/video.cc
@@ -15,12 +15,12 @@
#include "api/video_codecs/video_decoder_factory.h"
#include "api/video_codecs/video_encoder_factory.h"
-#include "api/videosourceproxy.h"
+#include "api/video_track_source_proxy.h"
#include "rtc_base/logging.h"
#include "sdk/android/native_api/jni/java_types.h"
-#include "sdk/android/src/jni/androidvideotracksource.h"
-#include "sdk/android/src/jni/videodecoderfactorywrapper.h"
-#include "sdk/android/src/jni/videoencoderfactorywrapper.h"
+#include "sdk/android/src/jni/android_video_track_source.h"
+#include "sdk/android/src/jni/video_decoder_factory_wrapper.h"
+#include "sdk/android/src/jni/video_encoder_factory_wrapper.h"
namespace webrtc {
namespace jni {
diff --git a/sdk/android/src/jni/timestamp_aligner.cc b/sdk/android/src/jni/timestamp_aligner.cc
index 3620343..942da43 100644
--- a/sdk/android/src/jni/timestamp_aligner.cc
+++ b/sdk/android/src/jni/timestamp_aligner.cc
@@ -10,8 +10,8 @@
#include <jni.h>
-#include "rtc_base/timestampaligner.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
+#include "rtc_base/timestamp_aligner.h"
#include "sdk/android/generated_video_jni/jni/TimestampAligner_jni.h"
#include "sdk/android/src/jni/jni_helpers.h"
diff --git a/sdk/android/src/jni/video_codec_info.cc b/sdk/android/src/jni/video_codec_info.cc
index 20a641d..58b9113 100644
--- a/sdk/android/src/jni/video_codec_info.cc
+++ b/sdk/android/src/jni/video_codec_info.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "sdk/android/src/jni/videocodecinfo.h"
+#include "sdk/android/src/jni/video_codec_info.h"
#include "sdk/android/generated_video_jni/jni/VideoCodecInfo_jni.h"
#include "sdk/android/native_api/jni/java_types.h"
diff --git a/sdk/android/src/jni/video_codec_info.h b/sdk/android/src/jni/video_codec_info.h
index 2829c02..07b0730 100644
--- a/sdk/android/src/jni/video_codec_info.h
+++ b/sdk/android/src/jni/video_codec_info.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef SDK_ANDROID_SRC_JNI_VIDEOCODECINFO_H_
-#define SDK_ANDROID_SRC_JNI_VIDEOCODECINFO_H_
+#ifndef SDK_ANDROID_SRC_JNI_VIDEO_CODEC_INFO_H_
+#define SDK_ANDROID_SRC_JNI_VIDEO_CODEC_INFO_H_
#include <jni.h>
@@ -28,4 +28,4 @@
} // namespace jni
} // namespace webrtc
-#endif // SDK_ANDROID_SRC_JNI_VIDEOCODECINFO_H_
+#endif // SDK_ANDROID_SRC_JNI_VIDEO_CODEC_INFO_H_
diff --git a/sdk/android/src/jni/video_codec_status.cc b/sdk/android/src/jni/video_codec_status.cc
index b4a0a52..f8613c5 100644
--- a/sdk/android/src/jni/video_codec_status.cc
+++ b/sdk/android/src/jni/video_codec_status.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "sdk/android/src/jni/videocodecstatus.h"
+#include "sdk/android/src/jni/video_codec_status.h"
#include "sdk/android/generated_video_jni/jni/VideoCodecStatus_jni.h"
diff --git a/sdk/android/src/jni/video_codec_status.h b/sdk/android/src/jni/video_codec_status.h
index 2804654..607bd46 100644
--- a/sdk/android/src/jni/video_codec_status.h
+++ b/sdk/android/src/jni/video_codec_status.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef SDK_ANDROID_SRC_JNI_VIDEOCODECSTATUS_H_
-#define SDK_ANDROID_SRC_JNI_VIDEOCODECSTATUS_H_
+#ifndef SDK_ANDROID_SRC_JNI_VIDEO_CODEC_STATUS_H_
+#define SDK_ANDROID_SRC_JNI_VIDEO_CODEC_STATUS_H_
#include <jni.h>
#include <stdint.h>
@@ -24,4 +24,4 @@
} // namespace jni
} // namespace webrtc
-#endif // SDK_ANDROID_SRC_JNI_VIDEOCODECSTATUS_H_
+#endif // SDK_ANDROID_SRC_JNI_VIDEO_CODEC_STATUS_H_
diff --git a/sdk/android/src/jni/video_decoder_factory_wrapper.cc b/sdk/android/src/jni/video_decoder_factory_wrapper.cc
index 94b4467..792e297 100644
--- a/sdk/android/src/jni/video_decoder_factory_wrapper.cc
+++ b/sdk/android/src/jni/video_decoder_factory_wrapper.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "sdk/android/src/jni/videodecoderfactorywrapper.h"
+#include "sdk/android/src/jni/video_decoder_factory_wrapper.h"
#include "api/video_codecs/sdp_video_format.h"
#include "api/video_codecs/video_decoder.h"
@@ -16,8 +16,8 @@
#include "rtc_base/logging.h"
#include "sdk/android/generated_video_jni/jni/VideoDecoderFactory_jni.h"
#include "sdk/android/native_api/jni/java_types.h"
-#include "sdk/android/src/jni/videocodecinfo.h"
-#include "sdk/android/src/jni/videodecoderwrapper.h"
+#include "sdk/android/src/jni/video_codec_info.h"
+#include "sdk/android/src/jni/video_decoder_wrapper.h"
namespace webrtc {
namespace jni {
diff --git a/sdk/android/src/jni/video_decoder_factory_wrapper.h b/sdk/android/src/jni/video_decoder_factory_wrapper.h
index a1716b1..2122fdc 100644
--- a/sdk/android/src/jni/video_decoder_factory_wrapper.h
+++ b/sdk/android/src/jni/video_decoder_factory_wrapper.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef SDK_ANDROID_SRC_JNI_VIDEODECODERFACTORYWRAPPER_H_
-#define SDK_ANDROID_SRC_JNI_VIDEODECODERFACTORYWRAPPER_H_
+#ifndef SDK_ANDROID_SRC_JNI_VIDEO_DECODER_FACTORY_WRAPPER_H_
+#define SDK_ANDROID_SRC_JNI_VIDEO_DECODER_FACTORY_WRAPPER_H_
#include <jni.h>
@@ -38,4 +38,4 @@
} // namespace jni
} // namespace webrtc
-#endif // SDK_ANDROID_SRC_JNI_VIDEODECODERFACTORYWRAPPER_H_
+#endif // SDK_ANDROID_SRC_JNI_VIDEO_DECODER_FACTORY_WRAPPER_H_
diff --git a/sdk/android/src/jni/video_decoder_fallback.cc b/sdk/android/src/jni/video_decoder_fallback.cc
index 48cb88c..fb67ccb 100644
--- a/sdk/android/src/jni/video_decoder_fallback.cc
+++ b/sdk/android/src/jni/video_decoder_fallback.cc
@@ -13,7 +13,7 @@
#include "api/video_codecs/video_decoder_software_fallback_wrapper.h"
#include "sdk/android/generated_video_jni/jni/VideoDecoderFallback_jni.h"
#include "sdk/android/src/jni/jni_helpers.h"
-#include "sdk/android/src/jni/videodecoderwrapper.h"
+#include "sdk/android/src/jni/video_decoder_wrapper.h"
namespace webrtc {
namespace jni {
diff --git a/sdk/android/src/jni/video_decoder_wrapper.cc b/sdk/android/src/jni/video_decoder_wrapper.cc
index 6c1423c..26dc3d5 100644
--- a/sdk/android/src/jni/video_decoder_wrapper.cc
+++ b/sdk/android/src/jni/video_decoder_wrapper.cc
@@ -8,20 +8,20 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "sdk/android/src/jni/videodecoderwrapper.h"
+#include "sdk/android/src/jni/video_decoder_wrapper.h"
#include "api/video/video_frame.h"
#include "modules/video_coding/include/video_codec_interface.h"
#include "modules/video_coding/utility/vp8_header_parser.h"
#include "modules/video_coding/utility/vp9_uncompressed_header_parser.h"
#include "rtc_base/logging.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
#include "sdk/android/generated_video_jni/jni/VideoDecoderWrapper_jni.h"
#include "sdk/android/generated_video_jni/jni/VideoDecoder_jni.h"
#include "sdk/android/native_api/jni/java_types.h"
-#include "sdk/android/src/jni/encodedimage.h"
-#include "sdk/android/src/jni/videocodecstatus.h"
-#include "sdk/android/src/jni/videoframe.h"
+#include "sdk/android/src/jni/encoded_image.h"
+#include "sdk/android/src/jni/video_codec_status.h"
+#include "sdk/android/src/jni/video_frame.h"
namespace webrtc {
namespace jni {
diff --git a/sdk/android/src/jni/video_decoder_wrapper.h b/sdk/android/src/jni/video_decoder_wrapper.h
index eb2958a..55a395b 100644
--- a/sdk/android/src/jni/video_decoder_wrapper.h
+++ b/sdk/android/src/jni/video_decoder_wrapper.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef SDK_ANDROID_SRC_JNI_VIDEODECODERWRAPPER_H_
-#define SDK_ANDROID_SRC_JNI_VIDEODECODERWRAPPER_H_
+#ifndef SDK_ANDROID_SRC_JNI_VIDEO_DECODER_WRAPPER_H_
+#define SDK_ANDROID_SRC_JNI_VIDEO_DECODER_WRAPPER_H_
#include <jni.h>
#include <atomic>
@@ -120,4 +120,4 @@
} // namespace jni
} // namespace webrtc
-#endif // SDK_ANDROID_SRC_JNI_VIDEODECODERWRAPPER_H_
+#endif // SDK_ANDROID_SRC_JNI_VIDEO_DECODER_WRAPPER_H_
diff --git a/sdk/android/src/jni/video_encoder_factory_wrapper.cc b/sdk/android/src/jni/video_encoder_factory_wrapper.cc
index 4402666..83cfb82 100644
--- a/sdk/android/src/jni/video_encoder_factory_wrapper.cc
+++ b/sdk/android/src/jni/video_encoder_factory_wrapper.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "sdk/android/src/jni/videoencoderfactorywrapper.h"
+#include "sdk/android/src/jni/video_encoder_factory_wrapper.h"
#include "api/video_codecs/video_encoder.h"
#include "common_types.h" // NOLINT(build/include)
@@ -16,8 +16,8 @@
#include "sdk/android/generated_video_jni/jni/VideoEncoderFactory_jni.h"
#include "sdk/android/native_api/jni/class_loader.h"
#include "sdk/android/native_api/jni/java_types.h"
-#include "sdk/android/src/jni/videocodecinfo.h"
-#include "sdk/android/src/jni/videoencoderwrapper.h"
+#include "sdk/android/src/jni/video_codec_info.h"
+#include "sdk/android/src/jni/video_encoder_wrapper.h"
namespace webrtc {
namespace jni {
diff --git a/sdk/android/src/jni/video_encoder_factory_wrapper.h b/sdk/android/src/jni/video_encoder_factory_wrapper.h
index 2c2dadc..0650c12 100644
--- a/sdk/android/src/jni/video_encoder_factory_wrapper.h
+++ b/sdk/android/src/jni/video_encoder_factory_wrapper.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef SDK_ANDROID_SRC_JNI_VIDEOENCODERFACTORYWRAPPER_H_
-#define SDK_ANDROID_SRC_JNI_VIDEOENCODERFACTORYWRAPPER_H_
+#ifndef SDK_ANDROID_SRC_JNI_VIDEO_ENCODER_FACTORY_WRAPPER_H_
+#define SDK_ANDROID_SRC_JNI_VIDEO_ENCODER_FACTORY_WRAPPER_H_
#include <jni.h>
#include <vector>
@@ -45,4 +45,4 @@
} // namespace jni
} // namespace webrtc
-#endif // SDK_ANDROID_SRC_JNI_VIDEOENCODERFACTORYWRAPPER_H_
+#endif // SDK_ANDROID_SRC_JNI_VIDEO_ENCODER_FACTORY_WRAPPER_H_
diff --git a/sdk/android/src/jni/video_encoder_fallback.cc b/sdk/android/src/jni/video_encoder_fallback.cc
index 6948ee0..af9863c 100644
--- a/sdk/android/src/jni/video_encoder_fallback.cc
+++ b/sdk/android/src/jni/video_encoder_fallback.cc
@@ -13,7 +13,7 @@
#include "api/video_codecs/video_encoder_software_fallback_wrapper.h"
#include "sdk/android/generated_video_jni/jni/VideoEncoderFallback_jni.h"
#include "sdk/android/src/jni/jni_helpers.h"
-#include "sdk/android/src/jni/videoencoderwrapper.h"
+#include "sdk/android/src/jni/video_encoder_wrapper.h"
namespace webrtc {
namespace jni {
diff --git a/sdk/android/src/jni/video_encoder_wrapper.cc b/sdk/android/src/jni/video_encoder_wrapper.cc
index 2706e66..5d34cf7 100644
--- a/sdk/android/src/jni/video_encoder_wrapper.cc
+++ b/sdk/android/src/jni/video_encoder_wrapper.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "sdk/android/src/jni/videoencoderwrapper.h"
+#include "sdk/android/src/jni/video_encoder_wrapper.h"
#include <utility>
@@ -18,13 +18,13 @@
#include "modules/video_coding/utility/vp8_header_parser.h"
#include "modules/video_coding/utility/vp9_uncompressed_header_parser.h"
#include "rtc_base/logging.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
#include "sdk/android/generated_video_jni/jni/VideoEncoderWrapper_jni.h"
#include "sdk/android/generated_video_jni/jni/VideoEncoder_jni.h"
#include "sdk/android/native_api/jni/class_loader.h"
#include "sdk/android/native_api/jni/java_types.h"
-#include "sdk/android/src/jni/encodedimage.h"
-#include "sdk/android/src/jni/videocodecstatus.h"
+#include "sdk/android/src/jni/encoded_image.h"
+#include "sdk/android/src/jni/video_codec_status.h"
namespace webrtc {
namespace jni {
diff --git a/sdk/android/src/jni/video_encoder_wrapper.h b/sdk/android/src/jni/video_encoder_wrapper.h
index 3618f78..0d2a9b6 100644
--- a/sdk/android/src/jni/video_encoder_wrapper.h
+++ b/sdk/android/src/jni/video_encoder_wrapper.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef SDK_ANDROID_SRC_JNI_VIDEOENCODERWRAPPER_H_
-#define SDK_ANDROID_SRC_JNI_VIDEOENCODERWRAPPER_H_
+#ifndef SDK_ANDROID_SRC_JNI_VIDEO_ENCODER_WRAPPER_H_
+#define SDK_ANDROID_SRC_JNI_VIDEO_ENCODER_WRAPPER_H_
#include <jni.h>
#include <deque>
@@ -21,7 +21,7 @@
#include "modules/video_coding/codecs/vp9/include/vp9_globals.h"
#include "rtc_base/task_queue.h"
#include "sdk/android/src/jni/jni_helpers.h"
-#include "sdk/android/src/jni/videoframe.h"
+#include "sdk/android/src/jni/video_frame.h"
namespace webrtc {
namespace jni {
@@ -119,4 +119,4 @@
} // namespace jni
} // namespace webrtc
-#endif // SDK_ANDROID_SRC_JNI_VIDEOENCODERWRAPPER_H_
+#endif // SDK_ANDROID_SRC_JNI_VIDEO_ENCODER_WRAPPER_H_
diff --git a/sdk/android/src/jni/video_frame.cc b/sdk/android/src/jni/video_frame.cc
index 1d52433..d196b03 100644
--- a/sdk/android/src/jni/video_frame.cc
+++ b/sdk/android/src/jni/video_frame.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "sdk/android/src/jni/videoframe.h"
+#include "sdk/android/src/jni/video_frame.h"
#include <memory>
@@ -18,7 +18,7 @@
#include "rtc_base/keep_ref_until_done.h"
#include "rtc_base/logging.h"
#include "rtc_base/scoped_ref_ptr.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
#include "sdk/android/generated_video_jni/jni/VideoFrame_jni.h"
#include "sdk/android/src/jni/jni_helpers.h"
#include "sdk/android/src/jni/wrapped_native_i420_buffer.h"
diff --git a/sdk/android/src/jni/video_frame.h b/sdk/android/src/jni/video_frame.h
index 107e03e..f6b569a 100644
--- a/sdk/android/src/jni/video_frame.h
+++ b/sdk/android/src/jni/video_frame.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef SDK_ANDROID_SRC_JNI_VIDEOFRAME_H_
-#define SDK_ANDROID_SRC_JNI_VIDEOFRAME_H_
+#ifndef SDK_ANDROID_SRC_JNI_VIDEO_FRAME_H_
+#define SDK_ANDROID_SRC_JNI_VIDEO_FRAME_H_
#include <jni.h>
@@ -84,4 +84,4 @@
} // namespace jni
} // namespace webrtc
-#endif // SDK_ANDROID_SRC_JNI_VIDEOFRAME_H_
+#endif // SDK_ANDROID_SRC_JNI_VIDEO_FRAME_H_
diff --git a/sdk/android/src/jni/video_sink.cc b/sdk/android/src/jni/video_sink.cc
index bbdda31..6ffba9c 100644
--- a/sdk/android/src/jni/video_sink.cc
+++ b/sdk/android/src/jni/video_sink.cc
@@ -8,10 +8,10 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "sdk/android/src/jni/videosink.h"
+#include "sdk/android/src/jni/video_sink.h"
#include "sdk/android/generated_video_jni/jni/VideoSink_jni.h"
-#include "sdk/android/src/jni/videoframe.h"
+#include "sdk/android/src/jni/video_frame.h"
namespace webrtc {
namespace jni {
diff --git a/sdk/android/src/jni/video_sink.h b/sdk/android/src/jni/video_sink.h
index 7efe444..f165454 100644
--- a/sdk/android/src/jni/video_sink.h
+++ b/sdk/android/src/jni/video_sink.h
@@ -8,12 +8,12 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef SDK_ANDROID_SRC_JNI_VIDEOSINK_H_
-#define SDK_ANDROID_SRC_JNI_VIDEOSINK_H_
+#ifndef SDK_ANDROID_SRC_JNI_VIDEO_SINK_H_
+#define SDK_ANDROID_SRC_JNI_VIDEO_SINK_H_
#include <jni.h>
-#include "api/mediastreaminterface.h"
+#include "api/media_stream_interface.h"
#include "sdk/android/src/jni/jni_helpers.h"
namespace webrtc {
@@ -33,4 +33,4 @@
} // namespace jni
} // namespace webrtc
-#endif // SDK_ANDROID_SRC_JNI_VIDEOSINK_H_
+#endif // SDK_ANDROID_SRC_JNI_VIDEO_SINK_H_
diff --git a/sdk/android/src/jni/video_source.cc b/sdk/android/src/jni/video_source.cc
index 54f03c1..c95c599 100644
--- a/sdk/android/src/jni/video_source.cc
+++ b/sdk/android/src/jni/video_source.cc
@@ -8,11 +8,11 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "api/videosourceproxy.h"
+#include "api/video_track_source_proxy.h"
#include "rtc_base/logging.h"
#include "sdk/android/generated_video_jni/jni/VideoSource_jni.h"
#include "sdk/android/native_api/jni/java_types.h"
-#include "sdk/android/src/jni/androidvideotracksource.h"
+#include "sdk/android/src/jni/android_video_track_source.h"
namespace webrtc {
namespace jni {
diff --git a/sdk/android/src/jni/video_track.cc b/sdk/android/src/jni/video_track.cc
index c42a4e6..b3b1278 100644
--- a/sdk/android/src/jni/video_track.cc
+++ b/sdk/android/src/jni/video_track.cc
@@ -10,10 +10,10 @@
#include <jni.h>
-#include "api/mediastreaminterface.h"
+#include "api/media_stream_interface.h"
#include "sdk/android/generated_video_jni/jni/VideoTrack_jni.h"
#include "sdk/android/src/jni/jni_helpers.h"
-#include "sdk/android/src/jni/videosink.h"
+#include "sdk/android/src/jni/video_sink.h"
namespace webrtc {
namespace jni {