diff --git a/api/BUILD.gn b/api/BUILD.gn index bc3d649e70..aeb03e514c 100644 --- a/api/BUILD.gn +++ b/api/BUILD.gn @@ -40,7 +40,7 @@ rtc_source_set("call_api") { rtc_source_set("callfactory_api") { visibility = [ "*" ] sources = [ - "call/callfactoryinterface.h", + "call/call_factory_interface.h", ] } @@ -77,59 +77,59 @@ rtc_static_library("libjingle_peerconnection_api") { visibility = [ "*" ] cflags = [] sources = [ - "asyncresolverfactory.h", + "async_resolver_factory.h", "bitrate_constraints.h", "candidate.cc", "candidate.h", - "crypto/cryptooptions.cc", - "crypto/cryptooptions.h", - "crypto/framedecryptorinterface.h", - "crypto/frameencryptorinterface.h", - "cryptoparams.h", - "datachannelinterface.cc", - "datachannelinterface.h", - "dtlstransportinterface.h", - "dtmfsenderinterface.h", + "crypto/crypto_options.cc", + "crypto/crypto_options.h", + "crypto/frame_decryptor_interface.h", + "crypto/frame_encryptor_interface.h", + "crypto_params.h", + "data_channel_interface.cc", + "data_channel_interface.h", + "dtls_transport_interface.h", + "dtmf_sender_interface.h", "jsep.cc", "jsep.h", - "jsepicecandidate.cc", - "jsepicecandidate.h", - "jsepsessiondescription.h", + "jsep_ice_candidate.cc", + "jsep_ice_candidate.h", + "jsep_session_description.h", + "media_constraints_interface.cc", + "media_constraints_interface.h", + "media_stream_interface.cc", + "media_stream_interface.h", + "media_stream_proxy.h", + "media_stream_track_proxy.h", "media_transport_interface.cc", "media_transport_interface.h", - "mediaconstraintsinterface.cc", - "mediaconstraintsinterface.h", - "mediastreaminterface.cc", - "mediastreaminterface.h", - "mediastreamproxy.h", - "mediastreamtrackproxy.h", - "mediatypes.cc", - "mediatypes.h", + "media_types.cc", + "media_types.h", "notifier.h", - "peerconnectionfactoryproxy.h", - "peerconnectioninterface.cc", - "peerconnectioninterface.h", - "peerconnectionproxy.h", + "peer_connection_factory_proxy.h", + "peer_connection_interface.cc", + "peer_connection_interface.h", + "peer_connection_proxy.h", "proxy.cc", "proxy.h", - "rtcerror.cc", - "rtcerror.h", + "rtc_error.cc", + "rtc_error.h", "rtp_headers.cc", "rtp_headers.h", - "rtpparameters.cc", - "rtpparameters.h", - "rtpreceiverinterface.cc", - "rtpreceiverinterface.h", - "rtpsenderinterface.cc", - "rtpsenderinterface.h", - "rtptransceiverinterface.cc", - "rtptransceiverinterface.h", - "setremotedescriptionobserverinterface.h", - "statstypes.cc", - "statstypes.h", - "turncustomizer.h", - "umametrics.h", - "videosourceproxy.h", + "rtp_parameters.cc", + "rtp_parameters.h", + "rtp_receiver_interface.cc", + "rtp_receiver_interface.h", + "rtp_sender_interface.cc", + "rtp_sender_interface.h", + "rtp_transceiver_interface.cc", + "rtp_transceiver_interface.h", + "set_remote_description_observer_interface.h", + "stats_types.cc", + "stats_types.h", + "turn_customizer.h", + "uma_metrics.h", + "video_track_source_proxy.h", ] deps = [ ":array_view", @@ -240,16 +240,16 @@ if (rtc_include_tests) { rtc_source_set("libjingle_logging_api") { visibility = [ "*" ] sources = [ - "rtceventlogoutput.h", + "rtc_event_log_output.h", ] } rtc_source_set("ortc_api") { visibility = [ "*" ] sources = [ - "ortc/packettransportinterface.h", - "ortc/rtptransportinterface.h", - "ortc/srtptransportinterface.h", + "ortc/packet_transport_interface.h", + "ortc/rtp_transport_interface.h", + "ortc/srtp_transport_interface.h", ] deps = [ @@ -262,10 +262,10 @@ rtc_source_set("rtc_stats_api") { visibility = [ "*" ] cflags = [] sources = [ - "stats/rtcstats.h", + "stats/rtc_stats.h", + "stats/rtc_stats_collector_callback.h", + "stats/rtc_stats_report.h", "stats/rtcstats_objects.h", - "stats/rtcstatscollectorcallback.h", - "stats/rtcstatsreport.h", ] deps = [ @@ -346,7 +346,7 @@ rtc_source_set("array_view") { rtc_source_set("refcountedbase") { visibility = [ "*" ] sources = [ - "refcountedbase.h", + "ref_counted_base.h", ] deps = [ "../rtc_base:rtc_base_approved", @@ -357,7 +357,7 @@ rtc_source_set("libjingle_peerconnection_test_api") { visibility = [ "*" ] testonly = true sources = [ - "test/fakeconstraints.h", + "test/fake_constraints.h", ] deps = [ @@ -666,8 +666,8 @@ if (rtc_include_tests) { sources = [ "array_view_unittest.cc", - "rtcerror_unittest.cc", - "rtpparameters_unittest.cc", + "rtc_error_unittest.cc", + "rtp_parameters_unittest.cc", "test/loopback_media_transport_unittest.cc", ] diff --git a/api/DEPS b/api/DEPS index 82885d4321..37d0e9b3ae 100644 --- a/api/DEPS +++ b/api/DEPS @@ -57,13 +57,13 @@ specific_include_rules = { "+modules/audio_coding/codecs/opus/audio_encoder_opus.h", ], - "asyncresolverfactory\.h": [ - "+rtc_base/asyncresolverinterface.h", + "async_resolver_factory\.h": [ + "+rtc_base/async_resolver_interface.h", ], "candidate\.h": [ "+rtc_base/network_constants.h", - "+rtc_base/socketaddress.h", + "+rtc_base/socket_address.h", ], "create_peerconnection_factory\.h": [ @@ -71,17 +71,17 @@ specific_include_rules = { "+rtc_base/scoped_ref_ptr.h", ], - "datachannelinterface\.h": [ - "+rtc_base/copyonwritebuffer.h", - "+rtc_base/refcount.h", + "data_channel_interface\.h": [ + "+rtc_base/copy_on_write_buffer.h", + "+rtc_base/ref_count.h", ], - "dtlstransportinterface\.h": [ - "+rtc_base/refcount.h", + "dtls_transport_interface\.h": [ + "+rtc_base/ref_count.h", ], - "dtmfsenderinterface\.h": [ - "+rtc_base/refcount.h", + "dtmf_sender_interface\.h": [ + "+rtc_base/ref_count.h", ], "fec_controller\.h": [ @@ -89,118 +89,118 @@ specific_include_rules = { ], "jsep\.h": [ - "+rtc_base/refcount.h", + "+rtc_base/ref_count.h", ], - "jsepicecandidate\.h": [ - "+rtc_base/constructormagic.h", + "jsep_ice_candidate\.h": [ + "+rtc_base/constructor_magic.h", ], - "jsepsessiondescription\.h": [ - "+rtc_base/constructormagic.h", + "jsep_session_description\.h": [ + "+rtc_base/constructor_magic.h", ], - "mediastreaminterface\.h": [ + "media_stream_interface\.h": [ "+modules/audio_processing/include/audio_processing_statistics.h", - "+rtc_base/refcount.h", + "+rtc_base/ref_count.h", "+rtc_base/scoped_ref_ptr.h", ], "media_transport_interface\.h": [ - "+rtc_base/copyonwritebuffer.h", # As used by datachannelinterface.h - "+rtc_base/networkroute.h", + "+rtc_base/copy_on_write_buffer.h", # As used by datachannelinterface.h + "+rtc_base/network_route.h", "+rtc_base/deprecation.h", ], - "peerconnectionfactoryproxy\.h": [ + "peer_connection_factory_proxy\.h": [ "+rtc_base/bind.h", ], - "peerconnectioninterface\.h": [ + "peer_connection_interface\.h": [ "+logging/rtc_event_log/rtc_event_log_factory_interface.h", - "+media/base/mediaconfig.h", - "+media/base/videocapturer.h", - "+media/base/mediaengine.h", - "+p2p/base/portallocator.h", - "+rtc_base/bitrateallocationstrategy.h", + "+media/base/media_config.h", + "+media/base/video_capturer.h", + "+media/base/media_engine.h", + "+p2p/base/port_allocator.h", + "+rtc_base/bitrate_allocation_strategy.h", "+rtc_base/network.h", "+rtc_base/platform_file.h", - "+rtc_base/rtccertificate.h", - "+rtc_base/rtccertificategenerator.h", - "+rtc_base/socketaddress.h", - "+rtc_base/sslcertificate.h", - "+rtc_base/sslstreamadapter.h", + "+rtc_base/rtc_certificate.h", + "+rtc_base/rtc_certificate_generator.h", + "+rtc_base/socket_address.h", + "+rtc_base/ssl_certificate.h", + "+rtc_base/ssl_stream_adapter.h", ], "proxy\.h": [ "+rtc_base/event.h", - "+rtc_base/messagehandler.h", # Inherits from it. - "+rtc_base/messagequeue.h", # Inherits from MessageData. - "+rtc_base/refcountedobject.h", + "+rtc_base/message_handler.h", # Inherits from it. + "+rtc_base/message_queue.h", # Inherits from MessageData. + "+rtc_base/ref_counted_object.h", "+rtc_base/scoped_ref_ptr.h", "+rtc_base/thread.h", ], - "refcountedbase\.h": [ - "+rtc_base/constructormagic.h", - "+rtc_base/refcount.h", - "+rtc_base/refcounter.h", + "ref_counted_base\.h": [ + "+rtc_base/constructor_magic.h", + "+rtc_base/ref_count.h", + "+rtc_base/ref_counter.h", ], - "rtcerror\.h": [ + "rtc_error\.h": [ "+rtc_base/logging.h", ], - "rtpreceiverinterface\.h": [ - "+rtc_base/refcount.h", + "rtp_receiver_interface\.h": [ + "+rtc_base/ref_count.h", "+rtc_base/scoped_ref_ptr.h", ], - "rtpsenderinterface\.h": [ - "+rtc_base/refcount.h", + "rtp_sender_interface\.h": [ + "+rtc_base/ref_count.h", "+rtc_base/scoped_ref_ptr.h", ], - "rtptransceiverinterface\.h": [ - "+rtc_base/refcount.h", + "rtp_transceiver_interface\.h": [ + "+rtc_base/ref_count.h", "+rtc_base/scoped_ref_ptr.h", ], - "setremotedescriptionobserverinterface\.h": [ - "+rtc_base/refcount.h", + "set_remote_description_observer_interface\.h": [ + "+rtc_base/ref_count.h", ], - "statstypes\.h": [ - "+rtc_base/constructormagic.h", - "+rtc_base/refcount.h", + "stats_types\.h": [ + "+rtc_base/constructor_magic.h", + "+rtc_base/ref_count.h", "+rtc_base/scoped_ref_ptr.h", - "+rtc_base/stringencode.h", + "+rtc_base/string_encode.h", "+rtc_base/thread_checker.h", ], - "umametrics\.h": [ - "+rtc_base/refcount.h", + "uma_metrics\.h": [ + "+rtc_base/ref_count.h", ], "audio_frame\.h": [ - "+rtc_base/constructormagic.h", + "+rtc_base/constructor_magic.h", ], "audio_mixer\.h": [ - "+rtc_base/refcount.h", + "+rtc_base/ref_count.h", ], "audio_decoder\.h": [ "+rtc_base/buffer.h", - "+rtc_base/constructormagic.h", + "+rtc_base/constructor_magic.h", ], "audio_decoder_factory\.h": [ - "+rtc_base/refcount.h", + "+rtc_base/ref_count.h", ], "audio_decoder_factory_template\.h": [ - "+rtc_base/refcountedobject.h", + "+rtc_base/ref_counted_object.h", "+rtc_base/scoped_ref_ptr.h", ], @@ -210,11 +210,11 @@ specific_include_rules = { ], "audio_encoder_factory\.h": [ - "+rtc_base/refcount.h", + "+rtc_base/ref_count.h", ], "audio_encoder_factory_template\.h": [ - "+rtc_base/refcountedobject.h", + "+rtc_base/ref_counted_object.h", "+rtc_base/scoped_ref_ptr.h", ], @@ -226,22 +226,22 @@ specific_include_rules = { "+rtc_base/scoped_ref_ptr.h", ], - "framedecryptorinterface\.h": [ - "+rtc_base/refcount.h", + "frame_decryptor_interface\.h": [ + "+rtc_base/ref_count.h", ], - "frameencryptorinterface\.h": [ - "+rtc_base/refcount.h", + "frame_encryptor_interface\.h": [ + "+rtc_base/ref_count.h", ], - "rtcstatscollectorcallback\.h": [ - "+rtc_base/refcount.h", + "rtc_stats_collector_callback\.h": [ + "+rtc_base/ref_count.h", "+rtc_base/scoped_ref_ptr.h", ], - "rtcstatsreport\.h": [ - "+rtc_base/refcount.h", - "+rtc_base/refcountedobject.h", + "rtc_stats_report\.h": [ + "+rtc_base/ref_count.h", + "+rtc_base/ref_counted_object.h", "+rtc_base/scoped_ref_ptr.h", ], @@ -250,11 +250,11 @@ specific_include_rules = { ], "fake_frame_decryptor\.h": [ - "+rtc_base/refcountedobject.h", + "+rtc_base/ref_counted_object.h", ], "fake_frame_encryptor\.h": [ - "+rtc_base/refcountedobject.h", + "+rtc_base/ref_counted_object.h", ], "mock.*\.h": [ @@ -262,7 +262,7 @@ specific_include_rules = { ], "simulated_network\.h": [ - "+rtc_base/criticalsection.h", + "+rtc_base/critical_section.h", "+rtc_base/random.h", "+rtc_base/thread_annotations.h", ], @@ -280,7 +280,7 @@ specific_include_rules = { ], "video_encoder_config\.h": [ - "+rtc_base/refcount.h", + "+rtc_base/ref_count.h", "+rtc_base/scoped_ref_ptr.h", ], diff --git a/api/async_resolver_factory.h b/api/async_resolver_factory.h index 96abee45ec..93d3f7934b 100644 --- a/api/async_resolver_factory.h +++ b/api/async_resolver_factory.h @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef API_ASYNCRESOLVERFACTORY_H_ -#define API_ASYNCRESOLVERFACTORY_H_ +#ifndef API_ASYNC_RESOLVER_FACTORY_H_ +#define API_ASYNC_RESOLVER_FACTORY_H_ -#include "rtc_base/asyncresolverinterface.h" +#include "rtc_base/async_resolver_interface.h" namespace webrtc { @@ -29,4 +29,4 @@ class AsyncResolverFactory { } // namespace webrtc -#endif // API_ASYNCRESOLVERFACTORY_H_ +#endif // API_ASYNC_RESOLVER_FACTORY_H_ diff --git a/api/audio/audio_frame.cc b/api/audio/audio_frame.cc index 75d30b0ba2..1e706b96fd 100644 --- a/api/audio/audio_frame.cc +++ b/api/audio/audio_frame.cc @@ -13,7 +13,7 @@ #include #include "rtc_base/checks.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/time_utils.h" namespace webrtc { diff --git a/api/audio/audio_frame.h b/api/audio/audio_frame.h index dd6ac021a7..8f1dc62a17 100644 --- a/api/audio/audio_frame.h +++ b/api/audio/audio_frame.h @@ -14,7 +14,7 @@ #include #include -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace webrtc { diff --git a/api/audio/audio_mixer.h b/api/audio/audio_mixer.h index 14eefc173b..b290cfacf0 100644 --- a/api/audio/audio_mixer.h +++ b/api/audio/audio_mixer.h @@ -14,7 +14,7 @@ #include #include "api/audio/audio_frame.h" -#include "rtc_base/refcount.h" +#include "rtc_base/ref_count.h" namespace webrtc { diff --git a/api/audio_codecs/audio_decoder.h b/api/audio_codecs/audio_decoder.h index 684266a48d..e4e5e1eff4 100644 --- a/api/audio_codecs/audio_decoder.h +++ b/api/audio_codecs/audio_decoder.h @@ -19,7 +19,7 @@ #include "absl/types/optional.h" #include "api/array_view.h" #include "rtc_base/buffer.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace webrtc { diff --git a/api/audio_codecs/audio_decoder_factory.h b/api/audio_codecs/audio_decoder_factory.h index 3d80958338..c36a0e103b 100644 --- a/api/audio_codecs/audio_decoder_factory.h +++ b/api/audio_codecs/audio_decoder_factory.h @@ -18,7 +18,7 @@ #include "api/audio_codecs/audio_codec_pair_id.h" #include "api/audio_codecs/audio_decoder.h" #include "api/audio_codecs/audio_format.h" -#include "rtc_base/refcount.h" +#include "rtc_base/ref_count.h" namespace webrtc { diff --git a/api/audio_codecs/audio_decoder_factory_template.h b/api/audio_codecs/audio_decoder_factory_template.h index 22bb7de472..e7f1443b95 100644 --- a/api/audio_codecs/audio_decoder_factory_template.h +++ b/api/audio_codecs/audio_decoder_factory_template.h @@ -15,7 +15,7 @@ #include #include "api/audio_codecs/audio_decoder_factory.h" -#include "rtc_base/refcountedobject.h" +#include "rtc_base/ref_counted_object.h" #include "rtc_base/scoped_ref_ptr.h" namespace webrtc { diff --git a/api/audio_codecs/audio_encoder_factory.h b/api/audio_codecs/audio_encoder_factory.h index a5fd561b6c..48995a876d 100644 --- a/api/audio_codecs/audio_encoder_factory.h +++ b/api/audio_codecs/audio_encoder_factory.h @@ -18,7 +18,7 @@ #include "api/audio_codecs/audio_codec_pair_id.h" #include "api/audio_codecs/audio_encoder.h" #include "api/audio_codecs/audio_format.h" -#include "rtc_base/refcount.h" +#include "rtc_base/ref_count.h" namespace webrtc { diff --git a/api/audio_codecs/audio_encoder_factory_template.h b/api/audio_codecs/audio_encoder_factory_template.h index 2088619019..01a6a74aa6 100644 --- a/api/audio_codecs/audio_encoder_factory_template.h +++ b/api/audio_codecs/audio_encoder_factory_template.h @@ -15,7 +15,7 @@ #include #include "api/audio_codecs/audio_encoder_factory.h" -#include "rtc_base/refcountedobject.h" +#include "rtc_base/ref_counted_object.h" #include "rtc_base/scoped_ref_ptr.h" namespace webrtc { diff --git a/api/call/call_factory_interface.h b/api/call/call_factory_interface.h index a7f32453c6..c3d5b41a9c 100644 --- a/api/call/call_factory_interface.h +++ b/api/call/call_factory_interface.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef API_CALL_CALLFACTORYINTERFACE_H_ -#define API_CALL_CALLFACTORYINTERFACE_H_ +#ifndef API_CALL_CALL_FACTORY_INTERFACE_H_ +#define API_CALL_CALL_FACTORY_INTERFACE_H_ #include @@ -33,4 +33,4 @@ std::unique_ptr CreateCallFactory(); } // namespace webrtc -#endif // API_CALL_CALLFACTORYINTERFACE_H_ +#endif // API_CALL_CALL_FACTORY_INTERFACE_H_ diff --git a/api/candidate.cc b/api/candidate.cc index 5637566f6a..c857f89c3c 100644 --- a/api/candidate.cc +++ b/api/candidate.cc @@ -11,7 +11,7 @@ #include "api/candidate.h" #include "rtc_base/helpers.h" -#include "rtc_base/ipaddress.h" +#include "rtc_base/ip_address.h" #include "rtc_base/strings/string_builder.h" namespace cricket { diff --git a/api/candidate.h b/api/candidate.h index 02b4bca82b..745205575b 100644 --- a/api/candidate.h +++ b/api/candidate.h @@ -19,7 +19,7 @@ #include "rtc_base/checks.h" #include "rtc_base/network_constants.h" -#include "rtc_base/socketaddress.h" +#include "rtc_base/socket_address.h" #include "rtc_base/system/rtc_export.h" namespace cricket { diff --git a/api/create_peerconnection_factory.cc b/api/create_peerconnection_factory.cc index d714dfed06..3e1566e51a 100644 --- a/api/create_peerconnection_factory.cc +++ b/api/create_peerconnection_factory.cc @@ -16,16 +16,16 @@ #include "api/audio/audio_mixer.h" #include "api/audio_codecs/audio_decoder_factory.h" #include "api/audio_codecs/audio_encoder_factory.h" -#include "api/call/callfactoryinterface.h" +#include "api/call/call_factory_interface.h" #include "api/fec_controller.h" -#include "api/peerconnectioninterface.h" +#include "api/peer_connection_interface.h" #include "api/transport/network_control.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 "logging/rtc_event_log/rtc_event_log_factory_interface.h" -#include "media/base/mediaengine.h" -#include "media/engine/webrtcmediaengine.h" +#include "media/base/media_engine.h" +#include "media/engine/webrtc_media_engine.h" #include "modules/audio_device/include/audio_device.h" #include "modules/audio_processing/include/audio_processing.h" #include "rtc_base/scoped_ref_ptr.h" diff --git a/api/create_peerconnection_factory.h b/api/create_peerconnection_factory.h index 063de1831f..c3729d2db8 100644 --- a/api/create_peerconnection_factory.h +++ b/api/create_peerconnection_factory.h @@ -17,7 +17,7 @@ #include "api/audio_codecs/audio_decoder_factory.h" #include "api/audio_codecs/audio_encoder_factory.h" #include "api/fec_controller.h" -#include "api/peerconnectioninterface.h" +#include "api/peer_connection_interface.h" #include "api/transport/network_control.h" #include "rtc_base/deprecation.h" #include "rtc_base/scoped_ref_ptr.h" diff --git a/api/crypto/crypto_options.cc b/api/crypto/crypto_options.cc index 7f34f19b53..9a3de2c9a2 100644 --- a/api/crypto/crypto_options.cc +++ b/api/crypto/crypto_options.cc @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "api/crypto/cryptooptions.h" -#include "rtc_base/sslstreamadapter.h" +#include "api/crypto/crypto_options.h" +#include "rtc_base/ssl_stream_adapter.h" namespace webrtc { diff --git a/api/crypto/crypto_options.h b/api/crypto/crypto_options.h index e730ab2089..f0b91d0774 100644 --- a/api/crypto/crypto_options.h +++ b/api/crypto/crypto_options.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef API_CRYPTO_CRYPTOOPTIONS_H_ -#define API_CRYPTO_CRYPTOOPTIONS_H_ +#ifndef API_CRYPTO_CRYPTO_OPTIONS_H_ +#define API_CRYPTO_CRYPTO_OPTIONS_H_ #include @@ -63,4 +63,4 @@ struct CryptoOptions { } // namespace webrtc -#endif // API_CRYPTO_CRYPTOOPTIONS_H_ +#endif // API_CRYPTO_CRYPTO_OPTIONS_H_ diff --git a/api/crypto/frame_decryptor_interface.h b/api/crypto/frame_decryptor_interface.h index 587df47c66..400e0569f6 100644 --- a/api/crypto/frame_decryptor_interface.h +++ b/api/crypto/frame_decryptor_interface.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef API_CRYPTO_FRAMEDECRYPTORINTERFACE_H_ -#define API_CRYPTO_FRAMEDECRYPTORINTERFACE_H_ +#ifndef API_CRYPTO_FRAME_DECRYPTOR_INTERFACE_H_ +#define API_CRYPTO_FRAME_DECRYPTOR_INTERFACE_H_ #include #include "api/array_view.h" -#include "api/mediatypes.h" -#include "rtc_base/refcount.h" +#include "api/media_types.h" +#include "rtc_base/ref_count.h" namespace webrtc { @@ -56,4 +56,4 @@ class FrameDecryptorInterface : public rtc::RefCountInterface { } // namespace webrtc -#endif // API_CRYPTO_FRAMEDECRYPTORINTERFACE_H_ +#endif // API_CRYPTO_FRAME_DECRYPTOR_INTERFACE_H_ diff --git a/api/crypto/frame_encryptor_interface.h b/api/crypto/frame_encryptor_interface.h index 72bc04beb0..d5b6d8a2d5 100644 --- a/api/crypto/frame_encryptor_interface.h +++ b/api/crypto/frame_encryptor_interface.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef API_CRYPTO_FRAMEENCRYPTORINTERFACE_H_ -#define API_CRYPTO_FRAMEENCRYPTORINTERFACE_H_ +#ifndef API_CRYPTO_FRAME_ENCRYPTOR_INTERFACE_H_ +#define API_CRYPTO_FRAME_ENCRYPTOR_INTERFACE_H_ #include "api/array_view.h" -#include "api/mediatypes.h" -#include "rtc_base/refcount.h" +#include "api/media_types.h" +#include "rtc_base/ref_count.h" namespace webrtc { @@ -52,4 +52,4 @@ class FrameEncryptorInterface : public rtc::RefCountInterface { } // namespace webrtc -#endif // API_CRYPTO_FRAMEENCRYPTORINTERFACE_H_ +#endif // API_CRYPTO_FRAME_ENCRYPTOR_INTERFACE_H_ diff --git a/api/crypto_params.h b/api/crypto_params.h index abe9055462..5da352cbef 100644 --- a/api/crypto_params.h +++ b/api/crypto_params.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef API_CRYPTOPARAMS_H_ -#define API_CRYPTOPARAMS_H_ +#ifndef API_CRYPTO_PARAMS_H_ +#define API_CRYPTO_PARAMS_H_ #include @@ -38,4 +38,4 @@ struct CryptoParams { } // namespace cricket -#endif // API_CRYPTOPARAMS_H_ +#endif // API_CRYPTO_PARAMS_H_ diff --git a/api/data_channel_interface.cc b/api/data_channel_interface.cc index 141462d907..240ccbe7a2 100644 --- a/api/data_channel_interface.cc +++ b/api/data_channel_interface.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "api/datachannelinterface.h" +#include "api/data_channel_interface.h" namespace webrtc { diff --git a/api/data_channel_interface.h b/api/data_channel_interface.h index 7cb5582233..91a9804003 100644 --- a/api/data_channel_interface.h +++ b/api/data_channel_interface.h @@ -11,16 +11,16 @@ // This file contains interfaces for DataChannels // http://dev.w3.org/2011/webrtc/editor/webrtc.html#rtcdatachannel -#ifndef API_DATACHANNELINTERFACE_H_ -#define API_DATACHANNELINTERFACE_H_ +#ifndef API_DATA_CHANNEL_INTERFACE_H_ +#define API_DATA_CHANNEL_INTERFACE_H_ #include #include #include #include "rtc_base/checks.h" -#include "rtc_base/copyonwritebuffer.h" -#include "rtc_base/refcount.h" +#include "rtc_base/copy_on_write_buffer.h" +#include "rtc_base/ref_count.h" namespace webrtc { @@ -177,4 +177,4 @@ class DataChannelInterface : public rtc::RefCountInterface { } // namespace webrtc -#endif // API_DATACHANNELINTERFACE_H_ +#endif // API_DATA_CHANNEL_INTERFACE_H_ diff --git a/api/dtls_transport_interface.h b/api/dtls_transport_interface.h index bff67520f0..abe7378d4b 100644 --- a/api/dtls_transport_interface.h +++ b/api/dtls_transport_interface.h @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef API_DTLSTRANSPORTINTERFACE_H_ -#define API_DTLSTRANSPORTINTERFACE_H_ +#ifndef API_DTLS_TRANSPORT_INTERFACE_H_ +#define API_DTLS_TRANSPORT_INTERFACE_H_ -#include "api/rtcerror.h" -#include "rtc_base/refcount.h" +#include "api/rtc_error.h" +#include "rtc_base/ref_count.h" namespace webrtc { @@ -66,4 +66,4 @@ class DtlsTransportInterface : public rtc::RefCountInterface { } // namespace webrtc -#endif // API_DTLSTRANSPORTINTERFACE_H_ +#endif // API_DTLS_TRANSPORT_INTERFACE_H_ diff --git a/api/dtmf_sender_interface.h b/api/dtmf_sender_interface.h index d8714f5d29..9cdfba189c 100644 --- a/api/dtmf_sender_interface.h +++ b/api/dtmf_sender_interface.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef API_DTMFSENDERINTERFACE_H_ -#define API_DTMFSENDERINTERFACE_H_ +#ifndef API_DTMF_SENDER_INTERFACE_H_ +#define API_DTMF_SENDER_INTERFACE_H_ #include -#include "api/mediastreaminterface.h" -#include "rtc_base/refcount.h" +#include "api/media_stream_interface.h" +#include "rtc_base/ref_count.h" namespace webrtc { @@ -97,4 +97,4 @@ class DtmfSenderInterface : public rtc::RefCountInterface { } // namespace webrtc -#endif // API_DTMFSENDERINTERFACE_H_ +#endif // API_DTMF_SENDER_INTERFACE_H_ diff --git a/api/jsep.h b/api/jsep.h index 1c50455d04..6da782748d 100644 --- a/api/jsep.h +++ b/api/jsep.h @@ -27,8 +27,8 @@ #include #include "absl/types/optional.h" -#include "api/rtcerror.h" -#include "rtc_base/refcount.h" +#include "api/rtc_error.h" +#include "rtc_base/ref_count.h" #include "rtc_base/system/rtc_export.h" namespace cricket { diff --git a/api/jsep_ice_candidate.cc b/api/jsep_ice_candidate.cc index ed2f7927f2..59da4e4975 100644 --- a/api/jsep_ice_candidate.cc +++ b/api/jsep_ice_candidate.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "api/jsepicecandidate.h" +#include "api/jsep_ice_candidate.h" #include #include diff --git a/api/jsep_ice_candidate.h b/api/jsep_ice_candidate.h index 9cc7443f3f..5b224549bb 100644 --- a/api/jsep_ice_candidate.h +++ b/api/jsep_ice_candidate.h @@ -11,8 +11,8 @@ // TODO(deadbeef): Move this out of api/; it's an implementation detail and // shouldn't be used externally. -#ifndef API_JSEPICECANDIDATE_H_ -#define API_JSEPICECANDIDATE_H_ +#ifndef API_JSEP_ICE_CANDIDATE_H_ +#define API_JSEP_ICE_CANDIDATE_H_ #include #include @@ -20,7 +20,7 @@ #include "api/candidate.h" #include "api/jsep.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace webrtc { @@ -82,4 +82,4 @@ class JsepCandidateCollection : public IceCandidateCollection { } // namespace webrtc -#endif // API_JSEPICECANDIDATE_H_ +#endif // API_JSEP_ICE_CANDIDATE_H_ diff --git a/api/jsep_session_description.h b/api/jsep_session_description.h index 49b80fa46d..75ae0cdae1 100644 --- a/api/jsep_session_description.h +++ b/api/jsep_session_description.h @@ -11,8 +11,8 @@ // TODO(deadbeef): Move this out of api/; it's an implementation detail and // shouldn't be used externally. -#ifndef API_JSEPSESSIONDESCRIPTION_H_ -#define API_JSEPSESSIONDESCRIPTION_H_ +#ifndef API_JSEP_SESSION_DESCRIPTION_H_ +#define API_JSEP_SESSION_DESCRIPTION_H_ #include #include @@ -21,8 +21,8 @@ #include "absl/strings/string_view.h" #include "api/candidate.h" #include "api/jsep.h" -#include "api/jsepicecandidate.h" -#include "rtc_base/constructormagic.h" +#include "api/jsep_ice_candidate.h" +#include "rtc_base/constructor_magic.h" namespace cricket { class SessionDescription; @@ -88,4 +88,4 @@ class JsepSessionDescription : public SessionDescriptionInterface { } // namespace webrtc -#endif // API_JSEPSESSIONDESCRIPTION_H_ +#endif // API_JSEP_SESSION_DESCRIPTION_H_ diff --git a/api/media_constraints_interface.cc b/api/media_constraints_interface.cc index b66ba0503a..ddf55595f4 100644 --- a/api/media_constraints_interface.cc +++ b/api/media_constraints_interface.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "api/mediaconstraintsinterface.h" +#include "api/media_constraints_interface.h" #include "absl/types/optional.h" -#include "api/peerconnectioninterface.h" -#include "media/base/mediaconfig.h" -#include "rtc_base/stringencode.h" +#include "api/peer_connection_interface.h" +#include "media/base/media_config.h" +#include "rtc_base/string_encode.h" namespace { diff --git a/api/media_constraints_interface.h b/api/media_constraints_interface.h index c9a6e1b188..fc49cbe0e8 100644 --- a/api/media_constraints_interface.h +++ b/api/media_constraints_interface.h @@ -18,15 +18,15 @@ // be removed from WebRTC. // https://bugs.chromium.org/p/webrtc/issues/detail?id=9239 -#ifndef API_MEDIACONSTRAINTSINTERFACE_H_ -#define API_MEDIACONSTRAINTSINTERFACE_H_ +#ifndef API_MEDIA_CONSTRAINTS_INTERFACE_H_ +#define API_MEDIA_CONSTRAINTS_INTERFACE_H_ #include #include #include #include "api/audio_options.h" -#include "api/peerconnectioninterface.h" +#include "api/peer_connection_interface.h" namespace webrtc { @@ -156,4 +156,4 @@ bool CopyConstraintsIntoOfferAnswerOptions( } // namespace webrtc -#endif // API_MEDIACONSTRAINTSINTERFACE_H_ +#endif // API_MEDIA_CONSTRAINTS_INTERFACE_H_ diff --git a/api/media_stream_interface.cc b/api/media_stream_interface.cc index 7154014ecf..73566c4a2f 100644 --- a/api/media_stream_interface.cc +++ b/api/media_stream_interface.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" namespace webrtc { diff --git a/api/media_stream_interface.h b/api/media_stream_interface.h index 6d967660c5..af89e9df2f 100644 --- a/api/media_stream_interface.h +++ b/api/media_stream_interface.h @@ -14,8 +14,8 @@ // interfaces must be used only with PeerConnection. PeerConnectionManager // interface provides the factory methods to create MediaStream and MediaTracks. -#ifndef API_MEDIASTREAMINTERFACE_H_ -#define API_MEDIASTREAMINTERFACE_H_ +#ifndef API_MEDIA_STREAM_INTERFACE_H_ +#define API_MEDIA_STREAM_INTERFACE_H_ #include @@ -28,7 +28,7 @@ #include "api/video/video_sink_interface.h" #include "api/video/video_source_interface.h" #include "modules/audio_processing/include/audio_processing_statistics.h" -#include "rtc_base/refcount.h" +#include "rtc_base/ref_count.h" #include "rtc_base/scoped_ref_ptr.h" namespace webrtc { @@ -294,4 +294,4 @@ class MediaStreamInterface : public rtc::RefCountInterface, } // namespace webrtc -#endif // API_MEDIASTREAMINTERFACE_H_ +#endif // API_MEDIA_STREAM_INTERFACE_H_ diff --git a/api/media_stream_proxy.h b/api/media_stream_proxy.h index 4c544595aa..516967998f 100644 --- a/api/media_stream_proxy.h +++ b/api/media_stream_proxy.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef API_MEDIASTREAMPROXY_H_ -#define API_MEDIASTREAMPROXY_H_ +#ifndef API_MEDIA_STREAM_PROXY_H_ +#define API_MEDIA_STREAM_PROXY_H_ #include -#include "api/mediastreaminterface.h" +#include "api/media_stream_interface.h" #include "api/proxy.h" namespace webrtc { @@ -41,4 +41,4 @@ END_PROXY_MAP() } // namespace webrtc -#endif // API_MEDIASTREAMPROXY_H_ +#endif // API_MEDIA_STREAM_PROXY_H_ diff --git a/api/media_stream_track_proxy.h b/api/media_stream_track_proxy.h index 77b7bad9b4..d3dc25504b 100644 --- a/api/media_stream_track_proxy.h +++ b/api/media_stream_track_proxy.h @@ -11,12 +11,12 @@ // This file includes proxy classes for tracks. The purpose is // to make sure tracks are only accessed from the signaling thread. -#ifndef API_MEDIASTREAMTRACKPROXY_H_ -#define API_MEDIASTREAMTRACKPROXY_H_ +#ifndef API_MEDIA_STREAM_TRACK_PROXY_H_ +#define API_MEDIA_STREAM_TRACK_PROXY_H_ #include -#include "api/mediastreaminterface.h" +#include "api/media_stream_interface.h" #include "api/proxy.h" namespace webrtc { @@ -62,4 +62,4 @@ END_PROXY_MAP() } // namespace webrtc -#endif // API_MEDIASTREAMTRACKPROXY_H_ +#endif // API_MEDIA_STREAM_TRACK_PROXY_H_ diff --git a/api/media_transport_interface.h b/api/media_transport_interface.h index 4531fe40d1..ee1b8e3a0f 100644 --- a/api/media_transport_interface.h +++ b/api/media_transport_interface.h @@ -25,11 +25,11 @@ #include "absl/types/optional.h" #include "api/array_view.h" -#include "api/rtcerror.h" +#include "api/rtc_error.h" #include "api/video/encoded_image.h" -#include "rtc_base/copyonwritebuffer.h" +#include "rtc_base/copy_on_write_buffer.h" #include "rtc_base/deprecation.h" -#include "rtc_base/networkroute.h" +#include "rtc_base/network_route.h" namespace rtc { class PacketTransportInternal; diff --git a/api/media_types.cc b/api/media_types.cc index 599542db08..3359f1dea9 100644 --- a/api/media_types.cc +++ b/api/media_types.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "api/mediatypes.h" +#include "api/media_types.h" -#include "api/mediastreaminterface.h" +#include "api/media_stream_interface.h" #include "rtc_base/checks.h" namespace { diff --git a/api/media_types.h b/api/media_types.h index f281276025..64e2ebc286 100644 --- a/api/media_types.h +++ b/api/media_types.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef API_MEDIATYPES_H_ -#define API_MEDIATYPES_H_ +#ifndef API_MEDIA_TYPES_H_ +#define API_MEDIA_TYPES_H_ #include @@ -33,4 +33,4 @@ enum class MediaType { ANY, AUDIO, VIDEO, DATA }; } // namespace webrtc -#endif // API_MEDIATYPES_H_ +#endif // API_MEDIA_TYPES_H_ diff --git a/api/notifier.h b/api/notifier.h index e5c61c9667..c03b1049eb 100644 --- a/api/notifier.h +++ b/api/notifier.h @@ -13,7 +13,7 @@ #include -#include "api/mediastreaminterface.h" +#include "api/media_stream_interface.h" #include "rtc_base/checks.h" namespace webrtc { diff --git a/api/ortc/packet_transport_interface.h b/api/ortc/packet_transport_interface.h index f357f8af63..8fef2701c2 100644 --- a/api/ortc/packet_transport_interface.h +++ b/api/ortc/packet_transport_interface.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef API_ORTC_PACKETTRANSPORTINTERFACE_H_ -#define API_ORTC_PACKETTRANSPORTINTERFACE_H_ +#ifndef API_ORTC_PACKET_TRANSPORT_INTERFACE_H_ +#define API_ORTC_PACKET_TRANSPORT_INTERFACE_H_ namespace rtc { @@ -36,4 +36,4 @@ class PacketTransportInterface { } // namespace webrtc -#endif // API_ORTC_PACKETTRANSPORTINTERFACE_H_ +#endif // API_ORTC_PACKET_TRANSPORT_INTERFACE_H_ diff --git a/api/ortc/rtp_transport_interface.h b/api/ortc/rtp_transport_interface.h index 4b9d16158f..ec712163da 100644 --- a/api/ortc/rtp_transport_interface.h +++ b/api/ortc/rtp_transport_interface.h @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef API_ORTC_RTPTRANSPORTINTERFACE_H_ -#define API_ORTC_RTPTRANSPORTINTERFACE_H_ +#ifndef API_ORTC_RTP_TRANSPORT_INTERFACE_H_ +#define API_ORTC_RTP_TRANSPORT_INTERFACE_H_ #include #include "absl/types/optional.h" -#include "api/ortc/packettransportinterface.h" -#include "api/rtcerror.h" +#include "api/ortc/packet_transport_interface.h" +#include "api/rtc_error.h" #include "api/rtp_headers.h" -#include "api/rtpparameters.h" +#include "api/rtp_parameters.h" namespace webrtc { @@ -91,4 +91,4 @@ class RtpTransportInterface { } // namespace webrtc -#endif // API_ORTC_RTPTRANSPORTINTERFACE_H_ +#endif // API_ORTC_RTP_TRANSPORT_INTERFACE_H_ diff --git a/api/ortc/srtp_transport_interface.h b/api/ortc/srtp_transport_interface.h index 4b757e400c..65ef1eff18 100644 --- a/api/ortc/srtp_transport_interface.h +++ b/api/ortc/srtp_transport_interface.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef API_ORTC_SRTPTRANSPORTINTERFACE_H_ -#define API_ORTC_SRTPTRANSPORTINTERFACE_H_ +#ifndef API_ORTC_SRTP_TRANSPORT_INTERFACE_H_ +#define API_ORTC_SRTP_TRANSPORT_INTERFACE_H_ -#include "api/cryptoparams.h" -#include "api/ortc/rtptransportinterface.h" -#include "api/rtcerror.h" +#include "api/crypto_params.h" +#include "api/ortc/rtp_transport_interface.h" +#include "api/rtc_error.h" namespace webrtc { @@ -45,4 +45,4 @@ class SrtpTransportInterface : public RtpTransportInterface { } // namespace webrtc -#endif // API_ORTC_SRTPTRANSPORTINTERFACE_H_ +#endif // API_ORTC_SRTP_TRANSPORT_INTERFACE_H_ diff --git a/api/peer_connection_factory_proxy.h b/api/peer_connection_factory_proxy.h index d885cc1505..1f37034e09 100644 --- a/api/peer_connection_factory_proxy.h +++ b/api/peer_connection_factory_proxy.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef API_PEERCONNECTIONFACTORYPROXY_H_ -#define API_PEERCONNECTIONFACTORYPROXY_H_ +#ifndef API_PEER_CONNECTION_FACTORY_PROXY_H_ +#define API_PEER_CONNECTION_FACTORY_PROXY_H_ #include #include #include -#include "api/peerconnectioninterface.h" +#include "api/peer_connection_interface.h" #include "api/proxy.h" #include "rtc_base/bind.h" @@ -74,4 +74,4 @@ END_PROXY_MAP() } // namespace webrtc -#endif // API_PEERCONNECTIONFACTORYPROXY_H_ +#endif // API_PEER_CONNECTION_FACTORY_PROXY_H_ diff --git a/api/peer_connection_interface.cc b/api/peer_connection_interface.cc index a9b95a920e..57754b6d88 100644 --- a/api/peer_connection_interface.cc +++ b/api/peer_connection_interface.cc @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "api/peerconnectioninterface.h" -#include "api/dtlstransportinterface.h" +#include "api/peer_connection_interface.h" +#include "api/dtls_transport_interface.h" namespace webrtc { diff --git a/api/peer_connection_interface.h b/api/peer_connection_interface.h index 91d71b49c1..d431a8e587 100644 --- a/api/peer_connection_interface.h +++ b/api/peer_connection_interface.h @@ -64,55 +64,55 @@ // 7. Once a candidate has been gathered, the PeerConnection will call the // observer function OnIceCandidate. Send these candidates to the remote peer. -#ifndef API_PEERCONNECTIONINTERFACE_H_ -#define API_PEERCONNECTIONINTERFACE_H_ +#ifndef API_PEER_CONNECTION_INTERFACE_H_ +#define API_PEER_CONNECTION_INTERFACE_H_ #include #include #include -#include "api/asyncresolverfactory.h" +#include "api/async_resolver_factory.h" #include "api/audio/audio_mixer.h" #include "api/audio_codecs/audio_decoder_factory.h" #include "api/audio_codecs/audio_encoder_factory.h" #include "api/audio_options.h" -#include "api/call/callfactoryinterface.h" -#include "api/crypto/cryptooptions.h" -#include "api/datachannelinterface.h" +#include "api/call/call_factory_interface.h" +#include "api/crypto/crypto_options.h" +#include "api/data_channel_interface.h" #include "api/fec_controller.h" #include "api/jsep.h" +#include "api/media_stream_interface.h" #include "api/media_transport_interface.h" -#include "api/mediastreaminterface.h" -#include "api/rtcerror.h" -#include "api/rtceventlogoutput.h" -#include "api/rtpreceiverinterface.h" -#include "api/rtpsenderinterface.h" -#include "api/rtptransceiverinterface.h" -#include "api/setremotedescriptionobserverinterface.h" -#include "api/stats/rtcstatscollectorcallback.h" -#include "api/statstypes.h" +#include "api/rtc_error.h" +#include "api/rtc_event_log_output.h" +#include "api/rtp_receiver_interface.h" +#include "api/rtp_sender_interface.h" +#include "api/rtp_transceiver_interface.h" +#include "api/set_remote_description_observer_interface.h" +#include "api/stats/rtc_stats_collector_callback.h" +#include "api/stats_types.h" #include "api/transport/bitrate_settings.h" #include "api/transport/network_control.h" -#include "api/turncustomizer.h" +#include "api/turn_customizer.h" #include "logging/rtc_event_log/rtc_event_log_factory_interface.h" -#include "media/base/mediaconfig.h" +#include "media/base/media_config.h" // TODO(bugs.webrtc.org/6353): cricket::VideoCapturer is deprecated and should // be deleted from the PeerConnection api. -#include "media/base/videocapturer.h" // nogncheck +#include "media/base/video_capturer.h" // nogncheck // TODO(bugs.webrtc.org/7447): We plan to provide a way to let applications // inject a PacketSocketFactory and/or NetworkManager, and not expose // PortAllocator in the PeerConnection api. -#include "media/base/mediaengine.h" // nogncheck -#include "p2p/base/portallocator.h" // nogncheck +#include "media/base/media_engine.h" // nogncheck +#include "p2p/base/port_allocator.h" // nogncheck // TODO(nisse): The interface for bitrate allocation strategy belongs in api/. -#include "rtc_base/bitrateallocationstrategy.h" +#include "rtc_base/bitrate_allocation_strategy.h" #include "rtc_base/network.h" #include "rtc_base/platform_file.h" -#include "rtc_base/rtccertificate.h" -#include "rtc_base/rtccertificategenerator.h" -#include "rtc_base/socketaddress.h" -#include "rtc_base/sslcertificate.h" -#include "rtc_base/sslstreamadapter.h" +#include "rtc_base/rtc_certificate.h" +#include "rtc_base/rtc_certificate_generator.h" +#include "rtc_base/socket_address.h" +#include "rtc_base/ssl_certificate.h" +#include "rtc_base/ssl_stream_adapter.h" #include "rtc_base/system/rtc_export.h" namespace rtc { @@ -1462,4 +1462,4 @@ CreateModularPeerConnectionFactory( } // namespace webrtc -#endif // API_PEERCONNECTIONINTERFACE_H_ +#endif // API_PEER_CONNECTION_INTERFACE_H_ diff --git a/api/peer_connection_proxy.h b/api/peer_connection_proxy.h index e69efc04ed..8bd4d71d0c 100644 --- a/api/peer_connection_proxy.h +++ b/api/peer_connection_proxy.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef API_PEERCONNECTIONPROXY_H_ -#define API_PEERCONNECTIONPROXY_H_ +#ifndef API_PEER_CONNECTION_PROXY_H_ +#define API_PEER_CONNECTION_PROXY_H_ #include #include #include -#include "api/peerconnectioninterface.h" +#include "api/peer_connection_interface.h" #include "api/proxy.h" namespace webrtc { @@ -141,4 +141,4 @@ END_PROXY_MAP() } // namespace webrtc -#endif // API_PEERCONNECTIONPROXY_H_ +#endif // API_PEER_CONNECTION_PROXY_H_ diff --git a/api/proxy.h b/api/proxy.h index 3c309957d1..b1d9d50b27 100644 --- a/api/proxy.h +++ b/api/proxy.h @@ -57,9 +57,9 @@ #include #include "rtc_base/event.h" -#include "rtc_base/messagehandler.h" -#include "rtc_base/messagequeue.h" -#include "rtc_base/refcountedobject.h" +#include "rtc_base/message_handler.h" +#include "rtc_base/message_queue.h" +#include "rtc_base/ref_counted_object.h" #include "rtc_base/scoped_ref_ptr.h" #include "rtc_base/thread.h" diff --git a/api/ref_counted_base.h b/api/ref_counted_base.h index 8c26efd3e3..a1761db851 100644 --- a/api/ref_counted_base.h +++ b/api/ref_counted_base.h @@ -7,12 +7,12 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#ifndef API_REFCOUNTEDBASE_H_ -#define API_REFCOUNTEDBASE_H_ +#ifndef API_REF_COUNTED_BASE_H_ +#define API_REF_COUNTED_BASE_H_ -#include "rtc_base/constructormagic.h" -#include "rtc_base/refcount.h" -#include "rtc_base/refcounter.h" +#include "rtc_base/constructor_magic.h" +#include "rtc_base/ref_count.h" +#include "rtc_base/ref_counter.h" namespace rtc { @@ -40,4 +40,4 @@ class RefCountedBase { } // namespace rtc -#endif // API_REFCOUNTEDBASE_H_ +#endif // API_REF_COUNTED_BASE_H_ diff --git a/api/rtc_error.cc b/api/rtc_error.cc index 039e7f340a..eccc891e1b 100644 --- a/api/rtc_error.cc +++ b/api/rtc_error.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "api/rtcerror.h" +#include "api/rtc_error.h" #include "rtc_base/arraysize.h" diff --git a/api/rtc_error.h b/api/rtc_error.h index 4910682dbf..d8db1f2cbb 100644 --- a/api/rtc_error.h +++ b/api/rtc_error.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef API_RTCERROR_H_ -#define API_RTCERROR_H_ +#ifndef API_RTC_ERROR_H_ +#define API_RTC_ERROR_H_ #ifdef UNIT_TEST #include @@ -291,4 +291,4 @@ class RTCErrorOr { } // namespace webrtc -#endif // API_RTCERROR_H_ +#endif // API_RTC_ERROR_H_ diff --git a/api/rtc_error_unittest.cc b/api/rtc_error_unittest.cc index a1ea83f004..e9beb0017a 100644 --- a/api/rtc_error_unittest.cc +++ b/api/rtc_error_unittest.cc @@ -10,7 +10,7 @@ #include -#include "api/rtcerror.h" +#include "api/rtc_error.h" #include "test/gtest.h" namespace { diff --git a/api/rtc_event_log_output.h b/api/rtc_event_log_output.h index 67e408d648..4a46324b80 100644 --- a/api/rtc_event_log_output.h +++ b/api/rtc_event_log_output.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef API_RTCEVENTLOGOUTPUT_H_ -#define API_RTCEVENTLOGOUTPUT_H_ +#ifndef API_RTC_EVENT_LOG_OUTPUT_H_ +#define API_RTC_EVENT_LOG_OUTPUT_H_ #include @@ -36,4 +36,4 @@ class RtcEventLogOutput { } // namespace webrtc -#endif // API_RTCEVENTLOGOUTPUT_H_ +#endif // API_RTC_EVENT_LOG_OUTPUT_H_ diff --git a/api/rtp_parameters.cc b/api/rtp_parameters.cc index 6b253dc646..c4fd1120be 100644 --- a/api/rtp_parameters.cc +++ b/api/rtp_parameters.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 "api/rtpparameters.h" +#include "api/rtp_parameters.h" #include #include diff --git a/api/rtp_parameters.h b/api/rtp_parameters.h index bb599ce4ae..a2c566a8ba 100644 --- a/api/rtp_parameters.h +++ b/api/rtp_parameters.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef API_RTPPARAMETERS_H_ -#define API_RTPPARAMETERS_H_ +#ifndef API_RTP_PARAMETERS_H_ +#define API_RTP_PARAMETERS_H_ #include #include @@ -17,7 +17,7 @@ #include #include "absl/types/optional.h" -#include "api/mediatypes.h" +#include "api/media_types.h" #include "rtc_base/system/rtc_export.h" namespace webrtc { @@ -673,4 +673,4 @@ struct RTC_EXPORT RtpParameters { } // namespace webrtc -#endif // API_RTPPARAMETERS_H_ +#endif // API_RTP_PARAMETERS_H_ diff --git a/api/rtp_parameters_unittest.cc b/api/rtp_parameters_unittest.cc index 9d17d25cfe..b6f2482fe9 100644 --- a/api/rtp_parameters_unittest.cc +++ b/api/rtp_parameters_unittest.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "api/rtpparameters.h" +#include "api/rtp_parameters.h" #include "test/gtest.h" namespace webrtc { diff --git a/api/rtp_receiver_interface.cc b/api/rtp_receiver_interface.cc index 216ed2e00f..d8bb3d374b 100644 --- a/api/rtp_receiver_interface.cc +++ b/api/rtp_receiver_interface.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "api/rtpreceiverinterface.h" +#include "api/rtp_receiver_interface.h" namespace webrtc { diff --git a/api/rtp_receiver_interface.h b/api/rtp_receiver_interface.h index 2619735ebe..12c9d9565a 100644 --- a/api/rtp_receiver_interface.h +++ b/api/rtp_receiver_interface.h @@ -11,18 +11,18 @@ // This file contains interfaces for RtpReceivers // http://w3c.github.io/webrtc-pc/#rtcrtpreceiver-interface -#ifndef API_RTPRECEIVERINTERFACE_H_ -#define API_RTPRECEIVERINTERFACE_H_ +#ifndef API_RTP_RECEIVER_INTERFACE_H_ +#define API_RTP_RECEIVER_INTERFACE_H_ #include #include -#include "api/crypto/framedecryptorinterface.h" -#include "api/mediastreaminterface.h" -#include "api/mediatypes.h" +#include "api/crypto/frame_decryptor_interface.h" +#include "api/media_stream_interface.h" +#include "api/media_types.h" #include "api/proxy.h" -#include "api/rtpparameters.h" -#include "rtc_base/refcount.h" +#include "api/rtp_parameters.h" +#include "rtc_base/ref_count.h" #include "rtc_base/scoped_ref_ptr.h" namespace webrtc { @@ -164,4 +164,4 @@ END_PROXY_MAP() } // namespace webrtc -#endif // API_RTPRECEIVERINTERFACE_H_ +#endif // API_RTP_RECEIVER_INTERFACE_H_ diff --git a/api/rtp_sender_interface.cc b/api/rtp_sender_interface.cc index 11c0a69de7..68747ea332 100644 --- a/api/rtp_sender_interface.cc +++ b/api/rtp_sender_interface.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "api/rtpsenderinterface.h" +#include "api/rtp_sender_interface.h" namespace webrtc { diff --git a/api/rtp_sender_interface.h b/api/rtp_sender_interface.h index 7c94c216e6..c1dc7168ce 100644 --- a/api/rtp_sender_interface.h +++ b/api/rtp_sender_interface.h @@ -11,20 +11,20 @@ // This file contains interfaces for RtpSenders // http://w3c.github.io/webrtc-pc/#rtcrtpsender-interface -#ifndef API_RTPSENDERINTERFACE_H_ -#define API_RTPSENDERINTERFACE_H_ +#ifndef API_RTP_SENDER_INTERFACE_H_ +#define API_RTP_SENDER_INTERFACE_H_ #include #include -#include "api/crypto/frameencryptorinterface.h" -#include "api/dtmfsenderinterface.h" -#include "api/mediastreaminterface.h" -#include "api/mediatypes.h" +#include "api/crypto/frame_encryptor_interface.h" +#include "api/dtmf_sender_interface.h" +#include "api/media_stream_interface.h" +#include "api/media_types.h" #include "api/proxy.h" -#include "api/rtcerror.h" -#include "api/rtpparameters.h" -#include "rtc_base/refcount.h" +#include "api/rtc_error.h" +#include "api/rtp_parameters.h" +#include "rtc_base/ref_count.h" #include "rtc_base/scoped_ref_ptr.h" namespace webrtc { @@ -108,4 +108,4 @@ END_PROXY_MAP() } // namespace webrtc -#endif // API_RTPSENDERINTERFACE_H_ +#endif // API_RTP_SENDER_INTERFACE_H_ diff --git a/api/rtp_transceiver_interface.cc b/api/rtp_transceiver_interface.cc index e62b014c65..050433148b 100644 --- a/api/rtp_transceiver_interface.cc +++ b/api/rtp_transceiver_interface.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "api/rtptransceiverinterface.h" +#include "api/rtp_transceiver_interface.h" #include "rtc_base/checks.h" diff --git a/api/rtp_transceiver_interface.h b/api/rtp_transceiver_interface.h index c01fdafb83..c62df49c3e 100644 --- a/api/rtp_transceiver_interface.h +++ b/api/rtp_transceiver_interface.h @@ -8,19 +8,19 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef API_RTPTRANSCEIVERINTERFACE_H_ -#define API_RTPTRANSCEIVERINTERFACE_H_ +#ifndef API_RTP_TRANSCEIVER_INTERFACE_H_ +#define API_RTP_TRANSCEIVER_INTERFACE_H_ #include #include #include "absl/types/optional.h" #include "api/array_view.h" -#include "api/mediatypes.h" -#include "api/rtpparameters.h" -#include "api/rtpreceiverinterface.h" -#include "api/rtpsenderinterface.h" -#include "rtc_base/refcount.h" +#include "api/media_types.h" +#include "api/rtp_parameters.h" +#include "api/rtp_receiver_interface.h" +#include "api/rtp_sender_interface.h" +#include "rtc_base/ref_count.h" #include "rtc_base/scoped_ref_ptr.h" namespace webrtc { @@ -137,4 +137,4 @@ class RtpTransceiverInterface : public rtc::RefCountInterface { } // namespace webrtc -#endif // API_RTPTRANSCEIVERINTERFACE_H_ +#endif // API_RTP_TRANSCEIVER_INTERFACE_H_ diff --git a/api/set_remote_description_observer_interface.h b/api/set_remote_description_observer_interface.h index bea8b82bd5..178255564a 100644 --- a/api/set_remote_description_observer_interface.h +++ b/api/set_remote_description_observer_interface.h @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef API_SETREMOTEDESCRIPTIONOBSERVERINTERFACE_H_ -#define API_SETREMOTEDESCRIPTIONOBSERVERINTERFACE_H_ +#ifndef API_SET_REMOTE_DESCRIPTION_OBSERVER_INTERFACE_H_ +#define API_SET_REMOTE_DESCRIPTION_OBSERVER_INTERFACE_H_ -#include "api/rtcerror.h" -#include "rtc_base/refcount.h" +#include "api/rtc_error.h" +#include "rtc_base/ref_count.h" namespace webrtc { @@ -28,4 +28,4 @@ class SetRemoteDescriptionObserverInterface : public rtc::RefCountInterface { } // namespace webrtc -#endif // API_SETREMOTEDESCRIPTIONOBSERVERINTERFACE_H_ +#endif // API_SET_REMOTE_DESCRIPTION_OBSERVER_INTERFACE_H_ diff --git a/api/stats/rtc_stats.h b/api/stats/rtc_stats.h index 3e96b0acc2..049b74f584 100644 --- a/api/stats/rtc_stats.h +++ b/api/stats/rtc_stats.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef API_STATS_RTCSTATS_H_ -#define API_STATS_RTCSTATS_H_ +#ifndef API_STATS_RTC_STATS_H_ +#define API_STATS_RTC_STATS_H_ #include #include @@ -348,4 +348,4 @@ class RTCNonStandardStatsMember : public RTCStatsMember { }; } // namespace webrtc -#endif // API_STATS_RTCSTATS_H_ +#endif // API_STATS_RTC_STATS_H_ diff --git a/api/stats/rtc_stats_collector_callback.h b/api/stats/rtc_stats_collector_callback.h index 9242217659..0bc821727e 100644 --- a/api/stats/rtc_stats_collector_callback.h +++ b/api/stats/rtc_stats_collector_callback.h @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef API_STATS_RTCSTATSCOLLECTORCALLBACK_H_ -#define API_STATS_RTCSTATSCOLLECTORCALLBACK_H_ +#ifndef API_STATS_RTC_STATS_COLLECTOR_CALLBACK_H_ +#define API_STATS_RTC_STATS_COLLECTOR_CALLBACK_H_ -#include "api/stats/rtcstatsreport.h" -#include "rtc_base/refcount.h" +#include "api/stats/rtc_stats_report.h" +#include "rtc_base/ref_count.h" #include "rtc_base/scoped_ref_ptr.h" namespace webrtc { @@ -27,4 +27,4 @@ class RTCStatsCollectorCallback : public virtual rtc::RefCountInterface { } // namespace webrtc -#endif // API_STATS_RTCSTATSCOLLECTORCALLBACK_H_ +#endif // API_STATS_RTC_STATS_COLLECTOR_CALLBACK_H_ diff --git a/api/stats/rtc_stats_report.h b/api/stats/rtc_stats_report.h index a70a9ff9c1..ab4f8f0342 100644 --- a/api/stats/rtc_stats_report.h +++ b/api/stats/rtc_stats_report.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef API_STATS_RTCSTATSREPORT_H_ -#define API_STATS_RTCSTATSREPORT_H_ +#ifndef API_STATS_RTC_STATS_REPORT_H_ +#define API_STATS_RTC_STATS_REPORT_H_ #include #include @@ -18,9 +18,9 @@ #include #include -#include "api/stats/rtcstats.h" -#include "rtc_base/refcount.h" -#include "rtc_base/refcountedobject.h" +#include "api/stats/rtc_stats.h" +#include "rtc_base/ref_count.h" +#include "rtc_base/ref_counted_object.h" #include "rtc_base/scoped_ref_ptr.h" #include "rtc_base/system/rtc_export.h" @@ -117,4 +117,4 @@ class RTC_EXPORT RTCStatsReport : public rtc::RefCountInterface { } // namespace webrtc -#endif // API_STATS_RTCSTATSREPORT_H_ +#endif // API_STATS_RTC_STATS_REPORT_H_ diff --git a/api/stats/rtcstats_objects.h b/api/stats/rtcstats_objects.h index 9727758b2a..e69bc8e34f 100644 --- a/api/stats/rtcstats_objects.h +++ b/api/stats/rtcstats_objects.h @@ -16,7 +16,7 @@ #include #include -#include "api/stats/rtcstats.h" +#include "api/stats/rtc_stats.h" #include "rtc_base/system/rtc_export.h" namespace webrtc { diff --git a/api/stats_types.cc b/api/stats_types.cc index dc37abcb29..71b1f86752 100644 --- a/api/stats_types.cc +++ b/api/stats_types.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "api/statstypes.h" +#include "api/stats_types.h" #include #include "rtc_base/checks.h" -#include "rtc_base/refcountedobject.h" +#include "rtc_base/ref_counted_object.h" // TODO(tommi): Could we have a static map of value name -> expected type // and use this to RTC_DCHECK on correct usage (somewhat strongly typed values)? diff --git a/api/stats_types.h b/api/stats_types.h index e653d15bf2..7f1160f2de 100644 --- a/api/stats_types.h +++ b/api/stats_types.h @@ -11,8 +11,8 @@ // This file contains structures used for retrieving statistics from an ongoing // libjingle session. -#ifndef API_STATSTYPES_H_ -#define API_STATSTYPES_H_ +#ifndef API_STATS_TYPES_H_ +#define API_STATS_TYPES_H_ #include #include @@ -20,10 +20,10 @@ #include #include -#include "rtc_base/constructormagic.h" -#include "rtc_base/refcount.h" +#include "rtc_base/constructor_magic.h" +#include "rtc_base/ref_count.h" #include "rtc_base/scoped_ref_ptr.h" -#include "rtc_base/stringencode.h" +#include "rtc_base/string_encode.h" #include "rtc_base/thread_checker.h" namespace webrtc { @@ -449,4 +449,4 @@ class StatsCollection { } // namespace webrtc -#endif // API_STATSTYPES_H_ +#endif // API_STATS_TYPES_H_ diff --git a/api/test/DEPS b/api/test/DEPS index 6c1ab93919..ed944b4d2d 100644 --- a/api/test/DEPS +++ b/api/test/DEPS @@ -5,12 +5,12 @@ specific_include_rules = { ".*": [ "+video" ], - "fakeconstraints\.h": [ - "+rtc_base/stringencode.h", + "fake_constraints\.h": [ + "+rtc_base/string_encode.h", ], "loopback_media_transport\.h": [ - "+rtc_base/asyncinvoker.h", - "+rtc_base/criticalsection.h", + "+rtc_base/async_invoker.h", + "+rtc_base/critical_section.h", "+rtc_base/thread.h", "+rtc_base/thread_checker.h", ], diff --git a/api/test/fake_constraints.h b/api/test/fake_constraints.h index d9c767de33..e2b26d111c 100644 --- a/api/test/fake_constraints.h +++ b/api/test/fake_constraints.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef API_TEST_FAKECONSTRAINTS_H_ -#define API_TEST_FAKECONSTRAINTS_H_ +#ifndef API_TEST_FAKE_CONSTRAINTS_H_ +#define API_TEST_FAKE_CONSTRAINTS_H_ #include #include -#include "api/mediaconstraintsinterface.h" -#include "rtc_base/stringencode.h" +#include "api/media_constraints_interface.h" +#include "rtc_base/string_encode.h" namespace webrtc { @@ -109,4 +109,4 @@ class FakeConstraints : public webrtc::MediaConstraintsInterface { } // namespace webrtc -#endif // API_TEST_FAKECONSTRAINTS_H_ +#endif // API_TEST_FAKE_CONSTRAINTS_H_ diff --git a/api/test/fake_frame_decryptor.h b/api/test/fake_frame_decryptor.h index e2bcf687b5..cb370b905a 100644 --- a/api/test/fake_frame_decryptor.h +++ b/api/test/fake_frame_decryptor.h @@ -16,9 +16,9 @@ #include #include "api/array_view.h" -#include "api/crypto/framedecryptorinterface.h" -#include "api/mediatypes.h" -#include "rtc_base/refcountedobject.h" +#include "api/crypto/frame_decryptor_interface.h" +#include "api/media_types.h" +#include "rtc_base/ref_counted_object.h" namespace webrtc { diff --git a/api/test/fake_frame_encryptor.h b/api/test/fake_frame_encryptor.h index 47597ee86f..074981b183 100644 --- a/api/test/fake_frame_encryptor.h +++ b/api/test/fake_frame_encryptor.h @@ -15,9 +15,9 @@ #include #include "api/array_view.h" -#include "api/crypto/frameencryptorinterface.h" -#include "api/mediatypes.h" -#include "rtc_base/refcountedobject.h" +#include "api/crypto/frame_encryptor_interface.h" +#include "api/media_types.h" +#include "rtc_base/ref_counted_object.h" namespace webrtc { diff --git a/api/test/loopback_media_transport.cc b/api/test/loopback_media_transport.cc index 40415e2797..57cc36d81f 100644 --- a/api/test/loopback_media_transport.cc +++ b/api/test/loopback_media_transport.cc @@ -11,7 +11,7 @@ #include "api/test/loopback_media_transport.h" #include "absl/memory/memory.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/time_utils.h" namespace webrtc { diff --git a/api/test/loopback_media_transport.h b/api/test/loopback_media_transport.h index bd2630577e..64b8ced24b 100644 --- a/api/test/loopback_media_transport.h +++ b/api/test/loopback_media_transport.h @@ -17,8 +17,8 @@ #include "absl/memory/memory.h" #include "api/media_transport_interface.h" -#include "rtc_base/asyncinvoker.h" -#include "rtc_base/criticalsection.h" +#include "rtc_base/async_invoker.h" +#include "rtc_base/critical_section.h" #include "rtc_base/thread.h" #include "rtc_base/thread_checker.h" diff --git a/api/test/mock_frame_decryptor.h b/api/test/mock_frame_decryptor.h index e80396554f..feac9b3809 100644 --- a/api/test/mock_frame_decryptor.h +++ b/api/test/mock_frame_decryptor.h @@ -13,7 +13,7 @@ #include -#include "api/crypto/framedecryptorinterface.h" +#include "api/crypto/frame_decryptor_interface.h" #include "test/gmock.h" namespace webrtc { diff --git a/api/test/mock_frame_encryptor.h b/api/test/mock_frame_encryptor.h index c4fb1fde87..44b5e3426d 100644 --- a/api/test/mock_frame_encryptor.h +++ b/api/test/mock_frame_encryptor.h @@ -11,7 +11,7 @@ #ifndef API_TEST_MOCK_FRAME_ENCRYPTOR_H_ #define API_TEST_MOCK_FRAME_ENCRYPTOR_H_ -#include "api/crypto/frameencryptorinterface.h" +#include "api/crypto/frame_encryptor_interface.h" #include "test/gmock.h" namespace webrtc { diff --git a/api/test/mock_peerconnectioninterface.h b/api/test/mock_peerconnectioninterface.h index 2e040decd8..86abad5eac 100644 --- a/api/test/mock_peerconnectioninterface.h +++ b/api/test/mock_peerconnectioninterface.h @@ -16,7 +16,7 @@ #include #include -#include "api/peerconnectioninterface.h" +#include "api/peer_connection_interface.h" #include "test/gmock.h" namespace webrtc { diff --git a/api/test/mock_rtpreceiver.h b/api/test/mock_rtpreceiver.h index de69ceaccd..c585cbf1cc 100644 --- a/api/test/mock_rtpreceiver.h +++ b/api/test/mock_rtpreceiver.h @@ -14,7 +14,7 @@ #include #include -#include "api/rtpreceiverinterface.h" +#include "api/rtp_receiver_interface.h" #include "test/gmock.h" namespace webrtc { diff --git a/api/test/mock_rtpsender.h b/api/test/mock_rtpsender.h index 37d6e0c693..dca718f145 100644 --- a/api/test/mock_rtpsender.h +++ b/api/test/mock_rtpsender.h @@ -14,7 +14,7 @@ #include #include -#include "api/rtpsenderinterface.h" +#include "api/rtp_sender_interface.h" #include "test/gmock.h" namespace webrtc { diff --git a/api/test/simulated_network.h b/api/test/simulated_network.h index c03b4ca4cb..404f016550 100644 --- a/api/test/simulated_network.h +++ b/api/test/simulated_network.h @@ -18,7 +18,7 @@ #include #include "absl/types/optional.h" -#include "rtc_base/criticalsection.h" +#include "rtc_base/critical_section.h" #include "rtc_base/random.h" #include "rtc_base/thread_annotations.h" diff --git a/api/test/video_quality_test_fixture.h b/api/test/video_quality_test_fixture.h index 1c82a0de13..79b6d672c9 100644 --- a/api/test/video_quality_test_fixture.h +++ b/api/test/video_quality_test_fixture.h @@ -18,7 +18,7 @@ #include "api/bitrate_constraints.h" #include "api/fec_controller.h" -#include "api/mediatypes.h" +#include "api/media_types.h" #include "api/test/simulated_network.h" #include "api/video_codecs/video_encoder_config.h" diff --git a/api/turn_customizer.h b/api/turn_customizer.h index 85c4e77c9c..f0bf0d9a35 100644 --- a/api/turn_customizer.h +++ b/api/turn_customizer.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef API_TURNCUSTOMIZER_H_ -#define API_TURNCUSTOMIZER_H_ +#ifndef API_TURN_CUSTOMIZER_H_ +#define API_TURN_CUSTOMIZER_H_ #include @@ -42,4 +42,4 @@ class TurnCustomizer { } // namespace webrtc -#endif // API_TURNCUSTOMIZER_H_ +#endif // API_TURN_CUSTOMIZER_H_ diff --git a/api/uma_metrics.h b/api/uma_metrics.h index 239eff3869..4336c1edc7 100644 --- a/api/uma_metrics.h +++ b/api/uma_metrics.h @@ -10,10 +10,10 @@ // This file contains enums related to IPv4/IPv6 metrics. -#ifndef API_UMAMETRICS_H_ -#define API_UMAMETRICS_H_ +#ifndef API_UMA_METRICS_H_ +#define API_UMA_METRICS_H_ -#include "rtc_base/refcount.h" +#include "rtc_base/ref_count.h" namespace webrtc { @@ -157,4 +157,4 @@ enum AddIceCandidateResult { } // namespace webrtc -#endif // API_UMAMETRICS_H_ +#endif // API_UMA_METRICS_H_ diff --git a/api/video/DEPS b/api/video/DEPS index a76b5540cc..3dfec07a60 100644 --- a/api/video/DEPS +++ b/api/video/DEPS @@ -21,7 +21,7 @@ specific_include_rules = { ], "video_frame_buffer\.h": [ - "+rtc_base/refcount.h", + "+rtc_base/ref_count.h", "+rtc_base/scoped_ref_ptr.h", ], diff --git a/api/video/i010_buffer.cc b/api/video/i010_buffer.cc index 557a7694af..8f4541f2ec 100644 --- a/api/video/i010_buffer.cc +++ b/api/video/i010_buffer.cc @@ -13,7 +13,7 @@ #include "api/video/i420_buffer.h" #include "rtc_base/checks.h" -#include "rtc_base/refcountedobject.h" +#include "rtc_base/ref_counted_object.h" #include "third_party/libyuv/include/libyuv/convert.h" #include "third_party/libyuv/include/libyuv/scale.h" diff --git a/api/video/i420_buffer.cc b/api/video/i420_buffer.cc index c468f51f97..ed45b98ae2 100644 --- a/api/video/i420_buffer.cc +++ b/api/video/i420_buffer.cc @@ -14,7 +14,7 @@ #include #include "rtc_base/checks.h" -#include "rtc_base/refcountedobject.h" +#include "rtc_base/ref_counted_object.h" #include "third_party/libyuv/include/libyuv/convert.h" #include "third_party/libyuv/include/libyuv/planar_functions.h" #include "third_party/libyuv/include/libyuv/scale.h" diff --git a/api/video/video_frame.cc b/api/video/video_frame.cc index c80ee8bc3b..75a30b28a9 100644 --- a/api/video/video_frame.cc +++ b/api/video/video_frame.cc @@ -11,7 +11,7 @@ #include "api/video/video_frame.h" #include "rtc_base/checks.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/time_utils.h" namespace webrtc { diff --git a/api/video/video_frame_buffer.h b/api/video/video_frame_buffer.h index 1e8169ac57..cdc87acfad 100644 --- a/api/video/video_frame_buffer.h +++ b/api/video/video_frame_buffer.h @@ -13,7 +13,7 @@ #include -#include "rtc_base/refcount.h" +#include "rtc_base/ref_count.h" #include "rtc_base/scoped_ref_ptr.h" namespace webrtc { diff --git a/api/video/video_stream_encoder_interface.h b/api/video/video_stream_encoder_interface.h index 2f95e5851e..6a0adde734 100644 --- a/api/video/video_stream_encoder_interface.h +++ b/api/video/video_stream_encoder_interface.h @@ -13,7 +13,7 @@ #include -#include "api/rtpparameters.h" // For DegradationPreference. +#include "api/rtp_parameters.h" // For DegradationPreference. #include "api/video/video_sink_interface.h" #include "api/video/video_source_interface.h" #include "api/video_codecs/video_encoder.h" diff --git a/api/video_codecs/builtin_video_decoder_factory.cc b/api/video_codecs/builtin_video_decoder_factory.cc index 883c1ebd2e..e71e069365 100644 --- a/api/video_codecs/builtin_video_decoder_factory.cc +++ b/api/video_codecs/builtin_video_decoder_factory.cc @@ -11,7 +11,7 @@ #include "api/video_codecs/builtin_video_decoder_factory.h" #include "absl/memory/memory.h" -#include "media/engine/internaldecoderfactory.h" +#include "media/engine/internal_decoder_factory.h" namespace webrtc { diff --git a/api/video_codecs/builtin_video_encoder_factory.cc b/api/video_codecs/builtin_video_encoder_factory.cc index 1778c218cb..0df97ccfc8 100644 --- a/api/video_codecs/builtin_video_encoder_factory.cc +++ b/api/video_codecs/builtin_video_encoder_factory.cc @@ -17,9 +17,9 @@ #include "api/video_codecs/sdp_video_format.h" #include "api/video_codecs/video_encoder.h" #include "media/base/codec.h" -#include "media/base/mediaconstants.h" +#include "media/base/media_constants.h" #include "media/engine/encoder_simulcast_proxy.h" -#include "media/engine/internalencoderfactory.h" +#include "media/engine/internal_encoder_factory.h" #include "rtc_base/checks.h" namespace webrtc { diff --git a/api/video_codecs/test/video_encoder_software_fallback_wrapper_unittest.cc b/api/video_codecs/test/video_encoder_software_fallback_wrapper_unittest.cc index 9fd5aed835..bf08d1c650 100644 --- a/api/video_codecs/test/video_encoder_software_fallback_wrapper_unittest.cc +++ b/api/video_codecs/test/video_encoder_software_fallback_wrapper_unittest.cc @@ -32,7 +32,7 @@ #include "modules/video_coding/include/video_codec_interface.h" #include "modules/video_coding/include/video_error_codes.h" #include "modules/video_coding/utility/simulcast_rate_allocator.h" -#include "rtc_base/fakeclock.h" +#include "rtc_base/fake_clock.h" #include "rtc_base/scoped_ref_ptr.h" #include "test/field_trial.h" #include "test/gmock.h" diff --git a/api/video_codecs/video_encoder_config.h b/api/video_codecs/video_encoder_config.h index 9dd8e4fa5d..3a353809b0 100644 --- a/api/video_codecs/video_encoder_config.h +++ b/api/video_codecs/video_encoder_config.h @@ -18,7 +18,7 @@ #include "absl/types/optional.h" #include "api/video_codecs/sdp_video_format.h" #include "api/video_codecs/video_codec.h" -#include "rtc_base/refcount.h" +#include "rtc_base/ref_count.h" #include "rtc_base/scoped_ref_ptr.h" namespace webrtc { diff --git a/api/video_track_source_proxy.h b/api/video_track_source_proxy.h index dbd9045be8..820cdcb286 100644 --- a/api/video_track_source_proxy.h +++ b/api/video_track_source_proxy.h @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef API_VIDEOSOURCEPROXY_H_ -#define API_VIDEOSOURCEPROXY_H_ +#ifndef API_VIDEO_TRACK_SOURCE_PROXY_H_ +#define API_VIDEO_TRACK_SOURCE_PROXY_H_ -#include "api/mediastreaminterface.h" +#include "api/media_stream_interface.h" #include "api/proxy.h" namespace webrtc { @@ -38,4 +38,4 @@ END_PROXY_MAP() } // namespace webrtc -#endif // API_VIDEOSOURCEPROXY_H_ +#endif // API_VIDEO_TRACK_SOURCE_PROXY_H_ diff --git a/audio/audio_level.h b/audio/audio_level.h index 3bbe5fdd20..bb04cc06c2 100644 --- a/audio/audio_level.h +++ b/audio/audio_level.h @@ -11,7 +11,7 @@ #ifndef AUDIO_AUDIO_LEVEL_H_ #define AUDIO_AUDIO_LEVEL_H_ -#include "rtc_base/criticalsection.h" +#include "rtc_base/critical_section.h" #include "rtc_base/thread_annotations.h" namespace webrtc { diff --git a/audio/audio_receive_stream.cc b/audio/audio_receive_stream.cc index 2e874ba40b..690bb90dc5 100644 --- a/audio/audio_receive_stream.cc +++ b/audio/audio_receive_stream.cc @@ -17,7 +17,7 @@ #include "api/array_view.h" #include "api/audio_codecs/audio_format.h" #include "api/call/audio_sink.h" -#include "api/rtpparameters.h" +#include "api/rtp_parameters.h" #include "audio/audio_send_stream.h" #include "audio/audio_state.h" #include "audio/channel_receive.h" @@ -27,7 +27,7 @@ #include "rtc_base/checks.h" #include "rtc_base/logging.h" #include "rtc_base/strings/string_builder.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/time_utils.h" namespace webrtc { diff --git a/audio/audio_receive_stream.h b/audio/audio_receive_stream.h index 86bcb1c6a2..6596cb4644 100644 --- a/audio/audio_receive_stream.h +++ b/audio/audio_receive_stream.h @@ -19,7 +19,7 @@ #include "audio/audio_state.h" #include "call/audio_receive_stream.h" #include "call/syncable.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" #include "rtc_base/thread_checker.h" namespace webrtc { diff --git a/audio/audio_send_stream.cc b/audio/audio_send_stream.cc index c5c25c2e57..0c9a9ffe10 100644 --- a/audio/audio_send_stream.cc +++ b/audio/audio_send_stream.cc @@ -19,7 +19,7 @@ #include "api/audio_codecs/audio_encoder_factory.h" #include "api/audio_codecs/audio_format.h" #include "api/call/transport.h" -#include "api/crypto/frameencryptorinterface.h" +#include "api/crypto/frame_encryptor_interface.h" #include "audio/audio_state.h" #include "audio/channel_send.h" #include "audio/conversion.h" @@ -37,7 +37,7 @@ #include "rtc_base/logging.h" #include "rtc_base/strings/audio_format_to_string.h" #include "rtc_base/task_queue.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/time_utils.h" #include "system_wrappers/include/field_trial.h" namespace webrtc { diff --git a/audio/audio_send_stream.h b/audio/audio_send_stream.h index cea8551daf..2ba8d061c7 100644 --- a/audio/audio_send_stream.h +++ b/audio/audio_send_stream.h @@ -20,7 +20,7 @@ #include "call/audio_state.h" #include "call/bitrate_allocator.h" #include "modules/rtp_rtcp/include/rtp_rtcp.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" #include "rtc_base/race_checker.h" #include "rtc_base/thread_checker.h" diff --git a/audio/audio_state.cc b/audio/audio_state.cc index ce9e89480f..334eaed432 100644 --- a/audio/audio_state.cc +++ b/audio/audio_state.cc @@ -19,7 +19,7 @@ #include "modules/audio_device/include/audio_device.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.h" namespace webrtc { diff --git a/audio/audio_state.h b/audio/audio_state.h index f633f2ffcd..60250da89a 100644 --- a/audio/audio_state.h +++ b/audio/audio_state.h @@ -18,9 +18,9 @@ #include "audio/audio_transport_impl.h" #include "audio/null_audio_poller.h" #include "call/audio_state.h" -#include "rtc_base/constructormagic.h" -#include "rtc_base/criticalsection.h" -#include "rtc_base/refcount.h" +#include "rtc_base/constructor_magic.h" +#include "rtc_base/critical_section.h" +#include "rtc_base/ref_count.h" #include "rtc_base/thread_checker.h" namespace webrtc { diff --git a/audio/audio_state_unittest.cc b/audio/audio_state_unittest.cc index 790b6433dd..75bf4e1583 100644 --- a/audio/audio_state_unittest.cc +++ b/audio/audio_state_unittest.cc @@ -16,7 +16,7 @@ #include "modules/audio_device/include/mock_audio_device.h" #include "modules/audio_mixer/audio_mixer_impl.h" #include "modules/audio_processing/include/mock_audio_processing.h" -#include "rtc_base/refcountedobject.h" +#include "rtc_base/ref_counted_object.h" #include "test/gtest.h" namespace webrtc { diff --git a/audio/audio_transport_impl.h b/audio/audio_transport_impl.h index 3a3155cdbd..e0aaa5ed51 100644 --- a/audio/audio_transport_impl.h +++ b/audio/audio_transport_impl.h @@ -19,8 +19,8 @@ #include "modules/audio_device/include/audio_device.h" #include "modules/audio_processing/include/audio_processing.h" #include "modules/audio_processing/typing_detection.h" -#include "rtc_base/constructormagic.h" -#include "rtc_base/criticalsection.h" +#include "rtc_base/constructor_magic.h" +#include "rtc_base/critical_section.h" #include "rtc_base/scoped_ref_ptr.h" #include "rtc_base/thread_annotations.h" diff --git a/audio/channel_receive.cc b/audio/channel_receive.cc index e5bcad3961..bfa85c0045 100644 --- a/audio/channel_receive.cc +++ b/audio/channel_receive.cc @@ -36,14 +36,14 @@ #include "modules/rtp_rtcp/source/rtp_rtcp_config.h" #include "modules/utility/include/process_thread.h" #include "rtc_base/checks.h" -#include "rtc_base/criticalsection.h" +#include "rtc_base/critical_section.h" #include "rtc_base/format_macros.h" #include "rtc_base/location.h" #include "rtc_base/logging.h" #include "rtc_base/numerics/safe_minmax.h" #include "rtc_base/race_checker.h" #include "rtc_base/thread_checker.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/time_utils.h" #include "system_wrappers/include/metrics.h" namespace webrtc { diff --git a/audio/channel_receive.h b/audio/channel_receive.h index 2c45a8f50d..d93ddadffc 100644 --- a/audio/channel_receive.h +++ b/audio/channel_receive.h @@ -21,9 +21,9 @@ #include "api/audio_codecs/audio_decoder_factory.h" #include "api/call/audio_sink.h" #include "api/call/transport.h" -#include "api/crypto/cryptooptions.h" +#include "api/crypto/crypto_options.h" #include "api/media_transport_interface.h" -#include "api/rtpreceiverinterface.h" +#include "api/rtp_receiver_interface.h" #include "call/rtp_packet_sink_interface.h" #include "call/syncable.h" #include "modules/audio_coding/include/audio_coding_module.h" diff --git a/audio/channel_send.cc b/audio/channel_send.cc index fa69422beb..7899cf7108 100644 --- a/audio/channel_send.cc +++ b/audio/channel_send.cc @@ -20,7 +20,7 @@ #include "absl/memory/memory.h" #include "api/array_view.h" #include "api/call/transport.h" -#include "api/crypto/frameencryptorinterface.h" +#include "api/crypto/frame_encryptor_interface.h" #include "audio/utility/audio_frame_operations.h" #include "call/rtp_transport_controller_send_interface.h" #include "logging/rtc_event_log/events/rtc_event_audio_playout.h" @@ -31,7 +31,7 @@ #include "modules/pacing/packet_router.h" #include "modules/utility/include/process_thread.h" #include "rtc_base/checks.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/location.h" @@ -41,7 +41,7 @@ #include "rtc_base/rate_limiter.h" #include "rtc_base/task_queue.h" #include "rtc_base/thread_checker.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/time_utils.h" #include "system_wrappers/include/field_trial.h" #include "system_wrappers/include/metrics.h" diff --git a/audio/channel_send.h b/audio/channel_send.h index 8bf53e8956..ccd17df67d 100644 --- a/audio/channel_send.h +++ b/audio/channel_send.h @@ -17,7 +17,7 @@ #include "api/audio/audio_frame.h" #include "api/audio_codecs/audio_encoder.h" -#include "api/crypto/cryptooptions.h" +#include "api/crypto/crypto_options.h" #include "api/media_transport_interface.h" #include "modules/rtp_rtcp/include/rtp_rtcp.h" #include "rtc_base/function_view.h" diff --git a/audio/null_audio_poller.cc b/audio/null_audio_poller.cc index d2b1199ed6..063a367d1c 100644 --- a/audio/null_audio_poller.cc +++ b/audio/null_audio_poller.cc @@ -15,7 +15,7 @@ #include "rtc_base/checks.h" #include "rtc_base/location.h" #include "rtc_base/thread.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/time_utils.h" namespace webrtc { namespace internal { diff --git a/audio/null_audio_poller.h b/audio/null_audio_poller.h index f91eb7d6c0..9a81426b11 100644 --- a/audio/null_audio_poller.h +++ b/audio/null_audio_poller.h @@ -14,8 +14,8 @@ #include #include "modules/audio_device/include/audio_device_defines.h" -#include "rtc_base/messagehandler.h" -#include "rtc_base/messagequeue.h" +#include "rtc_base/message_handler.h" +#include "rtc_base/message_queue.h" #include "rtc_base/thread_checker.h" namespace webrtc { diff --git a/audio/test/audio_bwe_integration_test.cc b/audio/test/audio_bwe_integration_test.cc index 9fa95b17b8..74eaef0ee0 100644 --- a/audio/test/audio_bwe_integration_test.cc +++ b/audio/test/audio_bwe_integration_test.cc @@ -17,7 +17,7 @@ #include "system_wrappers/include/sleep.h" #include "test/field_trial.h" #include "test/gtest.h" -#include "test/testsupport/fileutils.h" +#include "test/testsupport/file_utils.h" namespace webrtc { namespace test { diff --git a/audio/test/low_bandwidth_audio_test.cc b/audio/test/low_bandwidth_audio_test.cc index 857f983d57..54191e85a6 100644 --- a/audio/test/low_bandwidth_audio_test.cc +++ b/audio/test/low_bandwidth_audio_test.cc @@ -12,7 +12,7 @@ #include "audio/test/audio_end_to_end_test.h" #include "rtc_base/flags.h" #include "system_wrappers/include/sleep.h" -#include "test/testsupport/fileutils.h" +#include "test/testsupport/file_utils.h" WEBRTC_DEFINE_int(sample_rate_hz, 16000, diff --git a/audio/test/media_transport_test.cc b/audio/test/media_transport_test.cc index ba24e46c1b..3fd451bc07 100644 --- a/audio/test/media_transport_test.cc +++ b/audio/test/media_transport_test.cc @@ -24,7 +24,7 @@ #include "modules/audio_processing/include/mock_audio_processing.h" #include "modules/utility/include/process_thread.h" #include "rtc_base/task_queue.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/time_utils.h" #include "test/gtest.h" #include "test/mock_transport.h" diff --git a/call/BUILD.gn b/call/BUILD.gn index d45705290c..6db37a4748 100644 --- a/call/BUILD.gn +++ b/call/BUILD.gn @@ -191,8 +191,8 @@ rtc_source_set("bitrate_allocator") { rtc_static_library("call") { sources = [ "call.cc", - "callfactory.cc", - "callfactory.h", + "call_factory.cc", + "call_factory.h", "degraded_call.cc", "degraded_call.h", "flexfec_receive_stream_impl.cc", diff --git a/call/audio_receive_stream.h b/call/audio_receive_stream.h index 476ddabe74..e850954069 100644 --- a/call/audio_receive_stream.h +++ b/call/audio_receive_stream.h @@ -19,10 +19,10 @@ #include "absl/types/optional.h" #include "api/audio_codecs/audio_decoder_factory.h" #include "api/call/transport.h" -#include "api/crypto/cryptooptions.h" +#include "api/crypto/crypto_options.h" #include "api/media_transport_interface.h" -#include "api/rtpparameters.h" -#include "api/rtpreceiverinterface.h" +#include "api/rtp_parameters.h" +#include "api/rtp_receiver_interface.h" #include "call/rtp_config.h" #include "rtc_base/scoped_ref_ptr.h" diff --git a/call/audio_send_stream.cc b/call/audio_send_stream.cc index 303b49cbfb..0a3555b647 100644 --- a/call/audio_send_stream.cc +++ b/call/audio_send_stream.cc @@ -12,7 +12,7 @@ #include -#include "rtc_base/stringencode.h" +#include "rtc_base/string_encode.h" #include "rtc_base/strings/audio_format_to_string.h" #include "rtc_base/strings/string_builder.h" diff --git a/call/audio_send_stream.h b/call/audio_send_stream.h index f34a51d439..044ec99b0a 100644 --- a/call/audio_send_stream.h +++ b/call/audio_send_stream.h @@ -21,10 +21,10 @@ #include "api/audio_codecs/audio_encoder_factory.h" #include "api/audio_codecs/audio_format.h" #include "api/call/transport.h" -#include "api/crypto/cryptooptions.h" -#include "api/crypto/frameencryptorinterface.h" +#include "api/crypto/crypto_options.h" +#include "api/crypto/frame_encryptor_interface.h" #include "api/media_transport_interface.h" -#include "api/rtpparameters.h" +#include "api/rtp_parameters.h" #include "call/rtp_config.h" #include "modules/audio_processing/include/audio_processing_statistics.h" #include "rtc_base/scoped_ref_ptr.h" diff --git a/call/audio_state.h b/call/audio_state.h index 104f493fb6..1332c053f7 100644 --- a/call/audio_state.h +++ b/call/audio_state.h @@ -13,7 +13,7 @@ #include "api/audio/audio_mixer.h" #include "modules/audio_device/include/audio_device.h" #include "modules/audio_processing/include/audio_processing.h" -#include "rtc_base/refcount.h" +#include "rtc_base/ref_count.h" #include "rtc_base/scoped_ref_ptr.h" namespace webrtc { diff --git a/call/bitrate_allocator.h b/call/bitrate_allocator.h index 56d8bd566d..0259da7e72 100644 --- a/call/bitrate_allocator.h +++ b/call/bitrate_allocator.h @@ -20,7 +20,7 @@ #include #include "api/call/bitrate_allocation.h" -#include "rtc_base/bitrateallocationstrategy.h" +#include "rtc_base/bitrate_allocation_strategy.h" #include "rtc_base/sequenced_task_checker.h" namespace webrtc { diff --git a/call/call.cc b/call/call.cc index 3ffea84e2c..a57a41c1a7 100644 --- a/call/call.cc +++ b/call/call.cc @@ -45,7 +45,7 @@ #include "modules/utility/include/process_thread.h" #include "modules/video_coding/fec_controller_default.h" #include "rtc_base/checks.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" #include "rtc_base/location.h" #include "rtc_base/logging.h" #include "rtc_base/numerics/safe_minmax.h" @@ -54,7 +54,7 @@ #include "rtc_base/synchronization/rw_lock_wrapper.h" #include "rtc_base/task_queue.h" #include "rtc_base/thread_annotations.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/time_utils.h" #include "rtc_base/trace_event.h" #include "system_wrappers/include/clock.h" #include "system_wrappers/include/cpu_info.h" diff --git a/call/call.h b/call/call.h index c0e31c0902..ab834f3c84 100644 --- a/call/call.h +++ b/call/call.h @@ -15,7 +15,7 @@ #include #include -#include "api/mediatypes.h" +#include "api/media_types.h" #include "call/audio_receive_stream.h" #include "call/audio_send_stream.h" #include "call/call_config.h" @@ -24,10 +24,10 @@ #include "call/rtp_transport_controller_send_interface.h" #include "call/video_receive_stream.h" #include "call/video_send_stream.h" -#include "rtc_base/bitrateallocationstrategy.h" -#include "rtc_base/copyonwritebuffer.h" +#include "rtc_base/bitrate_allocation_strategy.h" +#include "rtc_base/copy_on_write_buffer.h" #include "rtc_base/network/sent_packet.h" -#include "rtc_base/networkroute.h" +#include "rtc_base/network_route.h" namespace webrtc { diff --git a/call/call_config.h b/call/call_config.h index 5834175761..67ccd51f19 100644 --- a/call/call_config.h +++ b/call/call_config.h @@ -12,7 +12,7 @@ #include "api/bitrate_constraints.h" #include "api/fec_controller.h" -#include "api/rtcerror.h" +#include "api/rtc_error.h" #include "api/transport/network_control.h" #include "call/audio_state.h" diff --git a/call/call_factory.cc b/call/call_factory.cc index 4c46a40dd8..309063d085 100644 --- a/call/call_factory.cc +++ b/call/call_factory.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "call/callfactory.h" +#include "call/call_factory.h" #include #include diff --git a/call/call_factory.h b/call/call_factory.h index 448ffdc575..f0d695c915 100644 --- a/call/call_factory.h +++ b/call/call_factory.h @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef CALL_CALLFACTORY_H_ -#define CALL_CALLFACTORY_H_ +#ifndef CALL_CALL_FACTORY_H_ +#define CALL_CALL_FACTORY_H_ -#include "api/call/callfactoryinterface.h" +#include "api/call/call_factory_interface.h" #include "call/call.h" #include "call/call_config.h" @@ -25,4 +25,4 @@ class CallFactory : public CallFactoryInterface { } // namespace webrtc -#endif // CALL_CALLFACTORY_H_ +#endif // CALL_CALL_FACTORY_H_ diff --git a/call/call_perf_tests.cc b/call/call_perf_tests.cc index 72aa78c5f7..c584bffa8a 100644 --- a/call/call_perf_tests.cc +++ b/call/call_perf_tests.cc @@ -27,7 +27,7 @@ #include "modules/audio_device/include/test_audio_device.h" #include "modules/audio_mixer/audio_mixer_impl.h" #include "modules/rtp_rtcp/include/rtp_header_parser.h" -#include "rtc_base/bitrateallocationstrategy.h" +#include "rtc_base/bitrate_allocation_strategy.h" #include "rtc_base/checks.h" #include "rtc_base/thread_annotations.h" #include "system_wrappers/include/metrics.h" @@ -43,7 +43,7 @@ #include "test/null_transport.h" #include "test/rtp_rtcp_observer.h" #include "test/single_threaded_task_queue.h" -#include "test/testsupport/fileutils.h" +#include "test/testsupport/file_utils.h" #include "test/testsupport/perf_test.h" #include "test/video_encoder_proxy_factory.h" #include "video/transport_adapter.h" diff --git a/call/degraded_call.h b/call/degraded_call.h index a5db264455..8f062c3a7b 100644 --- a/call/degraded_call.h +++ b/call/degraded_call.h @@ -18,7 +18,7 @@ #include "absl/types/optional.h" #include "api/call/transport.h" #include "api/fec_controller.h" -#include "api/mediatypes.h" +#include "api/media_types.h" #include "api/rtp_headers.h" #include "api/test/simulated_network.h" #include "api/video_codecs/video_encoder_config.h" @@ -33,8 +33,8 @@ #include "call/video_receive_stream.h" #include "call/video_send_stream.h" #include "modules/utility/include/process_thread.h" -#include "rtc_base/bitrateallocationstrategy.h" -#include "rtc_base/copyonwritebuffer.h" +#include "rtc_base/bitrate_allocation_strategy.h" +#include "rtc_base/copy_on_write_buffer.h" #include "rtc_base/network/sent_packet.h" #include "system_wrappers/include/clock.h" diff --git a/call/fake_network_pipe.cc b/call/fake_network_pipe.cc index 7c3c3d20b1..b5c0cb52e3 100644 --- a/call/fake_network_pipe.cc +++ b/call/fake_network_pipe.cc @@ -14,7 +14,7 @@ #include #include -#include "api/mediatypes.h" +#include "api/media_types.h" #include "call/fake_network_pipe.h" #include "modules/utility/include/process_thread.h" #include "rtc_base/checks.h" diff --git a/call/fake_network_pipe.h b/call/fake_network_pipe.h index 34e1b5070f..2c41dbfd93 100644 --- a/call/fake_network_pipe.h +++ b/call/fake_network_pipe.h @@ -23,8 +23,8 @@ #include "api/test/simulated_network.h" #include "call/call.h" #include "call/simulated_packet_receiver.h" -#include "rtc_base/constructormagic.h" -#include "rtc_base/criticalsection.h" +#include "rtc_base/constructor_magic.h" +#include "rtc_base/critical_section.h" #include "rtc_base/thread_annotations.h" namespace webrtc { diff --git a/call/flexfec_receive_stream.h b/call/flexfec_receive_stream.h index 949ad742aa..77c9932a23 100644 --- a/call/flexfec_receive_stream.h +++ b/call/flexfec_receive_stream.h @@ -17,7 +17,7 @@ #include "api/call/transport.h" #include "api/rtp_headers.h" -#include "api/rtpparameters.h" +#include "api/rtp_parameters.h" #include "call/rtp_packet_sink_interface.h" namespace webrtc { diff --git a/call/flexfec_receive_stream_impl.cc b/call/flexfec_receive_stream_impl.cc index 3b33be6b71..8154715490 100644 --- a/call/flexfec_receive_stream_impl.cc +++ b/call/flexfec_receive_stream_impl.cc @@ -17,7 +17,7 @@ #include "api/array_view.h" #include "api/call/transport.h" -#include "api/rtpparameters.h" +#include "api/rtp_parameters.h" #include "call/rtp_stream_receiver_controller_interface.h" #include "modules/rtp_rtcp/include/flexfec_receiver.h" #include "modules/rtp_rtcp/include/receive_statistics.h" diff --git a/call/flexfec_receive_stream_unittest.cc b/call/flexfec_receive_stream_unittest.cc index d73a804f06..a1bacf9c2e 100644 --- a/call/flexfec_receive_stream_unittest.cc +++ b/call/flexfec_receive_stream_unittest.cc @@ -16,7 +16,7 @@ #include "api/array_view.h" #include "api/call/transport.h" #include "api/rtp_headers.h" -#include "api/rtpparameters.h" +#include "api/rtp_parameters.h" #include "call/flexfec_receive_stream.h" #include "call/flexfec_receive_stream_impl.h" #include "call/rtp_stream_receiver_controller.h" diff --git a/call/packet_receiver.h b/call/packet_receiver.h index 02a01550de..df57d8f4f4 100644 --- a/call/packet_receiver.h +++ b/call/packet_receiver.h @@ -15,8 +15,8 @@ #include #include -#include "api/mediatypes.h" -#include "rtc_base/copyonwritebuffer.h" +#include "api/media_types.h" +#include "rtc_base/copy_on_write_buffer.h" namespace webrtc { diff --git a/call/rampup_tests.cc b/call/rampup_tests.cc index f629dbeb4c..91788b097a 100644 --- a/call/rampup_tests.cc +++ b/call/rampup_tests.cc @@ -17,7 +17,7 @@ #include "rtc_base/flags.h" #include "rtc_base/logging.h" #include "rtc_base/platform_thread.h" -#include "rtc_base/stringencode.h" +#include "rtc_base/string_encode.h" #include "test/encoder_settings.h" #include "test/gtest.h" #include "test/testsupport/perf_test.h" diff --git a/call/receive_time_calculator_unittest.cc b/call/receive_time_calculator_unittest.cc index 3de759cb09..4349ee462a 100644 --- a/call/receive_time_calculator_unittest.cc +++ b/call/receive_time_calculator_unittest.cc @@ -18,7 +18,7 @@ #include "absl/types/optional.h" #include "rtc_base/random.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/time_utils.h" #include "test/gtest.h" namespace webrtc { diff --git a/call/rtp_bitrate_configurator.h b/call/rtp_bitrate_configurator.h index 1981292fb7..a16dda8c10 100644 --- a/call/rtp_bitrate_configurator.h +++ b/call/rtp_bitrate_configurator.h @@ -14,7 +14,7 @@ #include "absl/types/optional.h" #include "api/bitrate_constraints.h" #include "api/transport/bitrate_settings.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace webrtc { diff --git a/call/rtp_config.h b/call/rtp_config.h index 06a89f2616..b6155c05f8 100644 --- a/call/rtp_config.h +++ b/call/rtp_config.h @@ -17,7 +17,7 @@ #include #include "api/rtp_headers.h" -#include "api/rtpparameters.h" +#include "api/rtp_parameters.h" namespace webrtc { // Currently only VP8/VP9 specific. diff --git a/call/rtp_payload_params.cc b/call/rtp_payload_params.cc index 95c64b4124..a0f123c61f 100644 --- a/call/rtp_payload_params.cc +++ b/call/rtp_payload_params.cc @@ -25,7 +25,7 @@ #include "rtc_base/checks.h" #include "rtc_base/logging.h" #include "rtc_base/random.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/time_utils.h" #include "system_wrappers/include/field_trial.h" namespace webrtc { diff --git a/call/rtp_stream_receiver_controller.h b/call/rtp_stream_receiver_controller.h index c523e3f5b3..045af3cf8d 100644 --- a/call/rtp_stream_receiver_controller.h +++ b/call/rtp_stream_receiver_controller.h @@ -14,7 +14,7 @@ #include "call/rtp_demuxer.h" #include "call/rtp_stream_receiver_controller_interface.h" -#include "rtc_base/criticalsection.h" +#include "rtc_base/critical_section.h" namespace webrtc { diff --git a/call/rtp_transport_controller_send.h b/call/rtp_transport_controller_send.h index 5b14a73617..2581a774e3 100644 --- a/call/rtp_transport_controller_send.h +++ b/call/rtp_transport_controller_send.h @@ -25,8 +25,8 @@ #include "modules/congestion_controller/rtp/transport_feedback_adapter.h" #include "modules/pacing/packet_router.h" #include "modules/utility/include/process_thread.h" -#include "rtc_base/constructormagic.h" -#include "rtc_base/networkroute.h" +#include "rtc_base/constructor_magic.h" +#include "rtc_base/network_route.h" #include "rtc_base/race_checker.h" #include "rtc_base/task_queue.h" diff --git a/call/rtp_transport_controller_send_interface.h b/call/rtp_transport_controller_send_interface.h index 19c1dadd68..ef6fad296f 100644 --- a/call/rtp_transport_controller_send_interface.h +++ b/call/rtp_transport_controller_send_interface.h @@ -20,7 +20,7 @@ #include "absl/types/optional.h" #include "api/bitrate_constraints.h" -#include "api/crypto/cryptooptions.h" +#include "api/crypto/crypto_options.h" #include "api/fec_controller.h" #include "api/transport/bitrate_settings.h" #include "call/rtp_config.h" diff --git a/call/rtp_video_sender.h b/call/rtp_video_sender.h index d72ef0d8ff..f5ef77ec09 100644 --- a/call/rtp_video_sender.h +++ b/call/rtp_video_sender.h @@ -27,8 +27,8 @@ #include "modules/rtp_rtcp/include/flexfec_sender.h" #include "modules/rtp_rtcp/source/rtp_video_header.h" #include "modules/utility/include/process_thread.h" -#include "rtc_base/constructormagic.h" -#include "rtc_base/criticalsection.h" +#include "rtc_base/constructor_magic.h" +#include "rtc_base/critical_section.h" #include "rtc_base/rate_limiter.h" #include "rtc_base/thread_annotations.h" #include "rtc_base/thread_checker.h" diff --git a/call/simulated_network.h b/call/simulated_network.h index 7d9d15b104..0336bfce12 100644 --- a/call/simulated_network.h +++ b/call/simulated_network.h @@ -17,7 +17,7 @@ #include "absl/types/optional.h" #include "api/test/simulated_network.h" -#include "rtc_base/criticalsection.h" +#include "rtc_base/critical_section.h" #include "rtc_base/random.h" #include "rtc_base/thread_annotations.h" diff --git a/call/test/mock_rtp_transport_controller_send.h b/call/test/mock_rtp_transport_controller_send.h index c2360417ee..18bb117fac 100644 --- a/call/test/mock_rtp_transport_controller_send.h +++ b/call/test/mock_rtp_transport_controller_send.h @@ -17,13 +17,13 @@ #include #include "api/bitrate_constraints.h" -#include "api/crypto/cryptooptions.h" -#include "api/crypto/frameencryptorinterface.h" +#include "api/crypto/crypto_options.h" +#include "api/crypto/frame_encryptor_interface.h" #include "call/rtp_transport_controller_send_interface.h" #include "modules/congestion_controller/include/network_changed_observer.h" #include "modules/pacing/packet_router.h" #include "rtc_base/network/sent_packet.h" -#include "rtc_base/networkroute.h" +#include "rtc_base/network_route.h" #include "rtc_base/rate_limiter.h" #include "test/gmock.h" diff --git a/call/video_receive_stream.h b/call/video_receive_stream.h index 27f6e95884..b469553f56 100644 --- a/call/video_receive_stream.h +++ b/call/video_receive_stream.h @@ -17,11 +17,11 @@ #include #include "api/call/transport.h" -#include "api/crypto/cryptooptions.h" +#include "api/crypto/crypto_options.h" #include "api/media_transport_interface.h" #include "api/rtp_headers.h" -#include "api/rtpparameters.h" -#include "api/rtpreceiverinterface.h" +#include "api/rtp_parameters.h" +#include "api/rtp_receiver_interface.h" #include "api/video/video_content_type.h" #include "api/video/video_sink_interface.h" #include "api/video/video_timing.h" diff --git a/call/video_send_stream.cc b/call/video_send_stream.cc index ebd37a759a..8d3f62cb1f 100644 --- a/call/video_send_stream.cc +++ b/call/video_send_stream.cc @@ -12,7 +12,7 @@ #include -#include "api/crypto/frameencryptorinterface.h" +#include "api/crypto/frame_encryptor_interface.h" #include "rtc_base/strings/string_builder.h" namespace webrtc { diff --git a/call/video_send_stream.h b/call/video_send_stream.h index 8ee2991313..5daec19449 100644 --- a/call/video_send_stream.h +++ b/call/video_send_stream.h @@ -18,9 +18,9 @@ #include "absl/types/optional.h" #include "api/call/transport.h" -#include "api/crypto/cryptooptions.h" +#include "api/crypto/crypto_options.h" #include "api/media_transport_interface.h" -#include "api/rtpparameters.h" +#include "api/rtp_parameters.h" #include "api/video/video_content_type.h" #include "api/video/video_frame.h" #include "api/video/video_sink_interface.h" diff --git a/common_audio/audio_converter.h b/common_audio/audio_converter.h index 24a5e72cee..73ad1ef8d7 100644 --- a/common_audio/audio_converter.h +++ b/common_audio/audio_converter.h @@ -14,7 +14,7 @@ #include #include -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace webrtc { diff --git a/common_audio/resampler/push_sinc_resampler.h b/common_audio/resampler/push_sinc_resampler.h index db9cdc1fd4..b002ff748c 100644 --- a/common_audio/resampler/push_sinc_resampler.h +++ b/common_audio/resampler/push_sinc_resampler.h @@ -16,7 +16,7 @@ #include #include "common_audio/resampler/sinc_resampler.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace webrtc { diff --git a/common_audio/resampler/push_sinc_resampler_unittest.cc b/common_audio/resampler/push_sinc_resampler_unittest.cc index 2f53a745ae..6d15a40495 100644 --- a/common_audio/resampler/push_sinc_resampler_unittest.cc +++ b/common_audio/resampler/push_sinc_resampler_unittest.cc @@ -16,7 +16,7 @@ #include "common_audio/include/audio_util.h" #include "common_audio/resampler/push_sinc_resampler.h" #include "common_audio/resampler/sinusoidal_linear_chirp_source.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/time_utils.h" #include "test/gmock.h" #include "test/gtest.h" diff --git a/common_audio/resampler/sinc_resampler.h b/common_audio/resampler/sinc_resampler.h index 0be4318e33..ffd70d9ce8 100644 --- a/common_audio/resampler/sinc_resampler.h +++ b/common_audio/resampler/sinc_resampler.h @@ -17,7 +17,7 @@ #include #include -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" #include "rtc_base/gtest_prod_util.h" #include "rtc_base/memory/aligned_malloc.h" #include "rtc_base/system/arch.h" diff --git a/common_audio/resampler/sinc_resampler_unittest.cc b/common_audio/resampler/sinc_resampler_unittest.cc index eb5424d54e..3e0b84b091 100644 --- a/common_audio/resampler/sinc_resampler_unittest.cc +++ b/common_audio/resampler/sinc_resampler_unittest.cc @@ -24,7 +24,7 @@ #include "common_audio/resampler/sinusoidal_linear_chirp_source.h" #include "rtc_base/stringize_macros.h" #include "rtc_base/system/arch.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/time_utils.h" #include "system_wrappers/include/cpu_features_wrapper.h" #include "test/gmock.h" #include "test/gtest.h" diff --git a/common_audio/resampler/sinusoidal_linear_chirp_source.h b/common_audio/resampler/sinusoidal_linear_chirp_source.h index 71dcff5eb9..81f6a24b7d 100644 --- a/common_audio/resampler/sinusoidal_linear_chirp_source.h +++ b/common_audio/resampler/sinusoidal_linear_chirp_source.h @@ -15,7 +15,7 @@ #define COMMON_AUDIO_RESAMPLER_SINUSOIDAL_LINEAR_CHIRP_SOURCE_H_ #include "common_audio/resampler/sinc_resampler.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace webrtc { diff --git a/common_audio/smoothing_filter.cc b/common_audio/smoothing_filter.cc index 0d5aaa4854..e5ce987786 100644 --- a/common_audio/smoothing_filter.cc +++ b/common_audio/smoothing_filter.cc @@ -13,7 +13,7 @@ #include #include "rtc_base/checks.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/time_utils.h" namespace webrtc { diff --git a/common_audio/smoothing_filter.h b/common_audio/smoothing_filter.h index c467d85426..e5f561ecf2 100644 --- a/common_audio/smoothing_filter.h +++ b/common_audio/smoothing_filter.h @@ -14,7 +14,7 @@ #include #include "absl/types/optional.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace webrtc { diff --git a/common_audio/smoothing_filter_unittest.cc b/common_audio/smoothing_filter_unittest.cc index abe4272a82..5f6711e53d 100644 --- a/common_audio/smoothing_filter_unittest.cc +++ b/common_audio/smoothing_filter_unittest.cc @@ -12,7 +12,7 @@ #include #include "common_audio/smoothing_filter.h" -#include "rtc_base/fakeclock.h" +#include "rtc_base/fake_clock.h" #include "test/gtest.h" namespace webrtc { diff --git a/common_audio/sparse_fir_filter.h b/common_audio/sparse_fir_filter.h index 22bcdff788..5197a8e28c 100644 --- a/common_audio/sparse_fir_filter.h +++ b/common_audio/sparse_fir_filter.h @@ -14,7 +14,7 @@ #include #include -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace webrtc { diff --git a/common_audio/wav_file.h b/common_audio/wav_file.h index cbce59d364..7e790e0fc7 100644 --- a/common_audio/wav_file.h +++ b/common_audio/wav_file.h @@ -17,7 +17,7 @@ #include #include -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" #include "rtc_base/platform_file.h" namespace webrtc { diff --git a/common_audio/wav_file_unittest.cc b/common_audio/wav_file_unittest.cc index d40229a1eb..b7e5d3fa3e 100644 --- a/common_audio/wav_file_unittest.cc +++ b/common_audio/wav_file_unittest.cc @@ -17,7 +17,7 @@ #include "common_audio/wav_file.h" #include "common_audio/wav_header.h" #include "test/gtest.h" -#include "test/testsupport/fileutils.h" +#include "test/testsupport/file_utils.h" // WavWriterTest.CPPFileDescriptor and WavWriterTest.CPP flaky on Mac. // See webrtc:9247. diff --git a/common_audio/window_generator.h b/common_audio/window_generator.h index ad3b4456b9..0cbe24a402 100644 --- a/common_audio/window_generator.h +++ b/common_audio/window_generator.h @@ -13,7 +13,7 @@ #include -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace webrtc { diff --git a/common_video/bitrate_adjuster.cc b/common_video/bitrate_adjuster.cc index ac21f2bd20..e2d3b3dcbf 100644 --- a/common_video/bitrate_adjuster.cc +++ b/common_video/bitrate_adjuster.cc @@ -14,7 +14,7 @@ #include #include "rtc_base/logging.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/time_utils.h" namespace webrtc { diff --git a/common_video/bitrate_adjuster_unittest.cc b/common_video/bitrate_adjuster_unittest.cc index cd0660d712..eae15cd078 100644 --- a/common_video/bitrate_adjuster_unittest.cc +++ b/common_video/bitrate_adjuster_unittest.cc @@ -11,7 +11,7 @@ #include "common_video/include/bitrate_adjuster.h" #include "api/units/time_delta.h" -#include "rtc_base/fakeclock.h" +#include "rtc_base/fake_clock.h" #include "test/gtest.h" namespace webrtc { diff --git a/common_video/h264/h264_bitstream_parser.cc b/common_video/h264/h264_bitstream_parser.cc index f3d2f8a6bf..e71d1cabd7 100644 --- a/common_video/h264/h264_bitstream_parser.cc +++ b/common_video/h264/h264_bitstream_parser.cc @@ -14,7 +14,7 @@ #include #include "common_video/h264/h264_common.h" -#include "rtc_base/bitbuffer.h" +#include "rtc_base/bit_buffer.h" #include "rtc_base/logging.h" namespace { diff --git a/common_video/h264/pps_parser.cc b/common_video/h264/pps_parser.cc index 464f6081e3..ae01652189 100644 --- a/common_video/h264/pps_parser.cc +++ b/common_video/h264/pps_parser.cc @@ -14,7 +14,7 @@ #include #include "common_video/h264/h264_common.h" -#include "rtc_base/bitbuffer.h" +#include "rtc_base/bit_buffer.h" #include "rtc_base/checks.h" #define RETURN_EMPTY_ON_FAIL(x) \ diff --git a/common_video/h264/pps_parser_unittest.cc b/common_video/h264/pps_parser_unittest.cc index 68fe5e9a65..a279563f85 100644 --- a/common_video/h264/pps_parser_unittest.cc +++ b/common_video/h264/pps_parser_unittest.cc @@ -11,7 +11,7 @@ #include "common_video/h264/pps_parser.h" #include "common_video/h264/h264_common.h" -#include "rtc_base/bitbuffer.h" +#include "rtc_base/bit_buffer.h" #include "rtc_base/buffer.h" #include "rtc_base/checks.h" #include "test/gtest.h" diff --git a/common_video/h264/sps_parser.cc b/common_video/h264/sps_parser.cc index c6f6d47466..3d78184e7a 100644 --- a/common_video/h264/sps_parser.cc +++ b/common_video/h264/sps_parser.cc @@ -14,7 +14,7 @@ #include #include "common_video/h264/h264_common.h" -#include "rtc_base/bitbuffer.h" +#include "rtc_base/bit_buffer.h" namespace { typedef absl::optional OptionalSps; diff --git a/common_video/h264/sps_parser_unittest.cc b/common_video/h264/sps_parser_unittest.cc index 94c9a0c744..73157ffae9 100644 --- a/common_video/h264/sps_parser_unittest.cc +++ b/common_video/h264/sps_parser_unittest.cc @@ -12,7 +12,7 @@ #include "common_video/h264/h264_common.h" #include "rtc_base/arraysize.h" -#include "rtc_base/bitbuffer.h" +#include "rtc_base/bit_buffer.h" #include "rtc_base/buffer.h" #include "test/gtest.h" diff --git a/common_video/h264/sps_vui_rewriter.cc b/common_video/h264/sps_vui_rewriter.cc index 3eab11f188..946604da89 100644 --- a/common_video/h264/sps_vui_rewriter.cc +++ b/common_video/h264/sps_vui_rewriter.cc @@ -17,7 +17,7 @@ #include "common_video/h264/h264_common.h" #include "common_video/h264/sps_parser.h" -#include "rtc_base/bitbuffer.h" +#include "rtc_base/bit_buffer.h" #include "rtc_base/checks.h" #include "rtc_base/logging.h" #include "rtc_base/numerics/safe_minmax.h" diff --git a/common_video/h264/sps_vui_rewriter_unittest.cc b/common_video/h264/sps_vui_rewriter_unittest.cc index 432606d6da..7061dc0a96 100644 --- a/common_video/h264/sps_vui_rewriter_unittest.cc +++ b/common_video/h264/sps_vui_rewriter_unittest.cc @@ -13,7 +13,7 @@ #include "common_video/h264/h264_common.h" #include "common_video/h264/sps_vui_rewriter.h" -#include "rtc_base/bitbuffer.h" +#include "rtc_base/bit_buffer.h" #include "rtc_base/buffer.h" #include "rtc_base/logging.h" #include "test/gtest.h" diff --git a/common_video/include/bitrate_adjuster.h b/common_video/include/bitrate_adjuster.h index bc2c6bb849..8ede3f9c76 100644 --- a/common_video/include/bitrate_adjuster.h +++ b/common_video/include/bitrate_adjuster.h @@ -15,7 +15,7 @@ #include #include "absl/types/optional.h" -#include "rtc_base/criticalsection.h" +#include "rtc_base/critical_section.h" #include "rtc_base/rate_statistics.h" #include "rtc_base/thread_annotations.h" diff --git a/common_video/include/i420_buffer_pool.h b/common_video/include/i420_buffer_pool.h index 2dcee195fa..8b0f08c80a 100644 --- a/common_video/include/i420_buffer_pool.h +++ b/common_video/include/i420_buffer_pool.h @@ -16,7 +16,7 @@ #include "api/video/i420_buffer.h" #include "rtc_base/race_checker.h" -#include "rtc_base/refcountedobject.h" +#include "rtc_base/ref_counted_object.h" #include "rtc_base/scoped_ref_ptr.h" namespace webrtc { diff --git a/common_video/include/video_frame_buffer.h b/common_video/include/video_frame_buffer.h index f813851b9a..f35f10714d 100644 --- a/common_video/include/video_frame_buffer.h +++ b/common_video/include/video_frame_buffer.h @@ -15,7 +15,7 @@ #include "api/video/video_frame_buffer.h" #include "rtc_base/callback.h" -#include "rtc_base/refcountedobject.h" +#include "rtc_base/ref_counted_object.h" #include "rtc_base/scoped_ref_ptr.h" namespace webrtc { diff --git a/common_video/libyuv/libyuv_unittest.cc b/common_video/libyuv/libyuv_unittest.cc index 9f2c241985..0ea4775cbd 100644 --- a/common_video/libyuv/libyuv_unittest.cc +++ b/common_video/libyuv/libyuv_unittest.cc @@ -20,7 +20,7 @@ #include "test/frame_utils.h" #include "test/gmock.h" #include "test/gtest.h" -#include "test/testsupport/fileutils.h" +#include "test/testsupport/file_utils.h" #include "third_party/libyuv/include/libyuv.h" namespace webrtc { diff --git a/common_video/video_frame_buffer.cc b/common_video/video_frame_buffer.cc index 1253d36752..823c5ad7a1 100644 --- a/common_video/video_frame_buffer.cc +++ b/common_video/video_frame_buffer.cc @@ -11,7 +11,7 @@ #include "api/video/i420_buffer.h" #include "rtc_base/checks.h" -#include "rtc_base/refcountedobject.h" +#include "rtc_base/ref_counted_object.h" #include "third_party/libyuv/include/libyuv/convert.h" namespace webrtc { diff --git a/common_video/video_frame_unittest.cc b/common_video/video_frame_unittest.cc index 6a2c45296b..d65dd483fe 100644 --- a/common_video/video_frame_unittest.cc +++ b/common_video/video_frame_unittest.cc @@ -15,7 +15,7 @@ #include "api/video/i420_buffer.h" #include "api/video/video_frame.h" #include "rtc_base/bind.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/time_utils.h" #include "test/fake_texture_frame.h" #include "test/frame_utils.h" #include "test/gtest.h" diff --git a/common_video/video_render_frames.cc b/common_video/video_render_frames.cc index 8152625f5b..5ef51f2805 100644 --- a/common_video/video_render_frames.cc +++ b/common_video/video_render_frames.cc @@ -15,7 +15,7 @@ #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/metrics.h" namespace webrtc { diff --git a/examples/BUILD.gn b/examples/BUILD.gn index ace85fed8a..5fd304145b 100644 --- a/examples/BUILD.gn +++ b/examples/BUILD.gn @@ -492,8 +492,8 @@ if (is_ios || (is_mac && target_cpu != "x86")) { "objcnativeapi/objc/NADAppDelegate.m", "objcnativeapi/objc/NADViewController.h", "objcnativeapi/objc/NADViewController.mm", - "objcnativeapi/objc/objccallclient.h", - "objcnativeapi/objc/objccallclient.mm", + "objcnativeapi/objc/objc_call_client.h", + "objcnativeapi/objc/objc_call_client.mm", ] if (!build_with_chromium && is_clang) { @@ -706,7 +706,7 @@ if (is_linux || is_win) { ] if (is_win) { sources += [ - "peerconnection/client/flagdefs.h", + "peerconnection/client/flag_defs.h", "peerconnection/client/main.cc", "peerconnection/client/main_wnd.cc", "peerconnection/client/main_wnd.h", @@ -842,8 +842,8 @@ if (is_win || is_android) { if (is_android) { sources += [ - "unityplugin/classreferenceholder.cc", - "unityplugin/classreferenceholder.h", + "unityplugin/class_reference_holder.cc", + "unityplugin/class_reference_holder.h", "unityplugin/jni_onload.cc", ] suppressed_configs += [ "//build/config/android:hide_all_but_jni_onload" ] diff --git a/examples/androidnativeapi/BUILD.gn b/examples/androidnativeapi/BUILD.gn index 6fdd36cce7..2d0438b91d 100644 --- a/examples/androidnativeapi/BUILD.gn +++ b/examples/androidnativeapi/BUILD.gn @@ -37,8 +37,8 @@ if (is_android) { rtc_shared_library("examples_androidnativeapi_jni") { testonly = true sources = [ - "jni/androidcallclient.cc", - "jni/androidcallclient.h", + "jni/android_call_client.cc", + "jni/android_call_client.h", "jni/onload.cc", ] diff --git a/examples/androidnativeapi/jni/android_call_client.cc b/examples/androidnativeapi/jni/android_call_client.cc index e0dc8cc135..119444b596 100644 --- a/examples/androidnativeapi/jni/android_call_client.cc +++ b/examples/androidnativeapi/jni/android_call_client.cc @@ -8,20 +8,20 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "examples/androidnativeapi/jni/androidcallclient.h" +#include "examples/androidnativeapi/jni/android_call_client.h" #include #include "absl/memory/memory.h" #include "api/audio_codecs/builtin_audio_decoder_factory.h" #include "api/audio_codecs/builtin_audio_encoder_factory.h" -#include "api/peerconnectioninterface.h" +#include "api/peer_connection_interface.h" #include "api/video/builtin_video_bitrate_allocator_factory.h" #include "examples/androidnativeapi/generated_jni/jni/CallClient_jni.h" #include "logging/rtc_event_log/rtc_event_log_factory.h" -#include "media/engine/internaldecoderfactory.h" -#include "media/engine/internalencoderfactory.h" -#include "media/engine/webrtcmediaengine.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 "sdk/android/native_api/jni/java_types.h" #include "sdk/android/native_api/video/wrapper.h" diff --git a/examples/androidnativeapi/jni/android_call_client.h b/examples/androidnativeapi/jni/android_call_client.h index d456e9c10a..5ab61f4736 100644 --- a/examples/androidnativeapi/jni/android_call_client.h +++ b/examples/androidnativeapi/jni/android_call_client.h @@ -8,20 +8,20 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef EXAMPLES_ANDROIDNATIVEAPI_JNI_ANDROIDCALLCLIENT_H_ -#define EXAMPLES_ANDROIDNATIVEAPI_JNI_ANDROIDCALLCLIENT_H_ +#ifndef EXAMPLES_ANDROIDNATIVEAPI_JNI_ANDROID_CALL_CLIENT_H_ +#define EXAMPLES_ANDROIDNATIVEAPI_JNI_ANDROID_CALL_CLIENT_H_ #include #include #include -#include "api/peerconnectioninterface.h" -#include "rtc_base/criticalsection.h" +#include "api/peer_connection_interface.h" +#include "rtc_base/critical_section.h" #include "rtc_base/scoped_ref_ptr.h" #include "rtc_base/thread_checker.h" #include "sdk/android/native_api/jni/scoped_java_ref.h" -#include "sdk/android/native_api/video/videosource.h" +#include "sdk/android/native_api/video/video_source.h" namespace webrtc_examples { @@ -76,4 +76,4 @@ class AndroidCallClient { } // namespace webrtc_examples -#endif // EXAMPLES_ANDROIDNATIVEAPI_JNI_ANDROIDCALLCLIENT_H_ +#endif // EXAMPLES_ANDROIDNATIVEAPI_JNI_ANDROID_CALL_CLIENT_H_ diff --git a/examples/androidnativeapi/jni/onload.cc b/examples/androidnativeapi/jni/onload.cc index 4b4b5d960a..6ea5275d2a 100644 --- a/examples/androidnativeapi/jni/onload.cc +++ b/examples/androidnativeapi/jni/onload.cc @@ -11,7 +11,7 @@ #include #include "modules/utility/include/jvm_android.h" -#include "rtc_base/ssladapter.h" +#include "rtc_base/ssl_adapter.h" #include "sdk/android/native_api/base/init.h" namespace webrtc_examples { diff --git a/examples/objc/AppRTCMobile/tests/ARDAppClient_xctest.mm b/examples/objc/AppRTCMobile/tests/ARDAppClient_xctest.mm index 0fc01132a9..c58a731ff2 100644 --- a/examples/objc/AppRTCMobile/tests/ARDAppClient_xctest.mm +++ b/examples/objc/AppRTCMobile/tests/ARDAppClient_xctest.mm @@ -13,7 +13,7 @@ #import #import -#include "rtc_base/ssladapter.h" +#include "rtc_base/ssl_adapter.h" #import #import diff --git a/examples/objcnativeapi/objc/NADViewController.mm b/examples/objcnativeapi/objc/NADViewController.mm index f9056006e5..d96f6498e7 100644 --- a/examples/objcnativeapi/objc/NADViewController.mm +++ b/examples/objcnativeapi/objc/NADViewController.mm @@ -20,7 +20,7 @@ #include -#include "examples/objcnativeapi/objc/objccallclient.h" +#include "examples/objcnativeapi/objc/objc_call_client.h" @interface NADViewController () diff --git a/examples/objcnativeapi/objc/objc_call_client.h b/examples/objcnativeapi/objc/objc_call_client.h index e48aae47e1..43a48c524d 100644 --- a/examples/objcnativeapi/objc/objc_call_client.h +++ b/examples/objcnativeapi/objc/objc_call_client.h @@ -14,8 +14,8 @@ #include #include -#include "api/peerconnectioninterface.h" -#include "rtc_base/criticalsection.h" +#include "api/peer_connection_interface.h" +#include "rtc_base/critical_section.h" #include "rtc_base/scoped_ref_ptr.h" #include "rtc_base/thread_checker.h" diff --git a/examples/objcnativeapi/objc/objc_call_client.mm b/examples/objcnativeapi/objc/objc_call_client.mm index 54015b2202..a30f7f6ac2 100644 --- a/examples/objcnativeapi/objc/objc_call_client.mm +++ b/examples/objcnativeapi/objc/objc_call_client.mm @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "examples/objcnativeapi/objc/objccallclient.h" +#include "examples/objcnativeapi/objc/objc_call_client.h" #include @@ -20,10 +20,10 @@ #include "absl/memory/memory.h" #include "api/audio_codecs/builtin_audio_decoder_factory.h" #include "api/audio_codecs/builtin_audio_encoder_factory.h" -#include "api/peerconnectioninterface.h" +#include "api/peer_connection_interface.h" #include "api/video/builtin_video_bitrate_allocator_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_processing/include/audio_processing.h" #include "sdk/objc/native/api/video_capturer.h" #include "sdk/objc/native/api/video_decoder_factory.h" diff --git a/examples/peerconnection/client/conductor.cc b/examples/peerconnection/client/conductor.cc index 096ff58d72..03f820a60a 100644 --- a/examples/peerconnection/client/conductor.cc +++ b/examples/peerconnection/client/conductor.cc @@ -25,7 +25,7 @@ #include "api/audio_codecs/builtin_audio_encoder_factory.h" #include "api/audio_options.h" #include "api/create_peerconnection_factory.h" -#include "api/rtpsenderinterface.h" +#include "api/rtp_sender_interface.h" #include "api/video_codecs/builtin_video_decoder_factory.h" #include "api/video_codecs/builtin_video_encoder_factory.h" #include "api/video_codecs/video_decoder_factory.h" @@ -36,12 +36,12 @@ #include "modules/audio_processing/include/audio_processing.h" #include "modules/video_capture/video_capture.h" #include "modules/video_capture/video_capture_factory.h" -#include "p2p/base/portallocator.h" -#include "pc/videotracksource.h" +#include "p2p/base/port_allocator.h" +#include "pc/video_track_source.h" #include "rtc_base/checks.h" #include "rtc_base/logging.h" -#include "rtc_base/refcountedobject.h" -#include "rtc_base/rtccertificategenerator.h" +#include "rtc_base/ref_counted_object.h" +#include "rtc_base/rtc_certificate_generator.h" #include "rtc_base/strings/json.h" #include "test/vcm_capturer.h" diff --git a/examples/peerconnection/client/conductor.h b/examples/peerconnection/client/conductor.h index 76c1dbecf9..58286b0a4b 100644 --- a/examples/peerconnection/client/conductor.h +++ b/examples/peerconnection/client/conductor.h @@ -17,8 +17,8 @@ #include #include -#include "api/mediastreaminterface.h" -#include "api/peerconnectioninterface.h" +#include "api/media_stream_interface.h" +#include "api/peer_connection_interface.h" #include "examples/peerconnection/client/main_wnd.h" #include "examples/peerconnection/client/peer_connection_client.h" diff --git a/examples/peerconnection/client/flag_defs.h b/examples/peerconnection/client/flag_defs.h index 51f9c9a425..6834de6f2c 100644 --- a/examples/peerconnection/client/flag_defs.h +++ b/examples/peerconnection/client/flag_defs.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef EXAMPLES_PEERCONNECTION_CLIENT_FLAGDEFS_H_ -#define EXAMPLES_PEERCONNECTION_CLIENT_FLAGDEFS_H_ +#ifndef EXAMPLES_PEERCONNECTION_CLIENT_FLAG_DEFS_H_ +#define EXAMPLES_PEERCONNECTION_CLIENT_FLAG_DEFS_H_ #include "rtc_base/flags.h" @@ -44,4 +44,4 @@ WEBRTC_DEFINE_string( "will assign the group Enabled to field trial WebRTC-FooFeature. Multiple " "trials are separated by \"/\""); -#endif // EXAMPLES_PEERCONNECTION_CLIENT_FLAGDEFS_H_ +#endif // EXAMPLES_PEERCONNECTION_CLIENT_FLAG_DEFS_H_ diff --git a/examples/peerconnection/client/linux/main.cc b/examples/peerconnection/client/linux/main.cc index b3978cf7b0..74fc17a449 100644 --- a/examples/peerconnection/client/linux/main.cc +++ b/examples/peerconnection/client/linux/main.cc @@ -13,15 +13,15 @@ #include #include "examples/peerconnection/client/conductor.h" -#include "examples/peerconnection/client/flagdefs.h" +#include "examples/peerconnection/client/flag_defs.h" #include "examples/peerconnection/client/linux/main_wnd.h" #include "examples/peerconnection/client/peer_connection_client.h" #include "rtc_base/flags.h" -#include "rtc_base/messagequeue.h" -#include "rtc_base/physicalsocketserver.h" -#include "rtc_base/refcountedobject.h" +#include "rtc_base/message_queue.h" +#include "rtc_base/physical_socket_server.h" +#include "rtc_base/ref_counted_object.h" #include "rtc_base/scoped_ref_ptr.h" -#include "rtc_base/ssladapter.h" +#include "rtc_base/ssl_adapter.h" #include "rtc_base/thread.h" #include "system_wrappers/include/field_trial.h" #include "test/field_trial.h" diff --git a/examples/peerconnection/client/linux/main_wnd.h b/examples/peerconnection/client/linux/main_wnd.h index b94d034741..a30ec2726e 100644 --- a/examples/peerconnection/client/linux/main_wnd.h +++ b/examples/peerconnection/client/linux/main_wnd.h @@ -15,7 +15,7 @@ #include #include -#include "api/mediastreaminterface.h" +#include "api/media_stream_interface.h" #include "api/video/video_frame.h" #include "api/video/video_sink_interface.h" #include "examples/peerconnection/client/main_wnd.h" diff --git a/examples/peerconnection/client/main.cc b/examples/peerconnection/client/main.cc index f92e606c33..dc6b5d5508 100644 --- a/examples/peerconnection/client/main.cc +++ b/examples/peerconnection/client/main.cc @@ -9,13 +9,13 @@ */ #include "examples/peerconnection/client/conductor.h" -#include "examples/peerconnection/client/flagdefs.h" +#include "examples/peerconnection/client/flag_defs.h" #include "examples/peerconnection/client/main_wnd.h" #include "examples/peerconnection/client/peer_connection_client.h" #include "rtc_base/checks.h" -#include "rtc_base/ssladapter.h" -#include "rtc_base/win32socketinit.h" -#include "rtc_base/win32socketserver.h" +#include "rtc_base/ssl_adapter.h" +#include "rtc_base/win32_socket_init.h" +#include "rtc_base/win32_socket_server.h" #include "system_wrappers/include/field_trial.h" #include "test/field_trial.h" diff --git a/examples/peerconnection/client/main_wnd.h b/examples/peerconnection/client/main_wnd.h index 57002583ea..898fea9d92 100644 --- a/examples/peerconnection/client/main_wnd.h +++ b/examples/peerconnection/client/main_wnd.h @@ -15,11 +15,11 @@ #include #include -#include "api/mediastreaminterface.h" +#include "api/media_stream_interface.h" #include "api/video/video_frame.h" #include "examples/peerconnection/client/peer_connection_client.h" -#include "media/base/mediachannel.h" -#include "media/base/videocommon.h" +#include "media/base/media_channel.h" +#include "media/base/video_common.h" #if defined(WEBRTC_WIN) #include "rtc_base/win32.h" #endif // WEBRTC_WIN diff --git a/examples/peerconnection/client/peer_connection_client.cc b/examples/peerconnection/client/peer_connection_client.cc index f173e42793..3203941672 100644 --- a/examples/peerconnection/client/peer_connection_client.cc +++ b/examples/peerconnection/client/peer_connection_client.cc @@ -13,10 +13,10 @@ #include "examples/peerconnection/client/defaults.h" #include "rtc_base/checks.h" #include "rtc_base/logging.h" -#include "rtc_base/nethelpers.h" +#include "rtc_base/net_helpers.h" #ifdef WIN32 -#include "rtc_base/win32socketserver.h" +#include "rtc_base/win32_socket_server.h" #endif namespace { diff --git a/examples/peerconnection/client/peer_connection_client.h b/examples/peerconnection/client/peer_connection_client.h index 8dd28f7993..56c235a82a 100644 --- a/examples/peerconnection/client/peer_connection_client.h +++ b/examples/peerconnection/client/peer_connection_client.h @@ -15,9 +15,9 @@ #include #include -#include "rtc_base/nethelpers.h" -#include "rtc_base/physicalsocketserver.h" -#include "rtc_base/signalthread.h" +#include "rtc_base/net_helpers.h" +#include "rtc_base/physical_socket_server.h" +#include "rtc_base/signal_thread.h" #include "rtc_base/third_party/sigslot/sigslot.h" typedef std::map Peers; diff --git a/examples/peerconnection/server/peer_channel.cc b/examples/peerconnection/server/peer_channel.cc index 7710d6ae25..91f5ff7d8f 100644 --- a/examples/peerconnection/server/peer_channel.cc +++ b/examples/peerconnection/server/peer_channel.cc @@ -17,7 +17,7 @@ #include "examples/peerconnection/server/data_socket.h" #include "examples/peerconnection/server/utils.h" -#include "rtc_base/stringencode.h" +#include "rtc_base/string_encode.h" // Set to the peer id of the originator when messages are being // exchanged between peers, but set to the id of the receiving peer diff --git a/examples/peerconnection/server/utils.cc b/examples/peerconnection/server/utils.cc index dcd1ef74db..5e61e601d9 100644 --- a/examples/peerconnection/server/utils.cc +++ b/examples/peerconnection/server/utils.cc @@ -12,7 +12,7 @@ #include -#include "rtc_base/stringencode.h" +#include "rtc_base/string_encode.h" using rtc::ToString; diff --git a/examples/relayserver/relayserver_main.cc b/examples/relayserver/relayserver_main.cc index 7d7d97711a..2045cb4031 100644 --- a/examples/relayserver/relayserver_main.cc +++ b/examples/relayserver/relayserver_main.cc @@ -11,10 +11,10 @@ #include // NOLINT #include -#include "p2p/base/relayserver.h" -#include "rtc_base/asyncudpsocket.h" -#include "rtc_base/socketaddress.h" -#include "rtc_base/socketserver.h" +#include "p2p/base/relay_server.h" +#include "rtc_base/async_udp_socket.h" +#include "rtc_base/socket_address.h" +#include "rtc_base/socket_server.h" #include "rtc_base/thread.h" int main(int argc, char** argv) { diff --git a/examples/stunprober/main.cc b/examples/stunprober/main.cc index d7ea30b3fd..72f05014d4 100644 --- a/examples/stunprober/main.cc +++ b/examples/stunprober/main.cc @@ -14,16 +14,16 @@ #include #include -#include "p2p/base/basicpacketsocketfactory.h" -#include "p2p/stunprober/stunprober.h" +#include "p2p/base/basic_packet_socket_factory.h" +#include "p2p/stunprober/stun_prober.h" #include "rtc_base/flags.h" #include "rtc_base/helpers.h" #include "rtc_base/logging.h" #include "rtc_base/network.h" -#include "rtc_base/socketaddress.h" -#include "rtc_base/ssladapter.h" +#include "rtc_base/socket_address.h" +#include "rtc_base/ssl_adapter.h" #include "rtc_base/thread.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/time_utils.h" using stunprober::StunProber; using stunprober::AsyncCallback; diff --git a/examples/stunserver/stunserver_main.cc b/examples/stunserver/stunserver_main.cc index 741ddecb0e..8180069bf0 100644 --- a/examples/stunserver/stunserver_main.cc +++ b/examples/stunserver/stunserver_main.cc @@ -9,10 +9,10 @@ */ #include -#include "p2p/base/stunserver.h" -#include "rtc_base/asyncudpsocket.h" -#include "rtc_base/socketaddress.h" -#include "rtc_base/socketserver.h" +#include "p2p/base/stun_server.h" +#include "rtc_base/async_udp_socket.h" +#include "rtc_base/socket_address.h" +#include "rtc_base/socket_server.h" #include "rtc_base/thread.h" using cricket::StunServer; diff --git a/examples/turnserver/read_auth_file.cc b/examples/turnserver/read_auth_file.cc index 0ae40cb7f0..3ad5c2bb39 100644 --- a/examples/turnserver/read_auth_file.cc +++ b/examples/turnserver/read_auth_file.cc @@ -12,7 +12,7 @@ #include -#include "rtc_base/stringencode.h" +#include "rtc_base/string_encode.h" namespace webrtc_examples { diff --git a/examples/turnserver/turnserver_main.cc b/examples/turnserver/turnserver_main.cc index 3e3ea9c730..5e2a747f20 100644 --- a/examples/turnserver/turnserver_main.cc +++ b/examples/turnserver/turnserver_main.cc @@ -15,13 +15,13 @@ #include #include "examples/turnserver/read_auth_file.h" -#include "p2p/base/basicpacketsocketfactory.h" -#include "p2p/base/portinterface.h" -#include "p2p/base/turnserver.h" -#include "rtc_base/asyncudpsocket.h" -#include "rtc_base/ipaddress.h" -#include "rtc_base/socketaddress.h" -#include "rtc_base/socketserver.h" +#include "p2p/base/basic_packet_socket_factory.h" +#include "p2p/base/port_interface.h" +#include "p2p/base/turn_server.h" +#include "rtc_base/async_udp_socket.h" +#include "rtc_base/ip_address.h" +#include "rtc_base/socket_address.h" +#include "rtc_base/socket_server.h" #include "rtc_base/thread.h" namespace { diff --git a/examples/unityplugin/class_reference_holder.cc b/examples/unityplugin/class_reference_holder.cc index 0ad96c594d..00ca772e76 100644 --- a/examples/unityplugin/class_reference_holder.cc +++ b/examples/unityplugin/class_reference_holder.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 "examples/unityplugin/classreferenceholder.h" +#include "examples/unityplugin/class_reference_holder.h" #include diff --git a/examples/unityplugin/class_reference_holder.h b/examples/unityplugin/class_reference_holder.h index 31d6efc979..2b0eba49f5 100644 --- a/examples/unityplugin/class_reference_holder.h +++ b/examples/unityplugin/class_reference_holder.h @@ -13,8 +13,8 @@ // specific java class into JNI c++ side, so that our c++ code can // call those java functions. -#ifndef EXAMPLES_UNITYPLUGIN_CLASSREFERENCEHOLDER_H_ -#define EXAMPLES_UNITYPLUGIN_CLASSREFERENCEHOLDER_H_ +#ifndef EXAMPLES_UNITYPLUGIN_CLASS_REFERENCE_HOLDER_H_ +#define EXAMPLES_UNITYPLUGIN_CLASS_REFERENCE_HOLDER_H_ #include #include @@ -34,4 +34,4 @@ jclass FindClass(JNIEnv* jni, const char* name); } // namespace unity_plugin -#endif // EXAMPLES_UNITYPLUGIN_CLASSREFERENCEHOLDER_H_ +#endif // EXAMPLES_UNITYPLUGIN_CLASS_REFERENCE_HOLDER_H_ diff --git a/examples/unityplugin/jni_onload.cc b/examples/unityplugin/jni_onload.cc index ebb5bfa364..089e9a21dd 100644 --- a/examples/unityplugin/jni_onload.cc +++ b/examples/unityplugin/jni_onload.cc @@ -12,9 +12,9 @@ #undef JNIEXPORT #define JNIEXPORT __attribute__((visibility("default"))) -#include "examples/unityplugin/classreferenceholder.h" -#include "rtc_base/ssladapter.h" -#include "sdk/android/src/jni/classreferenceholder.h" +#include "examples/unityplugin/class_reference_holder.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/examples/unityplugin/simple_peer_connection.cc b/examples/unityplugin/simple_peer_connection.cc index e1a2552aba..0b0a810ed4 100644 --- a/examples/unityplugin/simple_peer_connection.cc +++ b/examples/unityplugin/simple_peer_connection.cc @@ -16,22 +16,22 @@ #include "api/audio_codecs/builtin_audio_decoder_factory.h" #include "api/audio_codecs/builtin_audio_encoder_factory.h" #include "api/create_peerconnection_factory.h" -#include "api/videosourceproxy.h" -#include "media/engine/internaldecoderfactory.h" -#include "media/engine/internalencoderfactory.h" -#include "media/engine/multiplexcodecfactory.h" -#include "media/engine/webrtcvideodecoderfactory.h" -#include "media/engine/webrtcvideoencoderfactory.h" +#include "api/video_track_source_proxy.h" +#include "media/engine/internal_decoder_factory.h" +#include "media/engine/internal_encoder_factory.h" +#include "media/engine/multiplex_codec_factory.h" +#include "media/engine/webrtc_video_decoder_factory.h" +#include "media/engine/webrtc_video_encoder_factory.h" #include "modules/audio_device/include/audio_device.h" #include "modules/audio_processing/include/audio_processing.h" #include "modules/video_capture/video_capture_factory.h" -#include "pc/videotracksource.h" +#include "pc/video_track_source.h" #include "test/vcm_capturer.h" #if defined(WEBRTC_ANDROID) -#include "examples/unityplugin/classreferenceholder.h" +#include "examples/unityplugin/class_reference_holder.h" #include "modules/utility/include/helpers_android.h" -#include "sdk/android/src/jni/androidvideotracksource.h" +#include "sdk/android/src/jni/android_video_track_source.h" #include "sdk/android/src/jni/jni_helpers.h" #endif diff --git a/examples/unityplugin/simple_peer_connection.h b/examples/unityplugin/simple_peer_connection.h index e4d8a1b6cc..b99bde930e 100644 --- a/examples/unityplugin/simple_peer_connection.h +++ b/examples/unityplugin/simple_peer_connection.h @@ -16,9 +16,9 @@ #include #include -#include "api/datachannelinterface.h" -#include "api/mediastreaminterface.h" -#include "api/peerconnectioninterface.h" +#include "api/data_channel_interface.h" +#include "api/media_stream_interface.h" +#include "api/peer_connection_interface.h" #include "examples/unityplugin/unity_plugin_apis.h" #include "examples/unityplugin/video_observer.h" diff --git a/examples/unityplugin/video_observer.h b/examples/unityplugin/video_observer.h index 84c03d329a..01ccd2191a 100644 --- a/examples/unityplugin/video_observer.h +++ b/examples/unityplugin/video_observer.h @@ -13,7 +13,7 @@ #include -#include "api/mediastreaminterface.h" +#include "api/media_stream_interface.h" #include "api/video/video_sink_interface.h" #include "examples/unityplugin/unity_plugin_apis.h" diff --git a/logging/BUILD.gn b/logging/BUILD.gn index 14ce79acd0..5089515eb2 100644 --- a/logging/BUILD.gn +++ b/logging/BUILD.gn @@ -164,8 +164,8 @@ rtc_static_library("rtc_event_log_impl_encoder") { "rtc_event_log/encoder/delta_encoding.h", "rtc_event_log/encoder/rtc_event_log_encoder_common.cc", "rtc_event_log/encoder/rtc_event_log_encoder_common.h", - "rtc_event_log/encoder/varint.cc", - "rtc_event_log/encoder/varint.h", + "rtc_event_log/encoder/var_int.cc", + "rtc_event_log/encoder/var_int.h", ] defines = [] @@ -412,8 +412,8 @@ rtc_source_set("ice_log") { "rtc_event_log/events/rtc_event_ice_candidate_pair.h", "rtc_event_log/events/rtc_event_ice_candidate_pair_config.cc", "rtc_event_log/events/rtc_event_ice_candidate_pair_config.h", - "rtc_event_log/icelogger.cc", - "rtc_event_log/icelogger.h", + "rtc_event_log/ice_logger.cc", + "rtc_event_log/ice_logger.h", ] deps = [ diff --git a/logging/rtc_event_log/encoder/blob_encoding.cc b/logging/rtc_event_log/encoder/blob_encoding.cc index c11e7ba88f..48316b052b 100644 --- a/logging/rtc_event_log/encoder/blob_encoding.cc +++ b/logging/rtc_event_log/encoder/blob_encoding.cc @@ -12,7 +12,7 @@ #include -#include "logging/rtc_event_log/encoder/varint.h" +#include "logging/rtc_event_log/encoder/var_int.h" #include "rtc_base/checks.h" #include "rtc_base/logging.h" diff --git a/logging/rtc_event_log/encoder/blob_encoding_unittest.cc b/logging/rtc_event_log/encoder/blob_encoding_unittest.cc index 1d08e0feb8..a25923f22d 100644 --- a/logging/rtc_event_log/encoder/blob_encoding_unittest.cc +++ b/logging/rtc_event_log/encoder/blob_encoding_unittest.cc @@ -13,7 +13,7 @@ #include #include -#include "logging/rtc_event_log/encoder/varint.h" +#include "logging/rtc_event_log/encoder/var_int.h" #include "rtc_base/checks.h" #include "test/gtest.h" diff --git a/logging/rtc_event_log/encoder/delta_encoding.cc b/logging/rtc_event_log/encoder/delta_encoding.cc index 5e334b98d0..ca2589f11a 100644 --- a/logging/rtc_event_log/encoder/delta_encoding.cc +++ b/logging/rtc_event_log/encoder/delta_encoding.cc @@ -16,10 +16,10 @@ #include #include "absl/memory/memory.h" -#include "logging/rtc_event_log/encoder/varint.h" -#include "rtc_base/bitbuffer.h" +#include "logging/rtc_event_log/encoder/var_int.h" +#include "rtc_base/bit_buffer.h" #include "rtc_base/checks.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" #include "rtc_base/logging.h" #include "rtc_base/numerics/safe_conversions.h" diff --git a/logging/rtc_event_log/encoder/rtc_event_log_encoder_legacy.cc b/logging/rtc_event_log/encoder/rtc_event_log_encoder_legacy.cc index 28a1b5dd0b..7e42e3c566 100644 --- a/logging/rtc_event_log/encoder/rtc_event_log_encoder_legacy.cc +++ b/logging/rtc_event_log/encoder/rtc_event_log_encoder_legacy.cc @@ -15,7 +15,7 @@ #include "absl/types/optional.h" #include "api/rtp_headers.h" -#include "api/rtpparameters.h" +#include "api/rtp_parameters.h" #include "api/transport/network_types.h" #include "logging/rtc_event_log/events/rtc_event_alr_state.h" #include "logging/rtc_event_log/events/rtc_event_audio_network_adaptation.h" diff --git a/logging/rtc_event_log/encoder/rtc_event_log_encoder_unittest.cc b/logging/rtc_event_log/encoder/rtc_event_log_encoder_unittest.cc index 2225d87f0e..5246b217b6 100644 --- a/logging/rtc_event_log/encoder/rtc_event_log_encoder_unittest.cc +++ b/logging/rtc_event_log/encoder/rtc_event_log_encoder_unittest.cc @@ -37,7 +37,7 @@ #include "modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor_config.h" #include "modules/remote_bitrate_estimator/include/bwe_defines.h" #include "modules/rtp_rtcp/source/rtp_header_extensions.h" -#include "rtc_base/fakeclock.h" +#include "rtc_base/fake_clock.h" #include "rtc_base/random.h" #include "test/gtest.h" diff --git a/logging/rtc_event_log/encoder/var_int.cc b/logging/rtc_event_log/encoder/var_int.cc index 41e29e8480..b2c695ee78 100644 --- a/logging/rtc_event_log/encoder/var_int.cc +++ b/logging/rtc_event_log/encoder/var_int.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "logging/rtc_event_log/encoder/varint.h" +#include "logging/rtc_event_log/encoder/var_int.h" #include "rtc_base/checks.h" diff --git a/logging/rtc_event_log/encoder/var_int.h b/logging/rtc_event_log/encoder/var_int.h index 86bc7caee5..390ac90a33 100644 --- a/logging/rtc_event_log/encoder/var_int.h +++ b/logging/rtc_event_log/encoder/var_int.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef LOGGING_RTC_EVENT_LOG_ENCODER_VARINT_H_ -#define LOGGING_RTC_EVENT_LOG_ENCODER_VARINT_H_ +#ifndef LOGGING_RTC_EVENT_LOG_ENCODER_VAR_INT_H_ +#define LOGGING_RTC_EVENT_LOG_ENCODER_VAR_INT_H_ #include #include #include #include "absl/strings/string_view.h" -#include "rtc_base/bitbuffer.h" +#include "rtc_base/bit_buffer.h" namespace webrtc { @@ -44,4 +44,4 @@ size_t DecodeVarInt(rtc::BitBuffer* input, uint64_t* output); } // namespace webrtc -#endif // LOGGING_RTC_EVENT_LOG_ENCODER_VARINT_H_ +#endif // LOGGING_RTC_EVENT_LOG_ENCODER_VAR_INT_H_ diff --git a/logging/rtc_event_log/events/rtc_event.h b/logging/rtc_event_log/events/rtc_event.h index e2ac357322..a3564f0aa1 100644 --- a/logging/rtc_event_log/events/rtc_event.h +++ b/logging/rtc_event_log/events/rtc_event.h @@ -13,7 +13,7 @@ #include -#include "rtc_base/timeutils.h" +#include "rtc_base/time_utils.h" namespace webrtc { diff --git a/logging/rtc_event_log/fake_rtc_event_log.h b/logging/rtc_event_log/fake_rtc_event_log.h index c5ea08aa69..8c0e498148 100644 --- a/logging/rtc_event_log/fake_rtc_event_log.h +++ b/logging/rtc_event_log/fake_rtc_event_log.h @@ -16,7 +16,7 @@ #include "logging/rtc_event_log/events/rtc_event.h" #include "logging/rtc_event_log/rtc_event_log.h" -#include "rtc_base/asyncinvoker.h" +#include "rtc_base/async_invoker.h" #include "rtc_base/thread.h" namespace webrtc { diff --git a/logging/rtc_event_log/ice_logger.cc b/logging/rtc_event_log/ice_logger.cc index c1dbcd8c89..9e69b52785 100644 --- a/logging/rtc_event_log/ice_logger.cc +++ b/logging/rtc_event_log/ice_logger.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "logging/rtc_event_log/icelogger.h" +#include "logging/rtc_event_log/ice_logger.h" #include "absl/memory/memory.h" #include "logging/rtc_event_log/rtc_event_log.h" diff --git a/logging/rtc_event_log/ice_logger.h b/logging/rtc_event_log/ice_logger.h index f14cf0daec..0dea43bf9d 100644 --- a/logging/rtc_event_log/ice_logger.h +++ b/logging/rtc_event_log/ice_logger.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef LOGGING_RTC_EVENT_LOG_ICELOGGER_H_ -#define LOGGING_RTC_EVENT_LOG_ICELOGGER_H_ +#ifndef LOGGING_RTC_EVENT_LOG_ICE_LOGGER_H_ +#define LOGGING_RTC_EVENT_LOG_ICE_LOGGER_H_ #include @@ -53,4 +53,4 @@ class IceEventLog { } // namespace webrtc -#endif // LOGGING_RTC_EVENT_LOG_ICELOGGER_H_ +#endif // LOGGING_RTC_EVENT_LOG_ICE_LOGGER_H_ diff --git a/logging/rtc_event_log/output/rtc_event_log_output_file.h b/logging/rtc_event_log/output/rtc_event_log_output_file.h index ae2febb919..5325c5ff16 100644 --- a/logging/rtc_event_log/output/rtc_event_log_output_file.h +++ b/logging/rtc_event_log/output/rtc_event_log_output_file.h @@ -15,7 +15,7 @@ #include #include -#include "api/rtceventlogoutput.h" +#include "api/rtc_event_log_output.h" #include "rtc_base/platform_file.h" // Can't neatly forward PlatformFile. namespace webrtc { diff --git a/logging/rtc_event_log/output/rtc_event_log_output_file_unittest.cc b/logging/rtc_event_log/output/rtc_event_log_output_file_unittest.cc index 2893c93154..7d7cdf7a6b 100644 --- a/logging/rtc_event_log/output/rtc_event_log_output_file_unittest.cc +++ b/logging/rtc_event_log/output/rtc_event_log_output_file_unittest.cc @@ -18,7 +18,7 @@ #include "absl/memory/memory.h" #include "rtc_base/checks.h" #include "test/gtest.h" -#include "test/testsupport/fileutils.h" +#include "test/testsupport/file_utils.h" namespace webrtc { diff --git a/logging/rtc_event_log/rtc_event_log.h b/logging/rtc_event_log/rtc_event_log.h index 8db0e625b8..60fbf0f20f 100644 --- a/logging/rtc_event_log/rtc_event_log.h +++ b/logging/rtc_event_log/rtc_event_log.h @@ -14,7 +14,7 @@ #include #include -#include "api/rtceventlogoutput.h" +#include "api/rtc_event_log_output.h" #include "logging/rtc_event_log/events/rtc_event.h" namespace webrtc { diff --git a/logging/rtc_event_log/rtc_event_log_impl.cc b/logging/rtc_event_log/rtc_event_log_impl.cc index 9a64788924..66a7fb7ee2 100644 --- a/logging/rtc_event_log/rtc_event_log_impl.cc +++ b/logging/rtc_event_log/rtc_event_log_impl.cc @@ -19,11 +19,11 @@ #include "absl/memory/memory.h" #include "absl/types/optional.h" -#include "api/rtceventlogoutput.h" +#include "api/rtc_event_log_output.h" #include "logging/rtc_event_log/encoder/rtc_event_log_encoder_legacy.h" #include "logging/rtc_event_log/encoder/rtc_event_log_encoder_new_format.h" #include "rtc_base/checks.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" #include "rtc_base/event.h" #include "rtc_base/logging.h" #include "rtc_base/numerics/safe_conversions.h" diff --git a/logging/rtc_event_log/rtc_event_log_parser.cc b/logging/rtc_event_log/rtc_event_log_parser.cc index 6f9f979ece..abf6c7b7e5 100644 --- a/logging/rtc_event_log/rtc_event_log_parser.cc +++ b/logging/rtc_event_log/rtc_event_log_parser.cc @@ -23,7 +23,7 @@ #include "absl/memory/memory.h" #include "absl/types/optional.h" #include "api/rtp_headers.h" -#include "api/rtpparameters.h" +#include "api/rtp_parameters.h" #include "logging/rtc_event_log/encoder/blob_encoding.h" #include "logging/rtc_event_log/encoder/delta_encoding.h" #include "logging/rtc_event_log/encoder/rtc_event_log_encoder_common.h" diff --git a/logging/rtc_event_log/rtc_event_log_unittest.cc b/logging/rtc_event_log/rtc_event_log_unittest.cc index 842687ef41..ec68ad2461 100644 --- a/logging/rtc_event_log/rtc_event_log_unittest.cc +++ b/logging/rtc_event_log/rtc_event_log_unittest.cc @@ -43,10 +43,10 @@ #include "modules/rtp_rtcp/include/rtp_header_extension_map.h" #include "modules/rtp_rtcp/source/rtp_header_extensions.h" #include "rtc_base/checks.h" -#include "rtc_base/fakeclock.h" +#include "rtc_base/fake_clock.h" #include "rtc_base/random.h" #include "test/gtest.h" -#include "test/testsupport/fileutils.h" +#include "test/testsupport/file_utils.h" namespace webrtc { diff --git a/logging/rtc_event_log/rtc_event_log_unittest_helper.cc b/logging/rtc_event_log/rtc_event_log_unittest_helper.cc index e30d989a76..dff2952f4c 100644 --- a/logging/rtc_event_log/rtc_event_log_unittest_helper.cc +++ b/logging/rtc_event_log/rtc_event_log_unittest_helper.cc @@ -24,7 +24,7 @@ #include "absl/types/optional.h" #include "api/array_view.h" #include "api/rtp_headers.h" -#include "api/rtpparameters.h" +#include "api/rtp_parameters.h" #include "modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor_config.h" #include "modules/remote_bitrate_estimator/include/bwe_defines.h" #include "modules/rtp_rtcp/include/rtp_cvo.h" diff --git a/logging/rtc_event_log/rtc_stream_config.h b/logging/rtc_event_log/rtc_stream_config.h index a9da4814e6..6522f994eb 100644 --- a/logging/rtc_event_log/rtc_stream_config.h +++ b/logging/rtc_event_log/rtc_stream_config.h @@ -16,7 +16,7 @@ #include #include "api/rtp_headers.h" -#include "api/rtpparameters.h" +#include "api/rtp_parameters.h" namespace webrtc { namespace rtclog { diff --git a/media/BUILD.gn b/media/BUILD.gn index 515496b318..c2eeeb5e73 100644 --- a/media/BUILD.gn +++ b/media/BUILD.gn @@ -51,7 +51,7 @@ rtc_source_set("rtc_h264_profile_id") { rtc_source_set("rtc_media_config") { visibility = [ "*" ] sources = [ - "base/mediaconfig.h", + "base/media_config.h", ] } @@ -85,38 +85,38 @@ rtc_static_library("rtc_media_base") { "../rtc_base:stringutils", ] sources = [ - "base/adaptedvideotracksource.cc", - "base/adaptedvideotracksource.h", - "base/audiosource.h", + "base/adapted_video_track_source.cc", + "base/adapted_video_track_source.h", + "base/audio_source.h", "base/codec.cc", "base/codec.h", "base/device.h", - "base/mediachannel.cc", - "base/mediachannel.h", - "base/mediaconstants.cc", - "base/mediaconstants.h", - "base/mediaengine.cc", - "base/mediaengine.h", - "base/riddescription.cc", - "base/riddescription.h", - "base/rtpdataengine.cc", - "base/rtpdataengine.h", - "base/rtputils.cc", - "base/rtputils.h", - "base/streamparams.cc", - "base/streamparams.h", - "base/turnutils.cc", - "base/turnutils.h", - "base/videoadapter.cc", - "base/videoadapter.h", - "base/videobroadcaster.cc", - "base/videobroadcaster.h", - "base/videocapturer.cc", - "base/videocapturer.h", - "base/videocommon.cc", - "base/videocommon.h", - "base/videosourcebase.cc", - "base/videosourcebase.h", + "base/media_channel.cc", + "base/media_channel.h", + "base/media_constants.cc", + "base/media_constants.h", + "base/media_engine.cc", + "base/media_engine.h", + "base/rid_description.cc", + "base/rid_description.h", + "base/rtp_data_engine.cc", + "base/rtp_data_engine.h", + "base/rtp_utils.cc", + "base/rtp_utils.h", + "base/stream_params.cc", + "base/stream_params.h", + "base/turn_utils.cc", + "base/turn_utils.h", + "base/video_adapter.cc", + "base/video_adapter.h", + "base/video_broadcaster.cc", + "base/video_broadcaster.h", + "base/video_capturer.cc", + "base/video_capturer.h", + "base/video_common.cc", + "base/video_common.h", + "base/video_source_base.cc", + "base/video_source_base.h", ] if (!build_with_chromium && is_clang) { @@ -234,22 +234,22 @@ rtc_static_library("rtc_internal_video_codecs") { sources = [ "engine/convert_legacy_video_factory.cc", "engine/convert_legacy_video_factory.h", - "engine/internaldecoderfactory.cc", - "engine/internaldecoderfactory.h", - "engine/internalencoderfactory.cc", - "engine/internalencoderfactory.h", - "engine/multiplexcodecfactory.cc", - "engine/multiplexcodecfactory.h", - "engine/scopedvideodecoder.cc", - "engine/scopedvideodecoder.h", - "engine/scopedvideoencoder.cc", - "engine/scopedvideoencoder.h", + "engine/internal_decoder_factory.cc", + "engine/internal_decoder_factory.h", + "engine/internal_encoder_factory.cc", + "engine/internal_encoder_factory.h", + "engine/multiplex_codec_factory.cc", + "engine/multiplex_codec_factory.h", + "engine/scoped_video_decoder.cc", + "engine/scoped_video_decoder.h", + "engine/scoped_video_encoder.cc", + "engine/scoped_video_encoder.h", # TODO(bugs.webrtc.org/7925): stop exporting this header once downstream # targets depend on :rtc_encoder_simulcast_proxy directly. "engine/encoder_simulcast_proxy.h", - "engine/webrtcvideodecoderfactory.h", - "engine/webrtcvideoencoderfactory.h", + "engine/webrtc_video_decoder_factory.h", + "engine/webrtc_video_encoder_factory.h", ] if (!build_with_chromium && is_clang) { @@ -311,21 +311,21 @@ rtc_static_library("rtc_audio_video") { "engine/adm_helpers.h", "engine/apm_helpers.cc", "engine/apm_helpers.h", - "engine/nullwebrtcvideoengine.h", + "engine/null_webrtc_video_engine.h", "engine/payload_type_mapper.cc", "engine/payload_type_mapper.h", "engine/simulcast.cc", "engine/simulcast.h", - "engine/webrtcmediaengine.cc", - "engine/webrtcmediaengine.h", - "engine/webrtcvideodecoderfactory.cc", - "engine/webrtcvideodecoderfactory.h", - "engine/webrtcvideoencoderfactory.cc", - "engine/webrtcvideoencoderfactory.h", - "engine/webrtcvideoengine.cc", - "engine/webrtcvideoengine.h", - "engine/webrtcvoiceengine.cc", - "engine/webrtcvoiceengine.h", + "engine/webrtc_media_engine.cc", + "engine/webrtc_media_engine.h", + "engine/webrtc_video_decoder_factory.cc", + "engine/webrtc_video_decoder_factory.h", + "engine/webrtc_video_encoder_factory.cc", + "engine/webrtc_video_encoder_factory.h", + "engine/webrtc_video_engine.cc", + "engine/webrtc_video_engine.h", + "engine/webrtc_voice_engine.cc", + "engine/webrtc_voice_engine.h", ] if (!build_with_chromium && is_clang) { @@ -396,9 +396,9 @@ rtc_static_library("rtc_data") { if (rtc_enable_sctp) { sources = [ - "sctp/sctptransport.cc", - "sctp/sctptransport.h", - "sctp/sctptransportinternal.h", + "sctp/sctp_transport.cc", + "sctp/sctp_transport.h", + "sctp/sctp_transport_internal.h", ] } else { # libtool on mac does not like empty targets. @@ -474,23 +474,23 @@ if (rtc_include_tests) { "//third_party/abseil-cpp/absl/strings", ] sources = [ - "base/fakeframesource.cc", - "base/fakeframesource.h", - "base/fakemediaengine.cc", - "base/fakemediaengine.h", - "base/fakenetworkinterface.h", - "base/fakertp.cc", - "base/fakertp.h", - "base/fakevideocapturer.cc", - "base/fakevideocapturer.h", - "base/fakevideorenderer.cc", - "base/fakevideorenderer.h", - "base/testutils.cc", - "base/testutils.h", - "engine/fakewebrtccall.cc", - "engine/fakewebrtccall.h", - "engine/fakewebrtcvideoengine.cc", - "engine/fakewebrtcvideoengine.h", + "base/fake_frame_source.cc", + "base/fake_frame_source.h", + "base/fake_media_engine.cc", + "base/fake_media_engine.h", + "base/fake_network_interface.h", + "base/fake_rtp.cc", + "base/fake_rtp.h", + "base/fake_video_capturer.cc", + "base/fake_video_capturer.h", + "base/fake_video_renderer.cc", + "base/fake_video_renderer.h", + "base/test_utils.cc", + "base/test_utils.h", + "engine/fake_webrtc_call.cc", + "engine/fake_webrtc_call.h", + "engine/fake_webrtc_video_engine.cc", + "engine/fake_webrtc_video_engine.h", ] if (!build_with_chromium && is_clang) { @@ -577,35 +577,35 @@ if (rtc_include_tests) { ] sources = [ "base/codec_unittest.cc", - "base/rtpdataengine_unittest.cc", - "base/rtputils_unittest.cc", - "base/streamparams_unittest.cc", - "base/turnutils_unittest.cc", - "base/videoadapter_unittest.cc", - "base/videobroadcaster_unittest.cc", - "base/videocapturer_unittest.cc", - "base/videocommon_unittest.cc", + "base/rtp_data_engine_unittest.cc", + "base/rtp_utils_unittest.cc", + "base/stream_params_unittest.cc", + "base/turn_utils_unittest.cc", + "base/video_adapter_unittest.cc", + "base/video_broadcaster_unittest.cc", + "base/video_capturer_unittest.cc", + "base/video_common_unittest.cc", "engine/apm_helpers_unittest.cc", "engine/encoder_simulcast_proxy_unittest.cc", - "engine/internaldecoderfactory_unittest.cc", - "engine/multiplexcodecfactory_unittest.cc", - "engine/nullwebrtcvideoengine_unittest.cc", + "engine/internal_decoder_factory_unittest.cc", + "engine/multiplex_codec_factory_unittest.cc", + "engine/null_webrtc_video_engine_unittest.cc", "engine/payload_type_mapper_unittest.cc", "engine/simulcast_encoder_adapter_unittest.cc", "engine/simulcast_unittest.cc", - "engine/webrtcmediaengine_unittest.cc", - "engine/webrtcvideoencoderfactory_unittest.cc", - "engine/webrtcvideoengine_unittest.cc", + "engine/webrtc_media_engine_unittest.cc", + "engine/webrtc_video_encoder_factory_unittest.cc", + "engine/webrtc_video_engine_unittest.cc", ] # TODO(kthelgason): Reenable this test on iOS. # See bugs.webrtc.org/5569 if (!is_ios) { - sources += [ "engine/webrtcvoiceengine_unittest.cc" ] + sources += [ "engine/webrtc_voice_engine_unittest.cc" ] } if (rtc_enable_sctp) { - sources += [ "sctp/sctptransport_unittest.cc" ] + sources += [ "sctp/sctp_transport_unittest.cc" ] } if (rtc_use_h264) { diff --git a/media/base/adapted_video_track_source.cc b/media/base/adapted_video_track_source.cc index c0a4d3668b..531fa450a3 100644 --- a/media/base/adapted_video_track_source.cc +++ b/media/base/adapted_video_track_source.cc @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "media/base/adaptedvideotracksource.h" +#include "media/base/adapted_video_track_source.h" #include "api/video/i420_buffer.h" #include "api/video/video_frame_buffer.h" #include "api/video/video_rotation.h" #include "rtc_base/checks.h" #include "rtc_base/scoped_ref_ptr.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/time_utils.h" namespace rtc { diff --git a/media/base/adapted_video_track_source.h b/media/base/adapted_video_track_source.h index 9cd467f664..a995fe851d 100644 --- a/media/base/adapted_video_track_source.h +++ b/media/base/adapted_video_track_source.h @@ -8,20 +8,20 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef MEDIA_BASE_ADAPTEDVIDEOTRACKSOURCE_H_ -#define MEDIA_BASE_ADAPTEDVIDEOTRACKSOURCE_H_ +#ifndef MEDIA_BASE_ADAPTED_VIDEO_TRACK_SOURCE_H_ +#define MEDIA_BASE_ADAPTED_VIDEO_TRACK_SOURCE_H_ #include #include "absl/types/optional.h" -#include "api/mediastreaminterface.h" +#include "api/media_stream_interface.h" #include "api/notifier.h" #include "api/video/video_frame.h" #include "api/video/video_sink_interface.h" #include "api/video/video_source_interface.h" -#include "media/base/videoadapter.h" -#include "media/base/videobroadcaster.h" -#include "rtc_base/criticalsection.h" +#include "media/base/video_adapter.h" +#include "media/base/video_broadcaster.h" +#include "rtc_base/critical_section.h" #include "rtc_base/thread_annotations.h" #include "rtc_base/thread_checker.h" @@ -91,4 +91,4 @@ class AdaptedVideoTrackSource } // namespace rtc -#endif // MEDIA_BASE_ADAPTEDVIDEOTRACKSOURCE_H_ +#endif // MEDIA_BASE_ADAPTED_VIDEO_TRACK_SOURCE_H_ diff --git a/media/base/audio_source.h b/media/base/audio_source.h index 199b614850..d5cf629173 100644 --- a/media/base/audio_source.h +++ b/media/base/audio_source.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef MEDIA_BASE_AUDIOSOURCE_H_ -#define MEDIA_BASE_AUDIOSOURCE_H_ +#ifndef MEDIA_BASE_AUDIO_SOURCE_H_ +#define MEDIA_BASE_AUDIO_SOURCE_H_ #include @@ -46,4 +46,4 @@ class AudioSource { } // namespace cricket -#endif // MEDIA_BASE_AUDIOSOURCE_H_ +#endif // MEDIA_BASE_AUDIO_SOURCE_H_ diff --git a/media/base/codec.cc b/media/base/codec.cc index 0a1c7156af..805a79ea20 100644 --- a/media/base/codec.cc +++ b/media/base/codec.cc @@ -17,7 +17,7 @@ #include "media/base/vp9_profile.h" #include "rtc_base/checks.h" #include "rtc_base/logging.h" -#include "rtc_base/stringencode.h" +#include "rtc_base/string_encode.h" #include "rtc_base/strings/string_builder.h" namespace cricket { diff --git a/media/base/codec.h b/media/base/codec.h index 0ca6535287..fe4455d2ce 100644 --- a/media/base/codec.h +++ b/media/base/codec.h @@ -16,9 +16,9 @@ #include #include -#include "api/rtpparameters.h" +#include "api/rtp_parameters.h" #include "api/video_codecs/sdp_video_format.h" -#include "media/base/mediaconstants.h" +#include "media/base/media_constants.h" #include "rtc_base/system/rtc_export.h" namespace cricket { diff --git a/media/base/device.h b/media/base/device.h index 7910c97400..9ae844f566 100644 --- a/media/base/device.h +++ b/media/base/device.h @@ -13,7 +13,7 @@ #include -#include "rtc_base/stringencode.h" +#include "rtc_base/string_encode.h" namespace cricket { diff --git a/media/base/fake_frame_source.cc b/media/base/fake_frame_source.cc index 5f829af440..2573db1900 100644 --- a/media/base/fake_frame_source.cc +++ b/media/base/fake_frame_source.cc @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "media/base/fakeframesource.h" +#include "media/base/fake_frame_source.h" #include "api/video/i420_buffer.h" #include "api/video/video_frame_buffer.h" #include "rtc_base/checks.h" #include "rtc_base/scoped_ref_ptr.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/time_utils.h" namespace cricket { diff --git a/media/base/fake_frame_source.h b/media/base/fake_frame_source.h index fb433ae436..d6f71be4c7 100644 --- a/media/base/fake_frame_source.h +++ b/media/base/fake_frame_source.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef MEDIA_BASE_FAKEFRAMESOURCE_H_ -#define MEDIA_BASE_FAKEFRAMESOURCE_H_ +#ifndef MEDIA_BASE_FAKE_FRAME_SOURCE_H_ +#define MEDIA_BASE_FAKE_FRAME_SOURCE_H_ #include "api/video/video_frame.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/time_utils.h" namespace cricket { @@ -48,4 +48,4 @@ class FakeFrameSource { } // namespace cricket -#endif // MEDIA_BASE_FAKEFRAMESOURCE_H_ +#endif // MEDIA_BASE_FAKE_FRAME_SOURCE_H_ diff --git a/media/base/fake_media_engine.cc b/media/base/fake_media_engine.cc index b48206fd77..ab8ce9926b 100644 --- a/media/base/fake_media_engine.cc +++ b/media/base/fake_media_engine.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "media/base/fakemediaengine.h" +#include "media/base/fake_media_engine.h" #include diff --git a/media/base/fake_media_engine.h b/media/base/fake_media_engine.h index e3a0638715..ff8f44d78a 100644 --- a/media/base/fake_media_engine.h +++ b/media/base/fake_media_engine.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef MEDIA_BASE_FAKEMEDIAENGINE_H_ -#define MEDIA_BASE_FAKEMEDIAENGINE_H_ +#ifndef MEDIA_BASE_FAKE_MEDIA_ENGINE_H_ +#define MEDIA_BASE_FAKE_MEDIA_ENGINE_H_ #include #include @@ -20,14 +20,14 @@ #include #include "api/call/audio_sink.h" -#include "media/base/audiosource.h" -#include "media/base/mediaengine.h" -#include "media/base/rtputils.h" -#include "media/base/streamparams.h" -#include "media/engine/webrtcvideoengine.h" +#include "media/base/audio_source.h" +#include "media/base/media_engine.h" +#include "media/base/rtp_utils.h" +#include "media/base/stream_params.h" +#include "media/engine/webrtc_video_engine.h" #include "modules/audio_processing/include/audio_processing.h" -#include "rtc_base/copyonwritebuffer.h" -#include "rtc_base/networkroute.h" +#include "rtc_base/copy_on_write_buffer.h" +#include "rtc_base/network_route.h" using webrtc::RtpExtension; @@ -594,4 +594,4 @@ class FakeDataEngine : public DataEngineInterface { } // namespace cricket -#endif // MEDIA_BASE_FAKEMEDIAENGINE_H_ +#endif // MEDIA_BASE_FAKE_MEDIA_ENGINE_H_ diff --git a/media/base/fake_network_interface.h b/media/base/fake_network_interface.h index dfd340772b..e61202ffd3 100644 --- a/media/base/fake_network_interface.h +++ b/media/base/fake_network_interface.h @@ -8,21 +8,21 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef MEDIA_BASE_FAKENETWORKINTERFACE_H_ -#define MEDIA_BASE_FAKENETWORKINTERFACE_H_ +#ifndef MEDIA_BASE_FAKE_NETWORK_INTERFACE_H_ +#define MEDIA_BASE_FAKE_NETWORK_INTERFACE_H_ #include #include #include -#include "media/base/mediachannel.h" -#include "media/base/rtputils.h" -#include "rtc_base/byteorder.h" -#include "rtc_base/copyonwritebuffer.h" -#include "rtc_base/criticalsection.h" +#include "media/base/media_channel.h" +#include "media/base/rtp_utils.h" +#include "rtc_base/byte_order.h" +#include "rtc_base/copy_on_write_buffer.h" +#include "rtc_base/critical_section.h" #include "rtc_base/dscp.h" -#include "rtc_base/messagehandler.h" -#include "rtc_base/messagequeue.h" +#include "rtc_base/message_handler.h" +#include "rtc_base/message_queue.h" #include "rtc_base/thread.h" namespace cricket { @@ -224,4 +224,4 @@ class FakeNetworkInterface : public MediaChannel::NetworkInterface, } // namespace cricket -#endif // MEDIA_BASE_FAKENETWORKINTERFACE_H_ +#endif // MEDIA_BASE_FAKE_NETWORK_INTERFACE_H_ diff --git a/media/base/fake_rtp.cc b/media/base/fake_rtp.cc index 2bf0211f08..751766e8fe 100644 --- a/media/base/fake_rtp.cc +++ b/media/base/fake_rtp.cc @@ -12,7 +12,7 @@ #include #include -#include "media/base/fakertp.h" +#include "media/base/fake_rtp.h" #include "rtc_base/checks.h" #include "test/gtest.h" diff --git a/media/base/fake_rtp.h b/media/base/fake_rtp.h index 946f302b00..07c8e72f3e 100644 --- a/media/base/fake_rtp.h +++ b/media/base/fake_rtp.h @@ -10,8 +10,8 @@ // Fake RTP and RTCP packets to use in unit tests. -#ifndef MEDIA_BASE_FAKERTP_H_ -#define MEDIA_BASE_FAKERTP_H_ +#ifndef MEDIA_BASE_FAKE_RTP_H_ +#define MEDIA_BASE_FAKE_RTP_H_ #include // size_t #include @@ -120,4 +120,4 @@ void CompareHeaderExtensions(const char* packet1, const std::vector encrypted_headers, bool expect_equal); -#endif // MEDIA_BASE_FAKERTP_H_ +#endif // MEDIA_BASE_FAKE_RTP_H_ diff --git a/media/base/fake_video_capturer.cc b/media/base/fake_video_capturer.cc index c6043875f7..7535b164ae 100644 --- a/media/base/fake_video_capturer.cc +++ b/media/base/fake_video_capturer.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "media/base/fakevideocapturer.h" +#include "media/base/fake_video_capturer.h" #include #include @@ -19,7 +19,7 @@ #include "rtc_base/arraysize.h" #include "rtc_base/checks.h" #include "rtc_base/scoped_ref_ptr.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/time_utils.h" namespace cricket { diff --git a/media/base/fake_video_capturer.h b/media/base/fake_video_capturer.h index 4a49f4504a..3cb64b0554 100644 --- a/media/base/fake_video_capturer.h +++ b/media/base/fake_video_capturer.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef MEDIA_BASE_FAKEVIDEOCAPTURER_H_ -#define MEDIA_BASE_FAKEVIDEOCAPTURER_H_ +#ifndef MEDIA_BASE_FAKE_VIDEO_CAPTURER_H_ +#define MEDIA_BASE_FAKE_VIDEO_CAPTURER_H_ #include @@ -18,11 +18,11 @@ #include "api/video/i420_buffer.h" #include "api/video/video_frame.h" -#include "media/base/fakeframesource.h" -#include "media/base/videocapturer.h" -#include "media/base/videocommon.h" +#include "media/base/fake_frame_source.h" +#include "media/base/video_capturer.h" +#include "media/base/video_common.h" #include "rtc_base/task_queue_for_test.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/time_utils.h" namespace cricket { @@ -77,4 +77,4 @@ class FakeVideoCapturerWithTaskQueue : public FakeVideoCapturer { } // namespace cricket -#endif // MEDIA_BASE_FAKEVIDEOCAPTURER_H_ +#endif // MEDIA_BASE_FAKE_VIDEO_CAPTURER_H_ diff --git a/media/base/fake_video_renderer.cc b/media/base/fake_video_renderer.cc index fdd789a4b7..64de624bde 100644 --- a/media/base/fake_video_renderer.cc +++ b/media/base/fake_video_renderer.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "media/base/fakevideorenderer.h" +#include "media/base/fake_video_renderer.h" namespace cricket { diff --git a/media/base/fake_video_renderer.h b/media/base/fake_video_renderer.h index ce120346d6..4ffa91ee03 100644 --- a/media/base/fake_video_renderer.h +++ b/media/base/fake_video_renderer.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef MEDIA_BASE_FAKEVIDEORENDERER_H_ -#define MEDIA_BASE_FAKEVIDEORENDERER_H_ +#ifndef MEDIA_BASE_FAKE_VIDEO_RENDERER_H_ +#define MEDIA_BASE_FAKE_VIDEO_RENDERER_H_ #include @@ -17,7 +17,7 @@ #include "api/video/video_frame_buffer.h" #include "api/video/video_rotation.h" #include "api/video/video_sink_interface.h" -#include "rtc_base/criticalsection.h" +#include "rtc_base/critical_section.h" #include "rtc_base/scoped_ref_ptr.h" namespace cricket { @@ -122,4 +122,4 @@ class FakeVideoRenderer : public rtc::VideoSinkInterface { } // namespace cricket -#endif // MEDIA_BASE_FAKEVIDEORENDERER_H_ +#endif // MEDIA_BASE_FAKE_VIDEO_RENDERER_H_ diff --git a/media/base/media_channel.cc b/media/base/media_channel.cc index 0634b2e575..3451525648 100644 --- a/media/base/media_channel.cc +++ b/media/base/media_channel.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "media/base/mediachannel.h" +#include "media/base/media_channel.h" namespace cricket { diff --git a/media/base/media_channel.h b/media/base/media_channel.h index 09e752a343..8eecaa0fe9 100644 --- a/media/base/media_channel.h +++ b/media/base/media_channel.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef MEDIA_BASE_MEDIACHANNEL_H_ -#define MEDIA_BASE_MEDIACHANNEL_H_ +#ifndef MEDIA_BASE_MEDIA_CHANNEL_H_ +#define MEDIA_BASE_MEDIA_CHANNEL_H_ #include #include @@ -20,30 +20,30 @@ #include "absl/types/optional.h" #include "api/audio_codecs/audio_encoder.h" #include "api/audio_options.h" -#include "api/crypto/framedecryptorinterface.h" -#include "api/crypto/frameencryptorinterface.h" +#include "api/crypto/frame_decryptor_interface.h" +#include "api/crypto/frame_encryptor_interface.h" #include "api/media_transport_interface.h" -#include "api/rtcerror.h" -#include "api/rtpparameters.h" -#include "api/rtpreceiverinterface.h" +#include "api/rtc_error.h" +#include "api/rtp_parameters.h" +#include "api/rtp_receiver_interface.h" #include "api/video/video_content_type.h" #include "api/video/video_sink_interface.h" #include "api/video/video_source_interface.h" #include "api/video/video_timing.h" #include "api/video_codecs/video_encoder_config.h" #include "media/base/codec.h" -#include "media/base/mediaconfig.h" -#include "media/base/mediaconstants.h" -#include "media/base/streamparams.h" +#include "media/base/media_config.h" +#include "media/base/media_constants.h" +#include "media/base/stream_params.h" #include "modules/audio_processing/include/audio_processing_statistics.h" -#include "rtc_base/asyncpacketsocket.h" +#include "rtc_base/async_packet_socket.h" #include "rtc_base/buffer.h" -#include "rtc_base/copyonwritebuffer.h" +#include "rtc_base/copy_on_write_buffer.h" #include "rtc_base/dscp.h" #include "rtc_base/logging.h" -#include "rtc_base/networkroute.h" +#include "rtc_base/network_route.h" #include "rtc_base/socket.h" -#include "rtc_base/stringencode.h" +#include "rtc_base/string_encode.h" #include "rtc_base/strings/string_builder.h" #include "rtc_base/third_party/sigslot/sigslot.h" @@ -913,4 +913,4 @@ class DataMediaChannel : public MediaChannel { } // namespace cricket -#endif // MEDIA_BASE_MEDIACHANNEL_H_ +#endif // MEDIA_BASE_MEDIA_CHANNEL_H_ diff --git a/media/base/media_config.h b/media/base/media_config.h index c8fc5212a0..eb5d43b315 100644 --- a/media/base/media_config.h +++ b/media/base/media_config.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef MEDIA_BASE_MEDIACONFIG_H_ -#define MEDIA_BASE_MEDIACONFIG_H_ +#ifndef MEDIA_BASE_MEDIA_CONFIG_H_ +#define MEDIA_BASE_MEDIA_CONFIG_H_ namespace cricket { @@ -90,4 +90,4 @@ struct MediaConfig { } // namespace cricket -#endif // MEDIA_BASE_MEDIACONFIG_H_ +#endif // MEDIA_BASE_MEDIA_CONFIG_H_ diff --git a/media/base/media_constants.cc b/media/base/media_constants.cc index 94b91e7003..b10304a26c 100644 --- a/media/base/media_constants.cc +++ b/media/base/media_constants.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "media/base/mediaconstants.h" +#include "media/base/media_constants.h" namespace cricket { diff --git a/media/base/media_constants.h b/media/base/media_constants.h index d7fb20aeef..97dcadc9f3 100644 --- a/media/base/media_constants.h +++ b/media/base/media_constants.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef MEDIA_BASE_MEDIACONSTANTS_H_ -#define MEDIA_BASE_MEDIACONSTANTS_H_ +#ifndef MEDIA_BASE_MEDIA_CONSTANTS_H_ +#define MEDIA_BASE_MEDIA_CONSTANTS_H_ #include @@ -145,4 +145,4 @@ extern const size_t kConferenceMaxNumTemporalLayers; extern const size_t kConferenceDefaultNumTemporalLayers; } // namespace cricket -#endif // MEDIA_BASE_MEDIACONSTANTS_H_ +#endif // MEDIA_BASE_MEDIA_CONSTANTS_H_ diff --git a/media/base/media_engine.cc b/media/base/media_engine.cc index bcdd6b6b9b..91fcc1ea72 100644 --- a/media/base/media_engine.cc +++ b/media/base/media_engine.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "media/base/mediaengine.h" +#include "media/base/media_engine.h" #include #include @@ -17,7 +17,7 @@ #include "api/video/video_bitrate_allocation.h" #include "rtc_base/checks.h" -#include "rtc_base/stringencode.h" +#include "rtc_base/string_encode.h" namespace cricket { diff --git a/media/base/media_engine.h b/media/base/media_engine.h index 01300d48ac..40c9ecc62e 100644 --- a/media/base/media_engine.h +++ b/media/base/media_engine.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef MEDIA_BASE_MEDIAENGINE_H_ -#define MEDIA_BASE_MEDIAENGINE_H_ +#ifndef MEDIA_BASE_MEDIA_ENGINE_H_ +#define MEDIA_BASE_MEDIA_ENGINE_H_ #if defined(WEBRTC_MAC) && !defined(WEBRTC_IOS) #include @@ -21,12 +21,12 @@ #include "api/audio_codecs/audio_decoder_factory.h" #include "api/audio_codecs/audio_encoder_factory.h" -#include "api/crypto/cryptooptions.h" -#include "api/rtpparameters.h" +#include "api/crypto/crypto_options.h" +#include "api/rtp_parameters.h" #include "call/audio_state.h" #include "media/base/codec.h" -#include "media/base/mediachannel.h" -#include "media/base/videocommon.h" +#include "media/base/media_channel.h" +#include "media/base/video_common.h" #include "rtc_base/platform_file.h" namespace webrtc { @@ -155,4 +155,4 @@ webrtc::RtpParameters CreateRtpParametersWithEncodings(StreamParams sp); } // namespace cricket -#endif // MEDIA_BASE_MEDIAENGINE_H_ +#endif // MEDIA_BASE_MEDIA_ENGINE_H_ diff --git a/media/base/rid_description.cc b/media/base/rid_description.cc index 7f0c5d02da..b3eae272f9 100644 --- a/media/base/rid_description.cc +++ b/media/base/rid_description.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "media/base/riddescription.h" +#include "media/base/rid_description.h" namespace cricket { diff --git a/media/base/rid_description.h b/media/base/rid_description.h index 5a616ff26b..04c0f3d4bc 100644 --- a/media/base/rid_description.h +++ b/media/base/rid_description.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef MEDIA_BASE_RIDDESCRIPTION_H_ -#define MEDIA_BASE_RIDDESCRIPTION_H_ +#ifndef MEDIA_BASE_RID_DESCRIPTION_H_ +#define MEDIA_BASE_RID_DESCRIPTION_H_ #include #include @@ -90,4 +90,4 @@ struct RidDescription final { } // namespace cricket -#endif // MEDIA_BASE_RIDDESCRIPTION_H_ +#endif // MEDIA_BASE_RID_DESCRIPTION_H_ diff --git a/media/base/rtp_data_engine.cc b/media/base/rtp_data_engine.cc index c3367c0a1f..42ec8d076f 100644 --- a/media/base/rtp_data_engine.cc +++ b/media/base/rtp_data_engine.cc @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "media/base/rtpdataengine.h" +#include "media/base/rtp_data_engine.h" #include #include "absl/strings/match.h" #include "media/base/codec.h" -#include "media/base/mediaconstants.h" -#include "media/base/rtputils.h" -#include "media/base/streamparams.h" -#include "rtc_base/copyonwritebuffer.h" +#include "media/base/media_constants.h" +#include "media/base/rtp_utils.h" +#include "media/base/stream_params.h" +#include "rtc_base/copy_on_write_buffer.h" #include "rtc_base/data_rate_limiter.h" #include "rtc_base/helpers.h" #include "rtc_base/logging.h" diff --git a/media/base/rtp_data_engine.h b/media/base/rtp_data_engine.h index 42e919039d..f24b224695 100644 --- a/media/base/rtp_data_engine.h +++ b/media/base/rtp_data_engine.h @@ -8,17 +8,17 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef MEDIA_BASE_RTPDATAENGINE_H_ -#define MEDIA_BASE_RTPDATAENGINE_H_ +#ifndef MEDIA_BASE_RTP_DATA_ENGINE_H_ +#define MEDIA_BASE_RTP_DATA_ENGINE_H_ #include #include #include #include -#include "media/base/mediachannel.h" -#include "media/base/mediaconstants.h" -#include "media/base/mediaengine.h" +#include "media/base/media_channel.h" +#include "media/base/media_constants.h" +#include "media/base/media_engine.h" namespace rtc { class DataRateLimiter; @@ -109,4 +109,4 @@ class RtpDataMediaChannel : public DataMediaChannel { } // namespace cricket -#endif // MEDIA_BASE_RTPDATAENGINE_H_ +#endif // MEDIA_BASE_RTP_DATA_ENGINE_H_ diff --git a/media/base/rtp_data_engine_unittest.cc b/media/base/rtp_data_engine_unittest.cc index 23f9f67e8f..d0e4e84076 100644 --- a/media/base/rtp_data_engine_unittest.cc +++ b/media/base/rtp_data_engine_unittest.cc @@ -12,14 +12,14 @@ #include #include -#include "media/base/fakenetworkinterface.h" -#include "media/base/mediaconstants.h" -#include "media/base/rtpdataengine.h" -#include "media/base/rtputils.h" -#include "rtc_base/copyonwritebuffer.h" -#include "rtc_base/fakeclock.h" +#include "media/base/fake_network_interface.h" +#include "media/base/media_constants.h" +#include "media/base/rtp_data_engine.h" +#include "media/base/rtp_utils.h" +#include "rtc_base/copy_on_write_buffer.h" +#include "rtc_base/fake_clock.h" #include "rtc_base/third_party/sigslot/sigslot.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/time_utils.h" #include "test/gtest.h" class FakeDataReceiver : public sigslot::has_slots<> { diff --git a/media/base/rtp_utils.cc b/media/base/rtp_utils.cc index 40e2f9a3f3..b162fe590e 100644 --- a/media/base/rtp_utils.cc +++ b/media/base/rtp_utils.cc @@ -8,18 +8,18 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "media/base/rtputils.h" +#include "media/base/rtp_utils.h" #include #include // PacketTimeUpdateParams is defined in asyncpacketsocket.h. // TODO(sergeyu): Find more appropriate place for PacketTimeUpdateParams. -#include "media/base/turnutils.h" -#include "rtc_base/asyncpacketsocket.h" -#include "rtc_base/byteorder.h" +#include "media/base/turn_utils.h" +#include "rtc_base/async_packet_socket.h" +#include "rtc_base/byte_order.h" #include "rtc_base/checks.h" -#include "rtc_base/messagedigest.h" +#include "rtc_base/message_digest.h" namespace cricket { diff --git a/media/base/rtp_utils.h b/media/base/rtp_utils.h index c5fe14fb3d..93f3103b9c 100644 --- a/media/base/rtp_utils.h +++ b/media/base/rtp_utils.h @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef MEDIA_BASE_RTPUTILS_H_ -#define MEDIA_BASE_RTPUTILS_H_ +#ifndef MEDIA_BASE_RTP_UTILS_H_ +#define MEDIA_BASE_RTP_UTILS_H_ -#include "rtc_base/byteorder.h" +#include "rtc_base/byte_order.h" #include "rtc_base/system/rtc_export.h" namespace rtc { @@ -89,4 +89,4 @@ ApplyPacketOptions(uint8_t* data, } // namespace cricket -#endif // MEDIA_BASE_RTPUTILS_H_ +#endif // MEDIA_BASE_RTP_UTILS_H_ diff --git a/media/base/rtp_utils_unittest.cc b/media/base/rtp_utils_unittest.cc index d07ce8db27..8ac68a4472 100644 --- a/media/base/rtp_utils_unittest.cc +++ b/media/base/rtp_utils_unittest.cc @@ -12,9 +12,9 @@ #include #include -#include "media/base/fakertp.h" -#include "media/base/rtputils.h" -#include "rtc_base/asyncpacketsocket.h" +#include "media/base/fake_rtp.h" +#include "media/base/rtp_utils.h" +#include "rtc_base/async_packet_socket.h" #include "test/gtest.h" namespace cricket { diff --git a/media/base/stream_params.cc b/media/base/stream_params.cc index 8fb1719c90..f89e56537d 100644 --- a/media/base/stream_params.cc +++ b/media/base/stream_params.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "media/base/streamparams.h" +#include "media/base/stream_params.h" #include #include diff --git a/media/base/stream_params.h b/media/base/stream_params.h index f1285329c8..b53e04772c 100644 --- a/media/base/stream_params.h +++ b/media/base/stream_params.h @@ -43,8 +43,8 @@ // See https://tools.ietf.org/html/draft-ietf-mmusic-sdp-simulcast-13 // and https://tools.ietf.org/html/draft-ietf-mmusic-rid-15. -#ifndef MEDIA_BASE_STREAMPARAMS_H_ -#define MEDIA_BASE_STREAMPARAMS_H_ +#ifndef MEDIA_BASE_STREAM_PARAMS_H_ +#define MEDIA_BASE_STREAM_PARAMS_H_ #include #include @@ -52,8 +52,8 @@ #include #include -#include "media/base/riddescription.h" -#include "rtc_base/constructormagic.h" +#include "media/base/rid_description.h" +#include "rtc_base/constructor_magic.h" namespace cricket { @@ -374,4 +374,4 @@ bool IsSimulcastStream(const StreamParams& sp); } // namespace cricket -#endif // MEDIA_BASE_STREAMPARAMS_H_ +#endif // MEDIA_BASE_STREAM_PARAMS_H_ diff --git a/media/base/stream_params_unittest.cc b/media/base/stream_params_unittest.cc index d552578a7c..f0041332c8 100644 --- a/media/base/stream_params_unittest.cc +++ b/media/base/stream_params_unittest.cc @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "media/base/streamparams.h" +#include "media/base/stream_params.h" #include -#include "media/base/testutils.h" +#include "media/base/test_utils.h" #include "rtc_base/arraysize.h" #include "test/gtest.h" diff --git a/media/base/test_utils.cc b/media/base/test_utils.cc index 87f5010a56..a6d5f61c17 100644 --- a/media/base/test_utils.cc +++ b/media/base/test_utils.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "media/base/testutils.h" +#include "media/base/test_utils.h" #include diff --git a/media/base/test_utils.h b/media/base/test_utils.h index e08147b7f5..46783a17f5 100644 --- a/media/base/test_utils.h +++ b/media/base/test_utils.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef MEDIA_BASE_TESTUTILS_H_ -#define MEDIA_BASE_TESTUTILS_H_ +#ifndef MEDIA_BASE_TEST_UTILS_H_ +#define MEDIA_BASE_TEST_UTILS_H_ #include #include -#include "media/base/mediachannel.h" -#include "media/base/videocommon.h" +#include "media/base/media_channel.h" +#include "media/base/video_common.h" #include "rtc_base/arraysize.h" namespace webrtc { @@ -65,4 +65,4 @@ cricket::StreamParams CreatePrimaryWithFecFrStreamParams( } // namespace cricket -#endif // MEDIA_BASE_TESTUTILS_H_ +#endif // MEDIA_BASE_TEST_UTILS_H_ diff --git a/media/base/turn_utils.cc b/media/base/turn_utils.cc index 16df7d0ca1..c0f1a28224 100644 --- a/media/base/turn_utils.cc +++ b/media/base/turn_utils.cc @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "media/base/turnutils.h" +#include "media/base/turn_utils.h" #include "p2p/base/stun.h" -#include "rtc_base/byteorder.h" +#include "rtc_base/byte_order.h" namespace cricket { diff --git a/media/base/turn_utils.h b/media/base/turn_utils.h index 7aa0651cea..ed8e282ba7 100644 --- a/media/base/turn_utils.h +++ b/media/base/turn_utils.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef MEDIA_BASE_TURNUTILS_H_ -#define MEDIA_BASE_TURNUTILS_H_ +#ifndef MEDIA_BASE_TURN_UTILS_H_ +#define MEDIA_BASE_TURN_UTILS_H_ #include #include @@ -29,4 +29,4 @@ bool RTC_EXPORT UnwrapTurnPacket(const uint8_t* packet, } // namespace cricket -#endif // MEDIA_BASE_TURNUTILS_H_ +#endif // MEDIA_BASE_TURN_UTILS_H_ diff --git a/media/base/turn_utils_unittest.cc b/media/base/turn_utils_unittest.cc index 256f5ac0c7..f7bbf8b8d4 100644 --- a/media/base/turn_utils_unittest.cc +++ b/media/base/turn_utils_unittest.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "media/base/turnutils.h" +#include "media/base/turn_utils.h" #include "test/gtest.h" diff --git a/media/base/video_adapter.cc b/media/base/video_adapter.cc index 3e240a050d..4f1181e65a 100644 --- a/media/base/video_adapter.cc +++ b/media/base/video_adapter.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "media/base/videoadapter.h" +#include "media/base/video_adapter.h" #include #include @@ -17,10 +17,10 @@ #include #include "absl/types/optional.h" -#include "media/base/videocommon.h" +#include "media/base/video_common.h" #include "rtc_base/checks.h" #include "rtc_base/logging.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/time_utils.h" namespace { struct Fraction { diff --git a/media/base/video_adapter.h b/media/base/video_adapter.h index 0ce5c056fe..83f2f01204 100644 --- a/media/base/video_adapter.h +++ b/media/base/video_adapter.h @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef MEDIA_BASE_VIDEOADAPTER_H_ -#define MEDIA_BASE_VIDEOADAPTER_H_ +#ifndef MEDIA_BASE_VIDEO_ADAPTER_H_ +#define MEDIA_BASE_VIDEO_ADAPTER_H_ #include #include #include "absl/types/optional.h" -#include "media/base/videocommon.h" -#include "rtc_base/constructormagic.h" -#include "rtc_base/criticalsection.h" +#include "media/base/video_common.h" +#include "rtc_base/constructor_magic.h" +#include "rtc_base/critical_section.h" #include "rtc_base/thread_annotations.h" namespace cricket { @@ -134,4 +134,4 @@ class VideoAdapter { } // namespace cricket -#endif // MEDIA_BASE_VIDEOADAPTER_H_ +#endif // MEDIA_BASE_VIDEO_ADAPTER_H_ diff --git a/media/base/video_adapter_unittest.cc b/media/base/video_adapter_unittest.cc index d7b328f19f..f50e13b11c 100644 --- a/media/base/video_adapter_unittest.cc +++ b/media/base/video_adapter_unittest.cc @@ -14,9 +14,9 @@ #include "absl/memory/memory.h" #include "api/video/video_frame.h" -#include "media/base/fakeframesource.h" -#include "media/base/videoadapter.h" -#include "rtc_base/timeutils.h" +#include "media/base/fake_frame_source.h" +#include "media/base/video_adapter.h" +#include "rtc_base/time_utils.h" #include "test/gtest.h" namespace cricket { diff --git a/media/base/video_broadcaster.cc b/media/base/video_broadcaster.cc index 4ee6045f4e..a2009f21b3 100644 --- a/media/base/video_broadcaster.cc +++ b/media/base/video_broadcaster.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "media/base/videobroadcaster.h" +#include "media/base/video_broadcaster.h" #include diff --git a/media/base/video_broadcaster.h b/media/base/video_broadcaster.h index 18bfc9d06f..a99e0442d5 100644 --- a/media/base/video_broadcaster.h +++ b/media/base/video_broadcaster.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef MEDIA_BASE_VIDEOBROADCASTER_H_ -#define MEDIA_BASE_VIDEOBROADCASTER_H_ +#ifndef MEDIA_BASE_VIDEO_BROADCASTER_H_ +#define MEDIA_BASE_VIDEO_BROADCASTER_H_ #include "api/video/video_frame_buffer.h" #include "api/video/video_source_interface.h" -#include "media/base/videosourcebase.h" -#include "rtc_base/criticalsection.h" +#include "media/base/video_source_base.h" +#include "rtc_base/critical_section.h" #include "rtc_base/scoped_ref_ptr.h" #include "rtc_base/thread_annotations.h" #include "rtc_base/thread_checker.h" @@ -64,4 +64,4 @@ class VideoBroadcaster : public VideoSourceBase, } // namespace rtc -#endif // MEDIA_BASE_VIDEOBROADCASTER_H_ +#endif // MEDIA_BASE_VIDEO_BROADCASTER_H_ diff --git a/media/base/video_broadcaster_unittest.cc b/media/base/video_broadcaster_unittest.cc index 5b191a7ab0..cb76d9f8e5 100644 --- a/media/base/video_broadcaster_unittest.cc +++ b/media/base/video_broadcaster_unittest.cc @@ -14,8 +14,8 @@ #include "api/video/i420_buffer.h" #include "api/video/video_frame.h" #include "api/video/video_rotation.h" -#include "media/base/fakevideorenderer.h" -#include "media/base/videobroadcaster.h" +#include "media/base/fake_video_renderer.h" +#include "media/base/video_broadcaster.h" #include "test/gtest.h" using rtc::VideoBroadcaster; diff --git a/media/base/video_capturer.cc b/media/base/video_capturer.cc index 20dcf4e502..76c00473f6 100644 --- a/media/base/video_capturer.cc +++ b/media/base/video_capturer.cc @@ -10,7 +10,7 @@ // Implementation file of class VideoCapturer. -#include "media/base/videocapturer.h" +#include "media/base/video_capturer.h" #include @@ -21,7 +21,7 @@ #include "rtc_base/checks.h" #include "rtc_base/logging.h" #include "rtc_base/scoped_ref_ptr.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/time_utils.h" namespace cricket { diff --git a/media/base/video_capturer.h b/media/base/video_capturer.h index 32742062aa..05219be014 100644 --- a/media/base/video_capturer.h +++ b/media/base/video_capturer.h @@ -10,8 +10,8 @@ // Declaration of abstract class VideoCapturer -#ifndef MEDIA_BASE_VIDEOCAPTURER_H_ -#define MEDIA_BASE_VIDEOCAPTURER_H_ +#ifndef MEDIA_BASE_VIDEO_CAPTURER_H_ +#define MEDIA_BASE_VIDEO_CAPTURER_H_ #include @@ -21,15 +21,15 @@ #include #include "api/video/video_source_interface.h" -#include "media/base/videoadapter.h" -#include "media/base/videobroadcaster.h" -#include "media/base/videocommon.h" -#include "rtc_base/constructormagic.h" -#include "rtc_base/criticalsection.h" +#include "media/base/video_adapter.h" +#include "media/base/video_broadcaster.h" +#include "media/base/video_common.h" +#include "rtc_base/constructor_magic.h" +#include "rtc_base/critical_section.h" #include "rtc_base/system/rtc_export.h" #include "rtc_base/third_party/sigslot/sigslot.h" #include "rtc_base/thread_checker.h" -#include "rtc_base/timestampaligner.h" +#include "rtc_base/timestamp_aligner.h" namespace webrtc { class VideoFrame; @@ -280,4 +280,4 @@ class RTC_EXPORT VideoCapturer } // namespace cricket -#endif // MEDIA_BASE_VIDEOCAPTURER_H_ +#endif // MEDIA_BASE_VIDEO_CAPTURER_H_ diff --git a/media/base/video_capturer_unittest.cc b/media/base/video_capturer_unittest.cc index e6dae6d39e..bb05ca10b9 100644 --- a/media/base/video_capturer_unittest.cc +++ b/media/base/video_capturer_unittest.cc @@ -14,9 +14,9 @@ #include "absl/types/optional.h" #include "api/video/video_rotation.h" -#include "media/base/fakevideocapturer.h" -#include "media/base/fakevideorenderer.h" -#include "media/base/videocapturer.h" +#include "media/base/fake_video_capturer.h" +#include "media/base/fake_video_renderer.h" +#include "media/base/video_capturer.h" #include "rtc_base/gunit.h" #include "rtc_base/thread.h" #include "test/gtest.h" diff --git a/media/base/video_common.cc b/media/base/video_common.cc index 2f55793cd0..1035757af1 100644 --- a/media/base/video_common.cc +++ b/media/base/video_common.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "media/base/videocommon.h" +#include "media/base/video_common.h" #include "api/array_view.h" #include "rtc_base/arraysize.h" diff --git a/media/base/video_common.h b/media/base/video_common.h index 6447cba3b2..f01e833f38 100644 --- a/media/base/video_common.h +++ b/media/base/video_common.h @@ -10,15 +10,15 @@ // Common definition for video, including fourcc and VideoFormat. -#ifndef MEDIA_BASE_VIDEOCOMMON_H_ -#define MEDIA_BASE_VIDEOCOMMON_H_ +#ifndef MEDIA_BASE_VIDEO_COMMON_H_ +#define MEDIA_BASE_VIDEO_COMMON_H_ #include #include #include "rtc_base/system/rtc_export.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/time_utils.h" namespace cricket { @@ -226,4 +226,4 @@ struct RTC_EXPORT VideoFormat : VideoFormatPod { } // namespace cricket -#endif // MEDIA_BASE_VIDEOCOMMON_H_ +#endif // MEDIA_BASE_VIDEO_COMMON_H_ diff --git a/media/base/video_common_unittest.cc b/media/base/video_common_unittest.cc index 40421cb5fa..3a943670fe 100644 --- a/media/base/video_common_unittest.cc +++ b/media/base/video_common_unittest.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "media/base/videocommon.h" +#include "media/base/video_common.h" #include "test/gtest.h" diff --git a/media/base/video_source_base.cc b/media/base/video_source_base.cc index 47dfaabdc8..71b4276eaf 100644 --- a/media/base/video_source_base.cc +++ b/media/base/video_source_base.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "media/base/videosourcebase.h" +#include "media/base/video_source_base.h" #include diff --git a/media/base/video_source_base.h b/media/base/video_source_base.h index aaae61c353..507fa10645 100644 --- a/media/base/video_source_base.h +++ b/media/base/video_source_base.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef MEDIA_BASE_VIDEOSOURCEBASE_H_ -#define MEDIA_BASE_VIDEOSOURCEBASE_H_ +#ifndef MEDIA_BASE_VIDEO_SOURCE_BASE_H_ +#define MEDIA_BASE_VIDEO_SOURCE_BASE_H_ #include @@ -46,4 +46,4 @@ class VideoSourceBase : public VideoSourceInterface { } // namespace rtc -#endif // MEDIA_BASE_VIDEOSOURCEBASE_H_ +#endif // MEDIA_BASE_VIDEO_SOURCE_BASE_H_ diff --git a/media/engine/convert_legacy_video_factory.cc b/media/engine/convert_legacy_video_factory.cc index 45fd4201e1..221b6bc7b4 100644 --- a/media/engine/convert_legacy_video_factory.cc +++ b/media/engine/convert_legacy_video_factory.cc @@ -25,15 +25,15 @@ #include "api/video_codecs/video_encoder_factory.h" #include "api/video_codecs/video_encoder_software_fallback_wrapper.h" #include "media/base/codec.h" -#include "media/base/mediaconstants.h" +#include "media/base/media_constants.h" #include "media/engine/encoder_simulcast_proxy.h" -#include "media/engine/internaldecoderfactory.h" -#include "media/engine/internalencoderfactory.h" -#include "media/engine/scopedvideodecoder.h" -#include "media/engine/scopedvideoencoder.h" +#include "media/engine/internal_decoder_factory.h" +#include "media/engine/internal_encoder_factory.h" +#include "media/engine/scoped_video_decoder.h" +#include "media/engine/scoped_video_encoder.h" #include "media/engine/simulcast_encoder_adapter.h" -#include "media/engine/webrtcvideodecoderfactory.h" -#include "media/engine/webrtcvideoencoderfactory.h" +#include "media/engine/webrtc_video_decoder_factory.h" +#include "media/engine/webrtc_video_encoder_factory.h" #include "rtc_base/checks.h" namespace cricket { diff --git a/media/engine/convert_legacy_video_factory.h b/media/engine/convert_legacy_video_factory.h index f83415aeff..1fb19dd599 100644 --- a/media/engine/convert_legacy_video_factory.h +++ b/media/engine/convert_legacy_video_factory.h @@ -14,8 +14,8 @@ #include #include -#include "media/engine/webrtcvideodecoderfactory.h" -#include "media/engine/webrtcvideoencoderfactory.h" +#include "media/engine/webrtc_video_decoder_factory.h" +#include "media/engine/webrtc_video_encoder_factory.h" #include "rtc_base/deprecation.h" #include "rtc_base/system/rtc_export.h" diff --git a/media/engine/encoder_simulcast_proxy_unittest.cc b/media/engine/encoder_simulcast_proxy_unittest.cc index d1a88762b5..20ea36e7ff 100644 --- a/media/engine/encoder_simulcast_proxy_unittest.cc +++ b/media/engine/encoder_simulcast_proxy_unittest.cc @@ -14,7 +14,7 @@ #include "api/test/mock_video_encoder_factory.h" #include "api/video_codecs/vp8_temporal_layers.h" -#include "media/engine/webrtcvideoencoderfactory.h" +#include "media/engine/webrtc_video_encoder_factory.h" #include "modules/video_coding/include/video_codec_interface.h" #include "test/gmock.h" #include "test/gtest.h" diff --git a/media/engine/fake_webrtc_call.cc b/media/engine/fake_webrtc_call.cc index 6c5b8c74b8..c2230649cc 100644 --- a/media/engine/fake_webrtc_call.cc +++ b/media/engine/fake_webrtc_call.cc @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "media/engine/fakewebrtccall.h" +#include "media/engine/fake_webrtc_call.h" #include #include #include "api/call/audio_sink.h" -#include "media/base/rtputils.h" +#include "media/base/rtp_utils.h" #include "rtc_base/checks.h" #include "rtc_base/gunit.h" diff --git a/media/engine/fake_webrtc_call.h b/media/engine/fake_webrtc_call.h index 1b6deb0702..4e8aa039f6 100644 --- a/media/engine/fake_webrtc_call.h +++ b/media/engine/fake_webrtc_call.h @@ -17,8 +17,8 @@ // webrtc::VideoSendStream // webrtc::VideoReceiveStream -#ifndef MEDIA_ENGINE_FAKEWEBRTCCALL_H_ -#define MEDIA_ENGINE_FAKEWEBRTCCALL_H_ +#ifndef MEDIA_ENGINE_FAKE_WEBRTC_CALL_H_ +#define MEDIA_ENGINE_FAKE_WEBRTC_CALL_H_ #include #include @@ -344,4 +344,4 @@ class FakeCall final : public webrtc::Call, public webrtc::PacketReceiver { }; } // namespace cricket -#endif // MEDIA_ENGINE_FAKEWEBRTCCALL_H_ +#endif // MEDIA_ENGINE_FAKE_WEBRTC_CALL_H_ diff --git a/media/engine/fake_webrtc_video_engine.cc b/media/engine/fake_webrtc_video_engine.cc index 897f8f4a98..70bf9221d2 100644 --- a/media/engine/fake_webrtc_video_engine.cc +++ b/media/engine/fake_webrtc_video_engine.cc @@ -8,17 +8,17 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "media/engine/fakewebrtcvideoengine.h" +#include "media/engine/fake_webrtc_video_engine.h" #include #include "absl/memory/memory.h" #include "absl/strings/match.h" #include "media/base/codec.h" -#include "media/base/mediaconstants.h" +#include "media/base/media_constants.h" #include "media/engine/simulcast_encoder_adapter.h" #include "modules/video_coding/include/video_error_codes.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/time_utils.h" namespace cricket { diff --git a/media/engine/fake_webrtc_video_engine.h b/media/engine/fake_webrtc_video_engine.h index 1d1839a554..1505f491fb 100644 --- a/media/engine/fake_webrtc_video_engine.h +++ b/media/engine/fake_webrtc_video_engine.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef MEDIA_ENGINE_FAKEWEBRTCVIDEOENGINE_H_ -#define MEDIA_ENGINE_FAKEWEBRTCVIDEOENGINE_H_ +#ifndef MEDIA_ENGINE_FAKE_WEBRTC_VIDEO_ENGINE_H_ +#define MEDIA_ENGINE_FAKE_WEBRTC_VIDEO_ENGINE_H_ #include #include @@ -28,7 +28,7 @@ #include "api/video_codecs/video_encoder_factory.h" #include "common_types.h" // NOLINT(build/include) #include "modules/video_coding/include/video_codec_interface.h" -#include "rtc_base/criticalsection.h" +#include "rtc_base/critical_section.h" #include "rtc_base/event.h" #include "rtc_base/thread_annotations.h" @@ -140,4 +140,4 @@ class FakeWebRtcVideoEncoderFactory : public webrtc::VideoEncoderFactory { } // namespace cricket -#endif // MEDIA_ENGINE_FAKEWEBRTCVIDEOENGINE_H_ +#endif // MEDIA_ENGINE_FAKE_WEBRTC_VIDEO_ENGINE_H_ diff --git a/media/engine/internal_decoder_factory.cc b/media/engine/internal_decoder_factory.cc index a5624ee59f..5180b28917 100644 --- a/media/engine/internal_decoder_factory.cc +++ b/media/engine/internal_decoder_factory.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "media/engine/internaldecoderfactory.h" +#include "media/engine/internal_decoder_factory.h" #include "absl/strings/match.h" #include "api/video_codecs/sdp_video_format.h" #include "media/base/codec.h" -#include "media/base/mediaconstants.h" +#include "media/base/media_constants.h" #include "modules/video_coding/codecs/h264/include/h264.h" #include "modules/video_coding/codecs/vp8/include/vp8.h" #include "modules/video_coding/codecs/vp9/include/vp9.h" diff --git a/media/engine/internal_decoder_factory.h b/media/engine/internal_decoder_factory.h index 4002490cfd..feb8f53995 100644 --- a/media/engine/internal_decoder_factory.h +++ b/media/engine/internal_decoder_factory.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef MEDIA_ENGINE_INTERNALDECODERFACTORY_H_ -#define MEDIA_ENGINE_INTERNALDECODERFACTORY_H_ +#ifndef MEDIA_ENGINE_INTERNAL_DECODER_FACTORY_H_ +#define MEDIA_ENGINE_INTERNAL_DECODER_FACTORY_H_ #include #include @@ -29,4 +29,4 @@ class InternalDecoderFactory : public VideoDecoderFactory { } // namespace webrtc -#endif // MEDIA_ENGINE_INTERNALDECODERFACTORY_H_ +#endif // MEDIA_ENGINE_INTERNAL_DECODER_FACTORY_H_ diff --git a/media/engine/internal_decoder_factory_unittest.cc b/media/engine/internal_decoder_factory_unittest.cc index 147293dcf7..5e2bfbf9ec 100644 --- a/media/engine/internal_decoder_factory_unittest.cc +++ b/media/engine/internal_decoder_factory_unittest.cc @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "media/engine/internaldecoderfactory.h" +#include "media/engine/internal_decoder_factory.h" #include "api/video_codecs/sdp_video_format.h" #include "api/video_codecs/video_decoder.h" -#include "media/base/mediaconstants.h" +#include "media/base/media_constants.h" #include "test/gtest.h" namespace webrtc { diff --git a/media/engine/internal_encoder_factory.cc b/media/engine/internal_encoder_factory.cc index bf940a1f04..331f22b794 100644 --- a/media/engine/internal_encoder_factory.cc +++ b/media/engine/internal_encoder_factory.cc @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "media/engine/internalencoderfactory.h" +#include "media/engine/internal_encoder_factory.h" #include #include "absl/strings/match.h" #include "api/video_codecs/sdp_video_format.h" #include "media/base/codec.h" -#include "media/base/mediaconstants.h" +#include "media/base/media_constants.h" #include "modules/video_coding/codecs/h264/include/h264.h" #include "modules/video_coding/codecs/vp8/include/vp8.h" #include "modules/video_coding/codecs/vp9/include/vp9.h" diff --git a/media/engine/internal_encoder_factory.h b/media/engine/internal_encoder_factory.h index d30335e2c5..c2442f10d6 100644 --- a/media/engine/internal_encoder_factory.h +++ b/media/engine/internal_encoder_factory.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef MEDIA_ENGINE_INTERNALENCODERFACTORY_H_ -#define MEDIA_ENGINE_INTERNALENCODERFACTORY_H_ +#ifndef MEDIA_ENGINE_INTERNAL_ENCODER_FACTORY_H_ +#define MEDIA_ENGINE_INTERNAL_ENCODER_FACTORY_H_ #include #include @@ -32,4 +32,4 @@ class InternalEncoderFactory : public VideoEncoderFactory { } // namespace webrtc -#endif // MEDIA_ENGINE_INTERNALENCODERFACTORY_H_ +#endif // MEDIA_ENGINE_INTERNAL_ENCODER_FACTORY_H_ diff --git a/media/engine/multiplex_codec_factory.cc b/media/engine/multiplex_codec_factory.cc index 76f60ec14a..5a220d528a 100644 --- a/media/engine/multiplex_codec_factory.cc +++ b/media/engine/multiplex_codec_factory.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "media/engine/multiplexcodecfactory.h" +#include "media/engine/multiplex_codec_factory.h" #include #include @@ -17,7 +17,7 @@ #include "absl/strings/match.h" #include "api/video_codecs/sdp_video_format.h" #include "media/base/codec.h" -#include "media/base/mediaconstants.h" +#include "media/base/media_constants.h" #include "modules/video_coding/codecs/multiplex/include/multiplex_decoder_adapter.h" #include "modules/video_coding/codecs/multiplex/include/multiplex_encoder_adapter.h" #include "rtc_base/logging.h" diff --git a/media/engine/multiplex_codec_factory.h b/media/engine/multiplex_codec_factory.h index 48a29847b1..b8a15e21f6 100644 --- a/media/engine/multiplex_codec_factory.h +++ b/media/engine/multiplex_codec_factory.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef MEDIA_ENGINE_MULTIPLEXCODECFACTORY_H_ -#define MEDIA_ENGINE_MULTIPLEXCODECFACTORY_H_ +#ifndef MEDIA_ENGINE_MULTIPLEX_CODEC_FACTORY_H_ +#define MEDIA_ENGINE_MULTIPLEX_CODEC_FACTORY_H_ #include #include @@ -77,4 +77,4 @@ class RTC_EXPORT MultiplexDecoderFactory : public VideoDecoderFactory { } // namespace webrtc -#endif // MEDIA_ENGINE_MULTIPLEXCODECFACTORY_H_ +#endif // MEDIA_ENGINE_MULTIPLEX_CODEC_FACTORY_H_ diff --git a/media/engine/multiplex_codec_factory_unittest.cc b/media/engine/multiplex_codec_factory_unittest.cc index bc30f60c6d..1cde2f37d8 100644 --- a/media/engine/multiplex_codec_factory_unittest.cc +++ b/media/engine/multiplex_codec_factory_unittest.cc @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "media/engine/multiplexcodecfactory.h" +#include "media/engine/multiplex_codec_factory.h" #include #include "api/video_codecs/sdp_video_format.h" #include "api/video_codecs/video_decoder.h" #include "api/video_codecs/video_encoder.h" -#include "media/base/mediaconstants.h" -#include "media/engine/internaldecoderfactory.h" -#include "media/engine/internalencoderfactory.h" +#include "media/base/media_constants.h" +#include "media/engine/internal_decoder_factory.h" +#include "media/engine/internal_encoder_factory.h" #include "test/gtest.h" namespace webrtc { diff --git a/media/engine/null_webrtc_video_engine.h b/media/engine/null_webrtc_video_engine.h index 62326dd4dd..8702b73834 100644 --- a/media/engine/null_webrtc_video_engine.h +++ b/media/engine/null_webrtc_video_engine.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef MEDIA_ENGINE_NULLWEBRTCVIDEOENGINE_H_ -#define MEDIA_ENGINE_NULLWEBRTCVIDEOENGINE_H_ +#ifndef MEDIA_ENGINE_NULL_WEBRTC_VIDEO_ENGINE_H_ +#define MEDIA_ENGINE_NULL_WEBRTC_VIDEO_ENGINE_H_ #include -#include "media/base/mediachannel.h" -#include "media/base/mediaengine.h" +#include "media/base/media_channel.h" +#include "media/base/media_engine.h" namespace webrtc { @@ -49,4 +49,4 @@ class NullWebRtcVideoEngine : public VideoEngineInterface { } // namespace cricket -#endif // MEDIA_ENGINE_NULLWEBRTCVIDEOENGINE_H_ +#endif // MEDIA_ENGINE_NULL_WEBRTC_VIDEO_ENGINE_H_ diff --git a/media/engine/null_webrtc_video_engine_unittest.cc b/media/engine/null_webrtc_video_engine_unittest.cc index e718d1bb69..85eaea3a92 100644 --- a/media/engine/null_webrtc_video_engine_unittest.cc +++ b/media/engine/null_webrtc_video_engine_unittest.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "media/engine/nullwebrtcvideoengine.h" +#include "media/engine/null_webrtc_video_engine.h" #include "absl/memory/memory.h" -#include "media/engine/webrtcvoiceengine.h" +#include "media/engine/webrtc_voice_engine.h" #include "modules/audio_device/include/mock_audio_device.h" #include "modules/audio_processing/include/audio_processing.h" #include "test/gtest.h" diff --git a/media/engine/payload_type_mapper.cc b/media/engine/payload_type_mapper.cc index ae4e309ef4..fcacd44883 100644 --- a/media/engine/payload_type_mapper.cc +++ b/media/engine/payload_type_mapper.cc @@ -14,7 +14,7 @@ #include "absl/strings/ascii.h" #include "api/audio_codecs/audio_format.h" -#include "media/base/mediaconstants.h" +#include "media/base/media_constants.h" namespace cricket { diff --git a/media/engine/payload_type_mapper_unittest.cc b/media/engine/payload_type_mapper_unittest.cc index a802d27948..eed797b806 100644 --- a/media/engine/payload_type_mapper_unittest.cc +++ b/media/engine/payload_type_mapper_unittest.cc @@ -12,7 +12,7 @@ #include #include "absl/strings/string_view.h" -#include "media/base/mediaconstants.h" +#include "media/base/media_constants.h" #include "media/engine/payload_type_mapper.h" #include "test/gtest.h" diff --git a/media/engine/scoped_video_decoder.cc b/media/engine/scoped_video_decoder.cc index 118ab419f2..c33cc134ba 100644 --- a/media/engine/scoped_video_decoder.cc +++ b/media/engine/scoped_video_decoder.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "media/engine/scopedvideodecoder.h" +#include "media/engine/scoped_video_decoder.h" #include diff --git a/media/engine/scoped_video_decoder.h b/media/engine/scoped_video_decoder.h index fcb31453be..15b6ca577e 100644 --- a/media/engine/scoped_video_decoder.h +++ b/media/engine/scoped_video_decoder.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef MEDIA_ENGINE_SCOPEDVIDEODECODER_H_ -#define MEDIA_ENGINE_SCOPEDVIDEODECODER_H_ +#ifndef MEDIA_ENGINE_SCOPED_VIDEO_DECODER_H_ +#define MEDIA_ENGINE_SCOPED_VIDEO_DECODER_H_ #include #include "api/video_codecs/video_decoder.h" #include "media/base/codec.h" -#include "media/engine/webrtcvideodecoderfactory.h" +#include "media/engine/webrtc_video_decoder_factory.h" #include "rtc_base/deprecation.h" namespace cricket { @@ -41,4 +41,4 @@ CreateScopedVideoDecoder(cricket::WebRtcVideoDecoderFactory* factory, } // namespace cricket -#endif // MEDIA_ENGINE_SCOPEDVIDEODECODER_H_ +#endif // MEDIA_ENGINE_SCOPED_VIDEO_DECODER_H_ diff --git a/media/engine/scoped_video_encoder.cc b/media/engine/scoped_video_encoder.cc index 4ff2c72d92..7c631f61d6 100644 --- a/media/engine/scoped_video_encoder.cc +++ b/media/engine/scoped_video_encoder.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "media/engine/scopedvideoencoder.h" +#include "media/engine/scoped_video_encoder.h" #include #include diff --git a/media/engine/scoped_video_encoder.h b/media/engine/scoped_video_encoder.h index 46ad8b0404..e9c4dd3c5c 100644 --- a/media/engine/scoped_video_encoder.h +++ b/media/engine/scoped_video_encoder.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef MEDIA_ENGINE_SCOPEDVIDEOENCODER_H_ -#define MEDIA_ENGINE_SCOPEDVIDEOENCODER_H_ +#ifndef MEDIA_ENGINE_SCOPED_VIDEO_ENCODER_H_ +#define MEDIA_ENGINE_SCOPED_VIDEO_ENCODER_H_ #include #include "api/video_codecs/video_encoder.h" #include "media/base/codec.h" -#include "media/engine/webrtcvideoencoderfactory.h" +#include "media/engine/webrtc_video_encoder_factory.h" #include "rtc_base/deprecation.h" namespace cricket { @@ -39,4 +39,4 @@ CreateScopedVideoEncoder(cricket::WebRtcVideoEncoderFactory* factory, } // namespace cricket -#endif // MEDIA_ENGINE_SCOPEDVIDEOENCODER_H_ +#endif // MEDIA_ENGINE_SCOPED_VIDEO_ENCODER_H_ diff --git a/media/engine/simulcast.cc b/media/engine/simulcast.cc index 0103051bcc..ac49b57e99 100644 --- a/media/engine/simulcast.cc +++ b/media/engine/simulcast.cc @@ -15,7 +15,7 @@ #include "absl/types/optional.h" #include "api/video/video_bitrate_allocation.h" -#include "media/base/mediaconstants.h" +#include "media/base/media_constants.h" #include "media/engine/constants.h" #include "media/engine/simulcast.h" #include "modules/video_coding/utility/simulcast_rate_allocator.h" diff --git a/media/engine/simulcast_encoder_adapter.cc b/media/engine/simulcast_encoder_adapter.cc index 563ca45532..7acb726826 100644 --- a/media/engine/simulcast_encoder_adapter.cc +++ b/media/engine/simulcast_encoder_adapter.cc @@ -24,7 +24,7 @@ #include "api/video_codecs/video_encoder_factory.h" #include "modules/video_coding/include/video_error_codes.h" #include "modules/video_coding/utility/simulcast_rate_allocator.h" -#include "rtc_base/atomicops.h" +#include "rtc_base/atomic_ops.h" #include "rtc_base/checks.h" #include "rtc_base/scoped_ref_ptr.h" #include "system_wrappers/include/field_trial.h" diff --git a/media/engine/simulcast_encoder_adapter.h b/media/engine/simulcast_encoder_adapter.h index 783c342d6b..696503d16e 100644 --- a/media/engine/simulcast_encoder_adapter.h +++ b/media/engine/simulcast_encoder_adapter.h @@ -21,7 +21,7 @@ #include "absl/types/optional.h" #include "api/video_codecs/sdp_video_format.h" #include "modules/video_coding/include/video_codec_interface.h" -#include "rtc_base/atomicops.h" +#include "rtc_base/atomic_ops.h" #include "rtc_base/sequenced_task_checker.h" namespace webrtc { diff --git a/media/engine/simulcast_encoder_adapter_unittest.cc b/media/engine/simulcast_encoder_adapter_unittest.cc index 741e3fced0..9fa354f5fa 100644 --- a/media/engine/simulcast_encoder_adapter_unittest.cc +++ b/media/engine/simulcast_encoder_adapter_unittest.cc @@ -20,8 +20,8 @@ #include "api/video_codecs/sdp_video_format.h" #include "api/video_codecs/video_encoder_factory.h" #include "common_video/include/video_frame_buffer.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 "media/engine/simulcast_encoder_adapter.h" #include "modules/video_coding/codecs/vp8/include/vp8.h" #include "modules/video_coding/include/video_codec_interface.h" diff --git a/media/engine/simulcast_unittest.cc b/media/engine/simulcast_unittest.cc index ecc697ce26..ec4d0d0d6a 100644 --- a/media/engine/simulcast_unittest.cc +++ b/media/engine/simulcast_unittest.cc @@ -10,7 +10,7 @@ #include "media/engine/simulcast.h" -#include "media/base/mediaconstants.h" +#include "media/base/media_constants.h" #include "media/engine/constants.h" #include "test/field_trial.h" #include "test/gtest.h" diff --git a/media/engine/webrtc_media_engine.cc b/media/engine/webrtc_media_engine.cc index 844f463dcf..4819e2dfef 100644 --- a/media/engine/webrtc_media_engine.cc +++ b/media/engine/webrtc_media_engine.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "media/engine/webrtcmediaengine.h" +#include "media/engine/webrtc_media_engine.h" #include #include @@ -17,16 +17,16 @@ #include "api/video/builtin_video_bitrate_allocator_factory.h" #include "api/video_codecs/video_decoder_factory.h" #include "api/video_codecs/video_encoder_factory.h" -#include "media/engine/webrtcvoiceengine.h" +#include "media/engine/webrtc_voice_engine.h" #if defined(USE_BUILTIN_SW_CODECS) #include "media/engine/convert_legacy_video_factory.h" #endif #ifdef HAVE_WEBRTC_VIDEO -#include "media/engine/webrtcvideoengine.h" +#include "media/engine/webrtc_video_engine.h" #else -#include "media/engine/nullwebrtcvideoengine.h" +#include "media/engine/null_webrtc_video_engine.h" #endif namespace cricket { diff --git a/media/engine/webrtc_media_engine.h b/media/engine/webrtc_media_engine.h index 9256c0c732..837634a89e 100644 --- a/media/engine/webrtc_media_engine.h +++ b/media/engine/webrtc_media_engine.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef MEDIA_ENGINE_WEBRTCMEDIAENGINE_H_ -#define MEDIA_ENGINE_WEBRTCMEDIAENGINE_H_ +#ifndef MEDIA_ENGINE_WEBRTC_MEDIA_ENGINE_H_ +#define MEDIA_ENGINE_WEBRTC_MEDIA_ENGINE_H_ #include #include #include #include "call/call.h" -#include "media/base/mediaengine.h" +#include "media/base/media_engine.h" #include "modules/audio_device/include/audio_device.h" namespace webrtc { @@ -128,4 +128,4 @@ webrtc::BitrateConstraints GetBitrateConfigForCodec(const Codec& codec); } // namespace cricket -#endif // MEDIA_ENGINE_WEBRTCMEDIAENGINE_H_ +#endif // MEDIA_ENGINE_WEBRTC_MEDIA_ENGINE_H_ diff --git a/media/engine/webrtc_media_engine_unittest.cc b/media/engine/webrtc_media_engine_unittest.cc index eec7dc39c4..0241607f90 100644 --- a/media/engine/webrtc_media_engine_unittest.cc +++ b/media/engine/webrtc_media_engine_unittest.cc @@ -15,7 +15,7 @@ #include "api/video/builtin_video_bitrate_allocator_factory.h" #include "api/video_codecs/builtin_video_decoder_factory.h" #include "api/video_codecs/builtin_video_encoder_factory.h" -#include "media/engine/webrtcmediaengine.h" +#include "media/engine/webrtc_media_engine.h" #include "modules/audio_processing/include/audio_processing.h" #include "test/gtest.h" diff --git a/media/engine/webrtc_video_decoder_factory.cc b/media/engine/webrtc_video_decoder_factory.cc index 8d79cf561a..5f8743ef0c 100644 --- a/media/engine/webrtc_video_decoder_factory.cc +++ b/media/engine/webrtc_video_decoder_factory.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "media/engine/webrtcvideodecoderfactory.h" +#include "media/engine/webrtc_video_decoder_factory.h" #include "api/video_codecs/video_codec.h" #include "rtc_base/checks.h" diff --git a/media/engine/webrtc_video_decoder_factory.h b/media/engine/webrtc_video_decoder_factory.h index f00d9a69e0..72deca1428 100644 --- a/media/engine/webrtc_video_decoder_factory.h +++ b/media/engine/webrtc_video_decoder_factory.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef MEDIA_ENGINE_WEBRTCVIDEODECODERFACTORY_H_ -#define MEDIA_ENGINE_WEBRTCVIDEODECODERFACTORY_H_ +#ifndef MEDIA_ENGINE_WEBRTC_VIDEO_DECODER_FACTORY_H_ +#define MEDIA_ENGINE_WEBRTC_VIDEO_DECODER_FACTORY_H_ #include #include "api/video/video_codec_type.h" #include "media/base/codec.h" -#include "rtc_base/refcount.h" +#include "rtc_base/ref_count.h" #include "rtc_base/system/rtc_export.h" namespace webrtc { @@ -54,4 +54,4 @@ class RTC_EXPORT WebRtcVideoDecoderFactory { } // namespace cricket -#endif // MEDIA_ENGINE_WEBRTCVIDEODECODERFACTORY_H_ +#endif // MEDIA_ENGINE_WEBRTC_VIDEO_DECODER_FACTORY_H_ diff --git a/media/engine/webrtc_video_encoder_factory.cc b/media/engine/webrtc_video_encoder_factory.cc index 815613ec13..bf254e8f33 100644 --- a/media/engine/webrtc_video_encoder_factory.cc +++ b/media/engine/webrtc_video_encoder_factory.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "media/engine/webrtcvideoencoderfactory.h" +#include "media/engine/webrtc_video_encoder_factory.h" namespace cricket { diff --git a/media/engine/webrtc_video_encoder_factory.h b/media/engine/webrtc_video_encoder_factory.h index d39e0fd5f9..027340b609 100644 --- a/media/engine/webrtc_video_encoder_factory.h +++ b/media/engine/webrtc_video_encoder_factory.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef MEDIA_ENGINE_WEBRTCVIDEOENCODERFACTORY_H_ -#define MEDIA_ENGINE_WEBRTCVIDEOENCODERFACTORY_H_ +#ifndef MEDIA_ENGINE_WEBRTC_VIDEO_ENCODER_FACTORY_H_ +#define MEDIA_ENGINE_WEBRTC_VIDEO_ENCODER_FACTORY_H_ #include #include @@ -48,4 +48,4 @@ class RTC_EXPORT WebRtcVideoEncoderFactory { } // namespace cricket -#endif // MEDIA_ENGINE_WEBRTCVIDEOENCODERFACTORY_H_ +#endif // MEDIA_ENGINE_WEBRTC_VIDEO_ENCODER_FACTORY_H_ diff --git a/media/engine/webrtc_video_encoder_factory_unittest.cc b/media/engine/webrtc_video_encoder_factory_unittest.cc index 2b156a89a2..be6c2d1088 100644 --- a/media/engine/webrtc_video_encoder_factory_unittest.cc +++ b/media/engine/webrtc_video_encoder_factory_unittest.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "media/engine/webrtcvideoencoderfactory.h" +#include "media/engine/webrtc_video_encoder_factory.h" #include "test/gtest.h" diff --git a/media/engine/webrtc_video_engine.cc b/media/engine/webrtc_video_engine.cc index babe05d6b9..5fe0e62a2c 100644 --- a/media/engine/webrtc_video_engine.cc +++ b/media/engine/webrtc_video_engine.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "media/engine/webrtcvideoengine.h" +#include "media/engine/webrtc_video_engine.h" #include #include @@ -27,12 +27,12 @@ #include "media/engine/convert_legacy_video_factory.h" // nogncheck #endif #include "media/engine/simulcast.h" -#include "media/engine/webrtcmediaengine.h" -#include "media/engine/webrtcvoiceengine.h" -#include "rtc_base/copyonwritebuffer.h" +#include "media/engine/webrtc_media_engine.h" +#include "media/engine/webrtc_voice_engine.h" +#include "rtc_base/copy_on_write_buffer.h" #include "rtc_base/logging.h" #include "rtc_base/strings/string_builder.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/time_utils.h" #include "rtc_base/trace_event.h" #include "system_wrappers/include/field_trial.h" diff --git a/media/engine/webrtc_video_engine.h b/media/engine/webrtc_video_engine.h index a93453d97b..68db82c3f3 100644 --- a/media/engine/webrtc_video_engine.h +++ b/media/engine/webrtc_video_engine.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef MEDIA_ENGINE_WEBRTCVIDEOENGINE_H_ -#define MEDIA_ENGINE_WEBRTCVIDEOENGINE_H_ +#ifndef MEDIA_ENGINE_WEBRTC_VIDEO_ENGINE_H_ +#define MEDIA_ENGINE_WEBRTC_VIDEO_ENGINE_H_ #include #include @@ -28,12 +28,12 @@ #include "call/flexfec_receive_stream.h" #include "call/video_receive_stream.h" #include "call/video_send_stream.h" -#include "media/base/mediaengine.h" -#include "media/engine/webrtcvideodecoderfactory.h" -#include "media/engine/webrtcvideoencoderfactory.h" -#include "rtc_base/asyncinvoker.h" -#include "rtc_base/criticalsection.h" -#include "rtc_base/networkroute.h" +#include "media/base/media_engine.h" +#include "media/engine/webrtc_video_decoder_factory.h" +#include "media/engine/webrtc_video_encoder_factory.h" +#include "rtc_base/async_invoker.h" +#include "rtc_base/critical_section.h" +#include "rtc_base/network_route.h" #include "rtc_base/thread_annotations.h" #include "rtc_base/thread_checker.h" @@ -546,4 +546,4 @@ class EncoderStreamFactory } // namespace cricket -#endif // MEDIA_ENGINE_WEBRTCVIDEOENGINE_H_ +#endif // MEDIA_ENGINE_WEBRTC_VIDEO_ENGINE_H_ diff --git a/media/engine/webrtc_video_engine_unittest.cc b/media/engine/webrtc_video_engine_unittest.cc index 590d8bca2d..9b5abd6fd0 100644 --- a/media/engine/webrtc_video_engine_unittest.cc +++ b/media/engine/webrtc_video_engine_unittest.cc @@ -15,7 +15,7 @@ #include #include "absl/strings/match.h" -#include "api/rtpparameters.h" +#include "api/rtp_parameters.h" #include "api/test/mock_video_bitrate_allocator.h" #include "api/test/mock_video_bitrate_allocator_factory.h" #include "api/test/mock_video_decoder_factory.h" @@ -32,21 +32,21 @@ #include "call/flexfec_receive_stream.h" #include "common_video/h264/profile_level_id.h" #include "logging/rtc_event_log/rtc_event_log.h" -#include "media/base/fakenetworkinterface.h" -#include "media/base/fakevideocapturer.h" -#include "media/base/fakevideorenderer.h" -#include "media/base/mediaconstants.h" -#include "media/base/rtputils.h" -#include "media/base/testutils.h" +#include "media/base/fake_network_interface.h" +#include "media/base/fake_video_capturer.h" +#include "media/base/fake_video_renderer.h" +#include "media/base/media_constants.h" +#include "media/base/rtp_utils.h" +#include "media/base/test_utils.h" #include "media/engine/constants.h" -#include "media/engine/fakewebrtccall.h" -#include "media/engine/fakewebrtcvideoengine.h" +#include "media/engine/fake_webrtc_call.h" +#include "media/engine/fake_webrtc_video_engine.h" #include "media/engine/simulcast.h" -#include "media/engine/webrtcvideoengine.h" -#include "media/engine/webrtcvoiceengine.h" +#include "media/engine/webrtc_video_engine.h" +#include "media/engine/webrtc_voice_engine.h" #include "modules/rtp_rtcp/include/rtp_header_parser.h" #include "rtc_base/arraysize.h" -#include "rtc_base/fakeclock.h" +#include "rtc_base/fake_clock.h" #include "rtc_base/gunit.h" #include "rtc_base/numerics/safe_conversions.h" #include "test/field_trial.h" diff --git a/media/engine/webrtc_voice_engine.cc b/media/engine/webrtc_voice_engine.cc index 2bb4b28221..88fc4d812f 100644 --- a/media/engine/webrtc_voice_engine.cc +++ b/media/engine/webrtc_voice_engine.cc @@ -10,7 +10,7 @@ #ifdef HAVE_WEBRTC_VOICE -#include "media/engine/webrtcvoiceengine.h" +#include "media/engine/webrtc_voice_engine.h" #include #include @@ -23,20 +23,20 @@ #include "api/audio_codecs/audio_codec_pair_id.h" #include "api/call/audio_sink.h" #include "api/media_transport_interface.h" -#include "media/base/audiosource.h" -#include "media/base/mediaconstants.h" -#include "media/base/streamparams.h" +#include "media/base/audio_source.h" +#include "media/base/media_constants.h" +#include "media/base/stream_params.h" #include "media/engine/adm_helpers.h" #include "media/engine/apm_helpers.h" #include "media/engine/payload_type_mapper.h" -#include "media/engine/webrtcmediaengine.h" +#include "media/engine/webrtc_media_engine.h" #include "modules/audio_device/audio_device_impl.h" #include "modules/audio_mixer/audio_mixer_impl.h" #include "modules/audio_processing/aec_dump/aec_dump_factory.h" #include "modules/audio_processing/include/audio_processing.h" #include "rtc_base/arraysize.h" -#include "rtc_base/byteorder.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/byte_order.h" +#include "rtc_base/constructor_magic.h" #include "rtc_base/helpers.h" #include "rtc_base/logging.h" #include "rtc_base/race_checker.h" diff --git a/media/engine/webrtc_voice_engine.h b/media/engine/webrtc_voice_engine.h index 494b4f6609..701942dd4e 100644 --- a/media/engine/webrtc_voice_engine.h +++ b/media/engine/webrtc_voice_engine.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef MEDIA_ENGINE_WEBRTCVOICEENGINE_H_ -#define MEDIA_ENGINE_WEBRTCVOICEENGINE_H_ +#ifndef MEDIA_ENGINE_WEBRTC_VOICE_ENGINE_H_ +#define MEDIA_ENGINE_WEBRTC_VOICE_ENGINE_H_ #include #include @@ -17,16 +17,16 @@ #include #include "api/audio_codecs/audio_encoder_factory.h" -#include "api/rtpreceiverinterface.h" +#include "api/rtp_receiver_interface.h" #include "call/audio_state.h" #include "call/call.h" -#include "media/base/rtputils.h" +#include "media/base/rtp_utils.h" #include "media/engine/apm_helpers.h" #include "modules/audio_processing/include/audio_processing.h" #include "pc/channel.h" #include "rtc_base/buffer.h" -#include "rtc_base/constructormagic.h" -#include "rtc_base/networkroute.h" +#include "rtc_base/constructor_magic.h" +#include "rtc_base/network_route.h" #include "rtc_base/scoped_ref_ptr.h" #include "rtc_base/task_queue.h" #include "rtc_base/thread_checker.h" @@ -326,4 +326,4 @@ class WebRtcVoiceMediaChannel final : public VoiceMediaChannel, }; } // namespace cricket -#endif // MEDIA_ENGINE_WEBRTCVOICEENGINE_H_ +#endif // MEDIA_ENGINE_WEBRTC_VOICE_ENGINE_H_ diff --git a/media/engine/webrtc_voice_engine_unittest.cc b/media/engine/webrtc_voice_engine_unittest.cc index ff0d8c6b8a..06bf3fdf2b 100644 --- a/media/engine/webrtc_voice_engine_unittest.cc +++ b/media/engine/webrtc_voice_engine_unittest.cc @@ -14,20 +14,20 @@ #include "absl/strings/match.h" #include "api/audio_codecs/builtin_audio_decoder_factory.h" #include "api/audio_codecs/builtin_audio_encoder_factory.h" -#include "api/rtpparameters.h" +#include "api/rtp_parameters.h" #include "call/call.h" #include "logging/rtc_event_log/rtc_event_log.h" -#include "media/base/fakemediaengine.h" -#include "media/base/fakenetworkinterface.h" -#include "media/base/fakertp.h" -#include "media/base/mediaconstants.h" -#include "media/engine/fakewebrtccall.h" -#include "media/engine/webrtcvoiceengine.h" +#include "media/base/fake_media_engine.h" +#include "media/base/fake_network_interface.h" +#include "media/base/fake_rtp.h" +#include "media/base/media_constants.h" +#include "media/engine/fake_webrtc_call.h" +#include "media/engine/webrtc_voice_engine.h" #include "modules/audio_device/include/mock_audio_device.h" #include "modules/audio_processing/include/mock_audio_processing.h" #include "pc/channel.h" #include "rtc_base/arraysize.h" -#include "rtc_base/byteorder.h" +#include "rtc_base/byte_order.h" #include "rtc_base/numerics/safe_conversions.h" #include "rtc_base/scoped_ref_ptr.h" #include "test/field_trial.h" diff --git a/media/sctp/sctp_transport.cc b/media/sctp/sctp_transport.cc index 73e4185ae4..65c21819d7 100644 --- a/media/sctp/sctp_transport.cc +++ b/media/sctp/sctp_transport.cc @@ -18,7 +18,7 @@ enum PreservedErrno { }; } // namespace -#include "media/sctp/sctptransport.h" +#include "media/sctp/sctp_transport.h" #include #include @@ -27,12 +27,12 @@ enum PreservedErrno { #include #include "media/base/codec.h" -#include "media/base/mediaconstants.h" -#include "media/base/streamparams.h" -#include "p2p/base/dtlstransportinternal.h" // For PF_NORMAL +#include "media/base/media_constants.h" +#include "media/base/stream_params.h" +#include "p2p/base/dtls_transport_internal.h" // For PF_NORMAL #include "rtc_base/arraysize.h" -#include "rtc_base/copyonwritebuffer.h" -#include "rtc_base/criticalsection.h" +#include "rtc_base/copy_on_write_buffer.h" +#include "rtc_base/critical_section.h" #include "rtc_base/helpers.h" #include "rtc_base/logging.h" #include "rtc_base/numerics/safe_conversions.h" diff --git a/media/sctp/sctp_transport.h b/media/sctp/sctp_transport.h index 5c2a750e4f..f7ddd8767c 100644 --- a/media/sctp/sctp_transport.h +++ b/media/sctp/sctp_transport.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef MEDIA_SCTP_SCTPTRANSPORT_H_ -#define MEDIA_SCTP_SCTPTRANSPORT_H_ +#ifndef MEDIA_SCTP_SCTP_TRANSPORT_H_ +#define MEDIA_SCTP_SCTP_TRANSPORT_H_ #include @@ -19,14 +19,14 @@ #include #include -#include "rtc_base/asyncinvoker.h" -#include "rtc_base/constructormagic.h" -#include "rtc_base/copyonwritebuffer.h" +#include "rtc_base/async_invoker.h" +#include "rtc_base/constructor_magic.h" +#include "rtc_base/copy_on_write_buffer.h" #include "rtc_base/third_party/sigslot/sigslot.h" #include "rtc_base/thread.h" // For SendDataParams/ReceiveDataParams. -#include "media/base/mediachannel.h" -#include "media/sctp/sctptransportinternal.h" +#include "media/base/media_channel.h" +#include "media/sctp/sctp_transport_internal.h" // Defined by "usrsctplib/usrsctp.h" struct sockaddr_conn; @@ -228,4 +228,4 @@ class SctpTransportFactory : public SctpTransportInternalFactory { } // namespace cricket -#endif // MEDIA_SCTP_SCTPTRANSPORT_H_ +#endif // MEDIA_SCTP_SCTP_TRANSPORT_H_ diff --git a/media/sctp/sctp_transport_internal.h b/media/sctp/sctp_transport_internal.h index 4c3b542a52..12f1782783 100644 --- a/media/sctp/sctp_transport_internal.h +++ b/media/sctp/sctp_transport_internal.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef MEDIA_SCTP_SCTPTRANSPORTINTERNAL_H_ -#define MEDIA_SCTP_SCTPTRANSPORTINTERNAL_H_ +#ifndef MEDIA_SCTP_SCTP_TRANSPORT_INTERNAL_H_ +#define MEDIA_SCTP_SCTP_TRANSPORT_INTERNAL_H_ // TODO(deadbeef): Move SCTP code out of media/, and make it not depend on // anything in media/. @@ -18,13 +18,13 @@ #include #include -#include "rtc_base/copyonwritebuffer.h" +#include "rtc_base/copy_on_write_buffer.h" #include "rtc_base/thread.h" // For SendDataParams/ReceiveDataParams. // TODO(deadbeef): Use something else for SCTP. It's confusing that we use an // SSRC field for SID. -#include "media/base/mediachannel.h" -#include "p2p/base/packettransportinternal.h" +#include "media/base/media_channel.h" +#include "p2p/base/packet_transport_internal.h" namespace cricket { @@ -138,4 +138,4 @@ class SctpTransportInternalFactory { } // namespace cricket -#endif // MEDIA_SCTP_SCTPTRANSPORTINTERNAL_H_ +#endif // MEDIA_SCTP_SCTP_TRANSPORT_INTERNAL_H_ diff --git a/media/sctp/sctp_transport_unittest.cc b/media/sctp/sctp_transport_unittest.cc index c63bde8e26..0170785491 100644 --- a/media/sctp/sctp_transport_unittest.cc +++ b/media/sctp/sctp_transport_unittest.cc @@ -15,12 +15,12 @@ #include #include -#include "media/sctp/sctptransport.h" -#include "p2p/base/fakedtlstransport.h" -#include "rtc_base/copyonwritebuffer.h" +#include "media/sctp/sctp_transport.h" +#include "p2p/base/fake_dtls_transport.h" +#include "rtc_base/copy_on_write_buffer.h" #include "rtc_base/gunit.h" #include "rtc_base/logging.h" -#include "rtc_base/messagequeue.h" +#include "rtc_base/message_queue.h" #include "rtc_base/thread.h" #include "test/gtest.h" diff --git a/modules/audio_coding/acm2/acm_receive_test.h b/modules/audio_coding/acm2/acm_receive_test.h index 04aefc780e..23e48a00ee 100644 --- a/modules/audio_coding/acm2/acm_receive_test.h +++ b/modules/audio_coding/acm2/acm_receive_test.h @@ -16,7 +16,7 @@ #include #include "api/audio_codecs/audio_decoder_factory.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" #include "rtc_base/scoped_ref_ptr.h" #include "system_wrappers/include/clock.h" diff --git a/modules/audio_coding/acm2/acm_receiver.h b/modules/audio_coding/acm2/acm_receiver.h index 0cbaa9adf1..d3b41c862e 100644 --- a/modules/audio_coding/acm2/acm_receiver.h +++ b/modules/audio_coding/acm2/acm_receiver.h @@ -25,7 +25,7 @@ #include "modules/audio_coding/acm2/acm_resampler.h" #include "modules/audio_coding/acm2/call_statistics.h" #include "modules/audio_coding/include/audio_coding_module.h" -#include "rtc_base/criticalsection.h" +#include "rtc_base/critical_section.h" #include "rtc_base/thread_annotations.h" namespace webrtc { diff --git a/modules/audio_coding/acm2/acm_receiver_unittest.cc b/modules/audio_coding/acm2/acm_receiver_unittest.cc index 8b3d2e4dca..d5392dc78c 100644 --- a/modules/audio_coding/acm2/acm_receiver_unittest.cc +++ b/modules/audio_coding/acm2/acm_receiver_unittest.cc @@ -23,7 +23,7 @@ #include "rtc_base/numerics/safe_conversions.h" #include "system_wrappers/include/clock.h" #include "test/gtest.h" -#include "test/testsupport/fileutils.h" +#include "test/testsupport/file_utils.h" namespace webrtc { diff --git a/modules/audio_coding/acm2/acm_send_test.cc b/modules/audio_coding/acm2/acm_send_test.cc index cf9c8eb761..98d673f3a1 100644 --- a/modules/audio_coding/acm2/acm_send_test.cc +++ b/modules/audio_coding/acm2/acm_send_test.cc @@ -22,7 +22,7 @@ #include "modules/audio_coding/neteq/tools/input_audio_file.h" #include "modules/audio_coding/neteq/tools/packet.h" #include "rtc_base/checks.h" -#include "rtc_base/stringencode.h" +#include "rtc_base/string_encode.h" #include "test/gtest.h" namespace webrtc { diff --git a/modules/audio_coding/acm2/acm_send_test.h b/modules/audio_coding/acm2/acm_send_test.h index 3479de0f4a..24d230b823 100644 --- a/modules/audio_coding/acm2/acm_send_test.h +++ b/modules/audio_coding/acm2/acm_send_test.h @@ -17,7 +17,7 @@ #include "api/audio/audio_frame.h" #include "modules/audio_coding/include/audio_coding_module.h" #include "modules/audio_coding/neteq/tools/packet_source.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" #include "system_wrappers/include/clock.h" namespace webrtc { diff --git a/modules/audio_coding/acm2/audio_coding_module.cc b/modules/audio_coding/acm2/audio_coding_module.cc index 60da67929c..2ce768b85b 100644 --- a/modules/audio_coding/acm2/audio_coding_module.cc +++ b/modules/audio_coding/acm2/audio_coding_module.cc @@ -22,7 +22,7 @@ #include "modules/include/module_common_types_public.h" #include "rtc_base/buffer.h" #include "rtc_base/checks.h" -#include "rtc_base/criticalsection.h" +#include "rtc_base/critical_section.h" #include "rtc_base/logging.h" #include "rtc_base/numerics/safe_conversions.h" #include "rtc_base/thread_annotations.h" diff --git a/modules/audio_coding/acm2/audio_coding_module_unittest.cc b/modules/audio_coding/acm2/audio_coding_module_unittest.cc index a016481643..5037bc6cba 100644 --- a/modules/audio_coding/acm2/audio_coding_module_unittest.cc +++ b/modules/audio_coding/acm2/audio_coding_module_unittest.cc @@ -34,12 +34,12 @@ #include "modules/audio_coding/neteq/tools/output_wav_file.h" #include "modules/audio_coding/neteq/tools/packet.h" #include "modules/audio_coding/neteq/tools/rtp_file_source.h" -#include "rtc_base/criticalsection.h" +#include "rtc_base/critical_section.h" #include "rtc_base/event.h" -#include "rtc_base/messagedigest.h" +#include "rtc_base/message_digest.h" #include "rtc_base/numerics/safe_conversions.h" #include "rtc_base/platform_thread.h" -#include "rtc_base/refcountedobject.h" +#include "rtc_base/ref_counted_object.h" #include "rtc_base/system/arch.h" #include "rtc_base/thread_annotations.h" #include "system_wrappers/include/clock.h" @@ -47,7 +47,7 @@ #include "test/gtest.h" #include "test/mock_audio_decoder.h" #include "test/mock_audio_encoder.h" -#include "test/testsupport/fileutils.h" +#include "test/testsupport/file_utils.h" using ::testing::AtLeast; using ::testing::Invoke; diff --git a/modules/audio_coding/audio_network_adaptor/audio_network_adaptor_impl.cc b/modules/audio_coding/audio_network_adaptor/audio_network_adaptor_impl.cc index 9e47a06f7c..6731d504f9 100644 --- a/modules/audio_coding/audio_network_adaptor/audio_network_adaptor_impl.cc +++ b/modules/audio_coding/audio_network_adaptor/audio_network_adaptor_impl.cc @@ -18,7 +18,7 @@ #include "modules/audio_coding/audio_network_adaptor/debug_dump_writer.h" #include "modules/audio_coding/audio_network_adaptor/event_log_writer.h" #include "rtc_base/checks.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/time_utils.h" #include "system_wrappers/include/field_trial.h" namespace webrtc { diff --git a/modules/audio_coding/audio_network_adaptor/audio_network_adaptor_impl.h b/modules/audio_coding/audio_network_adaptor/audio_network_adaptor_impl.h index 4c1c19b7ea..fc2358b4d9 100644 --- a/modules/audio_coding/audio_network_adaptor/audio_network_adaptor_impl.h +++ b/modules/audio_coding/audio_network_adaptor/audio_network_adaptor_impl.h @@ -20,7 +20,7 @@ #include "modules/audio_coding/audio_network_adaptor/debug_dump_writer.h" #include "modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor.h" #include "modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor_config.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace webrtc { diff --git a/modules/audio_coding/audio_network_adaptor/audio_network_adaptor_impl_unittest.cc b/modules/audio_coding/audio_network_adaptor/audio_network_adaptor_impl_unittest.cc index be9550a7a7..76531d02e9 100644 --- a/modules/audio_coding/audio_network_adaptor/audio_network_adaptor_impl_unittest.cc +++ b/modules/audio_coding/audio_network_adaptor/audio_network_adaptor_impl_unittest.cc @@ -18,7 +18,7 @@ #include "modules/audio_coding/audio_network_adaptor/mock/mock_controller.h" #include "modules/audio_coding/audio_network_adaptor/mock/mock_controller_manager.h" #include "modules/audio_coding/audio_network_adaptor/mock/mock_debug_dump_writer.h" -#include "rtc_base/fakeclock.h" +#include "rtc_base/fake_clock.h" #include "test/field_trial.h" #include "test/gtest.h" diff --git a/modules/audio_coding/audio_network_adaptor/bitrate_controller.h b/modules/audio_coding/audio_network_adaptor/bitrate_controller.h index 6b6330b030..41bfbd1c32 100644 --- a/modules/audio_coding/audio_network_adaptor/bitrate_controller.h +++ b/modules/audio_coding/audio_network_adaptor/bitrate_controller.h @@ -16,7 +16,7 @@ #include "absl/types/optional.h" #include "modules/audio_coding/audio_network_adaptor/controller.h" #include "modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor_config.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace webrtc { namespace audio_network_adaptor { diff --git a/modules/audio_coding/audio_network_adaptor/channel_controller.h b/modules/audio_coding/audio_network_adaptor/channel_controller.h index 0d775b1c77..f211f40f17 100644 --- a/modules/audio_coding/audio_network_adaptor/channel_controller.h +++ b/modules/audio_coding/audio_network_adaptor/channel_controller.h @@ -16,7 +16,7 @@ #include "absl/types/optional.h" #include "modules/audio_coding/audio_network_adaptor/controller.h" #include "modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor_config.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace webrtc { diff --git a/modules/audio_coding/audio_network_adaptor/controller_manager.cc b/modules/audio_coding/audio_network_adaptor/controller_manager.cc index 6c99561d66..91c359d796 100644 --- a/modules/audio_coding/audio_network_adaptor/controller_manager.cc +++ b/modules/audio_coding/audio_network_adaptor/controller_manager.cc @@ -22,7 +22,7 @@ #include "modules/audio_coding/audio_network_adaptor/frame_length_controller.h" #include "modules/audio_coding/audio_network_adaptor/util/threshold_curve.h" #include "rtc_base/ignore_wundef.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/time_utils.h" #if WEBRTC_ENABLE_PROTOBUF RTC_PUSH_IGNORING_WUNDEF() diff --git a/modules/audio_coding/audio_network_adaptor/controller_manager.h b/modules/audio_coding/audio_network_adaptor/controller_manager.h index 1ff9bbf5f2..49800857a5 100644 --- a/modules/audio_coding/audio_network_adaptor/controller_manager.h +++ b/modules/audio_coding/audio_network_adaptor/controller_manager.h @@ -16,7 +16,7 @@ #include #include "modules/audio_coding/audio_network_adaptor/controller.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" #include "rtc_base/protobuf_utils.h" namespace webrtc { diff --git a/modules/audio_coding/audio_network_adaptor/controller_manager_unittest.cc b/modules/audio_coding/audio_network_adaptor/controller_manager_unittest.cc index 061e4aa8c6..2bdea19082 100644 --- a/modules/audio_coding/audio_network_adaptor/controller_manager_unittest.cc +++ b/modules/audio_coding/audio_network_adaptor/controller_manager_unittest.cc @@ -13,7 +13,7 @@ #include "modules/audio_coding/audio_network_adaptor/controller_manager.h" #include "modules/audio_coding/audio_network_adaptor/mock/mock_controller.h" #include "modules/audio_coding/audio_network_adaptor/mock/mock_debug_dump_writer.h" -#include "rtc_base/fakeclock.h" +#include "rtc_base/fake_clock.h" #include "rtc_base/ignore_wundef.h" #include "rtc_base/protobuf_utils.h" #include "test/gtest.h" diff --git a/modules/audio_coding/audio_network_adaptor/debug_dump_writer.h b/modules/audio_coding/audio_network_adaptor/debug_dump_writer.h index b464eb6eef..367f659542 100644 --- a/modules/audio_coding/audio_network_adaptor/debug_dump_writer.h +++ b/modules/audio_coding/audio_network_adaptor/debug_dump_writer.h @@ -15,7 +15,7 @@ #include "modules/audio_coding/audio_network_adaptor/controller.h" #include "modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" #include "rtc_base/ignore_wundef.h" #include "rtc_base/system/file_wrapper.h" #if WEBRTC_ENABLE_PROTOBUF diff --git a/modules/audio_coding/audio_network_adaptor/dtx_controller.h b/modules/audio_coding/audio_network_adaptor/dtx_controller.h index d3334eca9e..83fdf3ddd7 100644 --- a/modules/audio_coding/audio_network_adaptor/dtx_controller.h +++ b/modules/audio_coding/audio_network_adaptor/dtx_controller.h @@ -14,7 +14,7 @@ #include "absl/types/optional.h" #include "modules/audio_coding/audio_network_adaptor/controller.h" #include "modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor_config.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace webrtc { diff --git a/modules/audio_coding/audio_network_adaptor/event_log_writer.h b/modules/audio_coding/audio_network_adaptor/event_log_writer.h index 72b5245e11..c5e57e63e6 100644 --- a/modules/audio_coding/audio_network_adaptor/event_log_writer.h +++ b/modules/audio_coding/audio_network_adaptor/event_log_writer.h @@ -12,7 +12,7 @@ #define MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_EVENT_LOG_WRITER_H_ #include "modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor_config.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace webrtc { class RtcEventLog; diff --git a/modules/audio_coding/audio_network_adaptor/fec_controller_plr_based.h b/modules/audio_coding/audio_network_adaptor/fec_controller_plr_based.h index b7d3d56173..87afe2ebc1 100644 --- a/modules/audio_coding/audio_network_adaptor/fec_controller_plr_based.h +++ b/modules/audio_coding/audio_network_adaptor/fec_controller_plr_based.h @@ -18,7 +18,7 @@ #include "modules/audio_coding/audio_network_adaptor/controller.h" #include "modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor_config.h" #include "modules/audio_coding/audio_network_adaptor/util/threshold_curve.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace webrtc { diff --git a/modules/audio_coding/audio_network_adaptor/fec_controller_rplr_based.h b/modules/audio_coding/audio_network_adaptor/fec_controller_rplr_based.h index 421cb70abd..c547bff18d 100644 --- a/modules/audio_coding/audio_network_adaptor/fec_controller_rplr_based.h +++ b/modules/audio_coding/audio_network_adaptor/fec_controller_rplr_based.h @@ -15,7 +15,7 @@ #include "modules/audio_coding/audio_network_adaptor/controller.h" #include "modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor_config.h" #include "modules/audio_coding/audio_network_adaptor/util/threshold_curve.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace webrtc { diff --git a/modules/audio_coding/audio_network_adaptor/frame_length_controller.h b/modules/audio_coding/audio_network_adaptor/frame_length_controller.h index c852704b75..e1822472e3 100644 --- a/modules/audio_coding/audio_network_adaptor/frame_length_controller.h +++ b/modules/audio_coding/audio_network_adaptor/frame_length_controller.h @@ -18,7 +18,7 @@ #include "absl/types/optional.h" #include "modules/audio_coding/audio_network_adaptor/controller.h" #include "modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor_config.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace webrtc { diff --git a/modules/audio_coding/codecs/cng/audio_encoder_cng_unittest.cc b/modules/audio_coding/codecs/cng/audio_encoder_cng_unittest.cc index e3655b464a..3ecefd46be 100644 --- a/modules/audio_coding/codecs/cng/audio_encoder_cng_unittest.cc +++ b/modules/audio_coding/codecs/cng/audio_encoder_cng_unittest.cc @@ -13,7 +13,7 @@ #include "common_audio/vad/mock/mock_vad.h" #include "modules/audio_coding/codecs/cng/audio_encoder_cng.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" #include "rtc_base/numerics/safe_conversions.h" #include "test/gtest.h" #include "test/mock_audio_encoder.h" diff --git a/modules/audio_coding/codecs/cng/cng_unittest.cc b/modules/audio_coding/codecs/cng/cng_unittest.cc index 81688b1f47..80349e2504 100644 --- a/modules/audio_coding/codecs/cng/cng_unittest.cc +++ b/modules/audio_coding/codecs/cng/cng_unittest.cc @@ -12,7 +12,7 @@ #include "modules/audio_coding/codecs/cng/webrtc_cng.h" #include "test/gtest.h" -#include "test/testsupport/fileutils.h" +#include "test/testsupport/file_utils.h" namespace webrtc { diff --git a/modules/audio_coding/codecs/g711/audio_decoder_pcm.h b/modules/audio_coding/codecs/g711/audio_decoder_pcm.h index 9a01b8aff4..8fae71c36f 100644 --- a/modules/audio_coding/codecs/g711/audio_decoder_pcm.h +++ b/modules/audio_coding/codecs/g711/audio_decoder_pcm.h @@ -18,7 +18,7 @@ #include "api/audio_codecs/audio_decoder.h" #include "rtc_base/buffer.h" #include "rtc_base/checks.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace webrtc { diff --git a/modules/audio_coding/codecs/g711/audio_encoder_pcm.h b/modules/audio_coding/codecs/g711/audio_encoder_pcm.h index 88668d924e..e41c2a3cc6 100644 --- a/modules/audio_coding/codecs/g711/audio_encoder_pcm.h +++ b/modules/audio_coding/codecs/g711/audio_encoder_pcm.h @@ -14,7 +14,7 @@ #include #include "api/audio_codecs/audio_encoder.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace webrtc { diff --git a/modules/audio_coding/codecs/g722/audio_decoder_g722.h b/modules/audio_coding/codecs/g722/audio_decoder_g722.h index 324044886d..6911e0bad5 100644 --- a/modules/audio_coding/codecs/g722/audio_decoder_g722.h +++ b/modules/audio_coding/codecs/g722/audio_decoder_g722.h @@ -12,7 +12,7 @@ #define MODULES_AUDIO_CODING_CODECS_G722_AUDIO_DECODER_G722_H_ #include "api/audio_codecs/audio_decoder.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" typedef struct WebRtcG722DecInst G722DecInst; diff --git a/modules/audio_coding/codecs/g722/audio_encoder_g722.h b/modules/audio_coding/codecs/g722/audio_encoder_g722.h index d0d23ca717..cf45fb54be 100644 --- a/modules/audio_coding/codecs/g722/audio_encoder_g722.h +++ b/modules/audio_coding/codecs/g722/audio_encoder_g722.h @@ -17,7 +17,7 @@ #include "api/audio_codecs/g722/audio_encoder_g722_config.h" #include "modules/audio_coding/codecs/g722/g722_interface.h" #include "rtc_base/buffer.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace webrtc { diff --git a/modules/audio_coding/codecs/ilbc/audio_decoder_ilbc.h b/modules/audio_coding/codecs/ilbc/audio_decoder_ilbc.h index fcb2074dc9..d73ef0da59 100644 --- a/modules/audio_coding/codecs/ilbc/audio_decoder_ilbc.h +++ b/modules/audio_coding/codecs/ilbc/audio_decoder_ilbc.h @@ -17,7 +17,7 @@ #include "api/audio_codecs/audio_decoder.h" #include "rtc_base/buffer.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" typedef struct iLBC_decinst_t_ IlbcDecoderInstance; diff --git a/modules/audio_coding/codecs/ilbc/audio_encoder_ilbc.h b/modules/audio_coding/codecs/ilbc/audio_encoder_ilbc.h index 675dc7d99d..ada613bb64 100644 --- a/modules/audio_coding/codecs/ilbc/audio_encoder_ilbc.h +++ b/modules/audio_coding/codecs/ilbc/audio_encoder_ilbc.h @@ -14,7 +14,7 @@ #include "api/audio_codecs/audio_encoder.h" #include "api/audio_codecs/ilbc/audio_encoder_ilbc_config.h" #include "modules/audio_coding/codecs/ilbc/ilbc.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace webrtc { diff --git a/modules/audio_coding/codecs/isac/audio_decoder_isac_t.h b/modules/audio_coding/codecs/isac/audio_decoder_isac_t.h index f840ffa164..ab9a6edbae 100644 --- a/modules/audio_coding/codecs/isac/audio_decoder_isac_t.h +++ b/modules/audio_coding/codecs/isac/audio_decoder_isac_t.h @@ -16,7 +16,7 @@ #include "absl/types/optional.h" #include "api/audio_codecs/audio_decoder.h" #include "modules/audio_coding/codecs/isac/locked_bandwidth_info.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" #include "rtc_base/scoped_ref_ptr.h" namespace webrtc { diff --git a/modules/audio_coding/codecs/isac/audio_encoder_isac_t.h b/modules/audio_coding/codecs/isac/audio_encoder_isac_t.h index 298989863d..91eb1fd5aa 100644 --- a/modules/audio_coding/codecs/isac/audio_encoder_isac_t.h +++ b/modules/audio_coding/codecs/isac/audio_encoder_isac_t.h @@ -15,7 +15,7 @@ #include "api/audio_codecs/audio_encoder.h" #include "modules/audio_coding/codecs/isac/locked_bandwidth_info.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" #include "rtc_base/scoped_ref_ptr.h" namespace webrtc { diff --git a/modules/audio_coding/codecs/isac/locked_bandwidth_info.h b/modules/audio_coding/codecs/isac/locked_bandwidth_info.h index 37074f8f5b..0b1bc7d223 100644 --- a/modules/audio_coding/codecs/isac/locked_bandwidth_info.h +++ b/modules/audio_coding/codecs/isac/locked_bandwidth_info.h @@ -12,8 +12,8 @@ #define MODULES_AUDIO_CODING_CODECS_ISAC_LOCKED_BANDWIDTH_INFO_H_ #include "modules/audio_coding/codecs/isac/bandwidth_info.h" -#include "rtc_base/atomicops.h" -#include "rtc_base/criticalsection.h" +#include "rtc_base/atomic_ops.h" +#include "rtc_base/critical_section.h" #include "rtc_base/thread_annotations.h" namespace webrtc { diff --git a/modules/audio_coding/codecs/isac/main/source/isac_unittest.cc b/modules/audio_coding/codecs/isac/main/source/isac_unittest.cc index 3ec28cca74..6d9b013ae5 100644 --- a/modules/audio_coding/codecs/isac/main/source/isac_unittest.cc +++ b/modules/audio_coding/codecs/isac/main/source/isac_unittest.cc @@ -11,7 +11,7 @@ #include "modules/audio_coding/codecs/isac/main/include/isac.h" #include "test/gtest.h" -#include "test/testsupport/fileutils.h" +#include "test/testsupport/file_utils.h" struct WebRtcISACStruct; diff --git a/modules/audio_coding/codecs/isac/unittest.cc b/modules/audio_coding/codecs/isac/unittest.cc index 5855d56103..6791745eaf 100644 --- a/modules/audio_coding/codecs/isac/unittest.cc +++ b/modules/audio_coding/codecs/isac/unittest.cc @@ -19,7 +19,7 @@ #include "rtc_base/numerics/safe_conversions.h" #include "rtc_base/strings/string_builder.h" #include "test/gtest.h" -#include "test/testsupport/fileutils.h" +#include "test/testsupport/file_utils.h" namespace webrtc { diff --git a/modules/audio_coding/codecs/opus/audio_decoder_opus.h b/modules/audio_coding/codecs/opus/audio_decoder_opus.h index 8043425243..d8cc5c1fc2 100644 --- a/modules/audio_coding/codecs/opus/audio_decoder_opus.h +++ b/modules/audio_coding/codecs/opus/audio_decoder_opus.h @@ -18,7 +18,7 @@ #include "api/audio_codecs/audio_decoder.h" #include "modules/audio_coding/codecs/opus/opus_interface.h" #include "rtc_base/buffer.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace webrtc { diff --git a/modules/audio_coding/codecs/opus/audio_encoder_opus.cc b/modules/audio_coding/codecs/opus/audio_encoder_opus.cc index a5c4380433..0b8f29f084 100644 --- a/modules/audio_coding/codecs/opus/audio_encoder_opus.cc +++ b/modules/audio_coding/codecs/opus/audio_encoder_opus.cc @@ -27,7 +27,7 @@ #include "rtc_base/numerics/safe_minmax.h" #include "rtc_base/protobuf_utils.h" #include "rtc_base/string_to_number.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/time_utils.h" #include "system_wrappers/include/field_trial.h" namespace webrtc { diff --git a/modules/audio_coding/codecs/opus/audio_encoder_opus.h b/modules/audio_coding/codecs/opus/audio_encoder_opus.h index 7d051d5317..4533d733df 100644 --- a/modules/audio_coding/codecs/opus/audio_encoder_opus.h +++ b/modules/audio_coding/codecs/opus/audio_encoder_opus.h @@ -23,7 +23,7 @@ #include "common_audio/smoothing_filter.h" #include "modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor.h" #include "modules/audio_coding/codecs/opus/opus_interface.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" #include "rtc_base/protobuf_utils.h" namespace webrtc { diff --git a/modules/audio_coding/codecs/opus/audio_encoder_opus_unittest.cc b/modules/audio_coding/codecs/opus/audio_encoder_opus_unittest.cc index a0e24da985..6b34361813 100644 --- a/modules/audio_coding/codecs/opus/audio_encoder_opus_unittest.cc +++ b/modules/audio_coding/codecs/opus/audio_encoder_opus_unittest.cc @@ -20,11 +20,11 @@ #include "modules/audio_coding/codecs/opus/opus_interface.h" #include "modules/audio_coding/neteq/tools/audio_loop.h" #include "rtc_base/checks.h" -#include "rtc_base/fakeclock.h" +#include "rtc_base/fake_clock.h" #include "test/field_trial.h" #include "test/gmock.h" #include "test/gtest.h" -#include "test/testsupport/fileutils.h" +#include "test/testsupport/file_utils.h" namespace webrtc { using ::testing::NiceMock; diff --git a/modules/audio_coding/codecs/opus/opus_bandwidth_unittest.cc b/modules/audio_coding/codecs/opus/opus_bandwidth_unittest.cc index 7e6b6268f4..2c8edf0034 100644 --- a/modules/audio_coding/codecs/opus/opus_bandwidth_unittest.cc +++ b/modules/audio_coding/codecs/opus/opus_bandwidth_unittest.cc @@ -16,7 +16,7 @@ #include "modules/audio_coding/neteq/tools/audio_loop.h" #include "test/field_trial.h" #include "test/gtest.h" -#include "test/testsupport/fileutils.h" +#include "test/testsupport/file_utils.h" namespace webrtc { namespace { diff --git a/modules/audio_coding/codecs/opus/opus_complexity_unittest.cc b/modules/audio_coding/codecs/opus/opus_complexity_unittest.cc index 4c9174d92c..84bad33129 100644 --- a/modules/audio_coding/codecs/opus/opus_complexity_unittest.cc +++ b/modules/audio_coding/codecs/opus/opus_complexity_unittest.cc @@ -11,9 +11,9 @@ #include "api/audio_codecs/opus/audio_encoder_opus.h" #include "modules/audio_coding/neteq/tools/audio_loop.h" #include "rtc_base/format_macros.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/time_utils.h" #include "test/gtest.h" -#include "test/testsupport/fileutils.h" +#include "test/testsupport/file_utils.h" #include "test/testsupport/perf_test.h" namespace webrtc { diff --git a/modules/audio_coding/codecs/opus/opus_fec_test.cc b/modules/audio_coding/codecs/opus/opus_fec_test.cc index 4fab8a75a3..cd70821daf 100644 --- a/modules/audio_coding/codecs/opus/opus_fec_test.cc +++ b/modules/audio_coding/codecs/opus/opus_fec_test.cc @@ -13,7 +13,7 @@ #include "modules/audio_coding/codecs/opus/opus_interface.h" #include "rtc_base/format_macros.h" #include "test/gtest.h" -#include "test/testsupport/fileutils.h" +#include "test/testsupport/file_utils.h" using std::string; using std::tuple; diff --git a/modules/audio_coding/codecs/opus/opus_unittest.cc b/modules/audio_coding/codecs/opus/opus_unittest.cc index 034f8cd203..e5f0464f52 100644 --- a/modules/audio_coding/codecs/opus/opus_unittest.cc +++ b/modules/audio_coding/codecs/opus/opus_unittest.cc @@ -17,7 +17,7 @@ #include "rtc_base/checks.h" #include "rtc_base/numerics/safe_conversions.h" #include "test/gtest.h" -#include "test/testsupport/fileutils.h" +#include "test/testsupport/file_utils.h" namespace webrtc { diff --git a/modules/audio_coding/codecs/pcm16b/audio_decoder_pcm16b.h b/modules/audio_coding/codecs/pcm16b/audio_decoder_pcm16b.h index 9b478d806f..03341046a6 100644 --- a/modules/audio_coding/codecs/pcm16b/audio_decoder_pcm16b.h +++ b/modules/audio_coding/codecs/pcm16b/audio_decoder_pcm16b.h @@ -17,7 +17,7 @@ #include "api/audio_codecs/audio_decoder.h" #include "rtc_base/buffer.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace webrtc { diff --git a/modules/audio_coding/codecs/pcm16b/audio_encoder_pcm16b.h b/modules/audio_coding/codecs/pcm16b/audio_encoder_pcm16b.h index 6a20843fcb..71c757250a 100644 --- a/modules/audio_coding/codecs/pcm16b/audio_encoder_pcm16b.h +++ b/modules/audio_coding/codecs/pcm16b/audio_encoder_pcm16b.h @@ -12,7 +12,7 @@ #define MODULES_AUDIO_CODING_CODECS_PCM16B_AUDIO_ENCODER_PCM16B_H_ #include "modules/audio_coding/codecs/g711/audio_encoder_pcm.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace webrtc { diff --git a/modules/audio_coding/codecs/red/audio_encoder_copy_red.h b/modules/audio_coding/codecs/red/audio_encoder_copy_red.h index 5a68876b89..f05de19acb 100644 --- a/modules/audio_coding/codecs/red/audio_encoder_copy_red.h +++ b/modules/audio_coding/codecs/red/audio_encoder_copy_red.h @@ -19,7 +19,7 @@ #include "api/array_view.h" #include "api/audio_codecs/audio_encoder.h" #include "rtc_base/buffer.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace webrtc { diff --git a/modules/audio_coding/codecs/tools/audio_codec_speed_test.cc b/modules/audio_coding/codecs/tools/audio_codec_speed_test.cc index c539152212..1e6b4f0a13 100644 --- a/modules/audio_coding/codecs/tools/audio_codec_speed_test.cc +++ b/modules/audio_coding/codecs/tools/audio_codec_speed_test.cc @@ -12,7 +12,7 @@ #include "rtc_base/format_macros.h" #include "test/gtest.h" -#include "test/testsupport/fileutils.h" +#include "test/testsupport/file_utils.h" using ::std::get; diff --git a/modules/audio_coding/neteq/accelerate.h b/modules/audio_coding/neteq/accelerate.h index 1a3af42b2e..124b63384c 100644 --- a/modules/audio_coding/neteq/accelerate.h +++ b/modules/audio_coding/neteq/accelerate.h @@ -15,7 +15,7 @@ #include #include "modules/audio_coding/neteq/time_stretch.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace webrtc { diff --git a/modules/audio_coding/neteq/audio_decoder_unittest.cc b/modules/audio_coding/neteq/audio_decoder_unittest.cc index 1ad48350bb..42d96db4df 100644 --- a/modules/audio_coding/neteq/audio_decoder_unittest.cc +++ b/modules/audio_coding/neteq/audio_decoder_unittest.cc @@ -31,7 +31,7 @@ #include "modules/audio_coding/codecs/pcm16b/audio_encoder_pcm16b.h" #include "modules/audio_coding/neteq/tools/resample_input_audio_file.h" #include "test/gtest.h" -#include "test/testsupport/fileutils.h" +#include "test/testsupport/file_utils.h" namespace webrtc { diff --git a/modules/audio_coding/neteq/audio_multi_vector.h b/modules/audio_coding/neteq/audio_multi_vector.h index a2dd3c3cb1..a21bf57497 100644 --- a/modules/audio_coding/neteq/audio_multi_vector.h +++ b/modules/audio_coding/neteq/audio_multi_vector.h @@ -17,7 +17,7 @@ #include "api/array_view.h" #include "modules/audio_coding/neteq/audio_vector.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace webrtc { diff --git a/modules/audio_coding/neteq/audio_vector.h b/modules/audio_coding/neteq/audio_vector.h index d0db332db6..c8279da7e4 100644 --- a/modules/audio_coding/neteq/audio_vector.h +++ b/modules/audio_coding/neteq/audio_vector.h @@ -16,7 +16,7 @@ #include #include "rtc_base/checks.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace webrtc { diff --git a/modules/audio_coding/neteq/background_noise.h b/modules/audio_coding/neteq/background_noise.h index 84d7eb9d74..d047942773 100644 --- a/modules/audio_coding/neteq/background_noise.h +++ b/modules/audio_coding/neteq/background_noise.h @@ -14,7 +14,7 @@ #include // size_t #include -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace webrtc { diff --git a/modules/audio_coding/neteq/buffer_level_filter.h b/modules/audio_coding/neteq/buffer_level_filter.h index c8d27dcd1f..83388fb4f5 100644 --- a/modules/audio_coding/neteq/buffer_level_filter.h +++ b/modules/audio_coding/neteq/buffer_level_filter.h @@ -13,7 +13,7 @@ #include -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace webrtc { diff --git a/modules/audio_coding/neteq/comfort_noise.h b/modules/audio_coding/neteq/comfort_noise.h index 3a9bfde7aa..f748772710 100644 --- a/modules/audio_coding/neteq/comfort_noise.h +++ b/modules/audio_coding/neteq/comfort_noise.h @@ -13,7 +13,7 @@ #include -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace webrtc { diff --git a/modules/audio_coding/neteq/decision_logic.h b/modules/audio_coding/neteq/decision_logic.h index 2a533594b3..75f8a88b73 100644 --- a/modules/audio_coding/neteq/decision_logic.h +++ b/modules/audio_coding/neteq/decision_logic.h @@ -13,7 +13,7 @@ #include "modules/audio_coding/neteq/defines.h" #include "modules/audio_coding/neteq/tick_timer.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace webrtc { diff --git a/modules/audio_coding/neteq/decoder_database.h b/modules/audio_coding/neteq/decoder_database.h index f0163377c5..19922727ba 100644 --- a/modules/audio_coding/neteq/decoder_database.h +++ b/modules/audio_coding/neteq/decoder_database.h @@ -19,7 +19,7 @@ #include "api/audio_codecs/audio_format.h" #include "modules/audio_coding/codecs/cng/webrtc_cng.h" #include "modules/audio_coding/neteq/packet.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" #include "rtc_base/scoped_ref_ptr.h" namespace webrtc { diff --git a/modules/audio_coding/neteq/decoder_database_unittest.cc b/modules/audio_coding/neteq/decoder_database_unittest.cc index 0d7e57a335..9a28cacb35 100644 --- a/modules/audio_coding/neteq/decoder_database_unittest.cc +++ b/modules/audio_coding/neteq/decoder_database_unittest.cc @@ -15,7 +15,7 @@ #include #include "api/audio_codecs/builtin_audio_decoder_factory.h" -#include "rtc_base/refcountedobject.h" +#include "rtc_base/ref_counted_object.h" #include "test/gmock.h" #include "test/gtest.h" #include "test/mock_audio_decoder.h" diff --git a/modules/audio_coding/neteq/delay_manager.h b/modules/audio_coding/neteq/delay_manager.h index ce05bcc6f2..25eaba38dc 100644 --- a/modules/audio_coding/neteq/delay_manager.h +++ b/modules/audio_coding/neteq/delay_manager.h @@ -18,7 +18,7 @@ #include "absl/types/optional.h" #include "modules/audio_coding/neteq/tick_timer.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace webrtc { diff --git a/modules/audio_coding/neteq/delay_peak_detector.h b/modules/audio_coding/neteq/delay_peak_detector.h index 5c741178d2..8cd198dbda 100644 --- a/modules/audio_coding/neteq/delay_peak_detector.h +++ b/modules/audio_coding/neteq/delay_peak_detector.h @@ -17,7 +17,7 @@ #include #include "modules/audio_coding/neteq/tick_timer.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace webrtc { diff --git a/modules/audio_coding/neteq/dsp_helper.h b/modules/audio_coding/neteq/dsp_helper.h index 83794612c5..82fe14e6ea 100644 --- a/modules/audio_coding/neteq/dsp_helper.h +++ b/modules/audio_coding/neteq/dsp_helper.h @@ -16,7 +16,7 @@ #include "modules/audio_coding/neteq/audio_multi_vector.h" #include "modules/audio_coding/neteq/audio_vector.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace webrtc { diff --git a/modules/audio_coding/neteq/dtmf_buffer.h b/modules/audio_coding/neteq/dtmf_buffer.h index 24b14ece41..a994e3a739 100644 --- a/modules/audio_coding/neteq/dtmf_buffer.h +++ b/modules/audio_coding/neteq/dtmf_buffer.h @@ -15,7 +15,7 @@ #include #include -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace webrtc { diff --git a/modules/audio_coding/neteq/dtmf_tone_generator.h b/modules/audio_coding/neteq/dtmf_tone_generator.h index 22e166ef0c..968bc7f8c7 100644 --- a/modules/audio_coding/neteq/dtmf_tone_generator.h +++ b/modules/audio_coding/neteq/dtmf_tone_generator.h @@ -15,7 +15,7 @@ #include #include "modules/audio_coding/neteq/audio_multi_vector.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace webrtc { diff --git a/modules/audio_coding/neteq/expand.h b/modules/audio_coding/neteq/expand.h index 30c34a2c30..7c041b8671 100644 --- a/modules/audio_coding/neteq/expand.h +++ b/modules/audio_coding/neteq/expand.h @@ -15,7 +15,7 @@ #include #include "modules/audio_coding/neteq/audio_vector.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace webrtc { diff --git a/modules/audio_coding/neteq/expand_uma_logger.h b/modules/audio_coding/neteq/expand_uma_logger.h index bd079c6ab7..7cb11b1925 100644 --- a/modules/audio_coding/neteq/expand_uma_logger.h +++ b/modules/audio_coding/neteq/expand_uma_logger.h @@ -16,7 +16,7 @@ #include "absl/types/optional.h" #include "modules/audio_coding/neteq/tick_timer.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace webrtc { diff --git a/modules/audio_coding/neteq/expand_unittest.cc b/modules/audio_coding/neteq/expand_unittest.cc index 09914daca8..4c8c1743a8 100644 --- a/modules/audio_coding/neteq/expand_unittest.cc +++ b/modules/audio_coding/neteq/expand_unittest.cc @@ -20,7 +20,7 @@ #include "modules/audio_coding/neteq/tools/resample_input_audio_file.h" #include "rtc_base/numerics/safe_conversions.h" #include "test/gtest.h" -#include "test/testsupport/fileutils.h" +#include "test/testsupport/file_utils.h" namespace webrtc { diff --git a/modules/audio_coding/neteq/include/neteq.h b/modules/audio_coding/neteq/include/neteq.h index dec49c1b4c..6eecc65ca8 100644 --- a/modules/audio_coding/neteq/include/neteq.h +++ b/modules/audio_coding/neteq/include/neteq.h @@ -23,7 +23,7 @@ #include "api/audio_codecs/audio_format.h" #include "api/rtp_headers.h" #include "modules/audio_coding/neteq/defines.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" #include "rtc_base/scoped_ref_ptr.h" namespace webrtc { diff --git a/modules/audio_coding/neteq/merge.h b/modules/audio_coding/neteq/merge.h index e7e0bf9aa4..a062a95f6b 100644 --- a/modules/audio_coding/neteq/merge.h +++ b/modules/audio_coding/neteq/merge.h @@ -12,7 +12,7 @@ #define MODULES_AUDIO_CODING_NETEQ_MERGE_H_ #include "modules/audio_coding/neteq/audio_multi_vector.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace webrtc { diff --git a/modules/audio_coding/neteq/neteq_decoder_plc_unittest.cc b/modules/audio_coding/neteq/neteq_decoder_plc_unittest.cc index 0474e4a04d..21b15a9003 100644 --- a/modules/audio_coding/neteq/neteq_decoder_plc_unittest.cc +++ b/modules/audio_coding/neteq/neteq_decoder_plc_unittest.cc @@ -24,10 +24,10 @@ #include "modules/audio_coding/neteq/tools/input_audio_file.h" #include "modules/audio_coding/neteq/tools/neteq_test.h" #include "rtc_base/numerics/safe_conversions.h" -#include "rtc_base/refcountedobject.h" +#include "rtc_base/ref_counted_object.h" #include "test/audio_decoder_proxy_factory.h" #include "test/gtest.h" -#include "test/testsupport/fileutils.h" +#include "test/testsupport/file_utils.h" namespace webrtc { namespace test { diff --git a/modules/audio_coding/neteq/neteq_external_decoder_unittest.cc b/modules/audio_coding/neteq/neteq_external_decoder_unittest.cc index 6daa42e71e..8214ed2159 100644 --- a/modules/audio_coding/neteq/neteq_external_decoder_unittest.cc +++ b/modules/audio_coding/neteq/neteq_external_decoder_unittest.cc @@ -20,7 +20,7 @@ #include "modules/audio_coding/neteq/tools/rtp_generator.h" #include "rtc_base/strings/string_builder.h" #include "test/gmock.h" -#include "test/testsupport/fileutils.h" +#include "test/testsupport/file_utils.h" namespace webrtc { diff --git a/modules/audio_coding/neteq/neteq_impl.h b/modules/audio_coding/neteq/neteq_impl.h index 4dcab2a51d..d239627acc 100644 --- a/modules/audio_coding/neteq/neteq_impl.h +++ b/modules/audio_coding/neteq/neteq_impl.h @@ -24,8 +24,8 @@ #include "modules/audio_coding/neteq/random_vector.h" #include "modules/audio_coding/neteq/statistics_calculator.h" #include "modules/audio_coding/neteq/tick_timer.h" -#include "rtc_base/constructormagic.h" -#include "rtc_base/criticalsection.h" +#include "rtc_base/constructor_magic.h" +#include "rtc_base/critical_section.h" #include "rtc_base/thread_annotations.h" namespace webrtc { diff --git a/modules/audio_coding/neteq/neteq_network_stats_unittest.cc b/modules/audio_coding/neteq/neteq_network_stats_unittest.cc index 72a75d1b5c..79059b7f4e 100644 --- a/modules/audio_coding/neteq/neteq_network_stats_unittest.cc +++ b/modules/audio_coding/neteq/neteq_network_stats_unittest.cc @@ -17,7 +17,7 @@ #include "modules/audio_coding/neteq/include/neteq.h" #include "modules/audio_coding/neteq/tools/rtp_generator.h" -#include "rtc_base/refcountedobject.h" +#include "rtc_base/ref_counted_object.h" #include "test/audio_decoder_proxy_factory.h" #include "test/gmock.h" diff --git a/modules/audio_coding/neteq/neteq_stereo_unittest.cc b/modules/audio_coding/neteq/neteq_stereo_unittest.cc index 85dfc08fdb..289a38d9d2 100644 --- a/modules/audio_coding/neteq/neteq_stereo_unittest.cc +++ b/modules/audio_coding/neteq/neteq_stereo_unittest.cc @@ -23,7 +23,7 @@ #include "modules/audio_coding/neteq/tools/rtp_generator.h" #include "rtc_base/strings/string_builder.h" #include "test/gtest.h" -#include "test/testsupport/fileutils.h" +#include "test/testsupport/file_utils.h" namespace webrtc { diff --git a/modules/audio_coding/neteq/neteq_unittest.cc b/modules/audio_coding/neteq/neteq_unittest.cc index 6e0041382a..b562ede063 100644 --- a/modules/audio_coding/neteq/neteq_unittest.cc +++ b/modules/audio_coding/neteq/neteq_unittest.cc @@ -31,15 +31,15 @@ #include "modules/rtp_rtcp/include/rtcp_statistics.h" #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" #include "rtc_base/ignore_wundef.h" -#include "rtc_base/messagedigest.h" +#include "rtc_base/message_digest.h" #include "rtc_base/numerics/safe_conversions.h" #include "rtc_base/protobuf_utils.h" -#include "rtc_base/stringencode.h" +#include "rtc_base/string_encode.h" #include "rtc_base/strings/string_builder.h" #include "rtc_base/system/arch.h" #include "test/field_trial.h" #include "test/gtest.h" -#include "test/testsupport/fileutils.h" +#include "test/testsupport/file_utils.h" // This must come after test/gtest.h #include "rtc_base/flags.h" // NOLINT(build/include) diff --git a/modules/audio_coding/neteq/normal.h b/modules/audio_coding/neteq/normal.h index 80451b5007..2059c5a795 100644 --- a/modules/audio_coding/neteq/normal.h +++ b/modules/audio_coding/neteq/normal.h @@ -16,7 +16,7 @@ #include "modules/audio_coding/neteq/defines.h" #include "rtc_base/checks.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" #include "rtc_base/numerics/safe_conversions.h" namespace webrtc { diff --git a/modules/audio_coding/neteq/packet_buffer.h b/modules/audio_coding/neteq/packet_buffer.h index 0f5cd7f8ed..c594d19810 100644 --- a/modules/audio_coding/neteq/packet_buffer.h +++ b/modules/audio_coding/neteq/packet_buffer.h @@ -15,7 +15,7 @@ #include "modules/audio_coding/neteq/decoder_database.h" #include "modules/audio_coding/neteq/packet.h" #include "modules/include/module_common_types_public.h" // IsNewerTimestamp -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace webrtc { diff --git a/modules/audio_coding/neteq/post_decode_vad.h b/modules/audio_coding/neteq/post_decode_vad.h index 27d69a6eeb..ca7cabfd43 100644 --- a/modules/audio_coding/neteq/post_decode_vad.h +++ b/modules/audio_coding/neteq/post_decode_vad.h @@ -16,7 +16,7 @@ #include "api/audio_codecs/audio_decoder.h" #include "common_audio/vad/include/webrtc_vad.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace webrtc { diff --git a/modules/audio_coding/neteq/preemptive_expand.h b/modules/audio_coding/neteq/preemptive_expand.h index 0f7b3bc8ac..e7d2bad94b 100644 --- a/modules/audio_coding/neteq/preemptive_expand.h +++ b/modules/audio_coding/neteq/preemptive_expand.h @@ -15,7 +15,7 @@ #include #include "modules/audio_coding/neteq/time_stretch.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace webrtc { diff --git a/modules/audio_coding/neteq/random_vector.h b/modules/audio_coding/neteq/random_vector.h index e8c7ba847c..1d3760055b 100644 --- a/modules/audio_coding/neteq/random_vector.h +++ b/modules/audio_coding/neteq/random_vector.h @@ -14,7 +14,7 @@ #include #include -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace webrtc { diff --git a/modules/audio_coding/neteq/red_payload_splitter.h b/modules/audio_coding/neteq/red_payload_splitter.h index 55063e7417..c2e0a445d0 100644 --- a/modules/audio_coding/neteq/red_payload_splitter.h +++ b/modules/audio_coding/neteq/red_payload_splitter.h @@ -12,7 +12,7 @@ #define MODULES_AUDIO_CODING_NETEQ_RED_PAYLOAD_SPLITTER_H_ #include "modules/audio_coding/neteq/packet.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace webrtc { diff --git a/modules/audio_coding/neteq/statistics_calculator.h b/modules/audio_coding/neteq/statistics_calculator.h index 49b74a04b3..1dee6436a3 100644 --- a/modules/audio_coding/neteq/statistics_calculator.h +++ b/modules/audio_coding/neteq/statistics_calculator.h @@ -15,7 +15,7 @@ #include #include "modules/audio_coding/neteq/include/neteq.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace webrtc { diff --git a/modules/audio_coding/neteq/sync_buffer.h b/modules/audio_coding/neteq/sync_buffer.h index d645e9163e..7f6c111c71 100644 --- a/modules/audio_coding/neteq/sync_buffer.h +++ b/modules/audio_coding/neteq/sync_buffer.h @@ -19,7 +19,7 @@ #include "modules/audio_coding/neteq/audio_multi_vector.h" #include "modules/audio_coding/neteq/audio_vector.h" #include "rtc_base/buffer.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace webrtc { diff --git a/modules/audio_coding/neteq/test/neteq_ilbc_quality_test.cc b/modules/audio_coding/neteq/test/neteq_ilbc_quality_test.cc index b88c8560a7..09b3728bb8 100644 --- a/modules/audio_coding/neteq/test/neteq_ilbc_quality_test.cc +++ b/modules/audio_coding/neteq/test/neteq_ilbc_quality_test.cc @@ -15,7 +15,7 @@ #include "rtc_base/checks.h" #include "rtc_base/flags.h" #include "rtc_base/numerics/safe_conversions.h" -#include "test/testsupport/fileutils.h" +#include "test/testsupport/file_utils.h" using testing::InitGoogleTest; diff --git a/modules/audio_coding/neteq/test/neteq_pcm16b_quality_test.cc b/modules/audio_coding/neteq/test/neteq_pcm16b_quality_test.cc index cd38433b2c..3557b11260 100644 --- a/modules/audio_coding/neteq/test/neteq_pcm16b_quality_test.cc +++ b/modules/audio_coding/neteq/test/neteq_pcm16b_quality_test.cc @@ -16,7 +16,7 @@ #include "rtc_base/checks.h" #include "rtc_base/flags.h" #include "rtc_base/numerics/safe_conversions.h" -#include "test/testsupport/fileutils.h" +#include "test/testsupport/file_utils.h" using testing::InitGoogleTest; diff --git a/modules/audio_coding/neteq/test/neteq_pcmu_quality_test.cc b/modules/audio_coding/neteq/test/neteq_pcmu_quality_test.cc index 421e5f2f10..ce399a4e90 100644 --- a/modules/audio_coding/neteq/test/neteq_pcmu_quality_test.cc +++ b/modules/audio_coding/neteq/test/neteq_pcmu_quality_test.cc @@ -15,7 +15,7 @@ #include "rtc_base/checks.h" #include "rtc_base/flags.h" #include "rtc_base/numerics/safe_conversions.h" -#include "test/testsupport/fileutils.h" +#include "test/testsupport/file_utils.h" using testing::InitGoogleTest; diff --git a/modules/audio_coding/neteq/tick_timer.h b/modules/audio_coding/neteq/tick_timer.h index 02f083e02e..724dd125d3 100644 --- a/modules/audio_coding/neteq/tick_timer.h +++ b/modules/audio_coding/neteq/tick_timer.h @@ -15,7 +15,7 @@ #include #include "rtc_base/checks.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace webrtc { diff --git a/modules/audio_coding/neteq/time_stretch.h b/modules/audio_coding/neteq/time_stretch.h index 13ad2c8554..9f866493d9 100644 --- a/modules/audio_coding/neteq/time_stretch.h +++ b/modules/audio_coding/neteq/time_stretch.h @@ -15,7 +15,7 @@ #include // memset, size_t #include "modules/audio_coding/neteq/audio_multi_vector.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace webrtc { diff --git a/modules/audio_coding/neteq/time_stretch_unittest.cc b/modules/audio_coding/neteq/time_stretch_unittest.cc index c96c7d4ec2..6fced38942 100644 --- a/modules/audio_coding/neteq/time_stretch_unittest.cc +++ b/modules/audio_coding/neteq/time_stretch_unittest.cc @@ -21,7 +21,7 @@ #include "modules/audio_coding/neteq/tools/input_audio_file.h" #include "rtc_base/checks.h" #include "test/gtest.h" -#include "test/testsupport/fileutils.h" +#include "test/testsupport/file_utils.h" namespace webrtc { diff --git a/modules/audio_coding/neteq/timestamp_scaler.h b/modules/audio_coding/neteq/timestamp_scaler.h index 62f535c464..93cb953e90 100644 --- a/modules/audio_coding/neteq/timestamp_scaler.h +++ b/modules/audio_coding/neteq/timestamp_scaler.h @@ -12,7 +12,7 @@ #define MODULES_AUDIO_CODING_NETEQ_TIMESTAMP_SCALER_H_ #include "modules/audio_coding/neteq/packet.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace webrtc { diff --git a/modules/audio_coding/neteq/tools/audio_checksum.h b/modules/audio_coding/neteq/tools/audio_checksum.h index ee8c582380..e4306fa036 100644 --- a/modules/audio_coding/neteq/tools/audio_checksum.h +++ b/modules/audio_coding/neteq/tools/audio_checksum.h @@ -16,9 +16,9 @@ #include "modules/audio_coding/neteq/tools/audio_sink.h" #include "rtc_base/buffer.h" -#include "rtc_base/constructormagic.h" -#include "rtc_base/messagedigest.h" -#include "rtc_base/stringencode.h" +#include "rtc_base/constructor_magic.h" +#include "rtc_base/message_digest.h" +#include "rtc_base/string_encode.h" #include "rtc_base/system/arch.h" namespace webrtc { diff --git a/modules/audio_coding/neteq/tools/audio_loop.h b/modules/audio_coding/neteq/tools/audio_loop.h index c7788a693a..cd764cc5d0 100644 --- a/modules/audio_coding/neteq/tools/audio_loop.h +++ b/modules/audio_coding/neteq/tools/audio_loop.h @@ -15,7 +15,7 @@ #include #include "api/array_view.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace webrtc { namespace test { diff --git a/modules/audio_coding/neteq/tools/audio_sink.h b/modules/audio_coding/neteq/tools/audio_sink.h index be2a315350..68825ebbbf 100644 --- a/modules/audio_coding/neteq/tools/audio_sink.h +++ b/modules/audio_coding/neteq/tools/audio_sink.h @@ -12,7 +12,7 @@ #define MODULES_AUDIO_CODING_NETEQ_TOOLS_AUDIO_SINK_H_ #include "api/audio/audio_frame.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace webrtc { namespace test { diff --git a/modules/audio_coding/neteq/tools/constant_pcm_packet_source.h b/modules/audio_coding/neteq/tools/constant_pcm_packet_source.h index 117fabd9e0..7adb15bcea 100644 --- a/modules/audio_coding/neteq/tools/constant_pcm_packet_source.h +++ b/modules/audio_coding/neteq/tools/constant_pcm_packet_source.h @@ -15,7 +15,7 @@ #include #include "modules/audio_coding/neteq/tools/packet_source.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace webrtc { namespace test { diff --git a/modules/audio_coding/neteq/tools/input_audio_file.h b/modules/audio_coding/neteq/tools/input_audio_file.h index b36dc24e1a..4335a9913e 100644 --- a/modules/audio_coding/neteq/tools/input_audio_file.h +++ b/modules/audio_coding/neteq/tools/input_audio_file.h @@ -15,7 +15,7 @@ #include -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace webrtc { namespace test { diff --git a/modules/audio_coding/neteq/tools/neteq_performance_test.cc b/modules/audio_coding/neteq/tools/neteq_performance_test.cc index bd78ca4cb2..61f52bb3e5 100644 --- a/modules/audio_coding/neteq/tools/neteq_performance_test.cc +++ b/modules/audio_coding/neteq/tools/neteq_performance_test.cc @@ -18,7 +18,7 @@ #include "modules/audio_coding/neteq/tools/rtp_generator.h" #include "rtc_base/checks.h" #include "system_wrappers/include/clock.h" -#include "test/testsupport/fileutils.h" +#include "test/testsupport/file_utils.h" using webrtc::NetEq; using webrtc::test::AudioLoop; diff --git a/modules/audio_coding/neteq/tools/neteq_quality_test.cc b/modules/audio_coding/neteq/tools/neteq_quality_test.cc index 5a38255458..a0e7667520 100644 --- a/modules/audio_coding/neteq/tools/neteq_quality_test.cc +++ b/modules/audio_coding/neteq/tools/neteq_quality_test.cc @@ -17,7 +17,7 @@ #include "modules/audio_coding/neteq/tools/output_wav_file.h" #include "modules/audio_coding/neteq/tools/resample_input_audio_file.h" #include "rtc_base/checks.h" -#include "test/testsupport/fileutils.h" +#include "test/testsupport/file_utils.h" namespace webrtc { namespace test { diff --git a/modules/audio_coding/neteq/tools/neteq_stats_getter.cc b/modules/audio_coding/neteq/tools/neteq_stats_getter.cc index 1a521760b1..291fc24890 100644 --- a/modules/audio_coding/neteq/tools/neteq_stats_getter.cc +++ b/modules/audio_coding/neteq/tools/neteq_stats_getter.cc @@ -16,7 +16,7 @@ #include "rtc_base/checks.h" #include "rtc_base/strings/string_builder.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/time_utils.h" namespace webrtc { namespace test { diff --git a/modules/audio_coding/neteq/tools/neteq_test_factory.cc b/modules/audio_coding/neteq/tools/neteq_test_factory.cc index 76ff56c333..accaaed35c 100644 --- a/modules/audio_coding/neteq/tools/neteq_test_factory.cc +++ b/modules/audio_coding/neteq/tools/neteq_test_factory.cc @@ -38,9 +38,9 @@ #include "modules/audio_coding/neteq/tools/rtp_file_source.h" #include "rtc_base/checks.h" #include "rtc_base/flags.h" -#include "rtc_base/refcountedobject.h" +#include "rtc_base/ref_counted_object.h" #include "test/function_audio_decoder_factory.h" -#include "test/testsupport/fileutils.h" +#include "test/testsupport/file_utils.h" namespace webrtc { namespace test { diff --git a/modules/audio_coding/neteq/tools/output_audio_file.h b/modules/audio_coding/neteq/tools/output_audio_file.h index 7e65bc25db..c923a1ea41 100644 --- a/modules/audio_coding/neteq/tools/output_audio_file.h +++ b/modules/audio_coding/neteq/tools/output_audio_file.h @@ -16,7 +16,7 @@ #include #include "modules/audio_coding/neteq/tools/audio_sink.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace webrtc { namespace test { diff --git a/modules/audio_coding/neteq/tools/output_wav_file.h b/modules/audio_coding/neteq/tools/output_wav_file.h index 031a8cb929..3ffcfc6d62 100644 --- a/modules/audio_coding/neteq/tools/output_wav_file.h +++ b/modules/audio_coding/neteq/tools/output_wav_file.h @@ -15,7 +15,7 @@ #include "common_audio/wav_file.h" #include "modules/audio_coding/neteq/tools/audio_sink.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace webrtc { namespace test { diff --git a/modules/audio_coding/neteq/tools/packet.h b/modules/audio_coding/neteq/tools/packet.h index 1fe10005d3..5748ba2590 100644 --- a/modules/audio_coding/neteq/tools/packet.h +++ b/modules/audio_coding/neteq/tools/packet.h @@ -15,7 +15,7 @@ #include #include "api/rtp_headers.h" // NOLINT(build/include) -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace webrtc { diff --git a/modules/audio_coding/neteq/tools/packet_source.h b/modules/audio_coding/neteq/tools/packet_source.h index cb86a98999..975680f5a9 100644 --- a/modules/audio_coding/neteq/tools/packet_source.h +++ b/modules/audio_coding/neteq/tools/packet_source.h @@ -15,7 +15,7 @@ #include #include "modules/audio_coding/neteq/tools/packet.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace webrtc { namespace test { diff --git a/modules/audio_coding/neteq/tools/resample_input_audio_file.h b/modules/audio_coding/neteq/tools/resample_input_audio_file.h index 4e2e9b0bd9..d961f33ccb 100644 --- a/modules/audio_coding/neteq/tools/resample_input_audio_file.h +++ b/modules/audio_coding/neteq/tools/resample_input_audio_file.h @@ -15,7 +15,7 @@ #include "common_audio/resampler/include/resampler.h" #include "modules/audio_coding/neteq/tools/input_audio_file.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace webrtc { namespace test { diff --git a/modules/audio_coding/neteq/tools/rtc_event_log_source.h b/modules/audio_coding/neteq/tools/rtc_event_log_source.h index ea620da959..5238efb6e4 100644 --- a/modules/audio_coding/neteq/tools/rtc_event_log_source.h +++ b/modules/audio_coding/neteq/tools/rtc_event_log_source.h @@ -19,7 +19,7 @@ #include "logging/rtc_event_log/rtc_event_log_parser.h" #include "modules/audio_coding/neteq/tools/packet_source.h" #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace webrtc { diff --git a/modules/audio_coding/neteq/tools/rtp_file_source.h b/modules/audio_coding/neteq/tools/rtp_file_source.h index 7cb9a89b2c..77e435ae3a 100644 --- a/modules/audio_coding/neteq/tools/rtp_file_source.h +++ b/modules/audio_coding/neteq/tools/rtp_file_source.h @@ -19,7 +19,7 @@ #include "absl/types/optional.h" #include "modules/audio_coding/neteq/tools/packet_source.h" #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace webrtc { diff --git a/modules/audio_coding/neteq/tools/rtp_generator.h b/modules/audio_coding/neteq/tools/rtp_generator.h index a1a360fa45..1454c5796a 100644 --- a/modules/audio_coding/neteq/tools/rtp_generator.h +++ b/modules/audio_coding/neteq/tools/rtp_generator.h @@ -12,7 +12,7 @@ #define MODULES_AUDIO_CODING_NETEQ_TOOLS_RTP_GENERATOR_H_ #include "api/rtp_headers.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace webrtc { namespace test { diff --git a/modules/audio_coding/test/Channel.cc b/modules/audio_coding/test/Channel.cc index 8cb5baa7d1..4cb6c35cc5 100644 --- a/modules/audio_coding/test/Channel.cc +++ b/modules/audio_coding/test/Channel.cc @@ -14,7 +14,7 @@ #include #include "rtc_base/format_macros.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/time_utils.h" namespace webrtc { diff --git a/modules/audio_coding/test/Channel.h b/modules/audio_coding/test/Channel.h index eb197c6d1d..e428a716e0 100644 --- a/modules/audio_coding/test/Channel.h +++ b/modules/audio_coding/test/Channel.h @@ -15,7 +15,7 @@ #include "modules/audio_coding/include/audio_coding_module.h" #include "modules/include/module_common_types.h" -#include "rtc_base/criticalsection.h" +#include "rtc_base/critical_section.h" namespace webrtc { diff --git a/modules/audio_coding/test/EncodeDecodeTest.cc b/modules/audio_coding/test/EncodeDecodeTest.cc index 6ca7408a06..fbbc9d32f0 100644 --- a/modules/audio_coding/test/EncodeDecodeTest.cc +++ b/modules/audio_coding/test/EncodeDecodeTest.cc @@ -19,7 +19,7 @@ #include "modules/audio_coding/include/audio_coding_module.h" #include "rtc_base/strings/string_builder.h" #include "test/gtest.h" -#include "test/testsupport/fileutils.h" +#include "test/testsupport/file_utils.h" namespace webrtc { diff --git a/modules/audio_coding/test/PacketLossTest.cc b/modules/audio_coding/test/PacketLossTest.cc index 6f876590d6..000041bede 100644 --- a/modules/audio_coding/test/PacketLossTest.cc +++ b/modules/audio_coding/test/PacketLossTest.cc @@ -15,7 +15,7 @@ #include "api/audio_codecs/builtin_audio_decoder_factory.h" #include "rtc_base/strings/string_builder.h" #include "test/gtest.h" -#include "test/testsupport/fileutils.h" +#include "test/testsupport/file_utils.h" namespace webrtc { diff --git a/modules/audio_coding/test/TestAllCodecs.cc b/modules/audio_coding/test/TestAllCodecs.cc index aad80e8ca6..75ba60a1e1 100644 --- a/modules/audio_coding/test/TestAllCodecs.cc +++ b/modules/audio_coding/test/TestAllCodecs.cc @@ -20,10 +20,10 @@ #include "modules/audio_coding/include/audio_coding_module_typedefs.h" #include "modules/include/module_common_types.h" #include "rtc_base/logging.h" -#include "rtc_base/stringencode.h" +#include "rtc_base/string_encode.h" #include "rtc_base/strings/string_builder.h" #include "test/gtest.h" -#include "test/testsupport/fileutils.h" +#include "test/testsupport/file_utils.h" // Description of the test: // In this test we set up a one-way communication channel from a participant diff --git a/modules/audio_coding/test/TestRedFec.cc b/modules/audio_coding/test/TestRedFec.cc index b284205b83..0cb2415888 100644 --- a/modules/audio_coding/test/TestRedFec.cc +++ b/modules/audio_coding/test/TestRedFec.cc @@ -31,7 +31,7 @@ #include "modules/audio_coding/include/audio_coding_module_typedefs.h" #include "rtc_base/strings/string_builder.h" #include "test/gtest.h" -#include "test/testsupport/fileutils.h" +#include "test/testsupport/file_utils.h" namespace webrtc { diff --git a/modules/audio_coding/test/TestStereo.cc b/modules/audio_coding/test/TestStereo.cc index dd4be6a524..70065fb983 100644 --- a/modules/audio_coding/test/TestStereo.cc +++ b/modules/audio_coding/test/TestStereo.cc @@ -19,7 +19,7 @@ #include "modules/include/module_common_types.h" #include "rtc_base/strings/string_builder.h" #include "test/gtest.h" -#include "test/testsupport/fileutils.h" +#include "test/testsupport/file_utils.h" namespace webrtc { diff --git a/modules/audio_coding/test/TestVADDTX.cc b/modules/audio_coding/test/TestVADDTX.cc index 8e16280080..7c04b228c6 100644 --- a/modules/audio_coding/test/TestVADDTX.cc +++ b/modules/audio_coding/test/TestVADDTX.cc @@ -25,7 +25,7 @@ #include "modules/audio_coding/test/PCMFile.h" #include "rtc_base/strings/string_builder.h" #include "test/gtest.h" -#include "test/testsupport/fileutils.h" +#include "test/testsupport/file_utils.h" namespace webrtc { diff --git a/modules/audio_coding/test/Tester.cc b/modules/audio_coding/test/Tester.cc index 750656f85f..56e2c46af9 100644 --- a/modules/audio_coding/test/Tester.cc +++ b/modules/audio_coding/test/Tester.cc @@ -23,7 +23,7 @@ #include "modules/audio_coding/test/iSACTest.h" #include "modules/audio_coding/test/opus_test.h" #include "test/gtest.h" -#include "test/testsupport/fileutils.h" +#include "test/testsupport/file_utils.h" TEST(AudioCodingModuleTest, TestAllCodecs) { webrtc::TestAllCodecs().Perform(); diff --git a/modules/audio_coding/test/TwoWayCommunication.cc b/modules/audio_coding/test/TwoWayCommunication.cc index 3af114e0ba..585c1db51b 100644 --- a/modules/audio_coding/test/TwoWayCommunication.cc +++ b/modules/audio_coding/test/TwoWayCommunication.cc @@ -20,7 +20,7 @@ #include "api/audio_codecs/builtin_audio_encoder_factory.h" #include "modules/audio_coding/test/PCMFile.h" #include "test/gtest.h" -#include "test/testsupport/fileutils.h" +#include "test/testsupport/file_utils.h" namespace webrtc { diff --git a/modules/audio_coding/test/iSACTest.cc b/modules/audio_coding/test/iSACTest.cc index 0dceca7f03..7776a60e61 100644 --- a/modules/audio_coding/test/iSACTest.cc +++ b/modules/audio_coding/test/iSACTest.cc @@ -18,11 +18,11 @@ #include "api/audio_codecs/builtin_audio_decoder_factory.h" #include "api/audio_codecs/isac/audio_encoder_isac_float.h" #include "rtc_base/strings/string_builder.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/time_utils.h" #include "system_wrappers/include/sleep.h" #include "test/gmock.h" #include "test/gtest.h" -#include "test/testsupport/fileutils.h" +#include "test/testsupport/file_utils.h" namespace webrtc { diff --git a/modules/audio_coding/test/opus_test.cc b/modules/audio_coding/test/opus_test.cc index 1e24e5dae7..b8d8e67b0e 100644 --- a/modules/audio_coding/test/opus_test.cc +++ b/modules/audio_coding/test/opus_test.cc @@ -17,7 +17,7 @@ #include "modules/audio_coding/include/audio_coding_module_typedefs.h" #include "modules/audio_coding/test/TestStereo.h" #include "test/gtest.h" -#include "test/testsupport/fileutils.h" +#include "test/testsupport/file_utils.h" namespace webrtc { diff --git a/modules/audio_coding/test/target_delay_unittest.cc b/modules/audio_coding/test/target_delay_unittest.cc index 8d82b6eb87..c972e62f58 100644 --- a/modules/audio_coding/test/target_delay_unittest.cc +++ b/modules/audio_coding/test/target_delay_unittest.cc @@ -16,7 +16,7 @@ #include "modules/audio_coding/include/audio_coding_module.h" #include "modules/include/module_common_types.h" #include "test/gtest.h" -#include "test/testsupport/fileutils.h" +#include "test/testsupport/file_utils.h" namespace webrtc { diff --git a/modules/audio_device/android/aaudio_player.h b/modules/audio_device/android/aaudio_player.h index a92d508211..7173a25af8 100644 --- a/modules/audio_device/android/aaudio_player.h +++ b/modules/audio_device/android/aaudio_player.h @@ -16,7 +16,7 @@ #include "modules/audio_device/android/aaudio_wrapper.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/modules/audio_device/android/aaudio_recorder.cc b/modules/audio_device/android/aaudio_recorder.cc index 7eb7b1c59e..446512e85e 100644 --- a/modules/audio_device/android/aaudio_recorder.cc +++ b/modules/audio_device/android/aaudio_recorder.cc @@ -16,7 +16,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" namespace webrtc { diff --git a/modules/audio_device/android/aaudio_recorder.h b/modules/audio_device/android/aaudio_recorder.h index 1b78a018a1..cfd463fa7d 100644 --- a/modules/audio_device/android/aaudio_recorder.h +++ b/modules/audio_device/android/aaudio_recorder.h @@ -16,7 +16,7 @@ #include "modules/audio_device/android/aaudio_wrapper.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" diff --git a/modules/audio_device/android/aaudio_wrapper.cc b/modules/audio_device/android/aaudio_wrapper.cc index d95a9b4c6e..7e0c9a044e 100644 --- a/modules/audio_device/android/aaudio_wrapper.cc +++ b/modules/audio_device/android/aaudio_wrapper.cc @@ -13,7 +13,7 @@ #include "modules/audio_device/android/audio_manager.h" #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/modules/audio_device/android/audio_device_unittest.cc b/modules/audio_device/android/audio_device_unittest.cc index 6e09139c79..ec6646c3a0 100644 --- a/modules/audio_device/android/audio_device_unittest.cc +++ b/modules/audio_device/android/audio_device_unittest.cc @@ -24,14 +24,14 @@ #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 "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/modules/audio_device/android/audio_record_jni.cc b/modules/audio_device/android/audio_record_jni.cc index 97ba6c668c..920548943d 100644 --- a/modules/audio_device/android/audio_record_jni.cc +++ b/modules/audio_device/android/audio_record_jni.cc @@ -19,7 +19,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 "system_wrappers/include/metrics.h" namespace webrtc { diff --git a/modules/audio_device/android/opensles_player.cc b/modules/audio_device/android/opensles_player.cc index 6f86ba5794..921ffd29d2 100644 --- a/modules/audio_device/android/opensles_player.cc +++ b/modules/audio_device/android/opensles_player.cc @@ -21,7 +21,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" #define TAG "OpenSLESPlayer" #define ALOGV(...) __android_log_print(ANDROID_LOG_VERBOSE, TAG, __VA_ARGS__) diff --git a/modules/audio_device/android/opensles_recorder.cc b/modules/audio_device/android/opensles_recorder.cc index 6bc1bf57db..2d5dbb9bb5 100644 --- a/modules/audio_device/android/opensles_recorder.cc +++ b/modules/audio_device/android/opensles_recorder.cc @@ -21,7 +21,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" #define TAG "OpenSLESRecorder" #define ALOGV(...) __android_log_print(ANDROID_LOG_VERBOSE, TAG, __VA_ARGS__) diff --git a/modules/audio_device/audio_device_buffer.cc b/modules/audio_device/audio_device_buffer.cc index 8f920cfff8..052071a7fa 100644 --- a/modules/audio_device/audio_device_buffer.cc +++ b/modules/audio_device/audio_device_buffer.cc @@ -18,7 +18,7 @@ #include "rtc_base/bind.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/metrics.h" namespace webrtc { diff --git a/modules/audio_device/audio_device_buffer.h b/modules/audio_device/audio_device_buffer.h index bbe2969d43..37d9ffb6d6 100644 --- a/modules/audio_device/audio_device_buffer.h +++ b/modules/audio_device/audio_device_buffer.h @@ -17,7 +17,7 @@ #include "modules/audio_device/include/audio_device_defines.h" #include "rtc_base/buffer.h" -#include "rtc_base/criticalsection.h" +#include "rtc_base/critical_section.h" #include "rtc_base/task_queue.h" #include "rtc_base/thread_annotations.h" #include "rtc_base/thread_checker.h" diff --git a/modules/audio_device/audio_device_data_observer.cc b/modules/audio_device/audio_device_data_observer.cc index 994c2efdf3..56ba32b018 100644 --- a/modules/audio_device/audio_device_data_observer.cc +++ b/modules/audio_device/audio_device_data_observer.cc @@ -12,7 +12,7 @@ #include "modules/audio_device/include/audio_device_defines.h" #include "rtc_base/checks.h" -#include "rtc_base/refcountedobject.h" +#include "rtc_base/ref_counted_object.h" namespace webrtc { diff --git a/modules/audio_device/audio_device_impl.cc b/modules/audio_device/audio_device_impl.cc index c5f4332e5e..3fa95d3bc5 100644 --- a/modules/audio_device/audio_device_impl.cc +++ b/modules/audio_device/audio_device_impl.cc @@ -16,7 +16,7 @@ #include "modules/audio_device/audio_device_generic.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/scoped_ref_ptr.h" #include "system_wrappers/include/metrics.h" diff --git a/modules/audio_device/audio_device_unittest.cc b/modules/audio_device/audio_device_unittest.cc index 5ae48d82ab..f0ede1b1af 100644 --- a/modules/audio_device/audio_device_unittest.cc +++ b/modules/audio_device/audio_device_unittest.cc @@ -20,7 +20,7 @@ #include "modules/audio_device/include/audio_device.h" #include "modules/audio_device/include/mock_audio_transport.h" #include "rtc_base/buffer.h" -#include "rtc_base/criticalsection.h" +#include "rtc_base/critical_section.h" #include "rtc_base/event.h" #include "rtc_base/logging.h" #include "rtc_base/numerics/safe_conversions.h" @@ -28,7 +28,7 @@ #include "rtc_base/scoped_ref_ptr.h" #include "rtc_base/thread_annotations.h" #include "rtc_base/thread_checker.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/time_utils.h" #include "system_wrappers/include/sleep.h" #include "test/gmock.h" #include "test/gtest.h" diff --git a/modules/audio_device/dummy/file_audio_device.cc b/modules/audio_device/dummy/file_audio_device.cc index 2848eeae35..ea736e0bab 100644 --- a/modules/audio_device/dummy/file_audio_device.cc +++ b/modules/audio_device/dummy/file_audio_device.cc @@ -15,7 +15,7 @@ #include "rtc_base/checks.h" #include "rtc_base/logging.h" #include "rtc_base/platform_thread.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/time_utils.h" #include "system_wrappers/include/sleep.h" namespace webrtc { diff --git a/modules/audio_device/dummy/file_audio_device.h b/modules/audio_device/dummy/file_audio_device.h index 210c8f7b8b..375c6f6a73 100644 --- a/modules/audio_device/dummy/file_audio_device.h +++ b/modules/audio_device/dummy/file_audio_device.h @@ -17,9 +17,9 @@ #include #include "modules/audio_device/audio_device_generic.h" -#include "rtc_base/criticalsection.h" +#include "rtc_base/critical_section.h" #include "rtc_base/system/file_wrapper.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/time_utils.h" namespace rtc { class PlatformThread; diff --git a/modules/audio_device/include/audio_device.h b/modules/audio_device/include/audio_device.h index d73c1e66ea..c8f75031a5 100644 --- a/modules/audio_device/include/audio_device.h +++ b/modules/audio_device/include/audio_device.h @@ -12,7 +12,7 @@ #define MODULES_AUDIO_DEVICE_INCLUDE_AUDIO_DEVICE_H_ #include "modules/audio_device/include/audio_device_defines.h" -#include "rtc_base/refcount.h" +#include "rtc_base/ref_count.h" #include "rtc_base/scoped_ref_ptr.h" namespace webrtc { diff --git a/modules/audio_device/include/test_audio_device.cc b/modules/audio_device/include/test_audio_device.cc index 8aea1d245e..98c1612151 100644 --- a/modules/audio_device/include/test_audio_device.cc +++ b/modules/audio_device/include/test_audio_device.cc @@ -23,16 +23,16 @@ #include "modules/audio_device/include/test_audio_device.h" #include "rtc_base/buffer.h" #include "rtc_base/checks.h" -#include "rtc_base/criticalsection.h" +#include "rtc_base/critical_section.h" #include "rtc_base/event.h" #include "rtc_base/logging.h" #include "rtc_base/numerics/safe_conversions.h" #include "rtc_base/platform_thread.h" #include "rtc_base/random.h" -#include "rtc_base/refcountedobject.h" +#include "rtc_base/ref_counted_object.h" #include "rtc_base/thread.h" #include "rtc_base/thread_annotations.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/time_utils.h" namespace webrtc { diff --git a/modules/audio_device/include/test_audio_device_unittest.cc b/modules/audio_device/include/test_audio_device_unittest.cc index bdb1285e85..8d62084224 100644 --- a/modules/audio_device/include/test_audio_device_unittest.cc +++ b/modules/audio_device/include/test_audio_device_unittest.cc @@ -18,7 +18,7 @@ #include "rtc_base/logging.h" #include "test/gmock.h" #include "test/gtest.h" -#include "test/testsupport/fileutils.h" +#include "test/testsupport/file_utils.h" namespace webrtc { diff --git a/modules/audio_device/ios/audio_device_ios.mm b/modules/audio_device/ios/audio_device_ios.mm index 1aaff1f90c..8fa34d10f8 100644 --- a/modules/audio_device/ios/audio_device_ios.mm +++ b/modules/audio_device/ios/audio_device_ios.mm @@ -17,14 +17,14 @@ #include "api/array_view.h" #include "modules/audio_device/fine_audio_buffer.h" -#include "rtc_base/atomicops.h" +#include "rtc_base/atomic_ops.h" #include "rtc_base/bind.h" #include "rtc_base/checks.h" -#include "rtc_base/criticalsection.h" +#include "rtc_base/critical_section.h" #include "rtc_base/logging.h" #include "rtc_base/thread.h" #include "rtc_base/thread_annotations.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/time_utils.h" #include "sdk/objc/native/src/audio/helpers.h" #include "system_wrappers/include/metrics.h" diff --git a/modules/audio_device/ios/audio_device_unittest_ios.mm b/modules/audio_device/ios/audio_device_unittest_ios.mm index 19ff9c9233..983ad5d6da 100644 --- a/modules/audio_device/ios/audio_device_unittest_ios.mm +++ b/modules/audio_device/ios/audio_device_unittest_ios.mm @@ -21,15 +21,15 @@ #include "modules/audio_device/include/mock_audio_transport.h" #include "modules/audio_device/ios/audio_device_ios.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/logging.h" #include "rtc_base/scoped_ref_ptr.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/time_utils.h" #include "test/gmock.h" #include "test/gtest.h" -#include "test/testsupport/fileutils.h" +#include "test/testsupport/file_utils.h" #import "sdk/objc/components/audio/RTCAudioSession+Private.h" #import "sdk/objc/components/audio/RTCAudioSession.h" diff --git a/modules/audio_device/ios/audio_session_observer.h b/modules/audio_device/ios/audio_session_observer.h index 13a979bd4e..c79cdd1436 100644 --- a/modules/audio_device/ios/audio_session_observer.h +++ b/modules/audio_device/ios/audio_session_observer.h @@ -11,7 +11,7 @@ #ifndef MODULES_AUDIO_DEVICE_IOS_AUDIO_SESSION_OBSERVER_H_ #define MODULES_AUDIO_DEVICE_IOS_AUDIO_SESSION_OBSERVER_H_ -#include "rtc_base/asyncinvoker.h" +#include "rtc_base/async_invoker.h" #include "rtc_base/thread.h" namespace webrtc { diff --git a/modules/audio_device/linux/audio_device_alsa_linux.h b/modules/audio_device/linux/audio_device_alsa_linux.h index d60dcafdce..69e6e50822 100644 --- a/modules/audio_device/linux/audio_device_alsa_linux.h +++ b/modules/audio_device/linux/audio_device_alsa_linux.h @@ -15,7 +15,7 @@ #include "modules/audio_device/audio_device_generic.h" #include "modules/audio_device/linux/audio_mixer_manager_alsa_linux.h" -#include "rtc_base/criticalsection.h" +#include "rtc_base/critical_section.h" #include "rtc_base/platform_thread.h" #if defined(WEBRTC_USE_X11) diff --git a/modules/audio_device/linux/audio_device_pulse_linux.h b/modules/audio_device/linux/audio_device_pulse_linux.h index 4de87fc3e6..367d6571a7 100644 --- a/modules/audio_device/linux/audio_device_pulse_linux.h +++ b/modules/audio_device/linux/audio_device_pulse_linux.h @@ -19,7 +19,7 @@ #include "modules/audio_device/include/audio_device_defines.h" #include "modules/audio_device/linux/audio_mixer_manager_pulse_linux.h" #include "modules/audio_device/linux/pulseaudiosymboltable_linux.h" -#include "rtc_base/criticalsection.h" +#include "rtc_base/critical_section.h" #include "rtc_base/event.h" #include "rtc_base/platform_thread.h" #include "rtc_base/thread_annotations.h" diff --git a/modules/audio_device/linux/audio_mixer_manager_alsa_linux.h b/modules/audio_device/linux/audio_mixer_manager_alsa_linux.h index 5d40e08bf5..4cd563a6b1 100644 --- a/modules/audio_device/linux/audio_mixer_manager_alsa_linux.h +++ b/modules/audio_device/linux/audio_mixer_manager_alsa_linux.h @@ -13,7 +13,7 @@ #include "modules/audio_device/include/audio_device.h" #include "modules/audio_device/linux/alsasymboltable_linux.h" -#include "rtc_base/criticalsection.h" +#include "rtc_base/critical_section.h" #include diff --git a/modules/audio_device/linux/latebindingsymboltable_linux.h b/modules/audio_device/linux/latebindingsymboltable_linux.h index 57314a6e13..edb62aede8 100644 --- a/modules/audio_device/linux/latebindingsymboltable_linux.h +++ b/modules/audio_device/linux/latebindingsymboltable_linux.h @@ -15,7 +15,7 @@ #include // for NULL #include -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" // This file provides macros for creating "symbol table" classes to simplify the // dynamic loading of symbols from DLLs. Currently the implementation only diff --git a/modules/audio_device/mac/audio_device_mac.h b/modules/audio_device/mac/audio_device_mac.h index 5a70760653..e9ea7a71e7 100644 --- a/modules/audio_device/mac/audio_device_mac.h +++ b/modules/audio_device/mac/audio_device_mac.h @@ -15,7 +15,7 @@ #include "modules/audio_device/audio_device_generic.h" #include "modules/audio_device/mac/audio_mixer_manager_mac.h" -#include "rtc_base/criticalsection.h" +#include "rtc_base/critical_section.h" #include "rtc_base/event.h" #include "rtc_base/logging.h" #include "rtc_base/thread_annotations.h" diff --git a/modules/audio_device/mac/audio_mixer_manager_mac.h b/modules/audio_device/mac/audio_mixer_manager_mac.h index bb67f2058c..c073e6c319 100644 --- a/modules/audio_device/mac/audio_mixer_manager_mac.h +++ b/modules/audio_device/mac/audio_mixer_manager_mac.h @@ -12,7 +12,7 @@ #define AUDIO_DEVICE_AUDIO_MIXER_MANAGER_MAC_H_ #include "modules/audio_device/include/audio_device.h" -#include "rtc_base/criticalsection.h" +#include "rtc_base/critical_section.h" #include "rtc_base/logging.h" #include diff --git a/modules/audio_device/win/audio_device_core_win.cc b/modules/audio_device/win/audio_device_core_win.cc index fef8e50ffd..159db9219b 100644 --- a/modules/audio_device/win/audio_device_core_win.cc +++ b/modules/audio_device/win/audio_device_core_win.cc @@ -40,7 +40,7 @@ #include "rtc_base/logging.h" #include "rtc_base/platform_thread.h" -#include "rtc_base/stringutils.h" +#include "rtc_base/string_utils.h" #include "rtc_base/thread_annotations.h" #include "system_wrappers/include/sleep.h" diff --git a/modules/audio_device/win/audio_device_core_win.h b/modules/audio_device/win/audio_device_core_win.h index 7d06c8c890..9945552b2c 100644 --- a/modules/audio_device/win/audio_device_core_win.h +++ b/modules/audio_device/win/audio_device_core_win.h @@ -26,7 +26,7 @@ #include // IMediaObject #include // MMDevice -#include "rtc_base/criticalsection.h" +#include "rtc_base/critical_section.h" #include "rtc_base/scoped_ref_ptr.h" // Use Multimedia Class Scheduler Service (MMCSS) to boost the thread priority diff --git a/modules/audio_device/win/audio_device_module_win.cc b/modules/audio_device/win/audio_device_module_win.cc index f5d9c54920..2b9d6927bf 100644 --- a/modules/audio_device/win/audio_device_module_win.cc +++ b/modules/audio_device/win/audio_device_module_win.cc @@ -17,8 +17,8 @@ #include "modules/audio_device/include/audio_device.h" #include "rtc_base/checks.h" #include "rtc_base/logging.h" -#include "rtc_base/refcountedobject.h" -#include "rtc_base/stringutils.h" +#include "rtc_base/ref_counted_object.h" +#include "rtc_base/string_utils.h" #include "rtc_base/thread_checker.h" namespace webrtc { diff --git a/modules/audio_device/win/core_audio_base_win.cc b/modules/audio_device/win/core_audio_base_win.cc index 43e7bba607..c336c4281a 100644 --- a/modules/audio_device/win/core_audio_base_win.cc +++ b/modules/audio_device/win/core_audio_base_win.cc @@ -18,7 +18,7 @@ #include "rtc_base/checks.h" #include "rtc_base/logging.h" #include "rtc_base/numerics/safe_conversions.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/time_utils.h" #include "rtc_base/win/windows_version.h" using Microsoft::WRL::ComPtr; diff --git a/modules/audio_device/win/core_audio_output_win.cc b/modules/audio_device/win/core_audio_output_win.cc index d40d4f198b..c0dc1857d1 100644 --- a/modules/audio_device/win/core_audio_output_win.cc +++ b/modules/audio_device/win/core_audio_output_win.cc @@ -16,7 +16,7 @@ #include "rtc_base/bind.h" #include "rtc_base/checks.h" #include "rtc_base/logging.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/time_utils.h" using Microsoft::WRL::ComPtr; diff --git a/modules/audio_device/win/core_audio_utility_win.cc b/modules/audio_device/win/core_audio_utility_win.cc index a19ab77dc2..83ac8aa0e0 100644 --- a/modules/audio_device/win/core_audio_utility_win.cc +++ b/modules/audio_device/win/core_audio_utility_win.cc @@ -22,8 +22,8 @@ #include "rtc_base/arraysize.h" #include "rtc_base/logging.h" #include "rtc_base/platform_thread_types.h" +#include "rtc_base/string_utils.h" #include "rtc_base/strings/string_builder.h" -#include "rtc_base/stringutils.h" #include "rtc_base/win/windows_version.h" using ATL::CComHeapPtr; diff --git a/modules/audio_mixer/audio_mixer_impl.cc b/modules/audio_mixer/audio_mixer_impl.cc index 6957c65bc4..bca2a571a9 100644 --- a/modules/audio_mixer/audio_mixer_impl.cc +++ b/modules/audio_mixer/audio_mixer_impl.cc @@ -20,7 +20,7 @@ #include "modules/audio_mixer/default_output_rate_calculator.h" #include "rtc_base/checks.h" #include "rtc_base/logging.h" -#include "rtc_base/refcountedobject.h" +#include "rtc_base/ref_counted_object.h" namespace webrtc { namespace { diff --git a/modules/audio_mixer/audio_mixer_impl.h b/modules/audio_mixer/audio_mixer_impl.h index adaf2bd481..94361c739e 100644 --- a/modules/audio_mixer/audio_mixer_impl.h +++ b/modules/audio_mixer/audio_mixer_impl.h @@ -19,8 +19,8 @@ #include "api/audio/audio_mixer.h" #include "modules/audio_mixer/frame_combiner.h" #include "modules/audio_mixer/output_rate_calculator.h" -#include "rtc_base/constructormagic.h" -#include "rtc_base/criticalsection.h" +#include "rtc_base/constructor_magic.h" +#include "rtc_base/critical_section.h" #include "rtc_base/race_checker.h" #include "rtc_base/scoped_ref_ptr.h" #include "rtc_base/thread_annotations.h" diff --git a/modules/audio_processing/aec/aec_core.h b/modules/audio_processing/aec/aec_core.h index 35a6c9b216..06ae2a4e07 100644 --- a/modules/audio_processing/aec/aec_core.h +++ b/modules/audio_processing/aec/aec_core.h @@ -25,7 +25,7 @@ extern "C" { #include "modules/audio_processing/aec/aec_common.h" #include "modules/audio_processing/utility/block_mean_calculator.h" #include "modules/audio_processing/utility/ooura_fft.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace webrtc { diff --git a/modules/audio_processing/aec3/adaptive_fir_filter.h b/modules/audio_processing/aec3/adaptive_fir_filter.h index 7c832a6cd2..ed1f0d0ee3 100644 --- a/modules/audio_processing/aec3/adaptive_fir_filter.h +++ b/modules/audio_processing/aec3/adaptive_fir_filter.h @@ -21,7 +21,7 @@ #include "modules/audio_processing/aec3/fft_data.h" #include "modules/audio_processing/aec3/render_buffer.h" #include "modules/audio_processing/logging/apm_data_dumper.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" #include "rtc_base/system/arch.h" namespace webrtc { diff --git a/modules/audio_processing/aec3/aec3_fft.h b/modules/audio_processing/aec3/aec3_fft.h index 6cd649af8f..d5db83ec59 100644 --- a/modules/audio_processing/aec3/aec3_fft.h +++ b/modules/audio_processing/aec3/aec3_fft.h @@ -18,7 +18,7 @@ #include "modules/audio_processing/aec3/fft_data.h" #include "modules/audio_processing/utility/ooura_fft.h" #include "rtc_base/checks.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace webrtc { diff --git a/modules/audio_processing/aec3/aec_state.cc b/modules/audio_processing/aec3/aec_state.cc index a8f6a0162b..bf47e2e0a7 100644 --- a/modules/audio_processing/aec3/aec_state.cc +++ b/modules/audio_processing/aec3/aec_state.cc @@ -19,7 +19,7 @@ #include "api/array_view.h" #include "modules/audio_processing/aec3/aec3_common.h" #include "modules/audio_processing/logging/apm_data_dumper.h" -#include "rtc_base/atomicops.h" +#include "rtc_base/atomic_ops.h" #include "rtc_base/checks.h" #include "system_wrappers/include/field_trial.h" diff --git a/modules/audio_processing/aec3/block_framer.h b/modules/audio_processing/aec3/block_framer.h index 923e4cfb53..fae4b2990d 100644 --- a/modules/audio_processing/aec3/block_framer.h +++ b/modules/audio_processing/aec3/block_framer.h @@ -15,7 +15,7 @@ #include "api/array_view.h" #include "modules/audio_processing/aec3/aec3_common.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace webrtc { diff --git a/modules/audio_processing/aec3/block_processor.cc b/modules/audio_processing/aec3/block_processor.cc index ef25e7c23b..85e2c4b829 100644 --- a/modules/audio_processing/aec3/block_processor.cc +++ b/modules/audio_processing/aec3/block_processor.cc @@ -17,9 +17,9 @@ #include "modules/audio_processing/aec3/delay_estimate.h" #include "modules/audio_processing/aec3/echo_path_variability.h" #include "modules/audio_processing/logging/apm_data_dumper.h" -#include "rtc_base/atomicops.h" +#include "rtc_base/atomic_ops.h" #include "rtc_base/checks.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" #include "rtc_base/logging.h" namespace webrtc { diff --git a/modules/audio_processing/aec3/block_processor2.cc b/modules/audio_processing/aec3/block_processor2.cc index 30bd3ee5ca..1e9e0a0482 100644 --- a/modules/audio_processing/aec3/block_processor2.cc +++ b/modules/audio_processing/aec3/block_processor2.cc @@ -24,7 +24,7 @@ #include "modules/audio_processing/aec3/render_delay_buffer.h" #include "modules/audio_processing/aec3/render_delay_controller.h" #include "modules/audio_processing/logging/apm_data_dumper.h" -#include "rtc_base/atomicops.h" +#include "rtc_base/atomic_ops.h" #include "rtc_base/checks.h" #include "rtc_base/logging.h" diff --git a/modules/audio_processing/aec3/block_processor_metrics.h b/modules/audio_processing/aec3/block_processor_metrics.h index 9b437c0d13..4ba053683b 100644 --- a/modules/audio_processing/aec3/block_processor_metrics.h +++ b/modules/audio_processing/aec3/block_processor_metrics.h @@ -11,7 +11,7 @@ #ifndef MODULES_AUDIO_PROCESSING_AEC3_BLOCK_PROCESSOR_METRICS_H_ #define MODULES_AUDIO_PROCESSING_AEC3_BLOCK_PROCESSOR_METRICS_H_ -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace webrtc { diff --git a/modules/audio_processing/aec3/cascaded_biquad_filter.h b/modules/audio_processing/aec3/cascaded_biquad_filter.h index 2a3b6d65c5..3d9b14bd1d 100644 --- a/modules/audio_processing/aec3/cascaded_biquad_filter.h +++ b/modules/audio_processing/aec3/cascaded_biquad_filter.h @@ -16,7 +16,7 @@ #include #include "api/array_view.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace webrtc { diff --git a/modules/audio_processing/aec3/comfort_noise_generator.h b/modules/audio_processing/aec3/comfort_noise_generator.h index 3be386bab1..f78fda210a 100644 --- a/modules/audio_processing/aec3/comfort_noise_generator.h +++ b/modules/audio_processing/aec3/comfort_noise_generator.h @@ -18,7 +18,7 @@ #include "modules/audio_processing/aec3/aec3_common.h" #include "modules/audio_processing/aec3/aec_state.h" #include "modules/audio_processing/aec3/fft_data.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" #include "rtc_base/system/arch.h" namespace webrtc { diff --git a/modules/audio_processing/aec3/decimator.h b/modules/audio_processing/aec3/decimator.h index 2bb60a4d7b..a5050143c4 100644 --- a/modules/audio_processing/aec3/decimator.h +++ b/modules/audio_processing/aec3/decimator.h @@ -16,7 +16,7 @@ #include "api/array_view.h" #include "modules/audio_processing/aec3/aec3_common.h" #include "modules/audio_processing/aec3/cascaded_biquad_filter.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace webrtc { diff --git a/modules/audio_processing/aec3/echo_audibility.h b/modules/audio_processing/aec3/echo_audibility.h index b903ca0cf1..7b853219fb 100644 --- a/modules/audio_processing/aec3/echo_audibility.h +++ b/modules/audio_processing/aec3/echo_audibility.h @@ -19,7 +19,7 @@ #include "modules/audio_processing/aec3/render_buffer.h" #include "modules/audio_processing/aec3/stationarity_estimator.h" #include "modules/audio_processing/aec3/vector_buffer.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace webrtc { diff --git a/modules/audio_processing/aec3/echo_canceller3.cc b/modules/audio_processing/aec3/echo_canceller3.cc index 38f651063d..e3846058f2 100644 --- a/modules/audio_processing/aec3/echo_canceller3.cc +++ b/modules/audio_processing/aec3/echo_canceller3.cc @@ -14,7 +14,7 @@ #include "modules/audio_processing/aec3/aec3_common.h" #include "modules/audio_processing/logging/apm_data_dumper.h" -#include "rtc_base/atomicops.h" +#include "rtc_base/atomic_ops.h" #include "system_wrappers/include/field_trial.h" namespace webrtc { diff --git a/modules/audio_processing/aec3/echo_canceller3.h b/modules/audio_processing/aec3/echo_canceller3.h index 671d271676..c1298d207e 100644 --- a/modules/audio_processing/aec3/echo_canceller3.h +++ b/modules/audio_processing/aec3/echo_canceller3.h @@ -27,7 +27,7 @@ #include "modules/audio_processing/audio_buffer.h" #include "modules/audio_processing/logging/apm_data_dumper.h" #include "rtc_base/checks.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" #include "rtc_base/race_checker.h" #include "rtc_base/swap_queue.h" #include "rtc_base/thread_annotations.h" diff --git a/modules/audio_processing/aec3/echo_path_delay_estimator.h b/modules/audio_processing/aec3/echo_path_delay_estimator.h index 1f14735d1a..11255a47c1 100644 --- a/modules/audio_processing/aec3/echo_path_delay_estimator.h +++ b/modules/audio_processing/aec3/echo_path_delay_estimator.h @@ -20,7 +20,7 @@ #include "modules/audio_processing/aec3/delay_estimate.h" #include "modules/audio_processing/aec3/matched_filter.h" #include "modules/audio_processing/aec3/matched_filter_lag_aggregator.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace webrtc { diff --git a/modules/audio_processing/aec3/echo_remover.cc b/modules/audio_processing/aec3/echo_remover.cc index cfb7395199..1a290a7212 100644 --- a/modules/audio_processing/aec3/echo_remover.cc +++ b/modules/audio_processing/aec3/echo_remover.cc @@ -31,9 +31,9 @@ #include "modules/audio_processing/aec3/suppression_filter.h" #include "modules/audio_processing/aec3/suppression_gain.h" #include "modules/audio_processing/logging/apm_data_dumper.h" -#include "rtc_base/atomicops.h" +#include "rtc_base/atomic_ops.h" #include "rtc_base/checks.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" #include "rtc_base/logging.h" #include "system_wrappers/include/field_trial.h" diff --git a/modules/audio_processing/aec3/echo_remover_metrics.h b/modules/audio_processing/aec3/echo_remover_metrics.h index 0707a5f031..da740fb9cd 100644 --- a/modules/audio_processing/aec3/echo_remover_metrics.h +++ b/modules/audio_processing/aec3/echo_remover_metrics.h @@ -15,7 +15,7 @@ #include "modules/audio_processing/aec3/aec3_common.h" #include "modules/audio_processing/aec3/aec_state.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace webrtc { diff --git a/modules/audio_processing/aec3/erl_estimator.h b/modules/audio_processing/aec3/erl_estimator.h index 29718c3783..060fb917db 100644 --- a/modules/audio_processing/aec3/erl_estimator.h +++ b/modules/audio_processing/aec3/erl_estimator.h @@ -16,7 +16,7 @@ #include "api/array_view.h" #include "modules/audio_processing/aec3/aec3_common.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace webrtc { diff --git a/modules/audio_processing/aec3/filter_analyzer.cc b/modules/audio_processing/aec3/filter_analyzer.cc index 3e69be6585..9be9d02fca 100644 --- a/modules/audio_processing/aec3/filter_analyzer.cc +++ b/modules/audio_processing/aec3/filter_analyzer.cc @@ -18,7 +18,7 @@ #include "modules/audio_processing/aec3/aec3_common.h" #include "modules/audio_processing/aec3/render_buffer.h" #include "modules/audio_processing/logging/apm_data_dumper.h" -#include "rtc_base/atomicops.h" +#include "rtc_base/atomic_ops.h" #include "rtc_base/checks.h" #include "system_wrappers/include/field_trial.h" diff --git a/modules/audio_processing/aec3/filter_analyzer.h b/modules/audio_processing/aec3/filter_analyzer.h index e0fd0695cb..13d599d92b 100644 --- a/modules/audio_processing/aec3/filter_analyzer.h +++ b/modules/audio_processing/aec3/filter_analyzer.h @@ -19,7 +19,7 @@ #include "api/array_view.h" #include "api/audio/echo_canceller3_config.h" #include "modules/audio_processing/aec3/aec3_common.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace webrtc { diff --git a/modules/audio_processing/aec3/frame_blocker.h b/modules/audio_processing/aec3/frame_blocker.h index 08e1e1dd23..68cee972f4 100644 --- a/modules/audio_processing/aec3/frame_blocker.h +++ b/modules/audio_processing/aec3/frame_blocker.h @@ -16,7 +16,7 @@ #include "api/array_view.h" #include "modules/audio_processing/aec3/aec3_common.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace webrtc { diff --git a/modules/audio_processing/aec3/main_filter_update_gain.cc b/modules/audio_processing/aec3/main_filter_update_gain.cc index ef87d142db..11a97e2781 100644 --- a/modules/audio_processing/aec3/main_filter_update_gain.cc +++ b/modules/audio_processing/aec3/main_filter_update_gain.cc @@ -20,7 +20,7 @@ #include "modules/audio_processing/aec3/render_signal_analyzer.h" #include "modules/audio_processing/aec3/subtractor_output.h" #include "modules/audio_processing/logging/apm_data_dumper.h" -#include "rtc_base/atomicops.h" +#include "rtc_base/atomic_ops.h" #include "rtc_base/checks.h" namespace webrtc { diff --git a/modules/audio_processing/aec3/main_filter_update_gain.h b/modules/audio_processing/aec3/main_filter_update_gain.h index 892ff689a4..5c817cda6a 100644 --- a/modules/audio_processing/aec3/main_filter_update_gain.h +++ b/modules/audio_processing/aec3/main_filter_update_gain.h @@ -17,7 +17,7 @@ #include "api/audio/echo_canceller3_config.h" #include "modules/audio_processing/aec3/aec3_common.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace webrtc { diff --git a/modules/audio_processing/aec3/matched_filter.h b/modules/audio_processing/aec3/matched_filter.h index 2a65339a4c..084267f29d 100644 --- a/modules/audio_processing/aec3/matched_filter.h +++ b/modules/audio_processing/aec3/matched_filter.h @@ -16,7 +16,7 @@ #include "api/array_view.h" #include "modules/audio_processing/aec3/aec3_common.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" #include "rtc_base/system/arch.h" namespace webrtc { diff --git a/modules/audio_processing/aec3/matched_filter_lag_aggregator.h b/modules/audio_processing/aec3/matched_filter_lag_aggregator.h index d7f34aed60..0cc7789d11 100644 --- a/modules/audio_processing/aec3/matched_filter_lag_aggregator.h +++ b/modules/audio_processing/aec3/matched_filter_lag_aggregator.h @@ -17,7 +17,7 @@ #include "api/audio/echo_canceller3_config.h" #include "modules/audio_processing/aec3/delay_estimate.h" #include "modules/audio_processing/aec3/matched_filter.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace webrtc { diff --git a/modules/audio_processing/aec3/render_buffer.h b/modules/audio_processing/aec3/render_buffer.h index 4c7c60cf85..cc6cd1c12a 100644 --- a/modules/audio_processing/aec3/render_buffer.h +++ b/modules/audio_processing/aec3/render_buffer.h @@ -22,7 +22,7 @@ #include "modules/audio_processing/aec3/matrix_buffer.h" #include "modules/audio_processing/aec3/vector_buffer.h" #include "rtc_base/checks.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace webrtc { diff --git a/modules/audio_processing/aec3/render_delay_buffer.cc b/modules/audio_processing/aec3/render_delay_buffer.cc index 1ec27790a8..287e7c3c48 100644 --- a/modules/audio_processing/aec3/render_delay_buffer.cc +++ b/modules/audio_processing/aec3/render_delay_buffer.cc @@ -25,9 +25,9 @@ #include "modules/audio_processing/aec3/matrix_buffer.h" #include "modules/audio_processing/aec3/vector_buffer.h" #include "modules/audio_processing/logging/apm_data_dumper.h" -#include "rtc_base/atomicops.h" +#include "rtc_base/atomic_ops.h" #include "rtc_base/checks.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" #include "rtc_base/logging.h" #include "system_wrappers/include/field_trial.h" diff --git a/modules/audio_processing/aec3/render_delay_buffer2.cc b/modules/audio_processing/aec3/render_delay_buffer2.cc index 6992c5b898..4c0d55d2af 100644 --- a/modules/audio_processing/aec3/render_delay_buffer2.cc +++ b/modules/audio_processing/aec3/render_delay_buffer2.cc @@ -28,7 +28,7 @@ #include "modules/audio_processing/aec3/render_delay_buffer.h" #include "modules/audio_processing/aec3/vector_buffer.h" #include "modules/audio_processing/logging/apm_data_dumper.h" -#include "rtc_base/atomicops.h" +#include "rtc_base/atomic_ops.h" #include "rtc_base/checks.h" #include "rtc_base/logging.h" diff --git a/modules/audio_processing/aec3/render_delay_controller.cc b/modules/audio_processing/aec3/render_delay_controller.cc index c4665eaa22..4ad547724c 100644 --- a/modules/audio_processing/aec3/render_delay_controller.cc +++ b/modules/audio_processing/aec3/render_delay_controller.cc @@ -20,9 +20,9 @@ #include "modules/audio_processing/aec3/render_delay_controller_metrics.h" #include "modules/audio_processing/aec3/skew_estimator.h" #include "modules/audio_processing/logging/apm_data_dumper.h" -#include "rtc_base/atomicops.h" +#include "rtc_base/atomic_ops.h" #include "rtc_base/checks.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" #include "rtc_base/logging.h" #include "system_wrappers/include/field_trial.h" diff --git a/modules/audio_processing/aec3/render_delay_controller2.cc b/modules/audio_processing/aec3/render_delay_controller2.cc index 00daf8f2af..b3a15c0957 100644 --- a/modules/audio_processing/aec3/render_delay_controller2.cc +++ b/modules/audio_processing/aec3/render_delay_controller2.cc @@ -21,9 +21,9 @@ #include "modules/audio_processing/aec3/render_delay_controller.h" #include "modules/audio_processing/aec3/render_delay_controller_metrics.h" #include "modules/audio_processing/logging/apm_data_dumper.h" -#include "rtc_base/atomicops.h" +#include "rtc_base/atomic_ops.h" #include "rtc_base/checks.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" #include "system_wrappers/include/field_trial.h" namespace webrtc { diff --git a/modules/audio_processing/aec3/render_delay_controller_metrics.h b/modules/audio_processing/aec3/render_delay_controller_metrics.h index 22cc202e73..8c527a142e 100644 --- a/modules/audio_processing/aec3/render_delay_controller_metrics.h +++ b/modules/audio_processing/aec3/render_delay_controller_metrics.h @@ -15,7 +15,7 @@ #include "absl/types/optional.h" #include "modules/audio_processing/aec3/clockdrift_detector.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace webrtc { diff --git a/modules/audio_processing/aec3/render_signal_analyzer.h b/modules/audio_processing/aec3/render_signal_analyzer.h index 8a44232cf9..c7a3d8b7a0 100644 --- a/modules/audio_processing/aec3/render_signal_analyzer.h +++ b/modules/audio_processing/aec3/render_signal_analyzer.h @@ -20,7 +20,7 @@ #include "modules/audio_processing/aec3/aec3_common.h" #include "modules/audio_processing/aec3/render_buffer.h" #include "rtc_base/checks.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace webrtc { diff --git a/modules/audio_processing/aec3/residual_echo_estimator.h b/modules/audio_processing/aec3/residual_echo_estimator.h index 52885a58d8..a25aff75d3 100644 --- a/modules/audio_processing/aec3/residual_echo_estimator.h +++ b/modules/audio_processing/aec3/residual_echo_estimator.h @@ -23,7 +23,7 @@ #include "modules/audio_processing/aec3/reverb_model_fallback.h" #include "modules/audio_processing/aec3/vector_buffer.h" #include "rtc_base/checks.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace webrtc { diff --git a/modules/audio_processing/aec3/skew_estimator.h b/modules/audio_processing/aec3/skew_estimator.h index b0946d833e..8a457cb3d7 100644 --- a/modules/audio_processing/aec3/skew_estimator.h +++ b/modules/audio_processing/aec3/skew_estimator.h @@ -15,7 +15,7 @@ #include #include "absl/types/optional.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace webrtc { diff --git a/modules/audio_processing/aec3/stationarity_estimator.cc b/modules/audio_processing/aec3/stationarity_estimator.cc index 25100bfd4a..47f04bf0c1 100644 --- a/modules/audio_processing/aec3/stationarity_estimator.cc +++ b/modules/audio_processing/aec3/stationarity_estimator.cc @@ -18,7 +18,7 @@ #include "modules/audio_processing/aec3/aec3_common.h" #include "modules/audio_processing/aec3/vector_buffer.h" #include "modules/audio_processing/logging/apm_data_dumper.h" -#include "rtc_base/atomicops.h" +#include "rtc_base/atomic_ops.h" namespace webrtc { diff --git a/modules/audio_processing/aec3/subtractor.h b/modules/audio_processing/aec3/subtractor.h index bec014deec..70463be565 100644 --- a/modules/audio_processing/aec3/subtractor.h +++ b/modules/audio_processing/aec3/subtractor.h @@ -30,7 +30,7 @@ #include "modules/audio_processing/aec3/subtractor_output.h" #include "modules/audio_processing/logging/apm_data_dumper.h" #include "rtc_base/checks.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace webrtc { diff --git a/modules/audio_processing/aec3/suppression_filter.h b/modules/audio_processing/aec3/suppression_filter.h index edd1290014..63569b101f 100644 --- a/modules/audio_processing/aec3/suppression_filter.h +++ b/modules/audio_processing/aec3/suppression_filter.h @@ -18,7 +18,7 @@ #include "modules/audio_processing/aec3/aec3_fft.h" #include "modules/audio_processing/aec3/fft_data.h" #include "modules/audio_processing/utility/ooura_fft.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace webrtc { diff --git a/modules/audio_processing/aec3/suppression_gain.cc b/modules/audio_processing/aec3/suppression_gain.cc index c6d2bf6673..6f30c8b109 100644 --- a/modules/audio_processing/aec3/suppression_gain.cc +++ b/modules/audio_processing/aec3/suppression_gain.cc @@ -18,7 +18,7 @@ #include "modules/audio_processing/aec3/moving_average.h" #include "modules/audio_processing/aec3/vector_math.h" #include "modules/audio_processing/logging/apm_data_dumper.h" -#include "rtc_base/atomicops.h" +#include "rtc_base/atomic_ops.h" #include "rtc_base/checks.h" namespace webrtc { diff --git a/modules/audio_processing/aec3/suppression_gain.h b/modules/audio_processing/aec3/suppression_gain.h index e74cd9632b..9e33c28766 100644 --- a/modules/audio_processing/aec3/suppression_gain.h +++ b/modules/audio_processing/aec3/suppression_gain.h @@ -24,7 +24,7 @@ #include "modules/audio_processing/aec3/moving_average.h" #include "modules/audio_processing/aec3/render_signal_analyzer.h" #include "modules/audio_processing/logging/apm_data_dumper.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace webrtc { diff --git a/modules/audio_processing/aec3/suppression_gain_limiter.h b/modules/audio_processing/aec3/suppression_gain_limiter.h index eade949605..482f96548c 100644 --- a/modules/audio_processing/aec3/suppression_gain_limiter.h +++ b/modules/audio_processing/aec3/suppression_gain_limiter.h @@ -13,7 +13,7 @@ #include "api/array_view.h" #include "api/audio/echo_canceller3_config.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace webrtc { diff --git a/modules/audio_processing/aec_dump/aec_dump_unittest.cc b/modules/audio_processing/aec_dump/aec_dump_unittest.cc index 75ed5291fe..1f9ca0aec3 100644 --- a/modules/audio_processing/aec_dump/aec_dump_unittest.cc +++ b/modules/audio_processing/aec_dump/aec_dump_unittest.cc @@ -14,7 +14,7 @@ #include "rtc_base/task_queue.h" #include "test/gtest.h" -#include "test/testsupport/fileutils.h" +#include "test/testsupport/file_utils.h" TEST(AecDumper, APICallsDoNotCrash) { // Note order of initialization: Task queue has to be initialized diff --git a/modules/audio_processing/agc/agc_manager_direct.h b/modules/audio_processing/agc/agc_manager_direct.h index cbfd6a1018..8c9fc4da9c 100644 --- a/modules/audio_processing/agc/agc_manager_direct.h +++ b/modules/audio_processing/agc/agc_manager_direct.h @@ -15,7 +15,7 @@ #include "modules/audio_processing/agc/agc.h" #include "modules/audio_processing/logging/apm_data_dumper.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" #include "rtc_base/gtest_prod_util.h" namespace webrtc { diff --git a/modules/audio_processing/agc/loudness_histogram_unittest.cc b/modules/audio_processing/agc/loudness_histogram_unittest.cc index 8c617107ff..0c291d8de5 100644 --- a/modules/audio_processing/agc/loudness_histogram_unittest.cc +++ b/modules/audio_processing/agc/loudness_histogram_unittest.cc @@ -19,7 +19,7 @@ #include "modules/audio_processing/agc/utility.h" #include "test/gtest.h" -#include "test/testsupport/fileutils.h" +#include "test/testsupport/file_utils.h" namespace webrtc { diff --git a/modules/audio_processing/agc2/biquad_filter.h b/modules/audio_processing/agc2/biquad_filter.h index 3d78c07607..7bf3301e4b 100644 --- a/modules/audio_processing/agc2/biquad_filter.h +++ b/modules/audio_processing/agc2/biquad_filter.h @@ -15,7 +15,7 @@ #include "api/array_view.h" #include "rtc_base/arraysize.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace webrtc { diff --git a/modules/audio_processing/agc2/down_sampler.h b/modules/audio_processing/agc2/down_sampler.h index a609ea8e0c..61d1b005e0 100644 --- a/modules/audio_processing/agc2/down_sampler.h +++ b/modules/audio_processing/agc2/down_sampler.h @@ -13,7 +13,7 @@ #include "api/array_view.h" #include "modules/audio_processing/agc2/biquad_filter.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace webrtc { diff --git a/modules/audio_processing/agc2/fixed_digital_level_estimator.h b/modules/audio_processing/agc2/fixed_digital_level_estimator.h index 84429d3952..aa84a2e0f1 100644 --- a/modules/audio_processing/agc2/fixed_digital_level_estimator.h +++ b/modules/audio_processing/agc2/fixed_digital_level_estimator.h @@ -16,7 +16,7 @@ #include "modules/audio_processing/agc2/agc2_common.h" #include "modules/audio_processing/include/audio_frame_view.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace webrtc { diff --git a/modules/audio_processing/agc2/interpolated_gain_curve.h b/modules/audio_processing/agc2/interpolated_gain_curve.h index 68d4532238..1ecb94e7ec 100644 --- a/modules/audio_processing/agc2/interpolated_gain_curve.h +++ b/modules/audio_processing/agc2/interpolated_gain_curve.h @@ -16,7 +16,7 @@ #include "modules/audio_processing/agc2/agc2_common.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" #include "rtc_base/gtest_prod_util.h" #include "system_wrappers/include/metrics.h" diff --git a/modules/audio_processing/agc2/limiter.h b/modules/audio_processing/agc2/limiter.h index 1e0ab71a18..599fd0f4bb 100644 --- a/modules/audio_processing/agc2/limiter.h +++ b/modules/audio_processing/agc2/limiter.h @@ -17,7 +17,7 @@ #include "modules/audio_processing/agc2/fixed_digital_level_estimator.h" #include "modules/audio_processing/agc2/interpolated_gain_curve.h" #include "modules/audio_processing/include/audio_frame_view.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace webrtc { class ApmDataDumper; diff --git a/modules/audio_processing/agc2/noise_level_estimator.h b/modules/audio_processing/agc2/noise_level_estimator.h index 24067a1665..ca2f9f2e2f 100644 --- a/modules/audio_processing/agc2/noise_level_estimator.h +++ b/modules/audio_processing/agc2/noise_level_estimator.h @@ -13,7 +13,7 @@ #include "modules/audio_processing/agc2/signal_classifier.h" #include "modules/audio_processing/include/audio_frame_view.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace webrtc { class ApmDataDumper; diff --git a/modules/audio_processing/agc2/noise_spectrum_estimator.h b/modules/audio_processing/agc2/noise_spectrum_estimator.h index fd1cc13a3f..b22f9bb398 100644 --- a/modules/audio_processing/agc2/noise_spectrum_estimator.h +++ b/modules/audio_processing/agc2/noise_spectrum_estimator.h @@ -12,7 +12,7 @@ #define MODULES_AUDIO_PROCESSING_AGC2_NOISE_SPECTRUM_ESTIMATOR_H_ #include "api/array_view.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace webrtc { diff --git a/modules/audio_processing/agc2/rnn_vad/test_utils.cc b/modules/audio_processing/agc2/rnn_vad/test_utils.cc index db38cab74c..8decbd0ebb 100644 --- a/modules/audio_processing/agc2/rnn_vad/test_utils.cc +++ b/modules/audio_processing/agc2/rnn_vad/test_utils.cc @@ -13,7 +13,7 @@ #include "absl/memory/memory.h" #include "rtc_base/checks.h" #include "test/gtest.h" -#include "test/testsupport/fileutils.h" +#include "test/testsupport/file_utils.h" namespace webrtc { namespace rnn_vad { diff --git a/modules/audio_processing/agc2/signal_classifier.h b/modules/audio_processing/agc2/signal_classifier.h index 23fe315977..e0d6771b78 100644 --- a/modules/audio_processing/agc2/signal_classifier.h +++ b/modules/audio_processing/agc2/signal_classifier.h @@ -18,7 +18,7 @@ #include "modules/audio_processing/agc2/down_sampler.h" #include "modules/audio_processing/agc2/noise_spectrum_estimator.h" #include "modules/audio_processing/utility/ooura_fft.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace webrtc { diff --git a/modules/audio_processing/audio_generator/file_audio_generator.h b/modules/audio_processing/audio_generator/file_audio_generator.h index 01979a42b3..f322b09643 100644 --- a/modules/audio_processing/audio_generator/file_audio_generator.h +++ b/modules/audio_processing/audio_generator/file_audio_generator.h @@ -15,7 +15,7 @@ #include "common_audio/wav_file.h" #include "modules/audio_processing/include/audio_generator.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace webrtc { diff --git a/modules/audio_processing/audio_generator/file_audio_generator_unittest.cc b/modules/audio_processing/audio_generator/file_audio_generator_unittest.cc index 6ed3b94667..6569bfe711 100644 --- a/modules/audio_processing/audio_generator/file_audio_generator_unittest.cc +++ b/modules/audio_processing/audio_generator/file_audio_generator_unittest.cc @@ -13,7 +13,7 @@ #include "modules/audio_processing/include/audio_generator_factory.h" #include "modules/audio_processing/include/audio_processing.h" #include "test/gtest.h" -#include "test/testsupport/fileutils.h" +#include "test/testsupport/file_utils.h" namespace webrtc { namespace test { diff --git a/modules/audio_processing/audio_processing_impl.cc b/modules/audio_processing/audio_processing_impl.cc index c0058c73a8..eec4c3373d 100644 --- a/modules/audio_processing/audio_processing_impl.cc +++ b/modules/audio_processing/audio_processing_impl.cc @@ -37,12 +37,12 @@ #include "modules/audio_processing/residual_echo_detector.h" #include "modules/audio_processing/transient/transient_suppressor.h" #include "modules/audio_processing/voice_detection_impl.h" -#include "rtc_base/atomicops.h" +#include "rtc_base/atomic_ops.h" #include "rtc_base/checks.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" #include "rtc_base/logging.h" -#include "rtc_base/refcountedobject.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/ref_counted_object.h" +#include "rtc_base/time_utils.h" #include "rtc_base/trace_event.h" #include "system_wrappers/include/metrics.h" diff --git a/modules/audio_processing/audio_processing_impl.h b/modules/audio_processing/audio_processing_impl.h index 815cc9549d..9b66c26e5e 100644 --- a/modules/audio_processing/audio_processing_impl.h +++ b/modules/audio_processing/audio_processing_impl.h @@ -21,7 +21,7 @@ #include "modules/audio_processing/include/audio_processing_statistics.h" #include "modules/audio_processing/render_queue_item_verifier.h" #include "modules/audio_processing/rms_level.h" -#include "rtc_base/criticalsection.h" +#include "rtc_base/critical_section.h" #include "rtc_base/function_view.h" #include "rtc_base/gtest_prod_util.h" #include "rtc_base/ignore_wundef.h" diff --git a/modules/audio_processing/audio_processing_impl_locking_unittest.cc b/modules/audio_processing/audio_processing_impl_locking_unittest.cc index 18ee9cf449..3609124cc2 100644 --- a/modules/audio_processing/audio_processing_impl_locking_unittest.cc +++ b/modules/audio_processing/audio_processing_impl_locking_unittest.cc @@ -16,7 +16,7 @@ #include "api/array_view.h" #include "modules/audio_processing/test/test_utils.h" -#include "rtc_base/criticalsection.h" +#include "rtc_base/critical_section.h" #include "rtc_base/event.h" #include "rtc_base/platform_thread.h" #include "rtc_base/random.h" diff --git a/modules/audio_processing/audio_processing_impl_unittest.cc b/modules/audio_processing/audio_processing_impl_unittest.cc index 3a3133a788..c511cb3b52 100644 --- a/modules/audio_processing/audio_processing_impl_unittest.cc +++ b/modules/audio_processing/audio_processing_impl_unittest.cc @@ -17,7 +17,7 @@ #include "modules/audio_processing/test/echo_control_mock.h" #include "modules/audio_processing/test/test_utils.h" #include "rtc_base/checks.h" -#include "rtc_base/refcountedobject.h" +#include "rtc_base/ref_counted_object.h" #include "rtc_base/scoped_ref_ptr.h" #include "test/gmock.h" #include "test/gtest.h" diff --git a/modules/audio_processing/audio_processing_performance_unittest.cc b/modules/audio_processing/audio_processing_performance_unittest.cc index 80c2b382e4..fa0f1da71e 100644 --- a/modules/audio_processing/audio_processing_performance_unittest.cc +++ b/modules/audio_processing/audio_processing_performance_unittest.cc @@ -17,7 +17,7 @@ #include "api/array_view.h" #include "modules/audio_processing/test/test_utils.h" -#include "rtc_base/atomicops.h" +#include "rtc_base/atomic_ops.h" #include "rtc_base/event.h" #include "rtc_base/numerics/safe_conversions.h" #include "rtc_base/platform_thread.h" diff --git a/modules/audio_processing/audio_processing_unittest.cc b/modules/audio_processing/audio_processing_unittest.cc index 314d777e90..6ae6765378 100644 --- a/modules/audio_processing/audio_processing_unittest.cc +++ b/modules/audio_processing/audio_processing_unittest.cc @@ -28,20 +28,20 @@ #include "modules/audio_processing/test/test_utils.h" #include "rtc_base/arraysize.h" #include "rtc_base/checks.h" -#include "rtc_base/fakeclock.h" +#include "rtc_base/fake_clock.h" #include "rtc_base/gtest_prod_util.h" #include "rtc_base/ignore_wundef.h" #include "rtc_base/numerics/safe_conversions.h" #include "rtc_base/numerics/safe_minmax.h" #include "rtc_base/protobuf_utils.h" -#include "rtc_base/refcountedobject.h" +#include "rtc_base/ref_counted_object.h" #include "rtc_base/strings/string_builder.h" #include "rtc_base/swap_queue.h" #include "rtc_base/system/arch.h" #include "rtc_base/task_queue.h" #include "rtc_base/thread.h" #include "test/gtest.h" -#include "test/testsupport/fileutils.h" +#include "test/testsupport/file_utils.h" RTC_PUSH_IGNORING_WUNDEF() #ifdef WEBRTC_ANDROID_PLATFORM_BUILD diff --git a/modules/audio_processing/echo_cancellation_impl.h b/modules/audio_processing/echo_cancellation_impl.h index a8b43a8cd6..79be73bb6c 100644 --- a/modules/audio_processing/echo_cancellation_impl.h +++ b/modules/audio_processing/echo_cancellation_impl.h @@ -18,8 +18,8 @@ #include "api/array_view.h" #include "modules/audio_processing/include/audio_processing.h" -#include "rtc_base/constructormagic.h" -#include "rtc_base/criticalsection.h" +#include "rtc_base/constructor_magic.h" +#include "rtc_base/critical_section.h" #include "rtc_base/thread_annotations.h" namespace webrtc { diff --git a/modules/audio_processing/echo_cancellation_impl_unittest.cc b/modules/audio_processing/echo_cancellation_impl_unittest.cc index 9d81c1df3b..841ea0d9fb 100644 --- a/modules/audio_processing/echo_cancellation_impl_unittest.cc +++ b/modules/audio_processing/echo_cancellation_impl_unittest.cc @@ -13,7 +13,7 @@ #include "modules/audio_processing/aec/aec_core.h" #include "modules/audio_processing/echo_cancellation_impl.h" #include "modules/audio_processing/include/audio_processing.h" -#include "rtc_base/criticalsection.h" +#include "rtc_base/critical_section.h" #include "test/gtest.h" namespace webrtc { diff --git a/modules/audio_processing/echo_control_mobile_impl.cc b/modules/audio_processing/echo_control_mobile_impl.cc index b9fbf42052..3655eb1e21 100644 --- a/modules/audio_processing/echo_control_mobile_impl.cc +++ b/modules/audio_processing/echo_control_mobile_impl.cc @@ -17,7 +17,7 @@ #include "modules/audio_processing/audio_buffer.h" #include "modules/audio_processing/include/audio_processing.h" #include "rtc_base/checks.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace webrtc { diff --git a/modules/audio_processing/echo_control_mobile_unittest.cc b/modules/audio_processing/echo_control_mobile_unittest.cc index f0e60483d4..6b054d1aea 100644 --- a/modules/audio_processing/echo_control_mobile_unittest.cc +++ b/modules/audio_processing/echo_control_mobile_unittest.cc @@ -13,7 +13,7 @@ #include "modules/audio_processing/echo_control_mobile_impl.h" #include "modules/audio_processing/include/audio_processing.h" -#include "rtc_base/criticalsection.h" +#include "rtc_base/critical_section.h" #include "test/gtest.h" namespace webrtc { diff --git a/modules/audio_processing/gain_control_for_experimental_agc.cc b/modules/audio_processing/gain_control_for_experimental_agc.cc index 1479d58b54..5cb22f882f 100644 --- a/modules/audio_processing/gain_control_for_experimental_agc.cc +++ b/modules/audio_processing/gain_control_for_experimental_agc.cc @@ -12,8 +12,8 @@ #include "modules/audio_processing/include/audio_processing.h" #include "modules/audio_processing/logging/apm_data_dumper.h" -#include "rtc_base/atomicops.h" -#include "rtc_base/criticalsection.h" +#include "rtc_base/atomic_ops.h" +#include "rtc_base/critical_section.h" namespace webrtc { diff --git a/modules/audio_processing/gain_control_for_experimental_agc.h b/modules/audio_processing/gain_control_for_experimental_agc.h index b20fbc96f9..8f5681f0ea 100644 --- a/modules/audio_processing/gain_control_for_experimental_agc.h +++ b/modules/audio_processing/gain_control_for_experimental_agc.h @@ -13,8 +13,8 @@ #include "modules/audio_processing/agc/agc_manager_direct.h" #include "modules/audio_processing/include/audio_processing.h" -#include "rtc_base/constructormagic.h" -#include "rtc_base/criticalsection.h" +#include "rtc_base/constructor_magic.h" +#include "rtc_base/critical_section.h" #include "rtc_base/thread_checker.h" namespace webrtc { diff --git a/modules/audio_processing/gain_control_impl.cc b/modules/audio_processing/gain_control_impl.cc index d5118ba073..26ab1b457b 100644 --- a/modules/audio_processing/gain_control_impl.cc +++ b/modules/audio_processing/gain_control_impl.cc @@ -18,7 +18,7 @@ #include "modules/audio_processing/include/audio_processing.h" #include "modules/audio_processing/logging/apm_data_dumper.h" #include "rtc_base/checks.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace webrtc { diff --git a/modules/audio_processing/gain_control_impl.h b/modules/audio_processing/gain_control_impl.h index c21d911326..fc781d46ff 100644 --- a/modules/audio_processing/gain_control_impl.h +++ b/modules/audio_processing/gain_control_impl.h @@ -19,8 +19,8 @@ #include "absl/types/optional.h" #include "api/array_view.h" #include "modules/audio_processing/include/gain_control.h" -#include "rtc_base/constructormagic.h" -#include "rtc_base/criticalsection.h" +#include "rtc_base/constructor_magic.h" +#include "rtc_base/critical_section.h" #include "rtc_base/thread_annotations.h" namespace webrtc { diff --git a/modules/audio_processing/gain_controller2.cc b/modules/audio_processing/gain_controller2.cc index 2a327449df..a1bbb1b945 100644 --- a/modules/audio_processing/gain_controller2.cc +++ b/modules/audio_processing/gain_controller2.cc @@ -14,7 +14,7 @@ #include "modules/audio_processing/audio_buffer.h" #include "modules/audio_processing/include/audio_frame_view.h" #include "modules/audio_processing/logging/apm_data_dumper.h" -#include "rtc_base/atomicops.h" +#include "rtc_base/atomic_ops.h" #include "rtc_base/checks.h" #include "rtc_base/strings/string_builder.h" diff --git a/modules/audio_processing/gain_controller2.h b/modules/audio_processing/gain_controller2.h index 3a11810bb5..7ed310ebf6 100644 --- a/modules/audio_processing/gain_controller2.h +++ b/modules/audio_processing/gain_controller2.h @@ -18,7 +18,7 @@ #include "modules/audio_processing/agc2/gain_applier.h" #include "modules/audio_processing/agc2/limiter.h" #include "modules/audio_processing/include/audio_processing.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace webrtc { diff --git a/modules/audio_processing/include/audio_processing.h b/modules/audio_processing/include/audio_processing.h index 429816baca..b88a86feb4 100644 --- a/modules/audio_processing/include/audio_processing.h +++ b/modules/audio_processing/include/audio_processing.h @@ -32,7 +32,7 @@ #include "rtc_base/arraysize.h" #include "rtc_base/deprecation.h" #include "rtc_base/platform_file.h" -#include "rtc_base/refcount.h" +#include "rtc_base/ref_count.h" #include "rtc_base/scoped_ref_ptr.h" #include "rtc_base/system/rtc_export.h" diff --git a/modules/audio_processing/include/config.h b/modules/audio_processing/include/config.h index e77d3fd16d..930cf7e85e 100644 --- a/modules/audio_processing/include/config.h +++ b/modules/audio_processing/include/config.h @@ -13,7 +13,7 @@ #include -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" #include "rtc_base/system/rtc_export.h" namespace webrtc { diff --git a/modules/audio_processing/level_estimator_impl.h b/modules/audio_processing/level_estimator_impl.h index 901ae4cf58..da217bba02 100644 --- a/modules/audio_processing/level_estimator_impl.h +++ b/modules/audio_processing/level_estimator_impl.h @@ -14,8 +14,8 @@ #include #include "modules/audio_processing/include/audio_processing.h" -#include "rtc_base/constructormagic.h" -#include "rtc_base/criticalsection.h" +#include "rtc_base/constructor_magic.h" +#include "rtc_base/critical_section.h" namespace webrtc { diff --git a/modules/audio_processing/logging/apm_data_dumper.h b/modules/audio_processing/logging/apm_data_dumper.h index b541ae84b9..001fbf796e 100644 --- a/modules/audio_processing/logging/apm_data_dumper.h +++ b/modules/audio_processing/logging/apm_data_dumper.h @@ -25,7 +25,7 @@ #include "common_audio/wav_file.h" #include "rtc_base/checks.h" #endif -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" // Check to verify that the define is properly set. #if !defined(WEBRTC_APM_DEBUG_DUMP) || \ diff --git a/modules/audio_processing/low_cut_filter.h b/modules/audio_processing/low_cut_filter.h index fd4c6f19cb..86fbddd04b 100644 --- a/modules/audio_processing/low_cut_filter.h +++ b/modules/audio_processing/low_cut_filter.h @@ -14,7 +14,7 @@ #include #include -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace webrtc { diff --git a/modules/audio_processing/noise_suppression_impl.cc b/modules/audio_processing/noise_suppression_impl.cc index d8d9e32340..bfaddd989e 100644 --- a/modules/audio_processing/noise_suppression_impl.cc +++ b/modules/audio_processing/noise_suppression_impl.cc @@ -12,7 +12,7 @@ #include "modules/audio_processing/audio_buffer.h" #include "rtc_base/checks.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" #if defined(WEBRTC_NS_FLOAT) #include "modules/audio_processing/ns/noise_suppression.h" diff --git a/modules/audio_processing/noise_suppression_impl.h b/modules/audio_processing/noise_suppression_impl.h index fba716e253..414ca313be 100644 --- a/modules/audio_processing/noise_suppression_impl.h +++ b/modules/audio_processing/noise_suppression_impl.h @@ -15,8 +15,8 @@ #include #include "modules/audio_processing/include/audio_processing.h" -#include "rtc_base/constructormagic.h" -#include "rtc_base/criticalsection.h" +#include "rtc_base/constructor_magic.h" +#include "rtc_base/critical_section.h" namespace webrtc { diff --git a/modules/audio_processing/residual_echo_detector.cc b/modules/audio_processing/residual_echo_detector.cc index 3454214fd7..0b53cc2e57 100644 --- a/modules/audio_processing/residual_echo_detector.cc +++ b/modules/audio_processing/residual_echo_detector.cc @@ -16,7 +16,7 @@ #include "absl/types/optional.h" #include "modules/audio_processing/audio_buffer.h" #include "modules/audio_processing/logging/apm_data_dumper.h" -#include "rtc_base/atomicops.h" +#include "rtc_base/atomic_ops.h" #include "rtc_base/checks.h" #include "rtc_base/logging.h" #include "system_wrappers/include/metrics.h" diff --git a/modules/audio_processing/residual_echo_detector_unittest.cc b/modules/audio_processing/residual_echo_detector_unittest.cc index c6fb8e45c6..6658999494 100644 --- a/modules/audio_processing/residual_echo_detector_unittest.cc +++ b/modules/audio_processing/residual_echo_detector_unittest.cc @@ -11,7 +11,7 @@ #include #include "modules/audio_processing/residual_echo_detector.h" -#include "rtc_base/refcountedobject.h" +#include "rtc_base/ref_counted_object.h" #include "test/gtest.h" namespace webrtc { diff --git a/modules/audio_processing/rms_level_unittest.cc b/modules/audio_processing/rms_level_unittest.cc index cf7683d1c8..c2d6a507ff 100644 --- a/modules/audio_processing/rms_level_unittest.cc +++ b/modules/audio_processing/rms_level_unittest.cc @@ -14,7 +14,7 @@ #include "api/array_view.h" #include "modules/audio_processing/rms_level.h" #include "rtc_base/checks.h" -#include "rtc_base/numerics/mathutils.h" +#include "rtc_base/numerics/math_utils.h" #include "rtc_base/numerics/safe_conversions.h" #include "test/gtest.h" diff --git a/modules/audio_processing/test/aec_dump_based_simulator.h b/modules/audio_processing/test/aec_dump_based_simulator.h index 3358fcf276..78c1210c59 100644 --- a/modules/audio_processing/test/aec_dump_based_simulator.h +++ b/modules/audio_processing/test/aec_dump_based_simulator.h @@ -13,7 +13,7 @@ #include "modules/audio_processing/test/audio_processing_simulator.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" #include "rtc_base/ignore_wundef.h" RTC_PUSH_IGNORING_WUNDEF() diff --git a/modules/audio_processing/test/audio_processing_simulator.h b/modules/audio_processing/test/audio_processing_simulator.h index 4b67537b49..0ac25da9ef 100644 --- a/modules/audio_processing/test/audio_processing_simulator.h +++ b/modules/audio_processing/test/audio_processing_simulator.h @@ -22,9 +22,9 @@ #include "modules/audio_processing/include/audio_processing.h" #include "modules/audio_processing/test/fake_recording_device.h" #include "modules/audio_processing/test/test_utils.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" #include "rtc_base/task_queue.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/time_utils.h" namespace webrtc { namespace test { diff --git a/modules/audio_processing/test/bitexactness_tools.cc b/modules/audio_processing/test/bitexactness_tools.cc index 0e9d369452..7bf2b0117f 100644 --- a/modules/audio_processing/test/bitexactness_tools.cc +++ b/modules/audio_processing/test/bitexactness_tools.cc @@ -16,7 +16,7 @@ #include #include "api/array_view.h" -#include "test/testsupport/fileutils.h" +#include "test/testsupport/file_utils.h" namespace webrtc { namespace test { diff --git a/modules/audio_processing/test/conversational_speech/generator.cc b/modules/audio_processing/test/conversational_speech/generator.cc index fa561cf8e0..04c0678025 100644 --- a/modules/audio_processing/test/conversational_speech/generator.cc +++ b/modules/audio_processing/test/conversational_speech/generator.cc @@ -17,7 +17,7 @@ #include "modules/audio_processing/test/conversational_speech/timing.h" #include "modules/audio_processing/test/conversational_speech/wavreader_factory.h" #include "rtc_base/flags.h" -#include "test/testsupport/fileutils.h" +#include "test/testsupport/file_utils.h" namespace webrtc { namespace test { diff --git a/modules/audio_processing/test/conversational_speech/generator_unittest.cc b/modules/audio_processing/test/conversational_speech/generator_unittest.cc index 5ef11db5db..aacf2a2951 100644 --- a/modules/audio_processing/test/conversational_speech/generator_unittest.cc +++ b/modules/audio_processing/test/conversational_speech/generator_unittest.cc @@ -53,7 +53,7 @@ #include "rtc_base/logging.h" #include "test/gmock.h" #include "test/gtest.h" -#include "test/testsupport/fileutils.h" +#include "test/testsupport/file_utils.h" namespace webrtc { namespace test { diff --git a/modules/audio_processing/test/conversational_speech/multiend_call.cc b/modules/audio_processing/test/conversational_speech/multiend_call.cc index 4e2f54d150..2ae33d7137 100644 --- a/modules/audio_processing/test/conversational_speech/multiend_call.cc +++ b/modules/audio_processing/test/conversational_speech/multiend_call.cc @@ -14,7 +14,7 @@ #include #include "rtc_base/logging.h" -#include "test/testsupport/fileutils.h" +#include "test/testsupport/file_utils.h" namespace webrtc { namespace test { diff --git a/modules/audio_processing/test/conversational_speech/multiend_call.h b/modules/audio_processing/test/conversational_speech/multiend_call.h index a4eff382bd..09cb00c6ba 100644 --- a/modules/audio_processing/test/conversational_speech/multiend_call.h +++ b/modules/audio_processing/test/conversational_speech/multiend_call.h @@ -23,7 +23,7 @@ #include "modules/audio_processing/test/conversational_speech/timing.h" #include "modules/audio_processing/test/conversational_speech/wavreader_abstract_factory.h" #include "modules/audio_processing/test/conversational_speech/wavreader_interface.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace webrtc { namespace test { diff --git a/modules/audio_processing/test/conversational_speech/simulator.cc b/modules/audio_processing/test/conversational_speech/simulator.cc index c400499fd3..81b73fba52 100644 --- a/modules/audio_processing/test/conversational_speech/simulator.cc +++ b/modules/audio_processing/test/conversational_speech/simulator.cc @@ -22,10 +22,10 @@ #include "common_audio/include/audio_util.h" #include "common_audio/wav_file.h" #include "modules/audio_processing/test/conversational_speech/wavreader_interface.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" #include "rtc_base/logging.h" #include "rtc_base/numerics/safe_conversions.h" -#include "test/testsupport/fileutils.h" +#include "test/testsupport/file_utils.h" namespace webrtc { namespace test { diff --git a/modules/audio_processing/test/conversational_speech/simulator.h b/modules/audio_processing/test/conversational_speech/simulator.h index 743db420f5..a9992eb5d8 100644 --- a/modules/audio_processing/test/conversational_speech/simulator.h +++ b/modules/audio_processing/test/conversational_speech/simulator.h @@ -17,7 +17,7 @@ #include #include "modules/audio_processing/test/conversational_speech/multiend_call.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace webrtc { namespace test { diff --git a/modules/audio_processing/test/conversational_speech/timing.cc b/modules/audio_processing/test/conversational_speech/timing.cc index 6c19f32807..53c8142028 100644 --- a/modules/audio_processing/test/conversational_speech/timing.cc +++ b/modules/audio_processing/test/conversational_speech/timing.cc @@ -13,7 +13,7 @@ #include #include -#include "rtc_base/stringencode.h" +#include "rtc_base/string_encode.h" namespace webrtc { namespace test { diff --git a/modules/audio_processing/test/debug_dump_test.cc b/modules/audio_processing/test/debug_dump_test.cc index 509a90401b..7d0a2bd574 100644 --- a/modules/audio_processing/test/debug_dump_test.cc +++ b/modules/audio_processing/test/debug_dump_test.cc @@ -21,7 +21,7 @@ #include "modules/audio_processing/test/test_utils.h" #include "rtc_base/task_queue.h" #include "test/gtest.h" -#include "test/testsupport/fileutils.h" +#include "test/testsupport/file_utils.h" namespace webrtc { namespace test { diff --git a/modules/audio_processing/test/echo_canceller_test_tools.h b/modules/audio_processing/test/echo_canceller_test_tools.h index 1cb5b7e762..8c9ca0108f 100644 --- a/modules/audio_processing/test/echo_canceller_test_tools.h +++ b/modules/audio_processing/test/echo_canceller_test_tools.h @@ -15,7 +15,7 @@ #include #include "api/array_view.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" #include "rtc_base/random.h" namespace webrtc { diff --git a/modules/audio_processing/test/test_utils.h b/modules/audio_processing/test/test_utils.h index 10877f1a5f..36374318be 100644 --- a/modules/audio_processing/test/test_utils.h +++ b/modules/audio_processing/test/test_utils.h @@ -23,7 +23,7 @@ #include "common_audio/channel_buffer.h" #include "common_audio/wav_file.h" #include "modules/audio_processing/include/audio_processing.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace webrtc { diff --git a/modules/audio_processing/test/wav_based_simulator.h b/modules/audio_processing/test/wav_based_simulator.h index 0294e89ee6..3dfd2560d8 100644 --- a/modules/audio_processing/test/wav_based_simulator.h +++ b/modules/audio_processing/test/wav_based_simulator.h @@ -15,7 +15,7 @@ #include "modules/audio_processing/test/audio_processing_simulator.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace webrtc { namespace test { diff --git a/modules/audio_processing/transient/file_utils_unittest.cc b/modules/audio_processing/transient/file_utils_unittest.cc index 89902eccb1..ced06b197d 100644 --- a/modules/audio_processing/transient/file_utils_unittest.cc +++ b/modules/audio_processing/transient/file_utils_unittest.cc @@ -17,7 +17,7 @@ #include "rtc_base/system/file_wrapper.h" #include "test/gtest.h" -#include "test/testsupport/fileutils.h" +#include "test/testsupport/file_utils.h" namespace webrtc { diff --git a/modules/audio_processing/transient/transient_detector_unittest.cc b/modules/audio_processing/transient/transient_detector_unittest.cc index 091a573f13..11dd8aa384 100644 --- a/modules/audio_processing/transient/transient_detector_unittest.cc +++ b/modules/audio_processing/transient/transient_detector_unittest.cc @@ -18,7 +18,7 @@ #include "rtc_base/strings/string_builder.h" #include "rtc_base/system/file_wrapper.h" #include "test/gtest.h" -#include "test/testsupport/fileutils.h" +#include "test/testsupport/file_utils.h" namespace webrtc { diff --git a/modules/audio_processing/transient/transient_suppression_test.cc b/modules/audio_processing/transient/transient_suppression_test.cc index e15f69c042..57bddb62c4 100644 --- a/modules/audio_processing/transient/transient_suppression_test.cc +++ b/modules/audio_processing/transient/transient_suppression_test.cc @@ -21,7 +21,7 @@ #include "modules/audio_processing/agc/agc.h" #include "rtc_base/flags.h" #include "test/gtest.h" -#include "test/testsupport/fileutils.h" +#include "test/testsupport/file_utils.h" WEBRTC_DEFINE_string(in_file_name, "", "PCM file that contains the signal."); WEBRTC_DEFINE_string(detection_file_name, diff --git a/modules/audio_processing/transient/wpd_tree_unittest.cc b/modules/audio_processing/transient/wpd_tree_unittest.cc index 830a5dfb62..1d6dbe8e49 100644 --- a/modules/audio_processing/transient/wpd_tree_unittest.cc +++ b/modules/audio_processing/transient/wpd_tree_unittest.cc @@ -18,7 +18,7 @@ #include "rtc_base/strings/string_builder.h" #include "rtc_base/system/file_wrapper.h" #include "test/gtest.h" -#include "test/testsupport/fileutils.h" +#include "test/testsupport/file_utils.h" namespace webrtc { diff --git a/modules/audio_processing/utility/block_mean_calculator.h b/modules/audio_processing/utility/block_mean_calculator.h index cfa7cfbeba..5ccdbef562 100644 --- a/modules/audio_processing/utility/block_mean_calculator.h +++ b/modules/audio_processing/utility/block_mean_calculator.h @@ -13,7 +13,7 @@ #include -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace webrtc { diff --git a/modules/audio_processing/vad/pitch_based_vad_unittest.cc b/modules/audio_processing/vad/pitch_based_vad_unittest.cc index fb6daa523e..4a8331a769 100644 --- a/modules/audio_processing/vad/pitch_based_vad_unittest.cc +++ b/modules/audio_processing/vad/pitch_based_vad_unittest.cc @@ -16,7 +16,7 @@ #include #include "test/gtest.h" -#include "test/testsupport/fileutils.h" +#include "test/testsupport/file_utils.h" namespace webrtc { diff --git a/modules/audio_processing/vad/pole_zero_filter_unittest.cc b/modules/audio_processing/vad/pole_zero_filter_unittest.cc index 38ee10fc46..8088b40125 100644 --- a/modules/audio_processing/vad/pole_zero_filter_unittest.cc +++ b/modules/audio_processing/vad/pole_zero_filter_unittest.cc @@ -17,7 +17,7 @@ #include "modules/audio_processing/vad/vad_audio_proc_internal.h" #include "test/gtest.h" -#include "test/testsupport/fileutils.h" +#include "test/testsupport/file_utils.h" namespace webrtc { diff --git a/modules/audio_processing/vad/standalone_vad_unittest.cc b/modules/audio_processing/vad/standalone_vad_unittest.cc index 512276ecb5..22b1f4961c 100644 --- a/modules/audio_processing/vad/standalone_vad_unittest.cc +++ b/modules/audio_processing/vad/standalone_vad_unittest.cc @@ -15,7 +15,7 @@ #include #include "test/gtest.h" -#include "test/testsupport/fileutils.h" +#include "test/testsupport/file_utils.h" namespace webrtc { diff --git a/modules/audio_processing/vad/vad_audio_proc_unittest.cc b/modules/audio_processing/vad/vad_audio_proc_unittest.cc index 5b96be624d..0afed84c35 100644 --- a/modules/audio_processing/vad/vad_audio_proc_unittest.cc +++ b/modules/audio_processing/vad/vad_audio_proc_unittest.cc @@ -21,7 +21,7 @@ #include "modules/audio_processing/vad/common.h" #include "test/gtest.h" -#include "test/testsupport/fileutils.h" +#include "test/testsupport/file_utils.h" namespace webrtc { diff --git a/modules/audio_processing/vad/voice_activity_detector_unittest.cc b/modules/audio_processing/vad/voice_activity_detector_unittest.cc index 62eda2bd3d..3214bd966d 100644 --- a/modules/audio_processing/vad/voice_activity_detector_unittest.cc +++ b/modules/audio_processing/vad/voice_activity_detector_unittest.cc @@ -14,7 +14,7 @@ #include #include "test/gtest.h" -#include "test/testsupport/fileutils.h" +#include "test/testsupport/file_utils.h" namespace webrtc { namespace { diff --git a/modules/audio_processing/voice_detection_impl.cc b/modules/audio_processing/voice_detection_impl.cc index c55ca4aee8..7bf6c4a29c 100644 --- a/modules/audio_processing/voice_detection_impl.cc +++ b/modules/audio_processing/voice_detection_impl.cc @@ -14,7 +14,7 @@ #include "common_audio/vad/include/webrtc_vad.h" #include "modules/audio_processing/audio_buffer.h" #include "rtc_base/checks.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace webrtc { class VoiceDetectionImpl::Vad { diff --git a/modules/audio_processing/voice_detection_impl.h b/modules/audio_processing/voice_detection_impl.h index c438473679..680056631c 100644 --- a/modules/audio_processing/voice_detection_impl.h +++ b/modules/audio_processing/voice_detection_impl.h @@ -15,8 +15,8 @@ #include #include "modules/audio_processing/include/audio_processing.h" -#include "rtc_base/constructormagic.h" -#include "rtc_base/criticalsection.h" +#include "rtc_base/constructor_magic.h" +#include "rtc_base/critical_section.h" #include "rtc_base/thread_annotations.h" namespace webrtc { diff --git a/modules/bitrate_controller/bitrate_controller_impl.h b/modules/bitrate_controller/bitrate_controller_impl.h index ee220b6f11..5448c171b5 100644 --- a/modules/bitrate_controller/bitrate_controller_impl.h +++ b/modules/bitrate_controller/bitrate_controller_impl.h @@ -23,8 +23,8 @@ #include #include "modules/bitrate_controller/send_side_bandwidth_estimation.h" -#include "rtc_base/constructormagic.h" -#include "rtc_base/criticalsection.h" +#include "rtc_base/constructor_magic.h" +#include "rtc_base/critical_section.h" namespace webrtc { diff --git a/modules/congestion_controller/bbr/rtt_stats.h b/modules/congestion_controller/bbr/rtt_stats.h index f1c9f10d52..e8f0a8ba43 100644 --- a/modules/congestion_controller/bbr/rtt_stats.h +++ b/modules/congestion_controller/bbr/rtt_stats.h @@ -16,7 +16,7 @@ #include "api/units/time_delta.h" #include "api/units/timestamp.h" #include "rtc_base/checks.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" #include "rtc_base/logging.h" namespace webrtc { diff --git a/modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator_unittest.cc b/modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator_unittest.cc index 4991ee6996..cfb7618222 100644 --- a/modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator_unittest.cc +++ b/modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator_unittest.cc @@ -14,7 +14,7 @@ #include "absl/memory/memory.h" #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" -#include "rtc_base/fakeclock.h" +#include "rtc_base/fake_clock.h" #include "test/gmock.h" #include "test/gtest.h" diff --git a/modules/congestion_controller/goog_cc/alr_detector.cc b/modules/congestion_controller/goog_cc/alr_detector.cc index db669428f0..3009de44fd 100644 --- a/modules/congestion_controller/goog_cc/alr_detector.cc +++ b/modules/congestion_controller/goog_cc/alr_detector.cc @@ -20,7 +20,7 @@ #include "rtc_base/checks.h" #include "rtc_base/experiments/alr_experiment.h" #include "rtc_base/numerics/safe_conversions.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/time_utils.h" namespace webrtc { AlrDetector::AlrDetector() : AlrDetector(nullptr) {} diff --git a/modules/congestion_controller/goog_cc/delay_based_bwe.h b/modules/congestion_controller/goog_cc/delay_based_bwe.h index f276dfeabf..ba9289c020 100644 --- a/modules/congestion_controller/goog_cc/delay_based_bwe.h +++ b/modules/congestion_controller/goog_cc/delay_based_bwe.h @@ -23,7 +23,7 @@ #include "modules/remote_bitrate_estimator/include/bwe_defines.h" #include "modules/remote_bitrate_estimator/inter_arrival.h" #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" // For PacketFeedback -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" #include "rtc_base/race_checker.h" namespace webrtc { diff --git a/modules/congestion_controller/goog_cc/delay_based_bwe_unittest_helper.h b/modules/congestion_controller/goog_cc/delay_based_bwe_unittest_helper.h index 383f68d6c6..4d8a00c6ae 100644 --- a/modules/congestion_controller/goog_cc/delay_based_bwe_unittest_helper.h +++ b/modules/congestion_controller/goog_cc/delay_based_bwe_unittest_helper.h @@ -22,7 +22,7 @@ #include "modules/congestion_controller/goog_cc/delay_based_bwe.h" #include "modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h" #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" #include "system_wrappers/include/clock.h" #include "test/field_trial.h" #include "test/gtest.h" diff --git a/modules/congestion_controller/goog_cc/delay_increase_detector_interface.h b/modules/congestion_controller/goog_cc/delay_increase_detector_interface.h index e4f899af7c..40d945db58 100644 --- a/modules/congestion_controller/goog_cc/delay_increase_detector_interface.h +++ b/modules/congestion_controller/goog_cc/delay_increase_detector_interface.h @@ -13,7 +13,7 @@ #include #include "modules/remote_bitrate_estimator/include/bwe_defines.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace webrtc { diff --git a/modules/congestion_controller/goog_cc/goog_cc_network_control.h b/modules/congestion_controller/goog_cc/goog_cc_network_control.h index 6ba12ae0d4..c188d116b8 100644 --- a/modules/congestion_controller/goog_cc/goog_cc_network_control.h +++ b/modules/congestion_controller/goog_cc/goog_cc_network_control.h @@ -30,7 +30,7 @@ #include "modules/congestion_controller/goog_cc/delay_based_bwe.h" #include "modules/congestion_controller/goog_cc/delay_based_rate_controller.h" #include "modules/congestion_controller/goog_cc/probe_controller.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" #include "rtc_base/experiments/field_trial_parser.h" namespace webrtc { diff --git a/modules/congestion_controller/goog_cc/median_slope_estimator.h b/modules/congestion_controller/goog_cc/median_slope_estimator.h index aeab4ea822..3f1e3f5063 100644 --- a/modules/congestion_controller/goog_cc/median_slope_estimator.h +++ b/modules/congestion_controller/goog_cc/median_slope_estimator.h @@ -16,7 +16,7 @@ #include #include -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" #include "rtc_base/numerics/percentile_filter.h" namespace webrtc { diff --git a/modules/congestion_controller/goog_cc/probe_controller.h b/modules/congestion_controller/goog_cc/probe_controller.h index 75f3ee778b..98df8c74a2 100644 --- a/modules/congestion_controller/goog_cc/probe_controller.h +++ b/modules/congestion_controller/goog_cc/probe_controller.h @@ -18,7 +18,7 @@ #include "absl/types/optional.h" #include "api/transport/network_control.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" #include "rtc_base/system/unused.h" namespace webrtc { diff --git a/modules/congestion_controller/goog_cc/trendline_estimator.h b/modules/congestion_controller/goog_cc/trendline_estimator.h index 1826d81248..260cd03e34 100644 --- a/modules/congestion_controller/goog_cc/trendline_estimator.h +++ b/modules/congestion_controller/goog_cc/trendline_estimator.h @@ -17,7 +17,7 @@ #include "modules/congestion_controller/goog_cc/delay_increase_detector_interface.h" #include "modules/remote_bitrate_estimator/include/bwe_defines.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace webrtc { diff --git a/modules/congestion_controller/include/receive_side_congestion_controller.h b/modules/congestion_controller/include/receive_side_congestion_controller.h index 2cb1b52ac0..ad5d077bfe 100644 --- a/modules/congestion_controller/include/receive_side_congestion_controller.h +++ b/modules/congestion_controller/include/receive_side_congestion_controller.h @@ -15,8 +15,8 @@ #include #include "modules/remote_bitrate_estimator/remote_estimator_proxy.h" -#include "rtc_base/constructormagic.h" -#include "rtc_base/criticalsection.h" +#include "rtc_base/constructor_magic.h" +#include "rtc_base/critical_section.h" namespace webrtc { class RemoteBitrateEstimator; diff --git a/modules/congestion_controller/include/send_side_congestion_controller.h b/modules/congestion_controller/include/send_side_congestion_controller.h index 7f22ed2594..1a601ec889 100644 --- a/modules/congestion_controller/include/send_side_congestion_controller.h +++ b/modules/congestion_controller/include/send_side_congestion_controller.h @@ -22,10 +22,10 @@ #include "modules/include/module.h" #include "modules/include/module_common_types.h" #include "modules/pacing/paced_sender.h" -#include "rtc_base/constructormagic.h" -#include "rtc_base/criticalsection.h" +#include "rtc_base/constructor_magic.h" +#include "rtc_base/critical_section.h" #include "rtc_base/deprecation.h" -#include "rtc_base/networkroute.h" +#include "rtc_base/network_route.h" #include "rtc_base/race_checker.h" namespace rtc { diff --git a/modules/congestion_controller/include/send_side_congestion_controller_interface.h b/modules/congestion_controller/include/send_side_congestion_controller_interface.h index 0eeeabc238..588c00bc43 100644 --- a/modules/congestion_controller/include/send_side_congestion_controller_interface.h +++ b/modules/congestion_controller/include/send_side_congestion_controller_interface.h @@ -19,9 +19,9 @@ #include "modules/include/module.h" #include "modules/include/module_common_types.h" #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" #include "rtc_base/network/sent_packet.h" -#include "rtc_base/networkroute.h" +#include "rtc_base/network_route.h" namespace webrtc { diff --git a/modules/congestion_controller/rtp/control_handler.h b/modules/congestion_controller/rtp/control_handler.h index 0ecc6b1948..e9016c78a5 100644 --- a/modules/congestion_controller/rtp/control_handler.h +++ b/modules/congestion_controller/rtp/control_handler.h @@ -18,7 +18,7 @@ #include "api/units/data_size.h" #include "api/units/time_delta.h" #include "modules/pacing/paced_sender.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" #include "rtc_base/sequenced_task_checker.h" namespace webrtc { diff --git a/modules/congestion_controller/rtp/send_time_history.h b/modules/congestion_controller/rtp/send_time_history.h index c28ca61507..cba89b93a4 100644 --- a/modules/congestion_controller/rtp/send_time_history.h +++ b/modules/congestion_controller/rtp/send_time_history.h @@ -16,7 +16,7 @@ #include "api/units/data_size.h" #include "modules/include/module_common_types.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace webrtc { class Clock; diff --git a/modules/congestion_controller/rtp/transport_feedback_adapter.h b/modules/congestion_controller/rtp/transport_feedback_adapter.h index 1741d6d66a..eb90b5dfc2 100644 --- a/modules/congestion_controller/rtp/transport_feedback_adapter.h +++ b/modules/congestion_controller/rtp/transport_feedback_adapter.h @@ -16,7 +16,7 @@ #include "api/transport/network_types.h" #include "modules/congestion_controller/rtp/send_time_history.h" -#include "rtc_base/criticalsection.h" +#include "rtc_base/critical_section.h" #include "rtc_base/network/sent_packet.h" #include "rtc_base/thread_annotations.h" #include "rtc_base/thread_checker.h" diff --git a/modules/congestion_controller/send_side_congestion_controller.cc b/modules/congestion_controller/send_side_congestion_controller.cc index 3c8f72f385..d49e56752e 100644 --- a/modules/congestion_controller/send_side_congestion_controller.cc +++ b/modules/congestion_controller/send_side_congestion_controller.cc @@ -31,7 +31,7 @@ #include "rtc_base/logging.h" #include "rtc_base/network/sent_packet.h" #include "rtc_base/rate_limiter.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/time_utils.h" #include "system_wrappers/include/field_trial.h" namespace webrtc { diff --git a/modules/congestion_controller/transport_feedback_adapter.h b/modules/congestion_controller/transport_feedback_adapter.h index c6ac2ad9ad..a8318f63e3 100644 --- a/modules/congestion_controller/transport_feedback_adapter.h +++ b/modules/congestion_controller/transport_feedback_adapter.h @@ -16,7 +16,7 @@ #include "api/transport/network_types.h" #include "modules/congestion_controller/rtp/send_time_history.h" -#include "rtc_base/criticalsection.h" +#include "rtc_base/critical_section.h" #include "rtc_base/thread_annotations.h" #include "rtc_base/thread_checker.h" #include "system_wrappers/include/clock.h" diff --git a/modules/desktop_capture/cropped_desktop_frame.cc b/modules/desktop_capture/cropped_desktop_frame.cc index 45f4d8fb78..311f2549df 100644 --- a/modules/desktop_capture/cropped_desktop_frame.cc +++ b/modules/desktop_capture/cropped_desktop_frame.cc @@ -14,7 +14,7 @@ #include "modules/desktop_capture/cropped_desktop_frame.h" #include "modules/desktop_capture/desktop_region.h" #include "rtc_base/checks.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace webrtc { diff --git a/modules/desktop_capture/desktop_and_cursor_composer.cc b/modules/desktop_capture/desktop_and_cursor_composer.cc index fae34b453a..649b79153b 100644 --- a/modules/desktop_capture/desktop_and_cursor_composer.cc +++ b/modules/desktop_capture/desktop_and_cursor_composer.cc @@ -20,7 +20,7 @@ #include "modules/desktop_capture/mouse_cursor.h" #include "modules/desktop_capture/mouse_cursor_monitor.h" #include "rtc_base/checks.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace webrtc { diff --git a/modules/desktop_capture/desktop_and_cursor_composer.h b/modules/desktop_capture/desktop_and_cursor_composer.h index 4c661131e5..1381106cca 100644 --- a/modules/desktop_capture/desktop_and_cursor_composer.h +++ b/modules/desktop_capture/desktop_and_cursor_composer.h @@ -21,7 +21,7 @@ #include "modules/desktop_capture/mouse_cursor.h" #include "modules/desktop_capture/mouse_cursor_monitor.h" #include "modules/desktop_capture/shared_memory.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" #include "rtc_base/system/rtc_export.h" namespace webrtc { diff --git a/modules/desktop_capture/desktop_capturer_differ_wrapper.cc b/modules/desktop_capture/desktop_capturer_differ_wrapper.cc index 4759f9ab94..1b90fd58c4 100644 --- a/modules/desktop_capture/desktop_capturer_differ_wrapper.cc +++ b/modules/desktop_capture/desktop_capturer_differ_wrapper.cc @@ -18,7 +18,7 @@ #include "modules/desktop_capture/desktop_region.h" #include "modules/desktop_capture/differ_block.h" #include "rtc_base/checks.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/time_utils.h" namespace webrtc { diff --git a/modules/desktop_capture/desktop_capturer_differ_wrapper_unittest.cc b/modules/desktop_capture/desktop_capturer_differ_wrapper_unittest.cc index eb2b8b263c..0ae46f5ad4 100644 --- a/modules/desktop_capture/desktop_capturer_differ_wrapper_unittest.cc +++ b/modules/desktop_capture/desktop_capturer_differ_wrapper_unittest.cc @@ -21,7 +21,7 @@ #include "modules/desktop_capture/fake_desktop_capturer.h" #include "modules/desktop_capture/mock_desktop_capturer_callback.h" #include "rtc_base/random.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/time_utils.h" #include "system_wrappers/include/cpu_features_wrapper.h" #include "test/gtest.h" diff --git a/modules/desktop_capture/desktop_frame.h b/modules/desktop_capture/desktop_frame.h index 69fed35e25..803a2f4b94 100644 --- a/modules/desktop_capture/desktop_frame.h +++ b/modules/desktop_capture/desktop_frame.h @@ -17,7 +17,7 @@ #include "modules/desktop_capture/desktop_geometry.h" #include "modules/desktop_capture/desktop_region.h" #include "modules/desktop_capture/shared_memory.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" #include "rtc_base/system/rtc_export.h" namespace webrtc { diff --git a/modules/desktop_capture/desktop_frame_generator.cc b/modules/desktop_capture/desktop_frame_generator.cc index 8527d4d2cd..947b38963d 100644 --- a/modules/desktop_capture/desktop_frame_generator.cc +++ b/modules/desktop_capture/desktop_frame_generator.cc @@ -17,7 +17,7 @@ #include "modules/desktop_capture/rgba_color.h" #include "rtc_base/checks.h" #include "rtc_base/random.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/time_utils.h" namespace webrtc { diff --git a/modules/desktop_capture/desktop_frame_win.h b/modules/desktop_capture/desktop_frame_win.h index cd953f0123..e8861d51ff 100644 --- a/modules/desktop_capture/desktop_frame_win.h +++ b/modules/desktop_capture/desktop_frame_win.h @@ -16,7 +16,7 @@ #include #include "modules/desktop_capture/desktop_frame.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace webrtc { diff --git a/modules/desktop_capture/linux/base_capturer_pipewire.h b/modules/desktop_capture/linux/base_capturer_pipewire.h index 56b101acba..d7910aa01b 100644 --- a/modules/desktop_capture/linux/base_capturer_pipewire.h +++ b/modules/desktop_capture/linux/base_capturer_pipewire.h @@ -18,7 +18,7 @@ #include "modules/desktop_capture/desktop_capture_options.h" #include "modules/desktop_capture/desktop_capturer.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace webrtc { diff --git a/modules/desktop_capture/linux/screen_capturer_x11.cc b/modules/desktop_capture/linux/screen_capturer_x11.cc index 24f70b7eb1..6cd40c12a6 100644 --- a/modules/desktop_capture/linux/screen_capturer_x11.cc +++ b/modules/desktop_capture/linux/screen_capturer_x11.cc @@ -29,7 +29,7 @@ #include "modules/desktop_capture/shared_desktop_frame.h" #include "rtc_base/checks.h" #include "rtc_base/logging.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/time_utils.h" #include "rtc_base/trace_event.h" namespace webrtc { diff --git a/modules/desktop_capture/linux/screen_capturer_x11.h b/modules/desktop_capture/linux/screen_capturer_x11.h index e57cb20768..6412a7654e 100644 --- a/modules/desktop_capture/linux/screen_capturer_x11.h +++ b/modules/desktop_capture/linux/screen_capturer_x11.h @@ -26,7 +26,7 @@ #include "modules/desktop_capture/screen_capture_frame_queue.h" #include "modules/desktop_capture/screen_capturer_helper.h" #include "modules/desktop_capture/shared_desktop_frame.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace webrtc { diff --git a/modules/desktop_capture/linux/shared_x_display.h b/modules/desktop_capture/linux/shared_x_display.h index a14f41fab8..0829e09fb1 100644 --- a/modules/desktop_capture/linux/shared_x_display.h +++ b/modules/desktop_capture/linux/shared_x_display.h @@ -16,8 +16,8 @@ #include -#include "api/refcountedbase.h" -#include "rtc_base/constructormagic.h" +#include "api/ref_counted_base.h" +#include "rtc_base/constructor_magic.h" #include "rtc_base/scoped_ref_ptr.h" // Including Xlib.h will involve evil defines (Bool, Status, True, False), which diff --git a/modules/desktop_capture/linux/window_capturer_x11.h b/modules/desktop_capture/linux/window_capturer_x11.h index a9ad421dae..0f819507c9 100644 --- a/modules/desktop_capture/linux/window_capturer_x11.h +++ b/modules/desktop_capture/linux/window_capturer_x11.h @@ -23,7 +23,7 @@ #include "modules/desktop_capture/linux/window_finder_x11.h" #include "modules/desktop_capture/linux/x_atom_cache.h" #include "modules/desktop_capture/linux/x_server_pixel_buffer.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" #include "rtc_base/scoped_ref_ptr.h" namespace webrtc { diff --git a/modules/desktop_capture/linux/window_list_utils.cc b/modules/desktop_capture/linux/window_list_utils.cc index f130b719c3..906042aee0 100644 --- a/modules/desktop_capture/linux/window_list_utils.cc +++ b/modules/desktop_capture/linux/window_list_utils.cc @@ -17,7 +17,7 @@ #include "modules/desktop_capture/linux/x_error_trap.h" #include "rtc_base/checks.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" #include "rtc_base/logging.h" namespace webrtc { diff --git a/modules/desktop_capture/linux/x_error_trap.h b/modules/desktop_capture/linux/x_error_trap.h index a9d059a0bc..1fb0fdcc92 100644 --- a/modules/desktop_capture/linux/x_error_trap.h +++ b/modules/desktop_capture/linux/x_error_trap.h @@ -13,7 +13,7 @@ #include -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace webrtc { diff --git a/modules/desktop_capture/linux/x_server_pixel_buffer.h b/modules/desktop_capture/linux/x_server_pixel_buffer.h index a9398dac99..a11ca2097d 100644 --- a/modules/desktop_capture/linux/x_server_pixel_buffer.h +++ b/modules/desktop_capture/linux/x_server_pixel_buffer.h @@ -17,7 +17,7 @@ #include #include "modules/desktop_capture/desktop_geometry.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace webrtc { diff --git a/modules/desktop_capture/mac/desktop_configuration_monitor.h b/modules/desktop_capture/mac/desktop_configuration_monitor.h index cbf580b235..1ed4c6bbcf 100644 --- a/modules/desktop_capture/mac/desktop_configuration_monitor.h +++ b/modules/desktop_capture/mac/desktop_configuration_monitor.h @@ -16,10 +16,10 @@ #include #include -#include "api/refcountedbase.h" +#include "api/ref_counted_base.h" #include "modules/desktop_capture/mac/desktop_configuration.h" -#include "rtc_base/constructormagic.h" -#include "rtc_base/criticalsection.h" +#include "rtc_base/constructor_magic.h" +#include "rtc_base/critical_section.h" namespace webrtc { diff --git a/modules/desktop_capture/mac/full_screen_chrome_window_detector.cc b/modules/desktop_capture/mac/full_screen_chrome_window_detector.cc index 1f99de563b..3a26c77618 100644 --- a/modules/desktop_capture/mac/full_screen_chrome_window_detector.cc +++ b/modules/desktop_capture/mac/full_screen_chrome_window_detector.cc @@ -15,8 +15,8 @@ #include "modules/desktop_capture/mac/window_list_utils.h" #include "rtc_base/logging.h" -#include "rtc_base/macutils.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/mac_utils.h" +#include "rtc_base/time_utils.h" namespace webrtc { diff --git a/modules/desktop_capture/mac/full_screen_chrome_window_detector.h b/modules/desktop_capture/mac/full_screen_chrome_window_detector.h index 4fbe0009eb..2ee99adedc 100644 --- a/modules/desktop_capture/mac/full_screen_chrome_window_detector.h +++ b/modules/desktop_capture/mac/full_screen_chrome_window_detector.h @@ -13,9 +13,9 @@ #include -#include "api/refcountedbase.h" +#include "api/ref_counted_base.h" #include "modules/desktop_capture/desktop_capturer.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace webrtc { diff --git a/modules/desktop_capture/mac/screen_capturer_mac.mm b/modules/desktop_capture/mac/screen_capturer_mac.mm index 9f506732a6..8f9a9d34af 100644 --- a/modules/desktop_capture/mac/screen_capturer_mac.mm +++ b/modules/desktop_capture/mac/screen_capturer_mac.mm @@ -14,9 +14,9 @@ #include "modules/desktop_capture/mac/desktop_frame_provider.h" #include "rtc_base/checks.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" #include "rtc_base/logging.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/time_utils.h" #include "rtc_base/trace_event.h" #include "sdk/objc/helpers/scoped_cftyperef.h" diff --git a/modules/desktop_capture/mac/window_list_utils.cc b/modules/desktop_capture/mac/window_list_utils.cc index 7f89cde1ce..6e1fc3f933 100644 --- a/modules/desktop_capture/mac/window_list_utils.cc +++ b/modules/desktop_capture/mac/window_list_utils.cc @@ -17,7 +17,7 @@ #include #include "rtc_base/checks.h" -#include "rtc_base/macutils.h" +#include "rtc_base/mac_utils.h" static_assert(static_cast(kCGNullWindowID) == webrtc::kNullWindowId, diff --git a/modules/desktop_capture/mouse_cursor.h b/modules/desktop_capture/mouse_cursor.h index d27c439228..1d997e23c8 100644 --- a/modules/desktop_capture/mouse_cursor.h +++ b/modules/desktop_capture/mouse_cursor.h @@ -15,7 +15,7 @@ #include "modules/desktop_capture/desktop_frame.h" #include "modules/desktop_capture/desktop_geometry.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace webrtc { diff --git a/modules/desktop_capture/mouse_cursor_monitor_mac.mm b/modules/desktop_capture/mouse_cursor_monitor_mac.mm index 3402a5ffbb..814a45a74b 100644 --- a/modules/desktop_capture/mouse_cursor_monitor_mac.mm +++ b/modules/desktop_capture/mouse_cursor_monitor_mac.mm @@ -26,7 +26,7 @@ #include "modules/desktop_capture/mac/full_screen_chrome_window_detector.h" #include "modules/desktop_capture/mac/window_list_utils.h" #include "modules/desktop_capture/mouse_cursor.h" -#include "rtc_base/macutils.h" +#include "rtc_base/mac_utils.h" #include "rtc_base/scoped_ref_ptr.h" namespace webrtc { diff --git a/modules/desktop_capture/screen_capture_frame_queue.h b/modules/desktop_capture/screen_capture_frame_queue.h index a5bb595150..40dc6daa21 100644 --- a/modules/desktop_capture/screen_capture_frame_queue.h +++ b/modules/desktop_capture/screen_capture_frame_queue.h @@ -13,7 +13,7 @@ #include -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" // TODO(zijiehe): These headers are not used in this file, but to avoid build // break in remoting/host. We should add headers in each individual files. #include "modules/desktop_capture/desktop_frame.h" // Remove diff --git a/modules/desktop_capture/screen_capturer_helper.h b/modules/desktop_capture/screen_capturer_helper.h index d8fc36837b..fc4c85b706 100644 --- a/modules/desktop_capture/screen_capturer_helper.h +++ b/modules/desktop_capture/screen_capturer_helper.h @@ -15,7 +15,7 @@ #include "modules/desktop_capture/desktop_geometry.h" #include "modules/desktop_capture/desktop_region.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" #include "rtc_base/synchronization/rw_lock_wrapper.h" namespace webrtc { diff --git a/modules/desktop_capture/screen_capturer_integration_test.cc b/modules/desktop_capture/screen_capturer_integration_test.cc index 3fe38daabe..cb0e47530b 100644 --- a/modules/desktop_capture/screen_capturer_integration_test.cc +++ b/modules/desktop_capture/screen_capturer_integration_test.cc @@ -25,7 +25,7 @@ #include "modules/desktop_capture/rgba_color.h" #include "modules/desktop_capture/screen_drawer.h" #include "rtc_base/checks.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" #include "rtc_base/logging.h" #include "rtc_base/third_party/base64/base64.h" #include "test/gmock.h" diff --git a/modules/desktop_capture/screen_capturer_unittest.cc b/modules/desktop_capture/screen_capturer_unittest.cc index 90197d6169..a0b7cc5118 100644 --- a/modules/desktop_capture/screen_capturer_unittest.cc +++ b/modules/desktop_capture/screen_capturer_unittest.cc @@ -15,7 +15,7 @@ #include "modules/desktop_capture/desktop_frame.h" #include "modules/desktop_capture/desktop_region.h" #include "modules/desktop_capture/mock_desktop_capturer_callback.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" #include "rtc_base/logging.h" #include "test/gmock.h" #include "test/gtest.h" diff --git a/modules/desktop_capture/screen_drawer_unittest.cc b/modules/desktop_capture/screen_drawer_unittest.cc index d48fa89c0b..2186ada3c5 100644 --- a/modules/desktop_capture/screen_drawer_unittest.cc +++ b/modules/desktop_capture/screen_drawer_unittest.cc @@ -19,7 +19,7 @@ #include "rtc_base/logging.h" #include "rtc_base/platform_thread.h" #include "rtc_base/random.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/time_utils.h" #include "system_wrappers/include/sleep.h" #include "test/gtest.h" diff --git a/modules/desktop_capture/shared_desktop_frame.h b/modules/desktop_capture/shared_desktop_frame.h index 485436107f..12671de190 100644 --- a/modules/desktop_capture/shared_desktop_frame.h +++ b/modules/desktop_capture/shared_desktop_frame.h @@ -14,8 +14,8 @@ #include #include "modules/desktop_capture/desktop_frame.h" -#include "rtc_base/constructormagic.h" -#include "rtc_base/refcountedobject.h" +#include "rtc_base/constructor_magic.h" +#include "rtc_base/ref_counted_object.h" #include "rtc_base/scoped_ref_ptr.h" #include "rtc_base/system/rtc_export.h" diff --git a/modules/desktop_capture/shared_memory.h b/modules/desktop_capture/shared_memory.h index 81d4a307d8..ba846da4c8 100644 --- a/modules/desktop_capture/shared_memory.h +++ b/modules/desktop_capture/shared_memory.h @@ -19,7 +19,7 @@ #include -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace webrtc { diff --git a/modules/desktop_capture/win/desktop.h b/modules/desktop_capture/win/desktop.h index 94857eca1b..deb83cfe07 100644 --- a/modules/desktop_capture/win/desktop.h +++ b/modules/desktop_capture/win/desktop.h @@ -14,7 +14,7 @@ #include #include -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace webrtc { diff --git a/modules/desktop_capture/win/dxgi_duplicator_controller.cc b/modules/desktop_capture/win/dxgi_duplicator_controller.cc index 2029811b2a..bdf495837e 100644 --- a/modules/desktop_capture/win/dxgi_duplicator_controller.cc +++ b/modules/desktop_capture/win/dxgi_duplicator_controller.cc @@ -20,7 +20,7 @@ #include "modules/desktop_capture/win/screen_capture_utils.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" namespace webrtc { diff --git a/modules/desktop_capture/win/dxgi_duplicator_controller.h b/modules/desktop_capture/win/dxgi_duplicator_controller.h index ecae481005..a4f967d89f 100644 --- a/modules/desktop_capture/win/dxgi_duplicator_controller.h +++ b/modules/desktop_capture/win/dxgi_duplicator_controller.h @@ -24,7 +24,7 @@ #include "modules/desktop_capture/win/dxgi_adapter_duplicator.h" #include "modules/desktop_capture/win/dxgi_context.h" #include "modules/desktop_capture/win/dxgi_frame.h" -#include "rtc_base/criticalsection.h" +#include "rtc_base/critical_section.h" #include "rtc_base/scoped_ref_ptr.h" namespace webrtc { diff --git a/modules/desktop_capture/win/dxgi_output_duplicator.cc b/modules/desktop_capture/win/dxgi_output_duplicator.cc index f1f6f42066..a9ea02ee25 100644 --- a/modules/desktop_capture/win/dxgi_output_duplicator.cc +++ b/modules/desktop_capture/win/dxgi_output_duplicator.cc @@ -23,7 +23,7 @@ #include "modules/desktop_capture/win/dxgi_texture_staging.h" #include "rtc_base/checks.h" #include "rtc_base/logging.h" -#include "rtc_base/stringutils.h" +#include "rtc_base/string_utils.h" #include "rtc_base/win32.h" namespace webrtc { diff --git a/modules/desktop_capture/win/dxgi_output_duplicator.h b/modules/desktop_capture/win/dxgi_output_duplicator.h index d2a019d35b..9c05a706fe 100644 --- a/modules/desktop_capture/win/dxgi_output_duplicator.h +++ b/modules/desktop_capture/win/dxgi_output_duplicator.h @@ -27,7 +27,7 @@ #include "modules/desktop_capture/win/d3d_device.h" #include "modules/desktop_capture/win/dxgi_context.h" #include "modules/desktop_capture/win/dxgi_texture.h" -#include "rtc_base/criticalsection.h" +#include "rtc_base/critical_section.h" #include "rtc_base/thread_annotations.h" namespace webrtc { diff --git a/modules/desktop_capture/win/scoped_gdi_object.h b/modules/desktop_capture/win/scoped_gdi_object.h index 0de316c694..56abe95a9e 100644 --- a/modules/desktop_capture/win/scoped_gdi_object.h +++ b/modules/desktop_capture/win/scoped_gdi_object.h @@ -13,7 +13,7 @@ #include -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace webrtc { namespace win { diff --git a/modules/desktop_capture/win/scoped_thread_desktop.h b/modules/desktop_capture/win/scoped_thread_desktop.h index 7ea6d313c5..83ce454351 100644 --- a/modules/desktop_capture/win/scoped_thread_desktop.h +++ b/modules/desktop_capture/win/scoped_thread_desktop.h @@ -15,7 +15,7 @@ #include -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace webrtc { diff --git a/modules/desktop_capture/win/screen_capture_utils.cc b/modules/desktop_capture/win/screen_capture_utils.cc index e294497e55..6ab9738860 100644 --- a/modules/desktop_capture/win/screen_capture_utils.cc +++ b/modules/desktop_capture/win/screen_capture_utils.cc @@ -17,7 +17,7 @@ #include "modules/desktop_capture/desktop_capturer.h" #include "rtc_base/checks.h" -#include "rtc_base/stringutils.h" +#include "rtc_base/string_utils.h" #include "rtc_base/win32.h" namespace webrtc { diff --git a/modules/desktop_capture/win/screen_capturer_win_directx.cc b/modules/desktop_capture/win/screen_capturer_win_directx.cc index f038c70cf5..7d4d0aa92c 100644 --- a/modules/desktop_capture/win/screen_capturer_win_directx.cc +++ b/modules/desktop_capture/win/screen_capturer_win_directx.cc @@ -20,7 +20,7 @@ #include "modules/desktop_capture/win/screen_capture_utils.h" #include "rtc_base/checks.h" #include "rtc_base/logging.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/time_utils.h" #include "rtc_base/trace_event.h" namespace webrtc { diff --git a/modules/desktop_capture/win/screen_capturer_win_gdi.cc b/modules/desktop_capture/win/screen_capturer_win_gdi.cc index 03f8340bbc..866386c782 100644 --- a/modules/desktop_capture/win/screen_capturer_win_gdi.cc +++ b/modules/desktop_capture/win/screen_capturer_win_gdi.cc @@ -22,7 +22,7 @@ #include "modules/desktop_capture/win/screen_capture_utils.h" #include "rtc_base/checks.h" #include "rtc_base/logging.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/time_utils.h" #include "rtc_base/trace_event.h" namespace webrtc { diff --git a/modules/desktop_capture/win/screen_capturer_win_gdi.h b/modules/desktop_capture/win/screen_capturer_win_gdi.h index be4794efd8..a9c0fa9b6d 100644 --- a/modules/desktop_capture/win/screen_capturer_win_gdi.h +++ b/modules/desktop_capture/win/screen_capturer_win_gdi.h @@ -20,7 +20,7 @@ #include "modules/desktop_capture/shared_desktop_frame.h" #include "modules/desktop_capture/win/display_configuration_monitor.h" #include "modules/desktop_capture/win/scoped_thread_desktop.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace webrtc { diff --git a/modules/desktop_capture/win/screen_capturer_win_magnifier.cc b/modules/desktop_capture/win/screen_capturer_win_magnifier.cc index c7b07d15b8..891717c146 100644 --- a/modules/desktop_capture/win/screen_capturer_win_magnifier.cc +++ b/modules/desktop_capture/win/screen_capturer_win_magnifier.cc @@ -22,7 +22,7 @@ #include "modules/desktop_capture/win/screen_capture_utils.h" #include "rtc_base/checks.h" #include "rtc_base/logging.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/time_utils.h" namespace webrtc { diff --git a/modules/desktop_capture/win/screen_capturer_win_magnifier.h b/modules/desktop_capture/win/screen_capturer_win_magnifier.h index 28f29bce15..b14beebfdc 100644 --- a/modules/desktop_capture/win/screen_capturer_win_magnifier.h +++ b/modules/desktop_capture/win/screen_capturer_win_magnifier.h @@ -22,7 +22,7 @@ #include "modules/desktop_capture/screen_capturer_helper.h" #include "modules/desktop_capture/shared_desktop_frame.h" #include "modules/desktop_capture/win/scoped_thread_desktop.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace webrtc { diff --git a/modules/desktop_capture/win/window_capture_utils.h b/modules/desktop_capture/win/window_capture_utils.h index 024c7eb860..529d1b65a6 100644 --- a/modules/desktop_capture/win/window_capture_utils.h +++ b/modules/desktop_capture/win/window_capture_utils.h @@ -13,7 +13,7 @@ #include #include "modules/desktop_capture/desktop_geometry.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace webrtc { diff --git a/modules/desktop_capture/window_capturer_mac.mm b/modules/desktop_capture/window_capturer_mac.mm index b0647f041b..ae763f1dd5 100644 --- a/modules/desktop_capture/window_capturer_mac.mm +++ b/modules/desktop_capture/window_capturer_mac.mm @@ -23,9 +23,9 @@ #include "modules/desktop_capture/mac/full_screen_chrome_window_detector.h" #include "modules/desktop_capture/mac/window_list_utils.h" #include "modules/desktop_capture/window_finder_mac.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" #include "rtc_base/logging.h" -#include "rtc_base/macutils.h" +#include "rtc_base/mac_utils.h" #include "rtc_base/scoped_ref_ptr.h" #include "rtc_base/trace_event.h" diff --git a/modules/desktop_capture/window_capturer_null.cc b/modules/desktop_capture/window_capturer_null.cc index b4e8feab72..66e76a50fb 100644 --- a/modules/desktop_capture/window_capturer_null.cc +++ b/modules/desktop_capture/window_capturer_null.cc @@ -12,7 +12,7 @@ #include "modules/desktop_capture/desktop_capturer.h" #include "modules/desktop_capture/desktop_frame.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace webrtc { diff --git a/modules/desktop_capture/window_capturer_win.cc b/modules/desktop_capture/window_capturer_win.cc index f345a5e2e4..6730734ad2 100644 --- a/modules/desktop_capture/window_capturer_win.cc +++ b/modules/desktop_capture/window_capturer_win.cc @@ -18,9 +18,9 @@ #include "modules/desktop_capture/win/window_capture_utils.h" #include "modules/desktop_capture/window_finder_win.h" #include "rtc_base/checks.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" #include "rtc_base/logging.h" -#include "rtc_base/stringutils.h" +#include "rtc_base/string_utils.h" #include "rtc_base/trace_event.h" #include "rtc_base/win32.h" diff --git a/modules/pacing/paced_sender.h b/modules/pacing/paced_sender.h index 8ca32c377a..1949dc00ed 100644 --- a/modules/pacing/paced_sender.h +++ b/modules/pacing/paced_sender.h @@ -24,7 +24,7 @@ #include "modules/pacing/round_robin_packet_queue.h" #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" #include "modules/utility/include/process_thread.h" -#include "rtc_base/criticalsection.h" +#include "rtc_base/critical_section.h" #include "rtc_base/experiments/field_trial_parser.h" #include "rtc_base/thread_annotations.h" diff --git a/modules/pacing/packet_router.cc b/modules/pacing/packet_router.cc index 24be7eebf2..d674e22d57 100644 --- a/modules/pacing/packet_router.cc +++ b/modules/pacing/packet_router.cc @@ -18,9 +18,9 @@ #include "modules/rtp_rtcp/include/rtp_rtcp.h" #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" #include "modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h" -#include "rtc_base/atomicops.h" +#include "rtc_base/atomic_ops.h" #include "rtc_base/checks.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/time_utils.h" namespace webrtc { namespace { diff --git a/modules/pacing/packet_router.h b/modules/pacing/packet_router.h index b7cc5ff196..3362298b20 100644 --- a/modules/pacing/packet_router.h +++ b/modules/pacing/packet_router.h @@ -20,8 +20,8 @@ #include "modules/pacing/paced_sender.h" #include "modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h" #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" -#include "rtc_base/constructormagic.h" -#include "rtc_base/criticalsection.h" +#include "rtc_base/constructor_magic.h" +#include "rtc_base/critical_section.h" #include "rtc_base/thread_annotations.h" namespace webrtc { diff --git a/modules/pacing/packet_router_unittest.cc b/modules/pacing/packet_router_unittest.cc index f4a71c8a90..b3d91e6bcb 100644 --- a/modules/pacing/packet_router_unittest.cc +++ b/modules/pacing/packet_router_unittest.cc @@ -16,7 +16,7 @@ #include "modules/rtp_rtcp/mocks/mock_rtp_rtcp.h" #include "modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h" #include "rtc_base/checks.h" -#include "rtc_base/fakeclock.h" +#include "rtc_base/fake_clock.h" #include "test/gmock.h" #include "test/gtest.h" diff --git a/modules/remote_bitrate_estimator/bwe_simulations.cc b/modules/remote_bitrate_estimator/bwe_simulations.cc index 6579fe7d12..a1fde94f97 100644 --- a/modules/remote_bitrate_estimator/bwe_simulations.cc +++ b/modules/remote_bitrate_estimator/bwe_simulations.cc @@ -19,11 +19,11 @@ #include "modules/remote_bitrate_estimator/test/bwe_test_framework.h" #include "modules/remote_bitrate_estimator/test/packet_receiver.h" #include "modules/remote_bitrate_estimator/test/packet_sender.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" #include "rtc_base/random.h" #include "system_wrappers/include/clock.h" #include "test/gtest.h" -#include "test/testsupport/fileutils.h" +#include "test/testsupport/file_utils.h" namespace webrtc { namespace testing { diff --git a/modules/remote_bitrate_estimator/inter_arrival.h b/modules/remote_bitrate_estimator/inter_arrival.h index f2facd47c2..1d84970deb 100644 --- a/modules/remote_bitrate_estimator/inter_arrival.h +++ b/modules/remote_bitrate_estimator/inter_arrival.h @@ -14,7 +14,7 @@ #include #include -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace webrtc { diff --git a/modules/remote_bitrate_estimator/overuse_detector.h b/modules/remote_bitrate_estimator/overuse_detector.h index 61d1c3f707..a72881b714 100644 --- a/modules/remote_bitrate_estimator/overuse_detector.h +++ b/modules/remote_bitrate_estimator/overuse_detector.h @@ -13,7 +13,7 @@ #include #include "modules/remote_bitrate_estimator/include/bwe_defines.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace webrtc { diff --git a/modules/remote_bitrate_estimator/overuse_estimator.h b/modules/remote_bitrate_estimator/overuse_estimator.h index 3d7bd16be4..c06345bd69 100644 --- a/modules/remote_bitrate_estimator/overuse_estimator.h +++ b/modules/remote_bitrate_estimator/overuse_estimator.h @@ -15,7 +15,7 @@ #include "common_types.h" // NOLINT(build/include) #include "modules/remote_bitrate_estimator/include/bwe_defines.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace webrtc { diff --git a/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time.cc b/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time.cc index 1ad35c7bf0..3f943cc0f8 100644 --- a/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time.cc +++ b/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time.cc @@ -16,7 +16,7 @@ #include "modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h" #include "rtc_base/checks.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" #include "rtc_base/logging.h" #include "rtc_base/thread_annotations.h" #include "system_wrappers/include/metrics.h" diff --git a/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time.h b/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time.h index 5f7f7e979d..aee10caebb 100644 --- a/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time.h +++ b/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time.h @@ -25,8 +25,8 @@ #include "modules/remote_bitrate_estimator/overuse_detector.h" #include "modules/remote_bitrate_estimator/overuse_estimator.h" #include "rtc_base/checks.h" -#include "rtc_base/constructormagic.h" -#include "rtc_base/criticalsection.h" +#include "rtc_base/constructor_magic.h" +#include "rtc_base/critical_section.h" #include "rtc_base/race_checker.h" #include "rtc_base/rate_statistics.h" #include "rtc_base/thread_annotations.h" diff --git a/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time_unittest.cc b/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time_unittest.cc index 117beba27e..10dd99cfd9 100644 --- a/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time_unittest.cc +++ b/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time_unittest.cc @@ -11,7 +11,7 @@ #include "modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time.h" #include "modules/remote_bitrate_estimator/remote_bitrate_estimator_unittest_helper.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" #include "test/gtest.h" namespace webrtc { diff --git a/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream.h b/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream.h index 638f0d6802..ab542186ca 100644 --- a/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream.h +++ b/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream.h @@ -19,8 +19,8 @@ #include "modules/remote_bitrate_estimator/aimd_rate_control.h" #include "modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h" -#include "rtc_base/constructormagic.h" -#include "rtc_base/criticalsection.h" +#include "rtc_base/constructor_magic.h" +#include "rtc_base/critical_section.h" #include "rtc_base/rate_statistics.h" #include "rtc_base/thread_annotations.h" diff --git a/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream_unittest.cc b/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream_unittest.cc index c1116a4256..d0a7b22505 100644 --- a/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream_unittest.cc +++ b/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream_unittest.cc @@ -11,7 +11,7 @@ #include "modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream.h" #include "modules/remote_bitrate_estimator/remote_bitrate_estimator_unittest_helper.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" #include "test/gtest.h" namespace webrtc { diff --git a/modules/remote_bitrate_estimator/remote_bitrate_estimator_unittest_helper.h b/modules/remote_bitrate_estimator/remote_bitrate_estimator_unittest_helper.h index c3a323b385..8485adafb4 100644 --- a/modules/remote_bitrate_estimator/remote_bitrate_estimator_unittest_helper.h +++ b/modules/remote_bitrate_estimator/remote_bitrate_estimator_unittest_helper.h @@ -18,7 +18,7 @@ #include #include "modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" #include "system_wrappers/include/clock.h" #include "test/gtest.h" diff --git a/modules/remote_bitrate_estimator/remote_bitrate_estimators_test.cc b/modules/remote_bitrate_estimator/remote_bitrate_estimators_test.cc index 74feed238b..1d03038b0d 100644 --- a/modules/remote_bitrate_estimator/remote_bitrate_estimators_test.cc +++ b/modules/remote_bitrate_estimator/remote_bitrate_estimators_test.cc @@ -20,12 +20,12 @@ #include "modules/remote_bitrate_estimator/test/bwe_test_framework.h" #include "modules/remote_bitrate_estimator/test/packet_receiver.h" #include "modules/remote_bitrate_estimator/test/packet_sender.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" #include "rtc_base/random.h" #include "system_wrappers/include/clock.h" #include "test/field_trial.h" #include "test/gtest.h" -#include "test/testsupport/fileutils.h" +#include "test/testsupport/file_utils.h" namespace webrtc { namespace testing { diff --git a/modules/remote_bitrate_estimator/remote_estimator_proxy.h b/modules/remote_bitrate_estimator/remote_estimator_proxy.h index 63994c4957..ed4e29b7b6 100644 --- a/modules/remote_bitrate_estimator/remote_estimator_proxy.h +++ b/modules/remote_bitrate_estimator/remote_estimator_proxy.h @@ -16,7 +16,7 @@ #include "modules/include/module_common_types.h" #include "modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h" -#include "rtc_base/criticalsection.h" +#include "rtc_base/critical_section.h" namespace webrtc { diff --git a/modules/remote_bitrate_estimator/test/bwe.cc b/modules/remote_bitrate_estimator/test/bwe.cc index 1d9b7278f5..b672ddde06 100644 --- a/modules/remote_bitrate_estimator/test/bwe.cc +++ b/modules/remote_bitrate_estimator/test/bwe.cc @@ -18,7 +18,7 @@ #include "modules/remote_bitrate_estimator/test/estimators/remb.h" #include "modules/remote_bitrate_estimator/test/estimators/send_side.h" #include "modules/remote_bitrate_estimator/test/estimators/tcp.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" #include "rtc_base/numerics/safe_conversions.h" #include "rtc_base/system/fallthrough.h" diff --git a/modules/remote_bitrate_estimator/test/bwe.h b/modules/remote_bitrate_estimator/test/bwe.h index 62f8dc1f67..cf2517c822 100644 --- a/modules/remote_bitrate_estimator/test/bwe.h +++ b/modules/remote_bitrate_estimator/test/bwe.h @@ -22,7 +22,7 @@ #include "modules/include/module.h" #include "modules/remote_bitrate_estimator/test/bwe_test_framework.h" #include "modules/remote_bitrate_estimator/test/packet.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" #include "rtc_base/gtest_prod_util.h" #include "rtc_base/numerics/sequence_number_util.h" #include "system_wrappers/include/clock.h" diff --git a/modules/remote_bitrate_estimator/test/bwe_test.h b/modules/remote_bitrate_estimator/test/bwe_test.h index 34030e99a6..275a69637c 100644 --- a/modules/remote_bitrate_estimator/test/bwe_test.h +++ b/modules/remote_bitrate_estimator/test/bwe_test.h @@ -18,7 +18,7 @@ #include "modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h" #include "modules/remote_bitrate_estimator/test/bwe.h" #include "modules/remote_bitrate_estimator/test/bwe_test_framework.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" #include "test/gtest.h" namespace webrtc { diff --git a/modules/remote_bitrate_estimator/test/bwe_test_baselinefile.cc b/modules/remote_bitrate_estimator/test/bwe_test_baselinefile.cc index 866154026a..8e4b7b4ec8 100644 --- a/modules/remote_bitrate_estimator/test/bwe_test_baselinefile.cc +++ b/modules/remote_bitrate_estimator/test/bwe_test_baselinefile.cc @@ -17,8 +17,8 @@ #include #include "modules/remote_bitrate_estimator/test/bwe_test_fileutils.h" -#include "rtc_base/constructormagic.h" -#include "test/testsupport/fileutils.h" +#include "rtc_base/constructor_magic.h" +#include "test/testsupport/file_utils.h" namespace webrtc { namespace testing { diff --git a/modules/remote_bitrate_estimator/test/bwe_test_fileutils.cc b/modules/remote_bitrate_estimator/test/bwe_test_fileutils.cc index afea787b1a..a69f67225a 100644 --- a/modules/remote_bitrate_estimator/test/bwe_test_fileutils.cc +++ b/modules/remote_bitrate_estimator/test/bwe_test_fileutils.cc @@ -18,7 +18,7 @@ #include #include "modules/remote_bitrate_estimator/test/bwe_test_logging.h" -#include "test/testsupport/fileutils.h" +#include "test/testsupport/file_utils.h" namespace webrtc { namespace testing { diff --git a/modules/remote_bitrate_estimator/test/bwe_test_fileutils.h b/modules/remote_bitrate_estimator/test/bwe_test_fileutils.h index fcb1538e49..c38bc10104 100644 --- a/modules/remote_bitrate_estimator/test/bwe_test_fileutils.h +++ b/modules/remote_bitrate_estimator/test/bwe_test_fileutils.h @@ -15,7 +15,7 @@ #include #include -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace webrtc { namespace testing { diff --git a/modules/remote_bitrate_estimator/test/bwe_test_framework.cc b/modules/remote_bitrate_estimator/test/bwe_test_framework.cc index 1fd7832c0a..81d77e1726 100644 --- a/modules/remote_bitrate_estimator/test/bwe_test_framework.cc +++ b/modules/remote_bitrate_estimator/test/bwe_test_framework.cc @@ -18,7 +18,7 @@ #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" #include "modules/rtp_rtcp/source/rtp_packet_received.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" #include "rtc_base/numerics/safe_minmax.h" #include "rtc_base/system/unused.h" diff --git a/modules/remote_bitrate_estimator/test/bwe_test_framework.h b/modules/remote_bitrate_estimator/test/bwe_test_framework.h index c84a90187c..cd1af97698 100644 --- a/modules/remote_bitrate_estimator/test/bwe_test_framework.h +++ b/modules/remote_bitrate_estimator/test/bwe_test_framework.h @@ -30,7 +30,7 @@ #include "modules/remote_bitrate_estimator/test/bwe_test_logging.h" #include "modules/remote_bitrate_estimator/test/packet.h" #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" #include "rtc_base/random.h" #include "rtc_base/strings/string_builder.h" #include "system_wrappers/include/clock.h" diff --git a/modules/remote_bitrate_estimator/test/bwe_test_framework_unittest.cc b/modules/remote_bitrate_estimator/test/bwe_test_framework_unittest.cc index 6daac19f7b..f9da01eaf1 100644 --- a/modules/remote_bitrate_estimator/test/bwe_test_framework_unittest.cc +++ b/modules/remote_bitrate_estimator/test/bwe_test_framework_unittest.cc @@ -15,9 +15,9 @@ #include "modules/remote_bitrate_estimator/test/packet.h" #include "modules/remote_bitrate_estimator/test/packet_sender.h" #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" #include "test/gtest.h" -#include "test/testsupport/fileutils.h" +#include "test/testsupport/file_utils.h" namespace webrtc { namespace testing { diff --git a/modules/remote_bitrate_estimator/test/bwe_test_logging.h b/modules/remote_bitrate_estimator/test/bwe_test_logging.h index 6e0f66a7e4..5ad58df6ef 100644 --- a/modules/remote_bitrate_estimator/test/bwe_test_logging.h +++ b/modules/remote_bitrate_estimator/test/bwe_test_logging.h @@ -129,8 +129,8 @@ #include #include "common_types.h" // NOLINT(build/include) -#include "rtc_base/constructormagic.h" -#include "rtc_base/criticalsection.h" +#include "rtc_base/constructor_magic.h" +#include "rtc_base/critical_section.h" #define BWE_TEST_LOGGING_GLOBAL_CONTEXT(name) \ do { \ diff --git a/modules/remote_bitrate_estimator/test/estimators/nada.h b/modules/remote_bitrate_estimator/test/estimators/nada.h index 7faedc6bef..3ba923f564 100644 --- a/modules/remote_bitrate_estimator/test/estimators/nada.h +++ b/modules/remote_bitrate_estimator/test/estimators/nada.h @@ -23,7 +23,7 @@ #include "modules/include/module_common_types.h" #include "modules/remote_bitrate_estimator/test/bwe.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace webrtc { diff --git a/modules/remote_bitrate_estimator/test/estimators/remb.h b/modules/remote_bitrate_estimator/test/estimators/remb.h index 34c57b8b9c..df16fec848 100644 --- a/modules/remote_bitrate_estimator/test/estimators/remb.h +++ b/modules/remote_bitrate_estimator/test/estimators/remb.h @@ -17,7 +17,7 @@ #include "logging/rtc_event_log/mock/mock_rtc_event_log.h" #include "modules/remote_bitrate_estimator/test/bwe.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace webrtc { diff --git a/modules/remote_bitrate_estimator/test/estimators/send_side.h b/modules/remote_bitrate_estimator/test/estimators/send_side.h index f545b964d2..2313b7b74e 100644 --- a/modules/remote_bitrate_estimator/test/estimators/send_side.h +++ b/modules/remote_bitrate_estimator/test/estimators/send_side.h @@ -25,7 +25,7 @@ #include "modules/remote_bitrate_estimator/test/bwe.h" #include "modules/remote_bitrate_estimator/test/packet.h" #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" #include "system_wrappers/include/clock.h" #include "test/gmock.h" diff --git a/modules/remote_bitrate_estimator/test/packet_receiver.h b/modules/remote_bitrate_estimator/test/packet_receiver.h index 940d4b0af2..848119e6d5 100644 --- a/modules/remote_bitrate_estimator/test/packet_receiver.h +++ b/modules/remote_bitrate_estimator/test/packet_receiver.h @@ -20,7 +20,7 @@ #include "modules/remote_bitrate_estimator/test/bwe_test_framework.h" #include "modules/remote_bitrate_estimator/test/metric_recorder.h" #include "modules/remote_bitrate_estimator/test/packet.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace webrtc { namespace testing { diff --git a/modules/remote_bitrate_estimator/test/packet_sender.h b/modules/remote_bitrate_estimator/test/packet_sender.h index 42e98b6a8a..1d3b355feb 100644 --- a/modules/remote_bitrate_estimator/test/packet_sender.h +++ b/modules/remote_bitrate_estimator/test/packet_sender.h @@ -20,7 +20,7 @@ #include "modules/include/module.h" #include "modules/remote_bitrate_estimator/test/bwe.h" #include "modules/remote_bitrate_estimator/test/bwe_test_framework.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace webrtc { namespace testing { diff --git a/modules/rtp_rtcp/include/flexfec_sender.h b/modules/rtp_rtcp/include/flexfec_sender.h index acee11764c..aa0e8e04d9 100644 --- a/modules/rtp_rtcp/include/flexfec_sender.h +++ b/modules/rtp_rtcp/include/flexfec_sender.h @@ -16,7 +16,7 @@ #include #include "api/array_view.h" -#include "api/rtpparameters.h" +#include "api/rtp_parameters.h" #include "modules/include/module_common_types.h" #include "modules/rtp_rtcp/include/rtp_header_extension_map.h" #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" diff --git a/modules/rtp_rtcp/include/remote_ntp_time_estimator.h b/modules/rtp_rtcp/include/remote_ntp_time_estimator.h index e6d269c4dd..dd0e0de362 100644 --- a/modules/rtp_rtcp/include/remote_ntp_time_estimator.h +++ b/modules/rtp_rtcp/include/remote_ntp_time_estimator.h @@ -13,7 +13,7 @@ #include -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" #include "rtc_base/numerics/moving_median_filter.h" #include "system_wrappers/include/rtp_to_ntp_estimator.h" diff --git a/modules/rtp_rtcp/include/rtp_header_extension_map.h b/modules/rtp_rtcp/include/rtp_header_extension_map.h index 391c5beaa5..07b31a35bd 100644 --- a/modules/rtp_rtcp/include/rtp_header_extension_map.h +++ b/modules/rtp_rtcp/include/rtp_header_extension_map.h @@ -15,7 +15,7 @@ #include #include "api/array_view.h" -#include "api/rtpparameters.h" +#include "api/rtp_parameters.h" #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" #include "rtc_base/checks.h" diff --git a/modules/rtp_rtcp/include/rtp_header_parser.h b/modules/rtp_rtcp/include/rtp_header_parser.h index 85eab90a73..1b0156ba97 100644 --- a/modules/rtp_rtcp/include/rtp_header_parser.h +++ b/modules/rtp_rtcp/include/rtp_header_parser.h @@ -10,7 +10,7 @@ #ifndef MODULES_RTP_RTCP_INCLUDE_RTP_HEADER_PARSER_H_ #define MODULES_RTP_RTCP_INCLUDE_RTP_HEADER_PARSER_H_ -#include "api/rtpparameters.h" +#include "api/rtp_parameters.h" #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" namespace webrtc { diff --git a/modules/rtp_rtcp/include/rtp_rtcp.h b/modules/rtp_rtcp/include/rtp_rtcp.h index f6b0c0f68f..29aa2f0c5c 100644 --- a/modules/rtp_rtcp/include/rtp_rtcp.h +++ b/modules/rtp_rtcp/include/rtp_rtcp.h @@ -23,7 +23,7 @@ #include "modules/rtp_rtcp/include/flexfec_sender.h" #include "modules/rtp_rtcp/include/receive_statistics.h" #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" #include "rtc_base/deprecation.h" namespace webrtc { diff --git a/modules/rtp_rtcp/source/contributing_sources.h b/modules/rtp_rtcp/source/contributing_sources.h index 5e34539ce4..81bf725715 100644 --- a/modules/rtp_rtcp/source/contributing_sources.h +++ b/modules/rtp_rtcp/source/contributing_sources.h @@ -18,8 +18,8 @@ #include "absl/types/optional.h" #include "api/array_view.h" -#include "api/rtpreceiverinterface.h" // For RtpSource -#include "rtc_base/timeutils.h" // For kNumMillisecsPerSec +#include "api/rtp_receiver_interface.h" // For RtpSource +#include "rtc_base/time_utils.h" // For kNumMillisecsPerSec namespace webrtc { diff --git a/modules/rtp_rtcp/source/contributing_sources_unittest.cc b/modules/rtp_rtcp/source/contributing_sources_unittest.cc index 5f1d8d3d11..38d25cebc9 100644 --- a/modules/rtp_rtcp/source/contributing_sources_unittest.cc +++ b/modules/rtp_rtcp/source/contributing_sources_unittest.cc @@ -10,7 +10,7 @@ #include "modules/rtp_rtcp/source/contributing_sources.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/time_utils.h" #include "test/gmock.h" #include "test/gtest.h" diff --git a/modules/rtp_rtcp/source/dtmf_queue.h b/modules/rtp_rtcp/source/dtmf_queue.h index e5955a1297..28116bcfb4 100644 --- a/modules/rtp_rtcp/source/dtmf_queue.h +++ b/modules/rtp_rtcp/source/dtmf_queue.h @@ -14,7 +14,7 @@ #include #include -#include "rtc_base/criticalsection.h" +#include "rtc_base/critical_section.h" namespace webrtc { class DtmfQueue { diff --git a/modules/rtp_rtcp/source/flexfec_sender_unittest.cc b/modules/rtp_rtcp/source/flexfec_sender_unittest.cc index ddc2805209..c561dbb4c9 100644 --- a/modules/rtp_rtcp/source/flexfec_sender_unittest.cc +++ b/modules/rtp_rtcp/source/flexfec_sender_unittest.cc @@ -10,7 +10,7 @@ #include -#include "api/rtpparameters.h" +#include "api/rtp_parameters.h" #include "modules/rtp_rtcp/include/flexfec_sender.h" #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" #include "modules/rtp_rtcp/source/fec_test_helper.h" diff --git a/modules/rtp_rtcp/source/playout_delay_oracle.h b/modules/rtp_rtcp/source/playout_delay_oracle.h index 0e3bd39a7e..32f7d403ff 100644 --- a/modules/rtp_rtcp/source/playout_delay_oracle.h +++ b/modules/rtp_rtcp/source/playout_delay_oracle.h @@ -16,8 +16,8 @@ #include "common_types.h" // NOLINT(build/include) #include "modules/include/module_common_types_public.h" #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" -#include "rtc_base/constructormagic.h" -#include "rtc_base/criticalsection.h" +#include "rtc_base/constructor_magic.h" +#include "rtc_base/critical_section.h" #include "rtc_base/thread_annotations.h" namespace webrtc { diff --git a/modules/rtp_rtcp/source/receive_statistics_impl.h b/modules/rtp_rtcp/source/receive_statistics_impl.h index 0221d857d2..c153281d2b 100644 --- a/modules/rtp_rtcp/source/receive_statistics_impl.h +++ b/modules/rtp_rtcp/source/receive_statistics_impl.h @@ -19,7 +19,7 @@ #include "absl/types/optional.h" #include "modules/include/module_common_types_public.h" -#include "rtc_base/criticalsection.h" +#include "rtc_base/critical_section.h" #include "rtc_base/rate_statistics.h" #include "rtc_base/thread_annotations.h" diff --git a/modules/rtp_rtcp/source/rtcp_packet/compound_packet.h b/modules/rtp_rtcp/source/rtcp_packet/compound_packet.h index 89b78148f7..f521c7f921 100644 --- a/modules/rtp_rtcp/source/rtcp_packet/compound_packet.h +++ b/modules/rtp_rtcp/source/rtcp_packet/compound_packet.h @@ -15,7 +15,7 @@ #include #include "modules/rtp_rtcp/source/rtcp_packet.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace webrtc { namespace rtcp { diff --git a/modules/rtp_rtcp/source/rtcp_receiver.h b/modules/rtp_rtcp/source/rtcp_receiver.h index be4c70e3ce..fe6ec4cc4f 100644 --- a/modules/rtp_rtcp/source/rtcp_receiver.h +++ b/modules/rtp_rtcp/source/rtcp_receiver.h @@ -21,7 +21,7 @@ #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" #include "modules/rtp_rtcp/source/rtcp_nack_stats.h" #include "modules/rtp_rtcp/source/rtcp_packet/dlrr.h" -#include "rtc_base/criticalsection.h" +#include "rtc_base/critical_section.h" #include "rtc_base/thread_annotations.h" #include "system_wrappers/include/ntp_time.h" diff --git a/modules/rtp_rtcp/source/rtcp_sender.cc b/modules/rtp_rtcp/source/rtcp_sender.cc index 2581487927..3aedeec009 100644 --- a/modules/rtp_rtcp/source/rtcp_sender.cc +++ b/modules/rtp_rtcp/source/rtcp_sender.cc @@ -37,7 +37,7 @@ #include "modules/rtp_rtcp/source/time_util.h" #include "modules/rtp_rtcp/source/tmmbr_help.h" #include "rtc_base/checks.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" #include "rtc_base/logging.h" #include "rtc_base/numerics/safe_conversions.h" #include "rtc_base/trace_event.h" diff --git a/modules/rtp_rtcp/source/rtcp_sender.h b/modules/rtp_rtcp/source/rtcp_sender.h index 0845397da3..94c365bf8c 100644 --- a/modules/rtp_rtcp/source/rtcp_sender.h +++ b/modules/rtp_rtcp/source/rtcp_sender.h @@ -29,8 +29,8 @@ #include "modules/rtp_rtcp/source/rtcp_packet/dlrr.h" #include "modules/rtp_rtcp/source/rtcp_packet/report_block.h" #include "modules/rtp_rtcp/source/rtcp_packet/tmmb_item.h" -#include "rtc_base/constructormagic.h" -#include "rtc_base/criticalsection.h" +#include "rtc_base/constructor_magic.h" +#include "rtc_base/critical_section.h" #include "rtc_base/random.h" #include "rtc_base/thread_annotations.h" diff --git a/modules/rtp_rtcp/source/rtcp_transceiver.cc b/modules/rtp_rtcp/source/rtcp_transceiver.cc index 57d2142ffa..6c0e0b74f5 100644 --- a/modules/rtp_rtcp/source/rtcp_transceiver.cc +++ b/modules/rtp_rtcp/source/rtcp_transceiver.cc @@ -16,7 +16,7 @@ #include "modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h" #include "rtc_base/checks.h" #include "rtc_base/event.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/time_utils.h" namespace webrtc { namespace { diff --git a/modules/rtp_rtcp/source/rtcp_transceiver.h b/modules/rtp_rtcp/source/rtcp_transceiver.h index 9c9675110f..16fd5a7fdb 100644 --- a/modules/rtp_rtcp/source/rtcp_transceiver.h +++ b/modules/rtp_rtcp/source/rtcp_transceiver.h @@ -18,7 +18,7 @@ #include "modules/rtp_rtcp/source/rtcp_transceiver_config.h" #include "modules/rtp_rtcp/source/rtcp_transceiver_impl.h" -#include "rtc_base/copyonwritebuffer.h" +#include "rtc_base/copy_on_write_buffer.h" #include "rtc_base/task_queue.h" namespace webrtc { diff --git a/modules/rtp_rtcp/source/rtcp_transceiver_impl.cc b/modules/rtp_rtcp/source/rtcp_transceiver_impl.cc index 97c2ac018b..5acad08db9 100644 --- a/modules/rtp_rtcp/source/rtcp_transceiver_impl.cc +++ b/modules/rtp_rtcp/source/rtcp_transceiver_impl.cc @@ -33,7 +33,7 @@ #include "rtc_base/checks.h" #include "rtc_base/logging.h" #include "rtc_base/task_queue.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/time_utils.h" namespace webrtc { namespace { diff --git a/modules/rtp_rtcp/source/rtcp_transceiver_impl_unittest.cc b/modules/rtp_rtcp/source/rtcp_transceiver_impl_unittest.cc index e86d67f579..50ca111d31 100644 --- a/modules/rtp_rtcp/source/rtcp_transceiver_impl_unittest.cc +++ b/modules/rtp_rtcp/source/rtcp_transceiver_impl_unittest.cc @@ -21,7 +21,7 @@ #include "modules/rtp_rtcp/source/rtcp_packet/compound_packet.h" #include "modules/rtp_rtcp/source/time_util.h" #include "rtc_base/event.h" -#include "rtc_base/fakeclock.h" +#include "rtc_base/fake_clock.h" #include "rtc_base/task_queue.h" #include "test/gmock.h" #include "test/gtest.h" diff --git a/modules/rtp_rtcp/source/rtp_format_h264.h b/modules/rtp_rtcp/source/rtp_format_h264.h index fbd4fd9509..108156fefa 100644 --- a/modules/rtp_rtcp/source/rtp_format_h264.h +++ b/modules/rtp_rtcp/source/rtp_format_h264.h @@ -23,7 +23,7 @@ #include "modules/rtp_rtcp/source/rtp_packet_to_send.h" #include "modules/video_coding/codecs/h264/include/h264_globals.h" #include "rtc_base/buffer.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace webrtc { diff --git a/modules/rtp_rtcp/source/rtp_format_video_generic.h b/modules/rtp_rtcp/source/rtp_format_video_generic.h index 3458d49423..982e35a3c9 100644 --- a/modules/rtp_rtcp/source/rtp_format_video_generic.h +++ b/modules/rtp_rtcp/source/rtp_format_video_generic.h @@ -16,7 +16,7 @@ #include "api/array_view.h" #include "common_types.h" // NOLINT(build/include) #include "modules/rtp_rtcp/source/rtp_format.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace webrtc { diff --git a/modules/rtp_rtcp/source/rtp_format_vp8.h b/modules/rtp_rtcp/source/rtp_format_vp8.h index 444298fbbf..0e0fa523bf 100644 --- a/modules/rtp_rtcp/source/rtp_format_vp8.h +++ b/modules/rtp_rtcp/source/rtp_format_vp8.h @@ -34,7 +34,7 @@ #include "modules/rtp_rtcp/source/rtp_format.h" #include "modules/rtp_rtcp/source/rtp_packet_to_send.h" #include "modules/video_coding/codecs/vp8/include/vp8_globals.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace webrtc { diff --git a/modules/rtp_rtcp/source/rtp_format_vp8_test_helper.h b/modules/rtp_rtcp/source/rtp_format_vp8_test_helper.h index 07f5f6490a..03d4e58576 100644 --- a/modules/rtp_rtcp/source/rtp_format_vp8_test_helper.h +++ b/modules/rtp_rtcp/source/rtp_format_vp8_test_helper.h @@ -22,7 +22,7 @@ #include "modules/rtp_rtcp/source/rtp_format_vp8.h" #include "modules/video_coding/codecs/vp8/include/vp8_globals.h" #include "rtc_base/buffer.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace webrtc { diff --git a/modules/rtp_rtcp/source/rtp_format_vp9.cc b/modules/rtp_rtcp/source/rtp_format_vp9.cc index 9cd75143b8..bbb8e29792 100644 --- a/modules/rtp_rtcp/source/rtp_format_vp9.cc +++ b/modules/rtp_rtcp/source/rtp_format_vp9.cc @@ -15,7 +15,7 @@ #include "common_types.h" // NOLINT(build/include) #include "modules/rtp_rtcp/source/rtp_packet_to_send.h" #include "modules/video_coding/codecs/interface/common_constants.h" -#include "rtc_base/bitbuffer.h" +#include "rtc_base/bit_buffer.h" #include "rtc_base/checks.h" #include "rtc_base/logging.h" diff --git a/modules/rtp_rtcp/source/rtp_format_vp9.h b/modules/rtp_rtcp/source/rtp_format_vp9.h index c3b8f17a4b..2918b0634f 100644 --- a/modules/rtp_rtcp/source/rtp_format_vp9.h +++ b/modules/rtp_rtcp/source/rtp_format_vp9.h @@ -29,7 +29,7 @@ #include "modules/rtp_rtcp/source/rtp_format.h" #include "modules/rtp_rtcp/source/rtp_packet_to_send.h" #include "modules/video_coding/codecs/vp9/include/vp9_globals.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace webrtc { diff --git a/modules/rtp_rtcp/source/rtp_header_extension_size.cc b/modules/rtp_rtcp/source/rtp_header_extension_size.cc index f20ca00d71..7719922f2d 100644 --- a/modules/rtp_rtcp/source/rtp_header_extension_size.cc +++ b/modules/rtp_rtcp/source/rtp_header_extension_size.cc @@ -10,7 +10,7 @@ #include "modules/rtp_rtcp/source/rtp_header_extension_size.h" -#include "api/rtpparameters.h" +#include "api/rtp_parameters.h" namespace webrtc { diff --git a/modules/rtp_rtcp/source/rtp_header_parser.cc b/modules/rtp_rtcp/source/rtp_header_parser.cc index 6481a403a0..4e4c7231f7 100644 --- a/modules/rtp_rtcp/source/rtp_header_parser.cc +++ b/modules/rtp_rtcp/source/rtp_header_parser.cc @@ -13,7 +13,7 @@ #include "modules/rtp_rtcp/include/rtp_header_extension_map.h" #include "modules/rtp_rtcp/source/rtp_utility.h" -#include "rtc_base/criticalsection.h" +#include "rtc_base/critical_section.h" #include "rtc_base/thread_annotations.h" namespace webrtc { diff --git a/modules/rtp_rtcp/source/rtp_packet.cc b/modules/rtp_rtcp/source/rtp_packet.cc index 3fb80e4efd..6f2273590c 100644 --- a/modules/rtp_rtcp/source/rtp_packet.cc +++ b/modules/rtp_rtcp/source/rtp_packet.cc @@ -14,7 +14,7 @@ #include #include -#include "api/rtpparameters.h" +#include "api/rtp_parameters.h" #include "modules/rtp_rtcp/source/byte_io.h" #include "rtc_base/checks.h" #include "rtc_base/logging.h" diff --git a/modules/rtp_rtcp/source/rtp_packet.h b/modules/rtp_rtcp/source/rtp_packet.h index ddf261a612..c067580e09 100644 --- a/modules/rtp_rtcp/source/rtp_packet.h +++ b/modules/rtp_rtcp/source/rtp_packet.h @@ -16,7 +16,7 @@ #include "api/array_view.h" #include "modules/rtp_rtcp/include/rtp_header_extension_map.h" #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" -#include "rtc_base/copyonwritebuffer.h" +#include "rtc_base/copy_on_write_buffer.h" #include "rtc_base/deprecation.h" namespace webrtc { diff --git a/modules/rtp_rtcp/source/rtp_packet_history.h b/modules/rtp_rtcp/source/rtp_packet_history.h index 095424e3d7..c5b6e4d262 100644 --- a/modules/rtp_rtcp/source/rtp_packet_history.h +++ b/modules/rtp_rtcp/source/rtp_packet_history.h @@ -16,8 +16,8 @@ #include #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" -#include "rtc_base/constructormagic.h" -#include "rtc_base/criticalsection.h" +#include "rtc_base/constructor_magic.h" +#include "rtc_base/critical_section.h" #include "rtc_base/thread_annotations.h" namespace webrtc { diff --git a/modules/rtp_rtcp/source/rtp_rtcp_impl.h b/modules/rtp_rtcp/source/rtp_rtcp_impl.h index 78fa70ac67..7d5466a5de 100644 --- a/modules/rtp_rtcp/source/rtp_rtcp_impl.h +++ b/modules/rtp_rtcp/source/rtp_rtcp_impl.h @@ -32,7 +32,7 @@ #include "modules/rtp_rtcp/source/rtcp_receiver.h" #include "modules/rtp_rtcp/source/rtcp_sender.h" #include "modules/rtp_rtcp/source/rtp_sender.h" -#include "rtc_base/criticalsection.h" +#include "rtc_base/critical_section.h" #include "rtc_base/gtest_prod_util.h" namespace webrtc { diff --git a/modules/rtp_rtcp/source/rtp_sender.cc b/modules/rtp_rtcp/source/rtp_sender.cc index 87f1c00a2b..edd2edb0d2 100644 --- a/modules/rtp_rtcp/source/rtp_sender.cc +++ b/modules/rtp_rtcp/source/rtp_sender.cc @@ -35,7 +35,7 @@ #include "rtc_base/logging.h" #include "rtc_base/numerics/safe_minmax.h" #include "rtc_base/rate_limiter.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/time_utils.h" #include "rtc_base/trace_event.h" #include "system_wrappers/include/field_trial.h" diff --git a/modules/rtp_rtcp/source/rtp_sender.h b/modules/rtp_rtcp/source/rtp_sender.h index d3c6599da9..e5ddfcca5a 100644 --- a/modules/rtp_rtcp/source/rtp_sender.h +++ b/modules/rtp_rtcp/source/rtp_sender.h @@ -29,8 +29,8 @@ #include "modules/rtp_rtcp/source/rtp_packet_history.h" #include "modules/rtp_rtcp/source/rtp_rtcp_config.h" #include "modules/rtp_rtcp/source/rtp_utility.h" -#include "rtc_base/constructormagic.h" -#include "rtc_base/criticalsection.h" +#include "rtc_base/constructor_magic.h" +#include "rtc_base/critical_section.h" #include "rtc_base/deprecation.h" #include "rtc_base/random.h" #include "rtc_base/rate_statistics.h" diff --git a/modules/rtp_rtcp/source/rtp_sender_audio.h b/modules/rtp_rtcp/source/rtp_sender_audio.h index 1dbe5b5817..6580f7aca0 100644 --- a/modules/rtp_rtcp/source/rtp_sender_audio.h +++ b/modules/rtp_rtcp/source/rtp_sender_audio.h @@ -19,9 +19,9 @@ #include "modules/rtp_rtcp/source/dtmf_queue.h" #include "modules/rtp_rtcp/source/rtp_sender.h" #include "modules/rtp_rtcp/source/rtp_utility.h" -#include "rtc_base/constructormagic.h" -#include "rtc_base/criticalsection.h" -#include "rtc_base/onetimeevent.h" +#include "rtc_base/constructor_magic.h" +#include "rtc_base/critical_section.h" +#include "rtc_base/one_time_event.h" #include "rtc_base/thread_annotations.h" #include "system_wrappers/include/clock.h" diff --git a/modules/rtp_rtcp/source/rtp_sender_video.cc b/modules/rtp_rtcp/source/rtp_sender_video.cc index 2f592b3d27..8f276c4a3b 100644 --- a/modules/rtp_rtcp/source/rtp_sender_video.cc +++ b/modules/rtp_rtcp/source/rtp_sender_video.cc @@ -20,7 +20,7 @@ #include "absl/memory/memory.h" #include "absl/strings/match.h" -#include "api/crypto/frameencryptorinterface.h" +#include "api/crypto/frame_encryptor_interface.h" #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" #include "modules/rtp_rtcp/source/byte_io.h" #include "modules/rtp_rtcp/source/rtp_format_video_generic.h" diff --git a/modules/rtp_rtcp/source/rtp_sender_video.h b/modules/rtp_rtcp/source/rtp_sender_video.h index 5821b12109..91dc662b79 100644 --- a/modules/rtp_rtcp/source/rtp_sender_video.h +++ b/modules/rtp_rtcp/source/rtp_sender_video.h @@ -23,8 +23,8 @@ #include "modules/rtp_rtcp/source/rtp_sender.h" #include "modules/rtp_rtcp/source/rtp_utility.h" #include "modules/rtp_rtcp/source/ulpfec_generator.h" -#include "rtc_base/criticalsection.h" -#include "rtc_base/onetimeevent.h" +#include "rtc_base/critical_section.h" +#include "rtc_base/one_time_event.h" #include "rtc_base/rate_statistics.h" #include "rtc_base/sequenced_task_checker.h" #include "rtc_base/thread_annotations.h" diff --git a/modules/rtp_rtcp/source/time_util.cc b/modules/rtp_rtcp/source/time_util.cc index e65329d06b..806f9a9f15 100644 --- a/modules/rtp_rtcp/source/time_util.cc +++ b/modules/rtp_rtcp/source/time_util.cc @@ -13,7 +13,7 @@ #include #include "rtc_base/checks.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/time_utils.h" namespace webrtc { namespace { diff --git a/modules/rtp_rtcp/source/time_util_unittest.cc b/modules/rtp_rtcp/source/time_util_unittest.cc index 0ff4f7b079..f4315e5d6d 100644 --- a/modules/rtp_rtcp/source/time_util_unittest.cc +++ b/modules/rtp_rtcp/source/time_util_unittest.cc @@ -9,8 +9,8 @@ */ #include "modules/rtp_rtcp/source/time_util.h" -#include "rtc_base/fakeclock.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/fake_clock.h" +#include "rtc_base/time_utils.h" #include "system_wrappers/include/clock.h" #include "test/gtest.h" diff --git a/modules/rtp_rtcp/source/ulpfec_receiver_impl.h b/modules/rtp_rtcp/source/ulpfec_receiver_impl.h index 0943266161..2821513f0e 100644 --- a/modules/rtp_rtcp/source/ulpfec_receiver_impl.h +++ b/modules/rtp_rtcp/source/ulpfec_receiver_impl.h @@ -20,7 +20,7 @@ #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" #include "modules/rtp_rtcp/include/ulpfec_receiver.h" #include "modules/rtp_rtcp/source/forward_error_correction.h" -#include "rtc_base/criticalsection.h" +#include "rtc_base/critical_section.h" namespace webrtc { diff --git a/modules/rtp_rtcp/test/testFec/test_fec.cc b/modules/rtp_rtcp/test/testFec/test_fec.cc index 7c65d3dca8..3a893b37ca 100644 --- a/modules/rtp_rtcp/test/testFec/test_fec.cc +++ b/modules/rtp_rtcp/test/testFec/test_fec.cc @@ -23,7 +23,7 @@ #include "modules/rtp_rtcp/source/forward_error_correction_internal.h" #include "rtc_base/random.h" #include "test/gtest.h" -#include "test/testsupport/fileutils.h" +#include "test/testsupport/file_utils.h" // #define VERBOSE_OUTPUT diff --git a/modules/rtp_rtcp/test/testFec/test_packet_masks_metrics.cc b/modules/rtp_rtcp/test/testFec/test_packet_masks_metrics.cc index f6d2dea242..8d77a27bfa 100644 --- a/modules/rtp_rtcp/test/testFec/test_packet_masks_metrics.cc +++ b/modules/rtp_rtcp/test/testFec/test_packet_masks_metrics.cc @@ -50,7 +50,7 @@ #include "modules/rtp_rtcp/source/forward_error_correction_internal.h" #include "modules/rtp_rtcp/test/testFec/average_residual_loss_xor_codes.h" #include "test/gtest.h" -#include "test/testsupport/fileutils.h" +#include "test/testsupport/file_utils.h" namespace webrtc { diff --git a/modules/utility/source/process_thread_impl.cc b/modules/utility/source/process_thread_impl.cc index 20f26d927a..fbe60bbc85 100644 --- a/modules/utility/source/process_thread_impl.cc +++ b/modules/utility/source/process_thread_impl.cc @@ -15,7 +15,7 @@ #include "modules/include/module.h" #include "rtc_base/checks.h" #include "rtc_base/task_queue.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/time_utils.h" #include "rtc_base/trace_event.h" namespace webrtc { diff --git a/modules/utility/source/process_thread_impl.h b/modules/utility/source/process_thread_impl.h index fff21d0461..e927c1d533 100644 --- a/modules/utility/source/process_thread_impl.h +++ b/modules/utility/source/process_thread_impl.h @@ -18,7 +18,7 @@ #include "modules/include/module.h" #include "modules/utility/include/process_thread.h" -#include "rtc_base/criticalsection.h" +#include "rtc_base/critical_section.h" #include "rtc_base/event.h" #include "rtc_base/location.h" #include "rtc_base/platform_thread.h" diff --git a/modules/utility/source/process_thread_impl_unittest.cc b/modules/utility/source/process_thread_impl_unittest.cc index 19157963a3..013ef523b9 100644 --- a/modules/utility/source/process_thread_impl_unittest.cc +++ b/modules/utility/source/process_thread_impl_unittest.cc @@ -15,7 +15,7 @@ #include "modules/utility/source/process_thread_impl.h" #include "rtc_base/location.h" #include "rtc_base/task_queue.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/time_utils.h" #include "test/gmock.h" #include "test/gtest.h" diff --git a/modules/video_capture/external/video_capture_external.cc b/modules/video_capture/external/video_capture_external.cc index 776444cca7..1c5a90a488 100644 --- a/modules/video_capture/external/video_capture_external.cc +++ b/modules/video_capture/external/video_capture_external.cc @@ -10,7 +10,7 @@ #include "modules/video_capture/video_capture.h" #include "modules/video_capture/video_capture_impl.h" -#include "rtc_base/refcountedobject.h" +#include "rtc_base/ref_counted_object.h" #include "rtc_base/scoped_ref_ptr.h" namespace webrtc { diff --git a/modules/video_capture/linux/video_capture_linux.cc b/modules/video_capture/linux/video_capture_linux.cc index f35f42c28e..714a0f9d14 100644 --- a/modules/video_capture/linux/video_capture_linux.cc +++ b/modules/video_capture/linux/video_capture_linux.cc @@ -23,10 +23,10 @@ #include #include -#include "media/base/videocommon.h" +#include "media/base/video_common.h" #include "modules/video_capture/video_capture.h" #include "rtc_base/logging.h" -#include "rtc_base/refcountedobject.h" +#include "rtc_base/ref_counted_object.h" #include "rtc_base/scoped_ref_ptr.h" namespace webrtc { diff --git a/modules/video_capture/linux/video_capture_linux.h b/modules/video_capture/linux/video_capture_linux.h index 8004823e11..c162e03b1b 100644 --- a/modules/video_capture/linux/video_capture_linux.h +++ b/modules/video_capture/linux/video_capture_linux.h @@ -18,7 +18,7 @@ #include "common_types.h" // NOLINT(build/include) #include "modules/video_capture/video_capture_defines.h" #include "modules/video_capture/video_capture_impl.h" -#include "rtc_base/criticalsection.h" +#include "rtc_base/critical_section.h" #include "rtc_base/platform_thread.h" namespace webrtc { diff --git a/modules/video_capture/objc/video_capture.mm b/modules/video_capture/objc/video_capture.mm index 6dd2fd6e62..1b173f9d73 100644 --- a/modules/video_capture/objc/video_capture.mm +++ b/modules/video_capture/objc/video_capture.mm @@ -14,8 +14,8 @@ #include "modules/video_capture/objc/device_info_objc.h" #include "modules/video_capture/objc/rtc_video_capture_objc.h" -#include "rtc_base/refcount.h" -#include "rtc_base/refcountedobject.h" +#include "rtc_base/ref_count.h" +#include "rtc_base/ref_counted_object.h" #include "rtc_base/scoped_ref_ptr.h" using namespace webrtc; diff --git a/modules/video_capture/test/video_capture_unittest.cc b/modules/video_capture/test/video_capture_unittest.cc index 8238c20c04..63d5018b2e 100644 --- a/modules/video_capture/test/video_capture_unittest.cc +++ b/modules/video_capture/test/video_capture_unittest.cc @@ -21,9 +21,9 @@ #include "modules/utility/include/process_thread.h" #include "modules/video_capture/video_capture.h" #include "modules/video_capture/video_capture_factory.h" -#include "rtc_base/criticalsection.h" +#include "rtc_base/critical_section.h" #include "rtc_base/scoped_ref_ptr.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/time_utils.h" #include "system_wrappers/include/sleep.h" #include "test/frame_utils.h" #include "test/gtest.h" diff --git a/modules/video_capture/video_capture_impl.cc b/modules/video_capture/video_capture_impl.cc index bd2ecf4e5a..7977a24f41 100644 --- a/modules/video_capture/video_capture_impl.cc +++ b/modules/video_capture/video_capture_impl.cc @@ -18,8 +18,8 @@ #include "modules/video_capture/video_capture_config.h" #include "modules/video_capture/video_capture_impl.h" #include "rtc_base/logging.h" -#include "rtc_base/refcountedobject.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/ref_counted_object.h" +#include "rtc_base/time_utils.h" #include "rtc_base/trace_event.h" #include "third_party/libyuv/include/libyuv.h" diff --git a/modules/video_capture/video_capture_impl.h b/modules/video_capture/video_capture_impl.h index 358f002709..2ec3547ed4 100644 --- a/modules/video_capture/video_capture_impl.h +++ b/modules/video_capture/video_capture_impl.h @@ -24,7 +24,7 @@ #include "modules/video_capture/video_capture.h" #include "modules/video_capture/video_capture_config.h" #include "modules/video_capture/video_capture_defines.h" -#include "rtc_base/criticalsection.h" +#include "rtc_base/critical_section.h" #include "rtc_base/scoped_ref_ptr.h" namespace webrtc { diff --git a/modules/video_capture/windows/device_info_ds.cc b/modules/video_capture/windows/device_info_ds.cc index 7cba0d40d4..935d12562d 100644 --- a/modules/video_capture/windows/device_info_ds.cc +++ b/modules/video_capture/windows/device_info_ds.cc @@ -13,7 +13,7 @@ #include "modules/video_capture/video_capture_config.h" #include "modules/video_capture/windows/help_functions_ds.h" #include "rtc_base/logging.h" -#include "rtc_base/stringutils.h" +#include "rtc_base/string_utils.h" #include #include diff --git a/modules/video_capture/windows/sink_filter_ds.cc b/modules/video_capture/windows/sink_filter_ds.cc index c2db44b3f2..2e005ef14f 100644 --- a/modules/video_capture/windows/sink_filter_ds.cc +++ b/modules/video_capture/windows/sink_filter_ds.cc @@ -14,7 +14,7 @@ #include "rtc_base/checks.h" #include "rtc_base/logging.h" #include "rtc_base/platform_thread.h" -#include "rtc_base/stringutils.h" +#include "rtc_base/string_utils.h" #include // VIDEOINFOHEADER2 #include diff --git a/modules/video_capture/windows/video_capture_factory_windows.cc b/modules/video_capture/windows/video_capture_factory_windows.cc index 52a3cb512b..9f76902b2a 100644 --- a/modules/video_capture/windows/video_capture_factory_windows.cc +++ b/modules/video_capture/windows/video_capture_factory_windows.cc @@ -10,8 +10,8 @@ #include "modules/video_capture/windows/video_capture_ds.h" #include "modules/video_capture/windows/video_capture_mf.h" -#include "rtc_base/refcount.h" -#include "rtc_base/refcountedobject.h" +#include "rtc_base/ref_count.h" +#include "rtc_base/ref_counted_object.h" #include "rtc_base/scoped_ref_ptr.h" namespace webrtc { diff --git a/modules/video_coding/codecs/h264/h264.cc b/modules/video_coding/codecs/h264/h264.cc index 4ab7ab552f..6a692fbc57 100644 --- a/modules/video_coding/codecs/h264/h264.cc +++ b/modules/video_coding/codecs/h264/h264.cc @@ -18,7 +18,7 @@ #include "api/video_codecs/sdp_video_format.h" #include "common_types.h" // NOLINT(build/include) #include "media/base/h264_profile_level_id.h" -#include "media/base/mediaconstants.h" +#include "media/base/media_constants.h" #if defined(WEBRTC_USE_H264) #include "modules/video_coding/codecs/h264/h264_decoder_impl.h" diff --git a/modules/video_coding/codecs/h264/h264_decoder_impl.cc b/modules/video_coding/codecs/h264/h264_decoder_impl.cc index 0853d8f2c9..89155f2e4c 100644 --- a/modules/video_coding/codecs/h264/h264_decoder_impl.cc +++ b/modules/video_coding/codecs/h264/h264_decoder_impl.cc @@ -26,7 +26,7 @@ extern "C" { #include "common_video/include/video_frame_buffer.h" #include "modules/video_coding/codecs/h264/h264_color_space.h" #include "rtc_base/checks.h" -#include "rtc_base/criticalsection.h" +#include "rtc_base/critical_section.h" #include "rtc_base/keep_ref_until_done.h" #include "rtc_base/logging.h" #include "system_wrappers/include/metrics.h" diff --git a/modules/video_coding/codecs/h264/h264_encoder_impl.cc b/modules/video_coding/codecs/h264/h264_encoder_impl.cc index 3a49ac0a6f..05b26fecde 100644 --- a/modules/video_coding/codecs/h264/h264_encoder_impl.cc +++ b/modules/video_coding/codecs/h264/h264_encoder_impl.cc @@ -25,7 +25,7 @@ #include "modules/video_coding/utility/simulcast_utility.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/metrics.h" #include "third_party/libyuv/include/libyuv/convert.h" #include "third_party/libyuv/include/libyuv/scale.h" diff --git a/modules/video_coding/codecs/h264/test/h264_impl_unittest.cc b/modules/video_coding/codecs/h264/test/h264_impl_unittest.cc index 384ea70011..8fa2d496f5 100644 --- a/modules/video_coding/codecs/h264/test/h264_impl_unittest.cc +++ b/modules/video_coding/codecs/h264/test/h264_impl_unittest.cc @@ -22,7 +22,7 @@ #include "common_video/libyuv/include/webrtc_libyuv.h" #include "common_video/test/utilities.h" #include "media/base/codec.h" -#include "media/base/mediaconstants.h" +#include "media/base/media_constants.h" #include "modules/video_coding/codecs/h264/include/h264.h" #include "modules/video_coding/codecs/test/video_codec_unittest.h" #include "modules/video_coding/include/video_codec_interface.h" diff --git a/modules/video_coding/codecs/multiplex/include/multiplex_encoder_adapter.h b/modules/video_coding/codecs/multiplex/include/multiplex_encoder_adapter.h index 235a36030b..0543edd5ac 100644 --- a/modules/video_coding/codecs/multiplex/include/multiplex_encoder_adapter.h +++ b/modules/video_coding/codecs/multiplex/include/multiplex_encoder_adapter.h @@ -20,7 +20,7 @@ #include "api/video_codecs/video_encoder_factory.h" #include "modules/video_coding/codecs/multiplex/multiplex_encoded_image_packer.h" #include "modules/video_coding/include/video_codec_interface.h" -#include "rtc_base/criticalsection.h" +#include "rtc_base/critical_section.h" namespace webrtc { diff --git a/modules/video_coding/codecs/multiplex/test/multiplex_adapter_unittest.cc b/modules/video_coding/codecs/multiplex/test/multiplex_adapter_unittest.cc index 4c904c17e4..63bed8b2bc 100644 --- a/modules/video_coding/codecs/multiplex/test/multiplex_adapter_unittest.cc +++ b/modules/video_coding/codecs/multiplex/test/multiplex_adapter_unittest.cc @@ -29,7 +29,7 @@ #include "common_types.h" // NOLINT(build/include) #include "common_video/include/video_frame_buffer.h" #include "common_video/libyuv/include/webrtc_libyuv.h" -#include "media/base/mediaconstants.h" +#include "media/base/media_constants.h" #include "modules/video_coding/codecs/multiplex/include/augmented_video_frame_buffer.h" #include "modules/video_coding/codecs/multiplex/include/multiplex_decoder_adapter.h" #include "modules/video_coding/codecs/multiplex/include/multiplex_encoder_adapter.h" @@ -39,7 +39,7 @@ #include "modules/video_coding/include/video_codec_interface.h" #include "modules/video_coding/include/video_error_codes.h" #include "rtc_base/keep_ref_until_done.h" -#include "rtc_base/refcountedobject.h" +#include "rtc_base/ref_counted_object.h" #include "rtc_base/scoped_ref_ptr.h" #include "test/gmock.h" #include "test/gtest.h" diff --git a/modules/video_coding/codecs/test/video_codec_unittest.h b/modules/video_coding/codecs/test/video_codec_unittest.h index 9a4d60cec2..1b6a1f906f 100644 --- a/modules/video_coding/codecs/test/video_codec_unittest.h +++ b/modules/video_coding/codecs/test/video_codec_unittest.h @@ -19,7 +19,7 @@ #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/criticalsection.h" +#include "rtc_base/critical_section.h" #include "rtc_base/event.h" #include "rtc_base/thread_annotations.h" #include "test/frame_generator.h" diff --git a/modules/video_coding/codecs/test/videocodec_test_fixture_impl.cc b/modules/video_coding/codecs/test/videocodec_test_fixture_impl.cc index c9c84ed377..de3dad3939 100644 --- a/modules/video_coding/codecs/test/videocodec_test_fixture_impl.cc +++ b/modules/video_coding/codecs/test/videocodec_test_fixture_impl.cc @@ -29,9 +29,9 @@ #include "common_types.h" // NOLINT(build/include) #include "common_video/h264/h264_common.h" #include "media/base/h264_profile_level_id.h" -#include "media/base/mediaconstants.h" -#include "media/engine/internaldecoderfactory.h" -#include "media/engine/internalencoderfactory.h" +#include "media/base/media_constants.h" +#include "media/engine/internal_decoder_factory.h" +#include "media/engine/internal_encoder_factory.h" #include "media/engine/simulcast.h" #include "modules/video_coding/codecs/h264/include/h264_globals.h" #include "modules/video_coding/codecs/vp9/svc_config.h" @@ -41,11 +41,11 @@ #include "rtc_base/event.h" #include "rtc_base/file.h" #include "rtc_base/strings/string_builder.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/time_utils.h" #include "system_wrappers/include/cpu_info.h" #include "system_wrappers/include/sleep.h" #include "test/gtest.h" -#include "test/testsupport/fileutils.h" +#include "test/testsupport/file_utils.h" #include "test/testsupport/frame_writer.h" #include "test/video_codec_settings.h" diff --git a/modules/video_coding/codecs/test/videocodec_test_libvpx.cc b/modules/video_coding/codecs/test/videocodec_test_libvpx.cc index 9665d1c51b..4f63aa9ac8 100644 --- a/modules/video_coding/codecs/test/videocodec_test_libvpx.cc +++ b/modules/video_coding/codecs/test/videocodec_test_libvpx.cc @@ -14,14 +14,14 @@ #include "api/test/create_videocodec_test_fixture.h" #include "api/test/video/function_video_encoder_factory.h" #include "api/video_codecs/sdp_video_format.h" -#include "media/base/mediaconstants.h" -#include "media/engine/internaldecoderfactory.h" -#include "media/engine/internalencoderfactory.h" +#include "media/base/media_constants.h" +#include "media/engine/internal_decoder_factory.h" +#include "media/engine/internal_encoder_factory.h" #include "media/engine/simulcast_encoder_adapter.h" #include "modules/video_coding/utility/vp8_header_parser.h" #include "modules/video_coding/utility/vp9_uncompressed_header_parser.h" #include "test/gtest.h" -#include "test/testsupport/fileutils.h" +#include "test/testsupport/file_utils.h" namespace webrtc { namespace test { diff --git a/modules/video_coding/codecs/test/videocodec_test_mediacodec.cc b/modules/video_coding/codecs/test/videocodec_test_mediacodec.cc index 916f033dfc..f817f8ce5a 100644 --- a/modules/video_coding/codecs/test/videocodec_test_mediacodec.cc +++ b/modules/video_coding/codecs/test/videocodec_test_mediacodec.cc @@ -15,11 +15,11 @@ #include "absl/memory/memory.h" #include "api/test/create_videocodec_test_fixture.h" #include "common_types.h" // NOLINT(build/include) -#include "media/base/mediaconstants.h" +#include "media/base/media_constants.h" #include "modules/video_coding/codecs/test/android_codec_factory_helper.h" #include "modules/video_coding/codecs/test/videocodec_test_fixture_impl.h" #include "test/gtest.h" -#include "test/testsupport/fileutils.h" +#include "test/testsupport/file_utils.h" namespace webrtc { namespace test { diff --git a/modules/video_coding/codecs/test/videocodec_test_openh264.cc b/modules/video_coding/codecs/test/videocodec_test_openh264.cc index b386178c5b..59d214c058 100644 --- a/modules/video_coding/codecs/test/videocodec_test_openh264.cc +++ b/modules/video_coding/codecs/test/videocodec_test_openh264.cc @@ -12,10 +12,10 @@ #include "absl/memory/memory.h" #include "api/test/create_videocodec_test_fixture.h" -#include "media/base/mediaconstants.h" +#include "media/base/media_constants.h" #include "modules/video_coding/codecs/test/videocodec_test_fixture_impl.h" #include "test/gtest.h" -#include "test/testsupport/fileutils.h" +#include "test/testsupport/file_utils.h" namespace webrtc { namespace test { diff --git a/modules/video_coding/codecs/test/videocodec_test_parameterized.cc b/modules/video_coding/codecs/test/videocodec_test_parameterized.cc index d0ee265a41..099d06cb1d 100644 --- a/modules/video_coding/codecs/test/videocodec_test_parameterized.cc +++ b/modules/video_coding/codecs/test/videocodec_test_parameterized.cc @@ -10,7 +10,7 @@ #include "api/test/create_videocodec_test_fixture.h" #include "test/gtest.h" -#include "test/testsupport/fileutils.h" +#include "test/testsupport/file_utils.h" namespace webrtc { namespace test { diff --git a/modules/video_coding/codecs/test/videocodec_test_videotoolbox.cc b/modules/video_coding/codecs/test/videocodec_test_videotoolbox.cc index f1e565c3a7..10bcf65978 100644 --- a/modules/video_coding/codecs/test/videocodec_test_videotoolbox.cc +++ b/modules/video_coding/codecs/test/videocodec_test_videotoolbox.cc @@ -12,11 +12,11 @@ #include "absl/memory/memory.h" #include "api/test/create_videocodec_test_fixture.h" -#include "media/base/mediaconstants.h" +#include "media/base/media_constants.h" #include "modules/video_coding/codecs/test/objc_codec_factory_helper.h" #include "modules/video_coding/codecs/test/videocodec_test_fixture_impl.h" #include "test/gtest.h" -#include "test/testsupport/fileutils.h" +#include "test/testsupport/file_utils.h" namespace webrtc { namespace test { diff --git a/modules/video_coding/codecs/test/videoprocessor.cc b/modules/video_coding/codecs/test/videoprocessor.cc index 83181a0a3e..85e717323e 100644 --- a/modules/video_coding/codecs/test/videoprocessor.cc +++ b/modules/video_coding/codecs/test/videoprocessor.cc @@ -31,7 +31,7 @@ #include "modules/video_coding/include/video_error_codes.h" #include "rtc_base/checks.h" #include "rtc_base/scoped_ref_ptr.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/time_utils.h" #include "test/gtest.h" #include "third_party/libyuv/include/libyuv/compare.h" #include "third_party/libyuv/include/libyuv/scale.h" diff --git a/modules/video_coding/codecs/test/videoprocessor.h b/modules/video_coding/codecs/test/videoprocessor.h index 1a1bdb3313..aaf9ccfec1 100644 --- a/modules/video_coding/codecs/test/videoprocessor.h +++ b/modules/video_coding/codecs/test/videoprocessor.h @@ -32,7 +32,7 @@ #include "modules/video_coding/utility/ivf_file_writer.h" #include "rtc_base/buffer.h" #include "rtc_base/checks.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" #include "rtc_base/sequenced_task_checker.h" #include "rtc_base/task_queue.h" #include "rtc_base/thread_annotations.h" diff --git a/modules/video_coding/codecs/test/videoprocessor_unittest.cc b/modules/video_coding/codecs/test/videoprocessor_unittest.cc index f83240fc8c..541fc45cf3 100644 --- a/modules/video_coding/codecs/test/videoprocessor_unittest.cc +++ b/modules/video_coding/codecs/test/videoprocessor_unittest.cc @@ -15,7 +15,7 @@ #include "api/test/mock_video_encoder.h" #include "api/test/videocodec_test_fixture.h" #include "api/video/i420_buffer.h" -#include "media/base/mediaconstants.h" +#include "media/base/media_constants.h" #include "modules/video_coding/codecs/test/videocodec_test_stats_impl.h" #include "modules/video_coding/codecs/test/videoprocessor.h" #include "rtc_base/scoped_ref_ptr.h" diff --git a/modules/video_coding/codecs/vp8/libvpx_vp8_decoder.cc b/modules/video_coding/codecs/vp8/libvpx_vp8_decoder.cc index b0d5e1da1e..7b95d2b7b3 100644 --- a/modules/video_coding/codecs/vp8/libvpx_vp8_decoder.cc +++ b/modules/video_coding/codecs/vp8/libvpx_vp8_decoder.cc @@ -26,7 +26,7 @@ #include "rtc_base/checks.h" #include "rtc_base/numerics/exp_filter.h" #include "rtc_base/scoped_ref_ptr.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/time_utils.h" #include "system_wrappers/include/field_trial.h" #include "system_wrappers/include/metrics.h" #include "third_party/libyuv/include/libyuv/convert.h" diff --git a/modules/video_coding/codecs/vp8/screenshare_layers.h b/modules/video_coding/codecs/vp8/screenshare_layers.h index 0359b2c33f..acaa6d82d7 100644 --- a/modules/video_coding/codecs/vp8/screenshare_layers.h +++ b/modules/video_coding/codecs/vp8/screenshare_layers.h @@ -17,7 +17,7 @@ #include "modules/video_coding/codecs/vp8/include/temporal_layers_checker.h" #include "modules/video_coding/utility/frame_dropper.h" #include "rtc_base/rate_statistics.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/time_utils.h" namespace webrtc { diff --git a/modules/video_coding/codecs/vp8/test/vp8_impl_unittest.cc b/modules/video_coding/codecs/vp8/test/vp8_impl_unittest.cc index 40e01bdd13..ccc294c56e 100644 --- a/modules/video_coding/codecs/vp8/test/vp8_impl_unittest.cc +++ b/modules/video_coding/codecs/vp8/test/vp8_impl_unittest.cc @@ -22,7 +22,7 @@ #include "modules/video_coding/codecs/vp8/libvpx_vp8_encoder.h" #include "modules/video_coding/codecs/vp8/test/mock_libvpx_interface.h" #include "modules/video_coding/utility/vp8_header_parser.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/time_utils.h" #include "test/video_codec_settings.h" namespace webrtc { diff --git a/modules/video_coding/codecs/vp9/vp9_frame_buffer_pool.cc b/modules/video_coding/codecs/vp9/vp9_frame_buffer_pool.cc index ecbda4cb3b..4ed25abeea 100644 --- a/modules/video_coding/codecs/vp9/vp9_frame_buffer_pool.cc +++ b/modules/video_coding/codecs/vp9/vp9_frame_buffer_pool.cc @@ -19,7 +19,7 @@ #include "rtc_base/checks.h" #include "rtc_base/logging.h" -#include "rtc_base/refcountedobject.h" +#include "rtc_base/ref_counted_object.h" namespace webrtc { diff --git a/modules/video_coding/codecs/vp9/vp9_frame_buffer_pool.h b/modules/video_coding/codecs/vp9/vp9_frame_buffer_pool.h index 02ede24329..fd84b66bbf 100644 --- a/modules/video_coding/codecs/vp9/vp9_frame_buffer_pool.h +++ b/modules/video_coding/codecs/vp9/vp9_frame_buffer_pool.h @@ -17,8 +17,8 @@ #include #include "rtc_base/buffer.h" -#include "rtc_base/criticalsection.h" -#include "rtc_base/refcount.h" +#include "rtc_base/critical_section.h" +#include "rtc_base/ref_count.h" #include "rtc_base/scoped_ref_ptr.h" struct vpx_codec_ctx; diff --git a/modules/video_coding/codecs/vp9/vp9_impl.cc b/modules/video_coding/codecs/vp9/vp9_impl.cc index c87c9bb5c4..6f3e979a85 100644 --- a/modules/video_coding/codecs/vp9/vp9_impl.cc +++ b/modules/video_coding/codecs/vp9/vp9_impl.cc @@ -32,7 +32,7 @@ #include "rtc_base/checks.h" #include "rtc_base/keep_ref_until_done.h" #include "rtc_base/logging.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/time_utils.h" #include "rtc_base/trace_event.h" #include "system_wrappers/include/field_trial.h" diff --git a/modules/video_coding/fec_controller_default.h b/modules/video_coding/fec_controller_default.h index 99437773cb..1db39a403b 100644 --- a/modules/video_coding/fec_controller_default.h +++ b/modules/video_coding/fec_controller_default.h @@ -19,8 +19,8 @@ #include "api/fec_controller.h" #include "common_types.h" // NOLINT(build/include) #include "modules/video_coding/media_opt_util.h" -#include "rtc_base/constructormagic.h" -#include "rtc_base/criticalsection.h" +#include "rtc_base/constructor_magic.h" +#include "rtc_base/critical_section.h" #include "rtc_base/thread_annotations.h" #include "system_wrappers/include/clock.h" diff --git a/modules/video_coding/frame_buffer2.h b/modules/video_coding/frame_buffer2.h index d132becfee..64249a5190 100644 --- a/modules/video_coding/frame_buffer2.h +++ b/modules/video_coding/frame_buffer2.h @@ -22,8 +22,8 @@ #include "api/video/encoded_frame.h" #include "modules/video_coding/include/video_coding_defines.h" #include "modules/video_coding/inter_frame_delay.h" -#include "rtc_base/constructormagic.h" -#include "rtc_base/criticalsection.h" +#include "rtc_base/constructor_magic.h" +#include "rtc_base/critical_section.h" #include "rtc_base/event.h" #include "rtc_base/experiments/rtt_mult_experiment.h" #include "rtc_base/numerics/sequence_number_util.h" diff --git a/modules/video_coding/frame_object.cc b/modules/video_coding/frame_object.cc index 750c977fa5..8fd8983451 100644 --- a/modules/video_coding/frame_object.cc +++ b/modules/video_coding/frame_object.cc @@ -17,7 +17,7 @@ #include "modules/video_coding/packet.h" #include "modules/video_coding/packet_buffer.h" #include "rtc_base/checks.h" -#include "rtc_base/criticalsection.h" +#include "rtc_base/critical_section.h" namespace webrtc { namespace video_coding { diff --git a/modules/video_coding/generic_decoder.cc b/modules/video_coding/generic_decoder.cc index dee28ae891..6ef4c361be 100644 --- a/modules/video_coding/generic_decoder.cc +++ b/modules/video_coding/generic_decoder.cc @@ -17,7 +17,7 @@ #include "modules/video_coding/include/video_error_codes.h" #include "rtc_base/checks.h" #include "rtc_base/logging.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/time_utils.h" #include "rtc_base/trace_event.h" #include "system_wrappers/include/clock.h" diff --git a/modules/video_coding/generic_decoder.h b/modules/video_coding/generic_decoder.h index b0dccc47ef..d4a15d9d9e 100644 --- a/modules/video_coding/generic_decoder.h +++ b/modules/video_coding/generic_decoder.h @@ -18,7 +18,7 @@ #include "modules/video_coding/include/video_codec_interface.h" #include "modules/video_coding/timestamp_map.h" #include "modules/video_coding/timing.h" -#include "rtc_base/criticalsection.h" +#include "rtc_base/critical_section.h" #include "rtc_base/thread_checker.h" namespace webrtc { diff --git a/modules/video_coding/generic_encoder.cc b/modules/video_coding/generic_encoder.cc index 2d992efc36..221a8b2d81 100644 --- a/modules/video_coding/generic_encoder.cc +++ b/modules/video_coding/generic_encoder.cc @@ -25,7 +25,7 @@ #include "rtc_base/checks.h" #include "rtc_base/experiments/alr_experiment.h" #include "rtc_base/logging.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/time_utils.h" #include "rtc_base/trace_event.h" namespace webrtc { diff --git a/modules/video_coding/generic_encoder.h b/modules/video_coding/generic_encoder.h index 463f98a749..760831c96a 100644 --- a/modules/video_coding/generic_encoder.h +++ b/modules/video_coding/generic_encoder.h @@ -18,7 +18,7 @@ #include "api/units/data_rate.h" #include "modules/video_coding/include/video_codec_interface.h" #include "modules/video_coding/include/video_coding_defines.h" -#include "rtc_base/criticalsection.h" +#include "rtc_base/critical_section.h" #include "rtc_base/race_checker.h" namespace webrtc { diff --git a/modules/video_coding/generic_encoder_unittest.cc b/modules/video_coding/generic_encoder_unittest.cc index 9491b5a766..66d787322f 100644 --- a/modules/video_coding/generic_encoder_unittest.cc +++ b/modules/video_coding/generic_encoder_unittest.cc @@ -14,8 +14,8 @@ #include "api/video/video_timing.h" #include "modules/video_coding/generic_encoder.h" #include "modules/video_coding/include/video_coding_defines.h" -#include "rtc_base/fakeclock.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/fake_clock.h" +#include "rtc_base/time_utils.h" #include "test/gtest.h" namespace webrtc { diff --git a/modules/video_coding/h264_sprop_parameter_sets.h b/modules/video_coding/h264_sprop_parameter_sets.h index 28172d42ab..dbf27ef034 100644 --- a/modules/video_coding/h264_sprop_parameter_sets.h +++ b/modules/video_coding/h264_sprop_parameter_sets.h @@ -15,7 +15,7 @@ #include #include -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace webrtc { diff --git a/modules/video_coding/jitter_buffer.h b/modules/video_coding/jitter_buffer.h index c8d778117e..4a0d74018e 100644 --- a/modules/video_coding/jitter_buffer.h +++ b/modules/video_coding/jitter_buffer.h @@ -25,8 +25,8 @@ #include "modules/video_coding/inter_frame_delay.h" #include "modules/video_coding/jitter_buffer_common.h" #include "modules/video_coding/jitter_estimator.h" -#include "rtc_base/constructormagic.h" -#include "rtc_base/criticalsection.h" +#include "rtc_base/constructor_magic.h" +#include "rtc_base/critical_section.h" #include "rtc_base/thread_annotations.h" #include "system_wrappers/include/event_wrapper.h" diff --git a/modules/video_coding/jitter_estimator.h b/modules/video_coding/jitter_estimator.h index 56b532851d..f163f4ca3b 100644 --- a/modules/video_coding/jitter_estimator.h +++ b/modules/video_coding/jitter_estimator.h @@ -12,7 +12,7 @@ #define MODULES_VIDEO_CODING_JITTER_ESTIMATOR_H_ #include "modules/video_coding/rtt_filter.h" -#include "rtc_base/rollingaccumulator.h" +#include "rtc_base/rolling_accumulator.h" namespace webrtc { diff --git a/modules/video_coding/jitter_estimator_tests.cc b/modules/video_coding/jitter_estimator_tests.cc index 730f0ac0b4..e696f0e02f 100644 --- a/modules/video_coding/jitter_estimator_tests.cc +++ b/modules/video_coding/jitter_estimator_tests.cc @@ -18,7 +18,7 @@ #include "rtc_base/experiments/jitter_upper_bound_experiment.h" #include "rtc_base/numerics/histogram_percentile_counter.h" #include "rtc_base/strings/string_builder.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/time_utils.h" #include "system_wrappers/include/clock.h" #include "test/field_trial.h" #include "test/gtest.h" diff --git a/modules/video_coding/nack_module.h b/modules/video_coding/nack_module.h index ace5648e9b..16891d7620 100644 --- a/modules/video_coding/nack_module.h +++ b/modules/video_coding/nack_module.h @@ -19,7 +19,7 @@ #include "modules/include/module.h" #include "modules/include/module_common_types.h" #include "modules/video_coding/histogram.h" -#include "rtc_base/criticalsection.h" +#include "rtc_base/critical_section.h" #include "rtc_base/numerics/sequence_number_util.h" #include "rtc_base/thread_annotations.h" #include "system_wrappers/include/clock.h" diff --git a/modules/video_coding/packet_buffer.cc b/modules/video_coding/packet_buffer.cc index 4ef0b007bd..7fd3fc714a 100644 --- a/modules/video_coding/packet_buffer.cc +++ b/modules/video_coding/packet_buffer.cc @@ -22,7 +22,7 @@ #include "modules/rtp_rtcp/source/rtp_video_header.h" #include "modules/video_coding/codecs/h264/include/h264_globals.h" #include "modules/video_coding/frame_object.h" -#include "rtc_base/atomicops.h" +#include "rtc_base/atomic_ops.h" #include "rtc_base/checks.h" #include "rtc_base/logging.h" #include "rtc_base/numerics/mod_ops.h" diff --git a/modules/video_coding/packet_buffer.h b/modules/video_coding/packet_buffer.h index 51d2782837..73ffb053d0 100644 --- a/modules/video_coding/packet_buffer.h +++ b/modules/video_coding/packet_buffer.h @@ -19,7 +19,7 @@ #include "modules/include/module_common_types.h" #include "modules/video_coding/packet.h" #include "modules/video_coding/rtp_frame_reference_finder.h" -#include "rtc_base/criticalsection.h" +#include "rtc_base/critical_section.h" #include "rtc_base/numerics/sequence_number_util.h" #include "rtc_base/scoped_ref_ptr.h" #include "rtc_base/thread_annotations.h" diff --git a/modules/video_coding/receiver.h b/modules/video_coding/receiver.h index 97692e0797..e69aeeae3e 100644 --- a/modules/video_coding/receiver.h +++ b/modules/video_coding/receiver.h @@ -19,7 +19,7 @@ #include "modules/video_coding/jitter_buffer.h" #include "modules/video_coding/packet.h" #include "modules/video_coding/timing.h" -#include "rtc_base/criticalsection.h" +#include "rtc_base/critical_section.h" #include "system_wrappers/include/event_wrapper.h" namespace webrtc { diff --git a/modules/video_coding/rtp_frame_reference_finder.h b/modules/video_coding/rtp_frame_reference_finder.h index 01819eac65..e39d991019 100644 --- a/modules/video_coding/rtp_frame_reference_finder.h +++ b/modules/video_coding/rtp_frame_reference_finder.h @@ -20,7 +20,7 @@ #include "modules/include/module_common_types.h" #include "modules/rtp_rtcp/source/rtp_generic_frame_descriptor.h" -#include "rtc_base/criticalsection.h" +#include "rtc_base/critical_section.h" #include "rtc_base/numerics/sequence_number_util.h" #include "rtc_base/thread_annotations.h" diff --git a/modules/video_coding/rtp_frame_reference_finder_unittest.cc b/modules/video_coding/rtp_frame_reference_finder_unittest.cc index 1e8a9c5a73..e5694f9546 100644 --- a/modules/video_coding/rtp_frame_reference_finder_unittest.cc +++ b/modules/video_coding/rtp_frame_reference_finder_unittest.cc @@ -17,7 +17,7 @@ #include "modules/video_coding/frame_object.h" #include "modules/video_coding/packet_buffer.h" #include "rtc_base/random.h" -#include "rtc_base/refcount.h" +#include "rtc_base/ref_count.h" #include "system_wrappers/include/clock.h" #include "test/gtest.h" diff --git a/modules/video_coding/test/stream_generator.h b/modules/video_coding/test/stream_generator.h index 22c9f11315..150fa79606 100644 --- a/modules/video_coding/test/stream_generator.h +++ b/modules/video_coding/test/stream_generator.h @@ -15,7 +15,7 @@ #include "common_types.h" // NOLINT(build/include) #include "modules/video_coding/packet.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace webrtc { diff --git a/modules/video_coding/timing.h b/modules/video_coding/timing.h index 2b5e21d649..c70410eb06 100644 --- a/modules/video_coding/timing.h +++ b/modules/video_coding/timing.h @@ -14,7 +14,7 @@ #include #include "modules/video_coding/codec_timer.h" -#include "rtc_base/criticalsection.h" +#include "rtc_base/critical_section.h" #include "rtc_base/thread_annotations.h" namespace webrtc { diff --git a/modules/video_coding/utility/ivf_file_writer.h b/modules/video_coding/utility/ivf_file_writer.h index 21ebd9762f..600ab8d69f 100644 --- a/modules/video_coding/utility/ivf_file_writer.h +++ b/modules/video_coding/utility/ivf_file_writer.h @@ -17,9 +17,9 @@ #include "api/video/encoded_image.h" #include "common_types.h" // NOLINT(build/include) -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" #include "rtc_base/file.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/time_utils.h" namespace webrtc { diff --git a/modules/video_coding/utility/ivf_file_writer_unittest.cc b/modules/video_coding/utility/ivf_file_writer_unittest.cc index 720402f51a..6f71496b3b 100644 --- a/modules/video_coding/utility/ivf_file_writer_unittest.cc +++ b/modules/video_coding/utility/ivf_file_writer_unittest.cc @@ -17,7 +17,7 @@ #include "modules/rtp_rtcp/source/byte_io.h" #include "rtc_base/platform_file.h" #include "test/gtest.h" -#include "test/testsupport/fileutils.h" +#include "test/testsupport/file_utils.h" namespace webrtc { diff --git a/modules/video_coding/utility/quality_scaler.cc b/modules/video_coding/utility/quality_scaler.cc index 4a517dcfdf..e41a010d5e 100644 --- a/modules/video_coding/utility/quality_scaler.cc +++ b/modules/video_coding/utility/quality_scaler.cc @@ -17,7 +17,7 @@ #include "rtc_base/logging.h" #include "rtc_base/numerics/exp_filter.h" #include "rtc_base/task_queue.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/time_utils.h" // TODO(kthelgason): Some versions of Android have issues with log2. // See https://code.google.com/p/android/issues/detail?id=212634 for details diff --git a/modules/video_coding/utility/simulcast_rate_allocator.h b/modules/video_coding/utility/simulcast_rate_allocator.h index c1e8967171..c5242a52fc 100644 --- a/modules/video_coding/utility/simulcast_rate_allocator.h +++ b/modules/video_coding/utility/simulcast_rate_allocator.h @@ -18,7 +18,7 @@ #include "api/video/video_bitrate_allocation.h" #include "api/video/video_bitrate_allocator.h" #include "api/video_codecs/video_codec.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace webrtc { diff --git a/modules/video_coding/utility/vp9_uncompressed_header_parser.cc b/modules/video_coding/utility/vp9_uncompressed_header_parser.cc index 808fdd3087..9c89235fe2 100644 --- a/modules/video_coding/utility/vp9_uncompressed_header_parser.cc +++ b/modules/video_coding/utility/vp9_uncompressed_header_parser.cc @@ -9,7 +9,7 @@ */ #include "modules/video_coding/utility/vp9_uncompressed_header_parser.h" -#include "rtc_base/bitbuffer.h" +#include "rtc_base/bit_buffer.h" #include "rtc_base/logging.h" namespace webrtc { diff --git a/modules/video_coding/video_codec_initializer_unittest.cc b/modules/video_coding/video_codec_initializer_unittest.cc index 75be427226..a90b7b7482 100644 --- a/modules/video_coding/video_codec_initializer_unittest.cc +++ b/modules/video_coding/video_codec_initializer_unittest.cc @@ -25,7 +25,7 @@ #include "common_types.h" // NOLINT(build/include) #include "modules/video_coding/codecs/vp9/include/vp9_globals.h" #include "rtc_base/checks.h" -#include "rtc_base/refcountedobject.h" +#include "rtc_base/ref_counted_object.h" #include "rtc_base/scoped_ref_ptr.h" #include "test/gtest.h" diff --git a/modules/video_coding/video_coding_impl.cc b/modules/video_coding/video_coding_impl.cc index 7600915b72..70b816d706 100644 --- a/modules/video_coding/video_coding_impl.cc +++ b/modules/video_coding/video_coding_impl.cc @@ -17,7 +17,7 @@ #include "common_types.h" // NOLINT(build/include) #include "modules/video_coding/include/video_codec_interface.h" #include "modules/video_coding/timing.h" -#include "rtc_base/criticalsection.h" +#include "rtc_base/critical_section.h" #include "rtc_base/thread_checker.h" #include "system_wrappers/include/clock.h" diff --git a/modules/video_coding/video_coding_impl.h b/modules/video_coding/video_coding_impl.h index 08b0753271..e6b12158b9 100644 --- a/modules/video_coding/video_coding_impl.h +++ b/modules/video_coding/video_coding_impl.h @@ -26,7 +26,7 @@ #include "modules/video_coding/jitter_buffer.h" #include "modules/video_coding/receiver.h" #include "modules/video_coding/timing.h" -#include "rtc_base/onetimeevent.h" +#include "rtc_base/one_time_event.h" #include "rtc_base/sequenced_task_checker.h" #include "rtc_base/thread_annotations.h" #include "rtc_base/thread_checker.h" diff --git a/modules/video_coding/video_receiver.cc b/modules/video_coding/video_receiver.cc index f9b3547e22..414c07a2c8 100644 --- a/modules/video_coding/video_receiver.cc +++ b/modules/video_coding/video_receiver.cc @@ -31,10 +31,10 @@ #include "modules/video_coding/timing.h" #include "modules/video_coding/video_coding_impl.h" #include "rtc_base/checks.h" -#include "rtc_base/criticalsection.h" +#include "rtc_base/critical_section.h" #include "rtc_base/location.h" #include "rtc_base/logging.h" -#include "rtc_base/onetimeevent.h" +#include "rtc_base/one_time_event.h" #include "rtc_base/thread_checker.h" #include "rtc_base/trace_event.h" #include "system_wrappers/include/clock.h" diff --git a/modules/video_coding/video_sender.cc b/modules/video_coding/video_sender.cc index fe959b8cd4..78196ab4c4 100644 --- a/modules/video_coding/video_sender.cc +++ b/modules/video_coding/video_sender.cc @@ -28,7 +28,7 @@ #include "modules/video_coding/utility/default_video_bitrate_allocator.h" #include "modules/video_coding/video_coding_impl.h" #include "rtc_base/checks.h" -#include "rtc_base/criticalsection.h" +#include "rtc_base/critical_section.h" #include "rtc_base/logging.h" #include "rtc_base/scoped_ref_ptr.h" #include "rtc_base/sequenced_task_checker.h" diff --git a/modules/video_coding/video_sender_unittest.cc b/modules/video_coding/video_sender_unittest.cc index a9c9e455e2..44e9c3452d 100644 --- a/modules/video_coding/video_sender_unittest.cc +++ b/modules/video_coding/video_sender_unittest.cc @@ -24,7 +24,7 @@ #include "system_wrappers/include/clock.h" #include "test/frame_generator.h" #include "test/gtest.h" -#include "test/testsupport/fileutils.h" +#include "test/testsupport/file_utils.h" #include "test/video_codec_settings.h" using ::testing::_; diff --git a/modules/video_processing/test/denoiser_test.cc b/modules/video_processing/test/denoiser_test.cc index 014334539f..223e3ae79b 100644 --- a/modules/video_processing/test/denoiser_test.cc +++ b/modules/video_processing/test/denoiser_test.cc @@ -22,7 +22,7 @@ #include "rtc_base/scoped_ref_ptr.h" #include "test/frame_utils.h" #include "test/gtest.h" -#include "test/testsupport/fileutils.h" +#include "test/testsupport/file_utils.h" namespace webrtc { diff --git a/p2p/BUILD.gn b/p2p/BUILD.gn index 6695458aae..acbb8fca87 100644 --- a/p2p/BUILD.gn +++ b/p2p/BUILD.gn @@ -18,69 +18,69 @@ group("p2p") { rtc_static_library("rtc_p2p") { visibility = [ "*" ] sources = [ - "base/asyncstuntcpsocket.cc", - "base/asyncstuntcpsocket.h", - "base/basicasyncresolverfactory.cc", - "base/basicasyncresolverfactory.h", - "base/basicpacketsocketfactory.cc", - "base/basicpacketsocketfactory.h", - "base/candidatepairinterface.h", - "base/dtlstransport.cc", - "base/dtlstransport.h", - "base/dtlstransportinternal.cc", - "base/dtlstransportinternal.h", - "base/icecredentialsiterator.cc", - "base/icecredentialsiterator.h", - "base/icetransportinternal.cc", - "base/icetransportinternal.h", + "base/async_stun_tcp_socket.cc", + "base/async_stun_tcp_socket.h", + "base/basic_async_resolver_factory.cc", + "base/basic_async_resolver_factory.h", + "base/basic_packet_socket_factory.cc", + "base/basic_packet_socket_factory.h", + "base/candidate_pair_interface.h", + "base/dtls_transport.cc", + "base/dtls_transport.h", + "base/dtls_transport_internal.cc", + "base/dtls_transport_internal.h", + "base/ice_credentials_iterator.cc", + "base/ice_credentials_iterator.h", + "base/ice_transport_internal.cc", + "base/ice_transport_internal.h", "base/mdns_message.cc", "base/mdns_message.h", - "base/p2pconstants.cc", - "base/p2pconstants.h", - "base/p2ptransportchannel.cc", - "base/p2ptransportchannel.h", - "base/packetlossestimator.cc", - "base/packetlossestimator.h", - "base/packetsocketfactory.cc", - "base/packetsocketfactory.h", - "base/packettransportinterface.h", - "base/packettransportinternal.cc", - "base/packettransportinternal.h", + "base/p2p_constants.cc", + "base/p2p_constants.h", + "base/p2p_transport_channel.cc", + "base/p2p_transport_channel.h", + "base/packet_loss_estimator.cc", + "base/packet_loss_estimator.h", + "base/packet_socket_factory.cc", + "base/packet_socket_factory.h", + "base/packet_transport_interface.h", + "base/packet_transport_internal.cc", + "base/packet_transport_internal.h", "base/port.cc", "base/port.h", - "base/portallocator.cc", - "base/portallocator.h", - "base/portinterface.cc", - "base/portinterface.h", - "base/pseudotcp.cc", - "base/pseudotcp.h", - "base/regatheringcontroller.cc", - "base/regatheringcontroller.h", - "base/relayport.cc", - "base/relayport.h", + "base/port_allocator.cc", + "base/port_allocator.h", + "base/port_interface.cc", + "base/port_interface.h", + "base/pseudo_tcp.cc", + "base/pseudo_tcp.h", + "base/regathering_controller.cc", + "base/regathering_controller.h", + "base/relay_port.cc", + "base/relay_port.h", "base/stun.cc", "base/stun.h", - "base/stunport.cc", - "base/stunport.h", - "base/stunrequest.cc", - "base/stunrequest.h", - "base/tcpport.cc", - "base/tcpport.h", + "base/stun_port.cc", + "base/stun_port.h", + "base/stun_request.cc", + "base/stun_request.h", + "base/tcp_port.cc", + "base/tcp_port.h", "base/transport.h", - "base/transportdescription.cc", - "base/transportdescription.h", - "base/transportdescriptionfactory.cc", - "base/transportdescriptionfactory.h", - "base/transportfactoryinterface.h", - "base/transportinfo.h", - "base/turnport.cc", - "base/turnport.h", - "base/udpport.h", - "client/basicportallocator.cc", - "client/basicportallocator.h", - "client/relayportfactoryinterface.h", - "client/turnportfactory.cc", - "client/turnportfactory.h", + "base/transport_description.cc", + "base/transport_description.h", + "base/transport_description_factory.cc", + "base/transport_description_factory.h", + "base/transport_factory_interface.h", + "base/transport_info.h", + "base/turn_port.cc", + "base/turn_port.h", + "base/udp_port.h", + "client/basic_port_allocator.cc", + "client/basic_port_allocator.h", + "client/relay_port_factory_interface.h", + "client/turn_port_factory.cc", + "client/turn_port_factory.h", ] deps = [ @@ -115,18 +115,18 @@ if (rtc_include_tests) { rtc_source_set("p2p_test_utils") { testonly = true sources = [ - "base/fakecandidatepair.h", - "base/fakedtlstransport.h", - "base/fakeicetransport.h", - "base/fakepackettransport.h", - "base/fakeportallocator.h", - "base/mockasyncresolver.h", - "base/mockicetransport.h", - "base/testrelayserver.h", - "base/teststunserver.cc", - "base/teststunserver.h", - "base/testturncustomizer.h", - "base/testturnserver.h", + "base/fake_candidate_pair.h", + "base/fake_dtls_transport.h", + "base/fake_ice_transport.h", + "base/fake_packet_transport.h", + "base/fake_port_allocator.h", + "base/mock_async_resolver.h", + "base/mock_ice_transport.h", + "base/test_relay_server.h", + "base/test_stun_server.cc", + "base/test_stun_server.h", + "base/test_turn_customizer.h", + "base/test_turn_server.h", ] deps = [ ":p2p_server_utils", @@ -148,28 +148,28 @@ if (rtc_include_tests) { testonly = true sources = [ - "base/asyncstuntcpsocket_unittest.cc", - "base/basicasyncresolverfactory_unittest.cc", - "base/dtlstransport_unittest.cc", - "base/icecredentialsiterator_unittest.cc", + "base/async_stun_tcp_socket_unittest.cc", + "base/basic_async_resolver_factory_unittest.cc", + "base/dtls_transport_unittest.cc", + "base/ice_credentials_iterator_unittest.cc", "base/mdns_message_unittest.cc", - "base/p2ptransportchannel_unittest.cc", - "base/packetlossestimator_unittest.cc", + "base/p2p_transport_channel_unittest.cc", + "base/packet_loss_estimator_unittest.cc", + "base/port_allocator_unittest.cc", "base/port_unittest.cc", - "base/portallocator_unittest.cc", - "base/pseudotcp_unittest.cc", - "base/regatheringcontroller_unittest.cc", - "base/relayport_unittest.cc", - "base/relayserver_unittest.cc", + "base/pseudo_tcp_unittest.cc", + "base/regathering_controller_unittest.cc", + "base/relay_port_unittest.cc", + "base/relay_server_unittest.cc", + "base/stun_port_unittest.cc", + "base/stun_request_unittest.cc", + "base/stun_server_unittest.cc", "base/stun_unittest.cc", - "base/stunport_unittest.cc", - "base/stunrequest_unittest.cc", - "base/stunserver_unittest.cc", - "base/tcpport_unittest.cc", - "base/transportdescriptionfactory_unittest.cc", - "base/turnport_unittest.cc", - "base/turnserver_unittest.cc", - "client/basicportallocator_unittest.cc", + "base/tcp_port_unittest.cc", + "base/transport_description_factory_unittest.cc", + "base/turn_port_unittest.cc", + "base/turn_server_unittest.cc", + "client/basic_port_allocator_unittest.cc", ] deps = [ ":p2p_server_utils", @@ -201,12 +201,12 @@ if (rtc_include_tests) { rtc_source_set("p2p_server_utils") { testonly = true sources = [ - "base/relayserver.cc", - "base/relayserver.h", - "base/stunserver.cc", - "base/stunserver.h", - "base/turnserver.cc", - "base/turnserver.h", + "base/relay_server.cc", + "base/relay_server.h", + "base/stun_server.cc", + "base/stun_server.h", + "base/turn_server.cc", + "base/turn_server.h", ] deps = [ ":rtc_p2p", @@ -221,8 +221,8 @@ rtc_source_set("p2p_server_utils") { rtc_static_library("libstunprober") { visibility = [ "*" ] sources = [ - "stunprober/stunprober.cc", - "stunprober/stunprober.h", + "stunprober/stun_prober.cc", + "stunprober/stun_prober.h", ] deps = [ @@ -239,7 +239,7 @@ if (rtc_include_tests) { testonly = true sources = [ - "stunprober/stunprober_unittest.cc", + "stunprober/stun_prober_unittest.cc", ] deps = [ ":libstunprober", diff --git a/p2p/base/async_stun_tcp_socket.cc b/p2p/base/async_stun_tcp_socket.cc index e6f64ca9d2..5ded8aeafc 100644 --- a/p2p/base/async_stun_tcp_socket.cc +++ b/p2p/base/async_stun_tcp_socket.cc @@ -8,18 +8,18 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "p2p/base/asyncstuntcpsocket.h" +#include "p2p/base/async_stun_tcp_socket.h" #include #include #include #include "p2p/base/stun.h" -#include "rtc_base/byteorder.h" +#include "rtc_base/byte_order.h" #include "rtc_base/checks.h" #include "rtc_base/network/sent_packet.h" #include "rtc_base/third_party/sigslot/sigslot.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/time_utils.h" namespace cricket { diff --git a/p2p/base/async_stun_tcp_socket.h b/p2p/base/async_stun_tcp_socket.h index 5540b93e76..0f190be4b2 100644 --- a/p2p/base/async_stun_tcp_socket.h +++ b/p2p/base/async_stun_tcp_socket.h @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef P2P_BASE_ASYNCSTUNTCPSOCKET_H_ -#define P2P_BASE_ASYNCSTUNTCPSOCKET_H_ +#ifndef P2P_BASE_ASYNC_STUN_TCP_SOCKET_H_ +#define P2P_BASE_ASYNC_STUN_TCP_SOCKET_H_ #include -#include "rtc_base/asyncpacketsocket.h" -#include "rtc_base/asyncsocket.h" -#include "rtc_base/asynctcpsocket.h" -#include "rtc_base/constructormagic.h" -#include "rtc_base/socketaddress.h" +#include "rtc_base/async_packet_socket.h" +#include "rtc_base/async_socket.h" +#include "rtc_base/async_tcp_socket.h" +#include "rtc_base/constructor_magic.h" +#include "rtc_base/socket_address.h" namespace cricket { @@ -49,4 +49,4 @@ class AsyncStunTCPSocket : public rtc::AsyncTCPSocketBase { } // namespace cricket -#endif // P2P_BASE_ASYNCSTUNTCPSOCKET_H_ +#endif // P2P_BASE_ASYNC_STUN_TCP_SOCKET_H_ diff --git a/p2p/base/async_stun_tcp_socket_unittest.cc b/p2p/base/async_stun_tcp_socket_unittest.cc index 0203e4805b..70fddda336 100644 --- a/p2p/base/async_stun_tcp_socket_unittest.cc +++ b/p2p/base/async_stun_tcp_socket_unittest.cc @@ -14,12 +14,12 @@ #include #include -#include "p2p/base/asyncstuntcpsocket.h" -#include "rtc_base/asyncsocket.h" +#include "p2p/base/async_stun_tcp_socket.h" +#include "rtc_base/async_socket.h" #include "rtc_base/network/sent_packet.h" #include "rtc_base/third_party/sigslot/sigslot.h" #include "rtc_base/thread.h" -#include "rtc_base/virtualsocketserver.h" +#include "rtc_base/virtual_socket_server.h" #include "test/gtest.h" namespace cricket { diff --git a/p2p/base/basic_async_resolver_factory.cc b/p2p/base/basic_async_resolver_factory.cc index 22dac68510..9d8266eaf9 100644 --- a/p2p/base/basic_async_resolver_factory.cc +++ b/p2p/base/basic_async_resolver_factory.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "p2p/base/basicasyncresolverfactory.h" +#include "p2p/base/basic_async_resolver_factory.h" -#include "rtc_base/nethelpers.h" +#include "rtc_base/net_helpers.h" namespace webrtc { diff --git a/p2p/base/basic_async_resolver_factory.h b/p2p/base/basic_async_resolver_factory.h index 5bb8f55ca5..c4661b448b 100644 --- a/p2p/base/basic_async_resolver_factory.h +++ b/p2p/base/basic_async_resolver_factory.h @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef P2P_BASE_BASICASYNCRESOLVERFACTORY_H_ -#define P2P_BASE_BASICASYNCRESOLVERFACTORY_H_ +#ifndef P2P_BASE_BASIC_ASYNC_RESOLVER_FACTORY_H_ +#define P2P_BASE_BASIC_ASYNC_RESOLVER_FACTORY_H_ -#include "api/asyncresolverfactory.h" -#include "rtc_base/asyncresolverinterface.h" +#include "api/async_resolver_factory.h" +#include "rtc_base/async_resolver_interface.h" namespace webrtc { @@ -23,4 +23,4 @@ class BasicAsyncResolverFactory : public AsyncResolverFactory { } // namespace webrtc -#endif // P2P_BASE_BASICASYNCRESOLVERFACTORY_H_ +#endif // P2P_BASE_BASIC_ASYNC_RESOLVER_FACTORY_H_ diff --git a/p2p/base/basic_async_resolver_factory_unittest.cc b/p2p/base/basic_async_resolver_factory_unittest.cc index cee37b56b9..020226f1aa 100644 --- a/p2p/base/basic_async_resolver_factory_unittest.cc +++ b/p2p/base/basic_async_resolver_factory_unittest.cc @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "p2p/base/basicasyncresolverfactory.h" +#include "p2p/base/basic_async_resolver_factory.h" #include "rtc_base/gunit.h" -#include "rtc_base/socketaddress.h" +#include "rtc_base/socket_address.h" #include "rtc_base/third_party/sigslot/sigslot.h" #include "test/gtest.h" diff --git a/p2p/base/basic_packet_socket_factory.cc b/p2p/base/basic_packet_socket_factory.cc index 8205442d5d..2390e8adea 100644 --- a/p2p/base/basic_packet_socket_factory.cc +++ b/p2p/base/basic_packet_socket_factory.cc @@ -8,21 +8,21 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "p2p/base/basicpacketsocketfactory.h" +#include "p2p/base/basic_packet_socket_factory.h" #include #include -#include "p2p/base/asyncstuntcpsocket.h" -#include "rtc_base/asynctcpsocket.h" -#include "rtc_base/asyncudpsocket.h" +#include "p2p/base/async_stun_tcp_socket.h" +#include "rtc_base/async_tcp_socket.h" +#include "rtc_base/async_udp_socket.h" #include "rtc_base/checks.h" #include "rtc_base/logging.h" -#include "rtc_base/nethelpers.h" +#include "rtc_base/net_helpers.h" #include "rtc_base/socket.h" -#include "rtc_base/socketadapters.h" -#include "rtc_base/socketserver.h" -#include "rtc_base/ssladapter.h" +#include "rtc_base/socket_adapters.h" +#include "rtc_base/socket_server.h" +#include "rtc_base/ssl_adapter.h" #include "rtc_base/thread.h" namespace rtc { diff --git a/p2p/base/basic_packet_socket_factory.h b/p2p/base/basic_packet_socket_factory.h index 29f82db13d..266c638bb5 100644 --- a/p2p/base/basic_packet_socket_factory.h +++ b/p2p/base/basic_packet_socket_factory.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef P2P_BASE_BASICPACKETSOCKETFACTORY_H_ -#define P2P_BASE_BASICPACKETSOCKETFACTORY_H_ +#ifndef P2P_BASE_BASIC_PACKET_SOCKET_FACTORY_H_ +#define P2P_BASE_BASIC_PACKET_SOCKET_FACTORY_H_ #include -#include "p2p/base/packetsocketfactory.h" +#include "p2p/base/packet_socket_factory.h" namespace rtc { @@ -63,4 +63,4 @@ class BasicPacketSocketFactory : public PacketSocketFactory { } // namespace rtc -#endif // P2P_BASE_BASICPACKETSOCKETFACTORY_H_ +#endif // P2P_BASE_BASIC_PACKET_SOCKET_FACTORY_H_ diff --git a/p2p/base/candidate_pair_interface.h b/p2p/base/candidate_pair_interface.h index ff0bfcbdde..2b68fd7ea9 100644 --- a/p2p/base/candidate_pair_interface.h +++ b/p2p/base/candidate_pair_interface.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef P2P_BASE_CANDIDATEPAIRINTERFACE_H_ -#define P2P_BASE_CANDIDATEPAIRINTERFACE_H_ +#ifndef P2P_BASE_CANDIDATE_PAIR_INTERFACE_H_ +#define P2P_BASE_CANDIDATE_PAIR_INTERFACE_H_ namespace cricket { @@ -25,4 +25,4 @@ class CandidatePairInterface { } // namespace cricket -#endif // P2P_BASE_CANDIDATEPAIRINTERFACE_H_ +#endif // P2P_BASE_CANDIDATE_PAIR_INTERFACE_H_ diff --git a/p2p/base/dtls_transport.cc b/p2p/base/dtls_transport.cc index 75e0c1b87b..ba565ca96f 100644 --- a/p2p/base/dtls_transport.cc +++ b/p2p/base/dtls_transport.cc @@ -12,20 +12,20 @@ #include #include -#include "p2p/base/dtlstransport.h" +#include "p2p/base/dtls_transport.h" #include "absl/memory/memory.h" #include "logging/rtc_event_log/events/rtc_event_dtls_transport_state.h" #include "logging/rtc_event_log/events/rtc_event_dtls_writable_state.h" #include "logging/rtc_event_log/rtc_event_log.h" -#include "p2p/base/packettransportinternal.h" +#include "p2p/base/packet_transport_internal.h" #include "rtc_base/buffer.h" #include "rtc_base/checks.h" #include "rtc_base/dscp.h" #include "rtc_base/logging.h" -#include "rtc_base/messagequeue.h" -#include "rtc_base/rtccertificate.h" -#include "rtc_base/sslstreamadapter.h" +#include "rtc_base/message_queue.h" +#include "rtc_base/rtc_certificate.h" +#include "rtc_base/ssl_stream_adapter.h" #include "rtc_base/stream.h" #include "rtc_base/thread.h" diff --git a/p2p/base/dtls_transport.h b/p2p/base/dtls_transport.h index 6fb5d6c447..ceef1dcf32 100644 --- a/p2p/base/dtls_transport.h +++ b/p2p/base/dtls_transport.h @@ -8,20 +8,20 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef P2P_BASE_DTLSTRANSPORT_H_ -#define P2P_BASE_DTLSTRANSPORT_H_ +#ifndef P2P_BASE_DTLS_TRANSPORT_H_ +#define P2P_BASE_DTLS_TRANSPORT_H_ #include #include #include -#include "api/crypto/cryptooptions.h" -#include "p2p/base/dtlstransportinternal.h" -#include "p2p/base/icetransportinternal.h" +#include "api/crypto/crypto_options.h" +#include "p2p/base/dtls_transport_internal.h" +#include "p2p/base/ice_transport_internal.h" #include "rtc_base/buffer.h" -#include "rtc_base/bufferqueue.h" -#include "rtc_base/constructormagic.h" -#include "rtc_base/sslstreamadapter.h" +#include "rtc_base/buffer_queue.h" +#include "rtc_base/constructor_magic.h" +#include "rtc_base/ssl_stream_adapter.h" #include "rtc_base/stream.h" #include "rtc_base/strings/string_builder.h" #include "rtc_base/thread_checker.h" @@ -251,4 +251,4 @@ class DtlsTransport : public DtlsTransportInternal { } // namespace cricket -#endif // P2P_BASE_DTLSTRANSPORT_H_ +#endif // P2P_BASE_DTLS_TRANSPORT_H_ diff --git a/p2p/base/dtls_transport_internal.cc b/p2p/base/dtls_transport_internal.cc index a294ccbc4e..6997dbc702 100644 --- a/p2p/base/dtls_transport_internal.cc +++ b/p2p/base/dtls_transport_internal.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "p2p/base/dtlstransportinternal.h" +#include "p2p/base/dtls_transport_internal.h" namespace cricket { diff --git a/p2p/base/dtls_transport_internal.h b/p2p/base/dtls_transport_internal.h index 6aa4b38417..3054169547 100644 --- a/p2p/base/dtls_transport_internal.h +++ b/p2p/base/dtls_transport_internal.h @@ -8,22 +8,22 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef P2P_BASE_DTLSTRANSPORTINTERNAL_H_ -#define P2P_BASE_DTLSTRANSPORTINTERNAL_H_ +#ifndef P2P_BASE_DTLS_TRANSPORT_INTERNAL_H_ +#define P2P_BASE_DTLS_TRANSPORT_INTERNAL_H_ #include #include #include #include -#include "api/crypto/cryptooptions.h" -#include "p2p/base/icetransportinternal.h" -#include "p2p/base/packettransportinternal.h" -#include "rtc_base/constructormagic.h" +#include "api/crypto/crypto_options.h" +#include "p2p/base/ice_transport_internal.h" +#include "p2p/base/packet_transport_internal.h" +#include "rtc_base/constructor_magic.h" #include "rtc_base/scoped_ref_ptr.h" -#include "rtc_base/sslcertificate.h" -#include "rtc_base/sslfingerprint.h" -#include "rtc_base/sslstreamadapter.h" +#include "rtc_base/ssl_certificate.h" +#include "rtc_base/ssl_fingerprint.h" +#include "rtc_base/ssl_stream_adapter.h" #include "rtc_base/third_party/sigslot/sigslot.h" namespace cricket { @@ -119,4 +119,4 @@ class DtlsTransportInternal : public rtc::PacketTransportInternal { } // namespace cricket -#endif // P2P_BASE_DTLSTRANSPORTINTERNAL_H_ +#endif // P2P_BASE_DTLS_TRANSPORT_INTERNAL_H_ diff --git a/p2p/base/dtls_transport_unittest.cc b/p2p/base/dtls_transport_unittest.cc index dad4ddd8a8..f1ee1e00ea 100644 --- a/p2p/base/dtls_transport_unittest.cc +++ b/p2p/base/dtls_transport_unittest.cc @@ -14,17 +14,17 @@ #include #include "absl/memory/memory.h" -#include "p2p/base/dtlstransport.h" -#include "p2p/base/fakeicetransport.h" -#include "p2p/base/packettransportinternal.h" +#include "p2p/base/dtls_transport.h" +#include "p2p/base/fake_ice_transport.h" +#include "p2p/base/packet_transport_internal.h" #include "rtc_base/checks.h" #include "rtc_base/dscp.h" #include "rtc_base/gunit.h" #include "rtc_base/helpers.h" -#include "rtc_base/rtccertificate.h" -#include "rtc_base/ssladapter.h" -#include "rtc_base/sslidentity.h" -#include "rtc_base/sslstreamadapter.h" +#include "rtc_base/rtc_certificate.h" +#include "rtc_base/ssl_adapter.h" +#include "rtc_base/ssl_identity.h" +#include "rtc_base/ssl_stream_adapter.h" #define MAYBE_SKIP_TEST(feature) \ if (!(rtc::SSLStreamAdapter::feature())) { \ diff --git a/p2p/base/fake_candidate_pair.h b/p2p/base/fake_candidate_pair.h index c49ac479bc..c31b69f8ad 100644 --- a/p2p/base/fake_candidate_pair.h +++ b/p2p/base/fake_candidate_pair.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef P2P_BASE_FAKECANDIDATEPAIR_H_ -#define P2P_BASE_FAKECANDIDATEPAIR_H_ +#ifndef P2P_BASE_FAKE_CANDIDATE_PAIR_H_ +#define P2P_BASE_FAKE_CANDIDATE_PAIR_H_ #include #include "api/candidate.h" -#include "p2p/base/candidatepairinterface.h" +#include "p2p/base/candidate_pair_interface.h" namespace cricket { @@ -51,4 +51,4 @@ class FakeCandidatePair : public CandidatePairInterface { } // namespace cricket -#endif // P2P_BASE_FAKECANDIDATEPAIR_H_ +#endif // P2P_BASE_FAKE_CANDIDATE_PAIR_H_ diff --git a/p2p/base/fake_dtls_transport.h b/p2p/base/fake_dtls_transport.h index daef5c77fc..c3626188aa 100644 --- a/p2p/base/fake_dtls_transport.h +++ b/p2p/base/fake_dtls_transport.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef P2P_BASE_FAKEDTLSTRANSPORT_H_ -#define P2P_BASE_FAKEDTLSTRANSPORT_H_ +#ifndef P2P_BASE_FAKE_DTLS_TRANSPORT_H_ +#define P2P_BASE_FAKE_DTLS_TRANSPORT_H_ #include #include @@ -17,11 +17,11 @@ #include #include "absl/memory/memory.h" -#include "api/crypto/cryptooptions.h" -#include "p2p/base/dtlstransportinternal.h" -#include "p2p/base/fakeicetransport.h" -#include "rtc_base/fakesslidentity.h" -#include "rtc_base/rtccertificate.h" +#include "api/crypto/crypto_options.h" +#include "p2p/base/dtls_transport_internal.h" +#include "p2p/base/fake_ice_transport.h" +#include "rtc_base/fake_ssl_identity.h" +#include "rtc_base/rtc_certificate.h" namespace cricket { @@ -288,4 +288,4 @@ class FakeDtlsTransport : public DtlsTransportInternal { } // namespace cricket -#endif // P2P_BASE_FAKEDTLSTRANSPORT_H_ +#endif // P2P_BASE_FAKE_DTLS_TRANSPORT_H_ diff --git a/p2p/base/fake_ice_transport.h b/p2p/base/fake_ice_transport.h index c36dd7fad8..8bcd723aeb 100644 --- a/p2p/base/fake_ice_transport.h +++ b/p2p/base/fake_ice_transport.h @@ -8,17 +8,17 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef P2P_BASE_FAKEICETRANSPORT_H_ -#define P2P_BASE_FAKEICETRANSPORT_H_ +#ifndef P2P_BASE_FAKE_ICE_TRANSPORT_H_ +#define P2P_BASE_FAKE_ICE_TRANSPORT_H_ #include #include #include #include "absl/types/optional.h" -#include "p2p/base/icetransportinternal.h" -#include "rtc_base/asyncinvoker.h" -#include "rtc_base/copyonwritebuffer.h" +#include "p2p/base/ice_transport_internal.h" +#include "rtc_base/async_invoker.h" +#include "rtc_base/copy_on_write_buffer.h" namespace cricket { @@ -325,4 +325,4 @@ class FakeIceTransport : public IceTransportInternal { } // namespace cricket -#endif // P2P_BASE_FAKEICETRANSPORT_H_ +#endif // P2P_BASE_FAKE_ICE_TRANSPORT_H_ diff --git a/p2p/base/fake_packet_transport.h b/p2p/base/fake_packet_transport.h index 52b39215c7..6f79aadda1 100644 --- a/p2p/base/fake_packet_transport.h +++ b/p2p/base/fake_packet_transport.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef P2P_BASE_FAKEPACKETTRANSPORT_H_ -#define P2P_BASE_FAKEPACKETTRANSPORT_H_ +#ifndef P2P_BASE_FAKE_PACKET_TRANSPORT_H_ +#define P2P_BASE_FAKE_PACKET_TRANSPORT_H_ #include -#include "api/ortc/packettransportinterface.h" -#include "p2p/base/packettransportinternal.h" -#include "rtc_base/asyncinvoker.h" -#include "rtc_base/copyonwritebuffer.h" +#include "api/ortc/packet_transport_interface.h" +#include "p2p/base/packet_transport_internal.h" +#include "rtc_base/async_invoker.h" +#include "rtc_base/copy_on_write_buffer.h" namespace rtc { @@ -137,4 +137,4 @@ class FakePacketTransport : public PacketTransportInternal { } // namespace rtc -#endif // P2P_BASE_FAKEPACKETTRANSPORT_H_ +#endif // P2P_BASE_FAKE_PACKET_TRANSPORT_H_ diff --git a/p2p/base/fake_port_allocator.h b/p2p/base/fake_port_allocator.h index fc5f23722f..ab61c802fb 100644 --- a/p2p/base/fake_port_allocator.h +++ b/p2p/base/fake_port_allocator.h @@ -8,18 +8,18 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef P2P_BASE_FAKEPORTALLOCATOR_H_ -#define P2P_BASE_FAKEPORTALLOCATOR_H_ +#ifndef P2P_BASE_FAKE_PORT_ALLOCATOR_H_ +#define P2P_BASE_FAKE_PORT_ALLOCATOR_H_ #include #include #include -#include "p2p/base/basicpacketsocketfactory.h" -#include "p2p/base/portallocator.h" -#include "p2p/base/udpport.h" +#include "p2p/base/basic_packet_socket_factory.h" +#include "p2p/base/port_allocator.h" +#include "p2p/base/udp_port.h" #include "rtc_base/bind.h" -#include "rtc_base/nethelpers.h" +#include "rtc_base/net_helpers.h" #include "rtc_base/thread.h" namespace rtc { @@ -264,4 +264,4 @@ class FakePortAllocator : public cricket::PortAllocator { } // namespace cricket -#endif // P2P_BASE_FAKEPORTALLOCATOR_H_ +#endif // P2P_BASE_FAKE_PORT_ALLOCATOR_H_ diff --git a/p2p/base/ice_credentials_iterator.cc b/p2p/base/ice_credentials_iterator.cc index e51111f8a4..373c8510ac 100644 --- a/p2p/base/ice_credentials_iterator.cc +++ b/p2p/base/ice_credentials_iterator.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "p2p/base/icecredentialsiterator.h" +#include "p2p/base/ice_credentials_iterator.h" -#include "p2p/base/p2pconstants.h" +#include "p2p/base/p2p_constants.h" #include "rtc_base/helpers.h" namespace cricket { diff --git a/p2p/base/ice_credentials_iterator.h b/p2p/base/ice_credentials_iterator.h index 33e1d6460a..fa331cc6eb 100644 --- a/p2p/base/ice_credentials_iterator.h +++ b/p2p/base/ice_credentials_iterator.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef P2P_BASE_ICECREDENTIALSITERATOR_H_ -#define P2P_BASE_ICECREDENTIALSITERATOR_H_ +#ifndef P2P_BASE_ICE_CREDENTIALS_ITERATOR_H_ +#define P2P_BASE_ICE_CREDENTIALS_ITERATOR_H_ #include -#include "p2p/base/transportdescription.h" +#include "p2p/base/transport_description.h" namespace cricket { @@ -34,4 +34,4 @@ class IceCredentialsIterator { } // namespace cricket -#endif // P2P_BASE_ICECREDENTIALSITERATOR_H_ +#endif // P2P_BASE_ICE_CREDENTIALS_ITERATOR_H_ diff --git a/p2p/base/ice_credentials_iterator_unittest.cc b/p2p/base/ice_credentials_iterator_unittest.cc index b84925e6de..92b65f3ec7 100644 --- a/p2p/base/ice_credentials_iterator_unittest.cc +++ b/p2p/base/ice_credentials_iterator_unittest.cc @@ -10,7 +10,7 @@ #include -#include "p2p/base/icecredentialsiterator.h" +#include "p2p/base/ice_credentials_iterator.h" #include "test/gtest.h" using cricket::IceParameters; diff --git a/p2p/base/ice_transport_internal.cc b/p2p/base/ice_transport_internal.cc index 62bfb567e3..1d5b6e7403 100644 --- a/p2p/base/ice_transport_internal.cc +++ b/p2p/base/ice_transport_internal.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "p2p/base/icetransportinternal.h" +#include "p2p/base/ice_transport_internal.h" -#include "p2p/base/p2pconstants.h" +#include "p2p/base/p2p_constants.h" namespace cricket { diff --git a/p2p/base/ice_transport_internal.h b/p2p/base/ice_transport_internal.h index acc716965c..f3da45a787 100644 --- a/p2p/base/ice_transport_internal.h +++ b/p2p/base/ice_transport_internal.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef P2P_BASE_ICETRANSPORTINTERNAL_H_ -#define P2P_BASE_ICETRANSPORTINTERNAL_H_ +#ifndef P2P_BASE_ICE_TRANSPORT_INTERNAL_H_ +#define P2P_BASE_ICE_TRANSPORT_INTERNAL_H_ #include #include @@ -18,13 +18,13 @@ #include "absl/types/optional.h" #include "api/candidate.h" #include "api/transport/enums.h" -#include "p2p/base/packettransportinternal.h" +#include "p2p/base/packet_transport_internal.h" #include "p2p/base/port.h" -#include "p2p/base/transportdescription.h" +#include "p2p/base/transport_description.h" #include "rtc_base/network_constants.h" #include "rtc_base/system/rtc_export.h" #include "rtc_base/third_party/sigslot/sigslot.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/time_utils.h" namespace cricket { @@ -287,4 +287,4 @@ class RTC_EXPORT IceTransportInternal : public rtc::PacketTransportInternal { } // namespace cricket -#endif // P2P_BASE_ICETRANSPORTINTERNAL_H_ +#endif // P2P_BASE_ICE_TRANSPORT_INTERNAL_H_ diff --git a/p2p/base/mdns_message.cc b/p2p/base/mdns_message.cc index f14a0d117e..52ba70c8ab 100644 --- a/p2p/base/mdns_message.cc +++ b/p2p/base/mdns_message.cc @@ -10,8 +10,8 @@ #include "p2p/base/mdns_message.h" #include "rtc_base/logging.h" -#include "rtc_base/nethelpers.h" -#include "rtc_base/stringencode.h" +#include "rtc_base/net_helpers.h" +#include "rtc_base/string_encode.h" namespace webrtc { diff --git a/p2p/base/mdns_message.h b/p2p/base/mdns_message.h index a172444d42..303c6bb34c 100644 --- a/p2p/base/mdns_message.h +++ b/p2p/base/mdns_message.h @@ -25,8 +25,8 @@ #include #include -#include "rtc_base/bytebuffer.h" -#include "rtc_base/ipaddress.h" +#include "rtc_base/byte_buffer.h" +#include "rtc_base/ip_address.h" #include "rtc_base/message_buffer_reader.h" namespace webrtc { diff --git a/p2p/base/mdns_message_unittest.cc b/p2p/base/mdns_message_unittest.cc index 7f816f740b..a742ccb137 100644 --- a/p2p/base/mdns_message_unittest.cc +++ b/p2p/base/mdns_message_unittest.cc @@ -13,10 +13,10 @@ #include #include "p2p/base/mdns_message.h" -#include "rtc_base/bytebuffer.h" +#include "rtc_base/byte_buffer.h" #include "rtc_base/gunit.h" -#include "rtc_base/ipaddress.h" -#include "rtc_base/socketaddress.h" +#include "rtc_base/ip_address.h" +#include "rtc_base/socket_address.h" #include "test/gmock.h" #define ReadMdnsMessage(X, Y) ReadMdnsMessageTestCase(X, Y, sizeof(Y)) diff --git a/p2p/base/mock_async_resolver.h b/p2p/base/mock_async_resolver.h index 0ca6e8b27a..7d3be5b0b0 100644 --- a/p2p/base/mock_async_resolver.h +++ b/p2p/base/mock_async_resolver.h @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef P2P_BASE_MOCKASYNCRESOLVER_H_ -#define P2P_BASE_MOCKASYNCRESOLVER_H_ +#ifndef P2P_BASE_MOCK_ASYNC_RESOLVER_H_ +#define P2P_BASE_MOCK_ASYNC_RESOLVER_H_ -#include "api/asyncresolverfactory.h" -#include "rtc_base/asyncresolverinterface.h" +#include "api/async_resolver_factory.h" +#include "rtc_base/async_resolver_interface.h" #include "test/gmock.h" namespace rtc { @@ -50,4 +50,4 @@ class MockAsyncResolverFactory : public AsyncResolverFactory { } // namespace webrtc -#endif // P2P_BASE_MOCKASYNCRESOLVER_H_ +#endif // P2P_BASE_MOCK_ASYNC_RESOLVER_H_ diff --git a/p2p/base/mock_ice_transport.h b/p2p/base/mock_ice_transport.h index b18ce3d5ad..e0ad1e2180 100644 --- a/p2p/base/mock_ice_transport.h +++ b/p2p/base/mock_ice_transport.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef P2P_BASE_MOCKICETRANSPORT_H_ -#define P2P_BASE_MOCKICETRANSPORT_H_ +#ifndef P2P_BASE_MOCK_ICE_TRANSPORT_H_ +#define P2P_BASE_MOCK_ICE_TRANSPORT_H_ #include #include #include -#include "p2p/base/icetransportinternal.h" +#include "p2p/base/ice_transport_internal.h" #include "rtc_base/gunit.h" #include "test/gmock.h" @@ -78,4 +78,4 @@ class MockIceTransport : public IceTransportInternal { } // namespace cricket -#endif // P2P_BASE_MOCKICETRANSPORT_H_ +#endif // P2P_BASE_MOCK_ICE_TRANSPORT_H_ diff --git a/p2p/base/p2p_constants.cc b/p2p/base/p2p_constants.cc index 41d02dd968..619b73922a 100644 --- a/p2p/base/p2p_constants.cc +++ b/p2p/base/p2p_constants.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "p2p/base/p2pconstants.h" +#include "p2p/base/p2p_constants.h" namespace cricket { diff --git a/p2p/base/p2p_constants.h b/p2p/base/p2p_constants.h index a27e90b8ed..bdd1ebeb09 100644 --- a/p2p/base/p2p_constants.h +++ b/p2p/base/p2p_constants.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef P2P_BASE_P2PCONSTANTS_H_ -#define P2P_BASE_P2PCONSTANTS_H_ +#ifndef P2P_BASE_P2P_CONSTANTS_H_ +#define P2P_BASE_P2P_CONSTANTS_H_ #include #include @@ -108,4 +108,4 @@ extern const int MIN_CONNECTION_LIFETIME; } // namespace cricket -#endif // P2P_BASE_P2PCONSTANTS_H_ +#endif // P2P_BASE_P2P_CONSTANTS_H_ diff --git a/p2p/base/p2p_transport_channel.cc b/p2p/base/p2p_transport_channel.cc index 6506b53917..f1c8d1aa98 100644 --- a/p2p/base/p2p_transport_channel.cc +++ b/p2p/base/p2p_transport_channel.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "p2p/base/p2ptransportchannel.h" +#include "p2p/base/p2p_transport_channel.h" #include #include @@ -16,16 +16,16 @@ #include #include "api/candidate.h" -#include "logging/rtc_event_log/icelogger.h" -#include "p2p/base/candidatepairinterface.h" +#include "logging/rtc_event_log/ice_logger.h" +#include "p2p/base/candidate_pair_interface.h" #include "p2p/base/port.h" #include "rtc_base/checks.h" #include "rtc_base/crc32.h" #include "rtc_base/logging.h" -#include "rtc_base/nethelper.h" -#include "rtc_base/nethelpers.h" -#include "rtc_base/stringencode.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/net_helper.h" +#include "rtc_base/net_helpers.h" +#include "rtc_base/string_encode.h" +#include "rtc_base/time_utils.h" #include "system_wrappers/include/field_trial.h" #include "system_wrappers/include/metrics.h" diff --git a/p2p/base/p2p_transport_channel.h b/p2p/base/p2p_transport_channel.h index abedd0bdd3..5e15f76c72 100644 --- a/p2p/base/p2p_transport_channel.h +++ b/p2p/base/p2p_transport_channel.h @@ -17,8 +17,8 @@ // When all of the available connections become invalid (non-writable), we // kick off a process of determining more candidates and more connections. // -#ifndef P2P_BASE_P2PTRANSPORTCHANNEL_H_ -#define P2P_BASE_P2PTRANSPORTCHANNEL_H_ +#ifndef P2P_BASE_P2P_TRANSPORT_CHANNEL_H_ +#define P2P_BASE_P2P_TRANSPORT_CHANNEL_H_ #include #include @@ -27,20 +27,20 @@ #include #include -#include "api/asyncresolverfactory.h" +#include "api/async_resolver_factory.h" #include "api/candidate.h" -#include "api/rtcerror.h" +#include "api/rtc_error.h" #include "logging/rtc_event_log/events/rtc_event_ice_candidate_pair_config.h" -#include "logging/rtc_event_log/icelogger.h" -#include "p2p/base/candidatepairinterface.h" -#include "p2p/base/icetransportinternal.h" -#include "p2p/base/p2pconstants.h" -#include "p2p/base/portallocator.h" -#include "p2p/base/portinterface.h" -#include "p2p/base/regatheringcontroller.h" -#include "rtc_base/asyncinvoker.h" -#include "rtc_base/asyncpacketsocket.h" -#include "rtc_base/constructormagic.h" +#include "logging/rtc_event_log/ice_logger.h" +#include "p2p/base/candidate_pair_interface.h" +#include "p2p/base/ice_transport_internal.h" +#include "p2p/base/p2p_constants.h" +#include "p2p/base/port_allocator.h" +#include "p2p/base/port_interface.h" +#include "p2p/base/regathering_controller.h" +#include "rtc_base/async_invoker.h" +#include "rtc_base/async_packet_socket.h" +#include "rtc_base/constructor_magic.h" #include "rtc_base/strings/string_builder.h" #include "rtc_base/system/rtc_export.h" #include "rtc_base/third_party/sigslot/sigslot.h" @@ -452,4 +452,4 @@ class RTC_EXPORT P2PTransportChannel : public IceTransportInternal { } // namespace cricket -#endif // P2P_BASE_P2PTRANSPORTCHANNEL_H_ +#endif // P2P_BASE_P2P_TRANSPORT_CHANNEL_H_ diff --git a/p2p/base/p2p_transport_channel_unittest.cc b/p2p/base/p2p_transport_channel_unittest.cc index bd767cd2fc..9beb075e6f 100644 --- a/p2p/base/p2p_transport_channel_unittest.cc +++ b/p2p/base/p2p_transport_channel_unittest.cc @@ -13,30 +13,30 @@ #include #include "absl/memory/memory.h" -#include "p2p/base/fakeportallocator.h" -#include "p2p/base/icetransportinternal.h" -#include "p2p/base/mockasyncresolver.h" -#include "p2p/base/p2ptransportchannel.h" -#include "p2p/base/packettransportinternal.h" -#include "p2p/base/testrelayserver.h" -#include "p2p/base/teststunserver.h" -#include "p2p/base/testturnserver.h" -#include "p2p/client/basicportallocator.h" +#include "p2p/base/fake_port_allocator.h" +#include "p2p/base/ice_transport_internal.h" +#include "p2p/base/mock_async_resolver.h" +#include "p2p/base/p2p_transport_channel.h" +#include "p2p/base/packet_transport_internal.h" +#include "p2p/base/test_relay_server.h" +#include "p2p/base/test_stun_server.h" +#include "p2p/base/test_turn_server.h" +#include "p2p/client/basic_port_allocator.h" #include "rtc_base/checks.h" #include "rtc_base/dscp.h" -#include "rtc_base/fakeclock.h" -#include "rtc_base/fakenetwork.h" -#include "rtc_base/firewallsocketserver.h" +#include "rtc_base/fake_clock.h" +#include "rtc_base/fake_network.h" +#include "rtc_base/firewall_socket_server.h" #include "rtc_base/gunit.h" #include "rtc_base/helpers.h" #include "rtc_base/logging.h" -#include "rtc_base/natserver.h" -#include "rtc_base/natsocketfactory.h" -#include "rtc_base/proxyserver.h" -#include "rtc_base/socketaddress.h" -#include "rtc_base/ssladapter.h" +#include "rtc_base/nat_server.h" +#include "rtc_base/nat_socket_factory.h" +#include "rtc_base/proxy_server.h" +#include "rtc_base/socket_address.h" +#include "rtc_base/ssl_adapter.h" #include "rtc_base/thread.h" -#include "rtc_base/virtualsocketserver.h" +#include "rtc_base/virtual_socket_server.h" #include "system_wrappers/include/metrics.h" namespace { diff --git a/p2p/base/packet_loss_estimator.cc b/p2p/base/packet_loss_estimator.cc index be326f423d..435fbb0304 100644 --- a/p2p/base/packet_loss_estimator.cc +++ b/p2p/base/packet_loss_estimator.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "p2p/base/packetlossestimator.h" +#include "p2p/base/packet_loss_estimator.h" #include "rtc_base/checks.h" diff --git a/p2p/base/packet_loss_estimator.h b/p2p/base/packet_loss_estimator.h index a97c8b2f96..09a46fd378 100644 --- a/p2p/base/packet_loss_estimator.h +++ b/p2p/base/packet_loss_estimator.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef P2P_BASE_PACKETLOSSESTIMATOR_H_ -#define P2P_BASE_PACKETLOSSESTIMATOR_H_ +#ifndef P2P_BASE_PACKET_LOSS_ESTIMATOR_H_ +#define P2P_BASE_PACKET_LOSS_ESTIMATOR_H_ #include #include @@ -82,4 +82,4 @@ class PacketLossEstimator { } // namespace cricket -#endif // P2P_BASE_PACKETLOSSESTIMATOR_H_ +#endif // P2P_BASE_PACKET_LOSS_ESTIMATOR_H_ diff --git a/p2p/base/packet_loss_estimator_unittest.cc b/p2p/base/packet_loss_estimator_unittest.cc index ac17fc563d..f45d52e745 100644 --- a/p2p/base/packet_loss_estimator_unittest.cc +++ b/p2p/base/packet_loss_estimator_unittest.cc @@ -11,7 +11,7 @@ #include #include -#include "p2p/base/packetlossestimator.h" +#include "p2p/base/packet_loss_estimator.h" #include "test/gtest.h" using cricket::PacketLossEstimator; diff --git a/p2p/base/packet_socket_factory.cc b/p2p/base/packet_socket_factory.cc index d2f4c96c52..2739dbccf9 100644 --- a/p2p/base/packet_socket_factory.cc +++ b/p2p/base/packet_socket_factory.cc @@ -10,7 +10,7 @@ #include -#include "p2p/base/packetsocketfactory.h" +#include "p2p/base/packet_socket_factory.h" namespace rtc { diff --git a/p2p/base/packet_socket_factory.h b/p2p/base/packet_socket_factory.h index c903df06c8..a430d2ee3c 100644 --- a/p2p/base/packet_socket_factory.h +++ b/p2p/base/packet_socket_factory.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef P2P_BASE_PACKETSOCKETFACTORY_H_ -#define P2P_BASE_PACKETSOCKETFACTORY_H_ +#ifndef P2P_BASE_PACKET_SOCKET_FACTORY_H_ +#define P2P_BASE_PACKET_SOCKET_FACTORY_H_ #include #include -#include "rtc_base/constructormagic.h" -#include "rtc_base/proxyinfo.h" -#include "rtc_base/sslcertificate.h" +#include "rtc_base/constructor_magic.h" +#include "rtc_base/proxy_info.h" +#include "rtc_base/ssl_certificate.h" #include "rtc_base/system/rtc_export.h" namespace rtc { @@ -91,4 +91,4 @@ class RTC_EXPORT PacketSocketFactory { } // namespace rtc -#endif // P2P_BASE_PACKETSOCKETFACTORY_H_ +#endif // P2P_BASE_PACKET_SOCKET_FACTORY_H_ diff --git a/p2p/base/packet_transport_interface.h b/p2p/base/packet_transport_interface.h index aa65ee0397..7076c30794 100644 --- a/p2p/base/packet_transport_interface.h +++ b/p2p/base/packet_transport_interface.h @@ -12,13 +12,13 @@ // uses it. // TODO(deadbeef): Update chromium and remove this file. -#ifndef P2P_BASE_PACKETTRANSPORTINTERFACE_H_ -#define P2P_BASE_PACKETTRANSPORTINTERFACE_H_ +#ifndef P2P_BASE_PACKET_TRANSPORT_INTERFACE_H_ +#define P2P_BASE_PACKET_TRANSPORT_INTERFACE_H_ -#include "p2p/base/packettransportinternal.h" +#include "p2p/base/packet_transport_internal.h" namespace rtc { typedef PacketTransportInternal PacketTransportInterface; } -#endif // P2P_BASE_PACKETTRANSPORTINTERFACE_H_ +#endif // P2P_BASE_PACKET_TRANSPORT_INTERFACE_H_ diff --git a/p2p/base/packet_transport_internal.cc b/p2p/base/packet_transport_internal.cc index ba5f1e9068..8fda899d64 100644 --- a/p2p/base/packet_transport_internal.cc +++ b/p2p/base/packet_transport_internal.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "p2p/base/packettransportinternal.h" +#include "p2p/base/packet_transport_internal.h" namespace rtc { diff --git a/p2p/base/packet_transport_internal.h b/p2p/base/packet_transport_internal.h index 7d50f9c0ee..24723e9fce 100644 --- a/p2p/base/packet_transport_internal.h +++ b/p2p/base/packet_transport_internal.h @@ -8,18 +8,18 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef P2P_BASE_PACKETTRANSPORTINTERNAL_H_ -#define P2P_BASE_PACKETTRANSPORTINTERNAL_H_ +#ifndef P2P_BASE_PACKET_TRANSPORT_INTERNAL_H_ +#define P2P_BASE_PACKET_TRANSPORT_INTERNAL_H_ #include #include #include "absl/types/optional.h" // This is included for PacketOptions. -#include "api/ortc/packettransportinterface.h" +#include "api/ortc/packet_transport_interface.h" #include "p2p/base/port.h" -#include "rtc_base/asyncpacketsocket.h" -#include "rtc_base/networkroute.h" +#include "rtc_base/async_packet_socket.h" +#include "rtc_base/network_route.h" #include "rtc_base/socket.h" #include "rtc_base/system/rtc_export.h" #include "rtc_base/third_party/sigslot/sigslot.h" @@ -108,4 +108,4 @@ class RTC_EXPORT PacketTransportInternal } // namespace rtc -#endif // P2P_BASE_PACKETTRANSPORTINTERNAL_H_ +#endif // P2P_BASE_PACKET_TRANSPORT_INTERNAL_H_ diff --git a/p2p/base/port.cc b/p2p/base/port.cc index 24aed8e3d3..dd8c0ecb37 100644 --- a/p2p/base/port.cc +++ b/p2p/base/port.cc @@ -18,16 +18,16 @@ #include "absl/memory/memory.h" #include "absl/strings/match.h" -#include "p2p/base/portallocator.h" +#include "p2p/base/port_allocator.h" #include "rtc_base/checks.h" #include "rtc_base/crc32.h" #include "rtc_base/helpers.h" #include "rtc_base/logging.h" #include "rtc_base/mdns_responder_interface.h" -#include "rtc_base/messagedigest.h" +#include "rtc_base/message_digest.h" #include "rtc_base/network.h" #include "rtc_base/numerics/safe_minmax.h" -#include "rtc_base/stringencode.h" +#include "rtc_base/string_encode.h" #include "rtc_base/third_party/base64/base64.h" namespace { diff --git a/p2p/base/port.h b/p2p/base/port.h index 503737796a..cd8b737fb2 100644 --- a/p2p/base/port.h +++ b/p2p/base/port.h @@ -19,24 +19,24 @@ #include "absl/types/optional.h" #include "api/candidate.h" -#include "api/rtcerror.h" +#include "api/rtc_error.h" #include "logging/rtc_event_log/events/rtc_event_ice_candidate_pair.h" #include "logging/rtc_event_log/events/rtc_event_ice_candidate_pair_config.h" -#include "logging/rtc_event_log/icelogger.h" -#include "p2p/base/candidatepairinterface.h" -#include "p2p/base/p2pconstants.h" -#include "p2p/base/packetlossestimator.h" -#include "p2p/base/packetsocketfactory.h" -#include "p2p/base/portinterface.h" +#include "logging/rtc_event_log/ice_logger.h" +#include "p2p/base/candidate_pair_interface.h" +#include "p2p/base/p2p_constants.h" +#include "p2p/base/packet_loss_estimator.h" +#include "p2p/base/packet_socket_factory.h" +#include "p2p/base/port_interface.h" #include "p2p/base/stun.h" -#include "p2p/base/stunrequest.h" -#include "rtc_base/asyncpacketsocket.h" +#include "p2p/base/stun_request.h" +#include "rtc_base/async_packet_socket.h" #include "rtc_base/checks.h" -#include "rtc_base/nethelper.h" +#include "rtc_base/net_helper.h" #include "rtc_base/network.h" -#include "rtc_base/proxyinfo.h" -#include "rtc_base/ratetracker.h" -#include "rtc_base/socketaddress.h" +#include "rtc_base/proxy_info.h" +#include "rtc_base/rate_tracker.h" +#include "rtc_base/socket_address.h" #include "rtc_base/system/rtc_export.h" #include "rtc_base/third_party/sigslot/sigslot.h" #include "rtc_base/thread.h" diff --git a/p2p/base/port_allocator.cc b/p2p/base/port_allocator.cc index 38619467c4..c6ea6fd765 100644 --- a/p2p/base/port_allocator.cc +++ b/p2p/base/port_allocator.cc @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "p2p/base/portallocator.h" +#include "p2p/base/port_allocator.h" #include #include #include -#include "p2p/base/icecredentialsiterator.h" +#include "p2p/base/ice_credentials_iterator.h" #include "rtc_base/checks.h" #include "rtc_base/logging.h" diff --git a/p2p/base/port_allocator.h b/p2p/base/port_allocator.h index 7026f2b2b6..33745ea1ba 100644 --- a/p2p/base/port_allocator.h +++ b/p2p/base/port_allocator.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef P2P_BASE_PORTALLOCATOR_H_ -#define P2P_BASE_PORTALLOCATOR_H_ +#ifndef P2P_BASE_PORT_ALLOCATOR_H_ +#define P2P_BASE_PORT_ALLOCATOR_H_ #include #include @@ -17,10 +17,10 @@ #include #include "p2p/base/port.h" -#include "p2p/base/portinterface.h" +#include "p2p/base/port_interface.h" #include "rtc_base/helpers.h" -#include "rtc_base/proxyinfo.h" -#include "rtc_base/sslcertificate.h" +#include "rtc_base/proxy_info.h" +#include "rtc_base/ssl_certificate.h" #include "rtc_base/system/rtc_export.h" #include "rtc_base/third_party/sigslot/sigslot.h" #include "rtc_base/thread.h" @@ -626,4 +626,4 @@ class RTC_EXPORT PortAllocator : public sigslot::has_slots<> { } // namespace cricket -#endif // P2P_BASE_PORTALLOCATOR_H_ +#endif // P2P_BASE_PORT_ALLOCATOR_H_ diff --git a/p2p/base/port_allocator_unittest.cc b/p2p/base/port_allocator_unittest.cc index 9c1d3070f7..c82810270d 100644 --- a/p2p/base/port_allocator_unittest.cc +++ b/p2p/base/port_allocator_unittest.cc @@ -10,10 +10,10 @@ #include -#include "p2p/base/fakeportallocator.h" -#include "p2p/base/portallocator.h" +#include "p2p/base/fake_port_allocator.h" +#include "p2p/base/port_allocator.h" #include "rtc_base/thread.h" -#include "rtc_base/virtualsocketserver.h" +#include "rtc_base/virtual_socket_server.h" #include "test/gtest.h" static const char kContentName[] = "test content"; diff --git a/p2p/base/port_interface.cc b/p2p/base/port_interface.cc index 73fe296d70..9175ca54e3 100644 --- a/p2p/base/port_interface.cc +++ b/p2p/base/port_interface.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "p2p/base/portinterface.h" +#include "p2p/base/port_interface.h" namespace cricket { diff --git a/p2p/base/port_interface.h b/p2p/base/port_interface.h index 60fa4444b3..24f2e2afa4 100644 --- a/p2p/base/port_interface.h +++ b/p2p/base/port_interface.h @@ -8,17 +8,17 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef P2P_BASE_PORTINTERFACE_H_ -#define P2P_BASE_PORTINTERFACE_H_ +#ifndef P2P_BASE_PORT_INTERFACE_H_ +#define P2P_BASE_PORT_INTERFACE_H_ #include #include #include "absl/types/optional.h" #include "api/candidate.h" -#include "p2p/base/transportdescription.h" -#include "rtc_base/asyncpacketsocket.h" -#include "rtc_base/socketaddress.h" +#include "p2p/base/transport_description.h" +#include "rtc_base/async_packet_socket.h" +#include "rtc_base/socket_address.h" namespace rtc { class Network; @@ -142,4 +142,4 @@ class PortInterface { } // namespace cricket -#endif // P2P_BASE_PORTINTERFACE_H_ +#endif // P2P_BASE_PORT_INTERFACE_H_ diff --git a/p2p/base/port_unittest.cc b/p2p/base/port_unittest.cc index ba7de1951e..8857a978e9 100644 --- a/p2p/base/port_unittest.cc +++ b/p2p/base/port_unittest.cc @@ -20,50 +20,50 @@ #include "absl/types/optional.h" #include "api/candidate.h" #include "api/units/time_delta.h" -#include "p2p/base/basicpacketsocketfactory.h" -#include "p2p/base/p2pconstants.h" -#include "p2p/base/packetsocketfactory.h" +#include "p2p/base/basic_packet_socket_factory.h" +#include "p2p/base/p2p_constants.h" +#include "p2p/base/packet_socket_factory.h" #include "p2p/base/port.h" -#include "p2p/base/portallocator.h" -#include "p2p/base/portinterface.h" -#include "p2p/base/relayport.h" +#include "p2p/base/port_allocator.h" +#include "p2p/base/port_interface.h" +#include "p2p/base/relay_port.h" #include "p2p/base/stun.h" -#include "p2p/base/stunport.h" -#include "p2p/base/stunserver.h" -#include "p2p/base/tcpport.h" -#include "p2p/base/testrelayserver.h" -#include "p2p/base/teststunserver.h" -#include "p2p/base/testturnserver.h" -#include "p2p/base/transportdescription.h" -#include "p2p/base/turnport.h" -#include "p2p/base/turnserver.h" -#include "p2p/client/relayportfactoryinterface.h" +#include "p2p/base/stun_port.h" +#include "p2p/base/stun_server.h" +#include "p2p/base/tcp_port.h" +#include "p2p/base/test_relay_server.h" +#include "p2p/base/test_stun_server.h" +#include "p2p/base/test_turn_server.h" +#include "p2p/base/transport_description.h" +#include "p2p/base/turn_port.h" +#include "p2p/base/turn_server.h" +#include "p2p/client/relay_port_factory_interface.h" #include "rtc_base/arraysize.h" -#include "rtc_base/asyncpacketsocket.h" -#include "rtc_base/asyncsocket.h" +#include "rtc_base/async_packet_socket.h" +#include "rtc_base/async_socket.h" #include "rtc_base/buffer.h" -#include "rtc_base/bytebuffer.h" +#include "rtc_base/byte_buffer.h" #include "rtc_base/checks.h" #include "rtc_base/dscp.h" -#include "rtc_base/fakeclock.h" +#include "rtc_base/fake_clock.h" #include "rtc_base/gunit.h" #include "rtc_base/helpers.h" #include "rtc_base/logging.h" -#include "rtc_base/natserver.h" -#include "rtc_base/natsocketfactory.h" -#include "rtc_base/nattypes.h" -#include "rtc_base/nethelper.h" +#include "rtc_base/nat_server.h" +#include "rtc_base/nat_socket_factory.h" +#include "rtc_base/nat_types.h" +#include "rtc_base/net_helper.h" #include "rtc_base/network.h" #include "rtc_base/network/sent_packet.h" #include "rtc_base/network_constants.h" -#include "rtc_base/proxyinfo.h" +#include "rtc_base/proxy_info.h" #include "rtc_base/socket.h" -#include "rtc_base/socketadapters.h" -#include "rtc_base/socketaddress.h" +#include "rtc_base/socket_adapters.h" +#include "rtc_base/socket_address.h" #include "rtc_base/third_party/sigslot/sigslot.h" #include "rtc_base/thread.h" -#include "rtc_base/timeutils.h" -#include "rtc_base/virtualsocketserver.h" +#include "rtc_base/time_utils.h" +#include "rtc_base/virtual_socket_server.h" #include "test/gtest.h" using rtc::AsyncPacketSocket; diff --git a/p2p/base/pseudo_tcp.cc b/p2p/base/pseudo_tcp.cc index cac0a924c4..44c59c5367 100644 --- a/p2p/base/pseudo_tcp.cc +++ b/p2p/base/pseudo_tcp.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "p2p/base/pseudotcp.h" +#include "p2p/base/pseudo_tcp.h" #include #include @@ -17,13 +17,13 @@ #include #include -#include "rtc_base/bytebuffer.h" -#include "rtc_base/byteorder.h" +#include "rtc_base/byte_buffer.h" +#include "rtc_base/byte_order.h" #include "rtc_base/checks.h" #include "rtc_base/logging.h" #include "rtc_base/numerics/safe_minmax.h" #include "rtc_base/socket.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/time_utils.h" // The following logging is for detailed (packet-level) analysis only. #define _DBG_NONE 0 diff --git a/p2p/base/pseudo_tcp.h b/p2p/base/pseudo_tcp.h index 2522bdc96f..4849c2aec0 100644 --- a/p2p/base/pseudo_tcp.h +++ b/p2p/base/pseudo_tcp.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef P2P_BASE_PSEUDOTCP_H_ -#define P2P_BASE_PSEUDOTCP_H_ +#ifndef P2P_BASE_PSEUDO_TCP_H_ +#define P2P_BASE_PSEUDO_TCP_H_ #include #include @@ -246,4 +246,4 @@ class RTC_EXPORT PseudoTcp { } // namespace cricket -#endif // P2P_BASE_PSEUDOTCP_H_ +#endif // P2P_BASE_PSEUDO_TCP_H_ diff --git a/p2p/base/pseudo_tcp_unittest.cc b/p2p/base/pseudo_tcp_unittest.cc index 104d31c073..b54291113e 100644 --- a/p2p/base/pseudo_tcp_unittest.cc +++ b/p2p/base/pseudo_tcp_unittest.cc @@ -14,16 +14,16 @@ #include #include -#include "p2p/base/pseudotcp.h" +#include "p2p/base/pseudo_tcp.h" #include "rtc_base/gunit.h" #include "rtc_base/helpers.h" #include "rtc_base/location.h" #include "rtc_base/logging.h" #include "rtc_base/memory_stream.h" -#include "rtc_base/messagehandler.h" -#include "rtc_base/messagequeue.h" +#include "rtc_base/message_handler.h" +#include "rtc_base/message_queue.h" #include "rtc_base/thread.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/time_utils.h" #include "test/gtest.h" using cricket::PseudoTcp; diff --git a/p2p/base/regathering_controller.cc b/p2p/base/regathering_controller.cc index 6d4c4fd978..a4d21eb079 100644 --- a/p2p/base/regathering_controller.cc +++ b/p2p/base/regathering_controller.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "p2p/base/regatheringcontroller.h" +#include "p2p/base/regathering_controller.h" namespace webrtc { diff --git a/p2p/base/regathering_controller.h b/p2p/base/regathering_controller.h index 891ec85b88..234aea3b57 100644 --- a/p2p/base/regathering_controller.h +++ b/p2p/base/regathering_controller.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef P2P_BASE_REGATHERINGCONTROLLER_H_ -#define P2P_BASE_REGATHERINGCONTROLLER_H_ +#ifndef P2P_BASE_REGATHERING_CONTROLLER_H_ +#define P2P_BASE_REGATHERING_CONTROLLER_H_ -#include "p2p/base/icetransportinternal.h" -#include "p2p/base/portallocator.h" -#include "rtc_base/asyncinvoker.h" +#include "p2p/base/ice_transport_internal.h" +#include "p2p/base/port_allocator.h" +#include "rtc_base/async_invoker.h" #include "rtc_base/random.h" #include "rtc_base/thread.h" @@ -121,4 +121,4 @@ class BasicRegatheringController : public sigslot::has_slots<> { } // namespace webrtc -#endif // P2P_BASE_REGATHERINGCONTROLLER_H_ +#endif // P2P_BASE_REGATHERING_CONTROLLER_H_ diff --git a/p2p/base/regathering_controller_unittest.cc b/p2p/base/regathering_controller_unittest.cc index 6ae64e8658..c90beb622a 100644 --- a/p2p/base/regathering_controller_unittest.cc +++ b/p2p/base/regathering_controller_unittest.cc @@ -13,18 +13,18 @@ #include #include -#include "p2p/base/fakeportallocator.h" -#include "p2p/base/mockicetransport.h" -#include "p2p/base/p2pconstants.h" +#include "p2p/base/fake_port_allocator.h" +#include "p2p/base/mock_ice_transport.h" +#include "p2p/base/p2p_constants.h" #include "p2p/base/port.h" -#include "p2p/base/regatheringcontroller.h" -#include "p2p/base/stunserver.h" +#include "p2p/base/regathering_controller.h" +#include "p2p/base/stun_server.h" #include "rtc_base/gunit.h" -#include "rtc_base/refcountedobject.h" +#include "rtc_base/ref_counted_object.h" #include "rtc_base/scoped_ref_ptr.h" -#include "rtc_base/socketaddress.h" +#include "rtc_base/socket_address.h" #include "rtc_base/thread.h" -#include "rtc_base/virtualsocketserver.h" +#include "rtc_base/virtual_socket_server.h" namespace { diff --git a/p2p/base/relay_port.cc b/p2p/base/relay_port.cc index 211484e841..ebaefa7823 100644 --- a/p2p/base/relay_port.cc +++ b/p2p/base/relay_port.cc @@ -11,20 +11,20 @@ #include #include -#include "p2p/base/relayport.h" +#include "p2p/base/relay_port.h" #include "p2p/base/stun.h" -#include "p2p/base/stunrequest.h" -#include "rtc_base/asyncpacketsocket.h" -#include "rtc_base/bytebuffer.h" +#include "p2p/base/stun_request.h" +#include "rtc_base/async_packet_socket.h" +#include "rtc_base/byte_buffer.h" #include "rtc_base/checks.h" #include "rtc_base/dscp.h" #include "rtc_base/location.h" #include "rtc_base/logging.h" -#include "rtc_base/messagehandler.h" -#include "rtc_base/messagequeue.h" -#include "rtc_base/nethelper.h" -#include "rtc_base/proxyinfo.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/message_handler.h" +#include "rtc_base/message_queue.h" +#include "rtc_base/net_helper.h" +#include "rtc_base/proxy_info.h" +#include "rtc_base/time_utils.h" namespace cricket { diff --git a/p2p/base/relay_port.h b/p2p/base/relay_port.h index 5989f76e81..f9121ad1d4 100644 --- a/p2p/base/relay_port.h +++ b/p2p/base/relay_port.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef P2P_BASE_RELAYPORT_H_ -#define P2P_BASE_RELAYPORT_H_ +#ifndef P2P_BASE_RELAY_PORT_H_ +#define P2P_BASE_RELAY_PORT_H_ #include #include @@ -19,7 +19,7 @@ #include "absl/memory/memory.h" #include "p2p/base/port.h" -#include "p2p/base/stunrequest.h" +#include "p2p/base/stun_request.h" namespace cricket { @@ -115,4 +115,4 @@ class RelayPort : public Port { } // namespace cricket -#endif // P2P_BASE_RELAYPORT_H_ +#endif // P2P_BASE_RELAY_PORT_H_ diff --git a/p2p/base/relay_port_unittest.cc b/p2p/base/relay_port_unittest.cc index 1ca69f4ef9..5f410e6397 100644 --- a/p2p/base/relay_port_unittest.cc +++ b/p2p/base/relay_port_unittest.cc @@ -11,17 +11,17 @@ #include #include -#include "p2p/base/basicpacketsocketfactory.h" -#include "p2p/base/relayport.h" -#include "p2p/base/relayserver.h" +#include "p2p/base/basic_packet_socket_factory.h" +#include "p2p/base/relay_port.h" +#include "p2p/base/relay_server.h" #include "rtc_base/gunit.h" #include "rtc_base/helpers.h" #include "rtc_base/logging.h" -#include "rtc_base/socketadapters.h" -#include "rtc_base/socketaddress.h" -#include "rtc_base/ssladapter.h" +#include "rtc_base/socket_adapters.h" +#include "rtc_base/socket_address.h" +#include "rtc_base/ssl_adapter.h" #include "rtc_base/thread.h" -#include "rtc_base/virtualsocketserver.h" +#include "rtc_base/virtual_socket_server.h" using rtc::SocketAddress; diff --git a/p2p/base/relay_server.cc b/p2p/base/relay_server.cc index 0f712a959d..80b51b228b 100644 --- a/p2p/base/relay_server.cc +++ b/p2p/base/relay_server.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "p2p/base/relayserver.h" +#include "p2p/base/relay_server.h" #ifdef WEBRTC_POSIX #include @@ -17,7 +17,7 @@ #include #include -#include "rtc_base/asynctcpsocket.h" +#include "rtc_base/async_tcp_socket.h" #include "rtc_base/checks.h" #include "rtc_base/helpers.h" #include "rtc_base/logging.h" diff --git a/p2p/base/relay_server.h b/p2p/base/relay_server.h index 5ba5e065a8..3b9e9be1cb 100644 --- a/p2p/base/relay_server.h +++ b/p2p/base/relay_server.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef P2P_BASE_RELAYSERVER_H_ -#define P2P_BASE_RELAYSERVER_H_ +#ifndef P2P_BASE_RELAY_SERVER_H_ +#define P2P_BASE_RELAY_SERVER_H_ #include #include @@ -17,11 +17,11 @@ #include "p2p/base/port.h" #include "p2p/base/stun.h" -#include "rtc_base/asyncudpsocket.h" +#include "rtc_base/async_udp_socket.h" #include "rtc_base/random.h" -#include "rtc_base/socketaddresspair.h" +#include "rtc_base/socket_address_pair.h" #include "rtc_base/thread.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/time_utils.h" namespace cricket { @@ -232,4 +232,4 @@ class RelayServerBinding : public rtc::MessageHandler { } // namespace cricket -#endif // P2P_BASE_RELAYSERVER_H_ +#endif // P2P_BASE_RELAY_SERVER_H_ diff --git a/p2p/base/relay_server_unittest.cc b/p2p/base/relay_server_unittest.cc index 5399cf1577..a64cf4f981 100644 --- a/p2p/base/relay_server_unittest.cc +++ b/p2p/base/relay_server_unittest.cc @@ -14,14 +14,14 @@ #include #include "absl/memory/memory.h" -#include "p2p/base/relayserver.h" -#include "rtc_base/asyncudpsocket.h" -#include "rtc_base/bytebuffer.h" +#include "p2p/base/relay_server.h" +#include "rtc_base/async_udp_socket.h" +#include "rtc_base/byte_buffer.h" #include "rtc_base/helpers.h" -#include "rtc_base/socketaddress.h" -#include "rtc_base/testclient.h" +#include "rtc_base/socket_address.h" +#include "rtc_base/test_client.h" #include "rtc_base/thread.h" -#include "rtc_base/virtualsocketserver.h" +#include "rtc_base/virtual_socket_server.h" #include "test/gtest.h" using rtc::SocketAddress; diff --git a/p2p/base/stun.cc b/p2p/base/stun.cc index dd0fa627b7..66b53128a5 100644 --- a/p2p/base/stun.cc +++ b/p2p/base/stun.cc @@ -17,11 +17,11 @@ #include #include "absl/memory/memory.h" -#include "rtc_base/byteorder.h" +#include "rtc_base/byte_order.h" #include "rtc_base/checks.h" #include "rtc_base/crc32.h" #include "rtc_base/logging.h" -#include "rtc_base/messagedigest.h" +#include "rtc_base/message_digest.h" using rtc::ByteBufferReader; using rtc::ByteBufferWriter; diff --git a/p2p/base/stun.h b/p2p/base/stun.h index ca664b02fc..e61b345fd7 100644 --- a/p2p/base/stun.h +++ b/p2p/base/stun.h @@ -20,9 +20,9 @@ #include #include -#include "rtc_base/bytebuffer.h" -#include "rtc_base/ipaddress.h" -#include "rtc_base/socketaddress.h" +#include "rtc_base/byte_buffer.h" +#include "rtc_base/ip_address.h" +#include "rtc_base/socket_address.h" namespace cricket { diff --git a/p2p/base/stun_port.cc b/p2p/base/stun_port.cc index 727312329e..f94ea65c78 100644 --- a/p2p/base/stun_port.cc +++ b/p2p/base/stun_port.cc @@ -8,19 +8,19 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "p2p/base/stunport.h" +#include "p2p/base/stun_port.h" #include #include -#include "p2p/base/p2pconstants.h" -#include "p2p/base/portallocator.h" +#include "p2p/base/p2p_constants.h" +#include "p2p/base/port_allocator.h" #include "p2p/base/stun.h" #include "rtc_base/checks.h" #include "rtc_base/helpers.h" -#include "rtc_base/ipaddress.h" +#include "rtc_base/ip_address.h" #include "rtc_base/logging.h" -#include "rtc_base/nethelpers.h" +#include "rtc_base/net_helpers.h" #include "rtc_base/strings/string_builder.h" namespace cricket { diff --git a/p2p/base/stun_port.h b/p2p/base/stun_port.h index d7c9cb8a4f..1ee07279c9 100644 --- a/p2p/base/stun_port.h +++ b/p2p/base/stun_port.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef P2P_BASE_STUNPORT_H_ -#define P2P_BASE_STUNPORT_H_ +#ifndef P2P_BASE_STUN_PORT_H_ +#define P2P_BASE_STUN_PORT_H_ #include #include @@ -17,8 +17,8 @@ #include "absl/memory/memory.h" #include "p2p/base/port.h" -#include "p2p/base/stunrequest.h" -#include "rtc_base/asyncpacketsocket.h" +#include "p2p/base/stun_request.h" +#include "rtc_base/async_packet_socket.h" // TODO(mallinath) - Rename stunport.cc|h to udpport.cc|h. @@ -294,4 +294,4 @@ class StunPort : public UDPPort { } // namespace cricket -#endif // P2P_BASE_STUNPORT_H_ +#endif // P2P_BASE_STUN_PORT_H_ diff --git a/p2p/base/stun_port_unittest.cc b/p2p/base/stun_port_unittest.cc index 01518a9468..7e7e2deae2 100644 --- a/p2p/base/stun_port_unittest.cc +++ b/p2p/base/stun_port_unittest.cc @@ -10,14 +10,14 @@ #include -#include "p2p/base/basicpacketsocketfactory.h" -#include "p2p/base/stunport.h" -#include "p2p/base/teststunserver.h" +#include "p2p/base/basic_packet_socket_factory.h" +#include "p2p/base/stun_port.h" +#include "p2p/base/test_stun_server.h" #include "rtc_base/gunit.h" #include "rtc_base/helpers.h" -#include "rtc_base/socketaddress.h" -#include "rtc_base/ssladapter.h" -#include "rtc_base/virtualsocketserver.h" +#include "rtc_base/socket_address.h" +#include "rtc_base/ssl_adapter.h" +#include "rtc_base/virtual_socket_server.h" #include "test/gmock.h" using cricket::ServerAddresses; diff --git a/p2p/base/stun_request.cc b/p2p/base/stun_request.cc index edba4d68e5..f97ca869bf 100644 --- a/p2p/base/stun_request.cc +++ b/p2p/base/stun_request.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "p2p/base/stunrequest.h" +#include "p2p/base/stun_request.h" #include #include @@ -18,7 +18,7 @@ #include "rtc_base/checks.h" #include "rtc_base/helpers.h" #include "rtc_base/logging.h" -#include "rtc_base/timeutils.h" // For TimeMillis +#include "rtc_base/time_utils.h" // For TimeMillis namespace cricket { diff --git a/p2p/base/stun_request.h b/p2p/base/stun_request.h index 4a9a9b4a13..7994fb6709 100644 --- a/p2p/base/stun_request.h +++ b/p2p/base/stun_request.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef P2P_BASE_STUNREQUEST_H_ -#define P2P_BASE_STUNREQUEST_H_ +#ifndef P2P_BASE_STUN_REQUEST_H_ +#define P2P_BASE_STUN_REQUEST_H_ #include #include @@ -17,8 +17,8 @@ #include #include "p2p/base/stun.h" -#include "rtc_base/messagehandler.h" -#include "rtc_base/messagequeue.h" +#include "rtc_base/message_handler.h" +#include "rtc_base/message_queue.h" #include "rtc_base/third_party/sigslot/sigslot.h" #include "rtc_base/thread.h" @@ -154,4 +154,4 @@ class StunRequest : public rtc::MessageHandler { } // namespace cricket -#endif // P2P_BASE_STUNREQUEST_H_ +#endif // P2P_BASE_STUN_REQUEST_H_ diff --git a/p2p/base/stun_request_unittest.cc b/p2p/base/stun_request_unittest.cc index 94ea1cd619..e2ac57f0ea 100644 --- a/p2p/base/stun_request_unittest.cc +++ b/p2p/base/stun_request_unittest.cc @@ -10,11 +10,11 @@ #include -#include "p2p/base/stunrequest.h" -#include "rtc_base/fakeclock.h" +#include "p2p/base/stun_request.h" +#include "rtc_base/fake_clock.h" #include "rtc_base/gunit.h" #include "rtc_base/logging.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/time_utils.h" #include "test/gtest.h" namespace cricket { diff --git a/p2p/base/stun_server.cc b/p2p/base/stun_server.cc index 95f0cebe0a..38ccc3fab3 100644 --- a/p2p/base/stun_server.cc +++ b/p2p/base/stun_server.cc @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "p2p/base/stunserver.h" +#include "p2p/base/stun_server.h" #include -#include "rtc_base/bytebuffer.h" +#include "rtc_base/byte_buffer.h" #include "rtc_base/logging.h" namespace cricket { diff --git a/p2p/base/stun_server.h b/p2p/base/stun_server.h index b379513282..7ddc5c10e3 100644 --- a/p2p/base/stun_server.h +++ b/p2p/base/stun_server.h @@ -8,17 +8,17 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef P2P_BASE_STUNSERVER_H_ -#define P2P_BASE_STUNSERVER_H_ +#ifndef P2P_BASE_STUN_SERVER_H_ +#define P2P_BASE_STUN_SERVER_H_ #include #include #include #include "p2p/base/stun.h" -#include "rtc_base/asyncpacketsocket.h" -#include "rtc_base/asyncudpsocket.h" -#include "rtc_base/socketaddress.h" +#include "rtc_base/async_packet_socket.h" +#include "rtc_base/async_udp_socket.h" +#include "rtc_base/socket_address.h" #include "rtc_base/third_party/sigslot/sigslot.h" namespace cricket { @@ -67,4 +67,4 @@ class StunServer : public sigslot::has_slots<> { } // namespace cricket -#endif // P2P_BASE_STUNSERVER_H_ +#endif // P2P_BASE_STUN_SERVER_H_ diff --git a/p2p/base/stun_server_unittest.cc b/p2p/base/stun_server_unittest.cc index 154d5b857c..b5cc1dfae5 100644 --- a/p2p/base/stun_server_unittest.cc +++ b/p2p/base/stun_server_unittest.cc @@ -13,13 +13,13 @@ #include #include "absl/memory/memory.h" -#include "p2p/base/stunserver.h" -#include "rtc_base/bytebuffer.h" -#include "rtc_base/ipaddress.h" +#include "p2p/base/stun_server.h" +#include "rtc_base/byte_buffer.h" +#include "rtc_base/ip_address.h" #include "rtc_base/logging.h" -#include "rtc_base/testclient.h" +#include "rtc_base/test_client.h" #include "rtc_base/thread.h" -#include "rtc_base/virtualsocketserver.h" +#include "rtc_base/virtual_socket_server.h" #include "test/gtest.h" namespace cricket { diff --git a/p2p/base/stun_unittest.cc b/p2p/base/stun_unittest.cc index 4c57b2a7ee..60a0f7ef78 100644 --- a/p2p/base/stun_unittest.cc +++ b/p2p/base/stun_unittest.cc @@ -15,9 +15,9 @@ #include "absl/memory/memory.h" #include "p2p/base/stun.h" #include "rtc_base/arraysize.h" -#include "rtc_base/bytebuffer.h" -#include "rtc_base/byteorder.h" -#include "rtc_base/socketaddress.h" +#include "rtc_base/byte_buffer.h" +#include "rtc_base/byte_order.h" +#include "rtc_base/socket_address.h" #include "test/gtest.h" namespace cricket { diff --git a/p2p/base/tcp_port.cc b/p2p/base/tcp_port.cc index 490db1ac00..af49389364 100644 --- a/p2p/base/tcp_port.cc +++ b/p2p/base/tcp_port.cc @@ -64,19 +64,19 @@ * */ -#include "p2p/base/tcpport.h" +#include "p2p/base/tcp_port.h" #include #include #include -#include "p2p/base/p2pconstants.h" +#include "p2p/base/p2p_constants.h" #include "rtc_base/checks.h" -#include "rtc_base/ipaddress.h" +#include "rtc_base/ip_address.h" #include "rtc_base/location.h" #include "rtc_base/logging.h" -#include "rtc_base/nethelper.h" -#include "rtc_base/ratetracker.h" +#include "rtc_base/net_helper.h" +#include "rtc_base/rate_tracker.h" #include "rtc_base/third_party/sigslot/sigslot.h" namespace cricket { diff --git a/p2p/base/tcp_port.h b/p2p/base/tcp_port.h index 4d06a6507c..67716f73b2 100644 --- a/p2p/base/tcp_port.h +++ b/p2p/base/tcp_port.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef P2P_BASE_TCPPORT_H_ -#define P2P_BASE_TCPPORT_H_ +#ifndef P2P_BASE_TCP_PORT_H_ +#define P2P_BASE_TCP_PORT_H_ #include #include @@ -17,7 +17,7 @@ #include "absl/memory/memory.h" #include "p2p/base/port.h" -#include "rtc_base/asyncpacketsocket.h" +#include "rtc_base/async_packet_socket.h" namespace cricket { @@ -188,4 +188,4 @@ class TCPConnection : public Connection { } // namespace cricket -#endif // P2P_BASE_TCPPORT_H_ +#endif // P2P_BASE_TCP_PORT_H_ diff --git a/p2p/base/tcp_port_unittest.cc b/p2p/base/tcp_port_unittest.cc index 7899591759..b5b1f64e88 100644 --- a/p2p/base/tcp_port_unittest.cc +++ b/p2p/base/tcp_port_unittest.cc @@ -12,17 +12,17 @@ #include #include -#include "p2p/base/basicpacketsocketfactory.h" -#include "p2p/base/p2pconstants.h" -#include "p2p/base/tcpport.h" -#include "p2p/base/transportdescription.h" +#include "p2p/base/basic_packet_socket_factory.h" +#include "p2p/base/p2p_constants.h" +#include "p2p/base/tcp_port.h" +#include "p2p/base/transport_description.h" #include "rtc_base/gunit.h" #include "rtc_base/helpers.h" -#include "rtc_base/ipaddress.h" +#include "rtc_base/ip_address.h" #include "rtc_base/third_party/sigslot/sigslot.h" #include "rtc_base/thread.h" -#include "rtc_base/timeutils.h" -#include "rtc_base/virtualsocketserver.h" +#include "rtc_base/time_utils.h" +#include "rtc_base/virtual_socket_server.h" #include "test/gtest.h" using rtc::SocketAddress; diff --git a/p2p/base/test_relay_server.h b/p2p/base/test_relay_server.h index 9aca2f6bcb..be58251cd6 100644 --- a/p2p/base/test_relay_server.h +++ b/p2p/base/test_relay_server.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef P2P_BASE_TESTRELAYSERVER_H_ -#define P2P_BASE_TESTRELAYSERVER_H_ +#ifndef P2P_BASE_TEST_RELAY_SERVER_H_ +#define P2P_BASE_TEST_RELAY_SERVER_H_ #include -#include "p2p/base/relayserver.h" -#include "rtc_base/asynctcpsocket.h" +#include "p2p/base/relay_server.h" +#include "rtc_base/async_tcp_socket.h" #include "rtc_base/server_socket_adapters.h" #include "rtc_base/third_party/sigslot/sigslot.h" #include "rtc_base/thread.h" @@ -98,4 +98,4 @@ class TestRelayServer : public sigslot::has_slots<> { } // namespace cricket -#endif // P2P_BASE_TESTRELAYSERVER_H_ +#endif // P2P_BASE_TEST_RELAY_SERVER_H_ diff --git a/p2p/base/test_stun_server.cc b/p2p/base/test_stun_server.cc index e299224598..3c98cd8d64 100644 --- a/p2p/base/test_stun_server.cc +++ b/p2p/base/test_stun_server.cc @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "p2p/base/teststunserver.h" +#include "p2p/base/test_stun_server.h" -#include "rtc_base/asyncsocket.h" -#include "rtc_base/socketserver.h" +#include "rtc_base/async_socket.h" +#include "rtc_base/socket_server.h" namespace cricket { diff --git a/p2p/base/test_stun_server.h b/p2p/base/test_stun_server.h index e0d94b7285..44e3927ee9 100644 --- a/p2p/base/test_stun_server.h +++ b/p2p/base/test_stun_server.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef P2P_BASE_TESTSTUNSERVER_H_ -#define P2P_BASE_TESTSTUNSERVER_H_ +#ifndef P2P_BASE_TEST_STUN_SERVER_H_ +#define P2P_BASE_TEST_STUN_SERVER_H_ #include "p2p/base/stun.h" -#include "p2p/base/stunserver.h" -#include "rtc_base/asyncudpsocket.h" -#include "rtc_base/socketaddress.h" +#include "p2p/base/stun_server.h" +#include "rtc_base/async_udp_socket.h" +#include "rtc_base/socket_address.h" #include "rtc_base/thread.h" namespace cricket { @@ -42,4 +42,4 @@ class TestStunServer : StunServer { } // namespace cricket -#endif // P2P_BASE_TESTSTUNSERVER_H_ +#endif // P2P_BASE_TEST_STUN_SERVER_H_ diff --git a/p2p/base/test_turn_customizer.h b/p2p/base/test_turn_customizer.h index 7ca4579e98..ae8864acd2 100644 --- a/p2p/base/test_turn_customizer.h +++ b/p2p/base/test_turn_customizer.h @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef P2P_BASE_TESTTURNCUSTOMIZER_H_ -#define P2P_BASE_TESTTURNCUSTOMIZER_H_ +#ifndef P2P_BASE_TEST_TURN_CUSTOMIZER_H_ +#define P2P_BASE_TEST_TURN_CUSTOMIZER_H_ #include "absl/memory/memory.h" -#include "api/turncustomizer.h" +#include "api/turn_customizer.h" #include "rtc_base/gunit.h" namespace cricket { @@ -55,4 +55,4 @@ class TestTurnCustomizer : public webrtc::TurnCustomizer { } // namespace cricket -#endif // P2P_BASE_TESTTURNCUSTOMIZER_H_ +#endif // P2P_BASE_TEST_TURN_CUSTOMIZER_H_ diff --git a/p2p/base/test_turn_server.h b/p2p/base/test_turn_server.h index 734ca4d972..2bbe573ceb 100644 --- a/p2p/base/test_turn_server.h +++ b/p2p/base/test_turn_server.h @@ -8,18 +8,18 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef P2P_BASE_TESTTURNSERVER_H_ -#define P2P_BASE_TESTTURNSERVER_H_ +#ifndef P2P_BASE_TEST_TURN_SERVER_H_ +#define P2P_BASE_TEST_TURN_SERVER_H_ #include #include -#include "p2p/base/basicpacketsocketfactory.h" +#include "p2p/base/basic_packet_socket_factory.h" #include "p2p/base/stun.h" -#include "p2p/base/turnserver.h" -#include "rtc_base/asyncudpsocket.h" -#include "rtc_base/ssladapter.h" -#include "rtc_base/sslidentity.h" +#include "p2p/base/turn_server.h" +#include "rtc_base/async_udp_socket.h" +#include "rtc_base/ssl_adapter.h" +#include "rtc_base/ssl_identity.h" #include "rtc_base/thread.h" #include "rtc_base/thread_checker.h" @@ -152,4 +152,4 @@ class TestTurnServer : public TurnAuthInterface { } // namespace cricket -#endif // P2P_BASE_TESTTURNSERVER_H_ +#endif // P2P_BASE_TEST_TURN_SERVER_H_ diff --git a/p2p/base/transport_description.cc b/p2p/base/transport_description.cc index 95d7e2fcdd..1847eec975 100644 --- a/p2p/base/transport_description.cc +++ b/p2p/base/transport_description.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "p2p/base/transportdescription.h" +#include "p2p/base/transport_description.h" #include "absl/strings/match.h" #include "rtc_base/arraysize.h" diff --git a/p2p/base/transport_description.h b/p2p/base/transport_description.h index 2ab973278f..c3c14a6077 100644 --- a/p2p/base/transport_description.h +++ b/p2p/base/transport_description.h @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef P2P_BASE_TRANSPORTDESCRIPTION_H_ -#define P2P_BASE_TRANSPORTDESCRIPTION_H_ +#ifndef P2P_BASE_TRANSPORT_DESCRIPTION_H_ +#define P2P_BASE_TRANSPORT_DESCRIPTION_H_ #include #include #include #include -#include "p2p/base/p2pconstants.h" -#include "rtc_base/sslfingerprint.h" +#include "p2p/base/p2p_constants.h" +#include "rtc_base/ssl_fingerprint.h" namespace cricket { @@ -138,4 +138,4 @@ struct TransportDescription { } // namespace cricket -#endif // P2P_BASE_TRANSPORTDESCRIPTION_H_ +#endif // P2P_BASE_TRANSPORT_DESCRIPTION_H_ diff --git a/p2p/base/transport_description_factory.cc b/p2p/base/transport_description_factory.cc index 4e4f7241f2..d95328b121 100644 --- a/p2p/base/transport_description_factory.cc +++ b/p2p/base/transport_description_factory.cc @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "p2p/base/transportdescriptionfactory.h" +#include "p2p/base/transport_description_factory.h" #include #include #include #include "absl/memory/memory.h" -#include "p2p/base/transportdescription.h" +#include "p2p/base/transport_description.h" #include "rtc_base/logging.h" -#include "rtc_base/sslfingerprint.h" +#include "rtc_base/ssl_fingerprint.h" namespace cricket { diff --git a/p2p/base/transport_description_factory.h b/p2p/base/transport_description_factory.h index 55e5b9a140..c1656a0fac 100644 --- a/p2p/base/transport_description_factory.h +++ b/p2p/base/transport_description_factory.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef P2P_BASE_TRANSPORTDESCRIPTIONFACTORY_H_ -#define P2P_BASE_TRANSPORTDESCRIPTIONFACTORY_H_ +#ifndef P2P_BASE_TRANSPORT_DESCRIPTION_FACTORY_H_ +#define P2P_BASE_TRANSPORT_DESCRIPTION_FACTORY_H_ #include -#include "p2p/base/icecredentialsiterator.h" -#include "p2p/base/transportdescription.h" -#include "rtc_base/rtccertificate.h" +#include "p2p/base/ice_credentials_iterator.h" +#include "p2p/base/transport_description.h" +#include "rtc_base/rtc_certificate.h" namespace rtc { class SSLIdentity; @@ -83,4 +83,4 @@ class TransportDescriptionFactory { } // namespace cricket -#endif // P2P_BASE_TRANSPORTDESCRIPTIONFACTORY_H_ +#endif // P2P_BASE_TRANSPORT_DESCRIPTION_FACTORY_H_ diff --git a/p2p/base/transport_description_factory_unittest.cc b/p2p/base/transport_description_factory_unittest.cc index e8f623a01b..af91a212a3 100644 --- a/p2p/base/transport_description_factory_unittest.cc +++ b/p2p/base/transport_description_factory_unittest.cc @@ -14,14 +14,14 @@ #include #include -#include "p2p/base/p2pconstants.h" -#include "p2p/base/transportdescription.h" -#include "p2p/base/transportdescriptionfactory.h" -#include "rtc_base/copyonwritebuffer.h" -#include "rtc_base/fakesslidentity.h" -#include "rtc_base/sslcertificate.h" -#include "rtc_base/sslfingerprint.h" -#include "rtc_base/sslidentity.h" +#include "p2p/base/p2p_constants.h" +#include "p2p/base/transport_description.h" +#include "p2p/base/transport_description_factory.h" +#include "rtc_base/copy_on_write_buffer.h" +#include "rtc_base/fake_ssl_identity.h" +#include "rtc_base/ssl_certificate.h" +#include "rtc_base/ssl_fingerprint.h" +#include "rtc_base/ssl_identity.h" #include "test/gtest.h" using cricket::TransportDescriptionFactory; diff --git a/p2p/base/transport_factory_interface.h b/p2p/base/transport_factory_interface.h index 9805db005c..6da55345d2 100644 --- a/p2p/base/transport_factory_interface.h +++ b/p2p/base/transport_factory_interface.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef P2P_BASE_TRANSPORTFACTORYINTERFACE_H_ -#define P2P_BASE_TRANSPORTFACTORYINTERFACE_H_ +#ifndef P2P_BASE_TRANSPORT_FACTORY_INTERFACE_H_ +#define P2P_BASE_TRANSPORT_FACTORY_INTERFACE_H_ #include #include -#include "p2p/base/dtlstransportinternal.h" -#include "p2p/base/icetransportinternal.h" +#include "p2p/base/dtls_transport_internal.h" +#include "p2p/base/ice_transport_internal.h" namespace cricket { @@ -39,4 +39,4 @@ class TransportFactoryInterface { } // namespace cricket -#endif // P2P_BASE_TRANSPORTFACTORYINTERFACE_H_ +#endif // P2P_BASE_TRANSPORT_FACTORY_INTERFACE_H_ diff --git a/p2p/base/transport_info.h b/p2p/base/transport_info.h index 627c0f781f..1f60b64012 100644 --- a/p2p/base/transport_info.h +++ b/p2p/base/transport_info.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef P2P_BASE_TRANSPORTINFO_H_ -#define P2P_BASE_TRANSPORTINFO_H_ +#ifndef P2P_BASE_TRANSPORT_INFO_H_ +#define P2P_BASE_TRANSPORT_INFO_H_ #include #include #include "api/candidate.h" -#include "p2p/base/p2pconstants.h" -#include "p2p/base/transportdescription.h" +#include "p2p/base/p2p_constants.h" +#include "p2p/base/transport_description.h" #include "rtc_base/helpers.h" namespace cricket { @@ -39,4 +39,4 @@ typedef std::vector TransportInfos; } // namespace cricket -#endif // P2P_BASE_TRANSPORTINFO_H_ +#endif // P2P_BASE_TRANSPORT_INFO_H_ diff --git a/p2p/base/turn_port.cc b/p2p/base/turn_port.cc index eb0adfa3ce..bfaf45b5e8 100644 --- a/p2p/base/turn_port.cc +++ b/p2p/base/turn_port.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "p2p/base/turnport.h" +#include "p2p/base/turn_port.h" #include #include @@ -18,12 +18,12 @@ #include "absl/memory/memory.h" #include "absl/types/optional.h" #include "p2p/base/stun.h" -#include "rtc_base/asyncpacketsocket.h" -#include "rtc_base/byteorder.h" +#include "rtc_base/async_packet_socket.h" +#include "rtc_base/byte_order.h" #include "rtc_base/checks.h" #include "rtc_base/logging.h" -#include "rtc_base/nethelpers.h" -#include "rtc_base/socketaddress.h" +#include "rtc_base/net_helpers.h" +#include "rtc_base/socket_address.h" #include "rtc_base/strings/string_builder.h" namespace cricket { diff --git a/p2p/base/turn_port.h b/p2p/base/turn_port.h index e152e0a9df..3f2e95ccdf 100644 --- a/p2p/base/turn_port.h +++ b/p2p/base/turn_port.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef P2P_BASE_TURNPORT_H_ -#define P2P_BASE_TURNPORT_H_ +#ifndef P2P_BASE_TURN_PORT_H_ +#define P2P_BASE_TURN_PORT_H_ #include #include @@ -21,10 +21,10 @@ #include "absl/memory/memory.h" #include "p2p/base/port.h" -#include "p2p/client/basicportallocator.h" -#include "rtc_base/asyncinvoker.h" -#include "rtc_base/asyncpacketsocket.h" -#include "rtc_base/sslcertificate.h" +#include "p2p/client/basic_port_allocator.h" +#include "rtc_base/async_invoker.h" +#include "rtc_base/async_packet_socket.h" +#include "rtc_base/ssl_certificate.h" namespace webrtc { class TurnCustomizer; @@ -396,4 +396,4 @@ class TurnPort : public Port { } // namespace cricket -#endif // P2P_BASE_TURNPORT_H_ +#endif // P2P_BASE_TURN_PORT_H_ diff --git a/p2p/base/turn_port_unittest.cc b/p2p/base/turn_port_unittest.cc index cee1a2d67e..931f908a70 100644 --- a/p2p/base/turn_port_unittest.cc +++ b/p2p/base/turn_port_unittest.cc @@ -18,28 +18,28 @@ #include "absl/types/optional.h" #include "api/units/time_delta.h" -#include "p2p/base/basicpacketsocketfactory.h" -#include "p2p/base/p2pconstants.h" -#include "p2p/base/portallocator.h" -#include "p2p/base/stunport.h" -#include "p2p/base/testturncustomizer.h" -#include "p2p/base/testturnserver.h" -#include "p2p/base/transportdescription.h" -#include "p2p/base/turnport.h" -#include "p2p/base/turnserver.h" -#include "rtc_base/asyncsocket.h" +#include "p2p/base/basic_packet_socket_factory.h" +#include "p2p/base/p2p_constants.h" +#include "p2p/base/port_allocator.h" +#include "p2p/base/stun_port.h" +#include "p2p/base/test_turn_customizer.h" +#include "p2p/base/test_turn_server.h" +#include "p2p/base/transport_description.h" +#include "p2p/base/turn_port.h" +#include "p2p/base/turn_server.h" +#include "rtc_base/async_socket.h" #include "rtc_base/buffer.h" -#include "rtc_base/bytebuffer.h" +#include "rtc_base/byte_buffer.h" #include "rtc_base/checks.h" -#include "rtc_base/fakeclock.h" +#include "rtc_base/fake_clock.h" #include "rtc_base/gunit.h" #include "rtc_base/location.h" -#include "rtc_base/messagehandler.h" -#include "rtc_base/nethelper.h" -#include "rtc_base/socketaddress.h" +#include "rtc_base/message_handler.h" +#include "rtc_base/net_helper.h" +#include "rtc_base/socket_address.h" #include "rtc_base/thread.h" -#include "rtc_base/timeutils.h" -#include "rtc_base/virtualsocketserver.h" +#include "rtc_base/time_utils.h" +#include "rtc_base/virtual_socket_server.h" #include "test/gtest.h" using rtc::SocketAddress; diff --git a/p2p/base/turn_server.cc b/p2p/base/turn_server.cc index a8bb41c87a..62ef5d98ee 100644 --- a/p2p/base/turn_server.cc +++ b/p2p/base/turn_server.cc @@ -8,22 +8,22 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "p2p/base/turnserver.h" +#include "p2p/base/turn_server.h" #include // for std::tie #include #include "absl/memory/memory.h" -#include "p2p/base/asyncstuntcpsocket.h" -#include "p2p/base/packetsocketfactory.h" +#include "p2p/base/async_stun_tcp_socket.h" +#include "p2p/base/packet_socket_factory.h" #include "p2p/base/stun.h" #include "rtc_base/bind.h" -#include "rtc_base/bytebuffer.h" +#include "rtc_base/byte_buffer.h" #include "rtc_base/checks.h" #include "rtc_base/helpers.h" #include "rtc_base/logging.h" -#include "rtc_base/messagedigest.h" -#include "rtc_base/socketadapters.h" +#include "rtc_base/message_digest.h" +#include "rtc_base/socket_adapters.h" #include "rtc_base/strings/string_builder.h" #include "rtc_base/thread.h" diff --git a/p2p/base/turn_server.h b/p2p/base/turn_server.h index af51251bbc..690d6a9c95 100644 --- a/p2p/base/turn_server.h +++ b/p2p/base/turn_server.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef P2P_BASE_TURNSERVER_H_ -#define P2P_BASE_TURNSERVER_H_ +#ifndef P2P_BASE_TURN_SERVER_H_ +#define P2P_BASE_TURN_SERVER_H_ #include #include @@ -19,11 +19,11 @@ #include #include -#include "p2p/base/portinterface.h" -#include "rtc_base/asyncinvoker.h" -#include "rtc_base/asyncpacketsocket.h" -#include "rtc_base/messagequeue.h" -#include "rtc_base/socketaddress.h" +#include "p2p/base/port_interface.h" +#include "rtc_base/async_invoker.h" +#include "rtc_base/async_packet_socket.h" +#include "rtc_base/message_queue.h" +#include "rtc_base/socket_address.h" #include "rtc_base/third_party/sigslot/sigslot.h" #include "rtc_base/thread_checker.h" @@ -348,4 +348,4 @@ class TurnServer : public sigslot::has_slots<> { } // namespace cricket -#endif // P2P_BASE_TURNSERVER_H_ +#endif // P2P_BASE_TURN_SERVER_H_ diff --git a/p2p/base/turn_server_unittest.cc b/p2p/base/turn_server_unittest.cc index 279506a245..4080cec8da 100644 --- a/p2p/base/turn_server_unittest.cc +++ b/p2p/base/turn_server_unittest.cc @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "p2p/base/turnserver.h" +#include "p2p/base/turn_server.h" -#include "p2p/base/basicpacketsocketfactory.h" -#include "rtc_base/virtualsocketserver.h" +#include "p2p/base/basic_packet_socket_factory.h" +#include "rtc_base/virtual_socket_server.h" #include "test/gtest.h" // NOTE: This is a work in progress. Currently this file only has tests for diff --git a/p2p/base/udp_port.h b/p2p/base/udp_port.h index ce55101102..2fd68680cf 100644 --- a/p2p/base/udp_port.h +++ b/p2p/base/udp_port.h @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef P2P_BASE_UDPPORT_H_ -#define P2P_BASE_UDPPORT_H_ +#ifndef P2P_BASE_UDP_PORT_H_ +#define P2P_BASE_UDP_PORT_H_ // StunPort will be handling UDPPort functionality. -#include "p2p/base/stunport.h" +#include "p2p/base/stun_port.h" -#endif // P2P_BASE_UDPPORT_H_ +#endif // P2P_BASE_UDP_PORT_H_ diff --git a/p2p/client/basic_port_allocator.cc b/p2p/client/basic_port_allocator.cc index 5c3f63a557..6dc5dfc318 100644 --- a/p2p/client/basic_port_allocator.cc +++ b/p2p/client/basic_port_allocator.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "p2p/client/basicportallocator.h" +#include "p2p/client/basic_port_allocator.h" #include #include @@ -16,13 +16,13 @@ #include #include -#include "p2p/base/basicpacketsocketfactory.h" +#include "p2p/base/basic_packet_socket_factory.h" #include "p2p/base/port.h" -#include "p2p/base/relayport.h" -#include "p2p/base/stunport.h" -#include "p2p/base/tcpport.h" -#include "p2p/base/turnport.h" -#include "p2p/base/udpport.h" +#include "p2p/base/relay_port.h" +#include "p2p/base/stun_port.h" +#include "p2p/base/tcp_port.h" +#include "p2p/base/turn_port.h" +#include "p2p/base/udp_port.h" #include "rtc_base/checks.h" #include "rtc_base/helpers.h" #include "rtc_base/logging.h" diff --git a/p2p/client/basic_port_allocator.h b/p2p/client/basic_port_allocator.h index 672f3ddb7c..edc6b87cb0 100644 --- a/p2p/client/basic_port_allocator.h +++ b/p2p/client/basic_port_allocator.h @@ -8,19 +8,19 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef P2P_CLIENT_BASICPORTALLOCATOR_H_ -#define P2P_CLIENT_BASICPORTALLOCATOR_H_ +#ifndef P2P_CLIENT_BASIC_PORT_ALLOCATOR_H_ +#define P2P_CLIENT_BASIC_PORT_ALLOCATOR_H_ #include #include #include -#include "api/turncustomizer.h" -#include "p2p/base/portallocator.h" -#include "p2p/client/relayportfactoryinterface.h" -#include "p2p/client/turnportfactory.h" +#include "api/turn_customizer.h" +#include "p2p/base/port_allocator.h" +#include "p2p/client/relay_port_factory_interface.h" +#include "p2p/client/turn_port_factory.h" #include "rtc_base/checks.h" -#include "rtc_base/messagequeue.h" +#include "rtc_base/message_queue.h" #include "rtc_base/network.h" #include "rtc_base/system/rtc_export.h" #include "rtc_base/thread.h" @@ -410,4 +410,4 @@ class AllocationSequence : public rtc::MessageHandler, } // namespace cricket -#endif // P2P_CLIENT_BASICPORTALLOCATOR_H_ +#endif // P2P_CLIENT_BASIC_PORT_ALLOCATOR_H_ diff --git a/p2p/client/basic_port_allocator_unittest.cc b/p2p/client/basic_port_allocator_unittest.cc index 2b205e60f9..936ca2f225 100644 --- a/p2p/client/basic_port_allocator_unittest.cc +++ b/p2p/client/basic_port_allocator_unittest.cc @@ -12,34 +12,34 @@ #include #include // no-presubmit-check TODO(webrtc:8982) -#include "p2p/base/basicpacketsocketfactory.h" -#include "p2p/base/p2pconstants.h" -#include "p2p/base/stunport.h" -#include "p2p/base/stunrequest.h" -#include "p2p/base/stunserver.h" -#include "p2p/base/testrelayserver.h" -#include "p2p/base/teststunserver.h" -#include "p2p/base/testturnserver.h" -#include "p2p/client/basicportallocator.h" -#include "rtc_base/fakeclock.h" -#include "rtc_base/fakenetwork.h" -#include "rtc_base/firewallsocketserver.h" +#include "p2p/base/basic_packet_socket_factory.h" +#include "p2p/base/p2p_constants.h" +#include "p2p/base/stun_port.h" +#include "p2p/base/stun_request.h" +#include "p2p/base/stun_server.h" +#include "p2p/base/test_relay_server.h" +#include "p2p/base/test_stun_server.h" +#include "p2p/base/test_turn_server.h" +#include "p2p/client/basic_port_allocator.h" +#include "rtc_base/fake_clock.h" +#include "rtc_base/fake_network.h" +#include "rtc_base/firewall_socket_server.h" #include "rtc_base/gunit.h" -#include "rtc_base/ipaddress.h" +#include "rtc_base/ip_address.h" #include "rtc_base/logging.h" -#include "rtc_base/natserver.h" -#include "rtc_base/natsocketfactory.h" -#include "rtc_base/nattypes.h" -#include "rtc_base/nethelper.h" -#include "rtc_base/nethelpers.h" +#include "rtc_base/nat_server.h" +#include "rtc_base/nat_socket_factory.h" +#include "rtc_base/nat_types.h" +#include "rtc_base/net_helper.h" +#include "rtc_base/net_helpers.h" #include "rtc_base/network.h" #include "rtc_base/network_constants.h" -#include "rtc_base/networkmonitor.h" +#include "rtc_base/network_monitor.h" #include "rtc_base/socket.h" -#include "rtc_base/socketaddress.h" -#include "rtc_base/socketaddresspair.h" +#include "rtc_base/socket_address.h" +#include "rtc_base/socket_address_pair.h" #include "rtc_base/thread.h" -#include "rtc_base/virtualsocketserver.h" +#include "rtc_base/virtual_socket_server.h" #include "system_wrappers/include/metrics.h" #include "test/gtest.h" diff --git a/p2p/client/relay_port_factory_interface.h b/p2p/client/relay_port_factory_interface.h index 2afe6512fe..c1cf51e5c3 100644 --- a/p2p/client/relay_port_factory_interface.h +++ b/p2p/client/relay_port_factory_interface.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef P2P_CLIENT_RELAYPORTFACTORYINTERFACE_H_ -#define P2P_CLIENT_RELAYPORTFACTORYINTERFACE_H_ +#ifndef P2P_CLIENT_RELAY_PORT_FACTORY_INTERFACE_H_ +#define P2P_CLIENT_RELAY_PORT_FACTORY_INTERFACE_H_ #include #include -#include "p2p/base/portinterface.h" -#include "rtc_base/refcount.h" +#include "p2p/base/port_interface.h" +#include "rtc_base/ref_count.h" namespace rtc { class AsyncPacketSocket; @@ -67,4 +67,4 @@ class RelayPortFactoryInterface { } // namespace cricket -#endif // P2P_CLIENT_RELAYPORTFACTORYINTERFACE_H_ +#endif // P2P_CLIENT_RELAY_PORT_FACTORY_INTERFACE_H_ diff --git a/p2p/client/turn_port_factory.cc b/p2p/client/turn_port_factory.cc index 5465c36d7f..934c019bb7 100644 --- a/p2p/client/turn_port_factory.cc +++ b/p2p/client/turn_port_factory.cc @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "p2p/client/turnportfactory.h" +#include "p2p/client/turn_port_factory.h" #include #include -#include "p2p/base/portallocator.h" -#include "p2p/base/turnport.h" +#include "p2p/base/port_allocator.h" +#include "p2p/base/turn_port.h" namespace cricket { diff --git a/p2p/client/turn_port_factory.h b/p2p/client/turn_port_factory.h index ea199f4aae..abb1f67fe9 100644 --- a/p2p/client/turn_port_factory.h +++ b/p2p/client/turn_port_factory.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef P2P_CLIENT_TURNPORTFACTORY_H_ -#define P2P_CLIENT_TURNPORTFACTORY_H_ +#ifndef P2P_CLIENT_TURN_PORT_FACTORY_H_ +#define P2P_CLIENT_TURN_PORT_FACTORY_H_ #include #include "p2p/base/port.h" -#include "p2p/client/relayportfactoryinterface.h" -#include "rtc_base/asyncpacketsocket.h" +#include "p2p/client/relay_port_factory_interface.h" +#include "rtc_base/async_packet_socket.h" namespace cricket { @@ -34,4 +34,4 @@ class TurnPortFactory : public RelayPortFactoryInterface { } // namespace cricket -#endif // P2P_CLIENT_TURNPORTFACTORY_H_ +#endif // P2P_CLIENT_TURN_PORT_FACTORY_H_ diff --git a/p2p/stunprober/stun_prober.cc b/p2p/stunprober/stun_prober.cc index 9778416a1b..4fe572fd51 100644 --- a/p2p/stunprober/stun_prober.cc +++ b/p2p/stunprober/stun_prober.cc @@ -14,18 +14,18 @@ #include #include -#include "p2p/base/packetsocketfactory.h" +#include "p2p/base/packet_socket_factory.h" #include "p2p/base/stun.h" -#include "p2p/stunprober/stunprober.h" -#include "rtc_base/asyncpacketsocket.h" -#include "rtc_base/asyncresolverinterface.h" +#include "p2p/stunprober/stun_prober.h" +#include "rtc_base/async_packet_socket.h" +#include "rtc_base/async_resolver_interface.h" #include "rtc_base/bind.h" #include "rtc_base/checks.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" #include "rtc_base/helpers.h" #include "rtc_base/logging.h" #include "rtc_base/thread.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/time_utils.h" namespace stunprober { diff --git a/p2p/stunprober/stun_prober.h b/p2p/stunprober/stun_prober.h index a4feecd813..bdfb7584e2 100644 --- a/p2p/stunprober/stun_prober.h +++ b/p2p/stunprober/stun_prober.h @@ -8,20 +8,20 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef P2P_STUNPROBER_STUNPROBER_H_ -#define P2P_STUNPROBER_STUNPROBER_H_ +#ifndef P2P_STUNPROBER_STUN_PROBER_H_ +#define P2P_STUNPROBER_STUN_PROBER_H_ #include #include #include -#include "rtc_base/asyncinvoker.h" -#include "rtc_base/bytebuffer.h" +#include "rtc_base/async_invoker.h" +#include "rtc_base/byte_buffer.h" #include "rtc_base/callback.h" -#include "rtc_base/constructormagic.h" -#include "rtc_base/ipaddress.h" +#include "rtc_base/constructor_magic.h" +#include "rtc_base/ip_address.h" #include "rtc_base/network.h" -#include "rtc_base/socketaddress.h" +#include "rtc_base/socket_address.h" #include "rtc_base/system/rtc_export.h" #include "rtc_base/thread.h" #include "rtc_base/thread_checker.h" @@ -248,4 +248,4 @@ class RTC_EXPORT StunProber : public sigslot::has_slots<> { } // namespace stunprober -#endif // P2P_STUNPROBER_STUNPROBER_H_ +#endif // P2P_STUNPROBER_STUN_PROBER_H_ diff --git a/p2p/stunprober/stun_prober_unittest.cc b/p2p/stunprober/stun_prober_unittest.cc index b8009398ef..c54f453b79 100644 --- a/p2p/stunprober/stun_prober_unittest.cc +++ b/p2p/stunprober/stun_prober_unittest.cc @@ -11,13 +11,13 @@ #include #include -#include "p2p/base/basicpacketsocketfactory.h" -#include "p2p/base/teststunserver.h" -#include "p2p/stunprober/stunprober.h" +#include "p2p/base/basic_packet_socket_factory.h" +#include "p2p/base/test_stun_server.h" +#include "p2p/stunprober/stun_prober.h" #include "rtc_base/gunit.h" -#include "rtc_base/ipaddress.h" -#include "rtc_base/ssladapter.h" -#include "rtc_base/virtualsocketserver.h" +#include "rtc_base/ip_address.h" +#include "rtc_base/ssl_adapter.h" +#include "rtc_base/virtual_socket_server.h" #include "test/gtest.h" using stunprober::StunProber; diff --git a/pc/BUILD.gn b/pc/BUILD.gn index 7736b2fbd6..9b634fbf3c 100644 --- a/pc/BUILD.gn +++ b/pc/BUILD.gn @@ -31,41 +31,41 @@ rtc_static_library("rtc_pc_base") { sources = [ "channel.cc", "channel.h", - "channelinterface.h", - "channelmanager.cc", - "channelmanager.h", - "dtlssrtptransport.cc", - "dtlssrtptransport.h", - "dtlstransport.cc", - "dtlstransport.h", - "externalhmac.cc", - "externalhmac.h", - "jseptransport.cc", - "jseptransport.h", - "jseptransportcontroller.cc", - "jseptransportcontroller.h", - "mediasession.cc", - "mediasession.h", - "rtcpmuxfilter.cc", - "rtcpmuxfilter.h", - "rtpmediautils.cc", - "rtpmediautils.h", - "rtptransport.cc", - "rtptransport.h", - "rtptransportinternal.h", - "rtptransportinternaladapter.h", - "sessiondescription.cc", - "sessiondescription.h", - "simulcastdescription.cc", - "simulcastdescription.h", - "srtpfilter.cc", - "srtpfilter.h", - "srtpsession.cc", - "srtpsession.h", - "srtptransport.cc", - "srtptransport.h", - "transportstats.cc", - "transportstats.h", + "channel_interface.h", + "channel_manager.cc", + "channel_manager.h", + "dtls_srtp_transport.cc", + "dtls_srtp_transport.h", + "dtls_transport.cc", + "dtls_transport.h", + "external_hmac.cc", + "external_hmac.h", + "jsep_transport.cc", + "jsep_transport.h", + "jsep_transport_controller.cc", + "jsep_transport_controller.h", + "media_session.cc", + "media_session.h", + "rtcp_mux_filter.cc", + "rtcp_mux_filter.h", + "rtp_media_utils.cc", + "rtp_media_utils.h", + "rtp_transport.cc", + "rtp_transport.h", + "rtp_transport_internal.h", + "rtp_transport_internal_adapter.h", + "session_description.cc", + "session_description.h", + "simulcast_description.cc", + "simulcast_description.h", + "srtp_filter.cc", + "srtp_filter.h", + "srtp_session.cc", + "srtp_session.h", + "srtp_transport.cc", + "srtp_transport.h", + "transport_stats.cc", + "transport_stats.h", "unique_id_generator.cc", "unique_id_generator.h", ] @@ -129,63 +129,63 @@ rtc_static_library("peerconnection") { visibility = [ "*" ] cflags = [] sources = [ - "audiotrack.cc", - "audiotrack.h", - "datachannel.cc", - "datachannel.h", - "dtmfsender.cc", - "dtmfsender.h", - "iceserverparsing.cc", - "iceserverparsing.h", - "jsepicecandidate.cc", - "jsepsessiondescription.cc", - "localaudiosource.cc", - "localaudiosource.h", - "mediastream.cc", - "mediastream.h", - "mediastreamobserver.cc", - "mediastreamobserver.h", - "mediastreamtrack.h", - "peerconnection.cc", - "peerconnection.h", - "peerconnectionfactory.cc", - "peerconnectionfactory.h", - "peerconnectioninternal.h", - "remoteaudiosource.cc", - "remoteaudiosource.h", - "rtcstatscollector.cc", - "rtcstatscollector.h", - "rtcstatstraversal.cc", - "rtcstatstraversal.h", - "rtpparametersconversion.cc", - "rtpparametersconversion.h", - "rtpreceiver.cc", - "rtpreceiver.h", - "rtpsender.cc", - "rtpsender.h", - "rtptransceiver.cc", - "rtptransceiver.h", - "sctputils.cc", - "sctputils.h", - "sdpserializer.cc", - "sdpserializer.h", - "sdputils.cc", - "sdputils.h", - "statscollector.cc", - "statscollector.h", - "streamcollection.h", - "trackmediainfomap.cc", - "trackmediainfomap.h", - "videocapturertracksource.cc", - "videocapturertracksource.h", - "videotrack.cc", - "videotrack.h", - "videotracksource.cc", - "videotracksource.h", - "webrtcsdp.cc", - "webrtcsdp.h", - "webrtcsessiondescriptionfactory.cc", - "webrtcsessiondescriptionfactory.h", + "audio_track.cc", + "audio_track.h", + "data_channel.cc", + "data_channel.h", + "dtmf_sender.cc", + "dtmf_sender.h", + "ice_server_parsing.cc", + "ice_server_parsing.h", + "jsep_ice_candidate.cc", + "jsep_session_description.cc", + "local_audio_source.cc", + "local_audio_source.h", + "media_stream.cc", + "media_stream.h", + "media_stream_observer.cc", + "media_stream_observer.h", + "media_stream_track.h", + "peer_connection.cc", + "peer_connection.h", + "peer_connection_factory.cc", + "peer_connection_factory.h", + "peer_connection_internal.h", + "remote_audio_source.cc", + "remote_audio_source.h", + "rtc_stats_collector.cc", + "rtc_stats_collector.h", + "rtc_stats_traversal.cc", + "rtc_stats_traversal.h", + "rtp_parameters_conversion.cc", + "rtp_parameters_conversion.h", + "rtp_receiver.cc", + "rtp_receiver.h", + "rtp_sender.cc", + "rtp_sender.h", + "rtp_transceiver.cc", + "rtp_transceiver.h", + "sctp_utils.cc", + "sctp_utils.h", + "sdp_serializer.cc", + "sdp_serializer.h", + "sdp_utils.cc", + "sdp_utils.h", + "stats_collector.cc", + "stats_collector.h", + "stream_collection.h", + "track_media_info_map.cc", + "track_media_info_map.h", + "video_capturer_track_source.cc", + "video_capturer_track_source.h", + "video_track.cc", + "video_track.h", + "video_track_source.cc", + "video_track_source.h", + "webrtc_sdp.cc", + "webrtc_sdp.h", + "webrtc_session_description_factory.cc", + "webrtc_session_description_factory.h", ] if (!build_with_chromium && is_clang) { @@ -246,21 +246,21 @@ if (rtc_include_tests) { testonly = true sources = [ + "channel_manager_unittest.cc", "channel_unittest.cc", - "channelmanager_unittest.cc", - "dtlssrtptransport_unittest.cc", + "dtls_srtp_transport_unittest.cc", "dtlstransport_unittest.cc", - "jseptransport_unittest.cc", - "jseptransportcontroller_unittest.cc", - "mediasession_unittest.cc", - "rtcpmuxfilter_unittest.cc", - "rtptransport_unittest.cc", - "rtptransporttestutil.h", - "sessiondescription_unittest.cc", - "srtpfilter_unittest.cc", - "srtpsession_unittest.cc", - "srtptestutil.h", - "srtptransport_unittest.cc", + "jsep_transport_controller_unittest.cc", + "jsep_transport_unittest.cc", + "media_session_unittest.cc", + "rtcp_mux_filter_unittest.cc", + "rtp_transport_unittest.cc", + "session_description_unittest.cc", + "srtp_filter_unittest.cc", + "srtp_session_unittest.cc", + "srtp_transport_unittest.cc", + "test/rtp_transport_test_util.h", + "test/srtp_test_util.h", "unique_id_generator_unittest.cc", ] @@ -316,7 +316,7 @@ if (rtc_include_tests) { rtc_source_set("peerconnection_perf_tests") { testonly = true sources = [ - "peerconnection_rampup_tests.cc", + "peer_connection_rampup_tests.cc", ] deps = [ ":pc_test_utils", @@ -357,8 +357,8 @@ if (rtc_include_tests) { rtc_source_set("peerconnection_wrapper") { testonly = true sources = [ - "peerconnectionwrapper.cc", - "peerconnectionwrapper.h", + "peer_connection_wrapper.cc", + "peer_connection_wrapper.h", ] deps = [ ":pc_test_utils", @@ -379,27 +379,27 @@ if (rtc_include_tests) { rtc_source_set("pc_test_utils") { testonly = true sources = [ - "test/fakeaudiocapturemodule.cc", - "test/fakeaudiocapturemodule.h", - "test/fakedatachannelprovider.h", - "test/fakepeerconnectionbase.h", - "test/fakepeerconnectionforstats.h", - "test/fakeperiodicvideosource.h", - "test/fakeperiodicvideotracksource.h", - "test/fakertccertificategenerator.h", - "test/fakesctptransport.h", - "test/fakevideotrackrenderer.h", - "test/fakevideotracksource.h", - "test/framegeneratorcapturervideotracksource.h", - "test/mock_channelinterface.h", - "test/mock_datachannel.h", - "test/mock_rtpreceiverinternal.h", - "test/mock_rtpsenderinternal.h", - "test/mockpeerconnectionobservers.h", - "test/peerconnectiontestwrapper.cc", - "test/peerconnectiontestwrapper.h", - "test/rtcstatsobtainer.h", - "test/testsdpstrings.h", + "test/fake_audio_capture_module.cc", + "test/fake_audio_capture_module.h", + "test/fake_data_channel_provider.h", + "test/fake_peer_connection_base.h", + "test/fake_peer_connection_for_stats.h", + "test/fake_periodic_video_source.h", + "test/fake_periodic_video_track_source.h", + "test/fake_rtc_certificate_generator.h", + "test/fake_sctp_transport.h", + "test/fake_video_track_renderer.h", + "test/fake_video_track_source.h", + "test/frame_generator_capturer_video_track_source.h", + "test/mock_channel_interface.h", + "test/mock_data_channel.h", + "test/mock_peer_connection_observers.h", + "test/mock_rtp_receiver_internal.h", + "test/mock_rtp_sender_internal.h", + "test/peer_connection_test_wrapper.cc", + "test/peer_connection_test_wrapper.h", + "test/rtc_stats_obtainer.h", + "test/test_sdp_strings.h", ] deps = [ @@ -450,45 +450,45 @@ if (rtc_include_tests) { rtc_test("peerconnection_unittests") { testonly = true sources = [ - "datachannel_unittest.cc", - "dtmfsender_unittest.cc", - "iceserverparsing_unittest.cc", - "jsepsessiondescription_unittest.cc", - "localaudiosource_unittest.cc", - "mediaconstraintsinterface_unittest.cc", - "mediastream_unittest.cc", - "peerconnection_bundle_unittest.cc", - "peerconnection_crypto_unittest.cc", - "peerconnection_datachannel_unittest.cc", - "peerconnection_histogram_unittest.cc", - "peerconnection_ice_unittest.cc", - "peerconnection_integrationtest.cc", - "peerconnection_jsep_unittest.cc", - "peerconnection_media_unittest.cc", - "peerconnection_rtp_unittest.cc", - "peerconnection_signaling_unittest.cc", - "peerconnectionendtoend_unittest.cc", - "peerconnectionfactory_unittest.cc", - "peerconnectioninterface_unittest.cc", - "peerconnectionwrapper.cc", - "peerconnectionwrapper.h", + "data_channel_unittest.cc", + "dtmf_sender_unittest.cc", + "ice_server_parsing_unittest.cc", + "jsep_session_description_unittest.cc", + "local_audio_source_unittest.cc", + "media_constraints_interface_unittest.cc", + "media_stream_unittest.cc", + "peer_connection_bundle_unittest.cc", + "peer_connection_crypto_unittest.cc", + "peer_connection_data_channel_unittest.cc", + "peer_connection_end_to_end_unittest.cc", + "peer_connection_factory_unittest.cc", + "peer_connection_histogram_unittest.cc", + "peer_connection_ice_unittest.cc", + "peer_connection_integrationtest.cc", + "peer_connection_interface_unittest.cc", + "peer_connection_jsep_unittest.cc", + "peer_connection_media_unittest.cc", + "peer_connection_rtp_unittest.cc", + "peer_connection_signaling_unittest.cc", + "peer_connection_wrapper.cc", + "peer_connection_wrapper.h", "proxy_unittest.cc", - "rtcstats_integrationtest.cc", - "rtcstatscollector_unittest.cc", - "rtcstatstraversal_unittest.cc", - "rtpmediautils_unittest.cc", - "rtpparametersconversion_unittest.cc", - "rtpsenderreceiver_unittest.cc", - "rtptransceiver_unittest.cc", - "sctputils_unittest.cc", - "sdpserializer_unittest.cc", - "statscollector_unittest.cc", - "test/fakeaudiocapturemodule_unittest.cc", - "test/testsdpstrings.h", - "trackmediainfomap_unittest.cc", - "videocapturertracksource_unittest.cc", - "videotrack_unittest.cc", - "webrtcsdp_unittest.cc", + "rtc_stats_collector_unittest.cc", + "rtc_stats_integrationtest.cc", + "rtc_stats_traversal_unittest.cc", + "rtp_media_utils_unittest.cc", + "rtp_parameters_conversion_unittest.cc", + "rtp_sender_receiver_unittest.cc", + "rtp_transceiver_unittest.cc", + "sctp_utils_unittest.cc", + "sdp_serializer_unittest.cc", + "stats_collector_unittest.cc", + "test/fake_audio_capture_module_unittest.cc", + "test/test_sdp_strings.h", + "track_media_info_map_unittest.cc", + "video_capturer_track_source_unittest.cc", + "video_track_unittest.cc", + "webrtc_sdp_unittest.cc", ] if (rtc_enable_sctp) { @@ -593,8 +593,8 @@ if (rtc_include_tests) { check_includes = false testonly = true sources = [ - "test/androidtestinitializer.cc", - "test/androidtestinitializer.h", + "test/android_test_initializer.cc", + "test/android_test_initializer.h", ] deps = [ "../sdk/android:libjingle_peerconnection_jni", diff --git a/pc/audio_track.cc b/pc/audio_track.cc index 2a3e5e3878..f3bc3ffb75 100644 --- a/pc/audio_track.cc +++ b/pc/audio_track.cc @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "pc/audiotrack.h" +#include "pc/audio_track.h" #include "rtc_base/checks.h" -#include "rtc_base/refcountedobject.h" +#include "rtc_base/ref_counted_object.h" namespace webrtc { diff --git a/pc/audio_track.h b/pc/audio_track.h index 17ac70001a..6df8693222 100644 --- a/pc/audio_track.h +++ b/pc/audio_track.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef PC_AUDIOTRACK_H_ -#define PC_AUDIOTRACK_H_ +#ifndef PC_AUDIO_TRACK_H_ +#define PC_AUDIO_TRACK_H_ #include -#include "api/mediastreaminterface.h" -#include "pc/mediastreamtrack.h" -#include "rtc_base/constructormagic.h" +#include "api/media_stream_interface.h" +#include "pc/media_stream_track.h" +#include "rtc_base/constructor_magic.h" #include "rtc_base/scoped_ref_ptr.h" #include "rtc_base/thread_checker.h" @@ -55,4 +55,4 @@ class AudioTrack : public MediaStreamTrack, } // namespace webrtc -#endif // PC_AUDIOTRACK_H_ +#endif // PC_AUDIO_TRACK_H_ diff --git a/pc/channel.cc b/pc/channel.cc index 8a2fcb5456..b7bab924d3 100644 --- a/pc/channel.cc +++ b/pc/channel.cc @@ -16,24 +16,24 @@ #include "absl/memory/memory.h" #include "api/call/audio_sink.h" -#include "media/base/mediaconstants.h" -#include "media/base/rtputils.h" +#include "media/base/media_constants.h" +#include "media/base/rtp_utils.h" #include "modules/rtp_rtcp/source/rtp_packet_received.h" #include "rtc_base/bind.h" -#include "rtc_base/byteorder.h" +#include "rtc_base/byte_order.h" #include "rtc_base/checks.h" -#include "rtc_base/copyonwritebuffer.h" +#include "rtc_base/copy_on_write_buffer.h" #include "rtc_base/dscp.h" #include "rtc_base/logging.h" -#include "rtc_base/networkroute.h" +#include "rtc_base/network_route.h" #include "rtc_base/strings/string_builder.h" #include "rtc_base/trace_event.h" // Adding 'nogncheck' to disable the gn include headers check to support modular // WebRTC build targets. -#include "media/engine/webrtcvoiceengine.h" // nogncheck -#include "p2p/base/packettransportinternal.h" -#include "pc/channelmanager.h" -#include "pc/rtpmediautils.h" +#include "media/engine/webrtc_voice_engine.h" // nogncheck +#include "p2p/base/packet_transport_internal.h" +#include "pc/channel_manager.h" +#include "pc/rtp_media_utils.h" namespace cricket { using rtc::Bind; diff --git a/pc/channel.h b/pc/channel.h index 6264bb3904..6d6bd40e3d 100644 --- a/pc/channel.h +++ b/pc/channel.h @@ -20,24 +20,24 @@ #include "api/call/audio_sink.h" #include "api/jsep.h" -#include "api/rtpreceiverinterface.h" +#include "api/rtp_receiver_interface.h" #include "api/video/video_sink_interface.h" #include "api/video/video_source_interface.h" #include "call/rtp_packet_sink_interface.h" -#include "media/base/mediachannel.h" -#include "media/base/mediaengine.h" -#include "media/base/streamparams.h" -#include "p2p/base/dtlstransportinternal.h" -#include "p2p/base/packettransportinternal.h" -#include "pc/channelinterface.h" -#include "pc/dtlssrtptransport.h" -#include "pc/mediasession.h" -#include "pc/rtptransport.h" -#include "pc/srtpfilter.h" -#include "pc/srtptransport.h" -#include "rtc_base/asyncinvoker.h" -#include "rtc_base/asyncudpsocket.h" -#include "rtc_base/criticalsection.h" +#include "media/base/media_channel.h" +#include "media/base/media_engine.h" +#include "media/base/stream_params.h" +#include "p2p/base/dtls_transport_internal.h" +#include "p2p/base/packet_transport_internal.h" +#include "pc/channel_interface.h" +#include "pc/dtls_srtp_transport.h" +#include "pc/media_session.h" +#include "pc/rtp_transport.h" +#include "pc/srtp_filter.h" +#include "pc/srtp_transport.h" +#include "rtc_base/async_invoker.h" +#include "rtc_base/async_udp_socket.h" +#include "rtc_base/critical_section.h" #include "rtc_base/network.h" #include "rtc_base/third_party/sigslot/sigslot.h" diff --git a/pc/channel_interface.h b/pc/channel_interface.h index 8e4109a045..b623254b1b 100644 --- a/pc/channel_interface.h +++ b/pc/channel_interface.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef PC_CHANNELINTERFACE_H_ -#define PC_CHANNELINTERFACE_H_ +#ifndef PC_CHANNEL_INTERFACE_H_ +#define PC_CHANNEL_INTERFACE_H_ #include #include "api/jsep.h" -#include "api/mediatypes.h" -#include "media/base/mediachannel.h" -#include "pc/rtptransportinternal.h" +#include "api/media_types.h" +#include "media/base/media_channel.h" +#include "pc/rtp_transport_internal.h" namespace cricket { @@ -65,4 +65,4 @@ class ChannelInterface { } // namespace cricket -#endif // PC_CHANNELINTERFACE_H_ +#endif // PC_CHANNEL_INTERFACE_H_ diff --git a/pc/channel_manager.cc b/pc/channel_manager.cc index d5cbd9cbbb..c936caf16b 100644 --- a/pc/channel_manager.cc +++ b/pc/channel_manager.cc @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "pc/channelmanager.h" +#include "pc/channel_manager.h" #include #include #include "absl/memory/memory.h" #include "absl/strings/match.h" -#include "media/base/mediaconstants.h" +#include "media/base/media_constants.h" #include "rtc_base/checks.h" #include "rtc_base/location.h" #include "rtc_base/logging.h" diff --git a/pc/channel_manager.h b/pc/channel_manager.h index 8bd30d165a..38d79ee878 100644 --- a/pc/channel_manager.h +++ b/pc/channel_manager.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef PC_CHANNELMANAGER_H_ -#define PC_CHANNELMANAGER_H_ +#ifndef PC_CHANNEL_MANAGER_H_ +#define PC_CHANNEL_MANAGER_H_ #include #include @@ -17,16 +17,16 @@ #include #include "api/audio_options.h" -#include "api/crypto/cryptooptions.h" +#include "api/crypto/crypto_options.h" #include "api/media_transport_interface.h" #include "call/call.h" #include "media/base/codec.h" -#include "media/base/mediachannel.h" -#include "media/base/mediaconfig.h" -#include "media/base/mediaengine.h" +#include "media/base/media_channel.h" +#include "media/base/media_config.h" +#include "media/base/media_engine.h" #include "pc/channel.h" -#include "pc/rtptransportinternal.h" -#include "pc/sessiondescription.h" +#include "pc/rtp_transport_internal.h" +#include "pc/session_description.h" #include "rtc_base/platform_file.h" #include "rtc_base/thread.h" @@ -172,4 +172,4 @@ class ChannelManager final { } // namespace cricket -#endif // PC_CHANNELMANAGER_H_ +#endif // PC_CHANNEL_MANAGER_H_ diff --git a/pc/channel_manager_unittest.cc b/pc/channel_manager_unittest.cc index ed09b721a0..999e36eff0 100644 --- a/pc/channel_manager_unittest.cc +++ b/pc/channel_manager_unittest.cc @@ -11,17 +11,17 @@ #include #include "absl/memory/memory.h" -#include "api/rtcerror.h" +#include "api/rtc_error.h" #include "api/test/fake_media_transport.h" -#include "media/base/fakemediaengine.h" -#include "media/base/testutils.h" -#include "media/engine/fakewebrtccall.h" -#include "p2p/base/dtlstransportinternal.h" -#include "p2p/base/fakedtlstransport.h" -#include "p2p/base/p2pconstants.h" -#include "p2p/base/packettransportinternal.h" -#include "pc/channelmanager.h" -#include "pc/dtlssrtptransport.h" +#include "media/base/fake_media_engine.h" +#include "media/base/test_utils.h" +#include "media/engine/fake_webrtc_call.h" +#include "p2p/base/dtls_transport_internal.h" +#include "p2p/base/fake_dtls_transport.h" +#include "p2p/base/p2p_constants.h" +#include "p2p/base/packet_transport_internal.h" +#include "pc/channel_manager.h" +#include "pc/dtls_srtp_transport.h" #include "rtc_base/checks.h" #include "rtc_base/thread.h" #include "test/gtest.h" diff --git a/pc/channel_unittest.cc b/pc/channel_unittest.cc index e675375a48..5e15dbd89f 100644 --- a/pc/channel_unittest.cc +++ b/pc/channel_unittest.cc @@ -15,26 +15,26 @@ #include "absl/memory/memory.h" #include "api/array_view.h" #include "api/audio_options.h" -#include "api/rtpparameters.h" +#include "api/rtp_parameters.h" #include "media/base/codec.h" -#include "media/base/fakemediaengine.h" -#include "media/base/fakertp.h" -#include "media/base/mediachannel.h" -#include "p2p/base/candidatepairinterface.h" -#include "p2p/base/fakedtlstransport.h" -#include "p2p/base/fakepackettransport.h" -#include "p2p/base/icetransportinternal.h" -#include "p2p/base/p2pconstants.h" +#include "media/base/fake_media_engine.h" +#include "media/base/fake_rtp.h" +#include "media/base/media_channel.h" +#include "p2p/base/candidate_pair_interface.h" +#include "p2p/base/fake_dtls_transport.h" +#include "p2p/base/fake_packet_transport.h" +#include "p2p/base/ice_transport_internal.h" +#include "p2p/base/p2p_constants.h" #include "pc/channel.h" -#include "pc/dtlssrtptransport.h" -#include "pc/jseptransport.h" -#include "pc/rtptransport.h" +#include "pc/dtls_srtp_transport.h" +#include "pc/jsep_transport.h" +#include "pc/rtp_transport.h" #include "rtc_base/arraysize.h" #include "rtc_base/buffer.h" -#include "rtc_base/byteorder.h" +#include "rtc_base/byte_order.h" #include "rtc_base/checks.h" -#include "rtc_base/rtccertificate.h" -#include "rtc_base/sslidentity.h" +#include "rtc_base/rtc_certificate.h" +#include "rtc_base/ssl_identity.h" #include "test/gtest.h" using cricket::DtlsTransportInternal; diff --git a/pc/data_channel.cc b/pc/data_channel.cc index a632b8e7a9..f854defd1b 100644 --- a/pc/data_channel.cc +++ b/pc/data_channel.cc @@ -8,19 +8,19 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "pc/datachannel.h" +#include "pc/data_channel.h" #include #include #include #include "absl/memory/memory.h" -#include "media/sctp/sctptransportinternal.h" -#include "pc/sctputils.h" +#include "media/sctp/sctp_transport_internal.h" +#include "pc/sctp_utils.h" #include "rtc_base/checks.h" #include "rtc_base/location.h" #include "rtc_base/logging.h" -#include "rtc_base/refcountedobject.h" +#include "rtc_base/ref_counted_object.h" #include "rtc_base/thread.h" namespace webrtc { diff --git a/pc/data_channel.h b/pc/data_channel.h index 55a52dba27..af8dd938d0 100644 --- a/pc/data_channel.h +++ b/pc/data_channel.h @@ -8,19 +8,19 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef PC_DATACHANNEL_H_ -#define PC_DATACHANNEL_H_ +#ifndef PC_DATA_CHANNEL_H_ +#define PC_DATA_CHANNEL_H_ #include #include #include #include -#include "api/datachannelinterface.h" +#include "api/data_channel_interface.h" #include "api/proxy.h" -#include "media/base/mediachannel.h" +#include "media/base/media_channel.h" #include "pc/channel.h" -#include "rtc_base/asyncinvoker.h" +#include "rtc_base/async_invoker.h" #include "rtc_base/scoped_ref_ptr.h" #include "rtc_base/third_party/sigslot/sigslot.h" @@ -313,4 +313,4 @@ END_PROXY_MAP() } // namespace webrtc -#endif // PC_DATACHANNEL_H_ +#endif // PC_DATA_CHANNEL_H_ diff --git a/pc/data_channel_unittest.cc b/pc/data_channel_unittest.cc index 4addfbbc0f..4aa9dee787 100644 --- a/pc/data_channel_unittest.cc +++ b/pc/data_channel_unittest.cc @@ -12,9 +12,9 @@ #include #include -#include "pc/datachannel.h" -#include "pc/sctputils.h" -#include "pc/test/fakedatachannelprovider.h" +#include "pc/data_channel.h" +#include "pc/sctp_utils.h" +#include "pc/test/fake_data_channel_provider.h" #include "rtc_base/gunit.h" #include "rtc_base/numerics/safe_conversions.h" #include "test/gtest.h" diff --git a/pc/dtls_srtp_transport.cc b/pc/dtls_srtp_transport.cc index 48d3e492fe..fcf0727478 100644 --- a/pc/dtls_srtp_transport.cc +++ b/pc/dtls_srtp_transport.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "pc/dtlssrtptransport.h" +#include "pc/dtls_srtp_transport.h" #include #include @@ -16,7 +16,7 @@ #include "rtc_base/checks.h" #include "rtc_base/logging.h" -#include "rtc_base/sslstreamadapter.h" +#include "rtc_base/ssl_stream_adapter.h" namespace { // Value specified in RFC 5764. diff --git a/pc/dtls_srtp_transport.h b/pc/dtls_srtp_transport.h index 995e5374dc..c63a3ca5dd 100644 --- a/pc/dtls_srtp_transport.h +++ b/pc/dtls_srtp_transport.h @@ -8,17 +8,17 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef PC_DTLSSRTPTRANSPORT_H_ -#define PC_DTLSSRTPTRANSPORT_H_ +#ifndef PC_DTLS_SRTP_TRANSPORT_H_ +#define PC_DTLS_SRTP_TRANSPORT_H_ #include #include "absl/types/optional.h" -#include "api/cryptoparams.h" -#include "api/rtcerror.h" -#include "p2p/base/dtlstransportinternal.h" -#include "p2p/base/packettransportinternal.h" -#include "pc/srtptransport.h" +#include "api/crypto_params.h" +#include "api/rtc_error.h" +#include "p2p/base/dtls_transport_internal.h" +#include "p2p/base/packet_transport_internal.h" +#include "pc/srtp_transport.h" #include "rtc_base/buffer.h" #include "rtc_base/third_party/sigslot/sigslot.h" @@ -100,4 +100,4 @@ class DtlsSrtpTransport : public SrtpTransport { } // namespace webrtc -#endif // PC_DTLSSRTPTRANSPORT_H_ +#endif // PC_DTLS_SRTP_TRANSPORT_H_ diff --git a/pc/dtls_srtp_transport_unittest.cc b/pc/dtls_srtp_transport_unittest.cc index 50d0eaf824..abf1b2d307 100644 --- a/pc/dtls_srtp_transport_unittest.cc +++ b/pc/dtls_srtp_transport_unittest.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "pc/dtlssrtptransport.h" +#include "pc/dtls_srtp_transport.h" #include #include @@ -17,18 +17,18 @@ #include "absl/memory/memory.h" #include "call/rtp_demuxer.h" -#include "media/base/fakertp.h" -#include "p2p/base/dtlstransportinternal.h" -#include "p2p/base/fakedtlstransport.h" -#include "p2p/base/fakeicetransport.h" -#include "p2p/base/p2pconstants.h" -#include "pc/rtptransport.h" -#include "pc/rtptransporttestutil.h" -#include "rtc_base/asyncpacketsocket.h" -#include "rtc_base/byteorder.h" -#include "rtc_base/copyonwritebuffer.h" -#include "rtc_base/rtccertificate.h" -#include "rtc_base/sslidentity.h" +#include "media/base/fake_rtp.h" +#include "p2p/base/dtls_transport_internal.h" +#include "p2p/base/fake_dtls_transport.h" +#include "p2p/base/fake_ice_transport.h" +#include "p2p/base/p2p_constants.h" +#include "pc/rtp_transport.h" +#include "pc/test/rtp_transport_test_util.h" +#include "rtc_base/async_packet_socket.h" +#include "rtc_base/byte_order.h" +#include "rtc_base/copy_on_write_buffer.h" +#include "rtc_base/rtc_certificate.h" +#include "rtc_base/ssl_identity.h" #include "test/gtest.h" using cricket::FakeDtlsTransport; diff --git a/pc/dtls_transport.cc b/pc/dtls_transport.cc index eb1bc04a2e..4709107d80 100644 --- a/pc/dtls_transport.cc +++ b/pc/dtls_transport.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "pc/dtlstransport.h" +#include "pc/dtls_transport.h" #include diff --git a/pc/dtls_transport.h b/pc/dtls_transport.h index b3f16378f2..0fdcc0f3ec 100644 --- a/pc/dtls_transport.h +++ b/pc/dtls_transport.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef PC_DTLSTRANSPORT_H_ -#define PC_DTLSTRANSPORT_H_ +#ifndef PC_DTLS_TRANSPORT_H_ +#define PC_DTLS_TRANSPORT_H_ #include -#include "api/dtlstransportinterface.h" -#include "p2p/base/dtlstransport.h" -#include "rtc_base/asyncinvoker.h" +#include "api/dtls_transport_interface.h" +#include "p2p/base/dtls_transport.h" +#include "rtc_base/async_invoker.h" namespace webrtc { @@ -54,4 +54,4 @@ class DtlsTransport : public DtlsTransportInterface, }; } // namespace webrtc -#endif // PC_DTLSTRANSPORT_H_ +#endif // PC_DTLS_TRANSPORT_H_ diff --git a/pc/dtlstransport_unittest.cc b/pc/dtlstransport_unittest.cc index 05e3797045..508e557159 100644 --- a/pc/dtlstransport_unittest.cc +++ b/pc/dtlstransport_unittest.cc @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "pc/dtlstransport.h" +#include "pc/dtls_transport.h" #include #include #include "absl/memory/memory.h" -#include "p2p/base/fakedtlstransport.h" +#include "p2p/base/fake_dtls_transport.h" #include "rtc_base/gunit.h" #include "test/gmock.h" #include "test/gtest.h" diff --git a/pc/dtmf_sender.cc b/pc/dtmf_sender.cc index 6d39f5b5c2..f4c3617272 100644 --- a/pc/dtmf_sender.cc +++ b/pc/dtmf_sender.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "pc/dtmfsender.h" +#include "pc/dtmf_sender.h" #include #include @@ -16,7 +16,7 @@ #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.h" namespace webrtc { diff --git a/pc/dtmf_sender.h b/pc/dtmf_sender.h index 59ab5496a2..692c74bcef 100644 --- a/pc/dtmf_sender.h +++ b/pc/dtmf_sender.h @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef PC_DTMFSENDER_H_ -#define PC_DTMFSENDER_H_ +#ifndef PC_DTMF_SENDER_H_ +#define PC_DTMF_SENDER_H_ #include -#include "api/dtmfsenderinterface.h" +#include "api/dtmf_sender_interface.h" #include "api/proxy.h" -#include "rtc_base/asyncinvoker.h" -#include "rtc_base/constructormagic.h" -#include "rtc_base/refcount.h" +#include "rtc_base/async_invoker.h" +#include "rtc_base/constructor_magic.h" +#include "rtc_base/ref_count.h" #include "rtc_base/thread.h" // DtmfSender is the native implementation of the RTCDTMFSender defined by @@ -107,4 +107,4 @@ bool GetDtmfCode(char tone, int* code); } // namespace webrtc -#endif // PC_DTMFSENDER_H_ +#endif // PC_DTMF_SENDER_H_ diff --git a/pc/dtmf_sender_unittest.cc b/pc/dtmf_sender_unittest.cc index 8f9109d741..b98b035132 100644 --- a/pc/dtmf_sender_unittest.cc +++ b/pc/dtmf_sender_unittest.cc @@ -8,17 +8,17 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "pc/dtmfsender.h" +#include "pc/dtmf_sender.h" #include #include #include #include -#include "rtc_base/fakeclock.h" +#include "rtc_base/fake_clock.h" #include "rtc_base/gunit.h" -#include "rtc_base/refcountedobject.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/ref_counted_object.h" +#include "rtc_base/time_utils.h" #include "test/gtest.h" using webrtc::DtmfProviderInterface; diff --git a/pc/external_hmac.cc b/pc/external_hmac.cc index 41f13e5e44..99021f810a 100644 --- a/pc/external_hmac.cc +++ b/pc/external_hmac.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "pc/externalhmac.h" +#include "pc/external_hmac.h" #include // For malloc/free. #include diff --git a/pc/external_hmac.h b/pc/external_hmac.h index eea7c12d11..3319beaed4 100644 --- a/pc/external_hmac.h +++ b/pc/external_hmac.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef PC_EXTERNALHMAC_H_ -#define PC_EXTERNALHMAC_H_ +#ifndef PC_EXTERNAL_HMAC_H_ +#define PC_EXTERNAL_HMAC_H_ // External libsrtp HMAC auth module which implements methods defined in // auth_type_t. @@ -69,4 +69,4 @@ srtp_err_status_t external_hmac_compute(void* state, srtp_err_status_t external_crypto_init(); -#endif // PC_EXTERNALHMAC_H_ +#endif // PC_EXTERNAL_HMAC_H_ diff --git a/pc/ice_server_parsing.cc b/pc/ice_server_parsing.cc index 1bb5d87f9e..533d59787d 100644 --- a/pc/ice_server_parsing.cc +++ b/pc/ice_server_parsing.cc @@ -8,19 +8,19 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "pc/iceserverparsing.h" +#include "pc/ice_server_parsing.h" #include #include // For std::isdigit. #include -#include "p2p/base/portinterface.h" +#include "p2p/base/port_interface.h" #include "rtc_base/arraysize.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/socketaddress.h" -#include "rtc_base/stringencode.h" +#include "rtc_base/socket_address.h" +#include "rtc_base/string_encode.h" namespace webrtc { diff --git a/pc/ice_server_parsing.h b/pc/ice_server_parsing.h index f1c26c1457..c73d803896 100644 --- a/pc/ice_server_parsing.h +++ b/pc/ice_server_parsing.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef PC_ICESERVERPARSING_H_ -#define PC_ICESERVERPARSING_H_ +#ifndef PC_ICE_SERVER_PARSING_H_ +#define PC_ICE_SERVER_PARSING_H_ #include -#include "api/peerconnectioninterface.h" -#include "api/rtcerror.h" +#include "api/peer_connection_interface.h" +#include "api/rtc_error.h" #include "p2p/base/port.h" -#include "p2p/base/portallocator.h" +#include "p2p/base/port_allocator.h" namespace webrtc { @@ -33,4 +33,4 @@ RTCErrorType ParseIceServers( } // namespace webrtc -#endif // PC_ICESERVERPARSING_H_ +#endif // PC_ICE_SERVER_PARSING_H_ diff --git a/pc/ice_server_parsing_unittest.cc b/pc/ice_server_parsing_unittest.cc index 291afd1060..0ec59caa23 100644 --- a/pc/ice_server_parsing_unittest.cc +++ b/pc/ice_server_parsing_unittest.cc @@ -11,10 +11,10 @@ #include #include -#include "p2p/base/portinterface.h" -#include "pc/iceserverparsing.h" -#include "rtc_base/ipaddress.h" -#include "rtc_base/socketaddress.h" +#include "p2p/base/port_interface.h" +#include "pc/ice_server_parsing.h" +#include "rtc_base/ip_address.h" +#include "rtc_base/socket_address.h" #include "test/gtest.h" namespace webrtc { diff --git a/pc/jsep_ice_candidate.cc b/pc/jsep_ice_candidate.cc index 4753ca216f..c9dc9c18bf 100644 --- a/pc/jsep_ice_candidate.cc +++ b/pc/jsep_ice_candidate.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "api/jsepicecandidate.h" +#include "api/jsep_ice_candidate.h" #include #include "absl/memory/memory.h" -#include "pc/webrtcsdp.h" +#include "pc/webrtc_sdp.h" namespace webrtc { diff --git a/pc/jsep_session_description.cc b/pc/jsep_session_description.cc index d00ca5225e..9499e9a253 100644 --- a/pc/jsep_session_description.cc +++ b/pc/jsep_session_description.cc @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "api/jsepsessiondescription.h" +#include "api/jsep_session_description.h" #include #include "absl/memory/memory.h" #include "p2p/base/port.h" -#include "pc/mediasession.h" -#include "pc/webrtcsdp.h" +#include "pc/media_session.h" +#include "pc/webrtc_sdp.h" #include "rtc_base/arraysize.h" using cricket::SessionDescription; diff --git a/pc/jsep_session_description_unittest.cc b/pc/jsep_session_description_unittest.cc index 04577e2016..2eb1db0528 100644 --- a/pc/jsep_session_description_unittest.cc +++ b/pc/jsep_session_description_unittest.cc @@ -18,18 +18,18 @@ #include "absl/memory/memory.h" #include "api/candidate.h" #include "api/jsep.h" -#include "api/jsepicecandidate.h" -#include "api/jsepsessiondescription.h" +#include "api/jsep_ice_candidate.h" +#include "api/jsep_session_description.h" #include "media/base/codec.h" -#include "p2p/base/p2pconstants.h" +#include "p2p/base/p2p_constants.h" #include "p2p/base/port.h" -#include "p2p/base/transportdescription.h" -#include "p2p/base/transportinfo.h" -#include "pc/sessiondescription.h" -#include "pc/webrtcsdp.h" +#include "p2p/base/transport_description.h" +#include "p2p/base/transport_info.h" +#include "pc/session_description.h" +#include "pc/webrtc_sdp.h" #include "rtc_base/helpers.h" -#include "rtc_base/socketaddress.h" -#include "rtc_base/stringencode.h" +#include "rtc_base/socket_address.h" +#include "rtc_base/string_encode.h" #include "test/gtest.h" using cricket::MediaProtocolType; diff --git a/pc/jsep_transport.cc b/pc/jsep_transport.cc index 3372f1974f..fd6bd0de23 100644 --- a/pc/jsep_transport.cc +++ b/pc/jsep_transport.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "pc/jseptransport.h" +#include "pc/jsep_transport.h" #include #include @@ -19,10 +19,10 @@ #include "absl/memory/memory.h" #include "api/array_view.h" #include "api/candidate.h" -#include "p2p/base/p2pconstants.h" -#include "p2p/base/p2ptransportchannel.h" +#include "p2p/base/p2p_constants.h" +#include "p2p/base/p2p_transport_channel.h" #include "rtc_base/checks.h" -#include "rtc_base/copyonwritebuffer.h" +#include "rtc_base/copy_on_write_buffer.h" #include "rtc_base/logging.h" #include "rtc_base/strings/string_builder.h" diff --git a/pc/jsep_transport.h b/pc/jsep_transport.h index dee5500fb5..648fe299d0 100644 --- a/pc/jsep_transport.h +++ b/pc/jsep_transport.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef PC_JSEPTRANSPORT_H_ -#define PC_JSEPTRANSPORT_H_ +#ifndef PC_JSEP_TRANSPORT_H_ +#define PC_JSEP_TRANSPORT_H_ #include #include @@ -20,21 +20,21 @@ #include "api/candidate.h" #include "api/jsep.h" #include "api/media_transport_interface.h" -#include "p2p/base/dtlstransport.h" -#include "p2p/base/p2pconstants.h" -#include "p2p/base/transportinfo.h" -#include "pc/dtlssrtptransport.h" -#include "pc/dtlstransport.h" -#include "pc/rtcpmuxfilter.h" -#include "pc/rtptransport.h" -#include "pc/sessiondescription.h" -#include "pc/srtpfilter.h" -#include "pc/srtptransport.h" -#include "pc/transportstats.h" -#include "rtc_base/constructormagic.h" -#include "rtc_base/messagequeue.h" -#include "rtc_base/rtccertificate.h" -#include "rtc_base/sslstreamadapter.h" +#include "p2p/base/dtls_transport.h" +#include "p2p/base/p2p_constants.h" +#include "p2p/base/transport_info.h" +#include "pc/dtls_srtp_transport.h" +#include "pc/dtls_transport.h" +#include "pc/rtcp_mux_filter.h" +#include "pc/rtp_transport.h" +#include "pc/session_description.h" +#include "pc/srtp_filter.h" +#include "pc/srtp_transport.h" +#include "pc/transport_stats.h" +#include "rtc_base/constructor_magic.h" +#include "rtc_base/message_queue.h" +#include "rtc_base/rtc_certificate.h" +#include "rtc_base/ssl_stream_adapter.h" #include "rtc_base/third_party/sigslot/sigslot.h" namespace cricket { @@ -307,4 +307,4 @@ class JsepTransport : public sigslot::has_slots<>, } // namespace cricket -#endif // PC_JSEPTRANSPORT_H_ +#endif // PC_JSEP_TRANSPORT_H_ diff --git a/pc/jsep_transport_controller.cc b/pc/jsep_transport_controller.cc index c1f18b90bb..5163e016b3 100644 --- a/pc/jsep_transport_controller.cc +++ b/pc/jsep_transport_controller.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "pc/jseptransportcontroller.h" +#include "pc/jsep_transport_controller.h" #include #include @@ -16,7 +16,7 @@ #include "absl/memory/memory.h" #include "p2p/base/port.h" -#include "pc/srtpfilter.h" +#include "pc/srtp_filter.h" #include "rtc_base/bind.h" #include "rtc_base/checks.h" #include "rtc_base/key_derivation.h" diff --git a/pc/jsep_transport_controller.h b/pc/jsep_transport_controller.h index 653c4c97ec..1f4a632d47 100644 --- a/pc/jsep_transport_controller.h +++ b/pc/jsep_transport_controller.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef PC_JSEPTRANSPORTCONTROLLER_H_ -#define PC_JSEPTRANSPORTCONTROLLER_H_ +#ifndef PC_JSEP_TRANSPORT_CONTROLLER_H_ +#define PC_JSEP_TRANSPORT_CONTROLLER_H_ #include #include @@ -18,23 +18,23 @@ #include #include "api/candidate.h" -#include "api/crypto/cryptooptions.h" +#include "api/crypto/crypto_options.h" #include "api/media_transport_interface.h" -#include "api/peerconnectioninterface.h" +#include "api/peer_connection_interface.h" #include "logging/rtc_event_log/rtc_event_log.h" -#include "media/sctp/sctptransportinternal.h" -#include "p2p/base/dtlstransport.h" -#include "p2p/base/p2ptransportchannel.h" -#include "p2p/base/transportfactoryinterface.h" +#include "media/sctp/sctp_transport_internal.h" +#include "p2p/base/dtls_transport.h" +#include "p2p/base/p2p_transport_channel.h" +#include "p2p/base/transport_factory_interface.h" #include "pc/channel.h" -#include "pc/dtlssrtptransport.h" -#include "pc/dtlstransport.h" -#include "pc/jseptransport.h" -#include "pc/rtptransport.h" -#include "pc/srtptransport.h" -#include "rtc_base/asyncinvoker.h" -#include "rtc_base/constructormagic.h" -#include "rtc_base/refcountedobject.h" +#include "pc/dtls_srtp_transport.h" +#include "pc/dtls_transport.h" +#include "pc/jsep_transport.h" +#include "pc/rtp_transport.h" +#include "pc/srtp_transport.h" +#include "rtc_base/async_invoker.h" +#include "rtc_base/constructor_magic.h" +#include "rtc_base/ref_counted_object.h" #include "rtc_base/third_party/sigslot/sigslot.h" namespace rtc { @@ -373,4 +373,4 @@ class JsepTransportController : public sigslot::has_slots<> { } // namespace webrtc -#endif // PC_JSEPTRANSPORTCONTROLLER_H_ +#endif // PC_JSEP_TRANSPORT_CONTROLLER_H_ diff --git a/pc/jsep_transport_controller_unittest.cc b/pc/jsep_transport_controller_unittest.cc index c019013cf9..d34c4a918e 100644 --- a/pc/jsep_transport_controller_unittest.cc +++ b/pc/jsep_transport_controller_unittest.cc @@ -14,11 +14,11 @@ #include "absl/memory/memory.h" #include "api/media_transport_interface.h" #include "api/test/fake_media_transport.h" -#include "p2p/base/fakedtlstransport.h" -#include "p2p/base/fakeicetransport.h" -#include "p2p/base/transportfactoryinterface.h" -#include "p2p/base/transportinfo.h" -#include "pc/jseptransportcontroller.h" +#include "p2p/base/fake_dtls_transport.h" +#include "p2p/base/fake_ice_transport.h" +#include "p2p/base/transport_factory_interface.h" +#include "p2p/base/transport_info.h" +#include "pc/jsep_transport_controller.h" #include "rtc_base/gunit.h" #include "rtc_base/thread.h" #include "test/gtest.h" diff --git a/pc/jsep_transport_unittest.cc b/pc/jsep_transport_unittest.cc index 4d68d37877..efb2394eee 100644 --- a/pc/jsep_transport_unittest.cc +++ b/pc/jsep_transport_unittest.cc @@ -13,10 +13,10 @@ #include #include "absl/memory/memory.h" -#include "media/base/fakertp.h" -#include "p2p/base/fakedtlstransport.h" -#include "p2p/base/fakeicetransport.h" -#include "pc/jseptransport.h" +#include "media/base/fake_rtp.h" +#include "p2p/base/fake_dtls_transport.h" +#include "p2p/base/fake_ice_transport.h" +#include "pc/jsep_transport.h" #include "rtc_base/gunit.h" namespace cricket { diff --git a/pc/local_audio_source.cc b/pc/local_audio_source.cc index 2e89a7a36e..22ab1c39c3 100644 --- a/pc/local_audio_source.cc +++ b/pc/local_audio_source.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "pc/localaudiosource.h" +#include "pc/local_audio_source.h" -#include "rtc_base/refcountedobject.h" +#include "rtc_base/ref_counted_object.h" using webrtc::MediaSourceInterface; diff --git a/pc/local_audio_source.h b/pc/local_audio_source.h index dfd72e035b..0223fd4565 100644 --- a/pc/local_audio_source.h +++ b/pc/local_audio_source.h @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef PC_LOCALAUDIOSOURCE_H_ -#define PC_LOCALAUDIOSOURCE_H_ +#ifndef PC_LOCAL_AUDIO_SOURCE_H_ +#define PC_LOCAL_AUDIO_SOURCE_H_ #include "api/audio_options.h" -#include "api/mediastreaminterface.h" +#include "api/media_stream_interface.h" #include "api/notifier.h" #include "rtc_base/scoped_ref_ptr.h" @@ -47,4 +47,4 @@ class LocalAudioSource : public Notifier { } // namespace webrtc -#endif // PC_LOCALAUDIOSOURCE_H_ +#endif // PC_LOCAL_AUDIO_SOURCE_H_ diff --git a/pc/local_audio_source_unittest.cc b/pc/local_audio_source_unittest.cc index d28014aba5..76d3b366c3 100644 --- a/pc/local_audio_source_unittest.cc +++ b/pc/local_audio_source_unittest.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "pc/localaudiosource.h" +#include "pc/local_audio_source.h" #include "absl/types/optional.h" #include "test/gtest.h" diff --git a/pc/media_constraints_interface_unittest.cc b/pc/media_constraints_interface_unittest.cc index 4f46e705a0..b62e092487 100644 --- a/pc/media_constraints_interface_unittest.cc +++ b/pc/media_constraints_interface_unittest.cc @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "api/mediaconstraintsinterface.h" +#include "api/media_constraints_interface.h" #include "absl/types/optional.h" -#include "api/test/fakeconstraints.h" -#include "media/base/mediaconfig.h" +#include "api/test/fake_constraints.h" +#include "media/base/media_config.h" #include "test/gtest.h" namespace webrtc { diff --git a/pc/media_session.cc b/pc/media_session.cc index e650dd2c32..99e7e4098d 100644 --- a/pc/media_session.cc +++ b/pc/media_session.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "pc/mediasession.h" +#include "pc/media_session.h" #include // For std::find_if, std::sort. #include @@ -21,13 +21,13 @@ #include "absl/memory/memory.h" #include "absl/strings/match.h" #include "absl/types/optional.h" -#include "api/cryptoparams.h" +#include "api/crypto_params.h" #include "media/base/h264_profile_level_id.h" -#include "media/base/mediaconstants.h" -#include "p2p/base/p2pconstants.h" -#include "pc/channelmanager.h" -#include "pc/rtpmediautils.h" -#include "pc/srtpfilter.h" +#include "media/base/media_constants.h" +#include "p2p/base/p2p_constants.h" +#include "pc/channel_manager.h" +#include "pc/rtp_media_utils.h" +#include "pc/srtp_filter.h" #include "pc/unique_id_generator.h" #include "rtc_base/checks.h" #include "rtc_base/helpers.h" diff --git a/pc/media_session.h b/pc/media_session.h index f732cb24f8..2251b5b98b 100644 --- a/pc/media_session.h +++ b/pc/media_session.h @@ -10,8 +10,8 @@ // Types and classes used in media session descriptions. -#ifndef PC_MEDIASESSION_H_ -#define PC_MEDIASESSION_H_ +#ifndef PC_MEDIA_SESSION_H_ +#define PC_MEDIA_SESSION_H_ #include #include @@ -19,13 +19,13 @@ #include #include -#include "api/mediatypes.h" -#include "media/base/mediaconstants.h" -#include "media/base/mediaengine.h" // For DataChannelType -#include "p2p/base/icecredentialsiterator.h" -#include "p2p/base/transportdescriptionfactory.h" -#include "pc/jseptransport.h" -#include "pc/sessiondescription.h" +#include "api/media_types.h" +#include "media/base/media_constants.h" +#include "media/base/media_engine.h" // For DataChannelType +#include "p2p/base/ice_credentials_iterator.h" +#include "p2p/base/transport_description_factory.h" +#include "pc/jsep_transport.h" +#include "pc/session_description.h" namespace cricket { @@ -371,4 +371,4 @@ bool IsRtpProtocol(const std::string& protocol); } // namespace cricket -#endif // PC_MEDIASESSION_H_ +#endif // PC_MEDIA_SESSION_H_ diff --git a/pc/media_session_unittest.cc b/pc/media_session_unittest.cc index c73c19ec19..b6be353c36 100644 --- a/pc/media_session_unittest.cc +++ b/pc/media_session_unittest.cc @@ -15,18 +15,18 @@ #include "absl/memory/memory.h" #include "media/base/codec.h" -#include "media/base/testutils.h" -#include "p2p/base/p2pconstants.h" -#include "p2p/base/transportdescription.h" -#include "p2p/base/transportinfo.h" -#include "pc/mediasession.h" -#include "pc/rtpmediautils.h" -#include "pc/srtpfilter.h" +#include "media/base/test_utils.h" +#include "p2p/base/p2p_constants.h" +#include "p2p/base/transport_description.h" +#include "p2p/base/transport_info.h" +#include "pc/media_session.h" +#include "pc/rtp_media_utils.h" +#include "pc/srtp_filter.h" #include "rtc_base/checks.h" -#include "rtc_base/fakesslidentity.h" +#include "rtc_base/fake_ssl_identity.h" #include "rtc_base/gunit.h" -#include "rtc_base/messagedigest.h" -#include "rtc_base/ssladapter.h" +#include "rtc_base/message_digest.h" +#include "rtc_base/ssl_adapter.h" #include "rtc_base/strings/string_builder.h" #include "test/gmock.h" diff --git a/pc/media_stream.cc b/pc/media_stream.cc index 2e857fa959..e083b96859 100644 --- a/pc/media_stream.cc +++ b/pc/media_stream.cc @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "pc/mediastream.h" +#include "pc/media_stream.h" #include #include #include "rtc_base/checks.h" -#include "rtc_base/refcountedobject.h" +#include "rtc_base/ref_counted_object.h" namespace webrtc { diff --git a/pc/media_stream.h b/pc/media_stream.h index e170c6e7d4..e513226f7a 100644 --- a/pc/media_stream.h +++ b/pc/media_stream.h @@ -10,12 +10,12 @@ // This file contains the implementation of MediaStreamInterface interface. -#ifndef PC_MEDIASTREAM_H_ -#define PC_MEDIASTREAM_H_ +#ifndef PC_MEDIA_STREAM_H_ +#define PC_MEDIA_STREAM_H_ #include -#include "api/mediastreaminterface.h" +#include "api/media_stream_interface.h" #include "api/notifier.h" #include "rtc_base/scoped_ref_ptr.h" @@ -55,4 +55,4 @@ class MediaStream : public Notifier { } // namespace webrtc -#endif // PC_MEDIASTREAM_H_ +#endif // PC_MEDIA_STREAM_H_ diff --git a/pc/media_stream_observer.cc b/pc/media_stream_observer.cc index 1a611a3777..e3ef3c75a5 100644 --- a/pc/media_stream_observer.cc +++ b/pc/media_stream_observer.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "pc/mediastreamobserver.h" +#include "pc/media_stream_observer.h" #include #include diff --git a/pc/media_stream_observer.h b/pc/media_stream_observer.h index 217c9b6468..faa6772f6f 100644 --- a/pc/media_stream_observer.h +++ b/pc/media_stream_observer.h @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef PC_MEDIASTREAMOBSERVER_H_ -#define PC_MEDIASTREAMOBSERVER_H_ +#ifndef PC_MEDIA_STREAM_OBSERVER_H_ +#define PC_MEDIA_STREAM_OBSERVER_H_ -#include "api/mediastreaminterface.h" +#include "api/media_stream_interface.h" #include "rtc_base/scoped_ref_ptr.h" #include "rtc_base/third_party/sigslot/sigslot.h" @@ -45,4 +45,4 @@ class MediaStreamObserver : public ObserverInterface { } // namespace webrtc -#endif // PC_MEDIASTREAMOBSERVER_H_ +#endif // PC_MEDIA_STREAM_OBSERVER_H_ diff --git a/pc/media_stream_track.h b/pc/media_stream_track.h index 33ffbe2c69..358d89a25b 100644 --- a/pc/media_stream_track.h +++ b/pc/media_stream_track.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef PC_MEDIASTREAMTRACK_H_ -#define PC_MEDIASTREAMTRACK_H_ +#ifndef PC_MEDIA_STREAM_TRACK_H_ +#define PC_MEDIA_STREAM_TRACK_H_ #include -#include "api/mediastreaminterface.h" +#include "api/media_stream_interface.h" #include "api/notifier.h" namespace webrtc { @@ -59,4 +59,4 @@ class MediaStreamTrack : public Notifier { } // namespace webrtc -#endif // PC_MEDIASTREAMTRACK_H_ +#endif // PC_MEDIA_STREAM_TRACK_H_ diff --git a/pc/media_stream_unittest.cc b/pc/media_stream_unittest.cc index 69f6e8cf42..4b25e78634 100644 --- a/pc/media_stream_unittest.cc +++ b/pc/media_stream_unittest.cc @@ -11,10 +11,10 @@ #include #include -#include "pc/audiotrack.h" -#include "pc/mediastream.h" -#include "pc/test/fakevideotracksource.h" -#include "pc/videotrack.h" +#include "pc/audio_track.h" +#include "pc/media_stream.h" +#include "pc/test/fake_video_track_source.h" +#include "pc/video_track.h" #include "rtc_base/thread.h" #include "test/gmock.h" #include "test/gtest.h" diff --git a/pc/peer_connection.cc b/pc/peer_connection.cc index 2cf14a1efb..2d68c81761 100644 --- a/pc/peer_connection.cc +++ b/pc/peer_connection.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "pc/peerconnection.h" +#include "pc/peer_connection.h" #include #include @@ -19,37 +19,37 @@ #include "absl/memory/memory.h" #include "absl/strings/match.h" -#include "api/jsepicecandidate.h" -#include "api/jsepsessiondescription.h" -#include "api/mediastreamproxy.h" -#include "api/mediastreamtrackproxy.h" -#include "api/umametrics.h" +#include "api/jsep_ice_candidate.h" +#include "api/jsep_session_description.h" +#include "api/media_stream_proxy.h" +#include "api/media_stream_track_proxy.h" +#include "api/uma_metrics.h" #include "call/call.h" -#include "logging/rtc_event_log/icelogger.h" +#include "logging/rtc_event_log/ice_logger.h" #include "logging/rtc_event_log/output/rtc_event_log_output_file.h" #include "logging/rtc_event_log/rtc_event_log.h" -#include "media/sctp/sctptransport.h" -#include "pc/audiotrack.h" +#include "media/sctp/sctp_transport.h" +#include "pc/audio_track.h" #include "pc/channel.h" -#include "pc/channelmanager.h" -#include "pc/dtmfsender.h" -#include "pc/mediastream.h" -#include "pc/mediastreamobserver.h" -#include "pc/remoteaudiosource.h" -#include "pc/rtpmediautils.h" -#include "pc/rtpreceiver.h" -#include "pc/rtpsender.h" -#include "pc/sctputils.h" -#include "pc/sdputils.h" -#include "pc/streamcollection.h" +#include "pc/channel_manager.h" +#include "pc/dtmf_sender.h" +#include "pc/media_stream.h" +#include "pc/media_stream_observer.h" +#include "pc/remote_audio_source.h" +#include "pc/rtp_media_utils.h" +#include "pc/rtp_receiver.h" +#include "pc/rtp_sender.h" +#include "pc/sctp_utils.h" +#include "pc/sdp_utils.h" +#include "pc/stream_collection.h" #include "pc/unique_id_generator.h" -#include "pc/videocapturertracksource.h" -#include "pc/videotrack.h" +#include "pc/video_capturer_track_source.h" +#include "pc/video_track.h" #include "rtc_base/bind.h" #include "rtc_base/checks.h" #include "rtc_base/logging.h" #include "rtc_base/numerics/safe_conversions.h" -#include "rtc_base/stringencode.h" +#include "rtc_base/string_encode.h" #include "rtc_base/strings/string_builder.h" #include "rtc_base/trace_event.h" #include "system_wrappers/include/clock.h" diff --git a/pc/peer_connection.h b/pc/peer_connection.h index c663520490..b11c86765e 100644 --- a/pc/peer_connection.h +++ b/pc/peer_connection.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef PC_PEERCONNECTION_H_ -#define PC_PEERCONNECTION_H_ +#ifndef PC_PEER_CONNECTION_H_ +#define PC_PEER_CONNECTION_H_ #include #include @@ -18,18 +18,18 @@ #include #include "api/media_transport_interface.h" -#include "api/peerconnectioninterface.h" -#include "api/turncustomizer.h" -#include "pc/iceserverparsing.h" -#include "pc/jseptransportcontroller.h" -#include "pc/peerconnectionfactory.h" -#include "pc/peerconnectioninternal.h" -#include "pc/rtcstatscollector.h" -#include "pc/rtptransceiver.h" -#include "pc/statscollector.h" -#include "pc/streamcollection.h" +#include "api/peer_connection_interface.h" +#include "api/turn_customizer.h" +#include "pc/ice_server_parsing.h" +#include "pc/jsep_transport_controller.h" +#include "pc/peer_connection_factory.h" +#include "pc/peer_connection_internal.h" +#include "pc/rtc_stats_collector.h" +#include "pc/rtp_transceiver.h" +#include "pc/stats_collector.h" +#include "pc/stream_collection.h" #include "pc/unique_id_generator.h" -#include "pc/webrtcsessiondescriptionfactory.h" +#include "pc/webrtc_session_description_factory.h" namespace webrtc { @@ -1151,4 +1151,4 @@ class PeerConnection : public PeerConnectionInternal, } // namespace webrtc -#endif // PC_PEERCONNECTION_H_ +#endif // PC_PEER_CONNECTION_H_ diff --git a/pc/peer_connection_bundle_unittest.cc b/pc/peer_connection_bundle_unittest.cc index fca9914658..8f44c395d9 100644 --- a/pc/peer_connection_bundle_unittest.cc +++ b/pc/peer_connection_bundle_unittest.cc @@ -11,24 +11,24 @@ #include "api/audio_codecs/builtin_audio_decoder_factory.h" #include "api/audio_codecs/builtin_audio_encoder_factory.h" #include "api/create_peerconnection_factory.h" -#include "api/peerconnectionproxy.h" +#include "api/peer_connection_proxy.h" #include "api/video_codecs/builtin_video_decoder_factory.h" #include "api/video_codecs/builtin_video_encoder_factory.h" -#include "p2p/base/fakeportallocator.h" -#include "p2p/base/teststunserver.h" -#include "p2p/client/basicportallocator.h" -#include "pc/mediasession.h" -#include "pc/peerconnection.h" -#include "pc/peerconnectionwrapper.h" -#include "pc/sdputils.h" +#include "p2p/base/fake_port_allocator.h" +#include "p2p/base/test_stun_server.h" +#include "p2p/client/basic_port_allocator.h" +#include "pc/media_session.h" +#include "pc/peer_connection.h" +#include "pc/peer_connection_wrapper.h" +#include "pc/sdp_utils.h" #ifdef WEBRTC_ANDROID -#include "pc/test/androidtestinitializer.h" +#include "pc/test/android_test_initializer.h" #endif #include "absl/memory/memory.h" -#include "pc/test/fakeaudiocapturemodule.h" -#include "rtc_base/fakenetwork.h" +#include "pc/test/fake_audio_capture_module.h" +#include "rtc_base/fake_network.h" #include "rtc_base/gunit.h" -#include "rtc_base/virtualsocketserver.h" +#include "rtc_base/virtual_socket_server.h" #include "test/gmock.h" namespace webrtc { diff --git a/pc/peer_connection_crypto_unittest.cc b/pc/peer_connection_crypto_unittest.cc index 6f7e23b94f..b25aedad65 100644 --- a/pc/peer_connection_crypto_unittest.cc +++ b/pc/peer_connection_crypto_unittest.cc @@ -13,18 +13,18 @@ #include "api/create_peerconnection_factory.h" #include "api/video_codecs/builtin_video_decoder_factory.h" #include "api/video_codecs/builtin_video_encoder_factory.h" -#include "p2p/base/fakeportallocator.h" -#include "pc/mediasession.h" -#include "pc/peerconnectionwrapper.h" -#include "pc/sdputils.h" +#include "p2p/base/fake_port_allocator.h" +#include "pc/media_session.h" +#include "pc/peer_connection_wrapper.h" +#include "pc/sdp_utils.h" #ifdef WEBRTC_ANDROID -#include "pc/test/androidtestinitializer.h" +#include "pc/test/android_test_initializer.h" #endif #include "absl/memory/memory.h" -#include "pc/test/fakeaudiocapturemodule.h" -#include "pc/test/fakertccertificategenerator.h" +#include "pc/test/fake_audio_capture_module.h" +#include "pc/test/fake_rtc_certificate_generator.h" #include "rtc_base/gunit.h" -#include "rtc_base/virtualsocketserver.h" +#include "rtc_base/virtual_socket_server.h" namespace webrtc { diff --git a/pc/peer_connection_data_channel_unittest.cc b/pc/peer_connection_data_channel_unittest.cc index 8cb295b204..c120143b0d 100644 --- a/pc/peer_connection_data_channel_unittest.cc +++ b/pc/peer_connection_data_channel_unittest.cc @@ -15,39 +15,39 @@ #include #include "absl/types/optional.h" -#include "api/call/callfactoryinterface.h" +#include "api/call/call_factory_interface.h" #include "api/jsep.h" #include "api/media_transport_interface.h" -#include "api/mediatypes.h" -#include "api/peerconnectioninterface.h" -#include "api/peerconnectionproxy.h" +#include "api/media_types.h" +#include "api/peer_connection_interface.h" +#include "api/peer_connection_proxy.h" #include "api/test/fake_media_transport.h" #include "media/base/codec.h" -#include "media/base/fakemediaengine.h" -#include "media/base/mediaconstants.h" -#include "media/base/mediaengine.h" -#include "media/sctp/sctptransportinternal.h" -#include "p2p/base/p2pconstants.h" -#include "p2p/base/portallocator.h" -#include "pc/mediasession.h" -#include "pc/peerconnection.h" -#include "pc/peerconnectionfactory.h" -#include "pc/peerconnectionwrapper.h" -#include "pc/sdputils.h" -#include "pc/sessiondescription.h" -#include "pc/test/mockpeerconnectionobservers.h" +#include "media/base/fake_media_engine.h" +#include "media/base/media_constants.h" +#include "media/base/media_engine.h" +#include "media/sctp/sctp_transport_internal.h" +#include "p2p/base/p2p_constants.h" +#include "p2p/base/port_allocator.h" +#include "pc/media_session.h" +#include "pc/peer_connection.h" +#include "pc/peer_connection_factory.h" +#include "pc/peer_connection_wrapper.h" +#include "pc/sdp_utils.h" +#include "pc/session_description.h" +#include "pc/test/mock_peer_connection_observers.h" #include "rtc_base/checks.h" -#include "rtc_base/refcountedobject.h" -#include "rtc_base/rtccertificategenerator.h" +#include "rtc_base/ref_counted_object.h" +#include "rtc_base/rtc_certificate_generator.h" #include "rtc_base/scoped_ref_ptr.h" #include "rtc_base/thread.h" #include "test/gtest.h" #ifdef WEBRTC_ANDROID -#include "pc/test/androidtestinitializer.h" +#include "pc/test/android_test_initializer.h" #endif #include "absl/memory/memory.h" -#include "pc/test/fakesctptransport.h" -#include "rtc_base/virtualsocketserver.h" +#include "pc/test/fake_sctp_transport.h" +#include "rtc_base/virtual_socket_server.h" namespace webrtc { diff --git a/pc/peer_connection_end_to_end_unittest.cc b/pc/peer_connection_end_to_end_unittest.cc index 18f3563c4d..dd56b26692 100644 --- a/pc/peer_connection_end_to_end_unittest.cc +++ b/pc/peer_connection_end_to_end_unittest.cc @@ -23,11 +23,11 @@ #include "rtc_base/logging.h" #ifdef WEBRTC_ANDROID -#include "pc/test/androidtestinitializer.h" +#include "pc/test/android_test_initializer.h" #endif -#include "pc/test/peerconnectiontestwrapper.h" +#include "pc/test/peer_connection_test_wrapper.h" // Notice that mockpeerconnectionobservers.h must be included after the above! -#include "pc/test/mockpeerconnectionobservers.h" +#include "pc/test/mock_peer_connection_observers.h" #include "test/mock_audio_decoder.h" #include "test/mock_audio_decoder_factory.h" #include "test/mock_audio_encoder_factory.h" diff --git a/pc/peer_connection_factory.cc b/pc/peer_connection_factory.cc index e1b3e6c0a3..4c52b21ce4 100644 --- a/pc/peer_connection_factory.cc +++ b/pc/peer_connection_factory.cc @@ -8,43 +8,43 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "pc/peerconnectionfactory.h" +#include "pc/peer_connection_factory.h" #include #include #include "absl/memory/memory.h" #include "api/fec_controller.h" +#include "api/media_constraints_interface.h" +#include "api/media_stream_proxy.h" +#include "api/media_stream_track_proxy.h" #include "api/media_transport_interface.h" -#include "api/mediaconstraintsinterface.h" -#include "api/mediastreamproxy.h" -#include "api/mediastreamtrackproxy.h" -#include "api/peerconnectionfactoryproxy.h" -#include "api/peerconnectionproxy.h" -#include "api/turncustomizer.h" -#include "api/videosourceproxy.h" +#include "api/peer_connection_factory_proxy.h" +#include "api/peer_connection_proxy.h" +#include "api/turn_customizer.h" +#include "api/video_track_source_proxy.h" #include "logging/rtc_event_log/rtc_event_log.h" -#include "media/base/rtpdataengine.h" -#include "media/sctp/sctptransport.h" -#include "pc/rtpparametersconversion.h" +#include "media/base/rtp_data_engine.h" +#include "media/sctp/sctp_transport.h" +#include "pc/rtp_parameters_conversion.h" #include "rtc_base/bind.h" #include "rtc_base/checks.h" // Adding 'nogncheck' to disable the gn include headers check to support modular // WebRTC build targets. // TODO(zhihuang): This wouldn't be necessary if the interface and // implementation of the media engine were in separate build targets. -#include "media/engine/webrtcmediaengine.h" // nogncheck -#include "media/engine/webrtcvideodecoderfactory.h" // nogncheck -#include "media/engine/webrtcvideoencoderfactory.h" // nogncheck +#include "media/engine/webrtc_media_engine.h" // nogncheck +#include "media/engine/webrtc_video_decoder_factory.h" // nogncheck +#include "media/engine/webrtc_video_encoder_factory.h" // nogncheck #include "modules/audio_device/include/audio_device.h" // nogncheck -#include "p2p/base/basicpacketsocketfactory.h" -#include "p2p/client/basicportallocator.h" -#include "pc/audiotrack.h" -#include "pc/localaudiosource.h" -#include "pc/mediastream.h" -#include "pc/peerconnection.h" -#include "pc/videocapturertracksource.h" -#include "pc/videotrack.h" +#include "p2p/base/basic_packet_socket_factory.h" +#include "p2p/client/basic_port_allocator.h" +#include "pc/audio_track.h" +#include "pc/local_audio_source.h" +#include "pc/media_stream.h" +#include "pc/peer_connection.h" +#include "pc/video_capturer_track_source.h" +#include "pc/video_track.h" #include "system_wrappers/include/field_trial.h" namespace webrtc { diff --git a/pc/peer_connection_factory.h b/pc/peer_connection_factory.h index e64eb1083f..6b1958c9fa 100644 --- a/pc/peer_connection_factory.h +++ b/pc/peer_connection_factory.h @@ -9,18 +9,18 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef PC_PEERCONNECTIONFACTORY_H_ -#define PC_PEERCONNECTIONFACTORY_H_ +#ifndef PC_PEER_CONNECTION_FACTORY_H_ +#define PC_PEER_CONNECTION_FACTORY_H_ #include #include +#include "api/media_stream_interface.h" #include "api/media_transport_interface.h" -#include "api/mediastreaminterface.h" -#include "api/peerconnectioninterface.h" -#include "media/sctp/sctptransportinternal.h" -#include "pc/channelmanager.h" -#include "rtc_base/rtccertificategenerator.h" +#include "api/peer_connection_interface.h" +#include "media/sctp/sctp_transport_internal.h" +#include "pc/channel_manager.h" +#include "rtc_base/rtc_certificate_generator.h" #include "rtc_base/scoped_ref_ptr.h" #include "rtc_base/thread.h" @@ -156,4 +156,4 @@ class PeerConnectionFactory : public PeerConnectionFactoryInterface { } // namespace webrtc -#endif // PC_PEERCONNECTIONFACTORY_H_ +#endif // PC_PEER_CONNECTION_FACTORY_H_ diff --git a/pc/peer_connection_factory_unittest.cc b/pc/peer_connection_factory_unittest.cc index 01a6fb27f2..3f3cc158f5 100644 --- a/pc/peer_connection_factory_unittest.cc +++ b/pc/peer_connection_factory_unittest.cc @@ -20,29 +20,29 @@ #include "api/audio_codecs/builtin_audio_decoder_factory.h" #include "api/audio_codecs/builtin_audio_encoder_factory.h" #include "api/create_peerconnection_factory.h" -#include "api/datachannelinterface.h" +#include "api/data_channel_interface.h" #include "api/jsep.h" -#include "api/mediastreaminterface.h" +#include "api/media_stream_interface.h" #include "api/video_codecs/builtin_video_decoder_factory.h" #include "api/video_codecs/builtin_video_encoder_factory.h" #include "api/video_codecs/video_decoder_factory.h" #include "api/video_codecs/video_encoder_factory.h" -#include "media/base/fakevideocapturer.h" +#include "media/base/fake_video_capturer.h" #include "modules/audio_device/include/audio_device.h" #include "modules/audio_processing/include/audio_processing.h" -#include "p2p/base/fakeportallocator.h" +#include "p2p/base/fake_port_allocator.h" #include "p2p/base/port.h" -#include "p2p/base/portinterface.h" -#include "pc/peerconnectionfactory.h" -#include "pc/test/fakeaudiocapturemodule.h" -#include "rtc_base/socketaddress.h" +#include "p2p/base/port_interface.h" +#include "pc/peer_connection_factory.h" +#include "pc/test/fake_audio_capture_module.h" +#include "rtc_base/socket_address.h" #include "test/gtest.h" #ifdef WEBRTC_ANDROID -#include "pc/test/androidtestinitializer.h" +#include "pc/test/android_test_initializer.h" #endif -#include "pc/test/fakertccertificategenerator.h" -#include "pc/test/fakevideotrackrenderer.h" +#include "pc/test/fake_rtc_certificate_generator.h" +#include "pc/test/fake_video_track_renderer.h" using webrtc::DataChannelInterface; using webrtc::FakeVideoTrackRenderer; diff --git a/pc/peer_connection_histogram_unittest.cc b/pc/peer_connection_histogram_unittest.cc index 987fa3a63f..2bbebdb2c9 100644 --- a/pc/peer_connection_histogram_unittest.cc +++ b/pc/peer_connection_histogram_unittest.cc @@ -16,28 +16,28 @@ #include "absl/memory/memory.h" #include "absl/types/optional.h" -#include "api/call/callfactoryinterface.h" +#include "api/call/call_factory_interface.h" #include "api/jsep.h" -#include "api/peerconnectioninterface.h" -#include "api/peerconnectionproxy.h" -#include "api/rtcerror.h" -#include "media/base/fakemediaengine.h" -#include "p2p/base/portallocator.h" -#include "p2p/client/basicportallocator.h" -#include "pc/peerconnection.h" -#include "pc/peerconnectionfactory.h" -#include "pc/peerconnectionwrapper.h" -#include "pc/sdputils.h" -#include "pc/test/mockpeerconnectionobservers.h" +#include "api/peer_connection_interface.h" +#include "api/peer_connection_proxy.h" +#include "api/rtc_error.h" +#include "media/base/fake_media_engine.h" +#include "p2p/base/port_allocator.h" +#include "p2p/client/basic_port_allocator.h" +#include "pc/peer_connection.h" +#include "pc/peer_connection_factory.h" +#include "pc/peer_connection_wrapper.h" +#include "pc/sdp_utils.h" +#include "pc/test/mock_peer_connection_observers.h" #include "rtc_base/checks.h" -#include "rtc_base/fakenetwork.h" +#include "rtc_base/fake_network.h" #include "rtc_base/gunit.h" -#include "rtc_base/refcountedobject.h" -#include "rtc_base/rtccertificategenerator.h" +#include "rtc_base/ref_counted_object.h" +#include "rtc_base/rtc_certificate_generator.h" #include "rtc_base/scoped_ref_ptr.h" -#include "rtc_base/socketaddress.h" +#include "rtc_base/socket_address.h" #include "rtc_base/thread.h" -#include "rtc_base/virtualsocketserver.h" +#include "rtc_base/virtual_socket_server.h" #include "system_wrappers/include/metrics.h" #include "test/gtest.h" diff --git a/pc/peer_connection_ice_unittest.cc b/pc/peer_connection_ice_unittest.cc index 619705b712..4ef5458002 100644 --- a/pc/peer_connection_ice_unittest.cc +++ b/pc/peer_connection_ice_unittest.cc @@ -8,29 +8,29 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "p2p/base/fakeportallocator.h" -#include "p2p/base/teststunserver.h" -#include "p2p/client/basicportallocator.h" -#include "pc/mediasession.h" -#include "pc/peerconnection.h" -#include "pc/peerconnectionwrapper.h" -#include "pc/sdputils.h" +#include "p2p/base/fake_port_allocator.h" +#include "p2p/base/test_stun_server.h" +#include "p2p/client/basic_port_allocator.h" +#include "pc/media_session.h" +#include "pc/peer_connection.h" +#include "pc/peer_connection_wrapper.h" +#include "pc/sdp_utils.h" #ifdef WEBRTC_ANDROID -#include "pc/test/androidtestinitializer.h" +#include "pc/test/android_test_initializer.h" #endif #include "absl/memory/memory.h" #include "api/audio_codecs/builtin_audio_decoder_factory.h" #include "api/audio_codecs/builtin_audio_encoder_factory.h" #include "api/create_peerconnection_factory.h" -#include "api/peerconnectionproxy.h" -#include "api/umametrics.h" +#include "api/peer_connection_proxy.h" +#include "api/uma_metrics.h" #include "api/video_codecs/builtin_video_decoder_factory.h" #include "api/video_codecs/builtin_video_encoder_factory.h" -#include "pc/test/fakeaudiocapturemodule.h" -#include "rtc_base/fakenetwork.h" +#include "pc/test/fake_audio_capture_module.h" +#include "rtc_base/fake_network.h" #include "rtc_base/gunit.h" #include "rtc_base/strings/string_builder.h" -#include "rtc_base/virtualsocketserver.h" +#include "rtc_base/virtual_socket_server.h" #include "system_wrappers/include/metrics.h" namespace webrtc { diff --git a/pc/peer_connection_integrationtest.cc b/pc/peer_connection_integrationtest.cc index 0bd3d09921..84c5c886f3 100644 --- a/pc/peer_connection_integrationtest.cc +++ b/pc/peer_connection_integrationtest.cc @@ -25,12 +25,12 @@ #include "absl/memory/memory.h" #include "api/audio_codecs/builtin_audio_decoder_factory.h" #include "api/audio_codecs/builtin_audio_encoder_factory.h" -#include "api/mediastreaminterface.h" -#include "api/peerconnectioninterface.h" -#include "api/peerconnectionproxy.h" -#include "api/rtpreceiverinterface.h" +#include "api/media_stream_interface.h" +#include "api/peer_connection_interface.h" +#include "api/peer_connection_proxy.h" +#include "api/rtp_receiver_interface.h" #include "api/test/loopback_media_transport.h" -#include "api/umametrics.h" +#include "api/uma_metrics.h" #include "api/video_codecs/builtin_video_decoder_factory.h" #include "api/video_codecs/builtin_video_encoder_factory.h" #include "api/video_codecs/sdp_video_format.h" @@ -38,35 +38,35 @@ #include "logging/rtc_event_log/fake_rtc_event_log_factory.h" #include "logging/rtc_event_log/rtc_event_log_factory.h" #include "logging/rtc_event_log/rtc_event_log_factory_interface.h" -#include "media/engine/fakewebrtcvideoengine.h" -#include "media/engine/webrtcmediaengine.h" +#include "media/engine/fake_webrtc_video_engine.h" +#include "media/engine/webrtc_media_engine.h" #include "modules/audio_processing/include/audio_processing.h" -#include "p2p/base/mockasyncresolver.h" -#include "p2p/base/p2pconstants.h" -#include "p2p/base/portinterface.h" -#include "p2p/base/teststunserver.h" -#include "p2p/base/testturncustomizer.h" -#include "p2p/base/testturnserver.h" -#include "p2p/client/basicportallocator.h" -#include "pc/dtmfsender.h" -#include "pc/localaudiosource.h" -#include "pc/mediasession.h" -#include "pc/peerconnection.h" -#include "pc/peerconnectionfactory.h" -#include "pc/rtpmediautils.h" -#include "pc/sessiondescription.h" -#include "pc/test/fakeaudiocapturemodule.h" -#include "pc/test/fakeperiodicvideotracksource.h" -#include "pc/test/fakertccertificategenerator.h" -#include "pc/test/fakevideotrackrenderer.h" -#include "pc/test/mockpeerconnectionobservers.h" -#include "rtc_base/fakenetwork.h" -#include "rtc_base/firewallsocketserver.h" +#include "p2p/base/mock_async_resolver.h" +#include "p2p/base/p2p_constants.h" +#include "p2p/base/port_interface.h" +#include "p2p/base/test_stun_server.h" +#include "p2p/base/test_turn_customizer.h" +#include "p2p/base/test_turn_server.h" +#include "p2p/client/basic_port_allocator.h" +#include "pc/dtmf_sender.h" +#include "pc/local_audio_source.h" +#include "pc/media_session.h" +#include "pc/peer_connection.h" +#include "pc/peer_connection_factory.h" +#include "pc/rtp_media_utils.h" +#include "pc/session_description.h" +#include "pc/test/fake_audio_capture_module.h" +#include "pc/test/fake_periodic_video_track_source.h" +#include "pc/test/fake_rtc_certificate_generator.h" +#include "pc/test/fake_video_track_renderer.h" +#include "pc/test/mock_peer_connection_observers.h" +#include "rtc_base/fake_network.h" +#include "rtc_base/firewall_socket_server.h" #include "rtc_base/gunit.h" #include "rtc_base/numerics/safe_conversions.h" -#include "rtc_base/testcertificateverifier.h" -#include "rtc_base/timeutils.h" -#include "rtc_base/virtualsocketserver.h" +#include "rtc_base/test_certificate_verifier.h" +#include "rtc_base/time_utils.h" +#include "rtc_base/virtual_socket_server.h" #include "system_wrappers/include/metrics.h" #include "test/gmock.h" diff --git a/pc/peer_connection_interface_unittest.cc b/pc/peer_connection_interface_unittest.cc index 5b9f775607..9cd1e14680 100644 --- a/pc/peer_connection_interface_unittest.cc +++ b/pc/peer_connection_interface_unittest.cc @@ -23,19 +23,19 @@ #include "api/audio_codecs/audio_encoder_factory.h" #include "api/audio_codecs/builtin_audio_decoder_factory.h" #include "api/audio_codecs/builtin_audio_encoder_factory.h" -#include "api/call/callfactoryinterface.h" +#include "api/call/call_factory_interface.h" #include "api/create_peerconnection_factory.h" -#include "api/datachannelinterface.h" +#include "api/data_channel_interface.h" #include "api/jsep.h" -#include "api/jsepsessiondescription.h" -#include "api/mediastreaminterface.h" -#include "api/mediatypes.h" -#include "api/peerconnectioninterface.h" -#include "api/rtcerror.h" -#include "api/rtceventlogoutput.h" -#include "api/rtpreceiverinterface.h" -#include "api/rtpsenderinterface.h" -#include "api/rtptransceiverinterface.h" +#include "api/jsep_session_description.h" +#include "api/media_stream_interface.h" +#include "api/media_types.h" +#include "api/peer_connection_interface.h" +#include "api/rtc_error.h" +#include "api/rtc_event_log_output.h" +#include "api/rtp_receiver_interface.h" +#include "api/rtp_sender_interface.h" +#include "api/rtp_transceiver_interface.h" #include "api/video_codecs/builtin_video_decoder_factory.h" #include "api/video_codecs/builtin_video_encoder_factory.h" #include "api/video_codecs/video_decoder_factory.h" @@ -45,54 +45,54 @@ #include "logging/rtc_event_log/rtc_event_log_factory.h" #include "logging/rtc_event_log/rtc_event_log_factory_interface.h" #include "media/base/codec.h" -#include "media/base/fakevideocapturer.h" -#include "media/base/mediaconfig.h" -#include "media/base/mediaengine.h" -#include "media/base/streamparams.h" -#include "media/base/videocapturer.h" -#include "media/engine/webrtcmediaengine.h" -#include "media/sctp/sctptransportinternal.h" +#include "media/base/fake_video_capturer.h" +#include "media/base/media_config.h" +#include "media/base/media_engine.h" +#include "media/base/stream_params.h" +#include "media/base/video_capturer.h" +#include "media/engine/webrtc_media_engine.h" +#include "media/sctp/sctp_transport_internal.h" #include "modules/audio_device/include/audio_device.h" #include "modules/audio_processing/include/audio_processing.h" -#include "p2p/base/fakeportallocator.h" -#include "p2p/base/p2pconstants.h" +#include "p2p/base/fake_port_allocator.h" +#include "p2p/base/p2p_constants.h" #include "p2p/base/port.h" -#include "p2p/base/portallocator.h" -#include "p2p/base/transportdescription.h" -#include "p2p/base/transportinfo.h" -#include "pc/audiotrack.h" -#include "pc/mediasession.h" -#include "pc/mediastream.h" -#include "pc/peerconnection.h" -#include "pc/peerconnectionfactory.h" -#include "pc/rtcstatscollector.h" -#include "pc/rtpsender.h" -#include "pc/sessiondescription.h" -#include "pc/streamcollection.h" -#include "pc/test/fakeaudiocapturemodule.h" -#include "pc/test/fakertccertificategenerator.h" -#include "pc/test/fakevideotracksource.h" -#include "pc/test/mockpeerconnectionobservers.h" -#include "pc/test/testsdpstrings.h" -#include "pc/videotrack.h" +#include "p2p/base/port_allocator.h" +#include "p2p/base/transport_description.h" +#include "p2p/base/transport_info.h" +#include "pc/audio_track.h" +#include "pc/media_session.h" +#include "pc/media_stream.h" +#include "pc/peer_connection.h" +#include "pc/peer_connection_factory.h" +#include "pc/rtc_stats_collector.h" +#include "pc/rtp_sender.h" +#include "pc/session_description.h" +#include "pc/stream_collection.h" +#include "pc/test/fake_audio_capture_module.h" +#include "pc/test/fake_rtc_certificate_generator.h" +#include "pc/test/fake_video_track_source.h" +#include "pc/test/mock_peer_connection_observers.h" +#include "pc/test/test_sdp_strings.h" +#include "pc/video_track.h" #include "rtc_base/checks.h" -#include "rtc_base/copyonwritebuffer.h" +#include "rtc_base/copy_on_write_buffer.h" #include "rtc_base/gunit.h" #include "rtc_base/platform_file.h" -#include "rtc_base/refcountedobject.h" -#include "rtc_base/rtccertificategenerator.h" +#include "rtc_base/ref_counted_object.h" +#include "rtc_base/rtc_certificate_generator.h" #include "rtc_base/scoped_ref_ptr.h" -#include "rtc_base/socketaddress.h" -#include "rtc_base/stringutils.h" +#include "rtc_base/socket_address.h" +#include "rtc_base/string_utils.h" #include "rtc_base/thread.h" -#include "rtc_base/timeutils.h" -#include "rtc_base/virtualsocketserver.h" +#include "rtc_base/time_utils.h" +#include "rtc_base/virtual_socket_server.h" #include "test/gmock.h" #include "test/gtest.h" -#include "test/testsupport/fileutils.h" +#include "test/testsupport/file_utils.h" #ifdef WEBRTC_ANDROID -#include "pc/test/androidtestinitializer.h" +#include "pc/test/android_test_initializer.h" #endif namespace webrtc { diff --git a/pc/peer_connection_internal.h b/pc/peer_connection_internal.h index cb3627bfbc..2cfee76167 100644 --- a/pc/peer_connection_internal.h +++ b/pc/peer_connection_internal.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef PC_PEERCONNECTIONINTERNAL_H_ -#define PC_PEERCONNECTIONINTERNAL_H_ +#ifndef PC_PEER_CONNECTION_INTERNAL_H_ +#define PC_PEER_CONNECTION_INTERNAL_H_ #include #include @@ -17,10 +17,10 @@ #include #include -#include "api/peerconnectioninterface.h" +#include "api/peer_connection_interface.h" #include "call/call.h" -#include "pc/datachannel.h" -#include "pc/rtptransceiver.h" +#include "pc/data_channel.h" +#include "pc/rtp_transceiver.h" namespace webrtc { @@ -90,4 +90,4 @@ class PeerConnectionInternal : public PeerConnectionInterface { } // namespace webrtc -#endif // PC_PEERCONNECTIONINTERNAL_H_ +#endif // PC_PEER_CONNECTION_INTERNAL_H_ diff --git a/pc/peer_connection_jsep_unittest.cc b/pc/peer_connection_jsep_unittest.cc index 7a04474787..3acf11e1a0 100644 --- a/pc/peer_connection_jsep_unittest.cc +++ b/pc/peer_connection_jsep_unittest.cc @@ -12,20 +12,20 @@ #include "api/audio_codecs/builtin_audio_encoder_factory.h" #include "api/video_codecs/builtin_video_decoder_factory.h" #include "api/video_codecs/builtin_video_encoder_factory.h" -#include "media/engine/webrtcmediaengine.h" +#include "media/engine/webrtc_media_engine.h" #include "modules/audio_processing/include/audio_processing.h" -#include "pc/mediasession.h" -#include "pc/peerconnectionfactory.h" -#include "pc/peerconnectionwrapper.h" -#include "pc/sdputils.h" +#include "pc/media_session.h" +#include "pc/peer_connection_factory.h" +#include "pc/peer_connection_wrapper.h" +#include "pc/sdp_utils.h" #ifdef WEBRTC_ANDROID -#include "pc/test/androidtestinitializer.h" +#include "pc/test/android_test_initializer.h" #endif #include "absl/memory/memory.h" -#include "pc/test/fakeaudiocapturemodule.h" -#include "pc/test/fakesctptransport.h" +#include "pc/test/fake_audio_capture_module.h" +#include "pc/test/fake_sctp_transport.h" #include "rtc_base/gunit.h" -#include "rtc_base/virtualsocketserver.h" +#include "rtc_base/virtual_socket_server.h" #include "test/gmock.h" // This file contains tests that ensure the PeerConnection's implementation of diff --git a/pc/peer_connection_media_unittest.cc b/pc/peer_connection_media_unittest.cc index 25aea98284..3115eb6c24 100644 --- a/pc/peer_connection_media_unittest.cc +++ b/pc/peer_connection_media_unittest.cc @@ -14,22 +14,22 @@ #include -#include "api/call/callfactoryinterface.h" +#include "api/call/call_factory_interface.h" #include "api/test/fake_media_transport.h" #include "logging/rtc_event_log/rtc_event_log_factory.h" -#include "media/base/fakemediaengine.h" -#include "p2p/base/fakeportallocator.h" -#include "pc/mediasession.h" -#include "pc/peerconnectionwrapper.h" -#include "pc/rtpmediautils.h" -#include "pc/sdputils.h" +#include "media/base/fake_media_engine.h" +#include "p2p/base/fake_port_allocator.h" +#include "pc/media_session.h" +#include "pc/peer_connection_wrapper.h" +#include "pc/rtp_media_utils.h" +#include "pc/sdp_utils.h" #ifdef WEBRTC_ANDROID -#include "pc/test/androidtestinitializer.h" +#include "pc/test/android_test_initializer.h" #endif #include "absl/memory/memory.h" -#include "pc/test/fakertccertificategenerator.h" +#include "pc/test/fake_rtc_certificate_generator.h" #include "rtc_base/gunit.h" -#include "rtc_base/virtualsocketserver.h" +#include "rtc_base/virtual_socket_server.h" #include "test/gmock.h" namespace webrtc { diff --git a/pc/peer_connection_rampup_tests.cc b/pc/peer_connection_rampup_tests.cc index abec373f65..321affdca8 100644 --- a/pc/peer_connection_rampup_tests.cc +++ b/pc/peer_connection_rampup_tests.cc @@ -23,39 +23,39 @@ #include "api/audio_options.h" #include "api/create_peerconnection_factory.h" #include "api/jsep.h" -#include "api/mediastreaminterface.h" -#include "api/peerconnectioninterface.h" -#include "api/stats/rtcstats.h" +#include "api/media_stream_interface.h" +#include "api/peer_connection_interface.h" +#include "api/stats/rtc_stats.h" +#include "api/stats/rtc_stats_report.h" #include "api/stats/rtcstats_objects.h" -#include "api/stats/rtcstatsreport.h" #include "api/video_codecs/builtin_video_decoder_factory.h" #include "api/video_codecs/builtin_video_encoder_factory.h" #include "api/video_codecs/video_decoder_factory.h" #include "api/video_codecs/video_encoder_factory.h" #include "modules/audio_device/include/audio_device.h" #include "modules/audio_processing/include/audio_processing.h" -#include "p2p/base/portallocator.h" -#include "p2p/base/portinterface.h" -#include "p2p/base/testturnserver.h" -#include "p2p/client/basicportallocator.h" -#include "pc/peerconnection.h" -#include "pc/peerconnectionwrapper.h" -#include "pc/test/fakeaudiocapturemodule.h" -#include "pc/test/framegeneratorcapturervideotracksource.h" -#include "pc/test/mockpeerconnectionobservers.h" +#include "p2p/base/port_allocator.h" +#include "p2p/base/port_interface.h" +#include "p2p/base/test_turn_server.h" +#include "p2p/client/basic_port_allocator.h" +#include "pc/peer_connection.h" +#include "pc/peer_connection_wrapper.h" +#include "pc/test/fake_audio_capture_module.h" +#include "pc/test/frame_generator_capturer_video_track_source.h" +#include "pc/test/mock_peer_connection_observers.h" #include "rtc_base/checks.h" -#include "rtc_base/fakenetwork.h" -#include "rtc_base/firewallsocketserver.h" +#include "rtc_base/fake_network.h" +#include "rtc_base/firewall_socket_server.h" #include "rtc_base/gunit.h" #include "rtc_base/helpers.h" #include "rtc_base/location.h" -#include "rtc_base/refcountedobject.h" +#include "rtc_base/ref_counted_object.h" #include "rtc_base/scoped_ref_ptr.h" -#include "rtc_base/socketaddress.h" -#include "rtc_base/sslcertificate.h" -#include "rtc_base/testcertificateverifier.h" +#include "rtc_base/socket_address.h" +#include "rtc_base/ssl_certificate.h" +#include "rtc_base/test_certificate_verifier.h" #include "rtc_base/thread.h" -#include "rtc_base/virtualsocketserver.h" +#include "rtc_base/virtual_socket_server.h" #include "system_wrappers/include/clock.h" #include "test/gtest.h" #include "test/testsupport/perf_test.h" diff --git a/pc/peer_connection_rtp_unittest.cc b/pc/peer_connection_rtp_unittest.cc index 7d49fecd21..0b95d2d26a 100644 --- a/pc/peer_connection_rtp_unittest.cc +++ b/pc/peer_connection_rtp_unittest.cc @@ -23,34 +23,34 @@ #include "api/audio_codecs/builtin_audio_encoder_factory.h" #include "api/create_peerconnection_factory.h" #include "api/jsep.h" -#include "api/mediastreaminterface.h" -#include "api/mediatypes.h" -#include "api/peerconnectioninterface.h" -#include "api/rtcerror.h" -#include "api/rtpparameters.h" -#include "api/rtpreceiverinterface.h" -#include "api/rtpsenderinterface.h" -#include "api/rtptransceiverinterface.h" -#include "api/setremotedescriptionobserverinterface.h" -#include "api/umametrics.h" +#include "api/media_stream_interface.h" +#include "api/media_types.h" +#include "api/peer_connection_interface.h" +#include "api/rtc_error.h" +#include "api/rtp_parameters.h" +#include "api/rtp_receiver_interface.h" +#include "api/rtp_sender_interface.h" +#include "api/rtp_transceiver_interface.h" +#include "api/set_remote_description_observer_interface.h" +#include "api/uma_metrics.h" #include "api/video_codecs/builtin_video_decoder_factory.h" #include "api/video_codecs/builtin_video_encoder_factory.h" #include "api/video_codecs/video_decoder_factory.h" #include "api/video_codecs/video_encoder_factory.h" -#include "media/base/streamparams.h" +#include "media/base/stream_params.h" #include "modules/audio_device/include/audio_device.h" #include "modules/audio_processing/include/audio_processing.h" -#include "p2p/base/portallocator.h" -#include "pc/mediasession.h" -#include "pc/peerconnectionwrapper.h" -#include "pc/sdputils.h" -#include "pc/sessiondescription.h" -#include "pc/test/fakeaudiocapturemodule.h" -#include "pc/test/mockpeerconnectionobservers.h" +#include "p2p/base/port_allocator.h" +#include "pc/media_session.h" +#include "pc/peer_connection_wrapper.h" +#include "pc/sdp_utils.h" +#include "pc/session_description.h" +#include "pc/test/fake_audio_capture_module.h" +#include "pc/test/mock_peer_connection_observers.h" #include "rtc_base/checks.h" #include "rtc_base/gunit.h" -#include "rtc_base/refcountedobject.h" -#include "rtc_base/rtccertificategenerator.h" +#include "rtc_base/ref_counted_object.h" +#include "rtc_base/rtc_certificate_generator.h" #include "rtc_base/scoped_ref_ptr.h" #include "rtc_base/thread.h" #include "system_wrappers/include/metrics.h" diff --git a/pc/peer_connection_signaling_unittest.cc b/pc/peer_connection_signaling_unittest.cc index d90411c61c..ed76753e9d 100644 --- a/pc/peer_connection_signaling_unittest.cc +++ b/pc/peer_connection_signaling_unittest.cc @@ -16,20 +16,20 @@ #include "api/audio_codecs/builtin_audio_decoder_factory.h" #include "api/audio_codecs/builtin_audio_encoder_factory.h" #include "api/create_peerconnection_factory.h" -#include "api/peerconnectionproxy.h" +#include "api/peer_connection_proxy.h" #include "api/video_codecs/builtin_video_decoder_factory.h" #include "api/video_codecs/builtin_video_encoder_factory.h" -#include "pc/peerconnection.h" -#include "pc/peerconnectionwrapper.h" -#include "pc/sdputils.h" +#include "pc/peer_connection.h" +#include "pc/peer_connection_wrapper.h" +#include "pc/sdp_utils.h" #ifdef WEBRTC_ANDROID -#include "pc/test/androidtestinitializer.h" +#include "pc/test/android_test_initializer.h" #endif #include "absl/memory/memory.h" -#include "pc/test/fakeaudiocapturemodule.h" -#include "pc/test/fakertccertificategenerator.h" +#include "pc/test/fake_audio_capture_module.h" +#include "pc/test/fake_rtc_certificate_generator.h" #include "rtc_base/gunit.h" -#include "rtc_base/virtualsocketserver.h" +#include "rtc_base/virtual_socket_server.h" #include "test/gmock.h" namespace webrtc { diff --git a/pc/peer_connection_wrapper.cc b/pc/peer_connection_wrapper.cc index 05e7cf72ce..6bfb59f935 100644 --- a/pc/peer_connection_wrapper.cc +++ b/pc/peer_connection_wrapper.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "pc/peerconnectionwrapper.h" +#include "pc/peer_connection_wrapper.h" #include #include @@ -16,14 +16,14 @@ #include #include -#include "api/setremotedescriptionobserverinterface.h" -#include "pc/sdputils.h" -#include "pc/test/fakevideotracksource.h" +#include "api/set_remote_description_observer_interface.h" +#include "pc/sdp_utils.h" +#include "pc/test/fake_video_track_source.h" #include "rtc_base/checks.h" #include "rtc_base/function_view.h" #include "rtc_base/gunit.h" #include "rtc_base/logging.h" -#include "rtc_base/refcountedobject.h" +#include "rtc_base/ref_counted_object.h" #include "test/gtest.h" namespace webrtc { diff --git a/pc/peer_connection_wrapper.h b/pc/peer_connection_wrapper.h index 63a250110f..0acd58f2b9 100644 --- a/pc/peer_connection_wrapper.h +++ b/pc/peer_connection_wrapper.h @@ -8,23 +8,23 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef PC_PEERCONNECTIONWRAPPER_H_ -#define PC_PEERCONNECTIONWRAPPER_H_ +#ifndef PC_PEER_CONNECTION_WRAPPER_H_ +#define PC_PEER_CONNECTION_WRAPPER_H_ #include #include #include -#include "api/datachannelinterface.h" +#include "api/data_channel_interface.h" #include "api/jsep.h" -#include "api/mediastreaminterface.h" -#include "api/mediatypes.h" -#include "api/peerconnectioninterface.h" -#include "api/rtcerror.h" -#include "api/rtpsenderinterface.h" -#include "api/rtptransceiverinterface.h" -#include "api/stats/rtcstatsreport.h" -#include "pc/test/mockpeerconnectionobservers.h" +#include "api/media_stream_interface.h" +#include "api/media_types.h" +#include "api/peer_connection_interface.h" +#include "api/rtc_error.h" +#include "api/rtp_sender_interface.h" +#include "api/rtp_transceiver_interface.h" +#include "api/stats/rtc_stats_report.h" +#include "pc/test/mock_peer_connection_observers.h" #include "rtc_base/function_view.h" #include "rtc_base/scoped_ref_ptr.h" @@ -192,4 +192,4 @@ class PeerConnectionWrapper { } // namespace webrtc -#endif // PC_PEERCONNECTIONWRAPPER_H_ +#endif // PC_PEER_CONNECTION_WRAPPER_H_ diff --git a/pc/proxy_unittest.cc b/pc/proxy_unittest.cc index 072e606e30..f9b706355b 100644 --- a/pc/proxy_unittest.cc +++ b/pc/proxy_unittest.cc @@ -14,7 +14,7 @@ #include #include "rtc_base/gunit.h" -#include "rtc_base/refcount.h" +#include "rtc_base/ref_count.h" #include "test/gmock.h" using ::testing::_; diff --git a/pc/remote_audio_source.cc b/pc/remote_audio_source.cc index 53a972619a..ac7604db49 100644 --- a/pc/remote_audio_source.cc +++ b/pc/remote_audio_source.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "pc/remoteaudiosource.h" +#include "pc/remote_audio_source.h" #include #include @@ -16,7 +16,7 @@ #include "absl/memory/memory.h" #include "rtc_base/checks.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" #include "rtc_base/location.h" #include "rtc_base/logging.h" #include "rtc_base/scoped_ref_ptr.h" diff --git a/pc/remote_audio_source.h b/pc/remote_audio_source.h index 4d87331f91..399e7e3a44 100644 --- a/pc/remote_audio_source.h +++ b/pc/remote_audio_source.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef PC_REMOTEAUDIOSOURCE_H_ -#define PC_REMOTEAUDIOSOURCE_H_ +#ifndef PC_REMOTE_AUDIO_SOURCE_H_ +#define PC_REMOTE_AUDIO_SOURCE_H_ #include #include @@ -17,8 +17,8 @@ #include "api/call/audio_sink.h" #include "api/notifier.h" #include "pc/channel.h" -#include "rtc_base/criticalsection.h" -#include "rtc_base/messagehandler.h" +#include "rtc_base/critical_section.h" +#include "rtc_base/message_handler.h" namespace rtc { struct Message; @@ -73,4 +73,4 @@ class RemoteAudioSource : public Notifier, } // namespace webrtc -#endif // PC_REMOTEAUDIOSOURCE_H_ +#endif // PC_REMOTE_AUDIO_SOURCE_H_ diff --git a/pc/rtc_stats_collector.cc b/pc/rtc_stats_collector.cc index d48ecc01f3..b1a44ee794 100644 --- a/pc/rtc_stats_collector.cc +++ b/pc/rtc_stats_collector.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "pc/rtcstatscollector.h" +#include "pc/rtc_stats_collector.h" #include #include @@ -17,16 +17,16 @@ #include "absl/memory/memory.h" #include "api/candidate.h" -#include "api/mediastreaminterface.h" -#include "api/peerconnectioninterface.h" -#include "media/base/mediachannel.h" -#include "p2p/base/p2pconstants.h" +#include "api/media_stream_interface.h" +#include "api/peer_connection_interface.h" +#include "media/base/media_channel.h" +#include "p2p/base/p2p_constants.h" #include "p2p/base/port.h" -#include "pc/peerconnection.h" -#include "pc/rtcstatstraversal.h" +#include "pc/peer_connection.h" +#include "pc/rtc_stats_traversal.h" #include "rtc_base/checks.h" #include "rtc_base/strings/string_builder.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/time_utils.h" #include "rtc_base/trace_event.h" namespace webrtc { diff --git a/pc/rtc_stats_collector.h b/pc/rtc_stats_collector.h index 8dd16e39a9..e3402df053 100644 --- a/pc/rtc_stats_collector.h +++ b/pc/rtc_stats_collector.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef PC_RTCSTATSCOLLECTOR_H_ -#define PC_RTCSTATSCOLLECTOR_H_ +#ifndef PC_RTC_STATS_COLLECTOR_H_ +#define PC_RTC_STATS_COLLECTOR_H_ #include #include @@ -18,20 +18,20 @@ #include #include "absl/types/optional.h" +#include "api/stats/rtc_stats_collector_callback.h" +#include "api/stats/rtc_stats_report.h" #include "api/stats/rtcstats_objects.h" -#include "api/stats/rtcstatscollectorcallback.h" -#include "api/stats/rtcstatsreport.h" #include "call/call.h" -#include "media/base/mediachannel.h" -#include "pc/datachannel.h" -#include "pc/peerconnectioninternal.h" -#include "pc/trackmediainfomap.h" -#include "rtc_base/asyncinvoker.h" -#include "rtc_base/refcount.h" +#include "media/base/media_channel.h" +#include "pc/data_channel.h" +#include "pc/peer_connection_internal.h" +#include "pc/track_media_info_map.h" +#include "rtc_base/async_invoker.h" +#include "rtc_base/ref_count.h" #include "rtc_base/scoped_ref_ptr.h" -#include "rtc_base/sslidentity.h" +#include "rtc_base/ssl_identity.h" #include "rtc_base/third_party/sigslot/sigslot.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/time_utils.h" namespace webrtc { @@ -271,4 +271,4 @@ const char* DataStateToRTCDataChannelStateForTesting( } // namespace webrtc -#endif // PC_RTCSTATSCOLLECTOR_H_ +#endif // PC_RTC_STATS_COLLECTOR_H_ diff --git a/pc/rtc_stats_collector_unittest.cc b/pc/rtc_stats_collector_unittest.cc index 2be4371f41..4635d0e9b4 100644 --- a/pc/rtc_stats_collector_unittest.cc +++ b/pc/rtc_stats_collector_unittest.cc @@ -16,26 +16,26 @@ #include #include "absl/memory/memory.h" -#include "api/rtpparameters.h" +#include "api/rtp_parameters.h" +#include "api/stats/rtc_stats_report.h" #include "api/stats/rtcstats_objects.h" -#include "api/stats/rtcstatsreport.h" #include "api/units/time_delta.h" -#include "p2p/base/p2pconstants.h" +#include "p2p/base/p2p_constants.h" #include "p2p/base/port.h" -#include "pc/mediastream.h" -#include "pc/mediastreamtrack.h" -#include "pc/rtcstatscollector.h" -#include "pc/test/fakepeerconnectionforstats.h" -#include "pc/test/mock_datachannel.h" -#include "pc/test/mock_rtpreceiverinternal.h" -#include "pc/test/mock_rtpsenderinternal.h" -#include "pc/test/rtcstatsobtainer.h" +#include "pc/media_stream.h" +#include "pc/media_stream_track.h" +#include "pc/rtc_stats_collector.h" +#include "pc/test/fake_peer_connection_for_stats.h" +#include "pc/test/mock_data_channel.h" +#include "pc/test/mock_rtp_receiver_internal.h" +#include "pc/test/mock_rtp_sender_internal.h" +#include "pc/test/rtc_stats_obtainer.h" #include "rtc_base/checks.h" -#include "rtc_base/fakeclock.h" -#include "rtc_base/fakesslidentity.h" +#include "rtc_base/fake_clock.h" +#include "rtc_base/fake_ssl_identity.h" #include "rtc_base/gunit.h" #include "rtc_base/logging.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/time_utils.h" using testing::AtLeast; using testing::Invoke; diff --git a/pc/rtc_stats_integrationtest.cc b/pc/rtc_stats_integrationtest.cc index aa45975878..cae01ae4a5 100644 --- a/pc/rtc_stats_integrationtest.cc +++ b/pc/rtc_stats_integrationtest.cc @@ -22,25 +22,25 @@ #include "api/audio_codecs/builtin_audio_decoder_factory.h" #include "api/audio_codecs/builtin_audio_encoder_factory.h" #include "api/audio_options.h" -#include "api/datachannelinterface.h" -#include "api/peerconnectioninterface.h" -#include "api/rtpreceiverinterface.h" -#include "api/rtpsenderinterface.h" -#include "api/stats/rtcstats.h" +#include "api/data_channel_interface.h" +#include "api/peer_connection_interface.h" +#include "api/rtp_receiver_interface.h" +#include "api/rtp_sender_interface.h" +#include "api/stats/rtc_stats.h" +#include "api/stats/rtc_stats_report.h" #include "api/stats/rtcstats_objects.h" -#include "api/stats/rtcstatsreport.h" -#include "api/test/fakeconstraints.h" -#include "pc/rtcstatstraversal.h" -#include "pc/test/peerconnectiontestwrapper.h" -#include "pc/test/rtcstatsobtainer.h" +#include "api/test/fake_constraints.h" +#include "pc/rtc_stats_traversal.h" +#include "pc/test/peer_connection_test_wrapper.h" +#include "pc/test/rtc_stats_obtainer.h" #include "rtc_base/checks.h" #include "rtc_base/event_tracer.h" #include "rtc_base/gunit.h" -#include "rtc_base/refcountedobject.h" +#include "rtc_base/ref_counted_object.h" #include "rtc_base/scoped_ref_ptr.h" #include "rtc_base/thread.h" #include "rtc_base/trace_event.h" -#include "rtc_base/virtualsocketserver.h" +#include "rtc_base/virtual_socket_server.h" #include "test/gtest.h" namespace webrtc { diff --git a/pc/rtc_stats_traversal.cc b/pc/rtc_stats_traversal.cc index 62b8c52a10..e7af0e10e9 100644 --- a/pc/rtc_stats_traversal.cc +++ b/pc/rtc_stats_traversal.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "pc/rtcstatstraversal.h" +#include "pc/rtc_stats_traversal.h" #include #include diff --git a/pc/rtc_stats_traversal.h b/pc/rtc_stats_traversal.h index eb5c809244..f648ec66b9 100644 --- a/pc/rtc_stats_traversal.h +++ b/pc/rtc_stats_traversal.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef PC_RTCSTATSTRAVERSAL_H_ -#define PC_RTCSTATSTRAVERSAL_H_ +#ifndef PC_RTC_STATS_TRAVERSAL_H_ +#define PC_RTC_STATS_TRAVERSAL_H_ #include #include -#include "api/stats/rtcstats.h" -#include "api/stats/rtcstatsreport.h" +#include "api/stats/rtc_stats.h" +#include "api/stats/rtc_stats_report.h" #include "rtc_base/scoped_ref_ptr.h" namespace webrtc { @@ -41,4 +41,4 @@ std::vector GetStatsReferencedIds(const RTCStats& stats); } // namespace webrtc -#endif // PC_RTCSTATSTRAVERSAL_H_ +#endif // PC_RTC_STATS_TRAVERSAL_H_ diff --git a/pc/rtc_stats_traversal_unittest.cc b/pc/rtc_stats_traversal_unittest.cc index d5b0de7504..de2aae7977 100644 --- a/pc/rtc_stats_traversal_unittest.cc +++ b/pc/rtc_stats_traversal_unittest.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "pc/rtcstatstraversal.h" +#include "pc/rtc_stats_traversal.h" #include #include diff --git a/pc/rtcp_mux_filter.cc b/pc/rtcp_mux_filter.cc index dceaf465f4..a8cf717b28 100644 --- a/pc/rtcp_mux_filter.cc +++ b/pc/rtcp_mux_filter.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "pc/rtcpmuxfilter.h" +#include "pc/rtcp_mux_filter.h" #include "rtc_base/logging.h" diff --git a/pc/rtcp_mux_filter.h b/pc/rtcp_mux_filter.h index 55b6ea657b..48050de3d8 100644 --- a/pc/rtcp_mux_filter.h +++ b/pc/rtcp_mux_filter.h @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef PC_RTCPMUXFILTER_H_ -#define PC_RTCPMUXFILTER_H_ +#ifndef PC_RTCP_MUX_FILTER_H_ +#define PC_RTCP_MUX_FILTER_H_ -#include "pc/sessiondescription.h" +#include "pc/session_description.h" namespace cricket { @@ -75,4 +75,4 @@ class RtcpMuxFilter { } // namespace cricket -#endif // PC_RTCPMUXFILTER_H_ +#endif // PC_RTCP_MUX_FILTER_H_ diff --git a/pc/rtcp_mux_filter_unittest.cc b/pc/rtcp_mux_filter_unittest.cc index 095f08ff0d..586da23df8 100644 --- a/pc/rtcp_mux_filter_unittest.cc +++ b/pc/rtcp_mux_filter_unittest.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "pc/rtcpmuxfilter.h" +#include "pc/rtcp_mux_filter.h" #include "test/gtest.h" diff --git a/pc/rtp_media_utils.cc b/pc/rtp_media_utils.cc index 051cc0af42..f4a61207a6 100644 --- a/pc/rtp_media_utils.cc +++ b/pc/rtp_media_utils.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "pc/rtpmediautils.h" +#include "pc/rtp_media_utils.h" #include "rtc_base/checks.h" diff --git a/pc/rtp_media_utils.h b/pc/rtp_media_utils.h index 5f02d89907..3ff40c9f0f 100644 --- a/pc/rtp_media_utils.h +++ b/pc/rtp_media_utils.h @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef PC_RTPMEDIAUTILS_H_ -#define PC_RTPMEDIAUTILS_H_ +#ifndef PC_RTP_MEDIA_UTILS_H_ +#define PC_RTP_MEDIA_UTILS_H_ -#include "api/rtptransceiverinterface.h" +#include "api/rtp_transceiver_interface.h" namespace webrtc { @@ -54,4 +54,4 @@ inline std::ostream& operator<<( // no-presubmit-check TODO(webrtc:8982) } // namespace webrtc -#endif // PC_RTPMEDIAUTILS_H_ +#endif // PC_RTP_MEDIA_UTILS_H_ diff --git a/pc/rtp_media_utils_unittest.cc b/pc/rtp_media_utils_unittest.cc index af7e8f671b..fbaa7a3802 100644 --- a/pc/rtp_media_utils_unittest.cc +++ b/pc/rtp_media_utils_unittest.cc @@ -10,7 +10,7 @@ #include -#include "pc/rtpmediautils.h" +#include "pc/rtp_media_utils.h" #include "test/gtest.h" namespace webrtc { diff --git a/pc/rtp_parameters_conversion.cc b/pc/rtp_parameters_conversion.cc index 000b980562..cf9e6e1252 100644 --- a/pc/rtp_parameters_conversion.cc +++ b/pc/rtp_parameters_conversion.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "pc/rtpparametersconversion.h" +#include "pc/rtp_parameters_conversion.h" #include #include @@ -17,9 +17,9 @@ #include #include "api/array_view.h" -#include "api/mediatypes.h" -#include "media/base/mediaconstants.h" -#include "media/base/rtputils.h" +#include "api/media_types.h" +#include "media/base/media_constants.h" +#include "media/base/rtp_utils.h" #include "rtc_base/checks.h" #include "rtc_base/logging.h" #include "rtc_base/strings/string_builder.h" diff --git a/pc/rtp_parameters_conversion.h b/pc/rtp_parameters_conversion.h index b77d3b7899..dc24a456fa 100644 --- a/pc/rtp_parameters_conversion.h +++ b/pc/rtp_parameters_conversion.h @@ -8,18 +8,18 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef PC_RTPPARAMETERSCONVERSION_H_ -#define PC_RTPPARAMETERSCONVERSION_H_ +#ifndef PC_RTP_PARAMETERS_CONVERSION_H_ +#define PC_RTP_PARAMETERS_CONVERSION_H_ #include #include #include "absl/types/optional.h" -#include "api/rtcerror.h" -#include "api/rtpparameters.h" +#include "api/rtc_error.h" +#include "api/rtp_parameters.h" #include "media/base/codec.h" -#include "media/base/streamparams.h" -#include "pc/sessiondescription.h" +#include "media/base/stream_params.h" +#include "pc/session_description.h" namespace webrtc { @@ -106,4 +106,4 @@ RtpParameters ToRtpParameters( } // namespace webrtc -#endif // PC_RTPPARAMETERSCONVERSION_H_ +#endif // PC_RTP_PARAMETERS_CONVERSION_H_ diff --git a/pc/rtp_parameters_conversion_unittest.cc b/pc/rtp_parameters_conversion_unittest.cc index f4f1b9270c..27708cc883 100644 --- a/pc/rtp_parameters_conversion_unittest.cc +++ b/pc/rtp_parameters_conversion_unittest.cc @@ -10,7 +10,7 @@ #include -#include "pc/rtpparametersconversion.h" +#include "pc/rtp_parameters_conversion.h" #include "rtc_base/gunit.h" namespace webrtc { diff --git a/pc/rtp_receiver.cc b/pc/rtp_receiver.cc index be1bd4b067..837175a634 100644 --- a/pc/rtp_receiver.cc +++ b/pc/rtp_receiver.cc @@ -8,18 +8,18 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "pc/rtpreceiver.h" +#include "pc/rtp_receiver.h" #include #include #include -#include "api/mediastreamproxy.h" -#include "api/mediastreamtrackproxy.h" -#include "api/videosourceproxy.h" -#include "pc/audiotrack.h" -#include "pc/mediastream.h" -#include "pc/videotrack.h" +#include "api/media_stream_proxy.h" +#include "api/media_stream_track_proxy.h" +#include "api/video_track_source_proxy.h" +#include "pc/audio_track.h" +#include "pc/media_stream.h" +#include "pc/video_track.h" #include "rtc_base/checks.h" #include "rtc_base/location.h" #include "rtc_base/logging.h" diff --git a/pc/rtp_receiver.h b/pc/rtp_receiver.h index ca477a6064..754fce047e 100644 --- a/pc/rtp_receiver.h +++ b/pc/rtp_receiver.h @@ -12,27 +12,27 @@ // An RtpReceiver associates a MediaStreamTrackInterface with an underlying // transport (provided by cricket::VoiceChannel/cricket::VideoChannel) -#ifndef PC_RTPRECEIVER_H_ -#define PC_RTPRECEIVER_H_ +#ifndef PC_RTP_RECEIVER_H_ +#define PC_RTP_RECEIVER_H_ #include #include #include #include "absl/types/optional.h" -#include "api/crypto/framedecryptorinterface.h" -#include "api/mediastreaminterface.h" -#include "api/mediatypes.h" -#include "api/rtpparameters.h" -#include "api/rtpreceiverinterface.h" +#include "api/crypto/frame_decryptor_interface.h" +#include "api/media_stream_interface.h" +#include "api/media_types.h" +#include "api/rtp_parameters.h" +#include "api/rtp_receiver_interface.h" #include "api/video/video_frame.h" #include "api/video/video_sink_interface.h" #include "api/video/video_source_interface.h" -#include "media/base/mediachannel.h" -#include "media/base/videobroadcaster.h" -#include "pc/remoteaudiosource.h" -#include "pc/videotracksource.h" -#include "rtc_base/refcountedobject.h" +#include "media/base/media_channel.h" +#include "media/base/video_broadcaster.h" +#include "pc/remote_audio_source.h" +#include "pc/video_track_source.h" +#include "rtc_base/ref_counted_object.h" #include "rtc_base/scoped_ref_ptr.h" #include "rtc_base/thread.h" @@ -261,4 +261,4 @@ class VideoRtpReceiver : public rtc::RefCountedObject { } // namespace webrtc -#endif // PC_RTPRECEIVER_H_ +#endif // PC_RTP_RECEIVER_H_ diff --git a/pc/rtp_sender.cc b/pc/rtp_sender.cc index ec99a4b40d..b97b876f3d 100644 --- a/pc/rtp_sender.cc +++ b/pc/rtp_sender.cc @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "pc/rtpsender.h" +#include "pc/rtp_sender.h" #include #include #include "api/audio_options.h" -#include "api/mediastreaminterface.h" -#include "media/base/mediaengine.h" -#include "pc/statscollector.h" +#include "api/media_stream_interface.h" +#include "media/base/media_engine.h" +#include "pc/stats_collector.h" #include "rtc_base/checks.h" #include "rtc_base/helpers.h" #include "rtc_base/location.h" diff --git a/pc/rtp_sender.h b/pc/rtp_sender.h index 07fae6b954..6ed060372d 100644 --- a/pc/rtp_sender.h +++ b/pc/rtp_sender.h @@ -12,19 +12,19 @@ // An RtpSender associates a MediaStreamTrackInterface with an underlying // transport (provided by AudioProviderInterface/VideoProviderInterface) -#ifndef PC_RTPSENDER_H_ -#define PC_RTPSENDER_H_ +#ifndef PC_RTP_SENDER_H_ +#define PC_RTP_SENDER_H_ #include #include #include -#include "api/mediastreaminterface.h" -#include "api/rtpsenderinterface.h" -#include "media/base/audiosource.h" -#include "media/base/mediachannel.h" -#include "pc/dtmfsender.h" -#include "rtc_base/criticalsection.h" +#include "api/media_stream_interface.h" +#include "api/rtp_sender_interface.h" +#include "media/base/audio_source.h" +#include "media/base/media_channel.h" +#include "pc/dtmf_sender.h" +#include "rtc_base/critical_section.h" namespace webrtc { @@ -270,4 +270,4 @@ class VideoRtpSender : public ObserverInterface, } // namespace webrtc -#endif // PC_RTPSENDER_H_ +#endif // PC_RTP_SENDER_H_ diff --git a/pc/rtp_sender_receiver_unittest.cc b/pc/rtp_sender_receiver_unittest.cc index ec1e949335..5672a9c190 100644 --- a/pc/rtp_sender_receiver_unittest.cc +++ b/pc/rtp_sender_receiver_unittest.cc @@ -18,39 +18,39 @@ #include "absl/memory/memory.h" #include "absl/types/optional.h" #include "api/audio_options.h" -#include "api/crypto/cryptooptions.h" -#include "api/crypto/framedecryptorinterface.h" -#include "api/crypto/frameencryptorinterface.h" -#include "api/dtmfsenderinterface.h" -#include "api/mediastreaminterface.h" -#include "api/rtcerror.h" -#include "api/rtpparameters.h" +#include "api/crypto/crypto_options.h" +#include "api/crypto/frame_decryptor_interface.h" +#include "api/crypto/frame_encryptor_interface.h" +#include "api/dtmf_sender_interface.h" +#include "api/media_stream_interface.h" +#include "api/rtc_error.h" +#include "api/rtp_parameters.h" #include "api/test/fake_frame_decryptor.h" #include "api/test/fake_frame_encryptor.h" #include "logging/rtc_event_log/rtc_event_log.h" #include "media/base/codec.h" -#include "media/base/fakemediaengine.h" -#include "media/base/mediachannel.h" -#include "media/base/mediaconfig.h" -#include "media/base/mediaengine.h" -#include "media/base/rtpdataengine.h" -#include "media/base/streamparams.h" -#include "media/base/testutils.h" -#include "media/engine/fakewebrtccall.h" -#include "p2p/base/dtlstransportinternal.h" -#include "p2p/base/fakedtlstransport.h" -#include "p2p/base/p2pconstants.h" -#include "pc/audiotrack.h" +#include "media/base/fake_media_engine.h" +#include "media/base/media_channel.h" +#include "media/base/media_config.h" +#include "media/base/media_engine.h" +#include "media/base/rtp_data_engine.h" +#include "media/base/stream_params.h" +#include "media/base/test_utils.h" +#include "media/engine/fake_webrtc_call.h" +#include "p2p/base/dtls_transport_internal.h" +#include "p2p/base/fake_dtls_transport.h" +#include "p2p/base/p2p_constants.h" +#include "pc/audio_track.h" #include "pc/channel.h" -#include "pc/channelmanager.h" -#include "pc/dtlssrtptransport.h" -#include "pc/localaudiosource.h" -#include "pc/mediastream.h" -#include "pc/rtpreceiver.h" -#include "pc/rtpsender.h" -#include "pc/rtptransportinternal.h" -#include "pc/test/fakevideotracksource.h" -#include "pc/videotrack.h" +#include "pc/channel_manager.h" +#include "pc/dtls_srtp_transport.h" +#include "pc/local_audio_source.h" +#include "pc/media_stream.h" +#include "pc/rtp_receiver.h" +#include "pc/rtp_sender.h" +#include "pc/rtp_transport_internal.h" +#include "pc/test/fake_video_track_source.h" +#include "pc/video_track.h" #include "rtc_base/checks.h" #include "rtc_base/gunit.h" #include "rtc_base/scoped_ref_ptr.h" diff --git a/pc/rtp_transceiver.cc b/pc/rtp_transceiver.cc index ffb9bddf47..b04c20c4b6 100644 --- a/pc/rtp_transceiver.cc +++ b/pc/rtp_transceiver.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "pc/rtptransceiver.h" +#include "pc/rtp_transceiver.h" #include #include -#include "pc/rtpmediautils.h" +#include "pc/rtp_media_utils.h" #include "rtc_base/checks.h" #include "rtc_base/logging.h" diff --git a/pc/rtp_transceiver.h b/pc/rtp_transceiver.h index 07db196edd..7c234ce9eb 100644 --- a/pc/rtp_transceiver.h +++ b/pc/rtp_transceiver.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef PC_RTPTRANSCEIVER_H_ -#define PC_RTPTRANSCEIVER_H_ +#ifndef PC_RTP_TRANSCEIVER_H_ +#define PC_RTP_TRANSCEIVER_H_ #include #include -#include "api/rtptransceiverinterface.h" -#include "pc/rtpreceiver.h" -#include "pc/rtpsender.h" +#include "api/rtp_transceiver_interface.h" +#include "pc/rtp_receiver.h" +#include "pc/rtp_sender.h" namespace webrtc { @@ -216,4 +216,4 @@ END_PROXY_MAP(); } // namespace webrtc -#endif // PC_RTPTRANSCEIVER_H_ +#endif // PC_RTP_TRANSCEIVER_H_ diff --git a/pc/rtp_transceiver_unittest.cc b/pc/rtp_transceiver_unittest.cc index f8af12ffa2..885a5a10c8 100644 --- a/pc/rtp_transceiver_unittest.cc +++ b/pc/rtp_transceiver_unittest.cc @@ -10,9 +10,9 @@ // This file contains tests for |RtpTransceiver|. -#include "pc/rtptransceiver.h" +#include "pc/rtp_transceiver.h" -#include "pc/test/mock_channelinterface.h" +#include "pc/test/mock_channel_interface.h" #include "test/gmock.h" #include "test/gtest.h" diff --git a/pc/rtp_transport.cc b/pc/rtp_transport.cc index f4adb80f82..0b076f79ec 100644 --- a/pc/rtp_transport.cc +++ b/pc/rtp_transport.cc @@ -8,18 +8,18 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "pc/rtptransport.h" +#include "pc/rtp_transport.h" #include #include #include #include "api/rtp_headers.h" -#include "api/rtpparameters.h" -#include "media/base/rtputils.h" +#include "api/rtp_parameters.h" +#include "media/base/rtp_utils.h" #include "modules/rtp_rtcp/source/rtp_packet_received.h" #include "rtc_base/checks.h" -#include "rtc_base/copyonwritebuffer.h" +#include "rtc_base/copy_on_write_buffer.h" #include "rtc_base/logging.h" #include "rtc_base/third_party/sigslot/sigslot.h" #include "rtc_base/trace_event.h" diff --git a/pc/rtp_transport.h b/pc/rtp_transport.h index dab5903171..f188a17a39 100644 --- a/pc/rtp_transport.h +++ b/pc/rtp_transport.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef PC_RTPTRANSPORT_H_ -#define PC_RTPTRANSPORT_H_ +#ifndef PC_RTP_TRANSPORT_H_ +#define PC_RTP_TRANSPORT_H_ #include #include "call/rtp_demuxer.h" #include "modules/rtp_rtcp/include/rtp_header_extension_map.h" -#include "pc/rtptransportinternal.h" +#include "pc/rtp_transport_internal.h" #include "rtc_base/third_party/sigslot/sigslot.h" namespace rtc { @@ -152,4 +152,4 @@ class RtpTransport : public RtpTransportInternal { } // namespace webrtc -#endif // PC_RTPTRANSPORT_H_ +#endif // PC_RTP_TRANSPORT_H_ diff --git a/pc/rtp_transport_internal.h b/pc/rtp_transport_internal.h index e6338366c0..f8a5f2bb1a 100644 --- a/pc/rtp_transport_internal.h +++ b/pc/rtp_transport_internal.h @@ -8,17 +8,17 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef PC_RTPTRANSPORTINTERNAL_H_ -#define PC_RTPTRANSPORTINTERNAL_H_ +#ifndef PC_RTP_TRANSPORT_INTERNAL_H_ +#define PC_RTP_TRANSPORT_INTERNAL_H_ #include -#include "api/ortc/srtptransportinterface.h" +#include "api/ortc/srtp_transport_interface.h" #include "call/rtp_demuxer.h" -#include "p2p/base/icetransportinternal.h" -#include "pc/sessiondescription.h" -#include "rtc_base/networkroute.h" -#include "rtc_base/sslstreamadapter.h" +#include "p2p/base/ice_transport_internal.h" +#include "pc/session_description.h" +#include "rtc_base/network_route.h" +#include "rtc_base/ssl_stream_adapter.h" #include "rtc_base/third_party/sigslot/sigslot.h" namespace rtc { @@ -105,4 +105,4 @@ class RtpTransportInternal : public SrtpTransportInterface, } // namespace webrtc -#endif // PC_RTPTRANSPORTINTERNAL_H_ +#endif // PC_RTP_TRANSPORT_INTERNAL_H_ diff --git a/pc/rtp_transport_internal_adapter.h b/pc/rtp_transport_internal_adapter.h index fd92c5127d..c8fa8cc012 100644 --- a/pc/rtp_transport_internal_adapter.h +++ b/pc/rtp_transport_internal_adapter.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef PC_RTPTRANSPORTINTERNALADAPTER_H_ -#define PC_RTPTRANSPORTINTERNALADAPTER_H_ +#ifndef PC_RTP_TRANSPORT_INTERNAL_ADAPTER_H_ +#define PC_RTP_TRANSPORT_INTERNAL_ADAPTER_H_ #include #include -#include "pc/rtptransportinternal.h" +#include "pc/rtp_transport_internal.h" namespace webrtc { @@ -111,4 +111,4 @@ class RtpTransportInternalAdapter : public RtpTransportInternal { } // namespace webrtc -#endif // PC_RTPTRANSPORTINTERNALADAPTER_H_ +#endif // PC_RTP_TRANSPORT_INTERNAL_ADAPTER_H_ diff --git a/pc/rtp_transport_unittest.cc b/pc/rtp_transport_unittest.cc index 3b28c67d33..f3b2bb6f9f 100644 --- a/pc/rtp_transport_unittest.cc +++ b/pc/rtp_transport_unittest.cc @@ -14,10 +14,10 @@ #include #include "api/rtp_headers.h" -#include "api/rtpparameters.h" -#include "p2p/base/fakepackettransport.h" -#include "pc/rtptransport.h" -#include "pc/rtptransporttestutil.h" +#include "api/rtp_parameters.h" +#include "p2p/base/fake_packet_transport.h" +#include "pc/rtp_transport.h" +#include "pc/test/rtp_transport_test_util.h" #include "rtc_base/buffer.h" #include "rtc_base/third_party/sigslot/sigslot.h" #include "test/gtest.h" diff --git a/pc/sctp_utils.cc b/pc/sctp_utils.cc index 58fbde805c..aa7b6c11c0 100644 --- a/pc/sctp_utils.cc +++ b/pc/sctp_utils.cc @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "pc/sctputils.h" +#include "pc/sctp_utils.h" #include #include -#include "rtc_base/bytebuffer.h" -#include "rtc_base/copyonwritebuffer.h" +#include "rtc_base/byte_buffer.h" +#include "rtc_base/copy_on_write_buffer.h" #include "rtc_base/logging.h" namespace webrtc { diff --git a/pc/sctp_utils.h b/pc/sctp_utils.h index 7a4708af29..468c960949 100644 --- a/pc/sctp_utils.h +++ b/pc/sctp_utils.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef PC_SCTPUTILS_H_ -#define PC_SCTPUTILS_H_ +#ifndef PC_SCTP_UTILS_H_ +#define PC_SCTP_UTILS_H_ #include -#include "api/datachannelinterface.h" +#include "api/data_channel_interface.h" namespace rtc { class CopyOnWriteBuffer; @@ -38,4 +38,4 @@ bool WriteDataChannelOpenMessage(const std::string& label, void WriteDataChannelOpenAckMessage(rtc::CopyOnWriteBuffer* payload); } // namespace webrtc -#endif // PC_SCTPUTILS_H_ +#endif // PC_SCTP_UTILS_H_ diff --git a/pc/sctp_utils_unittest.cc b/pc/sctp_utils_unittest.cc index 0718a23f5f..72db9521bb 100644 --- a/pc/sctp_utils_unittest.cc +++ b/pc/sctp_utils_unittest.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "pc/sctputils.h" +#include "pc/sctp_utils.h" #include -#include "rtc_base/bytebuffer.h" -#include "rtc_base/copyonwritebuffer.h" +#include "rtc_base/byte_buffer.h" +#include "rtc_base/copy_on_write_buffer.h" #include "test/gtest.h" class SctpUtilsTest : public testing::Test { diff --git a/pc/sdp_serializer.cc b/pc/sdp_serializer.cc index 8e20aa2ec9..cdaddd7199 100644 --- a/pc/sdp_serializer.cc +++ b/pc/sdp_serializer.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "pc/sdpserializer.h" +#include "pc/sdp_serializer.h" #include #include @@ -17,8 +17,8 @@ #include "api/jsep.h" #include "rtc_base/checks.h" +#include "rtc_base/string_encode.h" #include "rtc_base/string_to_number.h" -#include "rtc_base/stringencode.h" #include "rtc_base/strings/string_builder.h" using cricket::RidDescription; diff --git a/pc/sdp_serializer.h b/pc/sdp_serializer.h index 3c6f31b0e2..476ebafbdc 100644 --- a/pc/sdp_serializer.h +++ b/pc/sdp_serializer.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef PC_SDPSERIALIZER_H_ -#define PC_SDPSERIALIZER_H_ +#ifndef PC_SDP_SERIALIZER_H_ +#define PC_SDP_SERIALIZER_H_ #include #include "absl/strings/string_view.h" -#include "api/rtcerror.h" -#include "media/base/riddescription.h" -#include "pc/sessiondescription.h" +#include "api/rtc_error.h" +#include "media/base/rid_description.h" +#include "pc/session_description.h" namespace webrtc { @@ -57,4 +57,4 @@ class SdpSerializer { } // namespace webrtc -#endif // PC_SDPSERIALIZER_H_ +#endif // PC_SDP_SERIALIZER_H_ diff --git a/pc/sdp_serializer_unittest.cc b/pc/sdp_serializer_unittest.cc index c5e95d01e9..76fa8baa93 100644 --- a/pc/sdp_serializer_unittest.cc +++ b/pc/sdp_serializer_unittest.cc @@ -13,7 +13,7 @@ #include #include -#include "pc/sdpserializer.h" +#include "pc/sdp_serializer.h" #include "rtc_base/gunit.h" using ::testing::ValuesIn; diff --git a/pc/sdp_utils.cc b/pc/sdp_utils.cc index 07bff7bca2..b20a667684 100644 --- a/pc/sdp_utils.cc +++ b/pc/sdp_utils.cc @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "pc/sdputils.h" +#include "pc/sdp_utils.h" #include #include #include "absl/memory/memory.h" -#include "api/jsepsessiondescription.h" +#include "api/jsep_session_description.h" namespace webrtc { diff --git a/pc/sdp_utils.h b/pc/sdp_utils.h index 0d2d304769..5e765fa586 100644 --- a/pc/sdp_utils.h +++ b/pc/sdp_utils.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef PC_SDPUTILS_H_ -#define PC_SDPUTILS_H_ +#ifndef PC_SDP_UTILS_H_ +#define PC_SDP_UTILS_H_ #include #include #include #include "api/jsep.h" -#include "pc/sessiondescription.h" +#include "pc/session_description.h" namespace webrtc { @@ -57,4 +57,4 @@ void SdpContentsForEach(SdpContentMutator fn, } // namespace webrtc -#endif // PC_SDPUTILS_H_ +#endif // PC_SDP_UTILS_H_ diff --git a/pc/session_description.cc b/pc/session_description.cc index dd56eafa7c..1029ee8d0b 100644 --- a/pc/session_description.cc +++ b/pc/session_description.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "pc/sessiondescription.h" +#include "pc/session_description.h" #include #include diff --git a/pc/session_description.h b/pc/session_description.h index 9998356999..13da227a57 100644 --- a/pc/session_description.h +++ b/pc/session_description.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef PC_SESSIONDESCRIPTION_H_ -#define PC_SESSIONDESCRIPTION_H_ +#ifndef PC_SESSION_DESCRIPTION_H_ +#define PC_SESSION_DESCRIPTION_H_ #include #include @@ -17,16 +17,16 @@ #include #include -#include "api/cryptoparams.h" -#include "api/mediatypes.h" -#include "api/rtpparameters.h" -#include "api/rtptransceiverinterface.h" -#include "media/base/mediachannel.h" -#include "media/base/streamparams.h" -#include "p2p/base/transportdescription.h" -#include "p2p/base/transportinfo.h" -#include "pc/simulcastdescription.h" -#include "rtc_base/socketaddress.h" +#include "api/crypto_params.h" +#include "api/media_types.h" +#include "api/rtp_parameters.h" +#include "api/rtp_transceiver_interface.h" +#include "media/base/media_channel.h" +#include "media/base/stream_params.h" +#include "p2p/base/transport_description.h" +#include "p2p/base/transport_info.h" +#include "pc/simulcast_description.h" +#include "rtc_base/socket_address.h" namespace cricket { @@ -549,4 +549,4 @@ enum ContentSource { CS_LOCAL, CS_REMOTE }; } // namespace cricket -#endif // PC_SESSIONDESCRIPTION_H_ +#endif // PC_SESSION_DESCRIPTION_H_ diff --git a/pc/session_description_unittest.cc b/pc/session_description_unittest.cc index 4e9d7dc4c3..3b05dca381 100644 --- a/pc/session_description_unittest.cc +++ b/pc/session_description_unittest.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 "pc/sessiondescription.h" +#include "pc/session_description.h" #include "test/gtest.h" diff --git a/pc/simulcast_description.cc b/pc/simulcast_description.cc index 61849ce5dc..0359ffcc2a 100644 --- a/pc/simulcast_description.cc +++ b/pc/simulcast_description.cc @@ -10,7 +10,7 @@ #include -#include "pc/simulcastdescription.h" +#include "pc/simulcast_description.h" #include "rtc_base/checks.h" namespace cricket { diff --git a/pc/simulcast_description.h b/pc/simulcast_description.h index 0781a6a283..1337a9ce4d 100644 --- a/pc/simulcast_description.h +++ b/pc/simulcast_description.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef PC_SIMULCASTDESCRIPTION_H_ -#define PC_SIMULCASTDESCRIPTION_H_ +#ifndef PC_SIMULCAST_DESCRIPTION_H_ +#define PC_SIMULCAST_DESCRIPTION_H_ #include #include @@ -108,4 +108,4 @@ class SimulcastDescription final { } // namespace cricket -#endif // PC_SIMULCASTDESCRIPTION_H_ +#endif // PC_SIMULCAST_DESCRIPTION_H_ diff --git a/pc/srtp_filter.cc b/pc/srtp_filter.cc index 0dff80794f..cdfaeaaf8f 100644 --- a/pc/srtp_filter.cc +++ b/pc/srtp_filter.cc @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "pc/srtpfilter.h" +#include "pc/srtp_filter.h" #include #include #include "rtc_base/logging.h" -#include "rtc_base/sslstreamadapter.h" +#include "rtc_base/ssl_stream_adapter.h" #include "rtc_base/third_party/base64/base64.h" #include "rtc_base/zero_memory.h" diff --git a/pc/srtp_filter.h b/pc/srtp_filter.h index 4ab0dd72c1..5b6c99dcb5 100644 --- a/pc/srtp_filter.h +++ b/pc/srtp_filter.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef PC_SRTPFILTER_H_ -#define PC_SRTPFILTER_H_ +#ifndef PC_SRTP_FILTER_H_ +#define PC_SRTP_FILTER_H_ #include #include @@ -19,13 +19,13 @@ #include "absl/types/optional.h" #include "api/array_view.h" -#include "api/cryptoparams.h" +#include "api/crypto_params.h" #include "api/jsep.h" -#include "pc/sessiondescription.h" +#include "pc/session_description.h" #include "rtc_base/buffer.h" -#include "rtc_base/constructormagic.h" -#include "rtc_base/criticalsection.h" -#include "rtc_base/sslstreamadapter.h" +#include "rtc_base/constructor_magic.h" +#include "rtc_base/critical_section.h" +#include "rtc_base/ssl_stream_adapter.h" #include "rtc_base/thread_checker.h" // Forward declaration to avoid pulling in libsrtp headers here @@ -143,4 +143,4 @@ class SrtpFilter { } // namespace cricket -#endif // PC_SRTPFILTER_H_ +#endif // PC_SRTP_FILTER_H_ diff --git a/pc/srtp_filter_unittest.cc b/pc/srtp_filter_unittest.cc index 326e1bac8a..d7368d12cb 100644 --- a/pc/srtp_filter_unittest.cc +++ b/pc/srtp_filter_unittest.cc @@ -10,9 +10,9 @@ #include -#include "api/cryptoparams.h" -#include "pc/srtpfilter.h" -#include "rtc_base/sslstreamadapter.h" +#include "api/crypto_params.h" +#include "pc/srtp_filter.h" +#include "rtc_base/ssl_stream_adapter.h" #include "test/gtest.h" using cricket::CryptoParams; diff --git a/pc/srtp_session.cc b/pc/srtp_session.cc index aadd4711a5..fccf7da2b9 100644 --- a/pc/srtp_session.cc +++ b/pc/srtp_session.cc @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "pc/srtpsession.h" +#include "pc/srtp_session.h" -#include "media/base/rtputils.h" -#include "pc/externalhmac.h" -#include "rtc_base/criticalsection.h" +#include "media/base/rtp_utils.h" +#include "pc/external_hmac.h" +#include "rtc_base/critical_section.h" #include "rtc_base/logging.h" -#include "rtc_base/sslstreamadapter.h" +#include "rtc_base/ssl_stream_adapter.h" #include "system_wrappers/include/metrics.h" #include "third_party/libsrtp/include/srtp.h" #include "third_party/libsrtp/include/srtp_priv.h" diff --git a/pc/srtp_session.h b/pc/srtp_session.h index ce05ce6d72..dd89e43982 100644 --- a/pc/srtp_session.h +++ b/pc/srtp_session.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef PC_SRTPSESSION_H_ -#define PC_SRTPSESSION_H_ +#ifndef PC_SRTP_SESSION_H_ +#define PC_SRTP_SESSION_H_ #include @@ -128,4 +128,4 @@ class SrtpSession { } // namespace cricket -#endif // PC_SRTPSESSION_H_ +#endif // PC_SRTP_SESSION_H_ diff --git a/pc/srtp_session_unittest.cc b/pc/srtp_session_unittest.cc index b95f19f432..dc0be624eb 100644 --- a/pc/srtp_session_unittest.cc +++ b/pc/srtp_session_unittest.cc @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "pc/srtpsession.h" +#include "pc/srtp_session.h" #include #include -#include "media/base/fakertp.h" -#include "pc/srtptestutil.h" -#include "rtc_base/byteorder.h" -#include "rtc_base/sslstreamadapter.h" // For rtc::SRTP_* +#include "media/base/fake_rtp.h" +#include "pc/test/srtp_test_util.h" +#include "rtc_base/byte_order.h" +#include "rtc_base/ssl_stream_adapter.h" // For rtc::SRTP_* #include "system_wrappers/include/metrics.h" #include "test/gtest.h" #include "third_party/libsrtp/include/srtp.h" diff --git a/pc/srtp_transport.cc b/pc/srtp_transport.cc index 8585fec23b..c7e4f0e9e8 100644 --- a/pc/srtp_transport.cc +++ b/pc/srtp_transport.cc @@ -8,22 +8,22 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "pc/srtptransport.h" +#include "pc/srtp_transport.h" #include #include #include #include -#include "media/base/rtputils.h" -#include "pc/rtptransport.h" -#include "pc/srtpsession.h" -#include "rtc_base/asyncpacketsocket.h" +#include "media/base/rtp_utils.h" +#include "pc/rtp_transport.h" +#include "pc/srtp_session.h" +#include "rtc_base/async_packet_socket.h" #include "rtc_base/checks.h" -#include "rtc_base/copyonwritebuffer.h" +#include "rtc_base/copy_on_write_buffer.h" #include "rtc_base/logging.h" #include "rtc_base/numerics/safe_conversions.h" -#include "rtc_base/sslstreamadapter.h" +#include "rtc_base/ssl_stream_adapter.h" #include "rtc_base/third_party/base64/base64.h" #include "rtc_base/third_party/sigslot/sigslot.h" #include "rtc_base/trace_event.h" diff --git a/pc/srtp_transport.h b/pc/srtp_transport.h index 57809d4751..75127119a8 100644 --- a/pc/srtp_transport.h +++ b/pc/srtp_transport.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef PC_SRTPTRANSPORT_H_ -#define PC_SRTPTRANSPORT_H_ +#ifndef PC_SRTP_TRANSPORT_H_ +#define PC_SRTP_TRANSPORT_H_ #include #include @@ -18,15 +18,15 @@ #include #include "absl/types/optional.h" -#include "api/cryptoparams.h" -#include "api/rtcerror.h" -#include "p2p/base/packettransportinternal.h" -#include "pc/rtptransport.h" -#include "pc/srtpsession.h" -#include "rtc_base/asyncpacketsocket.h" +#include "api/crypto_params.h" +#include "api/rtc_error.h" +#include "p2p/base/packet_transport_internal.h" +#include "pc/rtp_transport.h" +#include "pc/srtp_session.h" +#include "rtc_base/async_packet_socket.h" #include "rtc_base/buffer.h" -#include "rtc_base/copyonwritebuffer.h" -#include "rtc_base/networkroute.h" +#include "rtc_base/copy_on_write_buffer.h" +#include "rtc_base/network_route.h" namespace webrtc { @@ -170,4 +170,4 @@ class SrtpTransport : public RtpTransport { } // namespace webrtc -#endif // PC_SRTPTRANSPORT_H_ +#endif // PC_SRTP_TRANSPORT_H_ diff --git a/pc/srtp_transport_unittest.cc b/pc/srtp_transport_unittest.cc index 8f16836191..d429283fb2 100644 --- a/pc/srtp_transport_unittest.cc +++ b/pc/srtp_transport_unittest.cc @@ -14,16 +14,16 @@ #include "absl/memory/memory.h" #include "call/rtp_demuxer.h" -#include "media/base/fakertp.h" -#include "p2p/base/dtlstransportinternal.h" -#include "p2p/base/fakepackettransport.h" -#include "pc/rtptransporttestutil.h" -#include "pc/srtptestutil.h" -#include "pc/srtptransport.h" -#include "rtc_base/asyncpacketsocket.h" -#include "rtc_base/byteorder.h" +#include "media/base/fake_rtp.h" +#include "p2p/base/dtls_transport_internal.h" +#include "p2p/base/fake_packet_transport.h" +#include "pc/srtp_transport.h" +#include "pc/test/rtp_transport_test_util.h" +#include "pc/test/srtp_test_util.h" +#include "rtc_base/async_packet_socket.h" +#include "rtc_base/byte_order.h" #include "rtc_base/checks.h" -#include "rtc_base/sslstreamadapter.h" +#include "rtc_base/ssl_stream_adapter.h" #include "rtc_base/third_party/sigslot/sigslot.h" #include "test/gtest.h" diff --git a/pc/stats_collector.cc b/pc/stats_collector.cc index f9aa4f4695..178f05e6b9 100644 --- a/pc/stats_collector.cc +++ b/pc/stats_collector.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "pc/statscollector.h" +#include "pc/stats_collector.h" #include #include @@ -16,7 +16,7 @@ #include #include "pc/channel.h" -#include "pc/peerconnection.h" +#include "pc/peer_connection.h" #include "rtc_base/checks.h" #include "rtc_base/third_party/base64/base64.h" diff --git a/pc/stats_collector.h b/pc/stats_collector.h index 786d5df0f2..d0be338d52 100644 --- a/pc/stats_collector.h +++ b/pc/stats_collector.h @@ -11,8 +11,8 @@ // This file contains a class used for gathering statistics from an ongoing // libjingle PeerConnection. -#ifndef PC_STATSCOLLECTOR_H_ -#define PC_STATSCOLLECTOR_H_ +#ifndef PC_STATS_COLLECTOR_H_ +#define PC_STATS_COLLECTOR_H_ #include #include @@ -21,13 +21,13 @@ #include #include -#include "api/mediastreaminterface.h" -#include "api/peerconnectioninterface.h" -#include "api/statstypes.h" +#include "api/media_stream_interface.h" +#include "api/peer_connection_interface.h" +#include "api/stats_types.h" #include "p2p/base/port.h" -#include "pc/peerconnectioninternal.h" +#include "pc/peer_connection_internal.h" #include "rtc_base/network_constants.h" -#include "rtc_base/sslcertificate.h" +#include "rtc_base/ssl_certificate.h" namespace webrtc { @@ -154,4 +154,4 @@ class StatsCollector { } // namespace webrtc -#endif // PC_STATSCOLLECTOR_H_ +#endif // PC_STATS_COLLECTOR_H_ diff --git a/pc/stats_collector_unittest.cc b/pc/stats_collector_unittest.cc index 582b60ded9..4fdb8cd240 100644 --- a/pc/stats_collector_unittest.cc +++ b/pc/stats_collector_unittest.cc @@ -16,28 +16,28 @@ #include "absl/types/optional.h" #include "api/audio_codecs/audio_encoder.h" #include "api/candidate.h" -#include "api/datachannelinterface.h" +#include "api/data_channel_interface.h" #include "call/call.h" -#include "media/base/mediachannel.h" +#include "media/base/media_channel.h" #include "modules/audio_processing/include/audio_processing_statistics.h" -#include "pc/datachannel.h" -#include "pc/mediastream.h" -#include "pc/mediastreamtrack.h" -#include "pc/statscollector.h" -#include "pc/test/fakepeerconnectionforstats.h" -#include "pc/test/fakevideotracksource.h" -#include "pc/transportstats.h" -#include "pc/videotrack.h" -#include "rtc_base/fakesslidentity.h" -#include "rtc_base/messagedigest.h" -#include "rtc_base/nethelper.h" -#include "rtc_base/refcountedobject.h" -#include "rtc_base/rtccertificate.h" +#include "pc/data_channel.h" +#include "pc/media_stream.h" +#include "pc/media_stream_track.h" +#include "pc/stats_collector.h" +#include "pc/test/fake_peer_connection_for_stats.h" +#include "pc/test/fake_video_track_source.h" +#include "pc/transport_stats.h" +#include "pc/video_track.h" +#include "rtc_base/fake_ssl_identity.h" +#include "rtc_base/message_digest.h" +#include "rtc_base/net_helper.h" +#include "rtc_base/ref_counted_object.h" +#include "rtc_base/rtc_certificate.h" #include "rtc_base/scoped_ref_ptr.h" -#include "rtc_base/socketaddress.h" -#include "rtc_base/sslidentity.h" -#include "rtc_base/sslstreamadapter.h" -#include "rtc_base/stringencode.h" +#include "rtc_base/socket_address.h" +#include "rtc_base/ssl_identity.h" +#include "rtc_base/ssl_stream_adapter.h" +#include "rtc_base/string_encode.h" #include "rtc_base/third_party/base64/base64.h" #include "rtc_base/thread.h" #include "test/gtest.h" diff --git a/pc/stream_collection.h b/pc/stream_collection.h index 76317f91e1..28cd46fc5d 100644 --- a/pc/stream_collection.h +++ b/pc/stream_collection.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef PC_STREAMCOLLECTION_H_ -#define PC_STREAMCOLLECTION_H_ +#ifndef PC_STREAM_COLLECTION_H_ +#define PC_STREAM_COLLECTION_H_ #include #include -#include "api/peerconnectioninterface.h" +#include "api/peer_connection_interface.h" namespace webrtc { @@ -99,4 +99,4 @@ class StreamCollection : public StreamCollectionInterface { } // namespace webrtc -#endif // PC_STREAMCOLLECTION_H_ +#endif // PC_STREAM_COLLECTION_H_ diff --git a/pc/test/android_test_initializer.cc b/pc/test/android_test_initializer.cc index a67716dc23..584aedaaed 100644 --- a/pc/test/android_test_initializer.cc +++ b/pc/test/android_test_initializer.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "pc/test/androidtestinitializer.h" +#include "pc/test/android_test_initializer.h" #include @@ -28,7 +28,7 @@ RTC_POP_IGNORING_WUNDEF() // TODO(phoglund): This include is also to a target we can't really depend on. // We need to either break it out into a smaller target or find some way to // not use it. -#include "rtc_base/ssladapter.h" +#include "rtc_base/ssl_adapter.h" namespace webrtc { diff --git a/pc/test/android_test_initializer.h b/pc/test/android_test_initializer.h index 9c00a63aec..4181dd286c 100644 --- a/pc/test/android_test_initializer.h +++ b/pc/test/android_test_initializer.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef PC_TEST_ANDROIDTESTINITIALIZER_H_ -#define PC_TEST_ANDROIDTESTINITIALIZER_H_ +#ifndef PC_TEST_ANDROID_TEST_INITIALIZER_H_ +#define PC_TEST_ANDROID_TEST_INITIALIZER_H_ namespace webrtc { @@ -17,4 +17,4 @@ void InitializeAndroidObjects(); } // namespace webrtc -#endif // PC_TEST_ANDROIDTESTINITIALIZER_H_ +#endif // PC_TEST_ANDROID_TEST_INITIALIZER_H_ diff --git a/pc/test/fake_audio_capture_module.cc b/pc/test/fake_audio_capture_module.cc index fbb1ebb202..db0886ddad 100644 --- a/pc/test/fake_audio_capture_module.cc +++ b/pc/test/fake_audio_capture_module.cc @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "pc/test/fakeaudiocapturemodule.h" +#include "pc/test/fake_audio_capture_module.h" #include #include "rtc_base/checks.h" #include "rtc_base/location.h" -#include "rtc_base/refcountedobject.h" +#include "rtc_base/ref_counted_object.h" #include "rtc_base/thread.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/time_utils.h" // Audio sample value that is high enough that it doesn't occur naturally when // frames are being faked. E.g. NetEq will not generate this large sample value diff --git a/pc/test/fake_audio_capture_module.h b/pc/test/fake_audio_capture_module.h index 2f56ef4d5d..495cd01064 100644 --- a/pc/test/fake_audio_capture_module.h +++ b/pc/test/fake_audio_capture_module.h @@ -17,15 +17,15 @@ // Note P postfix of a function indicates that it should only be called by the // processing thread. -#ifndef PC_TEST_FAKEAUDIOCAPTUREMODULE_H_ -#define PC_TEST_FAKEAUDIOCAPTUREMODULE_H_ +#ifndef PC_TEST_FAKE_AUDIO_CAPTURE_MODULE_H_ +#define PC_TEST_FAKE_AUDIO_CAPTURE_MODULE_H_ #include #include "common_types.h" // NOLINT(build/include) #include "modules/audio_device/include/audio_device.h" -#include "rtc_base/criticalsection.h" -#include "rtc_base/messagehandler.h" +#include "rtc_base/critical_section.h" +#include "rtc_base/message_handler.h" #include "rtc_base/scoped_ref_ptr.h" namespace rtc { @@ -224,4 +224,4 @@ class FakeAudioCaptureModule : public webrtc::AudioDeviceModule, rtc::CriticalSection crit_callback_; }; -#endif // PC_TEST_FAKEAUDIOCAPTUREMODULE_H_ +#endif // PC_TEST_FAKE_AUDIO_CAPTURE_MODULE_H_ diff --git a/pc/test/fake_audio_capture_module_unittest.cc b/pc/test/fake_audio_capture_module_unittest.cc index 8e6db4b0ef..30a8090284 100644 --- a/pc/test/fake_audio_capture_module_unittest.cc +++ b/pc/test/fake_audio_capture_module_unittest.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "pc/test/fakeaudiocapturemodule.h" +#include "pc/test/fake_audio_capture_module.h" #include #include -#include "rtc_base/criticalsection.h" +#include "rtc_base/critical_section.h" #include "rtc_base/gunit.h" #include "rtc_base/scoped_ref_ptr.h" #include "test/gtest.h" diff --git a/pc/test/fake_data_channel_provider.h b/pc/test/fake_data_channel_provider.h index 83c5cb3924..2ada4a992d 100644 --- a/pc/test/fake_data_channel_provider.h +++ b/pc/test/fake_data_channel_provider.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef PC_TEST_FAKEDATACHANNELPROVIDER_H_ -#define PC_TEST_FAKEDATACHANNELPROVIDER_H_ +#ifndef PC_TEST_FAKE_DATA_CHANNEL_PROVIDER_H_ +#define PC_TEST_FAKE_DATA_CHANNEL_PROVIDER_H_ #include -#include "pc/datachannel.h" +#include "pc/data_channel.h" #include "rtc_base/checks.h" class FakeDataChannelProvider : public webrtc::DataChannelProviderInterface { @@ -152,4 +152,4 @@ class FakeDataChannelProvider : public webrtc::DataChannelProviderInterface { std::set send_ssrcs_; std::set recv_ssrcs_; }; -#endif // PC_TEST_FAKEDATACHANNELPROVIDER_H_ +#endif // PC_TEST_FAKE_DATA_CHANNEL_PROVIDER_H_ diff --git a/pc/test/fake_peer_connection_base.h b/pc/test/fake_peer_connection_base.h index b4bc7b93f0..85feebc358 100644 --- a/pc/test/fake_peer_connection_base.h +++ b/pc/test/fake_peer_connection_base.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef PC_TEST_FAKEPEERCONNECTIONBASE_H_ -#define PC_TEST_FAKEPEERCONNECTIONBASE_H_ +#ifndef PC_TEST_FAKE_PEER_CONNECTION_BASE_H_ +#define PC_TEST_FAKE_PEER_CONNECTION_BASE_H_ #include #include @@ -17,7 +17,7 @@ #include #include -#include "pc/peerconnectioninternal.h" +#include "pc/peer_connection_internal.h" namespace webrtc { @@ -299,4 +299,4 @@ class FakePeerConnectionBase : public PeerConnectionInternal { } // namespace webrtc -#endif // PC_TEST_FAKEPEERCONNECTIONBASE_H_ +#endif // PC_TEST_FAKE_PEER_CONNECTION_BASE_H_ diff --git a/pc/test/fake_peer_connection_for_stats.h b/pc/test/fake_peer_connection_for_stats.h index 9540ee70da..e33514aef2 100644 --- a/pc/test/fake_peer_connection_for_stats.h +++ b/pc/test/fake_peer_connection_for_stats.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef PC_TEST_FAKEPEERCONNECTIONFORSTATS_H_ -#define PC_TEST_FAKEPEERCONNECTIONFORSTATS_H_ +#ifndef PC_TEST_FAKE_PEER_CONNECTION_FOR_STATS_H_ +#define PC_TEST_FAKE_PEER_CONNECTION_FOR_STATS_H_ #include #include @@ -19,10 +19,10 @@ #include #include "absl/memory/memory.h" -#include "media/base/fakemediaengine.h" -#include "pc/streamcollection.h" -#include "pc/test/fakedatachannelprovider.h" -#include "pc/test/fakepeerconnectionbase.h" +#include "media/base/fake_media_engine.h" +#include "pc/stream_collection.h" +#include "pc/test/fake_data_channel_provider.h" +#include "pc/test/fake_peer_connection_base.h" namespace webrtc { @@ -384,4 +384,4 @@ class FakePeerConnectionForStats : public FakePeerConnectionBase { } // namespace webrtc -#endif // PC_TEST_FAKEPEERCONNECTIONFORSTATS_H_ +#endif // PC_TEST_FAKE_PEER_CONNECTION_FOR_STATS_H_ diff --git a/pc/test/fake_periodic_video_source.h b/pc/test/fake_periodic_video_source.h index 146d49e585..597f0ee8bd 100644 --- a/pc/test/fake_periodic_video_source.h +++ b/pc/test/fake_periodic_video_source.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef PC_TEST_FAKEPERIODICVIDEOSOURCE_H_ -#define PC_TEST_FAKEPERIODICVIDEOSOURCE_H_ +#ifndef PC_TEST_FAKE_PERIODIC_VIDEO_SOURCE_H_ +#define PC_TEST_FAKE_PERIODIC_VIDEO_SOURCE_H_ #include #include "absl/memory/memory.h" #include "api/video/video_source_interface.h" -#include "media/base/fakeframesource.h" -#include "media/base/videobroadcaster.h" +#include "media/base/fake_frame_source.h" +#include "media/base/video_broadcaster.h" #include "rtc_base/task_queue.h" namespace webrtc { @@ -99,4 +99,4 @@ class FakePeriodicVideoSource final } // namespace webrtc -#endif // PC_TEST_FAKEPERIODICVIDEOSOURCE_H_ +#endif // PC_TEST_FAKE_PERIODIC_VIDEO_SOURCE_H_ diff --git a/pc/test/fake_periodic_video_track_source.h b/pc/test/fake_periodic_video_track_source.h index ab428d806a..cc406d6d3f 100644 --- a/pc/test/fake_periodic_video_track_source.h +++ b/pc/test/fake_periodic_video_track_source.h @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef PC_TEST_FAKEPERIODICVIDEOTRACKSOURCE_H_ -#define PC_TEST_FAKEPERIODICVIDEOTRACKSOURCE_H_ +#ifndef PC_TEST_FAKE_PERIODIC_VIDEO_TRACK_SOURCE_H_ +#define PC_TEST_FAKE_PERIODIC_VIDEO_TRACK_SOURCE_H_ -#include "pc/test/fakeperiodicvideosource.h" -#include "pc/videotracksource.h" +#include "pc/test/fake_periodic_video_source.h" +#include "pc/video_track_source.h" namespace webrtc { @@ -38,4 +38,4 @@ class FakePeriodicVideoTrackSource : public VideoTrackSource { } // namespace webrtc -#endif // PC_TEST_FAKEPERIODICVIDEOTRACKSOURCE_H_ +#endif // PC_TEST_FAKE_PERIODIC_VIDEO_TRACK_SOURCE_H_ diff --git a/pc/test/fake_rtc_certificate_generator.h b/pc/test/fake_rtc_certificate_generator.h index a3e7654a20..9c43ba9726 100644 --- a/pc/test/fake_rtc_certificate_generator.h +++ b/pc/test/fake_rtc_certificate_generator.h @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef PC_TEST_FAKERTCCERTIFICATEGENERATOR_H_ -#define PC_TEST_FAKERTCCERTIFICATEGENERATOR_H_ +#ifndef PC_TEST_FAKE_RTC_CERTIFICATE_GENERATOR_H_ +#define PC_TEST_FAKE_RTC_CERTIFICATE_GENERATOR_H_ #include #include #include -#include "api/peerconnectioninterface.h" -#include "rtc_base/rtccertificate.h" -#include "rtc_base/rtccertificategenerator.h" +#include "api/peer_connection_interface.h" +#include "rtc_base/rtc_certificate.h" +#include "rtc_base/rtc_certificate_generator.h" // RSA with mod size 1024, pub exp 0x10001. static const rtc::RTCCertificatePEM kRsaPems[] = { @@ -241,4 +241,4 @@ class FakeRTCCertificateGenerator int generated_failures_ = 0; }; -#endif // PC_TEST_FAKERTCCERTIFICATEGENERATOR_H_ +#endif // PC_TEST_FAKE_RTC_CERTIFICATE_GENERATOR_H_ diff --git a/pc/test/fake_sctp_transport.h b/pc/test/fake_sctp_transport.h index 294376d91a..b2c5c1ae21 100644 --- a/pc/test/fake_sctp_transport.h +++ b/pc/test/fake_sctp_transport.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef PC_TEST_FAKESCTPTRANSPORT_H_ -#define PC_TEST_FAKESCTPTRANSPORT_H_ +#ifndef PC_TEST_FAKE_SCTP_TRANSPORT_H_ +#define PC_TEST_FAKE_SCTP_TRANSPORT_H_ #include -#include "media/sctp/sctptransportinternal.h" +#include "media/sctp/sctp_transport_internal.h" // Used for tests in this file to verify that PeerConnection responds to signals // from the SctpTransport correctly, and calls Start with the correct @@ -61,4 +61,4 @@ class FakeSctpTransportFactory : public cricket::SctpTransportInternalFactory { FakeSctpTransport* last_fake_sctp_transport_ = nullptr; }; -#endif // PC_TEST_FAKESCTPTRANSPORT_H_ +#endif // PC_TEST_FAKE_SCTP_TRANSPORT_H_ diff --git a/pc/test/fake_video_track_renderer.h b/pc/test/fake_video_track_renderer.h index 617261ae92..f6e341b4b2 100644 --- a/pc/test/fake_video_track_renderer.h +++ b/pc/test/fake_video_track_renderer.h @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef PC_TEST_FAKEVIDEOTRACKRENDERER_H_ -#define PC_TEST_FAKEVIDEOTRACKRENDERER_H_ +#ifndef PC_TEST_FAKE_VIDEO_TRACK_RENDERER_H_ +#define PC_TEST_FAKE_VIDEO_TRACK_RENDERER_H_ -#include "api/mediastreaminterface.h" -#include "media/base/fakevideorenderer.h" +#include "api/media_stream_interface.h" +#include "media/base/fake_video_renderer.h" namespace webrtc { @@ -30,4 +30,4 @@ class FakeVideoTrackRenderer : public cricket::FakeVideoRenderer { } // namespace webrtc -#endif // PC_TEST_FAKEVIDEOTRACKRENDERER_H_ +#endif // PC_TEST_FAKE_VIDEO_TRACK_RENDERER_H_ diff --git a/pc/test/fake_video_track_source.h b/pc/test/fake_video_track_source.h index 1b5bd87c53..295201ecb4 100644 --- a/pc/test/fake_video_track_source.h +++ b/pc/test/fake_video_track_source.h @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef PC_TEST_FAKEVIDEOTRACKSOURCE_H_ -#define PC_TEST_FAKEVIDEOTRACKSOURCE_H_ +#ifndef PC_TEST_FAKE_VIDEO_TRACK_SOURCE_H_ +#define PC_TEST_FAKE_VIDEO_TRACK_SOURCE_H_ -#include "api/mediastreaminterface.h" -#include "pc/videotracksource.h" +#include "api/media_stream_interface.h" +#include "pc/video_track_source.h" namespace webrtc { @@ -47,4 +47,4 @@ class FakeVideoTrackSource : public VideoTrackSource { } // namespace webrtc -#endif // PC_TEST_FAKEVIDEOTRACKSOURCE_H_ +#endif // PC_TEST_FAKE_VIDEO_TRACK_SOURCE_H_ diff --git a/pc/test/frame_generator_capturer_video_track_source.h b/pc/test/frame_generator_capturer_video_track_source.h index c9324edfad..3c68d1b180 100644 --- a/pc/test/frame_generator_capturer_video_track_source.h +++ b/pc/test/frame_generator_capturer_video_track_source.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef PC_TEST_FRAMEGENERATORCAPTURERVIDEOTRACKSOURCE_H_ -#define PC_TEST_FRAMEGENERATORCAPTURERVIDEOTRACKSOURCE_H_ +#ifndef PC_TEST_FRAME_GENERATOR_CAPTURER_VIDEO_TRACK_SOURCE_H_ +#define PC_TEST_FRAME_GENERATOR_CAPTURER_VIDEO_TRACK_SOURCE_H_ #include #include -#include "pc/videotracksource.h" +#include "pc/video_track_source.h" #include "test/frame_generator_capturer.h" namespace webrtc { @@ -73,4 +73,4 @@ class FrameGeneratorCapturerVideoTrackSource : public VideoTrackSource { } // namespace webrtc -#endif // PC_TEST_FRAMEGENERATORCAPTURERVIDEOTRACKSOURCE_H_ +#endif // PC_TEST_FRAME_GENERATOR_CAPTURER_VIDEO_TRACK_SOURCE_H_ diff --git a/pc/test/mock_channel_interface.h b/pc/test/mock_channel_interface.h index 4c32a8fb8d..b559e846ec 100644 --- a/pc/test/mock_channel_interface.h +++ b/pc/test/mock_channel_interface.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef PC_TEST_MOCK_CHANNELINTERFACE_H_ -#define PC_TEST_MOCK_CHANNELINTERFACE_H_ +#ifndef PC_TEST_MOCK_CHANNEL_INTERFACE_H_ +#define PC_TEST_MOCK_CHANNEL_INTERFACE_H_ #include -#include "pc/channelinterface.h" +#include "pc/channel_interface.h" #include "test/gmock.h" namespace cricket { @@ -44,4 +44,4 @@ class MockChannelInterface : public cricket::ChannelInterface { } // namespace cricket -#endif // PC_TEST_MOCK_CHANNELINTERFACE_H_ +#endif // PC_TEST_MOCK_CHANNEL_INTERFACE_H_ diff --git a/pc/test/mock_data_channel.h b/pc/test/mock_data_channel.h index fe887146fe..2db0c36777 100644 --- a/pc/test/mock_data_channel.h +++ b/pc/test/mock_data_channel.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef PC_TEST_MOCK_DATACHANNEL_H_ -#define PC_TEST_MOCK_DATACHANNEL_H_ +#ifndef PC_TEST_MOCK_DATA_CHANNEL_H_ +#define PC_TEST_MOCK_DATA_CHANNEL_H_ #include -#include "pc/datachannel.h" +#include "pc/data_channel.h" #include "test/gmock.h" namespace webrtc { @@ -54,4 +54,4 @@ class MockDataChannel : public rtc::RefCountedObject { } // namespace webrtc -#endif // PC_TEST_MOCK_DATACHANNEL_H_ +#endif // PC_TEST_MOCK_DATA_CHANNEL_H_ diff --git a/pc/test/mock_peer_connection_observers.h b/pc/test/mock_peer_connection_observers.h index 0657853c29..eeac9b05ab 100644 --- a/pc/test/mock_peer_connection_observers.h +++ b/pc/test/mock_peer_connection_observers.h @@ -11,8 +11,8 @@ // This file contains mock implementations of observers used in PeerConnection. // TODO(steveanton): These aren't really mocks and should be renamed. -#ifndef PC_TEST_MOCKPEERCONNECTIONOBSERVERS_H_ -#define PC_TEST_MOCKPEERCONNECTIONOBSERVERS_H_ +#ifndef PC_TEST_MOCK_PEER_CONNECTION_OBSERVERS_H_ +#define PC_TEST_MOCK_PEER_CONNECTION_OBSERVERS_H_ #include #include @@ -21,9 +21,9 @@ #include #include "absl/memory/memory.h" -#include "api/datachannelinterface.h" -#include "api/jsepicecandidate.h" -#include "pc/streamcollection.h" +#include "api/data_channel_interface.h" +#include "api/jsep_ice_candidate.h" +#include "pc/stream_collection.h" #include "rtc_base/checks.h" namespace webrtc { @@ -515,4 +515,4 @@ class MockRTCStatsCollectorCallback : public webrtc::RTCStatsCollectorCallback { } // namespace webrtc -#endif // PC_TEST_MOCKPEERCONNECTIONOBSERVERS_H_ +#endif // PC_TEST_MOCK_PEER_CONNECTION_OBSERVERS_H_ diff --git a/pc/test/mock_rtp_receiver_internal.h b/pc/test/mock_rtp_receiver_internal.h index 84b0d71766..10807daa5b 100644 --- a/pc/test/mock_rtp_receiver_internal.h +++ b/pc/test/mock_rtp_receiver_internal.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef PC_TEST_MOCK_RTPRECEIVERINTERNAL_H_ -#define PC_TEST_MOCK_RTPRECEIVERINTERNAL_H_ +#ifndef PC_TEST_MOCK_RTP_RECEIVER_INTERNAL_H_ +#define PC_TEST_MOCK_RTP_RECEIVER_INTERNAL_H_ #include #include -#include "pc/rtpreceiver.h" +#include "pc/rtp_receiver.h" #include "test/gmock.h" namespace webrtc { @@ -54,4 +54,4 @@ class MockRtpReceiverInternal : public RtpReceiverInternal { } // namespace webrtc -#endif // PC_TEST_MOCK_RTPRECEIVERINTERNAL_H_ +#endif // PC_TEST_MOCK_RTP_RECEIVER_INTERNAL_H_ diff --git a/pc/test/mock_rtp_sender_internal.h b/pc/test/mock_rtp_sender_internal.h index dd4f69497d..7859175bb0 100644 --- a/pc/test/mock_rtp_sender_internal.h +++ b/pc/test/mock_rtp_sender_internal.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef PC_TEST_MOCK_RTPSENDERINTERNAL_H_ -#define PC_TEST_MOCK_RTPSENDERINTERNAL_H_ +#ifndef PC_TEST_MOCK_RTP_SENDER_INTERNAL_H_ +#define PC_TEST_MOCK_RTP_SENDER_INTERNAL_H_ #include #include -#include "pc/rtpsender.h" +#include "pc/rtp_sender.h" #include "test/gmock.h" namespace webrtc { @@ -50,4 +50,4 @@ class MockRtpSenderInternal : public RtpSenderInternal { } // namespace webrtc -#endif // PC_TEST_MOCK_RTPSENDERINTERNAL_H_ +#endif // PC_TEST_MOCK_RTP_SENDER_INTERNAL_H_ diff --git a/pc/test/peer_connection_test_wrapper.cc b/pc/test/peer_connection_test_wrapper.cc index 96007bb9fd..089a78000e 100644 --- a/pc/test/peer_connection_test_wrapper.cc +++ b/pc/test/peer_connection_test_wrapper.cc @@ -23,20 +23,20 @@ #include "api/video_codecs/video_encoder_factory.h" #include "modules/audio_device/include/audio_device.h" #include "modules/audio_processing/include/audio_processing.h" -#include "p2p/base/fakeportallocator.h" -#include "p2p/base/portallocator.h" -#include "pc/test/fakeperiodicvideosource.h" -#include "pc/test/fakeperiodicvideotracksource.h" -#include "pc/test/fakertccertificategenerator.h" -#include "pc/test/mockpeerconnectionobservers.h" -#include "pc/test/peerconnectiontestwrapper.h" +#include "p2p/base/fake_port_allocator.h" +#include "p2p/base/port_allocator.h" +#include "pc/test/fake_periodic_video_source.h" +#include "pc/test/fake_periodic_video_track_source.h" +#include "pc/test/fake_rtc_certificate_generator.h" +#include "pc/test/mock_peer_connection_observers.h" +#include "pc/test/peer_connection_test_wrapper.h" #include "rtc_base/gunit.h" #include "rtc_base/logging.h" -#include "rtc_base/refcountedobject.h" -#include "rtc_base/rtccertificategenerator.h" -#include "rtc_base/stringencode.h" +#include "rtc_base/ref_counted_object.h" +#include "rtc_base/rtc_certificate_generator.h" +#include "rtc_base/string_encode.h" #include "rtc_base/thread_checker.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/time_utils.h" #include "test/gtest.h" using webrtc::FakeConstraints; diff --git a/pc/test/peer_connection_test_wrapper.h b/pc/test/peer_connection_test_wrapper.h index defe8f3df6..8bbf42f195 100644 --- a/pc/test/peer_connection_test_wrapper.h +++ b/pc/test/peer_connection_test_wrapper.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef PC_TEST_PEERCONNECTIONTESTWRAPPER_H_ -#define PC_TEST_PEERCONNECTIONTESTWRAPPER_H_ +#ifndef PC_TEST_PEER_CONNECTION_TEST_WRAPPER_H_ +#define PC_TEST_PEER_CONNECTION_TEST_WRAPPER_H_ #include #include @@ -18,15 +18,15 @@ #include "api/audio_codecs/audio_decoder_factory.h" #include "api/audio_codecs/audio_encoder_factory.h" #include "api/audio_options.h" -#include "api/datachannelinterface.h" +#include "api/data_channel_interface.h" #include "api/jsep.h" -#include "api/mediastreaminterface.h" -#include "api/peerconnectioninterface.h" -#include "api/rtcerror.h" -#include "api/rtpreceiverinterface.h" -#include "api/test/fakeconstraints.h" -#include "pc/test/fakeaudiocapturemodule.h" -#include "pc/test/fakevideotrackrenderer.h" +#include "api/media_stream_interface.h" +#include "api/peer_connection_interface.h" +#include "api/rtc_error.h" +#include "api/rtp_receiver_interface.h" +#include "api/test/fake_constraints.h" +#include "pc/test/fake_audio_capture_module.h" +#include "pc/test/fake_video_track_renderer.h" #include "rtc_base/scoped_ref_ptr.h" #include "rtc_base/third_party/sigslot/sigslot.h" #include "rtc_base/thread.h" @@ -126,4 +126,4 @@ class PeerConnectionTestWrapper int num_get_user_media_calls_ = 0; }; -#endif // PC_TEST_PEERCONNECTIONTESTWRAPPER_H_ +#endif // PC_TEST_PEER_CONNECTION_TEST_WRAPPER_H_ diff --git a/pc/test/rtc_stats_obtainer.h b/pc/test/rtc_stats_obtainer.h index cb8ecd5376..f0ec3eb563 100644 --- a/pc/test/rtc_stats_obtainer.h +++ b/pc/test/rtc_stats_obtainer.h @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef PC_TEST_RTCSTATSOBTAINER_H_ -#define PC_TEST_RTCSTATSOBTAINER_H_ +#ifndef PC_TEST_RTC_STATS_OBTAINER_H_ +#define PC_TEST_RTC_STATS_OBTAINER_H_ -#include "api/stats/rtcstatsreport.h" +#include "api/stats/rtc_stats_report.h" #include "rtc_base/gunit.h" namespace webrtc { @@ -50,4 +50,4 @@ class RTCStatsObtainer : public RTCStatsCollectorCallback { } // namespace webrtc -#endif // PC_TEST_RTCSTATSOBTAINER_H_ +#endif // PC_TEST_RTC_STATS_OBTAINER_H_ diff --git a/pc/test/rtp_transport_test_util.h b/pc/test/rtp_transport_test_util.h index f2c35122aa..0353b74754 100644 --- a/pc/test/rtp_transport_test_util.h +++ b/pc/test/rtp_transport_test_util.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef PC_RTPTRANSPORTTESTUTIL_H_ -#define PC_RTPTRANSPORTTESTUTIL_H_ +#ifndef PC_TEST_RTP_TRANSPORT_TEST_UTIL_H_ +#define PC_TEST_RTP_TRANSPORT_TEST_UTIL_H_ #include "call/rtp_packet_sink_interface.h" #include "modules/rtp_rtcp/source/rtp_packet_received.h" -#include "pc/rtptransportinternal.h" +#include "pc/rtp_transport_internal.h" #include "rtc_base/third_party/sigslot/sigslot.h" namespace webrtc { @@ -75,4 +75,4 @@ class TransportObserver : public RtpPacketSinkInterface, } // namespace webrtc -#endif // PC_RTPTRANSPORTTESTUTIL_H_ +#endif // PC_TEST_RTP_TRANSPORT_TEST_UTIL_H_ diff --git a/pc/test/srtp_test_util.h b/pc/test/srtp_test_util.h index edb3d764e8..ed12e541bf 100644 --- a/pc/test/srtp_test_util.h +++ b/pc/test/srtp_test_util.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef PC_SRTPTESTUTIL_H_ -#define PC_SRTPTESTUTIL_H_ +#ifndef PC_TEST_SRTP_TEST_UTIL_H_ +#define PC_TEST_SRTP_TEST_UTIL_H_ #include @@ -42,4 +42,4 @@ static int rtcp_auth_tag_len(const std::string& cs) { } // namespace rtc -#endif // PC_SRTPTESTUTIL_H_ +#endif // PC_TEST_SRTP_TEST_UTIL_H_ diff --git a/pc/test/test_sdp_strings.h b/pc/test/test_sdp_strings.h index ba139e2191..849757d300 100644 --- a/pc/test/test_sdp_strings.h +++ b/pc/test/test_sdp_strings.h @@ -10,8 +10,8 @@ // This file contain SDP strings used for testing. -#ifndef PC_TEST_TESTSDPSTRINGS_H_ -#define PC_TEST_TESTSDPSTRINGS_H_ +#ifndef PC_TEST_TEST_SDP_STRINGS_H_ +#define PC_TEST_TEST_SDP_STRINGS_H_ namespace webrtc { @@ -181,4 +181,4 @@ static const char kAudioSdpWithUnsupportedCodecsUnifiedPlan[] = } // namespace webrtc -#endif // PC_TEST_TESTSDPSTRINGS_H_ +#endif // PC_TEST_TEST_SDP_STRINGS_H_ diff --git a/pc/track_media_info_map.cc b/pc/track_media_info_map.cc index b5abb7e936..459f3ea698 100644 --- a/pc/track_media_info_map.cc +++ b/pc/track_media_info_map.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "pc/trackmediainfomap.h" +#include "pc/track_media_info_map.h" #include #include diff --git a/pc/track_media_info_map.h b/pc/track_media_info_map.h index fa1f7e7128..542501eb16 100644 --- a/pc/track_media_info_map.h +++ b/pc/track_media_info_map.h @@ -8,19 +8,19 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef PC_TRACKMEDIAINFOMAP_H_ -#define PC_TRACKMEDIAINFOMAP_H_ +#ifndef PC_TRACK_MEDIA_INFO_MAP_H_ +#define PC_TRACK_MEDIA_INFO_MAP_H_ #include #include #include #include -#include "api/mediastreaminterface.h" -#include "media/base/mediachannel.h" -#include "pc/rtpreceiver.h" -#include "pc/rtpsender.h" -#include "rtc_base/refcount.h" +#include "api/media_stream_interface.h" +#include "media/base/media_channel.h" +#include "pc/rtp_receiver.h" +#include "pc/rtp_sender.h" +#include "rtc_base/ref_count.h" namespace webrtc { @@ -127,4 +127,4 @@ class TrackMediaInfoMap { } // namespace webrtc -#endif // PC_TRACKMEDIAINFOMAP_H_ +#endif // PC_TRACK_MEDIA_INFO_MAP_H_ diff --git a/pc/track_media_info_map_unittest.cc b/pc/track_media_info_map_unittest.cc index 1b320d021c..9edd60e8b9 100644 --- a/pc/track_media_info_map_unittest.cc +++ b/pc/track_media_info_map_unittest.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "pc/trackmediainfomap.h" +#include "pc/track_media_info_map.h" #include #include @@ -16,15 +16,15 @@ #include #include -#include "api/rtpreceiverinterface.h" -#include "api/rtpsenderinterface.h" -#include "media/base/mediachannel.h" -#include "pc/audiotrack.h" -#include "pc/test/fakevideotracksource.h" -#include "pc/test/mock_rtpreceiverinternal.h" -#include "pc/test/mock_rtpsenderinternal.h" -#include "pc/videotrack.h" -#include "rtc_base/refcount.h" +#include "api/rtp_receiver_interface.h" +#include "api/rtp_sender_interface.h" +#include "media/base/media_channel.h" +#include "pc/audio_track.h" +#include "pc/test/fake_video_track_source.h" +#include "pc/test/mock_rtp_receiver_internal.h" +#include "pc/test/mock_rtp_sender_internal.h" +#include "pc/video_track.h" +#include "rtc_base/ref_count.h" #include "test/gtest.h" namespace webrtc { diff --git a/pc/transport_stats.cc b/pc/transport_stats.cc index df2df5892f..f6dd7d6fdf 100644 --- a/pc/transport_stats.cc +++ b/pc/transport_stats.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 "pc/transportstats.h" +#include "pc/transport_stats.h" namespace cricket { diff --git a/pc/transport_stats.h b/pc/transport_stats.h index 84abc54b0b..8813dbec5f 100644 --- a/pc/transport_stats.h +++ b/pc/transport_stats.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef PC_TRANSPORTSTATS_H_ -#define PC_TRANSPORTSTATS_H_ +#ifndef PC_TRANSPORT_STATS_H_ +#define PC_TRANSPORT_STATS_H_ #include #include -#include "p2p/base/dtlstransportinternal.h" +#include "p2p/base/dtls_transport_internal.h" #include "p2p/base/port.h" -#include "rtc_base/sslstreamadapter.h" +#include "rtc_base/ssl_stream_adapter.h" namespace cricket { @@ -48,4 +48,4 @@ struct TransportStats { } // namespace cricket -#endif // PC_TRANSPORTSTATS_H_ +#endif // PC_TRANSPORT_STATS_H_ diff --git a/pc/unique_id_generator.cc b/pc/unique_id_generator.cc index 6927bbeadc..6b508f1f4b 100644 --- a/pc/unique_id_generator.cc +++ b/pc/unique_id_generator.cc @@ -14,8 +14,8 @@ #include #include "rtc_base/helpers.h" +#include "rtc_base/string_encode.h" #include "rtc_base/string_to_number.h" -#include "rtc_base/stringencode.h" namespace webrtc { diff --git a/pc/video_capturer_track_source.cc b/pc/video_capturer_track_source.cc index 0767dcffff..c7403f7584 100644 --- a/pc/video_capturer_track_source.cc +++ b/pc/video_capturer_track_source.cc @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "pc/videocapturertracksource.h" +#include "pc/video_capturer_track_source.h" #include #include #include #include -#include "api/mediaconstraintsinterface.h" +#include "api/media_constraints_interface.h" #include "rtc_base/arraysize.h" #include "rtc_base/checks.h" diff --git a/pc/video_capturer_track_source.h b/pc/video_capturer_track_source.h index 0a254dba57..6915b4bd9f 100644 --- a/pc/video_capturer_track_source.h +++ b/pc/video_capturer_track_source.h @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef PC_VIDEOCAPTURERTRACKSOURCE_H_ -#define PC_VIDEOCAPTURERTRACKSOURCE_H_ +#ifndef PC_VIDEO_CAPTURER_TRACK_SOURCE_H_ +#define PC_VIDEO_CAPTURER_TRACK_SOURCE_H_ #include -#include "api/mediastreaminterface.h" -#include "media/base/videocapturer.h" -#include "media/base/videocommon.h" -#include "pc/videotracksource.h" -#include "rtc_base/asyncinvoker.h" +#include "api/media_stream_interface.h" +#include "media/base/video_capturer.h" +#include "media/base/video_common.h" +#include "pc/video_track_source.h" +#include "rtc_base/async_invoker.h" #include "rtc_base/third_party/sigslot/sigslot.h" // VideoCapturerTrackSource implements VideoTrackSourceInterface. It owns a @@ -83,4 +83,4 @@ class VideoCapturerTrackSource : public VideoTrackSource, } // namespace webrtc -#endif // PC_VIDEOCAPTURERTRACKSOURCE_H_ +#endif // PC_VIDEO_CAPTURER_TRACK_SOURCE_H_ diff --git a/pc/video_capturer_track_source_unittest.cc b/pc/video_capturer_track_source_unittest.cc index aef82a1525..4d2e4c30c2 100644 --- a/pc/video_capturer_track_source_unittest.cc +++ b/pc/video_capturer_track_source_unittest.cc @@ -13,11 +13,11 @@ #include #include -#include "api/test/fakeconstraints.h" -#include "media/base/fakevideocapturer.h" -#include "media/base/fakevideorenderer.h" -#include "media/base/mediachannel.h" -#include "pc/videocapturertracksource.h" +#include "api/test/fake_constraints.h" +#include "media/base/fake_video_capturer.h" +#include "media/base/fake_video_renderer.h" +#include "media/base/media_channel.h" +#include "pc/video_capturer_track_source.h" #include "rtc_base/arraysize.h" #include "rtc_base/event.h" #include "rtc_base/gunit.h" diff --git a/pc/video_track.cc b/pc/video_track.cc index 8975287c51..f93e3d51b4 100644 --- a/pc/video_track.cc +++ b/pc/video_track.cc @@ -12,10 +12,10 @@ #include #include "api/notifier.h" -#include "pc/videotrack.h" +#include "pc/video_track.h" #include "rtc_base/checks.h" #include "rtc_base/location.h" -#include "rtc_base/refcountedobject.h" +#include "rtc_base/ref_counted_object.h" namespace webrtc { diff --git a/pc/video_track.h b/pc/video_track.h index e6761e1629..0111a660af 100644 --- a/pc/video_track.h +++ b/pc/video_track.h @@ -8,17 +8,17 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef PC_VIDEOTRACK_H_ -#define PC_VIDEOTRACK_H_ +#ifndef PC_VIDEO_TRACK_H_ +#define PC_VIDEO_TRACK_H_ #include -#include "api/mediastreaminterface.h" +#include "api/media_stream_interface.h" #include "api/video/video_frame.h" #include "api/video/video_sink_interface.h" #include "api/video/video_source_interface.h" -#include "media/base/videosourcebase.h" -#include "pc/mediastreamtrack.h" +#include "media/base/video_source_base.h" +#include "pc/media_stream_track.h" #include "rtc_base/scoped_ref_ptr.h" #include "rtc_base/thread.h" #include "rtc_base/thread_annotations.h" @@ -65,4 +65,4 @@ class VideoTrack : public MediaStreamTrack, } // namespace webrtc -#endif // PC_VIDEOTRACK_H_ +#endif // PC_VIDEO_TRACK_H_ diff --git a/pc/video_track_source.cc b/pc/video_track_source.cc index cf0ffd71d0..408c8d7d73 100644 --- a/pc/video_track_source.cc +++ b/pc/video_track_source.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "pc/videotracksource.h" +#include "pc/video_track_source.h" #include "rtc_base/checks.h" diff --git a/pc/video_track_source.h b/pc/video_track_source.h index cedb75b3c8..ad0fe09619 100644 --- a/pc/video_track_source.h +++ b/pc/video_track_source.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef PC_VIDEOTRACKSOURCE_H_ -#define PC_VIDEOTRACKSOURCE_H_ +#ifndef PC_VIDEO_TRACK_SOURCE_H_ +#define PC_VIDEO_TRACK_SOURCE_H_ -#include "api/mediastreaminterface.h" +#include "api/media_stream_interface.h" #include "api/notifier.h" #include "api/video/video_sink_interface.h" -#include "media/base/mediachannel.h" +#include "media/base/media_channel.h" #include "rtc_base/system/rtc_export.h" #include "rtc_base/thread_checker.h" @@ -52,4 +52,4 @@ class RTC_EXPORT VideoTrackSource : public Notifier { } // namespace webrtc -#endif // PC_VIDEOTRACKSOURCE_H_ +#endif // PC_VIDEO_TRACK_SOURCE_H_ diff --git a/pc/video_track_unittest.cc b/pc/video_track_unittest.cc index 4973d8e842..806da7c32b 100644 --- a/pc/video_track_unittest.cc +++ b/pc/video_track_unittest.cc @@ -10,12 +10,12 @@ #include -#include "media/base/fakevideocapturer.h" -#include "media/base/videocommon.h" -#include "pc/test/fakevideotrackrenderer.h" -#include "pc/videotrack.h" -#include "pc/videotracksource.h" -#include "rtc_base/refcountedobject.h" +#include "media/base/fake_video_capturer.h" +#include "media/base/video_common.h" +#include "pc/test/fake_video_track_renderer.h" +#include "pc/video_track.h" +#include "pc/video_track_source.h" +#include "rtc_base/ref_counted_object.h" #include "test/gtest.h" using webrtc::FakeVideoTrackRenderer; diff --git a/pc/webrtc_sdp.cc b/pc/webrtc_sdp.cc index 5707b3c42b..094525a8b6 100644 --- a/pc/webrtc_sdp.cc +++ b/pc/webrtc_sdp.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "pc/webrtcsdp.h" +#include "pc/webrtc_sdp.h" #include #include @@ -26,24 +26,24 @@ #include "absl/memory/memory.h" #include "absl/strings/match.h" #include "api/candidate.h" -#include "api/cryptoparams.h" -#include "api/jsepicecandidate.h" -#include "api/jsepsessiondescription.h" -#include "api/mediatypes.h" +#include "api/crypto_params.h" +#include "api/jsep_ice_candidate.h" +#include "api/jsep_session_description.h" +#include "api/media_types.h" // for RtpExtension -#include "api/rtpparameters.h" +#include "api/rtp_parameters.h" #include "media/base/codec.h" -#include "media/base/mediaconstants.h" -#include "media/base/rtputils.h" -#include "media/sctp/sctptransportinternal.h" -#include "p2p/base/p2pconstants.h" +#include "media/base/media_constants.h" +#include "media/base/rtp_utils.h" +#include "media/sctp/sctp_transport_internal.h" +#include "p2p/base/p2p_constants.h" #include "p2p/base/port.h" -#include "pc/mediasession.h" -#include "pc/sdpserializer.h" +#include "pc/media_session.h" +#include "pc/sdp_serializer.h" #include "rtc_base/arraysize.h" #include "rtc_base/checks.h" #include "rtc_base/logging.h" -#include "rtc_base/messagedigest.h" +#include "rtc_base/message_digest.h" #include "rtc_base/strings/string_builder.h" using cricket::AudioContentDescription; diff --git a/pc/webrtc_sdp.h b/pc/webrtc_sdp.h index f185c08932..1d1e7aa4e6 100644 --- a/pc/webrtc_sdp.h +++ b/pc/webrtc_sdp.h @@ -17,8 +17,8 @@ // * draft-lennox-mmusic-sdp-source-selection-02 - // Mechanisms for Media Source Selection in SDP -#ifndef PC_WEBRTCSDP_H_ -#define PC_WEBRTCSDP_H_ +#ifndef PC_WEBRTC_SDP_H_ +#define PC_WEBRTC_SDP_H_ #include @@ -86,4 +86,4 @@ RTC_EXPORT bool SdpDeserializeCandidate(const std::string& transport_name, } // namespace webrtc -#endif // PC_WEBRTCSDP_H_ +#endif // PC_WEBRTC_SDP_H_ diff --git a/pc/webrtc_sdp_unittest.cc b/pc/webrtc_sdp_unittest.cc index 849f6c52dd..210848ff8c 100644 --- a/pc/webrtc_sdp_unittest.cc +++ b/pc/webrtc_sdp_unittest.cc @@ -18,33 +18,33 @@ #include #include "api/array_view.h" -#include "api/cryptoparams.h" -#include "api/jsepsessiondescription.h" -#include "api/mediatypes.h" -#include "api/rtpparameters.h" -#include "api/rtptransceiverinterface.h" +#include "api/crypto_params.h" +#include "api/jsep_session_description.h" +#include "api/media_types.h" +#include "api/rtp_parameters.h" +#include "api/rtp_transceiver_interface.h" #include "media/base/codec.h" -#include "media/base/mediaconstants.h" -#include "media/base/streamparams.h" -#include "p2p/base/p2pconstants.h" +#include "media/base/media_constants.h" +#include "media/base/stream_params.h" +#include "p2p/base/p2p_constants.h" #include "p2p/base/port.h" -#include "p2p/base/transportdescription.h" -#include "p2p/base/transportinfo.h" -#include "pc/mediasession.h" -#include "pc/sessiondescription.h" +#include "p2p/base/transport_description.h" +#include "p2p/base/transport_info.h" +#include "pc/media_session.h" +#include "pc/session_description.h" #include "rtc_base/checks.h" -#include "rtc_base/messagedigest.h" -#include "rtc_base/socketaddress.h" -#include "rtc_base/sslfingerprint.h" -#include "rtc_base/stringencode.h" -#include "rtc_base/stringutils.h" +#include "rtc_base/message_digest.h" +#include "rtc_base/socket_address.h" +#include "rtc_base/ssl_fingerprint.h" +#include "rtc_base/string_encode.h" +#include "rtc_base/string_utils.h" #include "test/gmock.h" #include "test/gtest.h" #ifdef WEBRTC_ANDROID -#include "pc/test/androidtestinitializer.h" +#include "pc/test/android_test_initializer.h" #endif -#include "pc/webrtcsdp.h" +#include "pc/webrtc_sdp.h" using cricket::AudioCodec; using cricket::AudioContentDescription; diff --git a/pc/webrtc_session_description_factory.cc b/pc/webrtc_session_description_factory.cc index 754a06c545..563632c434 100644 --- a/pc/webrtc_session_description_factory.cc +++ b/pc/webrtc_session_description_factory.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "pc/webrtcsessiondescriptionfactory.h" +#include "pc/webrtc_session_description_factory.h" #include #include @@ -19,16 +19,16 @@ #include "absl/memory/memory.h" #include "absl/types/optional.h" #include "api/jsep.h" -#include "api/jsepsessiondescription.h" -#include "api/rtcerror.h" -#include "pc/sessiondescription.h" +#include "api/jsep_session_description.h" +#include "api/rtc_error.h" +#include "pc/session_description.h" #include "rtc_base/checks.h" #include "rtc_base/location.h" #include "rtc_base/logging.h" -#include "rtc_base/refcountedobject.h" -#include "rtc_base/sslidentity.h" -#include "rtc_base/sslstreamadapter.h" -#include "rtc_base/stringencode.h" +#include "rtc_base/ref_counted_object.h" +#include "rtc_base/ssl_identity.h" +#include "rtc_base/ssl_stream_adapter.h" +#include "rtc_base/string_encode.h" using cricket::MediaSessionOptions; diff --git a/pc/webrtc_session_description_factory.h b/pc/webrtc_session_description_factory.h index 21859c7697..a1bd0c7718 100644 --- a/pc/webrtc_session_description_factory.h +++ b/pc/webrtc_session_description_factory.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef PC_WEBRTCSESSIONDESCRIPTIONFACTORY_H_ -#define PC_WEBRTCSESSIONDESCRIPTIONFACTORY_H_ +#ifndef PC_WEBRTC_SESSION_DESCRIPTION_FACTORY_H_ +#define PC_WEBRTC_SESSION_DESCRIPTION_FACTORY_H_ #include #include @@ -17,16 +17,16 @@ #include #include "api/jsep.h" -#include "api/peerconnectioninterface.h" -#include "p2p/base/transportdescription.h" -#include "p2p/base/transportdescriptionfactory.h" -#include "pc/mediasession.h" -#include "pc/peerconnectioninternal.h" -#include "rtc_base/constructormagic.h" -#include "rtc_base/messagehandler.h" -#include "rtc_base/messagequeue.h" -#include "rtc_base/rtccertificate.h" -#include "rtc_base/rtccertificategenerator.h" +#include "api/peer_connection_interface.h" +#include "p2p/base/transport_description.h" +#include "p2p/base/transport_description_factory.h" +#include "pc/media_session.h" +#include "pc/peer_connection_internal.h" +#include "rtc_base/constructor_magic.h" +#include "rtc_base/message_handler.h" +#include "rtc_base/message_queue.h" +#include "rtc_base/rtc_certificate.h" +#include "rtc_base/rtc_certificate_generator.h" #include "rtc_base/scoped_ref_ptr.h" #include "rtc_base/third_party/sigslot/sigslot.h" #include "rtc_base/thread.h" @@ -159,4 +159,4 @@ class WebRtcSessionDescriptionFactory : public rtc::MessageHandler, }; } // namespace webrtc -#endif // PC_WEBRTCSESSIONDESCRIPTIONFACTORY_H_ +#endif // PC_WEBRTC_SESSION_DESCRIPTION_FACTORY_H_ diff --git a/rtc_base/BUILD.gn b/rtc_base/BUILD.gn index f35002892d..4b3bdc382a 100644 --- a/rtc_base/BUILD.gn +++ b/rtc_base/BUILD.gn @@ -90,18 +90,18 @@ rtc_source_set("rtc_base_approved") { sources = [ "bind.h", - "bitbuffer.cc", - "bitbuffer.h", - "bitrateallocationstrategy.cc", - "bitrateallocationstrategy.h", + "bit_buffer.cc", + "bit_buffer.h", + "bitrate_allocation_strategy.cc", + "bitrate_allocation_strategy.h", "buffer.h", - "bufferqueue.cc", - "bufferqueue.h", - "bytebuffer.cc", - "bytebuffer.h", - "byteorder.h", - "copyonwritebuffer.cc", - "copyonwritebuffer.h", + "buffer_queue.cc", + "buffer_queue.h", + "byte_buffer.cc", + "byte_buffer.h", + "byte_order.h", + "copy_on_write_buffer.cc", + "copy_on_write_buffer.h", "event_tracer.cc", "event_tracer.h", "file.cc", @@ -119,7 +119,7 @@ rtc_source_set("rtc_base_approved") { "numerics/moving_max_counter.h", "numerics/sample_counter.cc", "numerics/sample_counter.h", - "onetimeevent.h", + "one_time_event.h", "platform_file.cc", "platform_file.h", "race_checker.cc", @@ -128,12 +128,12 @@ rtc_source_set("rtc_base_approved") { "random.h", "rate_statistics.cc", "rate_statistics.h", - "ratetracker.cc", - "ratetracker.h", + "rate_tracker.cc", + "rate_tracker.h", "swap_queue.h", "template_util.h", - "timestampaligner.cc", - "timestampaligner.h", + "timestamp_aligner.cc", + "timestamp_aligner.h", "trace_event.h", "zero_memory.cc", "zero_memory.h", @@ -184,7 +184,7 @@ rtc_source_set("macromagic") { visibility = [ "*" ] sources = [ "arraysize.h", - "constructormagic.h", + "constructor_magic.h", "format_macros.h", "stringize_macros.h", "thread_annotations.h", @@ -214,9 +214,9 @@ rtc_source_set("ptr_util") { rtc_source_set("refcount") { visibility = [ "*" ] sources = [ - "refcount.h", - "refcountedobject.h", - "refcounter.h", + "ref_count.h", + "ref_counted_object.h", + "ref_counter.h", ] deps = [ ":atomicops", @@ -226,8 +226,8 @@ rtc_source_set("refcount") { rtc_source_set("criticalsection") { sources = [ - "criticalsection.cc", - "criticalsection.h", + "critical_section.cc", + "critical_section.h", ] deps = [ ":atomicops", @@ -342,7 +342,7 @@ rtc_source_set("thread_checker") { rtc_source_set("atomicops") { sources = [ - "atomicops.h", + "atomic_ops.h", ] } @@ -417,8 +417,8 @@ rtc_source_set("safe_conversions") { rtc_source_set("timeutils") { visibility = [ "*" ] sources = [ - "timeutils.cc", - "timeutils.h", + "time_utils.cc", + "time_utils.h", ] deps = [ ":checks", @@ -429,14 +429,14 @@ rtc_source_set("timeutils") { rtc_source_set("stringutils") { sources = [ + "string_encode.cc", + "string_encode.h", "string_to_number.cc", "string_to_number.h", - "stringencode.cc", - "stringencode.h", + "string_utils.cc", + "string_utils.h", "strings/string_builder.cc", "strings/string_builder.h", - "stringutils.cc", - "stringutils.h", ] deps = [ ":checks", @@ -728,8 +728,8 @@ rtc_source_set("nethelpers") { # TODO(bugs.webrtc.org/9987): This build target will soon contain # the following files: # sources = [ - # "nethelpers.cc", - # "nethelpers.h", + # "net_helpers.cc", + # "net_helpers.h", # ] } @@ -737,8 +737,8 @@ rtc_source_set("asyncresolverinterface") { # TODO(bugs.webrtc.org/9987): This build target will soon contain # the following files: # sources = [ - # "asyncresolverinterface.cc", - # "asyncresolverinterface.h", + # "async_resolver_interface.cc", + # "async_resolver_interface.h", # ] } @@ -746,8 +746,8 @@ rtc_source_set("ipaddress") { # TODO(bugs.webrtc.org/9987): This build target will soon contain # the following files: # sources = [ - # "ipaddress.cc", - # "ipaddress.h", + # "ip_address.cc", + # "ip_address.h", # ] } @@ -755,8 +755,8 @@ rtc_source_set("socketaddress") { # TODO(bugs.webrtc.org/9987): This build target will soon contain # the following files: # sources = [ - # "socketaddress.cc", - # "socketaddress.h", + # "socket_address.cc", + # "socket_address.h", # ] } @@ -764,8 +764,8 @@ rtc_source_set("nullsocketserver") { # TODO(bugs.webrtc.org/9987): This build target will soon contain # the following files: # sources = [ - # "nullsocketserver.cc", - # "nullsocketserver.h", + # "null_socket_server.cc", + # "null_socket_server.h", # ] } @@ -773,7 +773,7 @@ rtc_source_set("socketserver") { # TODO(bugs.webrtc.org/9987): This build target will soon contain # the following files: # sources = [ - # "socketserver.h", + # "socket_server.h", # ] } @@ -785,16 +785,16 @@ rtc_source_set("threading") { # "asyncresolver.h", # "defaultsocketserver.cc", # "defaultsocketserver.h", - # "messagehandler.cc", - # "messagehandler.h", - # "messagequeue.cc", - # "messagequeue.h", - # "networkmonitor.cc", - # "networkmonitor.h", - # "physicalsocketserver.cc", - # "physicalsocketserver.h", - # "signalthread.cc", - # "signalthread.h", + # "message_handler.cc", + # "message_handler.h", + # "message_queue.cc", + # "message_queue.h", + # "network_monitor.cc", + # "network_monitor.h", + # "physical_socket_server.cc", + # "physical_socket_server.h", + # "signal_thread.cc", + # "signal_thread.h", # "thread.cc", # "thread.h", # ] @@ -804,7 +804,7 @@ rtc_source_set("socketfactory") { # TODO(bugs.webrtc.org/9987): This build target will soon contain # the following files: # sources = [ - # "socketfactory.h", + # "socket_factory.h", # ] } @@ -812,8 +812,8 @@ rtc_source_set("asyncsocket") { # TODO(bugs.webrtc.org/9987): This build target will soon contain # the following files: # sources = [ - # "asyncsocket.cc", - # "asyncsocket.h", + # "async_socket.cc", + # "async_socket.h", # ] } @@ -839,8 +839,8 @@ if (is_android) { # TODO(bugs.webrtc.org/9987): This build target will soon contain # the following files: # sources = [ - # "ifaddrs-android.cc", - # "ifaddrs-android.h", + # "ifaddrs_android.cc", + # "ifaddrs_android.h", # ] } } @@ -882,105 +882,105 @@ rtc_static_library("rtc_base") { all_dependent_configs = [ ":rtc_base_all_dependent_config" ] sources = [ - "asyncinvoker-inl.h", - "asyncinvoker.cc", - "asyncinvoker.h", - "asyncpacketsocket.cc", - "asyncpacketsocket.h", - "asyncresolverinterface.cc", - "asyncresolverinterface.h", - "asyncsocket.cc", - "asyncsocket.h", - "asynctcpsocket.cc", - "asynctcpsocket.h", - "asyncudpsocket.cc", - "asyncudpsocket.h", + "async_invoker.cc", + "async_invoker.h", + "async_invoker_inl.h", + "async_packet_socket.cc", + "async_packet_socket.h", + "async_resolver_interface.cc", + "async_resolver_interface.h", + "async_socket.cc", + "async_socket.h", + "async_tcp_socket.cc", + "async_tcp_socket.h", + "async_udp_socket.cc", + "async_udp_socket.h", "crc32.cc", "crc32.h", - "cryptstring.cc", - "cryptstring.h", + "crypt_string.cc", + "crypt_string.h", "data_rate_limiter.cc", "data_rate_limiter.h", "dscp.h", - "filerotatingstream.cc", - "filerotatingstream.h", + "file_rotating_stream.cc", + "file_rotating_stream.h", "gunit_prod.h", "helpers.cc", "helpers.h", - "httpcommon.cc", - "httpcommon.h", - "ipaddress.cc", - "ipaddress.h", + "http_common.cc", + "http_common.h", + "ip_address.cc", + "ip_address.h", "keep_ref_until_done.h", "key_derivation.cc", "key_derivation.h", "mdns_responder_interface.h", - "messagedigest.cc", - "messagedigest.h", - "messagehandler.cc", - "messagehandler.h", - "messagequeue.cc", - "messagequeue.h", - "nethelper.cc", - "nethelper.h", - "nethelpers.cc", - "nethelpers.h", + "message_digest.cc", + "message_digest.h", + "message_handler.cc", + "message_handler.h", + "message_queue.cc", + "message_queue.h", + "net_helper.cc", + "net_helper.h", + "net_helpers.cc", + "net_helpers.h", "network.cc", "network.h", "network_constants.h", - "networkmonitor.cc", - "networkmonitor.h", - "networkroute.h", - "nullsocketserver.cc", - "nullsocketserver.h", + "network_monitor.cc", + "network_monitor.h", + "network_route.h", + "null_socket_server.cc", + "null_socket_server.h", "openssl.h", + "openssl_adapter.cc", + "openssl_adapter.h", + "openssl_certificate.cc", + "openssl_certificate.h", + "openssl_digest.cc", + "openssl_digest.h", + "openssl_identity.cc", + "openssl_identity.h", "openssl_key_derivation_hkdf.cc", "openssl_key_derivation_hkdf.h", - "openssladapter.cc", - "openssladapter.h", - "opensslcertificate.cc", - "opensslcertificate.h", - "openssldigest.cc", - "openssldigest.h", - "opensslidentity.cc", - "opensslidentity.h", - "opensslsessioncache.cc", - "opensslsessioncache.h", - "opensslstreamadapter.cc", - "opensslstreamadapter.h", - "opensslutility.cc", - "opensslutility.h", - "physicalsocketserver.cc", - "physicalsocketserver.h", - "proxyinfo.cc", - "proxyinfo.h", - "rtccertificate.cc", - "rtccertificate.h", - "rtccertificategenerator.cc", - "rtccertificategenerator.h", - "signalthread.cc", - "signalthread.h", - "sigslotrepeater.h", + "openssl_session_cache.cc", + "openssl_session_cache.h", + "openssl_stream_adapter.cc", + "openssl_stream_adapter.h", + "openssl_utility.cc", + "openssl_utility.h", + "physical_socket_server.cc", + "physical_socket_server.h", + "proxy_info.cc", + "proxy_info.h", + "rtc_certificate.cc", + "rtc_certificate.h", + "rtc_certificate_generator.cc", + "rtc_certificate_generator.h", + "signal_thread.cc", + "signal_thread.h", + "sigslot_repeater.h", "socket.cc", "socket.h", - "socketadapters.cc", - "socketadapters.h", - "socketaddress.cc", - "socketaddress.h", - "socketaddresspair.cc", - "socketaddresspair.h", - "socketfactory.h", - "socketserver.h", - "ssladapter.cc", - "ssladapter.h", - "sslcertificate.cc", - "sslcertificate.h", - "sslfingerprint.cc", - "sslfingerprint.h", - "sslidentity.cc", - "sslidentity.h", - "sslstreamadapter.cc", - "sslstreamadapter.h", + "socket_adapters.cc", + "socket_adapters.h", + "socket_address.cc", + "socket_address.h", + "socket_address_pair.cc", + "socket_address_pair.h", + "socket_factory.h", + "socket_server.h", + "ssl_adapter.cc", + "ssl_adapter.h", + "ssl_certificate.cc", + "ssl_certificate.h", + "ssl_fingerprint.cc", + "ssl_fingerprint.h", + "ssl_identity.cc", + "ssl_identity.h", + "ssl_stream_adapter.cc", + "ssl_stream_adapter.h", "stream.cc", "stream.h", "thread.cc", @@ -993,19 +993,19 @@ rtc_static_library("rtc_base") { } else { sources += [ "callback.h", - "logsinks.cc", - "logsinks.h", - "numerics/mathutils.h", - "rollingaccumulator.h", - "sslroots.h", + "log_sinks.cc", + "log_sinks.h", + "numerics/math_utils.h", + "rolling_accumulator.h", + "ssl_roots.h", ] if (is_win) { - sources += [ "win32socketinit.h" ] + sources += [ "win32_socket_init.h" ] if (current_os != "winuwp") { sources += [ - "win32socketserver.cc", - "win32socketserver.h", + "win32_socket_server.cc", + "win32_socket_server.h", ] } } @@ -1019,8 +1019,8 @@ rtc_static_library("rtc_base") { if (is_android) { sources += [ - "ifaddrs-android.cc", - "ifaddrs-android.h", + "ifaddrs_android.cc", + "ifaddrs_android.h", ] libs += [ @@ -1030,7 +1030,7 @@ rtc_static_library("rtc_base") { } if (is_ios || is_mac) { - sources += [ "macifaddrs_converter.cc" ] + sources += [ "mac_ifaddrs_converter.cc" ] deps += [ "system:cocoa_threading" ] } @@ -1054,8 +1054,8 @@ rtc_static_library("rtc_base") { if (is_mac) { sources += [ - "macutils.cc", - "macutils.h", + "mac_utils.cc", + "mac_utils.h", ] } @@ -1063,8 +1063,8 @@ rtc_static_library("rtc_base") { sources += [ "win32.cc", "win32.h", - "win32window.cc", - "win32window.h", + "win32_window.cc", + "win32_window.h", ] libs += [ @@ -1116,8 +1116,8 @@ rtc_source_set("gunit_helpers") { rtc_source_set("testclient") { testonly = true sources = [ - "testclient.cc", - "testclient.h", + "test_client.cc", + "test_client.h", ] deps = [ ":criticalsection", @@ -1135,40 +1135,40 @@ rtc_source_set("rtc_base_tests_utils") { sources = [ "cpu_time.cc", "cpu_time.h", + "fake_clock.cc", + "fake_clock.h", "fake_mdns_responder.h", - "fakeclock.cc", - "fakeclock.h", - "fakenetwork.h", - "fakesslidentity.cc", - "fakesslidentity.h", - "firewallsocketserver.cc", - "firewallsocketserver.h", + "fake_network.h", + "fake_ssl_identity.cc", + "fake_ssl_identity.h", + "firewall_socket_server.cc", + "firewall_socket_server.h", "memory_stream.cc", "memory_stream.h", "memory_usage.cc", "memory_usage.h", - "natserver.cc", - "natserver.h", - "natsocketfactory.cc", - "natsocketfactory.h", - "nattypes.cc", - "nattypes.h", - "proxyserver.cc", - "proxyserver.h", + "nat_server.cc", + "nat_server.h", + "nat_socket_factory.cc", + "nat_socket_factory.h", + "nat_types.cc", + "nat_types.h", + "proxy_server.cc", + "proxy_server.h", "server_socket_adapters.cc", "server_socket_adapters.h", - "sigslottester.h", + "sigslot_tester.h", "sigslottester.h.pump", - "socketstream.cc", - "socketstream.h", - "testbase64.h", - "testcertificateverifier.h", - "testechoserver.cc", - "testechoserver.h", - "testutils.cc", - "testutils.h", - "virtualsocketserver.cc", - "virtualsocketserver.h", + "socket_stream.cc", + "socket_stream.h", + "test_base64.h", + "test_certificate_verifier.h", + "test_echo_server.cc", + "test_echo_server.h", + "test_utils.cc", + "test_utils.h", + "virtual_socket_server.cc", + "virtual_socket_server.h", ] deps = [ ":checks", @@ -1235,12 +1235,12 @@ if (rtc_include_tests) { sources = [ "cpu_time_unittest.cc", - "filerotatingstream_unittest.cc", - "nullsocketserver_unittest.cc", - "physicalsocketserver_unittest.cc", + "file_rotating_stream_unittest.cc", + "null_socket_server_unittest.cc", + "physical_socket_server_unittest.cc", + "socket_address_unittest.cc", "socket_unittest.cc", "socket_unittest.h", - "socketaddress_unittest.cc", ] deps = [ ":checks", @@ -1257,7 +1257,7 @@ if (rtc_include_tests) { "//third_party/abseil-cpp/absl/memory", ] if (is_win) { - sources += [ "win32socketserver_unittest.cc" ] + sources += [ "win32_socket_server_unittest.cc" ] } } @@ -1267,17 +1267,17 @@ if (rtc_include_tests) { cflags = [ "-fsanitize=memory" ] } sources = [ - "atomicops_unittest.cc", + "atomic_ops_unittest.cc", "base64_unittest.cc", "bind_unittest.cc", - "bitbuffer_unittest.cc", - "bitrateallocationstrategy_unittest.cc", + "bit_buffer_unittest.cc", + "bitrate_allocation_strategy_unittest.cc", + "buffer_queue_unittest.cc", "buffer_unittest.cc", - "bufferqueue_unittest.cc", - "bytebuffer_unittest.cc", - "byteorder_unittest.cc", - "copyonwritebuffer_unittest.cc", - "criticalsection_unittest.cc", + "byte_buffer_unittest.cc", + "byte_order_unittest.cc", + "copy_on_write_buffer_unittest.cc", + "critical_section_unittest.cc", "event_tracer_unittest.cc", "event_unittest.cc", "file_unittest.cc", @@ -1289,26 +1289,26 @@ if (rtc_include_tests) { "numerics/safe_compare_unittest.cc", "numerics/safe_minmax_unittest.cc", "numerics/sample_counter_unittest.cc", - "onetimeevent_unittest.cc", + "one_time_event_unittest.cc", "platform_file_unittest.cc", "platform_thread_unittest.cc", "random_unittest.cc", "rate_limiter_unittest.cc", "rate_statistics_unittest.cc", - "ratetracker_unittest.cc", - "refcountedobject_unittest.cc", + "rate_tracker_unittest.cc", + "ref_counted_object_unittest.cc", "sanitizer_unittest.cc", + "string_encode_unittest.cc", "string_to_number_unittest.cc", - "stringencode_unittest.cc", + "string_utils_unittest.cc", "stringize_macros_unittest.cc", "strings/string_builder_unittest.cc", - "stringutils_unittest.cc", "swap_queue_unittest.cc", "thread_annotations_unittest.cc", "thread_checker_unittest.cc", - "timestampaligner_unittest.cc", - "timeutils_unittest.cc", - "virtualsocket_unittest.cc", + "time_utils_unittest.cc", + "timestamp_aligner_unittest.cc", + "virtual_socket_unittest.cc", "zero_memory_unittest.cc", ] if (is_win) { @@ -1439,37 +1439,37 @@ if (rtc_include_tests) { "crc32_unittest.cc", "data_rate_limiter_unittest.cc", "helpers_unittest.cc", - "ipaddress_unittest.cc", + "ip_address_unittest.cc", "memory_usage_unittest.cc", - "messagedigest_unittest.cc", - "messagequeue_unittest.cc", + "message_digest_unittest.cc", + "message_queue_unittest.cc", "nat_unittest.cc", "network_unittest.cc", "proxy_unittest.cc", - "rollingaccumulator_unittest.cc", - "rtccertificate_unittest.cc", - "rtccertificategenerator_unittest.cc", - "signalthread_unittest.cc", - "sigslottester_unittest.cc", + "rolling_accumulator_unittest.cc", + "rtc_certificate_generator_unittest.cc", + "rtc_certificate_unittest.cc", + "signal_thread_unittest.cc", + "sigslot_tester_unittest.cc", "stream_unittest.cc", - "testclient_unittest.cc", + "test_client_unittest.cc", "thread_unittest.cc", ] if (is_win) { sources += [ "win32_unittest.cc", - "win32window_unittest.cc", + "win32_window_unittest.cc", ] } if (is_posix || is_fuchsia) { sources += [ + "openssl_adapter_unittest.cc", "openssl_key_derivation_hkdf_unittest.cc", - "openssladapter_unittest.cc", - "opensslsessioncache_unittest.cc", - "opensslutility_unittest.cc", - "ssladapter_unittest.cc", - "sslidentity_unittest.cc", - "sslstreamadapter_unittest.cc", + "openssl_session_cache_unittest.cc", + "openssl_utility_unittest.cc", + "ssl_adapter_unittest.cc", + "ssl_identity_unittest.cc", + "ssl_stream_adapter_unittest.cc", ] } deps = [ diff --git a/rtc_base/async_invoker.cc b/rtc_base/async_invoker.cc index f0dd1881ef..8584bdaea2 100644 --- a/rtc_base/async_invoker.cc +++ b/rtc_base/async_invoker.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "rtc_base/asyncinvoker.h" +#include "rtc_base/async_invoker.h" #include "rtc_base/checks.h" #include "rtc_base/logging.h" diff --git a/rtc_base/async_invoker.h b/rtc_base/async_invoker.h index 474ec7c335..805768b9cb 100644 --- a/rtc_base/async_invoker.h +++ b/rtc_base/async_invoker.h @@ -8,18 +8,18 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef RTC_BASE_ASYNCINVOKER_H_ -#define RTC_BASE_ASYNCINVOKER_H_ +#ifndef RTC_BASE_ASYNC_INVOKER_H_ +#define RTC_BASE_ASYNC_INVOKER_H_ #include #include #include -#include "rtc_base/asyncinvoker-inl.h" +#include "rtc_base/async_invoker_inl.h" #include "rtc_base/bind.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" #include "rtc_base/event.h" -#include "rtc_base/refcountedobject.h" +#include "rtc_base/ref_counted_object.h" #include "rtc_base/scoped_ref_ptr.h" #include "rtc_base/third_party/sigslot/sigslot.h" #include "rtc_base/thread.h" @@ -262,4 +262,4 @@ class GuardedAsyncInvoker : public sigslot::has_slots<> { } // namespace rtc -#endif // RTC_BASE_ASYNCINVOKER_H_ +#endif // RTC_BASE_ASYNC_INVOKER_H_ diff --git a/rtc_base/async_invoker_inl.h b/rtc_base/async_invoker_inl.h index 0dadc0f3b3..50ee638193 100644 --- a/rtc_base/async_invoker_inl.h +++ b/rtc_base/async_invoker_inl.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef RTC_BASE_ASYNCINVOKER_INL_H_ -#define RTC_BASE_ASYNCINVOKER_INL_H_ +#ifndef RTC_BASE_ASYNC_INVOKER_INL_H_ +#define RTC_BASE_ASYNC_INVOKER_INL_H_ #include "rtc_base/bind.h" -#include "rtc_base/criticalsection.h" +#include "rtc_base/critical_section.h" #include "rtc_base/event.h" -#include "rtc_base/messagehandler.h" -#include "rtc_base/refcountedobject.h" +#include "rtc_base/message_handler.h" +#include "rtc_base/ref_counted_object.h" #include "rtc_base/scoped_ref_ptr.h" #include "rtc_base/third_party/sigslot/sigslot.h" #include "rtc_base/thread.h" @@ -58,4 +58,4 @@ class FireAndForgetAsyncClosure : public AsyncClosure { } // namespace rtc -#endif // RTC_BASE_ASYNCINVOKER_INL_H_ +#endif // RTC_BASE_ASYNC_INVOKER_INL_H_ diff --git a/rtc_base/async_packet_socket.cc b/rtc_base/async_packet_socket.cc index 7e0cc8f810..12afbebfc5 100644 --- a/rtc_base/async_packet_socket.cc +++ b/rtc_base/async_packet_socket.cc @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "rtc_base/asyncpacketsocket.h" -#include "rtc_base/nethelper.h" +#include "rtc_base/async_packet_socket.h" +#include "rtc_base/net_helper.h" namespace rtc { diff --git a/rtc_base/async_packet_socket.h b/rtc_base/async_packet_socket.h index 0e31c2bac1..3afff3bf87 100644 --- a/rtc_base/async_packet_socket.h +++ b/rtc_base/async_packet_socket.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef RTC_BASE_ASYNCPACKETSOCKET_H_ -#define RTC_BASE_ASYNCPACKETSOCKET_H_ +#ifndef RTC_BASE_ASYNC_PACKET_SOCKET_H_ +#define RTC_BASE_ASYNC_PACKET_SOCKET_H_ -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" #include "rtc_base/dscp.h" #include "rtc_base/network/sent_packet.h" #include "rtc_base/socket.h" #include "rtc_base/third_party/sigslot/sigslot.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/time_utils.h" namespace rtc { @@ -140,4 +140,4 @@ void CopySocketInformationToPacketInfo(size_t packet_size_bytes, } // namespace rtc -#endif // RTC_BASE_ASYNCPACKETSOCKET_H_ +#endif // RTC_BASE_ASYNC_PACKET_SOCKET_H_ diff --git a/rtc_base/async_resolver_interface.cc b/rtc_base/async_resolver_interface.cc index b2880f2878..c8d6ab85de 100644 --- a/rtc_base/async_resolver_interface.cc +++ b/rtc_base/async_resolver_interface.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "rtc_base/asyncresolverinterface.h" +#include "rtc_base/async_resolver_interface.h" namespace rtc { diff --git a/rtc_base/async_resolver_interface.h b/rtc_base/async_resolver_interface.h index f3df884249..0f5e989a13 100644 --- a/rtc_base/async_resolver_interface.h +++ b/rtc_base/async_resolver_interface.h @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef RTC_BASE_ASYNCRESOLVERINTERFACE_H_ -#define RTC_BASE_ASYNCRESOLVERINTERFACE_H_ +#ifndef RTC_BASE_ASYNC_RESOLVER_INTERFACE_H_ +#define RTC_BASE_ASYNC_RESOLVER_INTERFACE_H_ -#include "rtc_base/socketaddress.h" +#include "rtc_base/socket_address.h" #include "rtc_base/third_party/sigslot/sigslot.h" namespace rtc { diff --git a/rtc_base/async_socket.cc b/rtc_base/async_socket.cc index acd5415eb5..ab3f99ee6b 100644 --- a/rtc_base/async_socket.cc +++ b/rtc_base/async_socket.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "rtc_base/asyncsocket.h" +#include "rtc_base/async_socket.h" #include "rtc_base/checks.h" namespace rtc { diff --git a/rtc_base/async_socket.h b/rtc_base/async_socket.h index c23929f978..7b2f0e0de9 100644 --- a/rtc_base/async_socket.h +++ b/rtc_base/async_socket.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef RTC_BASE_ASYNCSOCKET_H_ -#define RTC_BASE_ASYNCSOCKET_H_ +#ifndef RTC_BASE_ASYNC_SOCKET_H_ +#define RTC_BASE_ASYNC_SOCKET_H_ #include #include #include "rtc_base/socket.h" -#include "rtc_base/socketaddress.h" +#include "rtc_base/socket_address.h" #include "rtc_base/third_party/sigslot/sigslot.h" namespace rtc { @@ -83,4 +83,4 @@ class AsyncSocketAdapter : public AsyncSocket, public sigslot::has_slots<> { } // namespace rtc -#endif // RTC_BASE_ASYNCSOCKET_H_ +#endif // RTC_BASE_ASYNC_SOCKET_H_ diff --git a/rtc_base/async_tcp_socket.cc b/rtc_base/async_tcp_socket.cc index f15b524d8d..148e45982a 100644 --- a/rtc_base/async_tcp_socket.cc +++ b/rtc_base/async_tcp_socket.cc @@ -8,19 +8,19 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "rtc_base/asynctcpsocket.h" +#include "rtc_base/async_tcp_socket.h" #include #include #include #include -#include "rtc_base/byteorder.h" +#include "rtc_base/byte_order.h" #include "rtc_base/checks.h" #include "rtc_base/logging.h" #include "rtc_base/network/sent_packet.h" #include "rtc_base/third_party/sigslot/sigslot.h" -#include "rtc_base/timeutils.h" // for TimeMillis +#include "rtc_base/time_utils.h" // for TimeMillis #if defined(WEBRTC_POSIX) #include diff --git a/rtc_base/async_tcp_socket.h b/rtc_base/async_tcp_socket.h index 9567dd9143..ae12a94a93 100644 --- a/rtc_base/async_tcp_socket.h +++ b/rtc_base/async_tcp_socket.h @@ -8,18 +8,18 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef RTC_BASE_ASYNCTCPSOCKET_H_ -#define RTC_BASE_ASYNCTCPSOCKET_H_ +#ifndef RTC_BASE_ASYNC_TCP_SOCKET_H_ +#define RTC_BASE_ASYNC_TCP_SOCKET_H_ #include #include -#include "rtc_base/asyncpacketsocket.h" -#include "rtc_base/asyncsocket.h" +#include "rtc_base/async_packet_socket.h" +#include "rtc_base/async_socket.h" #include "rtc_base/buffer.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" #include "rtc_base/socket.h" -#include "rtc_base/socketaddress.h" +#include "rtc_base/socket_address.h" namespace rtc { @@ -109,4 +109,4 @@ class AsyncTCPSocket : public AsyncTCPSocketBase { } // namespace rtc -#endif // RTC_BASE_ASYNCTCPSOCKET_H_ +#endif // RTC_BASE_ASYNC_TCP_SOCKET_H_ diff --git a/rtc_base/async_tcp_socket_unittest.cc b/rtc_base/async_tcp_socket_unittest.cc index e8fd96cb8b..69b5392773 100644 --- a/rtc_base/async_tcp_socket_unittest.cc +++ b/rtc_base/async_tcp_socket_unittest.cc @@ -11,9 +11,9 @@ #include #include -#include "rtc_base/asynctcpsocket.h" +#include "rtc_base/async_tcp_socket.h" #include "rtc_base/gunit.h" -#include "rtc_base/virtualsocketserver.h" +#include "rtc_base/virtual_socket_server.h" namespace rtc { diff --git a/rtc_base/async_udp_socket.cc b/rtc_base/async_udp_socket.cc index a83403bc4b..852191060e 100644 --- a/rtc_base/async_udp_socket.cc +++ b/rtc_base/async_udp_socket.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "rtc_base/asyncudpsocket.h" +#include "rtc_base/async_udp_socket.h" #include #include @@ -17,7 +17,7 @@ #include "rtc_base/logging.h" #include "rtc_base/network/sent_packet.h" #include "rtc_base/third_party/sigslot/sigslot.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/time_utils.h" namespace rtc { diff --git a/rtc_base/async_udp_socket.h b/rtc_base/async_udp_socket.h index 030946d8a0..237c88d4b1 100644 --- a/rtc_base/async_udp_socket.h +++ b/rtc_base/async_udp_socket.h @@ -8,17 +8,17 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef RTC_BASE_ASYNCUDPSOCKET_H_ -#define RTC_BASE_ASYNCUDPSOCKET_H_ +#ifndef RTC_BASE_ASYNC_UDP_SOCKET_H_ +#define RTC_BASE_ASYNC_UDP_SOCKET_H_ #include #include -#include "rtc_base/asyncpacketsocket.h" -#include "rtc_base/asyncsocket.h" +#include "rtc_base/async_packet_socket.h" +#include "rtc_base/async_socket.h" #include "rtc_base/socket.h" -#include "rtc_base/socketaddress.h" -#include "rtc_base/socketfactory.h" +#include "rtc_base/socket_address.h" +#include "rtc_base/socket_factory.h" namespace rtc { @@ -68,4 +68,4 @@ class AsyncUDPSocket : public AsyncPacketSocket { } // namespace rtc -#endif // RTC_BASE_ASYNCUDPSOCKET_H_ +#endif // RTC_BASE_ASYNC_UDP_SOCKET_H_ diff --git a/rtc_base/async_udp_socket_unittest.cc b/rtc_base/async_udp_socket_unittest.cc index 33b3d13671..0484c3a592 100644 --- a/rtc_base/async_udp_socket_unittest.cc +++ b/rtc_base/async_udp_socket_unittest.cc @@ -11,10 +11,10 @@ #include #include -#include "rtc_base/asyncudpsocket.h" +#include "rtc_base/async_udp_socket.h" #include "rtc_base/gunit.h" -#include "rtc_base/physicalsocketserver.h" -#include "rtc_base/virtualsocketserver.h" +#include "rtc_base/physical_socket_server.h" +#include "rtc_base/virtual_socket_server.h" namespace rtc { diff --git a/rtc_base/atomic_ops.h b/rtc_base/atomic_ops.h index 16fa603a4e..18a24a8e2e 100644 --- a/rtc_base/atomic_ops.h +++ b/rtc_base/atomic_ops.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef RTC_BASE_ATOMICOPS_H_ -#define RTC_BASE_ATOMICOPS_H_ +#ifndef RTC_BASE_ATOMIC_OPS_H_ +#define RTC_BASE_ATOMIC_OPS_H_ #if defined(WEBRTC_WIN) // clang-format off @@ -76,4 +76,4 @@ class AtomicOps { } // namespace rtc -#endif // RTC_BASE_ATOMICOPS_H_ +#endif // RTC_BASE_ATOMIC_OPS_H_ diff --git a/rtc_base/base64_unittest.cc b/rtc_base/base64_unittest.cc index 16dcd8dcb6..dcc4d1b3e8 100644 --- a/rtc_base/base64_unittest.cc +++ b/rtc_base/base64_unittest.cc @@ -15,7 +15,7 @@ #include #include "rtc_base/logging.h" -#include "rtc_base/testbase64.h" +#include "rtc_base/test_base64.h" #include "test/gtest.h" namespace rtc { diff --git a/rtc_base/bind_unittest.cc b/rtc_base/bind_unittest.cc index f0c6801bed..a62e5479df 100644 --- a/rtc_base/bind_unittest.cc +++ b/rtc_base/bind_unittest.cc @@ -11,8 +11,8 @@ #include #include "rtc_base/bind.h" -#include "rtc_base/refcount.h" -#include "rtc_base/refcountedobject.h" +#include "rtc_base/ref_count.h" +#include "rtc_base/ref_counted_object.h" #include "test/gtest.h" namespace rtc { diff --git a/rtc_base/bit_buffer.cc b/rtc_base/bit_buffer.cc index be72d558f1..59b71fcb44 100644 --- a/rtc_base/bit_buffer.cc +++ b/rtc_base/bit_buffer.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "rtc_base/bitbuffer.h" +#include "rtc_base/bit_buffer.h" #include #include diff --git a/rtc_base/bit_buffer.h b/rtc_base/bit_buffer.h index ba96a129a4..b03677c20a 100644 --- a/rtc_base/bit_buffer.h +++ b/rtc_base/bit_buffer.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef RTC_BASE_BITBUFFER_H_ -#define RTC_BASE_BITBUFFER_H_ +#ifndef RTC_BASE_BIT_BUFFER_H_ +#define RTC_BASE_BIT_BUFFER_H_ #include // For size_t. #include // For integer types. -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace rtc { @@ -123,4 +123,4 @@ class BitBufferWriter : public BitBuffer { } // namespace rtc -#endif // RTC_BASE_BITBUFFER_H_ +#endif // RTC_BASE_BIT_BUFFER_H_ diff --git a/rtc_base/bit_buffer_unittest.cc b/rtc_base/bit_buffer_unittest.cc index 0696c42480..20c0049cb8 100644 --- a/rtc_base/bit_buffer_unittest.cc +++ b/rtc_base/bit_buffer_unittest.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "rtc_base/bitbuffer.h" +#include "rtc_base/bit_buffer.h" #include #include "rtc_base/arraysize.h" -#include "rtc_base/bytebuffer.h" +#include "rtc_base/byte_buffer.h" #include "test/gtest.h" namespace rtc { diff --git a/rtc_base/bitrate_allocation_strategy.cc b/rtc_base/bitrate_allocation_strategy.cc index 46e66741e0..af40af4385 100644 --- a/rtc_base/bitrate_allocation_strategy.cc +++ b/rtc_base/bitrate_allocation_strategy.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "rtc_base/bitrateallocationstrategy.h" +#include "rtc_base/bitrate_allocation_strategy.h" #include #include diff --git a/rtc_base/bitrate_allocation_strategy.h b/rtc_base/bitrate_allocation_strategy.h index 13a4eee524..fc54373b4d 100644 --- a/rtc_base/bitrate_allocation_strategy.h +++ b/rtc_base/bitrate_allocation_strategy.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef RTC_BASE_BITRATEALLOCATIONSTRATEGY_H_ -#define RTC_BASE_BITRATEALLOCATIONSTRATEGY_H_ +#ifndef RTC_BASE_BITRATE_ALLOCATION_STRATEGY_H_ +#define RTC_BASE_BITRATE_ALLOCATION_STRATEGY_H_ #include #include @@ -117,4 +117,4 @@ class AudioPriorityBitrateAllocationStrategy }; } // namespace rtc -#endif // RTC_BASE_BITRATEALLOCATIONSTRATEGY_H_ +#endif // RTC_BASE_BITRATE_ALLOCATION_STRATEGY_H_ diff --git a/rtc_base/bitrate_allocation_strategy_unittest.cc b/rtc_base/bitrate_allocation_strategy_unittest.cc index 618a603efe..aea3966f48 100644 --- a/rtc_base/bitrate_allocation_strategy_unittest.cc +++ b/rtc_base/bitrate_allocation_strategy_unittest.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "rtc_base/bitrateallocationstrategy.h" +#include "rtc_base/bitrate_allocation_strategy.h" #include diff --git a/rtc_base/buffer_queue.cc b/rtc_base/buffer_queue.cc index 74f7a502c0..8f3ead9348 100644 --- a/rtc_base/buffer_queue.cc +++ b/rtc_base/buffer_queue.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "rtc_base/bufferqueue.h" +#include "rtc_base/buffer_queue.h" #include #include diff --git a/rtc_base/buffer_queue.h b/rtc_base/buffer_queue.h index 63f5182509..bce3c8ae46 100644 --- a/rtc_base/buffer_queue.h +++ b/rtc_base/buffer_queue.h @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef RTC_BASE_BUFFERQUEUE_H_ -#define RTC_BASE_BUFFERQUEUE_H_ +#ifndef RTC_BASE_BUFFER_QUEUE_H_ +#define RTC_BASE_BUFFER_QUEUE_H_ #include #include #include #include "rtc_base/buffer.h" -#include "rtc_base/constructormagic.h" -#include "rtc_base/criticalsection.h" +#include "rtc_base/constructor_magic.h" +#include "rtc_base/critical_section.h" #include "rtc_base/thread_annotations.h" namespace rtc { @@ -60,4 +60,4 @@ class BufferQueue { } // namespace rtc -#endif // RTC_BASE_BUFFERQUEUE_H_ +#endif // RTC_BASE_BUFFER_QUEUE_H_ diff --git a/rtc_base/buffer_queue_unittest.cc b/rtc_base/buffer_queue_unittest.cc index d21e22e7b7..2a2f8cc4db 100644 --- a/rtc_base/buffer_queue_unittest.cc +++ b/rtc_base/buffer_queue_unittest.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "rtc_base/bufferqueue.h" +#include "rtc_base/buffer_queue.h" #include diff --git a/rtc_base/byte_buffer.cc b/rtc_base/byte_buffer.cc index f8ce1a29ef..9f7912094e 100644 --- a/rtc_base/byte_buffer.cc +++ b/rtc_base/byte_buffer.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "rtc_base/bytebuffer.h" +#include "rtc_base/byte_buffer.h" #include diff --git a/rtc_base/byte_buffer.h b/rtc_base/byte_buffer.h index 4d25c21050..73e904055d 100644 --- a/rtc_base/byte_buffer.h +++ b/rtc_base/byte_buffer.h @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef RTC_BASE_BYTEBUFFER_H_ -#define RTC_BASE_BYTEBUFFER_H_ +#ifndef RTC_BASE_BYTE_BUFFER_H_ +#define RTC_BASE_BYTE_BUFFER_H_ #include #include #include #include "rtc_base/buffer.h" -#include "rtc_base/byteorder.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/byte_order.h" +#include "rtc_base/constructor_magic.h" namespace rtc { @@ -201,4 +201,4 @@ class ByteBufferReader : public ByteBuffer { } // namespace rtc -#endif // RTC_BASE_BYTEBUFFER_H_ +#endif // RTC_BASE_BYTE_BUFFER_H_ diff --git a/rtc_base/byte_buffer_unittest.cc b/rtc_base/byte_buffer_unittest.cc index 8fb02fffae..eafe670958 100644 --- a/rtc_base/byte_buffer_unittest.cc +++ b/rtc_base/byte_buffer_unittest.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "rtc_base/bytebuffer.h" +#include "rtc_base/byte_buffer.h" #include #include "rtc_base/arraysize.h" -#include "rtc_base/byteorder.h" +#include "rtc_base/byte_order.h" #include "test/gtest.h" namespace rtc { diff --git a/rtc_base/byte_order.h b/rtc_base/byte_order.h index 86546a5ca3..2b50f0d3d0 100644 --- a/rtc_base/byte_order.h +++ b/rtc_base/byte_order.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef RTC_BASE_BYTEORDER_H_ -#define RTC_BASE_BYTEORDER_H_ +#ifndef RTC_BASE_BYTE_ORDER_H_ +#define RTC_BASE_BYTE_ORDER_H_ #include @@ -177,4 +177,4 @@ inline uint64_t NetworkToHost64(uint64_t n) { } // namespace rtc -#endif // RTC_BASE_BYTEORDER_H_ +#endif // RTC_BASE_BYTE_ORDER_H_ diff --git a/rtc_base/byte_order_unittest.cc b/rtc_base/byte_order_unittest.cc index 7aac17b08d..82b5fe98c4 100644 --- a/rtc_base/byte_order_unittest.cc +++ b/rtc_base/byte_order_unittest.cc @@ -10,7 +10,7 @@ #include -#include "rtc_base/byteorder.h" +#include "rtc_base/byte_order.h" #include "test/gtest.h" namespace rtc { diff --git a/rtc_base/callback.h b/rtc_base/callback.h index 65b7c9cdf3..bead5f42d3 100644 --- a/rtc_base/callback.h +++ b/rtc_base/callback.h @@ -62,8 +62,8 @@ #ifndef RTC_BASE_CALLBACK_H_ #define RTC_BASE_CALLBACK_H_ -#include "rtc_base/refcount.h" -#include "rtc_base/refcountedobject.h" +#include "rtc_base/ref_count.h" +#include "rtc_base/ref_counted_object.h" #include "rtc_base/scoped_ref_ptr.h" namespace rtc { diff --git a/rtc_base/callback.h.pump b/rtc_base/callback.h.pump index 2c40eabb07..a8a3faa472 100644 --- a/rtc_base/callback.h.pump +++ b/rtc_base/callback.h.pump @@ -57,8 +57,8 @@ #ifndef RTC_BASE_CALLBACK_H_ #define RTC_BASE_CALLBACK_H_ -#include "rtc_base/refcount.h" -#include "rtc_base/refcountedobject.h" +#include "rtc_base/ref_count.h" +#include "rtc_base/ref_counted_object.h" #include "rtc_base/scoped_ref_ptr.h" namespace rtc { diff --git a/rtc_base/callback_unittest.cc b/rtc_base/callback_unittest.cc index 54480bdc2f..876729570c 100644 --- a/rtc_base/callback_unittest.cc +++ b/rtc_base/callback_unittest.cc @@ -12,7 +12,7 @@ #include "rtc_base/bind.h" #include "rtc_base/keep_ref_until_done.h" -#include "rtc_base/refcount.h" +#include "rtc_base/ref_count.h" #include "test/gtest.h" namespace rtc { diff --git a/rtc_base/cancelable_task_handle.cc b/rtc_base/cancelable_task_handle.cc index 2267242b63..06c3e80e92 100644 --- a/rtc_base/cancelable_task_handle.cc +++ b/rtc_base/cancelable_task_handle.cc @@ -13,8 +13,8 @@ #include #include "rtc_base/checks.h" -#include "rtc_base/refcount.h" -#include "rtc_base/refcounter.h" +#include "rtc_base/ref_count.h" +#include "rtc_base/ref_counter.h" #include "rtc_base/sequenced_task_checker.h" #include "rtc_base/thread_annotations.h" #include "rtc_base/thread_checker.h" diff --git a/rtc_base/constructor_magic.h b/rtc_base/constructor_magic.h index 6b6e83cb47..e63c2ff628 100644 --- a/rtc_base/constructor_magic.h +++ b/rtc_base/constructor_magic.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef RTC_BASE_CONSTRUCTORMAGIC_H_ -#define RTC_BASE_CONSTRUCTORMAGIC_H_ +#ifndef RTC_BASE_CONSTRUCTOR_MAGIC_H_ +#define RTC_BASE_CONSTRUCTOR_MAGIC_H_ // Put this in the declarations for a class to be unassignable. #define RTC_DISALLOW_ASSIGN(TypeName) \ @@ -31,4 +31,4 @@ TypeName() = delete; \ RTC_DISALLOW_COPY_AND_ASSIGN(TypeName) -#endif // RTC_BASE_CONSTRUCTORMAGIC_H_ +#endif // RTC_BASE_CONSTRUCTOR_MAGIC_H_ diff --git a/rtc_base/copy_on_write_buffer.cc b/rtc_base/copy_on_write_buffer.cc index 8f5126a282..de003f2d8e 100644 --- a/rtc_base/copy_on_write_buffer.cc +++ b/rtc_base/copy_on_write_buffer.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "rtc_base/copyonwritebuffer.h" +#include "rtc_base/copy_on_write_buffer.h" #include diff --git a/rtc_base/copy_on_write_buffer.h b/rtc_base/copy_on_write_buffer.h index cc174dfc7c..e055f8dcce 100644 --- a/rtc_base/copy_on_write_buffer.h +++ b/rtc_base/copy_on_write_buffer.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef RTC_BASE_COPYONWRITEBUFFER_H_ -#define RTC_BASE_COPYONWRITEBUFFER_H_ +#ifndef RTC_BASE_COPY_ON_WRITE_BUFFER_H_ +#define RTC_BASE_COPY_ON_WRITE_BUFFER_H_ #include #include @@ -20,7 +20,7 @@ #include "rtc_base/buffer.h" #include "rtc_base/checks.h" -#include "rtc_base/refcountedobject.h" +#include "rtc_base/ref_counted_object.h" #include "rtc_base/scoped_ref_ptr.h" namespace rtc { @@ -243,4 +243,4 @@ class CopyOnWriteBuffer { } // namespace rtc -#endif // RTC_BASE_COPYONWRITEBUFFER_H_ +#endif // RTC_BASE_COPY_ON_WRITE_BUFFER_H_ diff --git a/rtc_base/copy_on_write_buffer_unittest.cc b/rtc_base/copy_on_write_buffer_unittest.cc index 90626111f4..fc569bdd62 100644 --- a/rtc_base/copy_on_write_buffer_unittest.cc +++ b/rtc_base/copy_on_write_buffer_unittest.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "rtc_base/copyonwritebuffer.h" +#include "rtc_base/copy_on_write_buffer.h" #include diff --git a/rtc_base/cpu_time.cc b/rtc_base/cpu_time.cc index 13a68db331..b95bcb136e 100644 --- a/rtc_base/cpu_time.cc +++ b/rtc_base/cpu_time.cc @@ -11,7 +11,7 @@ #include "rtc_base/cpu_time.h" #include "rtc_base/logging.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/time_utils.h" #if defined(WEBRTC_LINUX) #include diff --git a/rtc_base/cpu_time_unittest.cc b/rtc_base/cpu_time_unittest.cc index d362506ab1..b5e0f67c00 100644 --- a/rtc_base/cpu_time_unittest.cc +++ b/rtc_base/cpu_time_unittest.cc @@ -11,7 +11,7 @@ #include "rtc_base/cpu_time.h" #include "rtc_base/platform_thread.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/time_utils.h" #include "system_wrappers/include/sleep.h" #include "test/gtest.h" diff --git a/rtc_base/critical_section.cc b/rtc_base/critical_section.cc index 4e00be968d..72a238f2f0 100644 --- a/rtc_base/critical_section.cc +++ b/rtc_base/critical_section.cc @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "rtc_base/criticalsection.h" +#include "rtc_base/critical_section.h" #include -#include "rtc_base/atomicops.h" +#include "rtc_base/atomic_ops.h" #include "rtc_base/checks.h" #include "rtc_base/platform_thread_types.h" #include "rtc_base/system/unused.h" diff --git a/rtc_base/critical_section.h b/rtc_base/critical_section.h index f25e7d0c10..f744a5ea71 100644 --- a/rtc_base/critical_section.h +++ b/rtc_base/critical_section.h @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef RTC_BASE_CRITICALSECTION_H_ -#define RTC_BASE_CRITICALSECTION_H_ +#ifndef RTC_BASE_CRITICAL_SECTION_H_ +#define RTC_BASE_CRITICAL_SECTION_H_ #include "rtc_base/checks.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" #include "rtc_base/platform_thread_types.h" #include "rtc_base/thread_annotations.h" @@ -157,4 +157,4 @@ class RTC_SCOPED_LOCKABLE GlobalLockScope { } // namespace rtc -#endif // RTC_BASE_CRITICALSECTION_H_ +#endif // RTC_BASE_CRITICAL_SECTION_H_ diff --git a/rtc_base/critical_section_unittest.cc b/rtc_base/critical_section_unittest.cc index 6357736c82..e988046c26 100644 --- a/rtc_base/critical_section_unittest.cc +++ b/rtc_base/critical_section_unittest.cc @@ -16,13 +16,13 @@ #include #include "rtc_base/arraysize.h" -#include "rtc_base/atomicops.h" +#include "rtc_base/atomic_ops.h" #include "rtc_base/checks.h" -#include "rtc_base/criticalsection.h" +#include "rtc_base/critical_section.h" #include "rtc_base/event.h" #include "rtc_base/location.h" -#include "rtc_base/messagehandler.h" -#include "rtc_base/messagequeue.h" +#include "rtc_base/message_handler.h" +#include "rtc_base/message_queue.h" #include "rtc_base/platform_thread.h" #include "rtc_base/thread.h" #include "test/gtest.h" diff --git a/rtc_base/crypt_string.cc b/rtc_base/crypt_string.cc index 2c7c0c72af..3238255de6 100644 --- a/rtc_base/crypt_string.cc +++ b/rtc_base/crypt_string.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "rtc_base/cryptstring.h" +#include "rtc_base/crypt_string.h" namespace rtc { diff --git a/rtc_base/crypt_string.h b/rtc_base/crypt_string.h index d0e36cb169..8aa757cdb5 100644 --- a/rtc_base/crypt_string.h +++ b/rtc_base/crypt_string.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef RTC_BASE_CRYPTSTRING_H_ -#define RTC_BASE_CRYPTSTRING_H_ +#ifndef RTC_BASE_CRYPT_STRING_H_ +#define RTC_BASE_CRYPT_STRING_H_ #include @@ -83,4 +83,4 @@ class InsecureCryptStringImpl : public CryptStringImpl { } // namespace rtc -#endif // RTC_BASE_CRYPTSTRING_H_ +#endif // RTC_BASE_CRYPT_STRING_H_ diff --git a/rtc_base/event_tracer.cc b/rtc_base/event_tracer.cc index af88c9ddd4..bcc8252f47 100644 --- a/rtc_base/event_tracer.cc +++ b/rtc_base/event_tracer.cc @@ -16,16 +16,16 @@ #include #include -#include "rtc_base/atomicops.h" +#include "rtc_base/atomic_ops.h" #include "rtc_base/checks.h" -#include "rtc_base/criticalsection.h" +#include "rtc_base/critical_section.h" #include "rtc_base/event.h" #include "rtc_base/logging.h" #include "rtc_base/platform_thread.h" #include "rtc_base/platform_thread_types.h" #include "rtc_base/thread_annotations.h" #include "rtc_base/thread_checker.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/time_utils.h" #include "rtc_base/trace_event.h" // This is a guesstimate that should be enough in most cases. diff --git a/rtc_base/fake_clock.cc b/rtc_base/fake_clock.cc index f63b85c480..6b7d96b597 100644 --- a/rtc_base/fake_clock.cc +++ b/rtc_base/fake_clock.cc @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "rtc_base/fakeclock.h" +#include "rtc_base/fake_clock.h" #include "rtc_base/checks.h" -#include "rtc_base/messagequeue.h" +#include "rtc_base/message_queue.h" namespace rtc { diff --git a/rtc_base/fake_clock.h b/rtc_base/fake_clock.h index 5a0bbeed91..5ccf370b42 100644 --- a/rtc_base/fake_clock.h +++ b/rtc_base/fake_clock.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef RTC_BASE_FAKECLOCK_H_ -#define RTC_BASE_FAKECLOCK_H_ +#ifndef RTC_BASE_FAKE_CLOCK_H_ +#define RTC_BASE_FAKE_CLOCK_H_ #include #include "api/units/time_delta.h" -#include "rtc_base/criticalsection.h" +#include "rtc_base/critical_section.h" #include "rtc_base/thread_annotations.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/time_utils.h" namespace rtc { @@ -72,4 +72,4 @@ class ScopedRealClock { } // namespace rtc -#endif // RTC_BASE_FAKECLOCK_H_ +#endif // RTC_BASE_FAKE_CLOCK_H_ diff --git a/rtc_base/fake_network.h b/rtc_base/fake_network.h index 98c62174f8..196d43ec65 100644 --- a/rtc_base/fake_network.h +++ b/rtc_base/fake_network.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef RTC_BASE_FAKENETWORK_H_ -#define RTC_BASE_FAKENETWORK_H_ +#ifndef RTC_BASE_FAKE_NETWORK_H_ +#define RTC_BASE_FAKE_NETWORK_H_ #include #include @@ -19,10 +19,10 @@ #include "absl/memory/memory.h" #include "rtc_base/checks.h" #include "rtc_base/fake_mdns_responder.h" -#include "rtc_base/messagehandler.h" +#include "rtc_base/message_handler.h" #include "rtc_base/network.h" -#include "rtc_base/socketaddress.h" -#include "rtc_base/stringencode.h" +#include "rtc_base/socket_address.h" +#include "rtc_base/string_encode.h" #include "rtc_base/thread.h" namespace rtc { @@ -139,4 +139,4 @@ class FakeNetworkManager : public NetworkManagerBase, public MessageHandler { } // namespace rtc -#endif // RTC_BASE_FAKENETWORK_H_ +#endif // RTC_BASE_FAKE_NETWORK_H_ diff --git a/rtc_base/fake_ssl_identity.cc b/rtc_base/fake_ssl_identity.cc index 47996791a9..8607e0ac82 100644 --- a/rtc_base/fake_ssl_identity.cc +++ b/rtc_base/fake_ssl_identity.cc @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "rtc_base/fakesslidentity.h" +#include "rtc_base/fake_ssl_identity.h" #include #include #include "absl/memory/memory.h" #include "rtc_base/checks.h" -#include "rtc_base/messagedigest.h" +#include "rtc_base/message_digest.h" namespace rtc { diff --git a/rtc_base/fake_ssl_identity.h b/rtc_base/fake_ssl_identity.h index b19cbfbb49..c3a8d1f171 100644 --- a/rtc_base/fake_ssl_identity.h +++ b/rtc_base/fake_ssl_identity.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef RTC_BASE_FAKESSLIDENTITY_H_ -#define RTC_BASE_FAKESSLIDENTITY_H_ +#ifndef RTC_BASE_FAKE_SSL_IDENTITY_H_ +#define RTC_BASE_FAKE_SSL_IDENTITY_H_ #include #include -#include "rtc_base/sslcertificate.h" -#include "rtc_base/sslidentity.h" +#include "rtc_base/ssl_certificate.h" +#include "rtc_base/ssl_identity.h" namespace rtc { @@ -78,4 +78,4 @@ class FakeSSLIdentity : public SSLIdentity { } // namespace rtc -#endif // RTC_BASE_FAKESSLIDENTITY_H_ +#endif // RTC_BASE_FAKE_SSL_IDENTITY_H_ diff --git a/rtc_base/file.h b/rtc_base/file.h index bc0974ae2a..42428fa103 100644 --- a/rtc_base/file.h +++ b/rtc_base/file.h @@ -15,7 +15,7 @@ #include #include -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" #include "rtc_base/platform_file.h" namespace rtc { diff --git a/rtc_base/file_rotating_stream.cc b/rtc_base/file_rotating_stream.cc index fc87acbf10..01429b6629 100644 --- a/rtc_base/file_rotating_stream.cc +++ b/rtc_base/file_rotating_stream.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "rtc_base/filerotatingstream.h" +#include "rtc_base/file_rotating_stream.h" #include #include @@ -17,7 +17,7 @@ #if defined(WEBRTC_WIN) #include -#include "rtc_base/stringutils.h" +#include "rtc_base/string_utils.h" #else #include #include diff --git a/rtc_base/file_rotating_stream.h b/rtc_base/file_rotating_stream.h index 5560f3b744..bda1ee16ba 100644 --- a/rtc_base/file_rotating_stream.h +++ b/rtc_base/file_rotating_stream.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef RTC_BASE_FILEROTATINGSTREAM_H_ -#define RTC_BASE_FILEROTATINGSTREAM_H_ +#ifndef RTC_BASE_FILE_ROTATING_STREAM_H_ +#define RTC_BASE_FILE_ROTATING_STREAM_H_ #include #include #include #include -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" #include "rtc_base/stream.h" namespace rtc { @@ -178,4 +178,4 @@ class CallSessionFileRotatingStreamReader : public FileRotatingStreamReader { } // namespace rtc -#endif // RTC_BASE_FILEROTATINGSTREAM_H_ +#endif // RTC_BASE_FILE_ROTATING_STREAM_H_ diff --git a/rtc_base/file_rotating_stream_unittest.cc b/rtc_base/file_rotating_stream_unittest.cc index 63ddc96975..214cde95ba 100644 --- a/rtc_base/file_rotating_stream_unittest.cc +++ b/rtc_base/file_rotating_stream_unittest.cc @@ -13,9 +13,9 @@ #include #include "rtc_base/arraysize.h" -#include "rtc_base/filerotatingstream.h" +#include "rtc_base/file_rotating_stream.h" #include "test/gtest.h" -#include "test/testsupport/fileutils.h" +#include "test/testsupport/file_utils.h" namespace rtc { diff --git a/rtc_base/file_unittest.cc b/rtc_base/file_unittest.cc index 151771b647..bd3a61b555 100644 --- a/rtc_base/file_unittest.cc +++ b/rtc_base/file_unittest.cc @@ -13,7 +13,7 @@ #include "rtc_base/file.h" #include "test/gtest.h" -#include "test/testsupport/fileutils.h" +#include "test/testsupport/file_utils.h" #if defined(WEBRTC_WIN) diff --git a/rtc_base/firewall_socket_server.cc b/rtc_base/firewall_socket_server.cc index 0552481bf2..ec5a85709e 100644 --- a/rtc_base/firewall_socket_server.cc +++ b/rtc_base/firewall_socket_server.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "rtc_base/firewallsocketserver.h" +#include "rtc_base/firewall_socket_server.h" #include #include @@ -16,7 +16,7 @@ #include #include -#include "rtc_base/asyncsocket.h" +#include "rtc_base/async_socket.h" #include "rtc_base/checks.h" #include "rtc_base/logging.h" diff --git a/rtc_base/firewall_socket_server.h b/rtc_base/firewall_socket_server.h index 64a4311124..9536bd2aca 100644 --- a/rtc_base/firewall_socket_server.h +++ b/rtc_base/firewall_socket_server.h @@ -8,17 +8,17 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef RTC_BASE_FIREWALLSOCKETSERVER_H_ -#define RTC_BASE_FIREWALLSOCKETSERVER_H_ +#ifndef RTC_BASE_FIREWALL_SOCKET_SERVER_H_ +#define RTC_BASE_FIREWALL_SOCKET_SERVER_H_ #include -#include "rtc_base/asyncsocket.h" -#include "rtc_base/criticalsection.h" -#include "rtc_base/ipaddress.h" +#include "rtc_base/async_socket.h" +#include "rtc_base/critical_section.h" +#include "rtc_base/ip_address.h" #include "rtc_base/socket.h" -#include "rtc_base/socketaddress.h" -#include "rtc_base/socketserver.h" +#include "rtc_base/socket_address.h" +#include "rtc_base/socket_server.h" namespace rtc { @@ -129,4 +129,4 @@ class FirewallManager { } // namespace rtc -#endif // RTC_BASE_FIREWALLSOCKETSERVER_H_ +#endif // RTC_BASE_FIREWALL_SOCKET_SERVER_H_ diff --git a/rtc_base/flags.cc b/rtc_base/flags.cc index bcce0dafbc..6a87eb4b7b 100644 --- a/rtc_base/flags.cc +++ b/rtc_base/flags.cc @@ -23,7 +23,7 @@ #include // must come after windows.h // clang-format on -#include "rtc_base/stringutils.h" // For ToUtf8 +#include "rtc_base/string_utils.h" // For ToUtf8 #endif namespace { diff --git a/rtc_base/flags.h b/rtc_base/flags.h index a08bfd29b8..e152e2a979 100644 --- a/rtc_base/flags.h +++ b/rtc_base/flags.h @@ -25,7 +25,7 @@ #include "rtc_base/checks.h" #if defined(WEBRTC_WIN) -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" #endif namespace rtc { diff --git a/rtc_base/gunit.h b/rtc_base/gunit.h index 7f23fbb3f7..d49912524c 100644 --- a/rtc_base/gunit.h +++ b/rtc_base/gunit.h @@ -11,7 +11,7 @@ #ifndef RTC_BASE_GUNIT_H_ #define RTC_BASE_GUNIT_H_ -#include "rtc_base/fakeclock.h" +#include "rtc_base/fake_clock.h" #include "rtc_base/logging.h" #include "rtc_base/thread.h" #include "test/gtest.h" diff --git a/rtc_base/http_common.cc b/rtc_base/http_common.cc index 4640363b69..0456eeaa1c 100644 --- a/rtc_base/http_common.cc +++ b/rtc_base/http_common.cc @@ -25,11 +25,11 @@ #include #include "absl/strings/match.h" -#include "rtc_base/cryptstring.h" // for CryptString -#include "rtc_base/httpcommon.h" +#include "rtc_base/crypt_string.h" // for CryptString +#include "rtc_base/http_common.h" #include "rtc_base/logging.h" -#include "rtc_base/messagedigest.h" -#include "rtc_base/socketaddress.h" +#include "rtc_base/message_digest.h" +#include "rtc_base/socket_address.h" #include "rtc_base/strings/string_builder.h" #include "rtc_base/third_party/base64/base64.h" // for Base64 #include "rtc_base/zero_memory.h" // for ExplicitZeroMemory diff --git a/rtc_base/http_common.h b/rtc_base/http_common.h index fbad280e02..edf161fb4c 100644 --- a/rtc_base/http_common.h +++ b/rtc_base/http_common.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef RTC_BASE_HTTPCOMMON_H_ -#define RTC_BASE_HTTPCOMMON_H_ +#ifndef RTC_BASE_HTTP_COMMON_H_ +#define RTC_BASE_HTTP_COMMON_H_ #include @@ -49,4 +49,4 @@ HttpAuthResult HttpAuthenticate(const char* challenge, } // namespace rtc -#endif // RTC_BASE_HTTPCOMMON_H_ +#endif // RTC_BASE_HTTP_COMMON_H_ diff --git a/rtc_base/ifaddrs_android.cc b/rtc_base/ifaddrs_android.cc index cc6cdab12c..94b866990b 100644 --- a/rtc_base/ifaddrs_android.cc +++ b/rtc_base/ifaddrs_android.cc @@ -9,7 +9,7 @@ */ #if defined(WEBRTC_ANDROID) -#include "rtc_base/ifaddrs-android.h" +#include "rtc_base/ifaddrs_android.h" #include #include #include diff --git a/rtc_base/ifaddrs_converter.h b/rtc_base/ifaddrs_converter.h index 35bef5b004..bd6957d01e 100644 --- a/rtc_base/ifaddrs_converter.h +++ b/rtc_base/ifaddrs_converter.h @@ -12,12 +12,12 @@ #define RTC_BASE_IFADDRS_CONVERTER_H_ #if defined(WEBRTC_ANDROID) -#include "rtc_base/ifaddrs-android.h" +#include "rtc_base/ifaddrs_android.h" #else #include #endif // WEBRTC_ANDROID -#include "rtc_base/ipaddress.h" +#include "rtc_base/ip_address.h" namespace rtc { diff --git a/rtc_base/ip_address.cc b/rtc_base/ip_address.cc index 027a7b219e..ff0be13136 100644 --- a/rtc_base/ip_address.cc +++ b/rtc_base/ip_address.cc @@ -20,10 +20,10 @@ #include #endif -#include "rtc_base/byteorder.h" -#include "rtc_base/ipaddress.h" -#include "rtc_base/nethelpers.h" -#include "rtc_base/stringutils.h" +#include "rtc_base/byte_order.h" +#include "rtc_base/ip_address.h" +#include "rtc_base/net_helpers.h" +#include "rtc_base/string_utils.h" #if defined(WEBRTC_WIN) #include "rtc_base/win32.h" diff --git a/rtc_base/ip_address.h b/rtc_base/ip_address.h index 8189d1fe2f..49dea681bf 100644 --- a/rtc_base/ip_address.h +++ b/rtc_base/ip_address.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef RTC_BASE_IPADDRESS_H_ -#define RTC_BASE_IPADDRESS_H_ +#ifndef RTC_BASE_IP_ADDRESS_H_ +#define RTC_BASE_IP_ADDRESS_H_ #if defined(WEBRTC_POSIX) #include @@ -24,7 +24,7 @@ #include #include -#include "rtc_base/byteorder.h" +#include "rtc_base/byte_order.h" #if defined(WEBRTC_WIN) #include "rtc_base/win32.h" #endif @@ -189,4 +189,4 @@ int CountIPMaskBits(IPAddress mask); } // namespace rtc -#endif // RTC_BASE_IPADDRESS_H_ +#endif // RTC_BASE_IP_ADDRESS_H_ diff --git a/rtc_base/ip_address_unittest.cc b/rtc_base/ip_address_unittest.cc index 6ac1a40c04..c93244dcb6 100644 --- a/rtc_base/ip_address_unittest.cc +++ b/rtc_base/ip_address_unittest.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "rtc_base/ipaddress.h" +#include "rtc_base/ip_address.h" #include "test/gtest.h" diff --git a/rtc_base/keep_ref_until_done.h b/rtc_base/keep_ref_until_done.h index 9ba0e879eb..feb1e90328 100644 --- a/rtc_base/keep_ref_until_done.h +++ b/rtc_base/keep_ref_until_done.h @@ -13,7 +13,7 @@ #include "rtc_base/bind.h" #include "rtc_base/callback.h" -#include "rtc_base/refcount.h" +#include "rtc_base/ref_count.h" #include "rtc_base/scoped_ref_ptr.h" namespace rtc { diff --git a/rtc_base/key_derivation.h b/rtc_base/key_derivation.h index d98c66741a..f35e7ff990 100644 --- a/rtc_base/key_derivation.h +++ b/rtc_base/key_derivation.h @@ -18,7 +18,7 @@ #include "absl/types/optional.h" #include "api/array_view.h" #include "rtc_base/buffer.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace rtc { diff --git a/rtc_base/log_sinks.cc b/rtc_base/log_sinks.cc index c01bafbdd2..db12e9f09b 100644 --- a/rtc_base/log_sinks.cc +++ b/rtc_base/log_sinks.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 #include diff --git a/rtc_base/log_sinks.h b/rtc_base/log_sinks.h index d0867a2202..9e3574876a 100644 --- a/rtc_base/log_sinks.h +++ b/rtc_base/log_sinks.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef RTC_BASE_LOGSINKS_H_ -#define RTC_BASE_LOGSINKS_H_ +#ifndef RTC_BASE_LOG_SINKS_H_ +#define RTC_BASE_LOG_SINKS_H_ #include #include #include -#include "rtc_base/constructormagic.h" -#include "rtc_base/filerotatingstream.h" +#include "rtc_base/constructor_magic.h" +#include "rtc_base/file_rotating_stream.h" #include "rtc_base/logging.h" namespace rtc { @@ -69,4 +69,4 @@ class CallSessionFileRotatingLogSink : public FileRotatingLogSink { } // namespace rtc -#endif // RTC_BASE_LOGSINKS_H_ +#endif // RTC_BASE_LOG_SINKS_H_ diff --git a/rtc_base/logging.cc b/rtc_base/logging.cc index f7b06277e5..74128fb8d6 100644 --- a/rtc_base/logging.cc +++ b/rtc_base/logging.cc @@ -35,14 +35,14 @@ static const int kMaxLogLineSize = 1024 - 60; #include #include "rtc_base/checks.h" -#include "rtc_base/criticalsection.h" +#include "rtc_base/critical_section.h" #include "rtc_base/logging.h" #include "rtc_base/platform_thread_types.h" -#include "rtc_base/stringencode.h" +#include "rtc_base/string_encode.h" +#include "rtc_base/string_utils.h" #include "rtc_base/strings/string_builder.h" -#include "rtc_base/stringutils.h" #include "rtc_base/thread_annotations.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/time_utils.h" namespace rtc { namespace { diff --git a/rtc_base/logging.h b/rtc_base/logging.h index 6dd264834f..b46aa2dd7b 100644 --- a/rtc_base/logging.h +++ b/rtc_base/logging.h @@ -52,7 +52,7 @@ #include #include "absl/strings/string_view.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" #include "rtc_base/deprecation.h" #include "rtc_base/strings/string_builder.h" #include "rtc_base/system/inline.h" diff --git a/rtc_base/logging_unittest.cc b/rtc_base/logging_unittest.cc index a7945f2f91..bbeac444ed 100644 --- a/rtc_base/logging_unittest.cc +++ b/rtc_base/logging_unittest.cc @@ -18,7 +18,7 @@ #include "rtc_base/event.h" #include "rtc_base/platform_thread.h" #include "rtc_base/stream.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/time_utils.h" #include "test/gtest.h" namespace rtc { diff --git a/rtc_base/mac_utils.cc b/rtc_base/mac_utils.cc index 67fb69ca60..390f183c5c 100644 --- a/rtc_base/mac_utils.cc +++ b/rtc_base/mac_utils.cc @@ -15,7 +15,7 @@ #include "rtc_base/checks.h" #include "rtc_base/logging.h" -#include "rtc_base/macutils.h" +#include "rtc_base/mac_utils.h" namespace rtc { diff --git a/rtc_base/mac_utils.h b/rtc_base/mac_utils.h index b22e5f983a..ae97c3a6d5 100644 --- a/rtc_base/mac_utils.h +++ b/rtc_base/mac_utils.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef RTC_BASE_MACUTILS_H_ -#define RTC_BASE_MACUTILS_H_ +#ifndef RTC_BASE_MAC_UTILS_H_ +#define RTC_BASE_MAC_UTILS_H_ #include #include @@ -19,4 +19,4 @@ bool ToUtf8(const CFStringRef str16, std::string* str8); bool ToUtf16(const std::string& str8, CFStringRef* str16); } // namespace rtc -#endif // RTC_BASE_MACUTILS_H_ +#endif // RTC_BASE_MAC_UTILS_H_ diff --git a/rtc_base/mdns_responder_interface.h b/rtc_base/mdns_responder_interface.h index 71938b2576..96280a779e 100644 --- a/rtc_base/mdns_responder_interface.h +++ b/rtc_base/mdns_responder_interface.h @@ -14,7 +14,7 @@ #include #include -#include "rtc_base/ipaddress.h" +#include "rtc_base/ip_address.h" namespace webrtc { diff --git a/rtc_base/message_buffer_reader.h b/rtc_base/message_buffer_reader.h index baba89e014..32b8f336b1 100644 --- a/rtc_base/message_buffer_reader.h +++ b/rtc_base/message_buffer_reader.h @@ -11,7 +11,7 @@ #ifndef RTC_BASE_MESSAGE_BUFFER_READER_H_ #define RTC_BASE_MESSAGE_BUFFER_READER_H_ -#include "rtc_base/bytebuffer.h" +#include "rtc_base/byte_buffer.h" namespace webrtc { diff --git a/rtc_base/message_digest.cc b/rtc_base/message_digest.cc index 5a0d16a9a0..b1d4a489ec 100644 --- a/rtc_base/message_digest.cc +++ b/rtc_base/message_digest.cc @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "rtc_base/messagedigest.h" +#include "rtc_base/message_digest.h" #include #include #include -#include "rtc_base/openssldigest.h" -#include "rtc_base/stringencode.h" +#include "rtc_base/openssl_digest.h" +#include "rtc_base/string_encode.h" namespace rtc { diff --git a/rtc_base/message_digest.h b/rtc_base/message_digest.h index 757f914876..bbb22cf84e 100644 --- a/rtc_base/message_digest.h +++ b/rtc_base/message_digest.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef RTC_BASE_MESSAGEDIGEST_H_ -#define RTC_BASE_MESSAGEDIGEST_H_ +#ifndef RTC_BASE_MESSAGE_DIGEST_H_ +#define RTC_BASE_MESSAGE_DIGEST_H_ #include #include @@ -126,4 +126,4 @@ bool ComputeHmac(const std::string& alg, } // namespace rtc -#endif // RTC_BASE_MESSAGEDIGEST_H_ +#endif // RTC_BASE_MESSAGE_DIGEST_H_ diff --git a/rtc_base/message_digest_unittest.cc b/rtc_base/message_digest_unittest.cc index 623fafbed6..85e9bbde53 100644 --- a/rtc_base/message_digest_unittest.cc +++ b/rtc_base/message_digest_unittest.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "rtc_base/messagedigest.h" +#include "rtc_base/message_digest.h" -#include "rtc_base/stringencode.h" +#include "rtc_base/string_encode.h" #include "test/gtest.h" namespace rtc { diff --git a/rtc_base/message_handler.cc b/rtc_base/message_handler.cc index 7376defaf7..0e6c237a91 100644 --- a/rtc_base/message_handler.cc +++ b/rtc_base/message_handler.cc @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "rtc_base/messagehandler.h" -#include "rtc_base/messagequeue.h" +#include "rtc_base/message_handler.h" +#include "rtc_base/message_queue.h" namespace rtc { diff --git a/rtc_base/message_handler.h b/rtc_base/message_handler.h index 67a3103178..015255e4dc 100644 --- a/rtc_base/message_handler.h +++ b/rtc_base/message_handler.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef RTC_BASE_MESSAGEHANDLER_H_ -#define RTC_BASE_MESSAGEHANDLER_H_ +#ifndef RTC_BASE_MESSAGE_HANDLER_H_ +#define RTC_BASE_MESSAGE_HANDLER_H_ #include -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace rtc { @@ -67,4 +67,4 @@ class FunctorMessageHandler : public MessageHandler { } // namespace rtc -#endif // RTC_BASE_MESSAGEHANDLER_H_ +#endif // RTC_BASE_MESSAGE_HANDLER_H_ diff --git a/rtc_base/message_queue.cc b/rtc_base/message_queue.cc index 204952a7e2..abb01b3e9d 100644 --- a/rtc_base/message_queue.cc +++ b/rtc_base/message_queue.cc @@ -11,12 +11,12 @@ #include #include -#include "rtc_base/atomicops.h" +#include "rtc_base/atomic_ops.h" #include "rtc_base/checks.h" #include "rtc_base/logging.h" -#include "rtc_base/messagequeue.h" +#include "rtc_base/message_queue.h" #include "rtc_base/thread.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/time_utils.h" #include "rtc_base/trace_event.h" namespace rtc { diff --git a/rtc_base/message_queue.h b/rtc_base/message_queue.h index c1b9b5a916..e4845611b0 100644 --- a/rtc_base/message_queue.h +++ b/rtc_base/message_queue.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef RTC_BASE_MESSAGEQUEUE_H_ -#define RTC_BASE_MESSAGEQUEUE_H_ +#ifndef RTC_BASE_MESSAGE_QUEUE_H_ +#define RTC_BASE_MESSAGE_QUEUE_H_ #include @@ -19,12 +19,12 @@ #include #include -#include "rtc_base/constructormagic.h" -#include "rtc_base/criticalsection.h" +#include "rtc_base/constructor_magic.h" +#include "rtc_base/critical_section.h" #include "rtc_base/location.h" -#include "rtc_base/messagehandler.h" +#include "rtc_base/message_handler.h" #include "rtc_base/scoped_ref_ptr.h" -#include "rtc_base/socketserver.h" +#include "rtc_base/socket_server.h" #include "rtc_base/third_party/sigslot/sigslot.h" #include "rtc_base/thread_annotations.h" @@ -330,4 +330,4 @@ class MessageQueue { } // namespace rtc -#endif // RTC_BASE_MESSAGEQUEUE_H_ +#endif // RTC_BASE_MESSAGE_QUEUE_H_ diff --git a/rtc_base/message_queue_unittest.cc b/rtc_base/message_queue_unittest.cc index d04d753447..657949c2e3 100644 --- a/rtc_base/message_queue_unittest.cc +++ b/rtc_base/message_queue_unittest.cc @@ -8,20 +8,20 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "rtc_base/messagequeue.h" +#include "rtc_base/message_queue.h" #include -#include "rtc_base/atomicops.h" +#include "rtc_base/atomic_ops.h" #include "rtc_base/bind.h" #include "rtc_base/event.h" #include "rtc_base/gunit.h" #include "rtc_base/logging.h" -#include "rtc_base/nullsocketserver.h" -#include "rtc_base/refcount.h" -#include "rtc_base/refcountedobject.h" +#include "rtc_base/null_socket_server.h" +#include "rtc_base/ref_count.h" +#include "rtc_base/ref_counted_object.h" #include "rtc_base/thread.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/time_utils.h" namespace rtc { namespace { diff --git a/rtc_base/nat_server.cc b/rtc_base/nat_server.cc index b005ecae7a..2b614e8c9e 100644 --- a/rtc_base/nat_server.cc +++ b/rtc_base/nat_server.cc @@ -12,9 +12,9 @@ #include "rtc_base/checks.h" #include "rtc_base/logging.h" -#include "rtc_base/natserver.h" -#include "rtc_base/natsocketfactory.h" -#include "rtc_base/socketadapters.h" +#include "rtc_base/nat_server.h" +#include "rtc_base/nat_socket_factory.h" +#include "rtc_base/socket_adapters.h" namespace rtc { diff --git a/rtc_base/nat_server.h b/rtc_base/nat_server.h index d16b5370f0..46f01e9761 100644 --- a/rtc_base/nat_server.h +++ b/rtc_base/nat_server.h @@ -8,18 +8,18 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef RTC_BASE_NATSERVER_H_ -#define RTC_BASE_NATSERVER_H_ +#ifndef RTC_BASE_NAT_SERVER_H_ +#define RTC_BASE_NAT_SERVER_H_ #include #include -#include "rtc_base/asyncudpsocket.h" -#include "rtc_base/constructormagic.h" -#include "rtc_base/nattypes.h" -#include "rtc_base/proxyserver.h" -#include "rtc_base/socketaddresspair.h" -#include "rtc_base/socketfactory.h" +#include "rtc_base/async_udp_socket.h" +#include "rtc_base/constructor_magic.h" +#include "rtc_base/nat_types.h" +#include "rtc_base/proxy_server.h" +#include "rtc_base/socket_address_pair.h" +#include "rtc_base/socket_factory.h" #include "rtc_base/thread.h" namespace rtc { @@ -126,4 +126,4 @@ class NATServer : public sigslot::has_slots<> { } // namespace rtc -#endif // RTC_BASE_NATSERVER_H_ +#endif // RTC_BASE_NAT_SERVER_H_ diff --git a/rtc_base/nat_socket_factory.cc b/rtc_base/nat_socket_factory.cc index a707ce0259..6d44651eb4 100644 --- a/rtc_base/nat_socket_factory.cc +++ b/rtc_base/nat_socket_factory.cc @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "rtc_base/natsocketfactory.h" +#include "rtc_base/nat_socket_factory.h" #include "rtc_base/arraysize.h" #include "rtc_base/checks.h" #include "rtc_base/logging.h" -#include "rtc_base/natserver.h" -#include "rtc_base/virtualsocketserver.h" +#include "rtc_base/nat_server.h" +#include "rtc_base/virtual_socket_server.h" namespace rtc { diff --git a/rtc_base/nat_socket_factory.h b/rtc_base/nat_socket_factory.h index ecbd2f8d2e..9b5cb5a214 100644 --- a/rtc_base/nat_socket_factory.h +++ b/rtc_base/nat_socket_factory.h @@ -8,23 +8,23 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef RTC_BASE_NATSOCKETFACTORY_H_ -#define RTC_BASE_NATSOCKETFACTORY_H_ +#ifndef RTC_BASE_NAT_SOCKET_FACTORY_H_ +#define RTC_BASE_NAT_SOCKET_FACTORY_H_ #include #include #include #include -#include "rtc_base/asyncsocket.h" -#include "rtc_base/constructormagic.h" -#include "rtc_base/messagequeue.h" -#include "rtc_base/natserver.h" -#include "rtc_base/nattypes.h" +#include "rtc_base/async_socket.h" +#include "rtc_base/constructor_magic.h" +#include "rtc_base/message_queue.h" +#include "rtc_base/nat_server.h" +#include "rtc_base/nat_types.h" #include "rtc_base/socket.h" -#include "rtc_base/socketaddress.h" -#include "rtc_base/socketfactory.h" -#include "rtc_base/socketserver.h" +#include "rtc_base/socket_address.h" +#include "rtc_base/socket_factory.h" +#include "rtc_base/socket_server.h" namespace rtc { @@ -175,4 +175,4 @@ size_t UnpackAddressFromNAT(const char* buf, SocketAddress* remote_addr); } // namespace rtc -#endif // RTC_BASE_NATSOCKETFACTORY_H_ +#endif // RTC_BASE_NAT_SOCKET_FACTORY_H_ diff --git a/rtc_base/nat_types.cc b/rtc_base/nat_types.cc index a7af57d8c5..50d7de0dda 100644 --- a/rtc_base/nat_types.cc +++ b/rtc_base/nat_types.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "rtc_base/nattypes.h" +#include "rtc_base/nat_types.h" #include "rtc_base/checks.h" diff --git a/rtc_base/nat_types.h b/rtc_base/nat_types.h index 1d816ac57e..60e7fbd4b4 100644 --- a/rtc_base/nat_types.h +++ b/rtc_base/nat_types.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef RTC_BASE_NATTYPES_H_ -#define RTC_BASE_NATTYPES_H_ +#ifndef RTC_BASE_NAT_TYPES_H_ +#define RTC_BASE_NAT_TYPES_H_ namespace rtc { @@ -44,4 +44,4 @@ class NAT { } // namespace rtc -#endif // RTC_BASE_NATTYPES_H_ +#endif // RTC_BASE_NAT_TYPES_H_ diff --git a/rtc_base/nat_unittest.cc b/rtc_base/nat_unittest.cc index 731bba6801..95504c2a81 100644 --- a/rtc_base/nat_unittest.cc +++ b/rtc_base/nat_unittest.cc @@ -15,26 +15,26 @@ #include #include "absl/memory/memory.h" -#include "rtc_base/asyncpacketsocket.h" -#include "rtc_base/asyncsocket.h" -#include "rtc_base/asynctcpsocket.h" -#include "rtc_base/asyncudpsocket.h" +#include "rtc_base/async_packet_socket.h" +#include "rtc_base/async_socket.h" +#include "rtc_base/async_tcp_socket.h" +#include "rtc_base/async_udp_socket.h" #include "rtc_base/gunit.h" -#include "rtc_base/ipaddress.h" +#include "rtc_base/ip_address.h" #include "rtc_base/logging.h" -#include "rtc_base/natserver.h" -#include "rtc_base/natsocketfactory.h" -#include "rtc_base/nattypes.h" -#include "rtc_base/nethelpers.h" +#include "rtc_base/nat_server.h" +#include "rtc_base/nat_socket_factory.h" +#include "rtc_base/nat_types.h" +#include "rtc_base/net_helpers.h" #include "rtc_base/network.h" -#include "rtc_base/physicalsocketserver.h" -#include "rtc_base/socketaddress.h" -#include "rtc_base/socketfactory.h" -#include "rtc_base/socketserver.h" -#include "rtc_base/testclient.h" +#include "rtc_base/physical_socket_server.h" +#include "rtc_base/socket_address.h" +#include "rtc_base/socket_factory.h" +#include "rtc_base/socket_server.h" +#include "rtc_base/test_client.h" #include "rtc_base/third_party/sigslot/sigslot.h" #include "rtc_base/thread.h" -#include "rtc_base/virtualsocketserver.h" +#include "rtc_base/virtual_socket_server.h" #include "test/gtest.h" namespace rtc { diff --git a/rtc_base/net_helper.cc b/rtc_base/net_helper.cc index e654fe3925..7dcb599933 100644 --- a/rtc_base/net_helper.cc +++ b/rtc_base/net_helper.cc @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "rtc_base/nethelper.h" +#include "rtc_base/net_helper.h" #include "rtc_base/checks.h" -#include "rtc_base/ipaddress.h" +#include "rtc_base/ip_address.h" namespace cricket { diff --git a/rtc_base/net_helper.h b/rtc_base/net_helper.h index f9561380fb..e42502bb18 100644 --- a/rtc_base/net_helper.h +++ b/rtc_base/net_helper.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 RTC_BASE_NETHELPER_H_ -#define RTC_BASE_NETHELPER_H_ +#ifndef RTC_BASE_NET_HELPER_H_ +#define RTC_BASE_NET_HELPER_H_ #include @@ -29,4 +29,4 @@ int GetProtocolOverhead(const std::string& protocol); } // namespace cricket -#endif // RTC_BASE_NETHELPER_H_ +#endif // RTC_BASE_NET_HELPER_H_ diff --git a/rtc_base/net_helpers.cc b/rtc_base/net_helpers.cc index 1bba3b47d5..c662f1a77b 100644 --- a/rtc_base/net_helpers.cc +++ b/rtc_base/net_helpers.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "rtc_base/nethelpers.h" +#include "rtc_base/net_helpers.h" #include @@ -19,14 +19,14 @@ #endif #if defined(WEBRTC_POSIX) && !defined(__native_client__) #if defined(WEBRTC_ANDROID) -#include "rtc_base/ifaddrs-android.h" +#include "rtc_base/ifaddrs_android.h" #else #include #endif #endif // defined(WEBRTC_POSIX) && !defined(__native_client__) #include "rtc_base/logging.h" -#include "rtc_base/signalthread.h" +#include "rtc_base/signal_thread.h" #include "rtc_base/third_party/sigslot/sigslot.h" // for signal_with_thread... namespace rtc { diff --git a/rtc_base/net_helpers.h b/rtc_base/net_helpers.h index 138f9583cc..6f753180fd 100644 --- a/rtc_base/net_helpers.h +++ b/rtc_base/net_helpers.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef RTC_BASE_NETHELPERS_H_ -#define RTC_BASE_NETHELPERS_H_ +#ifndef RTC_BASE_NET_HELPERS_H_ +#define RTC_BASE_NET_HELPERS_H_ #if defined(WEBRTC_POSIX) #include @@ -19,10 +19,10 @@ #include -#include "rtc_base/asyncresolverinterface.h" -#include "rtc_base/ipaddress.h" -#include "rtc_base/signalthread.h" -#include "rtc_base/socketaddress.h" +#include "rtc_base/async_resolver_interface.h" +#include "rtc_base/ip_address.h" +#include "rtc_base/signal_thread.h" +#include "rtc_base/socket_address.h" namespace rtc { @@ -60,4 +60,4 @@ bool HasIPv4Enabled(); bool HasIPv6Enabled(); } // namespace rtc -#endif // RTC_BASE_NETHELPERS_H_ +#endif // RTC_BASE_NET_HELPERS_H_ diff --git a/rtc_base/network.cc b/rtc_base/network.cc index 5c7b019d66..c62c3ce483 100644 --- a/rtc_base/network.cc +++ b/rtc_base/network.cc @@ -36,11 +36,11 @@ #include "rtc_base/checks.h" #include "rtc_base/logging.h" -#include "rtc_base/networkmonitor.h" +#include "rtc_base/network_monitor.h" #include "rtc_base/socket.h" // includes something that makes windows happy -#include "rtc_base/stringencode.h" +#include "rtc_base/string_encode.h" +#include "rtc_base/string_utils.h" #include "rtc_base/strings/string_builder.h" -#include "rtc_base/stringutils.h" #include "rtc_base/thread.h" namespace rtc { diff --git a/rtc_base/network.h b/rtc_base/network.h index 8b1a5fcc5c..b5772a817e 100644 --- a/rtc_base/network.h +++ b/rtc_base/network.h @@ -19,10 +19,10 @@ #include #include -#include "rtc_base/ipaddress.h" +#include "rtc_base/ip_address.h" #include "rtc_base/mdns_responder_interface.h" -#include "rtc_base/messagehandler.h" -#include "rtc_base/networkmonitor.h" +#include "rtc_base/message_handler.h" +#include "rtc_base/network_monitor.h" #include "rtc_base/third_party/sigslot/sigslot.h" #if defined(WEBRTC_POSIX) diff --git a/rtc_base/network_monitor.cc b/rtc_base/network_monitor.cc index 0185eab856..4eb52901f3 100644 --- a/rtc_base/network_monitor.cc +++ b/rtc_base/network_monitor.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "rtc_base/networkmonitor.h" +#include "rtc_base/network_monitor.h" #include diff --git a/rtc_base/network_monitor.h b/rtc_base/network_monitor.h index 1ad7663669..ed4464db55 100644 --- a/rtc_base/network_monitor.h +++ b/rtc_base/network_monitor.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef RTC_BASE_NETWORKMONITOR_H_ -#define RTC_BASE_NETWORKMONITOR_H_ +#ifndef RTC_BASE_NETWORK_MONITOR_H_ +#define RTC_BASE_NETWORK_MONITOR_H_ #include "rtc_base/network_constants.h" #include "rtc_base/third_party/sigslot/sigslot.h" @@ -120,4 +120,4 @@ class NetworkMonitorFactory { } // namespace rtc -#endif // RTC_BASE_NETWORKMONITOR_H_ +#endif // RTC_BASE_NETWORK_MONITOR_H_ diff --git a/rtc_base/network_route.h b/rtc_base/network_route.h index be02731186..6a8f183513 100644 --- a/rtc_base/network_route.h +++ b/rtc_base/network_route.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef RTC_BASE_NETWORKROUTE_H_ -#define RTC_BASE_NETWORKROUTE_H_ +#ifndef RTC_BASE_NETWORK_ROUTE_H_ +#define RTC_BASE_NETWORK_ROUTE_H_ #include @@ -30,4 +30,4 @@ struct NetworkRoute { }; } // namespace rtc -#endif // RTC_BASE_NETWORKROUTE_H_ +#endif // RTC_BASE_NETWORK_ROUTE_H_ diff --git a/rtc_base/network_unittest.cc b/rtc_base/network_unittest.cc index cf1ceccaec..b1a5da6199 100644 --- a/rtc_base/network_unittest.cc +++ b/rtc_base/network_unittest.cc @@ -16,8 +16,8 @@ #include #include "rtc_base/checks.h" -#include "rtc_base/nethelpers.h" -#include "rtc_base/networkmonitor.h" +#include "rtc_base/net_helpers.h" +#include "rtc_base/network_monitor.h" #if defined(WEBRTC_POSIX) #include #include diff --git a/rtc_base/null_socket_server.cc b/rtc_base/null_socket_server.cc index ec042dd095..f446b3d4c1 100644 --- a/rtc_base/null_socket_server.cc +++ b/rtc_base/null_socket_server.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "rtc_base/nullsocketserver.h" +#include "rtc_base/null_socket_server.h" #include "rtc_base/checks.h" namespace rtc { diff --git a/rtc_base/null_socket_server.h b/rtc_base/null_socket_server.h index 47a7fa6118..da22c79160 100644 --- a/rtc_base/null_socket_server.h +++ b/rtc_base/null_socket_server.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef RTC_BASE_NULLSOCKETSERVER_H_ -#define RTC_BASE_NULLSOCKETSERVER_H_ +#ifndef RTC_BASE_NULL_SOCKET_SERVER_H_ +#define RTC_BASE_NULL_SOCKET_SERVER_H_ -#include "rtc_base/asyncsocket.h" +#include "rtc_base/async_socket.h" #include "rtc_base/event.h" #include "rtc_base/socket.h" -#include "rtc_base/socketserver.h" +#include "rtc_base/socket_server.h" namespace rtc { @@ -35,4 +35,4 @@ class NullSocketServer : public SocketServer { } // namespace rtc -#endif // RTC_BASE_NULLSOCKETSERVER_H_ +#endif // RTC_BASE_NULL_SOCKET_SERVER_H_ diff --git a/rtc_base/null_socket_server_unittest.cc b/rtc_base/null_socket_server_unittest.cc index 5d4a251bf1..8268911b83 100644 --- a/rtc_base/null_socket_server_unittest.cc +++ b/rtc_base/null_socket_server_unittest.cc @@ -8,17 +8,17 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "rtc_base/nullsocketserver.h" +#include "rtc_base/null_socket_server.h" #include #include #include "rtc_base/gunit.h" #include "rtc_base/location.h" -#include "rtc_base/messagehandler.h" -#include "rtc_base/messagequeue.h" +#include "rtc_base/message_handler.h" +#include "rtc_base/message_queue.h" #include "rtc_base/thread.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/time_utils.h" #include "test/gtest.h" namespace rtc { diff --git a/rtc_base/numerics/math_utils.h b/rtc_base/numerics/math_utils.h index 5036c8fecb..8a91958375 100644 --- a/rtc_base/numerics/math_utils.h +++ b/rtc_base/numerics/math_utils.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef RTC_BASE_NUMERICS_MATHUTILS_H_ -#define RTC_BASE_NUMERICS_MATHUTILS_H_ +#ifndef RTC_BASE_NUMERICS_MATH_UTILS_H_ +#define RTC_BASE_NUMERICS_MATH_UTILS_H_ #include #include @@ -36,4 +36,4 @@ typename std::make_unsigned::type unsigned_difference(T x, T y) { return static_cast(x) - static_cast(y); } -#endif // RTC_BASE_NUMERICS_MATHUTILS_H_ +#endif // RTC_BASE_NUMERICS_MATH_UTILS_H_ diff --git a/rtc_base/numerics/moving_max_counter.h b/rtc_base/numerics/moving_max_counter.h index 6c6286dfd4..ca956e96e8 100644 --- a/rtc_base/numerics/moving_max_counter.h +++ b/rtc_base/numerics/moving_max_counter.h @@ -19,7 +19,7 @@ #include "absl/types/optional.h" #include "rtc_base/checks.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace rtc { diff --git a/rtc_base/numerics/moving_median_filter.h b/rtc_base/numerics/moving_median_filter.h index dba3cd224e..b4d874105e 100644 --- a/rtc_base/numerics/moving_median_filter.h +++ b/rtc_base/numerics/moving_median_filter.h @@ -15,7 +15,7 @@ #include #include "rtc_base/checks.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" #include "rtc_base/numerics/percentile_filter.h" namespace webrtc { diff --git a/rtc_base/numerics/percentile_filter_unittest.cc b/rtc_base/numerics/percentile_filter_unittest.cc index 66121e4efe..a4cb31772e 100644 --- a/rtc_base/numerics/percentile_filter_unittest.cc +++ b/rtc_base/numerics/percentile_filter_unittest.cc @@ -14,7 +14,7 @@ #include #include -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" #include "rtc_base/numerics/percentile_filter.h" #include "test/gtest.h" diff --git a/rtc_base/one_time_event.h b/rtc_base/one_time_event.h index f649f15ded..c5ccbf6933 100644 --- a/rtc_base/one_time_event.h +++ b/rtc_base/one_time_event.h @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef RTC_BASE_ONETIMEEVENT_H_ -#define RTC_BASE_ONETIMEEVENT_H_ +#ifndef RTC_BASE_ONE_TIME_EVENT_H_ +#define RTC_BASE_ONE_TIME_EVENT_H_ -#include "rtc_base/criticalsection.h" +#include "rtc_base/critical_section.h" namespace webrtc { // Provides a simple way to perform an operation (such as logging) one @@ -57,4 +57,4 @@ class ThreadUnsafeOneTimeEvent { } // namespace webrtc -#endif // RTC_BASE_ONETIMEEVENT_H_ +#endif // RTC_BASE_ONE_TIME_EVENT_H_ diff --git a/rtc_base/one_time_event_unittest.cc b/rtc_base/one_time_event_unittest.cc index 2334cb5f6d..39fd8f9725 100644 --- a/rtc_base/one_time_event_unittest.cc +++ b/rtc_base/one_time_event_unittest.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "rtc_base/onetimeevent.h" +#include "rtc_base/one_time_event.h" #include "test/gtest.h" diff --git a/rtc_base/openssl_adapter.cc b/rtc_base/openssl_adapter.cc index fcfa53b7ee..dd2152ecaa 100644 --- a/rtc_base/openssl_adapter.cc +++ b/rtc_base/openssl_adapter.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "rtc_base/openssladapter.h" +#include "rtc_base/openssl_adapter.h" #include @@ -26,9 +26,9 @@ #include "rtc_base/location.h" #include "rtc_base/logging.h" #include "rtc_base/numerics/safe_conversions.h" -#include "rtc_base/opensslcertificate.h" -#include "rtc_base/opensslutility.h" -#include "rtc_base/stringencode.h" +#include "rtc_base/openssl_certificate.h" +#include "rtc_base/openssl_utility.h" +#include "rtc_base/string_encode.h" #include "rtc_base/thread.h" #ifndef OPENSSL_IS_BORINGSSL diff --git a/rtc_base/openssl_adapter.h b/rtc_base/openssl_adapter.h index 2e3a355f43..721967187b 100644 --- a/rtc_base/openssl_adapter.h +++ b/rtc_base/openssl_adapter.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef RTC_BASE_OPENSSLADAPTER_H_ -#define RTC_BASE_OPENSSLADAPTER_H_ +#ifndef RTC_BASE_OPENSSL_ADAPTER_H_ +#define RTC_BASE_OPENSSL_ADAPTER_H_ #include #include @@ -17,18 +17,18 @@ #include #include -#include "rtc_base/asyncsocket.h" +#include "rtc_base/async_socket.h" #include "rtc_base/buffer.h" -#include "rtc_base/messagehandler.h" -#include "rtc_base/messagequeue.h" -#include "rtc_base/opensslidentity.h" -#include "rtc_base/opensslsessioncache.h" +#include "rtc_base/message_handler.h" +#include "rtc_base/message_queue.h" +#include "rtc_base/openssl_identity.h" +#include "rtc_base/openssl_session_cache.h" #include "rtc_base/socket.h" -#include "rtc_base/socketaddress.h" -#include "rtc_base/ssladapter.h" -#include "rtc_base/sslcertificate.h" -#include "rtc_base/sslidentity.h" -#include "rtc_base/sslstreamadapter.h" +#include "rtc_base/socket_address.h" +#include "rtc_base/ssl_adapter.h" +#include "rtc_base/ssl_certificate.h" +#include "rtc_base/ssl_identity.h" +#include "rtc_base/ssl_stream_adapter.h" namespace rtc { @@ -189,4 +189,4 @@ std::string TransformAlpnProtocols(const std::vector& protos); } // namespace rtc -#endif // RTC_BASE_OPENSSLADAPTER_H_ +#endif // RTC_BASE_OPENSSL_ADAPTER_H_ diff --git a/rtc_base/openssl_adapter_unittest.cc b/rtc_base/openssl_adapter_unittest.cc index 4db00e561b..2b171e631e 100644 --- a/rtc_base/openssl_adapter_unittest.cc +++ b/rtc_base/openssl_adapter_unittest.cc @@ -13,9 +13,9 @@ #include #include "absl/memory/memory.h" -#include "rtc_base/asyncsocket.h" +#include "rtc_base/async_socket.h" #include "rtc_base/gunit.h" -#include "rtc_base/openssladapter.h" +#include "rtc_base/openssl_adapter.h" #include "test/gmock.h" namespace rtc { diff --git a/rtc_base/openssl_certificate.cc b/rtc_base/openssl_certificate.cc index 4e61b86f3b..c22e5fbb9d 100644 --- a/rtc_base/openssl_certificate.cc +++ b/rtc_base/openssl_certificate.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "rtc_base/opensslcertificate.h" +#include "rtc_base/openssl_certificate.h" #if defined(WEBRTC_WIN) // Must be included first before openssl headers. @@ -24,10 +24,10 @@ #include "rtc_base/checks.h" #include "rtc_base/helpers.h" #include "rtc_base/logging.h" -#include "rtc_base/messagedigest.h" -#include "rtc_base/openssldigest.h" -#include "rtc_base/opensslidentity.h" -#include "rtc_base/opensslutility.h" +#include "rtc_base/message_digest.h" +#include "rtc_base/openssl_digest.h" +#include "rtc_base/openssl_identity.h" +#include "rtc_base/openssl_utility.h" namespace rtc { namespace { diff --git a/rtc_base/openssl_certificate.h b/rtc_base/openssl_certificate.h index 088725c0d7..9b61eee8ea 100644 --- a/rtc_base/openssl_certificate.h +++ b/rtc_base/openssl_certificate.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef RTC_BASE_OPENSSLCERTIFICATE_H_ -#define RTC_BASE_OPENSSLCERTIFICATE_H_ +#ifndef RTC_BASE_OPENSSL_CERTIFICATE_H_ +#define RTC_BASE_OPENSSL_CERTIFICATE_H_ #include @@ -18,9 +18,9 @@ #include #include "rtc_base/buffer.h" -#include "rtc_base/constructormagic.h" -#include "rtc_base/sslcertificate.h" -#include "rtc_base/sslidentity.h" +#include "rtc_base/constructor_magic.h" +#include "rtc_base/ssl_certificate.h" +#include "rtc_base/ssl_identity.h" namespace rtc { @@ -75,4 +75,4 @@ class OpenSSLCertificate final : public SSLCertificate { } // namespace rtc -#endif // RTC_BASE_OPENSSLCERTIFICATE_H_ +#endif // RTC_BASE_OPENSSL_CERTIFICATE_H_ diff --git a/rtc_base/openssl_digest.cc b/rtc_base/openssl_digest.cc index da90b65f82..1cf5bc09b4 100644 --- a/rtc_base/openssl_digest.cc +++ b/rtc_base/openssl_digest.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "rtc_base/openssldigest.h" +#include "rtc_base/openssl_digest.h" #include "rtc_base/checks.h" // RTC_DCHECK, RTC_CHECK #include "rtc_base/openssl.h" diff --git a/rtc_base/openssl_digest.h b/rtc_base/openssl_digest.h index 82dc9a96cd..00f883c9f4 100644 --- a/rtc_base/openssl_digest.h +++ b/rtc_base/openssl_digest.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef RTC_BASE_OPENSSLDIGEST_H_ -#define RTC_BASE_OPENSSLDIGEST_H_ +#ifndef RTC_BASE_OPENSSL_DIGEST_H_ +#define RTC_BASE_OPENSSL_DIGEST_H_ #include #include #include -#include "rtc_base/messagedigest.h" +#include "rtc_base/message_digest.h" namespace rtc { @@ -46,4 +46,4 @@ class OpenSSLDigest final : public MessageDigest { } // namespace rtc -#endif // RTC_BASE_OPENSSLDIGEST_H_ +#endif // RTC_BASE_OPENSSL_DIGEST_H_ diff --git a/rtc_base/openssl_identity.cc b/rtc_base/openssl_identity.cc index 9850c855ea..531c971816 100644 --- a/rtc_base/openssl_identity.cc +++ b/rtc_base/openssl_identity.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "rtc_base/opensslidentity.h" +#include "rtc_base/openssl_identity.h" #include #include @@ -32,7 +32,7 @@ #include "rtc_base/logging.h" #include "rtc_base/numerics/safe_conversions.h" #include "rtc_base/openssl.h" -#include "rtc_base/opensslutility.h" +#include "rtc_base/openssl_utility.h" namespace rtc { diff --git a/rtc_base/openssl_identity.h b/rtc_base/openssl_identity.h index fcf7debf90..f0c4fb895d 100644 --- a/rtc_base/openssl_identity.h +++ b/rtc_base/openssl_identity.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef RTC_BASE_OPENSSLIDENTITY_H_ -#define RTC_BASE_OPENSSLIDENTITY_H_ +#ifndef RTC_BASE_OPENSSL_IDENTITY_H_ +#define RTC_BASE_OPENSSL_IDENTITY_H_ #include @@ -18,10 +18,10 @@ #include #include "rtc_base/checks.h" -#include "rtc_base/constructormagic.h" -#include "rtc_base/opensslcertificate.h" -#include "rtc_base/sslcertificate.h" -#include "rtc_base/sslidentity.h" +#include "rtc_base/constructor_magic.h" +#include "rtc_base/openssl_certificate.h" +#include "rtc_base/ssl_certificate.h" +#include "rtc_base/ssl_identity.h" namespace rtc { @@ -98,4 +98,4 @@ class OpenSSLIdentity final : public SSLIdentity { } // namespace rtc -#endif // RTC_BASE_OPENSSLIDENTITY_H_ +#endif // RTC_BASE_OPENSSL_IDENTITY_H_ diff --git a/rtc_base/openssl_key_derivation_hkdf.h b/rtc_base/openssl_key_derivation_hkdf.h index ebf43cfaa7..7f882527e2 100644 --- a/rtc_base/openssl_key_derivation_hkdf.h +++ b/rtc_base/openssl_key_derivation_hkdf.h @@ -11,7 +11,7 @@ #ifndef RTC_BASE_OPENSSL_KEY_DERIVATION_HKDF_H_ #define RTC_BASE_OPENSSL_KEY_DERIVATION_HKDF_H_ -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" #include "rtc_base/key_derivation.h" namespace rtc { diff --git a/rtc_base/openssl_session_cache.cc b/rtc_base/openssl_session_cache.cc index 2e37d55deb..f74dfeade2 100644 --- a/rtc_base/openssl_session_cache.cc +++ b/rtc_base/openssl_session_cache.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "rtc_base/opensslsessioncache.h" +#include "rtc_base/openssl_session_cache.h" #include "rtc_base/checks.h" #include "rtc_base/openssl.h" diff --git a/rtc_base/openssl_session_cache.h b/rtc_base/openssl_session_cache.h index c74b7bf820..e53e41a816 100644 --- a/rtc_base/openssl_session_cache.h +++ b/rtc_base/openssl_session_cache.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef RTC_BASE_OPENSSLSESSIONCACHE_H_ -#define RTC_BASE_OPENSSLSESSIONCACHE_H_ +#ifndef RTC_BASE_OPENSSL_SESSION_CACHE_H_ +#define RTC_BASE_OPENSSL_SESSION_CACHE_H_ #include #include #include -#include "rtc_base/constructormagic.h" -#include "rtc_base/sslstreamadapter.h" +#include "rtc_base/constructor_magic.h" +#include "rtc_base/ssl_stream_adapter.h" #ifndef OPENSSL_IS_BORINGSSL typedef struct ssl_session_st SSL_SESSION; @@ -64,4 +64,4 @@ class OpenSSLSessionCache final { } // namespace rtc -#endif // RTC_BASE_OPENSSLSESSIONCACHE_H_ +#endif // RTC_BASE_OPENSSL_SESSION_CACHE_H_ diff --git a/rtc_base/openssl_session_cache_unittest.cc b/rtc_base/openssl_session_cache_unittest.cc index 6489b2bc2f..366fc26ae5 100644 --- a/rtc_base/openssl_session_cache_unittest.cc +++ b/rtc_base/openssl_session_cache_unittest.cc @@ -16,7 +16,7 @@ #include "rtc_base/gunit.h" #include "rtc_base/openssl.h" -#include "rtc_base/opensslsessioncache.h" +#include "rtc_base/openssl_session_cache.h" namespace rtc { diff --git a/rtc_base/openssl_stream_adapter.cc b/rtc_base/openssl_stream_adapter.cc index 2682013ba9..0245976fa6 100644 --- a/rtc_base/openssl_stream_adapter.cc +++ b/rtc_base/openssl_stream_adapter.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "rtc_base/opensslstreamadapter.h" +#include "rtc_base/openssl_stream_adapter.h" #include #include @@ -29,13 +29,13 @@ #include "rtc_base/logging.h" #include "rtc_base/numerics/safe_conversions.h" #include "rtc_base/openssl.h" -#include "rtc_base/openssladapter.h" -#include "rtc_base/openssldigest.h" -#include "rtc_base/opensslidentity.h" -#include "rtc_base/sslcertificate.h" +#include "rtc_base/openssl_adapter.h" +#include "rtc_base/openssl_digest.h" +#include "rtc_base/openssl_identity.h" +#include "rtc_base/ssl_certificate.h" #include "rtc_base/stream.h" #include "rtc_base/thread.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/time_utils.h" namespace { bool g_use_time_callback_for_testing = false; diff --git a/rtc_base/openssl_stream_adapter.h b/rtc_base/openssl_stream_adapter.h index e012d172a6..40d17795aa 100644 --- a/rtc_base/openssl_stream_adapter.h +++ b/rtc_base/openssl_stream_adapter.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef RTC_BASE_OPENSSLSTREAMADAPTER_H_ -#define RTC_BASE_OPENSSLSTREAMADAPTER_H_ +#ifndef RTC_BASE_OPENSSL_STREAM_ADAPTER_H_ +#define RTC_BASE_OPENSSL_STREAM_ADAPTER_H_ #include @@ -20,10 +20,10 @@ #include #include "rtc_base/buffer.h" -#include "rtc_base/messagequeue.h" -#include "rtc_base/opensslidentity.h" -#include "rtc_base/sslidentity.h" -#include "rtc_base/sslstreamadapter.h" +#include "rtc_base/message_queue.h" +#include "rtc_base/openssl_identity.h" +#include "rtc_base/ssl_identity.h" +#include "rtc_base/ssl_stream_adapter.h" #include "rtc_base/stream.h" namespace rtc { @@ -223,4 +223,4 @@ class OpenSSLStreamAdapter final : public SSLStreamAdapter { } // namespace rtc -#endif // RTC_BASE_OPENSSLSTREAMADAPTER_H_ +#endif // RTC_BASE_OPENSSL_STREAM_ADAPTER_H_ diff --git a/rtc_base/openssl_utility.cc b/rtc_base/openssl_utility.cc index a3f33478eb..9749912c78 100644 --- a/rtc_base/openssl_utility.cc +++ b/rtc_base/openssl_utility.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "rtc_base/opensslutility.h" +#include "rtc_base/openssl_utility.h" #if defined(WEBRTC_WIN) // Must be included first before openssl headers. #include "rtc_base/win32.h" // NOLINT @@ -24,9 +24,9 @@ #include "rtc_base/arraysize.h" #include "rtc_base/logging.h" #include "rtc_base/numerics/safe_conversions.h" -#include "rtc_base/opensslcertificate.h" +#include "rtc_base/openssl_certificate.h" #ifndef WEBRTC_EXCLUDE_BUILT_IN_SSL_ROOT_CERTS -#include "rtc_base/sslroots.h" +#include "rtc_base/ssl_roots.h" #endif // WEBRTC_EXCLUDE_BUILT_IN_SSL_ROOT_CERTS namespace rtc { diff --git a/rtc_base/openssl_utility.h b/rtc_base/openssl_utility.h index 77ed0b1e7c..a2e49dfdbd 100644 --- a/rtc_base/openssl_utility.h +++ b/rtc_base/openssl_utility.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef RTC_BASE_OPENSSLUTILITY_H_ -#define RTC_BASE_OPENSSLUTILITY_H_ +#ifndef RTC_BASE_OPENSSL_UTILITY_H_ +#define RTC_BASE_OPENSSL_UTILITY_H_ #include #include @@ -37,4 +37,4 @@ bool LoadBuiltinSSLRootCertificates(SSL_CTX* ssl_ctx); } // namespace openssl } // namespace rtc -#endif // RTC_BASE_OPENSSLUTILITY_H_ +#endif // RTC_BASE_OPENSSL_UTILITY_H_ diff --git a/rtc_base/openssl_utility_unittest.cc b/rtc_base/openssl_utility_unittest.cc index 2f952ae4b2..9c9b9717ab 100644 --- a/rtc_base/openssl_utility_unittest.cc +++ b/rtc_base/openssl_utility_unittest.cc @@ -32,8 +32,8 @@ #include "rtc_base/gunit.h" #include "rtc_base/numerics/safe_conversions.h" #include "rtc_base/openssl.h" -#include "rtc_base/opensslutility.h" -#include "rtc_base/sslroots.h" +#include "rtc_base/openssl_utility.h" +#include "rtc_base/ssl_roots.h" #include "test/gmock.h" namespace rtc { diff --git a/rtc_base/physical_socket_server.cc b/rtc_base/physical_socket_server.cc index 4ad2857c00..4845a73380 100644 --- a/rtc_base/physical_socket_server.cc +++ b/rtc_base/physical_socket_server.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 "rtc_base/physicalsocketserver.h" +#include "rtc_base/physical_socket_server.h" #if defined(_MSC_VER) && _MSC_VER < 1300 #pragma warning(disable : 4786) @@ -44,12 +44,12 @@ #include #include "rtc_base/arraysize.h" -#include "rtc_base/byteorder.h" +#include "rtc_base/byte_order.h" #include "rtc_base/checks.h" #include "rtc_base/logging.h" -#include "rtc_base/networkmonitor.h" -#include "rtc_base/nullsocketserver.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/network_monitor.h" +#include "rtc_base/null_socket_server.h" +#include "rtc_base/time_utils.h" #if defined(WEBRTC_WIN) #define LAST_SYSTEM_ERROR (::GetLastError()) diff --git a/rtc_base/physical_socket_server.h b/rtc_base/physical_socket_server.h index ee4f936e81..b2dfb3ff86 100644 --- a/rtc_base/physical_socket_server.h +++ b/rtc_base/physical_socket_server.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef RTC_BASE_PHYSICALSOCKETSERVER_H_ -#define RTC_BASE_PHYSICALSOCKETSERVER_H_ +#ifndef RTC_BASE_PHYSICAL_SOCKET_SERVER_H_ +#define RTC_BASE_PHYSICAL_SOCKET_SERVER_H_ #if defined(WEBRTC_POSIX) && defined(WEBRTC_LINUX) #include @@ -20,9 +20,9 @@ #include #include -#include "rtc_base/criticalsection.h" -#include "rtc_base/nethelpers.h" -#include "rtc_base/socketserver.h" +#include "rtc_base/critical_section.h" +#include "rtc_base/net_helpers.h" +#include "rtc_base/socket_server.h" #if defined(WEBRTC_POSIX) typedef int SOCKET; @@ -268,4 +268,4 @@ class SocketDispatcher : public Dispatcher, public PhysicalSocket { } // namespace rtc -#endif // RTC_BASE_PHYSICALSOCKETSERVER_H_ +#endif // RTC_BASE_PHYSICAL_SOCKET_SERVER_H_ diff --git a/rtc_base/physical_socket_server_unittest.cc b/rtc_base/physical_socket_server_unittest.cc index c253cc66bb..aed8bf3890 100644 --- a/rtc_base/physical_socket_server_unittest.cc +++ b/rtc_base/physical_socket_server_unittest.cc @@ -13,12 +13,12 @@ #include #include "rtc_base/gunit.h" -#include "rtc_base/ipaddress.h" +#include "rtc_base/ip_address.h" #include "rtc_base/logging.h" -#include "rtc_base/networkmonitor.h" -#include "rtc_base/physicalsocketserver.h" +#include "rtc_base/network_monitor.h" +#include "rtc_base/physical_socket_server.h" #include "rtc_base/socket_unittest.h" -#include "rtc_base/testutils.h" +#include "rtc_base/test_utils.h" #include "rtc_base/thread.h" #include "test/gtest.h" diff --git a/rtc_base/platform_file.cc b/rtc_base/platform_file.cc index baefb22931..f9317d304c 100644 --- a/rtc_base/platform_file.cc +++ b/rtc_base/platform_file.cc @@ -13,7 +13,7 @@ #if defined(WEBRTC_WIN) #include -#include "rtc_base/stringutils.h" // For ToUtf16 +#include "rtc_base/string_utils.h" // For ToUtf16 #else #include #include diff --git a/rtc_base/platform_file_unittest.cc b/rtc_base/platform_file_unittest.cc index 4e72400da2..396286a0be 100644 --- a/rtc_base/platform_file_unittest.cc +++ b/rtc_base/platform_file_unittest.cc @@ -10,7 +10,7 @@ #include "rtc_base/platform_file.h" #include "test/gtest.h" -#include "test/testsupport/fileutils.h" +#include "test/testsupport/file_utils.h" namespace rtc { diff --git a/rtc_base/platform_thread.cc b/rtc_base/platform_thread.cc index ba84b6ae8e..1324069210 100644 --- a/rtc_base/platform_thread.cc +++ b/rtc_base/platform_thread.cc @@ -17,9 +17,9 @@ #include #include -#include "rtc_base/atomicops.h" +#include "rtc_base/atomic_ops.h" #include "rtc_base/checks.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/time_utils.h" namespace rtc { namespace { diff --git a/rtc_base/platform_thread.h b/rtc_base/platform_thread.h index 47c23dc1b5..79ea7c15a6 100644 --- a/rtc_base/platform_thread.h +++ b/rtc_base/platform_thread.h @@ -16,7 +16,7 @@ #endif #include -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" #include "rtc_base/platform_thread_types.h" #include "rtc_base/thread_checker.h" diff --git a/rtc_base/proxy_info.cc b/rtc_base/proxy_info.cc index c394487c1a..23d60afa74 100644 --- a/rtc_base/proxy_info.cc +++ b/rtc_base/proxy_info.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "rtc_base/proxyinfo.h" +#include "rtc_base/proxy_info.h" namespace rtc { diff --git a/rtc_base/proxy_info.h b/rtc_base/proxy_info.h index 19476696a2..6fded09686 100644 --- a/rtc_base/proxy_info.h +++ b/rtc_base/proxy_info.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef RTC_BASE_PROXYINFO_H_ -#define RTC_BASE_PROXYINFO_H_ +#ifndef RTC_BASE_PROXY_INFO_H_ +#define RTC_BASE_PROXY_INFO_H_ #include -#include "rtc_base/cryptstring.h" -#include "rtc_base/socketaddress.h" +#include "rtc_base/crypt_string.h" +#include "rtc_base/socket_address.h" namespace rtc { @@ -35,4 +35,4 @@ struct ProxyInfo { } // namespace rtc -#endif // RTC_BASE_PROXYINFO_H_ +#endif // RTC_BASE_PROXY_INFO_H_ diff --git a/rtc_base/proxy_server.cc b/rtc_base/proxy_server.cc index 638ce0d7d6..3420404632 100644 --- a/rtc_base/proxy_server.cc +++ b/rtc_base/proxy_server.cc @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "rtc_base/proxyserver.h" +#include "rtc_base/proxy_server.h" #include #include #include "rtc_base/checks.h" #include "rtc_base/logging.h" -#include "rtc_base/socketfactory.h" +#include "rtc_base/socket_factory.h" namespace rtc { diff --git a/rtc_base/proxy_server.h b/rtc_base/proxy_server.h index 587a49caca..ef4a3c7866 100644 --- a/rtc_base/proxy_server.h +++ b/rtc_base/proxy_server.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef RTC_BASE_PROXYSERVER_H_ -#define RTC_BASE_PROXYSERVER_H_ +#ifndef RTC_BASE_PROXY_SERVER_H_ +#define RTC_BASE_PROXY_SERVER_H_ #include #include -#include "rtc_base/asyncsocket.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/async_socket.h" +#include "rtc_base/constructor_magic.h" #include "rtc_base/server_socket_adapters.h" -#include "rtc_base/socketaddress.h" +#include "rtc_base/socket_address.h" #include "rtc_base/stream.h" namespace rtc { @@ -101,4 +101,4 @@ class SocksProxyServer : public ProxyServer { } // namespace rtc -#endif // RTC_BASE_PROXYSERVER_H_ +#endif // RTC_BASE_PROXY_SERVER_H_ diff --git a/rtc_base/proxy_unittest.cc b/rtc_base/proxy_unittest.cc index 010189384f..229891d52a 100644 --- a/rtc_base/proxy_unittest.cc +++ b/rtc_base/proxy_unittest.cc @@ -11,11 +11,11 @@ #include #include #include "rtc_base/gunit.h" -#include "rtc_base/proxyserver.h" -#include "rtc_base/socketadapters.h" -#include "rtc_base/testclient.h" -#include "rtc_base/testechoserver.h" -#include "rtc_base/virtualsocketserver.h" +#include "rtc_base/proxy_server.h" +#include "rtc_base/socket_adapters.h" +#include "rtc_base/test_client.h" +#include "rtc_base/test_echo_server.h" +#include "rtc_base/virtual_socket_server.h" using rtc::Socket; using rtc::SocketAddress; diff --git a/rtc_base/random.h b/rtc_base/random.h index e1c3bb7058..31de6e19fd 100644 --- a/rtc_base/random.h +++ b/rtc_base/random.h @@ -15,7 +15,7 @@ #include #include "rtc_base/checks.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace webrtc { diff --git a/rtc_base/random_unittest.cc b/rtc_base/random_unittest.cc index d05a16b27e..8f326573f5 100644 --- a/rtc_base/random_unittest.cc +++ b/rtc_base/random_unittest.cc @@ -13,7 +13,7 @@ #include #include -#include "rtc_base/numerics/mathutils.h" // unsigned difference +#include "rtc_base/numerics/math_utils.h" // unsigned difference #include "rtc_base/random.h" #include "test/gtest.h" diff --git a/rtc_base/rate_limiter.h b/rtc_base/rate_limiter.h index 43ef88d8fc..7eaa946568 100644 --- a/rtc_base/rate_limiter.h +++ b/rtc_base/rate_limiter.h @@ -14,8 +14,8 @@ #include #include -#include "rtc_base/constructormagic.h" -#include "rtc_base/criticalsection.h" +#include "rtc_base/constructor_magic.h" +#include "rtc_base/critical_section.h" #include "rtc_base/rate_statistics.h" #include "rtc_base/thread_annotations.h" diff --git a/rtc_base/rate_tracker.cc b/rtc_base/rate_tracker.cc index 7c96ca9f60..771dc6c148 100644 --- a/rtc_base/rate_tracker.cc +++ b/rtc_base/rate_tracker.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "rtc_base/ratetracker.h" +#include "rtc_base/rate_tracker.h" #include #include "rtc_base/checks.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/time_utils.h" namespace rtc { diff --git a/rtc_base/rate_tracker.h b/rtc_base/rate_tracker.h index ac9b88a5d1..e9be52260c 100644 --- a/rtc_base/rate_tracker.h +++ b/rtc_base/rate_tracker.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef RTC_BASE_RATETRACKER_H_ -#define RTC_BASE_RATETRACKER_H_ +#ifndef RTC_BASE_RATE_TRACKER_H_ +#define RTC_BASE_RATE_TRACKER_H_ #include #include @@ -66,4 +66,4 @@ class RateTracker { } // namespace rtc -#endif // RTC_BASE_RATETRACKER_H_ +#endif // RTC_BASE_RATE_TRACKER_H_ diff --git a/rtc_base/rate_tracker_unittest.cc b/rtc_base/rate_tracker_unittest.cc index ff74a3736f..7a2c1ad73b 100644 --- a/rtc_base/rate_tracker_unittest.cc +++ b/rtc_base/rate_tracker_unittest.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "rtc_base/ratetracker.h" +#include "rtc_base/rate_tracker.h" #include "test/gtest.h" diff --git a/rtc_base/ref_count.h b/rtc_base/ref_count.h index fb0971ce01..d8d652abd8 100644 --- a/rtc_base/ref_count.h +++ b/rtc_base/ref_count.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 RTC_BASE_REFCOUNT_H_ -#define RTC_BASE_REFCOUNT_H_ +#ifndef RTC_BASE_REF_COUNT_H_ +#define RTC_BASE_REF_COUNT_H_ namespace rtc { @@ -64,4 +64,4 @@ class RefCountInterface { } // namespace rtc -#endif // RTC_BASE_REFCOUNT_H_ +#endif // RTC_BASE_REF_COUNT_H_ diff --git a/rtc_base/ref_counted_object.h b/rtc_base/ref_counted_object.h index 3b21004be6..ce18379d50 100644 --- a/rtc_base/ref_counted_object.h +++ b/rtc_base/ref_counted_object.h @@ -7,15 +7,15 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#ifndef RTC_BASE_REFCOUNTEDOBJECT_H_ -#define RTC_BASE_REFCOUNTEDOBJECT_H_ +#ifndef RTC_BASE_REF_COUNTED_OBJECT_H_ +#define RTC_BASE_REF_COUNTED_OBJECT_H_ #include #include -#include "rtc_base/constructormagic.h" -#include "rtc_base/refcount.h" -#include "rtc_base/refcounter.h" +#include "rtc_base/constructor_magic.h" +#include "rtc_base/ref_count.h" +#include "rtc_base/ref_counter.h" namespace rtc { @@ -61,4 +61,4 @@ class RefCountedObject : public T { } // namespace rtc -#endif // RTC_BASE_REFCOUNTEDOBJECT_H_ +#endif // RTC_BASE_REF_COUNTED_OBJECT_H_ diff --git a/rtc_base/ref_counted_object_unittest.cc b/rtc_base/ref_counted_object_unittest.cc index 71ff4262a1..9b475e2102 100644 --- a/rtc_base/ref_counted_object_unittest.cc +++ b/rtc_base/ref_counted_object_unittest.cc @@ -12,8 +12,8 @@ #include #include -#include "rtc_base/refcount.h" -#include "rtc_base/refcountedobject.h" +#include "rtc_base/ref_count.h" +#include "rtc_base/ref_counted_object.h" #include "rtc_base/scoped_ref_ptr.h" #include "test/gtest.h" diff --git a/rtc_base/ref_counter.h b/rtc_base/ref_counter.h index 3906529c25..9b4d5ef755 100644 --- a/rtc_base/ref_counter.h +++ b/rtc_base/ref_counter.h @@ -7,11 +7,11 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#ifndef RTC_BASE_REFCOUNTER_H_ -#define RTC_BASE_REFCOUNTER_H_ +#ifndef RTC_BASE_REF_COUNTER_H_ +#define RTC_BASE_REF_COUNTER_H_ -#include "rtc_base/atomicops.h" -#include "rtc_base/refcount.h" +#include "rtc_base/atomic_ops.h" +#include "rtc_base/ref_count.h" namespace webrtc { namespace webrtc_impl { @@ -49,4 +49,4 @@ class RefCounter { } // namespace webrtc_impl } // namespace webrtc -#endif // RTC_BASE_REFCOUNTER_H_ +#endif // RTC_BASE_REF_COUNTER_H_ diff --git a/rtc_base/rolling_accumulator.h b/rtc_base/rolling_accumulator.h index 9ad8159330..dacceffe2d 100644 --- a/rtc_base/rolling_accumulator.h +++ b/rtc_base/rolling_accumulator.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef RTC_BASE_ROLLINGACCUMULATOR_H_ -#define RTC_BASE_ROLLINGACCUMULATOR_H_ +#ifndef RTC_BASE_ROLLING_ACCUMULATOR_H_ +#define RTC_BASE_ROLLING_ACCUMULATOR_H_ #include #include #include #include "rtc_base/checks.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace rtc { @@ -164,4 +164,4 @@ class RollingAccumulator { } // namespace rtc -#endif // RTC_BASE_ROLLINGACCUMULATOR_H_ +#endif // RTC_BASE_ROLLING_ACCUMULATOR_H_ diff --git a/rtc_base/rolling_accumulator_unittest.cc b/rtc_base/rolling_accumulator_unittest.cc index 38716f23cc..7d5e70d109 100644 --- a/rtc_base/rolling_accumulator_unittest.cc +++ b/rtc_base/rolling_accumulator_unittest.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "rtc_base/rollingaccumulator.h" +#include "rtc_base/rolling_accumulator.h" #include "test/gtest.h" diff --git a/rtc_base/rtc_certificate.cc b/rtc_base/rtc_certificate.cc index 875068f4fc..46f6c3129c 100644 --- a/rtc_base/rtc_certificate.cc +++ b/rtc_base/rtc_certificate.cc @@ -10,13 +10,13 @@ #include -#include "rtc_base/rtccertificate.h" +#include "rtc_base/rtc_certificate.h" #include "rtc_base/checks.h" -#include "rtc_base/refcountedobject.h" -#include "rtc_base/sslcertificate.h" -#include "rtc_base/sslidentity.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/ref_counted_object.h" +#include "rtc_base/ssl_certificate.h" +#include "rtc_base/ssl_identity.h" +#include "rtc_base/time_utils.h" namespace rtc { diff --git a/rtc_base/rtc_certificate.h b/rtc_base/rtc_certificate.h index 561ea0f9e7..a826af4b1d 100644 --- a/rtc_base/rtc_certificate.h +++ b/rtc_base/rtc_certificate.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef RTC_BASE_RTCCERTIFICATE_H_ -#define RTC_BASE_RTCCERTIFICATE_H_ +#ifndef RTC_BASE_RTC_CERTIFICATE_H_ +#define RTC_BASE_RTC_CERTIFICATE_H_ #include #include #include -#include "rtc_base/refcount.h" +#include "rtc_base/ref_count.h" #include "rtc_base/scoped_ref_ptr.h" namespace rtc { @@ -90,4 +90,4 @@ class RTCCertificate : public RefCountInterface { } // namespace rtc -#endif // RTC_BASE_RTCCERTIFICATE_H_ +#endif // RTC_BASE_RTC_CERTIFICATE_H_ diff --git a/rtc_base/rtc_certificate_generator.cc b/rtc_base/rtc_certificate_generator.cc index 114b35c665..08cd19946d 100644 --- a/rtc_base/rtc_certificate_generator.cc +++ b/rtc_base/rtc_certificate_generator.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "rtc_base/rtccertificategenerator.h" +#include "rtc_base/rtc_certificate_generator.h" #include #include @@ -17,10 +17,10 @@ #include "rtc_base/checks.h" #include "rtc_base/location.h" -#include "rtc_base/messagehandler.h" -#include "rtc_base/messagequeue.h" -#include "rtc_base/refcountedobject.h" -#include "rtc_base/sslidentity.h" +#include "rtc_base/message_handler.h" +#include "rtc_base/message_queue.h" +#include "rtc_base/ref_counted_object.h" +#include "rtc_base/ssl_identity.h" namespace rtc { diff --git a/rtc_base/rtc_certificate_generator.h b/rtc_base/rtc_certificate_generator.h index fed075e6dd..75688dd9c3 100644 --- a/rtc_base/rtc_certificate_generator.h +++ b/rtc_base/rtc_certificate_generator.h @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef RTC_BASE_RTCCERTIFICATEGENERATOR_H_ -#define RTC_BASE_RTCCERTIFICATEGENERATOR_H_ +#ifndef RTC_BASE_RTC_CERTIFICATE_GENERATOR_H_ +#define RTC_BASE_RTC_CERTIFICATE_GENERATOR_H_ #include #include "absl/types/optional.h" -#include "rtc_base/refcount.h" -#include "rtc_base/rtccertificate.h" +#include "rtc_base/ref_count.h" +#include "rtc_base/rtc_certificate.h" #include "rtc_base/scoped_ref_ptr.h" -#include "rtc_base/sslidentity.h" +#include "rtc_base/ssl_identity.h" #include "rtc_base/thread.h" namespace rtc { @@ -84,4 +84,4 @@ class RTCCertificateGenerator : public RTCCertificateGeneratorInterface { } // namespace rtc -#endif // RTC_BASE_RTCCERTIFICATEGENERATOR_H_ +#endif // RTC_BASE_RTC_CERTIFICATE_GENERATOR_H_ diff --git a/rtc_base/rtc_certificate_generator_unittest.cc b/rtc_base/rtc_certificate_generator_unittest.cc index e3c820b90c..69c85976de 100644 --- a/rtc_base/rtc_certificate_generator_unittest.cc +++ b/rtc_base/rtc_certificate_generator_unittest.cc @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "rtc_base/rtccertificategenerator.h" +#include "rtc_base/rtc_certificate_generator.h" #include #include "absl/types/optional.h" #include "rtc_base/checks.h" #include "rtc_base/gunit.h" -#include "rtc_base/refcountedobject.h" +#include "rtc_base/ref_counted_object.h" #include "rtc_base/thread.h" #include "test/gtest.h" diff --git a/rtc_base/rtc_certificate_unittest.cc b/rtc_base/rtc_certificate_unittest.cc index f5a777c649..ab242bbf73 100644 --- a/rtc_base/rtc_certificate_unittest.cc +++ b/rtc_base/rtc_certificate_unittest.cc @@ -14,9 +14,9 @@ #include "rtc_base/checks.h" #include "rtc_base/numerics/safe_conversions.h" -#include "rtc_base/rtccertificate.h" -#include "rtc_base/sslidentity.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/rtc_certificate.h" +#include "rtc_base/ssl_identity.h" +#include "rtc_base/time_utils.h" #include "test/gtest.h" namespace rtc { diff --git a/rtc_base/sequenced_task_checker.h b/rtc_base/sequenced_task_checker.h index eb151985de..e5443afe5a 100644 --- a/rtc_base/sequenced_task_checker.h +++ b/rtc_base/sequenced_task_checker.h @@ -17,7 +17,7 @@ #define ENABLE_SEQUENCED_TASK_CHECKER RTC_DCHECK_IS_ON #include "rtc_base/checks.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" #include "rtc_base/sequenced_task_checker_impl.h" #include "rtc_base/thread_annotations.h" diff --git a/rtc_base/sequenced_task_checker_impl.h b/rtc_base/sequenced_task_checker_impl.h index 293b1ac297..a850b945dc 100644 --- a/rtc_base/sequenced_task_checker_impl.h +++ b/rtc_base/sequenced_task_checker_impl.h @@ -11,7 +11,7 @@ #ifndef RTC_BASE_SEQUENCED_TASK_CHECKER_IMPL_H_ #define RTC_BASE_SEQUENCED_TASK_CHECKER_IMPL_H_ -#include "rtc_base/criticalsection.h" +#include "rtc_base/critical_section.h" #include "rtc_base/thread_checker.h" namespace rtc { diff --git a/rtc_base/sequenced_task_checker_unittest.cc b/rtc_base/sequenced_task_checker_unittest.cc index 02918cd7c3..b3df2fab8b 100644 --- a/rtc_base/sequenced_task_checker_unittest.cc +++ b/rtc_base/sequenced_task_checker_unittest.cc @@ -14,7 +14,7 @@ #include #include "rtc_base/checks.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" #include "rtc_base/event.h" #include "rtc_base/platform_thread.h" #include "rtc_base/task_queue.h" diff --git a/rtc_base/server_socket_adapters.cc b/rtc_base/server_socket_adapters.cc index 64f9bf0f86..887ca8777c 100644 --- a/rtc_base/server_socket_adapters.cc +++ b/rtc_base/server_socket_adapters.cc @@ -10,7 +10,7 @@ #include -#include "rtc_base/bytebuffer.h" +#include "rtc_base/byte_buffer.h" #include "rtc_base/server_socket_adapters.h" namespace rtc { diff --git a/rtc_base/server_socket_adapters.h b/rtc_base/server_socket_adapters.h index e741ba83ef..a534eeaf64 100644 --- a/rtc_base/server_socket_adapters.h +++ b/rtc_base/server_socket_adapters.h @@ -11,7 +11,7 @@ #ifndef RTC_BASE_SERVER_SOCKET_ADAPTERS_H_ #define RTC_BASE_SERVER_SOCKET_ADAPTERS_H_ -#include "rtc_base/socketadapters.h" +#include "rtc_base/socket_adapters.h" namespace rtc { diff --git a/rtc_base/signal_thread.cc b/rtc_base/signal_thread.cc index 5dd9387931..84613db309 100644 --- a/rtc_base/signal_thread.cc +++ b/rtc_base/signal_thread.cc @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "rtc_base/signalthread.h" +#include "rtc_base/signal_thread.h" #include #include "absl/memory/memory.h" #include "rtc_base/checks.h" #include "rtc_base/location.h" -#include "rtc_base/nullsocketserver.h" -#include "rtc_base/socketserver.h" +#include "rtc_base/null_socket_server.h" +#include "rtc_base/socket_server.h" namespace rtc { diff --git a/rtc_base/signal_thread.h b/rtc_base/signal_thread.h index 9208e2c246..9a20ad252b 100644 --- a/rtc_base/signal_thread.h +++ b/rtc_base/signal_thread.h @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef RTC_BASE_SIGNALTHREAD_H_ -#define RTC_BASE_SIGNALTHREAD_H_ +#ifndef RTC_BASE_SIGNAL_THREAD_H_ +#define RTC_BASE_SIGNAL_THREAD_H_ #include #include "rtc_base/checks.h" -#include "rtc_base/constructormagic.h" -#include "rtc_base/criticalsection.h" -#include "rtc_base/messagehandler.h" -#include "rtc_base/messagequeue.h" +#include "rtc_base/constructor_magic.h" +#include "rtc_base/critical_section.h" +#include "rtc_base/message_handler.h" +#include "rtc_base/message_queue.h" #include "rtc_base/third_party/sigslot/sigslot.h" #include "rtc_base/thread.h" #include "rtc_base/thread_annotations.h" @@ -155,4 +155,4 @@ class SignalThread : public sigslot::has_slots<>, protected MessageHandler { } // namespace rtc -#endif // RTC_BASE_SIGNALTHREAD_H_ +#endif // RTC_BASE_SIGNAL_THREAD_H_ diff --git a/rtc_base/signal_thread_unittest.cc b/rtc_base/signal_thread_unittest.cc index eeae030fbc..2bc0dda8e2 100644 --- a/rtc_base/signal_thread_unittest.cc +++ b/rtc_base/signal_thread_unittest.cc @@ -10,10 +10,10 @@ #include -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" #include "rtc_base/gunit.h" -#include "rtc_base/signalthread.h" -#include "rtc_base/socketserver.h" +#include "rtc_base/signal_thread.h" +#include "rtc_base/socket_server.h" #include "rtc_base/thread.h" #include "test/gtest.h" diff --git a/rtc_base/sigslot_repeater.h b/rtc_base/sigslot_repeater.h index 724e624a7c..f562c5aa7b 100644 --- a/rtc_base/sigslot_repeater.h +++ b/rtc_base/sigslot_repeater.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef RTC_BASE_SIGSLOTREPEATER_H__ -#define RTC_BASE_SIGSLOTREPEATER_H__ +#ifndef RTC_BASE_SIGSLOT_REPEATER_H__ +#define RTC_BASE_SIGSLOT_REPEATER_H__ // repeaters are both signals and slots, which are designed as intermediate // pass-throughs for signals and slots which don't know about each other (for @@ -53,4 +53,4 @@ using repeater = } // namespace sigslot -#endif // RTC_BASE_SIGSLOTREPEATER_H__ +#endif // RTC_BASE_SIGSLOT_REPEATER_H__ diff --git a/rtc_base/sigslot_tester.h b/rtc_base/sigslot_tester.h index 73f4365a34..58be511ef6 100644 --- a/rtc_base/sigslot_tester.h +++ b/rtc_base/sigslot_tester.h @@ -12,8 +12,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef RTC_BASE_SIGSLOTTESTER_H_ -#define RTC_BASE_SIGSLOTTESTER_H_ +#ifndef RTC_BASE_SIGSLOT_TESTER_H_ +#define RTC_BASE_SIGSLOT_TESTER_H_ // To generate sigslottester.h from sigslottester.h.pump, execute: // /home/build/google3/third_party/gtest/scripts/pump.py sigslottester.h.pump @@ -38,7 +38,7 @@ // EXPECT_EQ("hello", capture); // /* See unit-tests for more examples */ -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" #include "rtc_base/third_party/sigslot/sigslot.h" namespace rtc { @@ -237,4 +237,4 @@ class SigslotTester5 : public sigslot::has_slots<> { }; } // namespace rtc -#endif // RTC_BASE_SIGSLOTTESTER_H_ +#endif // RTC_BASE_SIGSLOT_TESTER_H_ diff --git a/rtc_base/sigslot_tester_unittest.cc b/rtc_base/sigslot_tester_unittest.cc index b8d5735f9d..6c5b12ec5f 100644 --- a/rtc_base/sigslot_tester_unittest.cc +++ b/rtc_base/sigslot_tester_unittest.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "rtc_base/sigslottester.h" +#include "rtc_base/sigslot_tester.h" #include diff --git a/rtc_base/sigslot_unittest.cc b/rtc_base/sigslot_unittest.cc index d5d8e0000a..8edab7c49e 100644 --- a/rtc_base/sigslot_unittest.cc +++ b/rtc_base/sigslot_unittest.cc @@ -10,7 +10,7 @@ #include "rtc_base/third_party/sigslot/sigslot.h" -#include "rtc_base/sigslotrepeater.h" +#include "rtc_base/sigslot_repeater.h" #include "test/gtest.h" // This function, when passed a has_slots or signalx, will break the build if diff --git a/rtc_base/sigslottester.h.pump b/rtc_base/sigslottester.h.pump index 0c7c693c61..0a1f41128d 100755 --- a/rtc_base/sigslottester.h.pump +++ b/rtc_base/sigslottester.h.pump @@ -35,7 +35,7 @@ // EXPECT_EQ("hello", capture); // /* See unit-tests for more examples */ -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" #include "rtc_base/third_party/sigslot/sigslot.h" namespace rtc { diff --git a/rtc_base/socket.h b/rtc_base/socket.h index 84a0e84b68..a2b65d18cb 100644 --- a/rtc_base/socket.h +++ b/rtc_base/socket.h @@ -25,8 +25,8 @@ #include "rtc_base/win32.h" #endif -#include "rtc_base/constructormagic.h" -#include "rtc_base/socketaddress.h" +#include "rtc_base/constructor_magic.h" +#include "rtc_base/socket_address.h" // Rather than converting errors into a private namespace, // Reuse the POSIX socket api errors. Note this depends on diff --git a/rtc_base/socket_adapters.cc b/rtc_base/socket_adapters.cc index 3fe88d51da..2bcdcd8b16 100644 --- a/rtc_base/socket_adapters.cc +++ b/rtc_base/socket_adapters.cc @@ -31,11 +31,11 @@ #include "absl/strings/match.h" #include "rtc_base/buffer.h" -#include "rtc_base/bytebuffer.h" +#include "rtc_base/byte_buffer.h" #include "rtc_base/checks.h" -#include "rtc_base/httpcommon.h" +#include "rtc_base/http_common.h" #include "rtc_base/logging.h" -#include "rtc_base/socketadapters.h" +#include "rtc_base/socket_adapters.h" #include "rtc_base/strings/string_builder.h" #include "rtc_base/zero_memory.h" diff --git a/rtc_base/socket_adapters.h b/rtc_base/socket_adapters.h index ca55909af9..99c9109d7f 100644 --- a/rtc_base/socket_adapters.h +++ b/rtc_base/socket_adapters.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef RTC_BASE_SOCKETADAPTERS_H_ -#define RTC_BASE_SOCKETADAPTERS_H_ +#ifndef RTC_BASE_SOCKET_ADAPTERS_H_ +#define RTC_BASE_SOCKET_ADAPTERS_H_ #include #include "api/array_view.h" -#include "rtc_base/asyncsocket.h" -#include "rtc_base/constructormagic.h" -#include "rtc_base/cryptstring.h" +#include "rtc_base/async_socket.h" +#include "rtc_base/constructor_magic.h" +#include "rtc_base/crypt_string.h" namespace rtc { @@ -167,4 +167,4 @@ class AsyncSocksProxySocket : public BufferedReadAdapter { } // namespace rtc -#endif // RTC_BASE_SOCKETADAPTERS_H_ +#endif // RTC_BASE_SOCKET_ADAPTERS_H_ diff --git a/rtc_base/socket_address.cc b/rtc_base/socket_address.cc index c91846d1ba..3b22a05a90 100644 --- a/rtc_base/socket_address.cc +++ b/rtc_base/socket_address.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "rtc_base/socketaddress.h" +#include "rtc_base/socket_address.h" #include "rtc_base/numerics/safe_conversions.h" #if defined(WEBRTC_POSIX) @@ -26,10 +26,10 @@ #include #endif -#include "rtc_base/byteorder.h" +#include "rtc_base/byte_order.h" #include "rtc_base/checks.h" #include "rtc_base/logging.h" -#include "rtc_base/nethelpers.h" +#include "rtc_base/net_helpers.h" #include "rtc_base/strings/string_builder.h" #if defined(WEBRTC_WIN) diff --git a/rtc_base/socket_address.h b/rtc_base/socket_address.h index b1a52b9371..342f5de2aa 100644 --- a/rtc_base/socket_address.h +++ b/rtc_base/socket_address.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef RTC_BASE_SOCKETADDRESS_H_ -#define RTC_BASE_SOCKETADDRESS_H_ +#ifndef RTC_BASE_SOCKET_ADDRESS_H_ +#define RTC_BASE_SOCKET_ADDRESS_H_ #include #ifdef UNIT_TEST #include // no-presubmit-check TODO(webrtc:8982) #endif // UNIT_TEST -#include "rtc_base/ipaddress.h" +#include "rtc_base/ip_address.h" #undef SetPort @@ -199,4 +199,4 @@ SocketAddress EmptySocketAddressWithFamily(int family); } // namespace rtc -#endif // RTC_BASE_SOCKETADDRESS_H_ +#endif // RTC_BASE_SOCKET_ADDRESS_H_ diff --git a/rtc_base/socket_address_pair.cc b/rtc_base/socket_address_pair.cc index 914ffd9916..54f70ff17a 100644 --- a/rtc_base/socket_address_pair.cc +++ b/rtc_base/socket_address_pair.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "rtc_base/socketaddresspair.h" +#include "rtc_base/socket_address_pair.h" namespace rtc { diff --git a/rtc_base/socket_address_pair.h b/rtc_base/socket_address_pair.h index 6691386d3a..f315e6460a 100644 --- a/rtc_base/socket_address_pair.h +++ b/rtc_base/socket_address_pair.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef RTC_BASE_SOCKETADDRESSPAIR_H_ -#define RTC_BASE_SOCKETADDRESSPAIR_H_ +#ifndef RTC_BASE_SOCKET_ADDRESS_PAIR_H_ +#define RTC_BASE_SOCKET_ADDRESS_PAIR_H_ #include -#include "rtc_base/socketaddress.h" +#include "rtc_base/socket_address.h" namespace rtc { @@ -40,4 +40,4 @@ class SocketAddressPair { } // namespace rtc -#endif // RTC_BASE_SOCKETADDRESSPAIR_H_ +#endif // RTC_BASE_SOCKET_ADDRESS_PAIR_H_ diff --git a/rtc_base/socket_address_unittest.cc b/rtc_base/socket_address_unittest.cc index d2420fc5ae..14da8cb519 100644 --- a/rtc_base/socket_address_unittest.cc +++ b/rtc_base/socket_address_unittest.cc @@ -14,8 +14,8 @@ #include -#include "rtc_base/ipaddress.h" -#include "rtc_base/socketaddress.h" +#include "rtc_base/ip_address.h" +#include "rtc_base/socket_address.h" #include "test/gtest.h" namespace rtc { diff --git a/rtc_base/socket_factory.h b/rtc_base/socket_factory.h index 5a5cd04333..7356745c72 100644 --- a/rtc_base/socket_factory.h +++ b/rtc_base/socket_factory.h @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef RTC_BASE_SOCKETFACTORY_H_ -#define RTC_BASE_SOCKETFACTORY_H_ +#ifndef RTC_BASE_SOCKET_FACTORY_H_ +#define RTC_BASE_SOCKET_FACTORY_H_ -#include "rtc_base/asyncsocket.h" +#include "rtc_base/async_socket.h" #include "rtc_base/socket.h" namespace rtc { @@ -30,4 +30,4 @@ class SocketFactory { } // namespace rtc -#endif // RTC_BASE_SOCKETFACTORY_H_ +#endif // RTC_BASE_SOCKET_FACTORY_H_ diff --git a/rtc_base/socket_server.h b/rtc_base/socket_server.h index e29884e6b3..348d0998b2 100644 --- a/rtc_base/socket_server.h +++ b/rtc_base/socket_server.h @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef RTC_BASE_SOCKETSERVER_H_ -#define RTC_BASE_SOCKETSERVER_H_ +#ifndef RTC_BASE_SOCKET_SERVER_H_ +#define RTC_BASE_SOCKET_SERVER_H_ #include -#include "rtc_base/socketfactory.h" +#include "rtc_base/socket_factory.h" namespace rtc { @@ -59,4 +59,4 @@ class SocketServer : public SocketFactory { } // namespace rtc -#endif // RTC_BASE_SOCKETSERVER_H_ +#endif // RTC_BASE_SOCKET_SERVER_H_ diff --git a/rtc_base/socket_stream.cc b/rtc_base/socket_stream.cc index 8978404cf4..e93d6aa3a0 100644 --- a/rtc_base/socket_stream.cc +++ b/rtc_base/socket_stream.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "rtc_base/socketstream.h" +#include "rtc_base/socket_stream.h" #include "rtc_base/checks.h" #include "rtc_base/socket.h" diff --git a/rtc_base/socket_stream.h b/rtc_base/socket_stream.h index 6047fcdaea..f9875fe41e 100644 --- a/rtc_base/socket_stream.h +++ b/rtc_base/socket_stream.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef RTC_BASE_SOCKETSTREAM_H_ -#define RTC_BASE_SOCKETSTREAM_H_ +#ifndef RTC_BASE_SOCKET_STREAM_H_ +#define RTC_BASE_SOCKET_STREAM_H_ #include -#include "rtc_base/asyncsocket.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/async_socket.h" +#include "rtc_base/constructor_magic.h" #include "rtc_base/stream.h" #include "rtc_base/third_party/sigslot/sigslot.h" @@ -61,4 +61,4 @@ class SocketStream : public StreamInterface, public sigslot::has_slots<> { } // namespace rtc -#endif // RTC_BASE_SOCKETSTREAM_H_ +#endif // RTC_BASE_SOCKET_STREAM_H_ diff --git a/rtc_base/socket_unittest.cc b/rtc_base/socket_unittest.cc index 79259a5179..3166ec7e61 100644 --- a/rtc_base/socket_unittest.cc +++ b/rtc_base/socket_unittest.cc @@ -15,25 +15,25 @@ #include "absl/memory/memory.h" #include "rtc_base/arraysize.h" -#include "rtc_base/asyncpacketsocket.h" -#include "rtc_base/asyncsocket.h" -#include "rtc_base/asyncudpsocket.h" +#include "rtc_base/async_packet_socket.h" +#include "rtc_base/async_socket.h" +#include "rtc_base/async_udp_socket.h" #include "rtc_base/buffer.h" #include "rtc_base/gunit.h" #include "rtc_base/location.h" #include "rtc_base/logging.h" -#include "rtc_base/messagehandler.h" -#include "rtc_base/messagequeue.h" -#include "rtc_base/nethelpers.h" +#include "rtc_base/message_handler.h" +#include "rtc_base/message_queue.h" +#include "rtc_base/net_helpers.h" #include "rtc_base/socket.h" +#include "rtc_base/socket_address.h" +#include "rtc_base/socket_server.h" #include "rtc_base/socket_unittest.h" -#include "rtc_base/socketaddress.h" -#include "rtc_base/socketserver.h" -#include "rtc_base/testclient.h" -#include "rtc_base/testutils.h" +#include "rtc_base/test_client.h" +#include "rtc_base/test_utils.h" #include "rtc_base/third_party/sigslot/sigslot.h" #include "rtc_base/thread.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/time_utils.h" namespace rtc { diff --git a/rtc_base/ssl_adapter.cc b/rtc_base/ssl_adapter.cc index e091f00520..9d414ea2ff 100644 --- a/rtc_base/ssl_adapter.cc +++ b/rtc_base/ssl_adapter.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "rtc_base/ssladapter.h" +#include "rtc_base/ssl_adapter.h" -#include "rtc_base/openssladapter.h" +#include "rtc_base/openssl_adapter.h" /////////////////////////////////////////////////////////////////////////////// diff --git a/rtc_base/ssl_adapter.h b/rtc_base/ssl_adapter.h index 7ebedcadf0..240899f551 100644 --- a/rtc_base/ssl_adapter.h +++ b/rtc_base/ssl_adapter.h @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef RTC_BASE_SSLADAPTER_H_ -#define RTC_BASE_SSLADAPTER_H_ +#ifndef RTC_BASE_SSL_ADAPTER_H_ +#define RTC_BASE_SSL_ADAPTER_H_ #include #include -#include "rtc_base/asyncsocket.h" -#include "rtc_base/sslcertificate.h" -#include "rtc_base/sslidentity.h" -#include "rtc_base/sslstreamadapter.h" +#include "rtc_base/async_socket.h" +#include "rtc_base/ssl_certificate.h" +#include "rtc_base/ssl_identity.h" +#include "rtc_base/ssl_stream_adapter.h" namespace rtc { @@ -103,4 +103,4 @@ bool CleanupSSL(); } // namespace rtc -#endif // RTC_BASE_SSLADAPTER_H_ +#endif // RTC_BASE_SSL_ADAPTER_H_ diff --git a/rtc_base/ssl_adapter_unittest.cc b/rtc_base/ssl_adapter_unittest.cc index c84c668c7e..9774c0a5d9 100644 --- a/rtc_base/ssl_adapter_unittest.cc +++ b/rtc_base/ssl_adapter_unittest.cc @@ -14,15 +14,15 @@ #include "absl/memory/memory.h" #include "rtc_base/gunit.h" -#include "rtc_base/ipaddress.h" -#include "rtc_base/messagedigest.h" -#include "rtc_base/socketstream.h" -#include "rtc_base/ssladapter.h" -#include "rtc_base/sslidentity.h" -#include "rtc_base/sslstreamadapter.h" +#include "rtc_base/ip_address.h" +#include "rtc_base/message_digest.h" +#include "rtc_base/socket_stream.h" +#include "rtc_base/ssl_adapter.h" +#include "rtc_base/ssl_identity.h" +#include "rtc_base/ssl_stream_adapter.h" #include "rtc_base/stream.h" -#include "rtc_base/stringencode.h" -#include "rtc_base/virtualsocketserver.h" +#include "rtc_base/string_encode.h" +#include "rtc_base/virtual_socket_server.h" #include "test/gmock.h" using ::testing::_; diff --git a/rtc_base/ssl_certificate.cc b/rtc_base/ssl_certificate.cc index 934848fb73..8f6cfa2365 100644 --- a/rtc_base/ssl_certificate.cc +++ b/rtc_base/ssl_certificate.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "rtc_base/sslcertificate.h" +#include "rtc_base/ssl_certificate.h" #include #include @@ -16,8 +16,8 @@ #include "absl/memory/memory.h" #include "rtc_base/checks.h" -#include "rtc_base/opensslcertificate.h" -#include "rtc_base/sslfingerprint.h" +#include "rtc_base/openssl_certificate.h" +#include "rtc_base/ssl_fingerprint.h" #include "rtc_base/third_party/base64/base64.h" namespace rtc { diff --git a/rtc_base/ssl_certificate.h b/rtc_base/ssl_certificate.h index eb81c209e4..fad1404a8f 100644 --- a/rtc_base/ssl_certificate.h +++ b/rtc_base/ssl_certificate.h @@ -12,8 +12,8 @@ // for TLS TURN connections and the SSLStreamAdapter for DTLS Peer to Peer // Connections for SRTP Key negotiation and SCTP encryption. -#ifndef RTC_BASE_SSLCERTIFICATE_H_ -#define RTC_BASE_SSLCERTIFICATE_H_ +#ifndef RTC_BASE_SSL_CERTIFICATE_H_ +#define RTC_BASE_SSL_CERTIFICATE_H_ #include #include @@ -22,7 +22,7 @@ #include #include "rtc_base/buffer.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace rtc { @@ -134,4 +134,4 @@ class SSLCertificateVerifier { } // namespace rtc -#endif // RTC_BASE_SSLCERTIFICATE_H_ +#endif // RTC_BASE_SSL_CERTIFICATE_H_ diff --git a/rtc_base/ssl_fingerprint.cc b/rtc_base/ssl_fingerprint.cc index b296d33ddd..77b6149842 100644 --- a/rtc_base/ssl_fingerprint.cc +++ b/rtc_base/ssl_fingerprint.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "rtc_base/sslfingerprint.h" +#include "rtc_base/ssl_fingerprint.h" #include #include @@ -17,11 +17,11 @@ #include "absl/memory/memory.h" #include "rtc_base/logging.h" -#include "rtc_base/messagedigest.h" -#include "rtc_base/rtccertificate.h" -#include "rtc_base/sslcertificate.h" -#include "rtc_base/sslidentity.h" -#include "rtc_base/stringencode.h" +#include "rtc_base/message_digest.h" +#include "rtc_base/rtc_certificate.h" +#include "rtc_base/ssl_certificate.h" +#include "rtc_base/ssl_identity.h" +#include "rtc_base/string_encode.h" namespace rtc { diff --git a/rtc_base/ssl_fingerprint.h b/rtc_base/ssl_fingerprint.h index ea10ede720..f4037f78b0 100644 --- a/rtc_base/ssl_fingerprint.h +++ b/rtc_base/ssl_fingerprint.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef RTC_BASE_SSLFINGERPRINT_H_ -#define RTC_BASE_SSLFINGERPRINT_H_ +#ifndef RTC_BASE_SSL_FINGERPRINT_H_ +#define RTC_BASE_SSL_FINGERPRINT_H_ #include #include #include -#include "rtc_base/copyonwritebuffer.h" +#include "rtc_base/copy_on_write_buffer.h" namespace rtc { @@ -70,4 +70,4 @@ struct SSLFingerprint { } // namespace rtc -#endif // RTC_BASE_SSLFINGERPRINT_H_ +#endif // RTC_BASE_SSL_FINGERPRINT_H_ diff --git a/rtc_base/ssl_identity.cc b/rtc_base/ssl_identity.cc index 41eb35d5f5..63818c1bb9 100644 --- a/rtc_base/ssl_identity.cc +++ b/rtc_base/ssl_identity.cc @@ -9,18 +9,18 @@ */ // Handling of certificates and keypairs for SSLStreamAdapter's peer mode. -#include "rtc_base/sslidentity.h" +#include "rtc_base/ssl_identity.h" #include #include #include #include "rtc_base/checks.h" -#include "rtc_base/opensslidentity.h" -#include "rtc_base/sslcertificate.h" +#include "rtc_base/openssl_identity.h" +#include "rtc_base/ssl_certificate.h" #include "rtc_base/strings/string_builder.h" #include "rtc_base/third_party/base64/base64.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/time_utils.h" namespace rtc { diff --git a/rtc_base/ssl_identity.h b/rtc_base/ssl_identity.h index 39feeabab3..c013a89917 100644 --- a/rtc_base/ssl_identity.h +++ b/rtc_base/ssl_identity.h @@ -10,8 +10,8 @@ // Handling of certificates and keypairs for SSLStreamAdapter's peer mode. -#ifndef RTC_BASE_SSLIDENTITY_H_ -#define RTC_BASE_SSLIDENTITY_H_ +#ifndef RTC_BASE_SSL_IDENTITY_H_ +#define RTC_BASE_SSL_IDENTITY_H_ #include #include @@ -164,4 +164,4 @@ extern const char kPemTypeEcPrivateKey[]; } // namespace rtc -#endif // RTC_BASE_SSLIDENTITY_H_ +#endif // RTC_BASE_SSL_IDENTITY_H_ diff --git a/rtc_base/ssl_identity_unittest.cc b/rtc_base/ssl_identity_unittest.cc index d2ec15771c..f01f37bcec 100644 --- a/rtc_base/ssl_identity_unittest.cc +++ b/rtc_base/ssl_identity_unittest.cc @@ -14,13 +14,13 @@ #include #include "rtc_base/checks.h" -#include "rtc_base/fakesslidentity.h" +#include "rtc_base/fake_ssl_identity.h" #include "rtc_base/helpers.h" #include "rtc_base/logging.h" -#include "rtc_base/messagedigest.h" -#include "rtc_base/sslfingerprint.h" -#include "rtc_base/sslidentity.h" -#include "rtc_base/stringutils.h" +#include "rtc_base/message_digest.h" +#include "rtc_base/ssl_fingerprint.h" +#include "rtc_base/ssl_identity.h" +#include "rtc_base/string_utils.h" #include "test/gtest.h" using rtc::SSLIdentity; diff --git a/rtc_base/ssl_roots.h b/rtc_base/ssl_roots.h index 0dbd19b4a9..69f6e396f6 100644 --- a/rtc_base/ssl_roots.h +++ b/rtc_base/ssl_roots.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef RTC_BASE_SSLROOTS_H_ -#define RTC_BASE_SSLROOTS_H_ +#ifndef RTC_BASE_SSL_ROOTS_H_ +#define RTC_BASE_SSL_ROOTS_H_ // This file is the root certificates in C form that are needed to connect to // Google. @@ -4283,4 +4283,4 @@ const size_t kSSLCertCertificateSizeList[] = { // clang-format on -#endif // RTC_BASE_SSLROOTS_H_ +#endif // RTC_BASE_SSL_ROOTS_H_ diff --git a/rtc_base/ssl_stream_adapter.cc b/rtc_base/ssl_stream_adapter.cc index 9c33a9c933..372c37ff0d 100644 --- a/rtc_base/ssl_stream_adapter.cc +++ b/rtc_base/ssl_stream_adapter.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "rtc_base/sslstreamadapter.h" +#include "rtc_base/ssl_stream_adapter.h" -#include "rtc_base/opensslstreamadapter.h" +#include "rtc_base/openssl_stream_adapter.h" /////////////////////////////////////////////////////////////////////////////// diff --git a/rtc_base/ssl_stream_adapter.h b/rtc_base/ssl_stream_adapter.h index 3fff6bc005..04d0fc5dd4 100644 --- a/rtc_base/ssl_stream_adapter.h +++ b/rtc_base/ssl_stream_adapter.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef RTC_BASE_SSLSTREAMADAPTER_H_ -#define RTC_BASE_SSLSTREAMADAPTER_H_ +#ifndef RTC_BASE_SSL_STREAM_ADAPTER_H_ +#define RTC_BASE_SSL_STREAM_ADAPTER_H_ #include #include @@ -17,8 +17,8 @@ #include #include -#include "rtc_base/sslcertificate.h" -#include "rtc_base/sslidentity.h" +#include "rtc_base/ssl_certificate.h" +#include "rtc_base/ssl_identity.h" #include "rtc_base/stream.h" #include "rtc_base/third_party/sigslot/sigslot.h" @@ -263,4 +263,4 @@ class SSLStreamAdapter : public StreamAdapterInterface { } // namespace rtc -#endif // RTC_BASE_SSLSTREAMADAPTER_H_ +#endif // RTC_BASE_SSL_STREAM_ADAPTER_H_ diff --git a/rtc_base/ssl_stream_adapter_unittest.cc b/rtc_base/ssl_stream_adapter_unittest.cc index 6fbb1d7c2c..e866266530 100644 --- a/rtc_base/ssl_stream_adapter_unittest.cc +++ b/rtc_base/ssl_stream_adapter_unittest.cc @@ -13,15 +13,15 @@ #include #include -#include "rtc_base/bufferqueue.h" +#include "rtc_base/buffer_queue.h" #include "rtc_base/checks.h" #include "rtc_base/gunit.h" #include "rtc_base/helpers.h" #include "rtc_base/memory_stream.h" -#include "rtc_base/messagedigest.h" -#include "rtc_base/ssladapter.h" -#include "rtc_base/sslidentity.h" -#include "rtc_base/sslstreamadapter.h" +#include "rtc_base/message_digest.h" +#include "rtc_base/ssl_adapter.h" +#include "rtc_base/ssl_identity.h" +#include "rtc_base/ssl_stream_adapter.h" #include "rtc_base/stream.h" using ::testing::WithParamInterface; diff --git a/rtc_base/stream.cc b/rtc_base/stream.cc index 0541bf6c01..083df401fe 100644 --- a/rtc_base/stream.cc +++ b/rtc_base/stream.cc @@ -14,7 +14,7 @@ #include "rtc_base/checks.h" #include "rtc_base/location.h" -#include "rtc_base/messagequeue.h" +#include "rtc_base/message_queue.h" #include "rtc_base/stream.h" #include "rtc_base/thread.h" @@ -22,7 +22,7 @@ #include #define fileno _fileno -#include "rtc_base/stringutils.h" +#include "rtc_base/string_utils.h" #endif namespace rtc { diff --git a/rtc_base/stream.h b/rtc_base/stream.h index f643114024..718c12e986 100644 --- a/rtc_base/stream.h +++ b/rtc_base/stream.h @@ -16,10 +16,10 @@ #include #include "rtc_base/buffer.h" -#include "rtc_base/constructormagic.h" -#include "rtc_base/criticalsection.h" -#include "rtc_base/messagehandler.h" -#include "rtc_base/messagequeue.h" +#include "rtc_base/constructor_magic.h" +#include "rtc_base/critical_section.h" +#include "rtc_base/message_handler.h" +#include "rtc_base/message_queue.h" #include "rtc_base/third_party/sigslot/sigslot.h" namespace rtc { diff --git a/rtc_base/string_encode.cc b/rtc_base/string_encode.cc index fc4e3bc8e7..45ea58628e 100644 --- a/rtc_base/string_encode.cc +++ b/rtc_base/string_encode.cc @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "rtc_base/stringencode.h" +#include "rtc_base/string_encode.h" #include #include "rtc_base/arraysize.h" #include "rtc_base/checks.h" -#include "rtc_base/stringutils.h" +#include "rtc_base/string_utils.h" namespace rtc { diff --git a/rtc_base/string_encode.h b/rtc_base/string_encode.h index 09bf77f446..d3338d9526 100644 --- a/rtc_base/string_encode.h +++ b/rtc_base/string_encode.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef RTC_BASE_STRINGENCODE_H_ -#define RTC_BASE_STRINGENCODE_H_ +#ifndef RTC_BASE_STRING_ENCODE_H_ +#define RTC_BASE_STRING_ENCODE_H_ #include #include @@ -197,4 +197,4 @@ static inline T FromString(const std::string& str) { } // namespace rtc -#endif // RTC_BASE_STRINGENCODE_H__ +#endif // RTC_BASE_STRING_ENCODE_H__ diff --git a/rtc_base/string_encode_unittest.cc b/rtc_base/string_encode_unittest.cc index ab871a5ce9..cc72e43a28 100644 --- a/rtc_base/string_encode_unittest.cc +++ b/rtc_base/string_encode_unittest.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "rtc_base/stringencode.h" +#include "rtc_base/string_encode.h" #include #include // no-presubmit-check TODO(webrtc:8982) diff --git a/rtc_base/string_utils.cc b/rtc_base/string_utils.cc index 57ca408409..97bf481d06 100644 --- a/rtc_base/string_utils.cc +++ b/rtc_base/string_utils.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "rtc_base/stringutils.h" +#include "rtc_base/string_utils.h" namespace rtc { diff --git a/rtc_base/string_utils.h b/rtc_base/string_utils.h index 2a53e69a87..b4ce209a99 100644 --- a/rtc_base/string_utils.h +++ b/rtc_base/string_utils.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef RTC_BASE_STRINGUTILS_H_ -#define RTC_BASE_STRINGUTILS_H_ +#ifndef RTC_BASE_STRING_UTILS_H_ +#define RTC_BASE_STRING_UTILS_H_ #include #include @@ -110,4 +110,4 @@ std::string LeftPad(char padding, unsigned length, std::string s); } // namespace rtc -#endif // RTC_BASE_STRINGUTILS_H_ +#endif // RTC_BASE_STRING_UTILS_H_ diff --git a/rtc_base/string_utils_unittest.cc b/rtc_base/string_utils_unittest.cc index a07d8bb973..b4396f11d4 100644 --- a/rtc_base/string_utils_unittest.cc +++ b/rtc_base/string_utils_unittest.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "rtc_base/stringutils.h" +#include "rtc_base/string_utils.h" #include "test/gtest.h" diff --git a/rtc_base/strings/json.cc b/rtc_base/strings/json.cc index efcb97a272..8a544a0c0d 100644 --- a/rtc_base/strings/json.cc +++ b/rtc_base/strings/json.cc @@ -14,7 +14,7 @@ #include #include -#include "rtc_base/stringencode.h" +#include "rtc_base/string_encode.h" namespace rtc { diff --git a/rtc_base/strings/string_builder.h b/rtc_base/strings/string_builder.h index 27001d1be5..7c45ac4ace 100644 --- a/rtc_base/strings/string_builder.h +++ b/rtc_base/strings/string_builder.h @@ -17,8 +17,8 @@ #include "absl/strings/string_view.h" #include "api/array_view.h" -#include "rtc_base/stringencode.h" -#include "rtc_base/stringutils.h" +#include "rtc_base/string_encode.h" +#include "rtc_base/string_utils.h" namespace rtc { diff --git a/rtc_base/swap_queue.h b/rtc_base/swap_queue.h index 53d42197a4..c3246dba94 100644 --- a/rtc_base/swap_queue.h +++ b/rtc_base/swap_queue.h @@ -16,8 +16,8 @@ #include #include "rtc_base/checks.h" -#include "rtc_base/constructormagic.h" -#include "rtc_base/criticalsection.h" +#include "rtc_base/constructor_magic.h" +#include "rtc_base/critical_section.h" #include "rtc_base/system/unused.h" #include "rtc_base/thread_annotations.h" diff --git a/rtc_base/system/file_wrapper.h b/rtc_base/system/file_wrapper.h index 0bb86a397f..f2ed51ae3c 100644 --- a/rtc_base/system/file_wrapper.h +++ b/rtc_base/system/file_wrapper.h @@ -14,7 +14,7 @@ #include #include -#include "rtc_base/criticalsection.h" +#include "rtc_base/critical_section.h" // Implementation that can read (exclusive) or write from/to a file. diff --git a/rtc_base/task_queue.h b/rtc_base/task_queue.h index fa84625da1..0f2d219955 100644 --- a/rtc_base/task_queue.h +++ b/rtc_base/task_queue.h @@ -17,7 +17,7 @@ #include #include "absl/memory/memory.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" #include "rtc_base/scoped_ref_ptr.h" #include "rtc_base/system/rtc_export.h" #include "rtc_base/thread_annotations.h" diff --git a/rtc_base/task_queue_for_test.h b/rtc_base/task_queue_for_test.h index 5cd4e8397c..dd27f64409 100644 --- a/rtc_base/task_queue_for_test.h +++ b/rtc_base/task_queue_for_test.h @@ -12,7 +12,7 @@ #define RTC_BASE_TASK_QUEUE_FOR_TEST_H_ #include "rtc_base/checks.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" #include "rtc_base/event.h" #include "rtc_base/task_queue.h" #include "rtc_base/thread_annotations.h" diff --git a/rtc_base/task_queue_gcd.cc b/rtc_base/task_queue_gcd.cc index f2f3412e38..405edab403 100644 --- a/rtc_base/task_queue_gcd.cc +++ b/rtc_base/task_queue_gcd.cc @@ -20,8 +20,8 @@ #include "rtc_base/checks.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" #include "rtc_base/task_queue_posix.h" namespace rtc { diff --git a/rtc_base/task_queue_libevent.cc b/rtc_base/task_queue_libevent.cc index d30c82df97..ab97b0cf84 100644 --- a/rtc_base/task_queue_libevent.cc +++ b/rtc_base/task_queue_libevent.cc @@ -24,18 +24,18 @@ #include "base/third_party/libevent/event.h" #include "rtc_base/checks.h" -#include "rtc_base/criticalsection.h" +#include "rtc_base/critical_section.h" #include "rtc_base/logging.h" #include "rtc_base/numerics/safe_conversions.h" #include "rtc_base/platform_thread.h" #include "rtc_base/platform_thread_types.h" -#include "rtc_base/refcount.h" -#include "rtc_base/refcountedobject.h" +#include "rtc_base/ref_count.h" +#include "rtc_base/ref_counted_object.h" #include "rtc_base/scoped_ref_ptr.h" #include "rtc_base/system/unused.h" #include "rtc_base/task_queue_posix.h" #include "rtc_base/thread_annotations.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/time_utils.h" namespace rtc { using internal::GetQueuePtrTls; diff --git a/rtc_base/task_queue_stdlib.cc b/rtc_base/task_queue_stdlib.cc index 0fb0ed28b9..2b9d5a2ffc 100644 --- a/rtc_base/task_queue_stdlib.cc +++ b/rtc_base/task_queue_stdlib.cc @@ -19,14 +19,14 @@ #include #include "rtc_base/checks.h" -#include "rtc_base/criticalsection.h" +#include "rtc_base/critical_section.h" #include "rtc_base/event.h" #include "rtc_base/logging.h" #include "rtc_base/platform_thread.h" -#include "rtc_base/refcount.h" -#include "rtc_base/refcountedobject.h" +#include "rtc_base/ref_count.h" +#include "rtc_base/ref_counted_object.h" #include "rtc_base/thread_annotations.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/time_utils.h" namespace rtc { namespace { diff --git a/rtc_base/task_queue_unittest.cc b/rtc_base/task_queue_unittest.cc index a76c09eba8..d4ef105c8a 100644 --- a/rtc_base/task_queue_unittest.cc +++ b/rtc_base/task_queue_unittest.cc @@ -25,7 +25,7 @@ #include "rtc_base/event.h" #include "rtc_base/task_queue.h" #include "rtc_base/task_queue_for_test.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/time_utils.h" #include "test/gtest.h" using rtc::test::TaskQueueForTest; diff --git a/rtc_base/task_queue_win.cc b/rtc_base/task_queue_win.cc index 565cc9b70f..b73aa95493 100644 --- a/rtc_base/task_queue_win.cc +++ b/rtc_base/task_queue_win.cc @@ -29,14 +29,14 @@ #include "rtc_base/arraysize.h" #include "rtc_base/checks.h" -#include "rtc_base/criticalsection.h" +#include "rtc_base/critical_section.h" #include "rtc_base/event.h" #include "rtc_base/logging.h" #include "rtc_base/numerics/safe_conversions.h" #include "rtc_base/platform_thread.h" -#include "rtc_base/refcount.h" -#include "rtc_base/refcountedobject.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/ref_count.h" +#include "rtc_base/ref_counted_object.h" +#include "rtc_base/time_utils.h" namespace rtc { namespace { diff --git a/rtc_base/test_base64.h b/rtc_base/test_base64.h index 5dc94b6cbc..51d8c58113 100644 --- a/rtc_base/test_base64.h +++ b/rtc_base/test_base64.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef RTC_BASE_TESTBASE64_H_ -#define RTC_BASE_TESTBASE64_H_ +#ifndef RTC_BASE_TEST_BASE64_H_ +#define RTC_BASE_TEST_BASE64_H_ /* This file was generated by googleclient/talk/binary2header.sh */ @@ -2108,4 +2108,4 @@ static unsigned char testbase64[] = { 0xba, 0x5b, 0xfe, 0x97, 0xfa, 0x4b, 0xfc, 0xba, 0x7f, 0xb1, 0xc7, 0xab, 0x1e, 0x8f, 0xff, 0xd9}; -#endif // RTC_BASE_TESTBASE64_H_ +#endif // RTC_BASE_TEST_BASE64_H_ diff --git a/rtc_base/test_certificate_verifier.h b/rtc_base/test_certificate_verifier.h index 8ad6e4d736..9775615b5d 100644 --- a/rtc_base/test_certificate_verifier.h +++ b/rtc_base/test_certificate_verifier.h @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef RTC_BASE_TESTCERTIFICATEVERIFIER_H_ -#define RTC_BASE_TESTCERTIFICATEVERIFIER_H_ +#ifndef RTC_BASE_TEST_CERTIFICATE_VERIFIER_H_ +#define RTC_BASE_TEST_CERTIFICATE_VERIFIER_H_ -#include "rtc_base/sslcertificate.h" +#include "rtc_base/ssl_certificate.h" namespace rtc { @@ -31,4 +31,4 @@ class TestCertificateVerifier : public SSLCertificateVerifier { } // namespace rtc -#endif // RTC_BASE_TESTCERTIFICATEVERIFIER_H_ +#endif // RTC_BASE_TEST_CERTIFICATE_VERIFIER_H_ diff --git a/rtc_base/test_client.cc b/rtc_base/test_client.cc index 00363bae65..274b6ca07d 100644 --- a/rtc_base/test_client.cc +++ b/rtc_base/test_client.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "rtc_base/testclient.h" +#include "rtc_base/test_client.h" #include #include @@ -16,7 +16,7 @@ #include "absl/memory/memory.h" #include "rtc_base/gunit.h" #include "rtc_base/thread.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/time_utils.h" namespace rtc { diff --git a/rtc_base/test_client.h b/rtc_base/test_client.h index 16fb6ba677..fb8a2f9905 100644 --- a/rtc_base/test_client.h +++ b/rtc_base/test_client.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef RTC_BASE_TESTCLIENT_H_ -#define RTC_BASE_TESTCLIENT_H_ +#ifndef RTC_BASE_TEST_CLIENT_H_ +#define RTC_BASE_TEST_CLIENT_H_ #include #include -#include "rtc_base/asyncudpsocket.h" -#include "rtc_base/constructormagic.h" -#include "rtc_base/criticalsection.h" -#include "rtc_base/fakeclock.h" +#include "rtc_base/async_udp_socket.h" +#include "rtc_base/constructor_magic.h" +#include "rtc_base/critical_section.h" +#include "rtc_base/fake_clock.h" namespace rtc { @@ -113,4 +113,4 @@ class TestClient : public sigslot::has_slots<> { } // namespace rtc -#endif // RTC_BASE_TESTCLIENT_H_ +#endif // RTC_BASE_TEST_CLIENT_H_ diff --git a/rtc_base/test_client_unittest.cc b/rtc_base/test_client_unittest.cc index d45a5a38e6..382aaafe1b 100644 --- a/rtc_base/test_client_unittest.cc +++ b/rtc_base/test_client_unittest.cc @@ -8,18 +8,18 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "rtc_base/testclient.h" +#include "rtc_base/test_client.h" #include #include "absl/memory/memory.h" -#include "rtc_base/asyncsocket.h" -#include "rtc_base/asynctcpsocket.h" -#include "rtc_base/asyncudpsocket.h" +#include "rtc_base/async_socket.h" +#include "rtc_base/async_tcp_socket.h" +#include "rtc_base/async_udp_socket.h" #include "rtc_base/logging.h" -#include "rtc_base/nethelpers.h" -#include "rtc_base/socketserver.h" -#include "rtc_base/testechoserver.h" +#include "rtc_base/net_helpers.h" +#include "rtc_base/socket_server.h" +#include "rtc_base/test_echo_server.h" #include "rtc_base/thread.h" #include "test/gtest.h" diff --git a/rtc_base/test_echo_server.cc b/rtc_base/test_echo_server.cc index 1e1fb59bb1..d2e11d6a46 100644 --- a/rtc_base/test_echo_server.cc +++ b/rtc_base/test_echo_server.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "rtc_base/testechoserver.h" +#include "rtc_base/test_echo_server.h" -#include "rtc_base/socketserver.h" +#include "rtc_base/socket_server.h" namespace rtc { diff --git a/rtc_base/test_echo_server.h b/rtc_base/test_echo_server.h index f1342fda38..4710560644 100644 --- a/rtc_base/test_echo_server.h +++ b/rtc_base/test_echo_server.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef RTC_BASE_TESTECHOSERVER_H_ -#define RTC_BASE_TESTECHOSERVER_H_ +#ifndef RTC_BASE_TEST_ECHO_SERVER_H_ +#define RTC_BASE_TEST_ECHO_SERVER_H_ #include #include @@ -17,11 +17,11 @@ #include #include -#include "rtc_base/asyncpacketsocket.h" -#include "rtc_base/asyncsocket.h" -#include "rtc_base/asynctcpsocket.h" -#include "rtc_base/constructormagic.h" -#include "rtc_base/socketaddress.h" +#include "rtc_base/async_packet_socket.h" +#include "rtc_base/async_socket.h" +#include "rtc_base/async_tcp_socket.h" +#include "rtc_base/constructor_magic.h" +#include "rtc_base/socket_address.h" #include "rtc_base/third_party/sigslot/sigslot.h" #include "rtc_base/thread.h" @@ -69,4 +69,4 @@ class TestEchoServer : public sigslot::has_slots<> { } // namespace rtc -#endif // RTC_BASE_TESTECHOSERVER_H_ +#endif // RTC_BASE_TEST_ECHO_SERVER_H_ diff --git a/rtc_base/test_utils.cc b/rtc_base/test_utils.cc index f3292fd59f..ecf2cfa6ec 100644 --- a/rtc_base/test_utils.cc +++ b/rtc_base/test_utils.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "rtc_base/testutils.h" +#include "rtc_base/test_utils.h" namespace webrtc { namespace testing { diff --git a/rtc_base/test_utils.h b/rtc_base/test_utils.h index 7ec0c12b68..4746e962ae 100644 --- a/rtc_base/test_utils.h +++ b/rtc_base/test_utils.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef RTC_BASE_TESTUTILS_H_ -#define RTC_BASE_TESTUTILS_H_ +#ifndef RTC_BASE_TEST_UTILS_H_ +#define RTC_BASE_TEST_UTILS_H_ // Utilities for testing rtc infrastructure in unittests #include #include -#include "rtc_base/asyncsocket.h" +#include "rtc_base/async_socket.h" #include "rtc_base/stream.h" #include "rtc_base/third_party/sigslot/sigslot.h" @@ -137,4 +137,4 @@ class StreamSink : public sigslot::has_slots<> { } // namespace testing } // namespace webrtc -#endif // RTC_BASE_TESTUTILS_H_ +#endif // RTC_BASE_TEST_UTILS_H_ diff --git a/rtc_base/thread.cc b/rtc_base/thread.cc index 4dd5fd2224..936871c40c 100644 --- a/rtc_base/thread.cc +++ b/rtc_base/thread.cc @@ -28,10 +28,10 @@ #include #include "rtc_base/checks.h" -#include "rtc_base/criticalsection.h" +#include "rtc_base/critical_section.h" #include "rtc_base/logging.h" -#include "rtc_base/nullsocketserver.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/null_socket_server.h" +#include "rtc_base/time_utils.h" #include "rtc_base/trace_event.h" #if defined(WEBRTC_MAC) diff --git a/rtc_base/thread.h b/rtc_base/thread.h index 039192ce7f..e2d37a07db 100644 --- a/rtc_base/thread.h +++ b/rtc_base/thread.h @@ -20,12 +20,12 @@ #if defined(WEBRTC_POSIX) #include #endif -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" #include "rtc_base/location.h" -#include "rtc_base/messagehandler.h" -#include "rtc_base/messagequeue.h" +#include "rtc_base/message_handler.h" +#include "rtc_base/message_queue.h" #include "rtc_base/platform_thread_types.h" -#include "rtc_base/socketserver.h" +#include "rtc_base/socket_server.h" #include "rtc_base/thread_annotations.h" #if defined(WEBRTC_WIN) diff --git a/rtc_base/thread_checker.h b/rtc_base/thread_checker.h index ad0450871a..baff897172 100644 --- a/rtc_base/thread_checker.h +++ b/rtc_base/thread_checker.h @@ -20,7 +20,7 @@ #define RTC_ENABLE_THREAD_CHECKER RTC_DCHECK_IS_ON #include "rtc_base/checks.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" #include "rtc_base/thread_annotations.h" #include "rtc_base/thread_checker_impl.h" diff --git a/rtc_base/thread_checker_impl.h b/rtc_base/thread_checker_impl.h index c82fe1de5d..c39e10f951 100644 --- a/rtc_base/thread_checker_impl.h +++ b/rtc_base/thread_checker_impl.h @@ -13,7 +13,7 @@ #ifndef RTC_BASE_THREAD_CHECKER_IMPL_H_ #define RTC_BASE_THREAD_CHECKER_IMPL_H_ -#include "rtc_base/criticalsection.h" +#include "rtc_base/critical_section.h" #include "rtc_base/platform_thread_types.h" namespace rtc { diff --git a/rtc_base/thread_checker_unittest.cc b/rtc_base/thread_checker_unittest.cc index 52397a9929..a40196ff74 100644 --- a/rtc_base/thread_checker_unittest.cc +++ b/rtc_base/thread_checker_unittest.cc @@ -14,9 +14,9 @@ #include #include "rtc_base/checks.h" -#include "rtc_base/constructormagic.h" -#include "rtc_base/nullsocketserver.h" -#include "rtc_base/socketserver.h" +#include "rtc_base/constructor_magic.h" +#include "rtc_base/null_socket_server.h" +#include "rtc_base/socket_server.h" #include "rtc_base/task_queue.h" #include "rtc_base/thread.h" #include "rtc_base/thread_checker.h" diff --git a/rtc_base/thread_unittest.cc b/rtc_base/thread_unittest.cc index 68930f80ae..d87c332ea2 100644 --- a/rtc_base/thread_unittest.cc +++ b/rtc_base/thread_unittest.cc @@ -10,13 +10,13 @@ #include -#include "rtc_base/asyncinvoker.h" -#include "rtc_base/asyncudpsocket.h" +#include "rtc_base/async_invoker.h" +#include "rtc_base/async_udp_socket.h" #include "rtc_base/event.h" #include "rtc_base/gunit.h" -#include "rtc_base/nullsocketserver.h" -#include "rtc_base/physicalsocketserver.h" -#include "rtc_base/socketaddress.h" +#include "rtc_base/null_socket_server.h" +#include "rtc_base/physical_socket_server.h" +#include "rtc_base/socket_address.h" #include "rtc_base/third_party/sigslot/sigslot.h" #include "rtc_base/thread.h" diff --git a/rtc_base/time_utils.cc b/rtc_base/time_utils.cc index 0f79a87ee1..53f8b36623 100644 --- a/rtc_base/time_utils.cc +++ b/rtc_base/time_utils.cc @@ -29,7 +29,7 @@ #endif #include "rtc_base/checks.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/time_utils.h" namespace rtc { diff --git a/rtc_base/time_utils.h b/rtc_base/time_utils.h index c6ddd73e3d..d1d8b05064 100644 --- a/rtc_base/time_utils.h +++ b/rtc_base/time_utils.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef RTC_BASE_TIMEUTILS_H_ -#define RTC_BASE_TIMEUTILS_H_ +#ifndef RTC_BASE_TIME_UTILS_H_ +#define RTC_BASE_TIME_UTILS_H_ #include #include @@ -165,4 +165,4 @@ class IntervalRange { } // namespace rtc -#endif // RTC_BASE_TIMEUTILS_H_ +#endif // RTC_BASE_TIME_UTILS_H_ diff --git a/rtc_base/time_utils_unittest.cc b/rtc_base/time_utils_unittest.cc index a2e9a3f9e6..b4cefb7e46 100644 --- a/rtc_base/time_utils_unittest.cc +++ b/rtc_base/time_utils_unittest.cc @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "rtc_base/timeutils.h" +#include "rtc_base/time_utils.h" #include #include "api/units/time_delta.h" #include "rtc_base/event.h" -#include "rtc_base/fakeclock.h" +#include "rtc_base/fake_clock.h" #include "rtc_base/helpers.h" #include "rtc_base/location.h" -#include "rtc_base/messagehandler.h" +#include "rtc_base/message_handler.h" #include "rtc_base/thread.h" #include "test/gtest.h" diff --git a/rtc_base/timestamp_aligner.cc b/rtc_base/timestamp_aligner.cc index f2da101727..3d92dd8624 100644 --- a/rtc_base/timestamp_aligner.cc +++ b/rtc_base/timestamp_aligner.cc @@ -13,8 +13,8 @@ #include "rtc_base/checks.h" #include "rtc_base/logging.h" -#include "rtc_base/timestampaligner.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/time_utils.h" +#include "rtc_base/timestamp_aligner.h" namespace rtc { diff --git a/rtc_base/timestamp_aligner.h b/rtc_base/timestamp_aligner.h index 6fa8d697e3..2146880b04 100644 --- a/rtc_base/timestamp_aligner.h +++ b/rtc_base/timestamp_aligner.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef RTC_BASE_TIMESTAMPALIGNER_H_ -#define RTC_BASE_TIMESTAMPALIGNER_H_ +#ifndef RTC_BASE_TIMESTAMP_ALIGNER_H_ +#define RTC_BASE_TIMESTAMP_ALIGNER_H_ #include -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace rtc { @@ -71,4 +71,4 @@ class TimestampAligner { } // namespace rtc -#endif // RTC_BASE_TIMESTAMPALIGNER_H_ +#endif // RTC_BASE_TIMESTAMP_ALIGNER_H_ diff --git a/rtc_base/timestamp_aligner_unittest.cc b/rtc_base/timestamp_aligner_unittest.cc index b57f480d39..f92cd96bb1 100644 --- a/rtc_base/timestamp_aligner_unittest.cc +++ b/rtc_base/timestamp_aligner_unittest.cc @@ -13,8 +13,8 @@ #include #include "rtc_base/random.h" -#include "rtc_base/timestampaligner.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/time_utils.h" +#include "rtc_base/timestamp_aligner.h" #include "test/gtest.h" namespace rtc { diff --git a/rtc_base/unittest_main.cc b/rtc_base/unittest_main.cc index 981f6802cf..def010465d 100644 --- a/rtc_base/unittest_main.cc +++ b/rtc_base/unittest_main.cc @@ -16,15 +16,15 @@ #include "rtc_base/flags.h" #include "rtc_base/logging.h" -#include "rtc_base/ssladapter.h" -#include "rtc_base/sslstreamadapter.h" +#include "rtc_base/ssl_adapter.h" +#include "rtc_base/ssl_stream_adapter.h" #include "system_wrappers/include/field_trial.h" #include "system_wrappers/include/metrics.h" #include "test/field_trial.h" #include "test/gtest.h" #if defined(WEBRTC_WIN) -#include "rtc_base/win32socketinit.h" +#include "rtc_base/win32_socket_init.h" #endif #if defined(WEBRTC_IOS) diff --git a/rtc_base/virtual_socket_server.cc b/rtc_base/virtual_socket_server.cc index 79694112c8..3255124b8e 100644 --- a/rtc_base/virtual_socket_server.cc +++ b/rtc_base/virtual_socket_server.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "rtc_base/virtualsocketserver.h" +#include "rtc_base/virtual_socket_server.h" #include #include @@ -19,12 +19,12 @@ #include #include "rtc_base/checks.h" -#include "rtc_base/fakeclock.h" +#include "rtc_base/fake_clock.h" #include "rtc_base/logging.h" -#include "rtc_base/physicalsocketserver.h" -#include "rtc_base/socketaddresspair.h" +#include "rtc_base/physical_socket_server.h" +#include "rtc_base/socket_address_pair.h" #include "rtc_base/thread.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/time_utils.h" namespace rtc { #if defined(WEBRTC_WIN) diff --git a/rtc_base/virtual_socket_server.h b/rtc_base/virtual_socket_server.h index 4fa7d77a87..610c0fb371 100644 --- a/rtc_base/virtual_socket_server.h +++ b/rtc_base/virtual_socket_server.h @@ -8,18 +8,18 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef RTC_BASE_VIRTUALSOCKETSERVER_H_ -#define RTC_BASE_VIRTUALSOCKETSERVER_H_ +#ifndef RTC_BASE_VIRTUAL_SOCKET_SERVER_H_ +#define RTC_BASE_VIRTUAL_SOCKET_SERVER_H_ #include #include #include "rtc_base/checks.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" #include "rtc_base/event.h" -#include "rtc_base/fakeclock.h" -#include "rtc_base/messagequeue.h" -#include "rtc_base/socketserver.h" +#include "rtc_base/fake_clock.h" +#include "rtc_base/message_queue.h" +#include "rtc_base/socket_server.h" namespace rtc { @@ -409,4 +409,4 @@ class VirtualSocket : public AsyncSocket, } // namespace rtc -#endif // RTC_BASE_VIRTUALSOCKETSERVER_H_ +#endif // RTC_BASE_VIRTUAL_SOCKET_SERVER_H_ diff --git a/rtc_base/virtual_socket_unittest.cc b/rtc_base/virtual_socket_unittest.cc index 77f0367e64..ac0af08b3f 100644 --- a/rtc_base/virtual_socket_unittest.cc +++ b/rtc_base/virtual_socket_unittest.cc @@ -23,24 +23,24 @@ #include "absl/memory/memory.h" #include "rtc_base/arraysize.h" -#include "rtc_base/asyncpacketsocket.h" -#include "rtc_base/asyncsocket.h" -#include "rtc_base/asyncudpsocket.h" -#include "rtc_base/fakeclock.h" +#include "rtc_base/async_packet_socket.h" +#include "rtc_base/async_socket.h" +#include "rtc_base/async_udp_socket.h" +#include "rtc_base/fake_clock.h" #include "rtc_base/gunit.h" -#include "rtc_base/ipaddress.h" +#include "rtc_base/ip_address.h" #include "rtc_base/location.h" #include "rtc_base/logging.h" -#include "rtc_base/messagehandler.h" -#include "rtc_base/messagequeue.h" +#include "rtc_base/message_handler.h" +#include "rtc_base/message_queue.h" #include "rtc_base/socket.h" -#include "rtc_base/socketaddress.h" -#include "rtc_base/testclient.h" -#include "rtc_base/testutils.h" +#include "rtc_base/socket_address.h" +#include "rtc_base/test_client.h" +#include "rtc_base/test_utils.h" #include "rtc_base/third_party/sigslot/sigslot.h" #include "rtc_base/thread.h" -#include "rtc_base/timeutils.h" -#include "rtc_base/virtualsocketserver.h" +#include "rtc_base/time_utils.h" +#include "rtc_base/virtual_socket_server.h" #include "test/gtest.h" namespace rtc { diff --git a/rtc_base/weak_ptr.h b/rtc_base/weak_ptr.h index 8acfab0f03..daeb6712f3 100644 --- a/rtc_base/weak_ptr.h +++ b/rtc_base/weak_ptr.h @@ -15,8 +15,8 @@ #include -#include "rtc_base/refcount.h" -#include "rtc_base/refcountedobject.h" +#include "rtc_base/ref_count.h" +#include "rtc_base/ref_counted_object.h" #include "rtc_base/scoped_ref_ptr.h" #include "rtc_base/sequenced_task_checker.h" diff --git a/rtc_base/win/windows_version.cc b/rtc_base/win/windows_version.cc index 65ef4fd86f..72aa5c66b7 100644 --- a/rtc_base/win/windows_version.cc +++ b/rtc_base/win/windows_version.cc @@ -14,7 +14,7 @@ #include #include "rtc_base/checks.h" -#include "rtc_base/stringutils.h" +#include "rtc_base/string_utils.h" #if !defined(__clang__) && _MSC_FULL_VER < 191125507 #error VS 2017 Update 3.2 or higher is required diff --git a/rtc_base/win/windows_version.h b/rtc_base/win/windows_version.h index 39d333e4d7..fa0a76775c 100644 --- a/rtc_base/win/windows_version.h +++ b/rtc_base/win/windows_version.h @@ -14,7 +14,7 @@ #include #include -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" typedef void* HANDLE; diff --git a/rtc_base/win32.cc b/rtc_base/win32.cc index 480d97b5c5..b5a2611914 100644 --- a/rtc_base/win32.cc +++ b/rtc_base/win32.cc @@ -15,10 +15,10 @@ #include #include "rtc_base/arraysize.h" -#include "rtc_base/byteorder.h" +#include "rtc_base/byte_order.h" #include "rtc_base/checks.h" #include "rtc_base/logging.h" -#include "rtc_base/stringutils.h" +#include "rtc_base/string_utils.h" namespace rtc { diff --git a/rtc_base/win32_socket_init.h b/rtc_base/win32_socket_init.h index 7f9bdccd6d..4a90e142b6 100644 --- a/rtc_base/win32_socket_init.h +++ b/rtc_base/win32_socket_init.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef RTC_BASE_WIN32SOCKETINIT_H_ -#define RTC_BASE_WIN32SOCKETINIT_H_ +#ifndef RTC_BASE_WIN32_SOCKET_INIT_H_ +#define RTC_BASE_WIN32_SOCKET_INIT_H_ #ifndef WEBRTC_WIN #error "Only #include this header in Windows builds" @@ -38,4 +38,4 @@ class WinsockInitializer { } // namespace rtc -#endif // RTC_BASE_WIN32SOCKETINIT_H_ +#endif // RTC_BASE_WIN32_SOCKET_INIT_H_ diff --git a/rtc_base/win32_socket_server.cc b/rtc_base/win32_socket_server.cc index 230f3ed46f..389b76b352 100644 --- a/rtc_base/win32_socket_server.cc +++ b/rtc_base/win32_socket_server.cc @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "rtc_base/win32socketserver.h" +#include "rtc_base/win32_socket_server.h" #include // NOLINT #include -#include "rtc_base/byteorder.h" +#include "rtc_base/byte_order.h" #include "rtc_base/checks.h" #include "rtc_base/logging.h" -#include "rtc_base/timeutils.h" // For Time, TimeSince -#include "rtc_base/win32window.h" +#include "rtc_base/time_utils.h" // For Time, TimeSince +#include "rtc_base/win32_window.h" namespace rtc { diff --git a/rtc_base/win32_socket_server.h b/rtc_base/win32_socket_server.h index 0b11d644ec..37515d92ff 100644 --- a/rtc_base/win32_socket_server.h +++ b/rtc_base/win32_socket_server.h @@ -8,18 +8,18 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef RTC_BASE_WIN32SOCKETSERVER_H_ -#define RTC_BASE_WIN32SOCKETSERVER_H_ +#ifndef RTC_BASE_WIN32_SOCKET_SERVER_H_ +#define RTC_BASE_WIN32_SOCKET_SERVER_H_ #if defined(WEBRTC_WIN) -#include "rtc_base/asyncsocket.h" -#include "rtc_base/criticalsection.h" -#include "rtc_base/messagequeue.h" +#include "rtc_base/async_socket.h" +#include "rtc_base/critical_section.h" +#include "rtc_base/message_queue.h" #include "rtc_base/socket.h" -#include "rtc_base/socketfactory.h" -#include "rtc_base/socketserver.h" +#include "rtc_base/socket_factory.h" +#include "rtc_base/socket_server.h" #include "rtc_base/thread.h" -#include "rtc_base/win32window.h" +#include "rtc_base/win32_window.h" namespace rtc { @@ -151,4 +151,4 @@ class Win32Thread : public Thread { #endif // WEBRTC_WIN -#endif // RTC_BASE_WIN32SOCKETSERVER_H_ +#endif // RTC_BASE_WIN32_SOCKET_SERVER_H_ diff --git a/rtc_base/win32_socket_server_unittest.cc b/rtc_base/win32_socket_server_unittest.cc index 60295f1074..d8484d113b 100644 --- a/rtc_base/win32_socket_server_unittest.cc +++ b/rtc_base/win32_socket_server_unittest.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 "rtc_base/win32socketserver.h" +#include "rtc_base/win32_socket_server.h" #include "rtc_base/gunit.h" #include "rtc_base/socket_unittest.h" #include "rtc_base/thread.h" diff --git a/rtc_base/win32_unittest.cc b/rtc_base/win32_unittest.cc index 5691be46c8..913aa01352 100644 --- a/rtc_base/win32_unittest.cc +++ b/rtc_base/win32_unittest.cc @@ -11,7 +11,7 @@ #include #include "rtc_base/gunit.h" -#include "rtc_base/nethelpers.h" +#include "rtc_base/net_helpers.h" #include "rtc_base/win32.h" #if !defined(WEBRTC_WIN) diff --git a/rtc_base/win32_window.cc b/rtc_base/win32_window.cc index 4290894d26..fc7b4c3099 100644 --- a/rtc_base/win32_window.cc +++ b/rtc_base/win32_window.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "rtc_base/win32window.h" +#include "rtc_base/win32_window.h" #include "rtc_base/checks.h" #include "rtc_base/logging.h" diff --git a/rtc_base/win32_window.h b/rtc_base/win32_window.h index e96aa350fb..5256a85d09 100644 --- a/rtc_base/win32_window.h +++ b/rtc_base/win32_window.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef RTC_BASE_WIN32WINDOW_H_ -#define RTC_BASE_WIN32WINDOW_H_ +#ifndef RTC_BASE_WIN32_WINDOW_H_ +#define RTC_BASE_WIN32_WINDOW_H_ #if defined(WEBRTC_WIN) @@ -67,4 +67,4 @@ class Win32Window { #endif // WEBRTC_WIN -#endif // RTC_BASE_WIN32WINDOW_H_ +#endif // RTC_BASE_WIN32_WINDOW_H_ diff --git a/rtc_base/win32_window_unittest.cc b/rtc_base/win32_window_unittest.cc index c659349e0e..62430bb1d9 100644 --- a/rtc_base/win32_window_unittest.cc +++ b/rtc_base/win32_window_unittest.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "rtc_base/win32window.h" +#include "rtc_base/win32_window.h" #include "rtc_base/gunit.h" #include "rtc_base/logging.h" diff --git a/rtc_tools/event_log_visualizer/main.cc b/rtc_tools/event_log_visualizer/main.cc index 8c92be5ae9..651627ede9 100644 --- a/rtc_tools/event_log_visualizer/main.cc +++ b/rtc_tools/event_log_visualizer/main.cc @@ -28,7 +28,7 @@ #include "rtc_tools/event_log_visualizer/plot_python.h" #include "system_wrappers/include/field_trial.h" #include "test/field_trial.h" -#include "test/testsupport/fileutils.h" +#include "test/testsupport/file_utils.h" WEBRTC_DEFINE_string( plot_profile, diff --git a/rtc_tools/frame_analyzer/reference_less_video_analysis_unittest.cc b/rtc_tools/frame_analyzer/reference_less_video_analysis_unittest.cc index 093a941f48..2c736d1285 100644 --- a/rtc_tools/frame_analyzer/reference_less_video_analysis_unittest.cc +++ b/rtc_tools/frame_analyzer/reference_less_video_analysis_unittest.cc @@ -13,7 +13,7 @@ #include "rtc_tools/frame_analyzer/reference_less_video_analysis_lib.h" #include "rtc_tools/video_file_reader.h" #include "test/gtest.h" -#include "test/testsupport/fileutils.h" +#include "test/testsupport/file_utils.h" class ReferenceLessVideoAnalysisTest : public ::testing::Test { public: diff --git a/rtc_tools/frame_analyzer/video_color_aligner.cc b/rtc_tools/frame_analyzer/video_color_aligner.cc index e99f6e7d3b..da72341f80 100644 --- a/rtc_tools/frame_analyzer/video_color_aligner.cc +++ b/rtc_tools/frame_analyzer/video_color_aligner.cc @@ -19,7 +19,7 @@ #include "api/array_view.h" #include "api/video/i420_buffer.h" #include "rtc_base/checks.h" -#include "rtc_base/refcountedobject.h" +#include "rtc_base/ref_counted_object.h" #include "rtc_tools/frame_analyzer/linear_least_squares.h" #include "third_party/libyuv/include/libyuv/planar_functions.h" #include "third_party/libyuv/include/libyuv/scale.h" diff --git a/rtc_tools/frame_analyzer/video_color_aligner_unittest.cc b/rtc_tools/frame_analyzer/video_color_aligner_unittest.cc index 9e07cf015a..980898b6bd 100644 --- a/rtc_tools/frame_analyzer/video_color_aligner_unittest.cc +++ b/rtc_tools/frame_analyzer/video_color_aligner_unittest.cc @@ -16,7 +16,7 @@ #include "rtc_tools/frame_analyzer/video_quality_analysis.h" #include "rtc_tools/video_file_reader.h" #include "test/gtest.h" -#include "test/testsupport/fileutils.h" +#include "test/testsupport/file_utils.h" namespace webrtc { namespace test { diff --git a/rtc_tools/frame_analyzer/video_geometry_aligner.cc b/rtc_tools/frame_analyzer/video_geometry_aligner.cc index d3cbc051c9..db397bc3a5 100644 --- a/rtc_tools/frame_analyzer/video_geometry_aligner.cc +++ b/rtc_tools/frame_analyzer/video_geometry_aligner.cc @@ -14,7 +14,7 @@ #include "api/video/i420_buffer.h" #include "rtc_base/checks.h" -#include "rtc_base/refcountedobject.h" +#include "rtc_base/ref_counted_object.h" #include "rtc_tools/frame_analyzer/video_quality_analysis.h" #include "third_party/libyuv/include/libyuv/scale.h" diff --git a/rtc_tools/frame_analyzer/video_geometry_aligner_unittest.cc b/rtc_tools/frame_analyzer/video_geometry_aligner_unittest.cc index 1ffe515f28..6b0904a8e1 100644 --- a/rtc_tools/frame_analyzer/video_geometry_aligner_unittest.cc +++ b/rtc_tools/frame_analyzer/video_geometry_aligner_unittest.cc @@ -16,7 +16,7 @@ #include "rtc_tools/frame_analyzer/video_quality_analysis.h" #include "rtc_tools/video_file_reader.h" #include "test/gtest.h" -#include "test/testsupport/fileutils.h" +#include "test/testsupport/file_utils.h" namespace webrtc { namespace test { diff --git a/rtc_tools/frame_analyzer/video_quality_analysis_unittest.cc b/rtc_tools/frame_analyzer/video_quality_analysis_unittest.cc index 970bfa8fdf..4cd4bfaeef 100644 --- a/rtc_tools/frame_analyzer/video_quality_analysis_unittest.cc +++ b/rtc_tools/frame_analyzer/video_quality_analysis_unittest.cc @@ -18,7 +18,7 @@ #include "rtc_tools/frame_analyzer/video_quality_analysis.h" #include "test/gtest.h" -#include "test/testsupport/fileutils.h" +#include "test/testsupport/file_utils.h" namespace webrtc { namespace test { diff --git a/rtc_tools/frame_analyzer/video_temporal_aligner.cc b/rtc_tools/frame_analyzer/video_temporal_aligner.cc index ec227c5583..d03ec61078 100644 --- a/rtc_tools/frame_analyzer/video_temporal_aligner.cc +++ b/rtc_tools/frame_analyzer/video_temporal_aligner.cc @@ -20,7 +20,7 @@ #include "api/video/i420_buffer.h" #include "api/video/video_frame_buffer.h" -#include "rtc_base/refcountedobject.h" +#include "rtc_base/ref_counted_object.h" #include "rtc_tools/frame_analyzer/video_quality_analysis.h" namespace webrtc { diff --git a/rtc_tools/frame_analyzer/video_temporal_aligner_unittest.cc b/rtc_tools/frame_analyzer/video_temporal_aligner_unittest.cc index 5db9928f51..9519a7462b 100644 --- a/rtc_tools/frame_analyzer/video_temporal_aligner_unittest.cc +++ b/rtc_tools/frame_analyzer/video_temporal_aligner_unittest.cc @@ -15,7 +15,7 @@ #include "rtc_tools/frame_analyzer/video_quality_analysis.h" #include "rtc_tools/video_file_reader.h" #include "test/gtest.h" -#include "test/testsupport/fileutils.h" +#include "test/testsupport/file_utils.h" namespace webrtc { namespace test { diff --git a/rtc_tools/frame_editing/frame_editing_unittest.cc b/rtc_tools/frame_editing/frame_editing_unittest.cc index c9065e1d78..a55a4e583f 100644 --- a/rtc_tools/frame_editing/frame_editing_unittest.cc +++ b/rtc_tools/frame_editing/frame_editing_unittest.cc @@ -18,7 +18,7 @@ #include "common_video/libyuv/include/webrtc_libyuv.h" #include "rtc_tools/frame_editing/frame_editing_lib.h" #include "test/gtest.h" -#include "test/testsupport/fileutils.h" +#include "test/testsupport/file_utils.h" namespace webrtc { namespace test { diff --git a/rtc_tools/network_tester/config_reader.h b/rtc_tools/network_tester/config_reader.h index deee245eef..69105f1988 100644 --- a/rtc_tools/network_tester/config_reader.h +++ b/rtc_tools/network_tester/config_reader.h @@ -15,7 +15,7 @@ #include #include "absl/types/optional.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" #include "rtc_base/ignore_wundef.h" diff --git a/rtc_tools/network_tester/network_tester_unittest.cc b/rtc_tools/network_tester/network_tester_unittest.cc index 74c4855c9d..156e8bb23c 100644 --- a/rtc_tools/network_tester/network_tester_unittest.cc +++ b/rtc_tools/network_tester/network_tester_unittest.cc @@ -15,7 +15,7 @@ #include "rtc_base/gunit.h" #include "rtc_tools/network_tester/test_controller.h" #include "test/gtest.h" -#include "test/testsupport/fileutils.h" +#include "test/testsupport/file_utils.h" namespace webrtc { diff --git a/rtc_tools/network_tester/packet_logger.h b/rtc_tools/network_tester/packet_logger.h index 6659d6c176..109ee4c14f 100644 --- a/rtc_tools/network_tester/packet_logger.h +++ b/rtc_tools/network_tester/packet_logger.h @@ -14,7 +14,7 @@ #include #include -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" #include "rtc_base/ignore_wundef.h" #ifdef WEBRTC_NETWORK_TESTER_PROTO diff --git a/rtc_tools/network_tester/packet_sender.cc b/rtc_tools/network_tester/packet_sender.cc index 4ad2375ebe..62b93e34c2 100644 --- a/rtc_tools/network_tester/packet_sender.cc +++ b/rtc_tools/network_tester/packet_sender.cc @@ -16,7 +16,7 @@ #include #include "absl/types/optional.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/time_utils.h" #include "rtc_tools/network_tester/config_reader.h" #include "rtc_tools/network_tester/test_controller.h" diff --git a/rtc_tools/network_tester/packet_sender.h b/rtc_tools/network_tester/packet_sender.h index da3eb293b1..886a6f56fe 100644 --- a/rtc_tools/network_tester/packet_sender.h +++ b/rtc_tools/network_tester/packet_sender.h @@ -14,7 +14,7 @@ #include #include -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" #include "rtc_base/ignore_wundef.h" #include "rtc_base/sequenced_task_checker.h" #include "rtc_base/task_queue.h" diff --git a/rtc_tools/network_tester/test_controller.cc b/rtc_tools/network_tester/test_controller.cc index 9e8029436d..87fb4c04ce 100644 --- a/rtc_tools/network_tester/test_controller.cc +++ b/rtc_tools/network_tester/test_controller.cc @@ -14,7 +14,7 @@ #include "absl/types/optional.h" #include "rtc_base/checks.h" -#include "rtc_base/ipaddress.h" +#include "rtc_base/ip_address.h" #include "rtc_base/thread.h" namespace webrtc { diff --git a/rtc_tools/network_tester/test_controller.h b/rtc_tools/network_tester/test_controller.h index f411c9b9b8..bde3b04b19 100644 --- a/rtc_tools/network_tester/test_controller.h +++ b/rtc_tools/network_tester/test_controller.h @@ -18,13 +18,13 @@ #include #include "absl/types/optional.h" -#include "p2p/base/basicpacketsocketfactory.h" -#include "rtc_base/asyncpacketsocket.h" -#include "rtc_base/constructormagic.h" -#include "rtc_base/criticalsection.h" +#include "p2p/base/basic_packet_socket_factory.h" +#include "rtc_base/async_packet_socket.h" +#include "rtc_base/constructor_magic.h" +#include "rtc_base/critical_section.h" #include "rtc_base/ignore_wundef.h" #include "rtc_base/sequenced_task_checker.h" -#include "rtc_base/socketaddress.h" +#include "rtc_base/socket_address.h" #include "rtc_base/third_party/sigslot/sigslot.h" #include "rtc_base/thread_annotations.h" #include "rtc_base/thread_checker.h" diff --git a/rtc_tools/sanitizers_unittest.cc b/rtc_tools/sanitizers_unittest.cc index 077cf7e699..adee3a2240 100644 --- a/rtc_tools/sanitizers_unittest.cc +++ b/rtc_tools/sanitizers_unittest.cc @@ -14,7 +14,7 @@ #include "absl/memory/memory.h" #include "rtc_base/checks.h" -#include "rtc_base/nullsocketserver.h" +#include "rtc_base/null_socket_server.h" #include "rtc_base/thread.h" #include "test/gtest.h" diff --git a/rtc_tools/simple_command_line_parser.h b/rtc_tools/simple_command_line_parser.h index 0acaf9eb87..b30ce72a4d 100644 --- a/rtc_tools/simple_command_line_parser.h +++ b/rtc_tools/simple_command_line_parser.h @@ -15,7 +15,7 @@ #include #include -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" #include "rtc_base/gtest_prod_util.h" // This is a very basic command line parsing class. We pass the command line diff --git a/rtc_tools/video_file_reader.cc b/rtc_tools/video_file_reader.cc index b98e386050..573315135f 100644 --- a/rtc_tools/video_file_reader.cc +++ b/rtc_tools/video_file_reader.cc @@ -19,9 +19,9 @@ #include "api/video/i420_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/string_encode.h" #include "rtc_base/string_to_number.h" -#include "rtc_base/stringencode.h" namespace webrtc { namespace test { diff --git a/rtc_tools/video_file_reader.h b/rtc_tools/video_file_reader.h index 92a724a765..a0315e34ed 100644 --- a/rtc_tools/video_file_reader.h +++ b/rtc_tools/video_file_reader.h @@ -16,7 +16,7 @@ #include #include "api/video/video_frame_buffer.h" -#include "rtc_base/refcount.h" +#include "rtc_base/ref_count.h" #include "rtc_base/scoped_ref_ptr.h" namespace webrtc { diff --git a/rtc_tools/video_file_reader_unittest.cc b/rtc_tools/video_file_reader_unittest.cc index 9353727745..c0258d1cd8 100644 --- a/rtc_tools/video_file_reader_unittest.cc +++ b/rtc_tools/video_file_reader_unittest.cc @@ -14,7 +14,7 @@ #include #include "test/gtest.h" -#include "test/testsupport/fileutils.h" +#include "test/testsupport/file_utils.h" namespace webrtc { namespace test { diff --git a/rtc_tools/video_file_writer_unittest.cc b/rtc_tools/video_file_writer_unittest.cc index 4c4b1a58e4..9a74b5f442 100644 --- a/rtc_tools/video_file_writer_unittest.cc +++ b/rtc_tools/video_file_writer_unittest.cc @@ -16,7 +16,7 @@ #include "rtc_tools/video_file_reader.h" #include "rtc_tools/video_file_writer.h" #include "test/gtest.h" -#include "test/testsupport/fileutils.h" +#include "test/testsupport/file_utils.h" namespace webrtc { namespace test { diff --git a/sdk/android/BUILD.gn b/sdk/android/BUILD.gn index 03d3d0e5e5..ed0bdc405d 100644 --- a/sdk/android/BUILD.gn +++ b/sdk/android/BUILD.gn @@ -127,7 +127,7 @@ if (is_android) { 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 @@ if (is_android) { 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 @@ if (is_android) { 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 @@ if (is_android) { 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 @@ if (is_android) { 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 @@ if (is_android) { 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 @@ if (is_android) { visibility = [ "*" ] allow_poison = [ "software_video_codecs" ] sources = [ - "src/jni/vp8codec.cc", + "src/jni/vp8_codec.cc", ] deps = [ ":base_jni", @@ -809,7 +809,7 @@ if (is_android) { visibility = [ "*" ] allow_poison = [ "software_video_codecs" ] sources = [ - "src/jni/vp9codec.cc", + "src/jni/vp9_codec.cc", ] deps = [ ":base_jni", @@ -867,8 +867,8 @@ if (is_android) { 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 @@ if (is_android) { 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 @@ if (is_android) { 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 @@ if (is_android) { 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 @@ if (is_android) { 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 @@ if (is_android) { "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 89ffeb6971..fb7ce91ca0 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 5d33ab781e..822fab9386 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 #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 537a2470c9..135ebb1e86 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 #include -#include "rtc_base/networkmonitor.h" +#include "rtc_base/network_monitor.h" namespace webrtc { @@ -33,4 +33,4 @@ CreateAndroidNetworkMonitorFactory(); } // 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 3c5fb3d3e1..6b78e7e7f7 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 b26ef2c4c5..e37a992445 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 #include -#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 892905bf0f..e6839754ac 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 #include #include -#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 652be7adc6..889d6092e7 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 #include -#include "api/peerconnectioninterface.h" +#include "api/peer_connection_interface.h" #include "rtc_base/thread.h" namespace webrtc { @@ -31,4 +31,4 @@ jobject NativeToJavaPeerConnectionFactory( } // 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 aae1de7ff0..a813f40313 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 75ebdbce30..d46f3e8f53 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 -#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 @@ rtc::scoped_refptr CreateJavaVideoSource( } // 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 fe2d45a04a..7b87ad6577 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 fc670ea916..e32cf34806 100644 --- a/sdk/android/native_api/video/wrapper.h +++ b/sdk/android/native_api/video/wrapper.h @@ -14,7 +14,7 @@ #include #include -#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 8774119bff..6f52880d27 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 5c7289df4b..fb2c30fab1 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 453b7da262..53efd224b0 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 5b902b7f15..de02071bb4 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 7ecf9f8eb4..17d1df9916 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 cc418eef13..55955b0d41 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 @@ -84,4 +84,4 @@ static inline bool CheckException(JNIEnv* jni) { } // 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 70d5b58b22..a73167d717 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 0bf7186fbf..aaa2d9adba 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 7ac17281f9..b45d17758c 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 #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 563d5bd5e4..898ddc98b0 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 #include #include #include -#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 @@ using webrtc::jni::AndroidNetworkMonitorFactory; } // 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 407e6f68e1..e703974405 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 f573eda67a..4fbbffbb4b 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 -#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 4f8442e577..c68f8d1ef8 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 b43b5b3157..e6146d0d47 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 8134d3c0a2..7393275a07 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 ec380830af..0ed0fa2d5c 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 a9d647f69a..99a2a7f407 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 36bd70c4d8..61be7defa7 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 390cec0e9e..74c0f365bc 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 00a5f1ecc8..67d6c1fbcf 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 32d9e5c9cf..4f1490728c 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 51759fc95a..4702f5e2a9 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 @@ using webrtc::jni::FreeGlobalClassReferenceHolder; } // 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 21f83364d9..daa7788bf3 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 66c226b1c9..02047aa822 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 #include "common_types.h" // NOLINT(build/include) @@ -33,4 +33,4 @@ ScopedJavaLocalRef NativeToJavaFrameTypeArray( } // 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 12324b5a06..c067abdff9 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 8129b1e90f..915a9351a4 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 24a6212543..d26c992846 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 83c61d6a08..88730ea4ea 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 cfa3c60abb..eebe668a37 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 bac51a06da..e48b88dcb7 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 @@ -36,4 +36,4 @@ class JNILogSink : public rtc::LogSink { } // 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 c332343607..fe6f8367c5 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 57ddc075e7..51acf41f03 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 #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 @@ ScopedJavaLocalRef CreateJavaNativeCapturerObserver( } // 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 3eee11b3a5..609c1b056e 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 ed1d0bc879..355df39cd3 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 d933daa519..bc65c3a594 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 0f38b13f78..a592df8255 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 9890264a55..a9c8f2609a 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 #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 @@ absl::optional JavaToNativeOptionalCryptoOptions( } // 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 d07e00e39a..4f704e2f61 100644 --- a/sdk/android/src/jni/pc/data_channel.cc +++ b/sdk/android/src/jni/pc/data_channel.cc @@ -13,12 +13,12 @@ #include #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 c6786f64e7..9da1b67dae 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 @@ ScopedJavaLocalRef WrapNativeDataChannel( } // 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 0dad8bdb7f..a9c1995334 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 b9d66a4679..ee4a4cd807 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 -#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 662b649ba6..0feeeb49f0 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 -#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 @@ absl::optional JavaToNativeNetworkPreference( } // 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 d1d96279f2..e2da4ec216 100644 --- a/sdk/android/src/jni/pc/media.cc +++ b/sdk/android/src/jni/pc/media.cc @@ -11,11 +11,11 @@ #include -#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 e7a4bb5037..8c7d173c43 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 2fbf34e74a..e29b900bd5 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 #include -#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 @@ std::unique_ptr JavaToNativeMediaConstraints( } // 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 6a7f47ba52..83cdfb7f9b 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 35efc1704f..deb4252246 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 479ab11e0c..135a3499bb 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 #include -#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 @@ jclass GetMediaStreamClass(JNIEnv* env); } // 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 67044ccb88..19ce61026f 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 8af425c9a4..8bfe302db7 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 -#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 @@ cricket::MediaType JavaToNativeMediaType(JNIEnv* jni, } // 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 2d62ea32a1..5d7a0bb94b 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 bacd42dfcd..cc71001be7 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 #include #include -#include "api/peerconnectioninterface.h" +#include "api/peer_connection_interface.h" #include "rtc_base/thread.h" namespace webrtc { @@ -60,4 +60,4 @@ class OwnedFactoryAndThreads { } // 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 142454ae61..50a48c4796 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 #include @@ -33,28 +33,28 @@ #include #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 7a282bf7a2..15465e4a53 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 #include #include -#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 @@ class OwnedPeerConnection { } // 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 726295c55e..293031ff88 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 #include @@ -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 6f09776df9..ba8dbe6871 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 -#include "api/peerconnectioninterface.h" +#include "api/peer_connection_interface.h" #include "rtc_base/thread.h" namespace webrtc { @@ -34,4 +34,4 @@ jobject NativeToJavaPeerConnectionFactory( } // 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 af5b07646a..d46faaf73a 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 f7d1f75d13..91a413cd37 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 @@ ScopedJavaLocalRef NativeToJavaRTCCertificatePEM( } // 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 966d2efb75..9443b5ddd4 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 #include -#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 a2794ff2f3..50fad1844d 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 -#include "api/peerconnectioninterface.h" +#include "api/peer_connection_interface.h" #include "sdk/android/src/jni/jni_helpers.h" namespace webrtc { @@ -38,4 +38,4 @@ class RTCStatsCollectorCallbackWrapper : public RTCStatsCollectorCallback { } // 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 3c7a9a9103..25adb4c68f 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 ae79793b1a..3bcd343fae 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 -#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 @@ ScopedJavaLocalRef NativeToJavaRtpParameters( } // 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 28e2f6e4e9..bc82ca8762 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 c2e9c31aed..dd8ba0e8df 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 -#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 @@ class JavaRtpReceiverGlobalOwner { } // 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 412046632b..42edb01013 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 5d30ed52e4..d782ca915f 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 -#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 @@ ScopedJavaLocalRef NativeToJavaRtpSender( } // 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 e7ec769a8e..50844fda49 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 #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 61f3e0cafc..e96276ca9d 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 -#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 @@ class JavaRtpTransceiverGlobalOwner { } // 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 87989ab047..47d13faedf 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 -#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 6673fececf..e23792cbcc 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 #include -#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 @@ class SetSdpObserverJni : public SetSessionDescriptionObserver { } // 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 bd3806d562..aa648fe0dc 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 diff --git a/sdk/android/src/jni/pc/session_description.h b/sdk/android/src/jni/pc/session_description.h index a7ef667158..fe308474a7 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 #include @@ -31,4 +31,4 @@ ScopedJavaLocalRef NativeToJavaSessionDescription( } // 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 2ff9a462e3..0f21fd30de 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 719fa44494..8c883f445b 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 #include -#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 @@ class SSLCertificateVerifierWrapper : public rtc::SSLCertificateVerifier { } // 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 f30a34c34d..c7534ec23f 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 diff --git a/sdk/android/src/jni/pc/stats_observer.h b/sdk/android/src/jni/pc/stats_observer.h index d21fb98abe..0cfd43384b 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 @@ class StatsObserverJni : public StatsObserver { } // 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 d1432af1b9..e756313ea8 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 ea6997310f..359234fc76 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 @@ TurnCustomizer* GetNativeTurnCustomizer( } // 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 c7c6e76d5d..0d168eb31e 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 3620343f59..942da435b0 100644 --- a/sdk/android/src/jni/timestamp_aligner.cc +++ b/sdk/android/src/jni/timestamp_aligner.cc @@ -10,8 +10,8 @@ #include -#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 20a641d139..58b911381d 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 2829c02b07..07b073086a 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 @@ -28,4 +28,4 @@ ScopedJavaLocalRef SdpVideoFormatToVideoCodecInfo( } // 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 b4a0a525f2..f8613c56f6 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 2804654e41..607bd46340 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 #include @@ -24,4 +24,4 @@ int32_t JavaToNativeVideoCodecStatus( } // 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 94b44676e1..792e297bed 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 a1716b10ba..2122fdc008 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 @@ -38,4 +38,4 @@ class VideoDecoderFactoryWrapper : public VideoDecoderFactory { } // 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 48cb88cc0f..fb67ccbbef 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 6c1423cf72..26dc3d5ed2 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 eb2958a908..55a395bee7 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 #include @@ -120,4 +120,4 @@ std::unique_ptr JavaToNativeVideoDecoder( } // 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 44026662db..83cfb82a94 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 2c2dadcaec..0650c12d32 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 #include @@ -45,4 +45,4 @@ class VideoEncoderFactoryWrapper : public VideoEncoderFactory { } // 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 6948ee08d0..af9863c846 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 2706e664f7..5d34cf75fe 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 @@ -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 3618f78473..0d2a9b67f4 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 #include @@ -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 @@ bool IsHardwareVideoEncoder(JNIEnv* jni, const JavaRef& j_encoder); } // 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 1d52433ab1..d196b035fb 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 @@ -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 107e03e17b..f6b569a3e5 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 @@ -84,4 +84,4 @@ int64_t GetJavaVideoFrameTimestampNs(JNIEnv* jni, } // 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 bbdda31431..6ffba9c158 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 7efe44405f..f16545434b 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 -#include "api/mediastreaminterface.h" +#include "api/media_stream_interface.h" #include "sdk/android/src/jni/jni_helpers.h" namespace webrtc { @@ -33,4 +33,4 @@ class VideoSinkWrapper : public rtc::VideoSinkInterface { } // 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 54f03c18ca..c95c599ce5 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 c42a4e6a2d..b3b1278cdb 100644 --- a/sdk/android/src/jni/video_track.cc +++ b/sdk/android/src/jni/video_track.cc @@ -10,10 +10,10 @@ #include -#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 { diff --git a/sdk/objc/api/RTCVideoRendererAdapter+Private.h b/sdk/objc/api/RTCVideoRendererAdapter+Private.h index 7cedba43f9..d983ae6c33 100644 --- a/sdk/objc/api/RTCVideoRendererAdapter+Private.h +++ b/sdk/objc/api/RTCVideoRendererAdapter+Private.h @@ -12,7 +12,7 @@ #import "base/RTCVideoRenderer.h" -#include "api/mediastreaminterface.h" +#include "api/media_stream_interface.h" NS_ASSUME_NONNULL_BEGIN diff --git a/sdk/objc/api/logging/RTCCallbackLogger.mm b/sdk/objc/api/logging/RTCCallbackLogger.mm index 8d415b9d4a..e58b03b549 100644 --- a/sdk/objc/api/logging/RTCCallbackLogger.mm +++ b/sdk/objc/api/logging/RTCCallbackLogger.mm @@ -13,8 +13,8 @@ #include #include "rtc_base/checks.h" +#include "rtc_base/log_sinks.h" #include "rtc_base/logging.h" -#include "rtc_base/logsinks.h" class CallbackLogSink : public rtc::LogSink { public: diff --git a/sdk/objc/api/peerconnection/RTCAudioTrack+Private.h b/sdk/objc/api/peerconnection/RTCAudioTrack+Private.h index fe30d65689..88dd971b67 100644 --- a/sdk/objc/api/peerconnection/RTCAudioTrack+Private.h +++ b/sdk/objc/api/peerconnection/RTCAudioTrack+Private.h @@ -10,7 +10,7 @@ #import "RTCAudioTrack.h" -#include "api/mediastreaminterface.h" +#include "api/media_stream_interface.h" NS_ASSUME_NONNULL_BEGIN diff --git a/sdk/objc/api/peerconnection/RTCCertificate.mm b/sdk/objc/api/peerconnection/RTCCertificate.mm index bce4c3bd58..250cfc4920 100644 --- a/sdk/objc/api/peerconnection/RTCCertificate.mm +++ b/sdk/objc/api/peerconnection/RTCCertificate.mm @@ -13,8 +13,8 @@ #import "base/RTCLogging.h" #include "rtc_base/logging.h" -#include "rtc_base/rtccertificategenerator.h" -#include "rtc_base/sslidentity.h" +#include "rtc_base/rtc_certificate_generator.h" +#include "rtc_base/ssl_identity.h" @implementation RTCCertificate diff --git a/sdk/objc/api/peerconnection/RTCConfiguration+Native.h b/sdk/objc/api/peerconnection/RTCConfiguration+Native.h index e14e6d4d9d..54783f049a 100644 --- a/sdk/objc/api/peerconnection/RTCConfiguration+Native.h +++ b/sdk/objc/api/peerconnection/RTCConfiguration+Native.h @@ -10,7 +10,7 @@ #import "RTCConfiguration.h" -#include "api/peerconnectioninterface.h" +#include "api/peer_connection_interface.h" NS_ASSUME_NONNULL_BEGIN diff --git a/sdk/objc/api/peerconnection/RTCConfiguration+Private.h b/sdk/objc/api/peerconnection/RTCConfiguration+Private.h index cb45441a15..845f779272 100644 --- a/sdk/objc/api/peerconnection/RTCConfiguration+Private.h +++ b/sdk/objc/api/peerconnection/RTCConfiguration+Private.h @@ -10,7 +10,7 @@ #import "RTCConfiguration.h" -#include "api/peerconnectioninterface.h" +#include "api/peer_connection_interface.h" NS_ASSUME_NONNULL_BEGIN diff --git a/sdk/objc/api/peerconnection/RTCConfiguration.mm b/sdk/objc/api/peerconnection/RTCConfiguration.mm index 4041f8399f..83ae575986 100644 --- a/sdk/objc/api/peerconnection/RTCConfiguration.mm +++ b/sdk/objc/api/peerconnection/RTCConfiguration.mm @@ -18,8 +18,8 @@ #import "RTCIntervalRange+Private.h" #import "base/RTCLogging.h" -#include "rtc_base/rtccertificategenerator.h" -#include "rtc_base/sslidentity.h" +#include "rtc_base/rtc_certificate_generator.h" +#include "rtc_base/ssl_identity.h" @implementation RTCConfiguration diff --git a/sdk/objc/api/peerconnection/RTCDataChannel+Private.h b/sdk/objc/api/peerconnection/RTCDataChannel+Private.h index a88a316b10..74d0455859 100644 --- a/sdk/objc/api/peerconnection/RTCDataChannel+Private.h +++ b/sdk/objc/api/peerconnection/RTCDataChannel+Private.h @@ -10,7 +10,7 @@ #import "RTCDataChannel.h" -#include "api/datachannelinterface.h" +#include "api/data_channel_interface.h" #include "rtc_base/scoped_ref_ptr.h" NS_ASSUME_NONNULL_BEGIN diff --git a/sdk/objc/api/peerconnection/RTCDataChannelConfiguration+Private.h b/sdk/objc/api/peerconnection/RTCDataChannelConfiguration+Private.h index 11be5a6c24..244f742ccc 100644 --- a/sdk/objc/api/peerconnection/RTCDataChannelConfiguration+Private.h +++ b/sdk/objc/api/peerconnection/RTCDataChannelConfiguration+Private.h @@ -10,7 +10,7 @@ #import "RTCDataChannelConfiguration.h" -#include "api/datachannelinterface.h" +#include "api/data_channel_interface.h" NS_ASSUME_NONNULL_BEGIN diff --git a/sdk/objc/api/peerconnection/RTCDtmfSender+Private.h b/sdk/objc/api/peerconnection/RTCDtmfSender+Private.h index cdcf62c8b5..ec054818ef 100644 --- a/sdk/objc/api/peerconnection/RTCDtmfSender+Private.h +++ b/sdk/objc/api/peerconnection/RTCDtmfSender+Private.h @@ -10,7 +10,7 @@ #import "RTCDtmfSender.h" -#include "api/dtmfsenderinterface.h" +#include "api/dtmf_sender_interface.h" NS_ASSUME_NONNULL_BEGIN diff --git a/sdk/objc/api/peerconnection/RTCDtmfSender.mm b/sdk/objc/api/peerconnection/RTCDtmfSender.mm index 1513840013..77d0678275 100644 --- a/sdk/objc/api/peerconnection/RTCDtmfSender.mm +++ b/sdk/objc/api/peerconnection/RTCDtmfSender.mm @@ -13,7 +13,7 @@ #import "base/RTCLogging.h" #import "helpers/NSString+StdString.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/time_utils.h" @implementation RTCDtmfSender { rtc::scoped_refptr _nativeDtmfSender; diff --git a/sdk/objc/api/peerconnection/RTCFileLogger.mm b/sdk/objc/api/peerconnection/RTCFileLogger.mm index 9515cfb813..ef13023582 100644 --- a/sdk/objc/api/peerconnection/RTCFileLogger.mm +++ b/sdk/objc/api/peerconnection/RTCFileLogger.mm @@ -13,9 +13,9 @@ #include #include "rtc_base/checks.h" -#include "rtc_base/filerotatingstream.h" +#include "rtc_base/file_rotating_stream.h" +#include "rtc_base/log_sinks.h" #include "rtc_base/logging.h" -#include "rtc_base/logsinks.h" NSString *const kDefaultLogDirName = @"webrtc_logs"; NSUInteger const kDefaultMaxFileSize = 10 * 1024 * 1024; // 10MB. diff --git a/sdk/objc/api/peerconnection/RTCIceServer+Private.h b/sdk/objc/api/peerconnection/RTCIceServer+Private.h index 8d16dfd625..53fbb45dc2 100644 --- a/sdk/objc/api/peerconnection/RTCIceServer+Private.h +++ b/sdk/objc/api/peerconnection/RTCIceServer+Private.h @@ -10,7 +10,7 @@ #import "RTCIceServer.h" -#include "api/peerconnectioninterface.h" +#include "api/peer_connection_interface.h" NS_ASSUME_NONNULL_BEGIN diff --git a/sdk/objc/api/peerconnection/RTCIntervalRange+Private.h b/sdk/objc/api/peerconnection/RTCIntervalRange+Private.h index a4e59cd8d0..afa7509a35 100644 --- a/sdk/objc/api/peerconnection/RTCIntervalRange+Private.h +++ b/sdk/objc/api/peerconnection/RTCIntervalRange+Private.h @@ -10,7 +10,7 @@ #import "RTCIntervalRange.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/time_utils.h" NS_ASSUME_NONNULL_BEGIN diff --git a/sdk/objc/api/peerconnection/RTCLegacyStatsReport+Private.h b/sdk/objc/api/peerconnection/RTCLegacyStatsReport+Private.h index 51888b6092..d87659d4d6 100644 --- a/sdk/objc/api/peerconnection/RTCLegacyStatsReport+Private.h +++ b/sdk/objc/api/peerconnection/RTCLegacyStatsReport+Private.h @@ -10,7 +10,7 @@ #import "RTCLegacyStatsReport.h" -#include "api/statstypes.h" +#include "api/stats_types.h" NS_ASSUME_NONNULL_BEGIN diff --git a/sdk/objc/api/peerconnection/RTCMediaConstraints+Private.h b/sdk/objc/api/peerconnection/RTCMediaConstraints+Private.h index 68a9436974..335b029aec 100644 --- a/sdk/objc/api/peerconnection/RTCMediaConstraints+Private.h +++ b/sdk/objc/api/peerconnection/RTCMediaConstraints+Private.h @@ -12,7 +12,7 @@ #include -#include "api/mediaconstraintsinterface.h" +#include "api/media_constraints_interface.h" namespace webrtc { diff --git a/sdk/objc/api/peerconnection/RTCMediaSource+Private.h b/sdk/objc/api/peerconnection/RTCMediaSource+Private.h index a34cbbd593..7d69aaae7c 100644 --- a/sdk/objc/api/peerconnection/RTCMediaSource+Private.h +++ b/sdk/objc/api/peerconnection/RTCMediaSource+Private.h @@ -10,7 +10,7 @@ #import "RTCMediaSource.h" -#include "api/mediastreaminterface.h" +#include "api/media_stream_interface.h" NS_ASSUME_NONNULL_BEGIN diff --git a/sdk/objc/api/peerconnection/RTCMediaStream+Private.h b/sdk/objc/api/peerconnection/RTCMediaStream+Private.h index 21d64ecbfa..23149ce56e 100644 --- a/sdk/objc/api/peerconnection/RTCMediaStream+Private.h +++ b/sdk/objc/api/peerconnection/RTCMediaStream+Private.h @@ -10,7 +10,7 @@ #import "RTCMediaStream.h" -#include "api/mediastreaminterface.h" +#include "api/media_stream_interface.h" NS_ASSUME_NONNULL_BEGIN diff --git a/sdk/objc/api/peerconnection/RTCMediaStreamTrack+Private.h b/sdk/objc/api/peerconnection/RTCMediaStreamTrack+Private.h index 7f8810c650..176bb73d85 100644 --- a/sdk/objc/api/peerconnection/RTCMediaStreamTrack+Private.h +++ b/sdk/objc/api/peerconnection/RTCMediaStreamTrack+Private.h @@ -10,7 +10,7 @@ #import "RTCMediaStreamTrack.h" -#include "api/mediastreaminterface.h" +#include "api/media_stream_interface.h" typedef NS_ENUM(NSInteger, RTCMediaStreamTrackType) { RTCMediaStreamTrackTypeAudio, diff --git a/sdk/objc/api/peerconnection/RTCPeerConnection+Private.h b/sdk/objc/api/peerconnection/RTCPeerConnection+Private.h index d26eb2e592..3de6a9b794 100644 --- a/sdk/objc/api/peerconnection/RTCPeerConnection+Private.h +++ b/sdk/objc/api/peerconnection/RTCPeerConnection+Private.h @@ -10,7 +10,7 @@ #import "RTCPeerConnection.h" -#include "api/peerconnectioninterface.h" +#include "api/peer_connection_interface.h" NS_ASSUME_NONNULL_BEGIN diff --git a/sdk/objc/api/peerconnection/RTCPeerConnection.mm b/sdk/objc/api/peerconnection/RTCPeerConnection.mm index b59dafec35..fde71a2d55 100644 --- a/sdk/objc/api/peerconnection/RTCPeerConnection.mm +++ b/sdk/objc/api/peerconnection/RTCPeerConnection.mm @@ -28,7 +28,7 @@ #include -#include "api/jsepicecandidate.h" +#include "api/jsep_ice_candidate.h" #include "api/media_transport_interface.h" #include "rtc_base/checks.h" diff --git a/sdk/objc/api/peerconnection/RTCPeerConnectionFactory+Private.h b/sdk/objc/api/peerconnection/RTCPeerConnectionFactory+Private.h index 4dc03cf0cc..a82c445c00 100644 --- a/sdk/objc/api/peerconnection/RTCPeerConnectionFactory+Private.h +++ b/sdk/objc/api/peerconnection/RTCPeerConnectionFactory+Private.h @@ -10,7 +10,7 @@ #import "RTCPeerConnectionFactory.h" -#include "api/peerconnectioninterface.h" +#include "api/peer_connection_interface.h" #include "rtc_base/scoped_ref_ptr.h" NS_ASSUME_NONNULL_BEGIN diff --git a/sdk/objc/api/peerconnection/RTCPeerConnectionFactory.mm b/sdk/objc/api/peerconnection/RTCPeerConnectionFactory.mm index 726288491e..dfcb637ca5 100644 --- a/sdk/objc/api/peerconnection/RTCPeerConnectionFactory.mm +++ b/sdk/objc/api/peerconnection/RTCPeerConnectionFactory.mm @@ -52,7 +52,7 @@ // API layer. #include "absl/memory/memory.h" #include "api/media_transport_interface.h" -#include "media/engine/webrtcmediaengine.h" // nogncheck +#include "media/engine/webrtc_media_engine.h" // nogncheck @implementation RTCPeerConnectionFactory { std::unique_ptr _networkThread; diff --git a/sdk/objc/api/peerconnection/RTCPeerConnectionFactoryOptions+Private.h b/sdk/objc/api/peerconnection/RTCPeerConnectionFactoryOptions+Private.h index 2ccbd1c294..986b0e698d 100644 --- a/sdk/objc/api/peerconnection/RTCPeerConnectionFactoryOptions+Private.h +++ b/sdk/objc/api/peerconnection/RTCPeerConnectionFactoryOptions+Private.h @@ -10,7 +10,7 @@ #import "RTCPeerConnectionFactoryOptions.h" -#include "api/peerconnectioninterface.h" +#include "api/peer_connection_interface.h" NS_ASSUME_NONNULL_BEGIN diff --git a/sdk/objc/api/peerconnection/RTCRtcpParameters+Private.h b/sdk/objc/api/peerconnection/RTCRtcpParameters+Private.h index 540601bdb9..5471bf4d62 100644 --- a/sdk/objc/api/peerconnection/RTCRtcpParameters+Private.h +++ b/sdk/objc/api/peerconnection/RTCRtcpParameters+Private.h @@ -10,7 +10,7 @@ #import "RTCRtcpParameters.h" -#include "api/rtpparameters.h" +#include "api/rtp_parameters.h" NS_ASSUME_NONNULL_BEGIN diff --git a/sdk/objc/api/peerconnection/RTCRtpCodecParameters+Private.h b/sdk/objc/api/peerconnection/RTCRtpCodecParameters+Private.h index 3759a27871..1b297edeba 100644 --- a/sdk/objc/api/peerconnection/RTCRtpCodecParameters+Private.h +++ b/sdk/objc/api/peerconnection/RTCRtpCodecParameters+Private.h @@ -10,7 +10,7 @@ #import "RTCRtpCodecParameters.h" -#include "api/rtpparameters.h" +#include "api/rtp_parameters.h" NS_ASSUME_NONNULL_BEGIN diff --git a/sdk/objc/api/peerconnection/RTCRtpCodecParameters.mm b/sdk/objc/api/peerconnection/RTCRtpCodecParameters.mm index d555beab43..f25679e329 100644 --- a/sdk/objc/api/peerconnection/RTCRtpCodecParameters.mm +++ b/sdk/objc/api/peerconnection/RTCRtpCodecParameters.mm @@ -13,7 +13,7 @@ #import "RTCMediaStreamTrack.h" #import "helpers/NSString+StdString.h" -#include "media/base/mediaconstants.h" +#include "media/base/media_constants.h" #include "rtc_base/checks.h" const NSString * const kRTCRtxCodecName = @(cricket::kRtxCodecName); diff --git a/sdk/objc/api/peerconnection/RTCRtpEncodingParameters+Private.h b/sdk/objc/api/peerconnection/RTCRtpEncodingParameters+Private.h index fe60948e0b..e3684d3ca5 100644 --- a/sdk/objc/api/peerconnection/RTCRtpEncodingParameters+Private.h +++ b/sdk/objc/api/peerconnection/RTCRtpEncodingParameters+Private.h @@ -10,7 +10,7 @@ #import "RTCRtpEncodingParameters.h" -#include "api/rtpparameters.h" +#include "api/rtp_parameters.h" NS_ASSUME_NONNULL_BEGIN diff --git a/sdk/objc/api/peerconnection/RTCRtpHeaderExtension+Private.h b/sdk/objc/api/peerconnection/RTCRtpHeaderExtension+Private.h index 3f1f547afc..8a2a2311e4 100644 --- a/sdk/objc/api/peerconnection/RTCRtpHeaderExtension+Private.h +++ b/sdk/objc/api/peerconnection/RTCRtpHeaderExtension+Private.h @@ -10,7 +10,7 @@ #import "RTCRtpHeaderExtension.h" -#include "api/rtpparameters.h" +#include "api/rtp_parameters.h" NS_ASSUME_NONNULL_BEGIN diff --git a/sdk/objc/api/peerconnection/RTCRtpParameters+Private.h b/sdk/objc/api/peerconnection/RTCRtpParameters+Private.h index 0b7aa2077e..a88ccfa75e 100644 --- a/sdk/objc/api/peerconnection/RTCRtpParameters+Private.h +++ b/sdk/objc/api/peerconnection/RTCRtpParameters+Private.h @@ -10,7 +10,7 @@ #import "RTCRtpParameters.h" -#include "api/rtpparameters.h" +#include "api/rtp_parameters.h" NS_ASSUME_NONNULL_BEGIN diff --git a/sdk/objc/api/peerconnection/RTCRtpReceiver+Native.h b/sdk/objc/api/peerconnection/RTCRtpReceiver+Native.h index 8013b69ec9..419a347a7e 100644 --- a/sdk/objc/api/peerconnection/RTCRtpReceiver+Native.h +++ b/sdk/objc/api/peerconnection/RTCRtpReceiver+Native.h @@ -10,7 +10,7 @@ #import "RTCRtpReceiver.h" -#include "api/crypto/framedecryptorinterface.h" +#include "api/crypto/frame_decryptor_interface.h" #include "rtc_base/scoped_ref_ptr.h" NS_ASSUME_NONNULL_BEGIN diff --git a/sdk/objc/api/peerconnection/RTCRtpReceiver+Private.h b/sdk/objc/api/peerconnection/RTCRtpReceiver+Private.h index 019b57641b..6f56739f0b 100644 --- a/sdk/objc/api/peerconnection/RTCRtpReceiver+Private.h +++ b/sdk/objc/api/peerconnection/RTCRtpReceiver+Private.h @@ -10,7 +10,7 @@ #import "RTCRtpReceiver.h" -#include "api/rtpreceiverinterface.h" +#include "api/rtp_receiver_interface.h" NS_ASSUME_NONNULL_BEGIN diff --git a/sdk/objc/api/peerconnection/RTCRtpReceiver.mm b/sdk/objc/api/peerconnection/RTCRtpReceiver.mm index 4d240be62a..5d444782c2 100644 --- a/sdk/objc/api/peerconnection/RTCRtpReceiver.mm +++ b/sdk/objc/api/peerconnection/RTCRtpReceiver.mm @@ -16,7 +16,7 @@ #import "base/RTCLogging.h" #import "helpers/NSString+StdString.h" -#include "api/mediastreaminterface.h" +#include "api/media_stream_interface.h" namespace webrtc { diff --git a/sdk/objc/api/peerconnection/RTCRtpSender+Native.h b/sdk/objc/api/peerconnection/RTCRtpSender+Native.h index 612c5e04ca..daef7eed56 100644 --- a/sdk/objc/api/peerconnection/RTCRtpSender+Native.h +++ b/sdk/objc/api/peerconnection/RTCRtpSender+Native.h @@ -10,7 +10,7 @@ #import "RTCRtpSender.h" -#include "api/crypto/frameencryptorinterface.h" +#include "api/crypto/frame_encryptor_interface.h" #include "rtc_base/scoped_ref_ptr.h" NS_ASSUME_NONNULL_BEGIN diff --git a/sdk/objc/api/peerconnection/RTCRtpSender+Private.h b/sdk/objc/api/peerconnection/RTCRtpSender+Private.h index d0dcb2bbdb..389b833ffa 100644 --- a/sdk/objc/api/peerconnection/RTCRtpSender+Private.h +++ b/sdk/objc/api/peerconnection/RTCRtpSender+Private.h @@ -10,7 +10,7 @@ #import "RTCRtpSender.h" -#include "api/rtpsenderinterface.h" +#include "api/rtp_sender_interface.h" NS_ASSUME_NONNULL_BEGIN diff --git a/sdk/objc/api/peerconnection/RTCRtpSender.mm b/sdk/objc/api/peerconnection/RTCRtpSender.mm index 30e1bdecd5..b227025867 100644 --- a/sdk/objc/api/peerconnection/RTCRtpSender.mm +++ b/sdk/objc/api/peerconnection/RTCRtpSender.mm @@ -17,7 +17,7 @@ #import "base/RTCLogging.h" #import "helpers/NSString+StdString.h" -#include "api/mediastreaminterface.h" +#include "api/media_stream_interface.h" @implementation RTCRtpSender { RTCPeerConnectionFactory *_factory; diff --git a/sdk/objc/api/peerconnection/RTCRtpTransceiver+Private.h b/sdk/objc/api/peerconnection/RTCRtpTransceiver+Private.h index 61cbcb3a26..d7f6b585e4 100644 --- a/sdk/objc/api/peerconnection/RTCRtpTransceiver+Private.h +++ b/sdk/objc/api/peerconnection/RTCRtpTransceiver+Private.h @@ -10,7 +10,7 @@ #import "RTCRtpTransceiver.h" -#include "api/rtptransceiverinterface.h" +#include "api/rtp_transceiver_interface.h" NS_ASSUME_NONNULL_BEGIN diff --git a/sdk/objc/api/peerconnection/RTCSSLAdapter.mm b/sdk/objc/api/peerconnection/RTCSSLAdapter.mm index 18388f99d7..430249577b 100644 --- a/sdk/objc/api/peerconnection/RTCSSLAdapter.mm +++ b/sdk/objc/api/peerconnection/RTCSSLAdapter.mm @@ -11,7 +11,7 @@ #import "RTCSSLAdapter.h" #include "rtc_base/checks.h" -#include "rtc_base/ssladapter.h" +#include "rtc_base/ssl_adapter.h" BOOL RTCInitializeSSL(void) { BOOL initialized = rtc::InitializeSSL(); diff --git a/sdk/objc/api/peerconnection/RTCVideoSource+Private.h b/sdk/objc/api/peerconnection/RTCVideoSource+Private.h index 828aad87bd..1827e6b924 100644 --- a/sdk/objc/api/peerconnection/RTCVideoSource+Private.h +++ b/sdk/objc/api/peerconnection/RTCVideoSource+Private.h @@ -12,7 +12,7 @@ #import "RTCMediaSource+Private.h" -#include "api/mediastreaminterface.h" +#include "api/media_stream_interface.h" #include "rtc_base/thread.h" NS_ASSUME_NONNULL_BEGIN diff --git a/sdk/objc/api/peerconnection/RTCVideoSource.mm b/sdk/objc/api/peerconnection/RTCVideoSource.mm index 1cbeb0bbce..789c8436e5 100644 --- a/sdk/objc/api/peerconnection/RTCVideoSource.mm +++ b/sdk/objc/api/peerconnection/RTCVideoSource.mm @@ -10,7 +10,7 @@ #import "RTCVideoSource+Private.h" -#include "api/videosourceproxy.h" +#include "api/video_track_source_proxy.h" #include "rtc_base/checks.h" #include "sdk/objc/native/src/objc_video_track_source.h" diff --git a/sdk/objc/api/peerconnection/RTCVideoTrack+Private.h b/sdk/objc/api/peerconnection/RTCVideoTrack+Private.h index 176366a04b..dd3d172820 100644 --- a/sdk/objc/api/peerconnection/RTCVideoTrack+Private.h +++ b/sdk/objc/api/peerconnection/RTCVideoTrack+Private.h @@ -10,7 +10,7 @@ #import "RTCVideoTrack.h" -#include "api/mediastreaminterface.h" +#include "api/media_stream_interface.h" NS_ASSUME_NONNULL_BEGIN diff --git a/sdk/objc/api/video_codec/RTCVideoCodecConstants.mm b/sdk/objc/api/video_codec/RTCVideoCodecConstants.mm index acbf126170..3de6e22ef7 100644 --- a/sdk/objc/api/video_codec/RTCVideoCodecConstants.mm +++ b/sdk/objc/api/video_codec/RTCVideoCodecConstants.mm @@ -11,7 +11,7 @@ #import "RTCVideoCodecConstants.h" -#include "media/base/mediaconstants.h" +#include "media/base/media_constants.h" NSString *const kRTCVideoCodecVp8Name = @(cricket::kVp8CodecName); NSString *const kRTCVideoCodecVp9Name = @(cricket::kVp9CodecName); diff --git a/sdk/objc/components/audio/RTCAudioSession.mm b/sdk/objc/components/audio/RTCAudioSession.mm index b4d759b189..1b2b487c5d 100644 --- a/sdk/objc/components/audio/RTCAudioSession.mm +++ b/sdk/objc/components/audio/RTCAudioSession.mm @@ -12,9 +12,9 @@ #import -#include "rtc_base/atomicops.h" +#include "rtc_base/atomic_ops.h" #include "rtc_base/checks.h" -#include "rtc_base/criticalsection.h" +#include "rtc_base/critical_section.h" #import "RTCAudioSessionConfiguration.h" #import "base/RTCLogging.h" diff --git a/sdk/objc/components/video_codec/RTCH264ProfileLevelId.mm b/sdk/objc/components/video_codec/RTCH264ProfileLevelId.mm index 359656cb97..afd9fcb44c 100644 --- a/sdk/objc/components/video_codec/RTCH264ProfileLevelId.mm +++ b/sdk/objc/components/video_codec/RTCH264ProfileLevelId.mm @@ -17,7 +17,7 @@ #endif #include "media/base/h264_profile_level_id.h" -#include "media/base/mediaconstants.h" +#include "media/base/media_constants.h" namespace { diff --git a/sdk/objc/components/video_codec/RTCVideoDecoderH264.mm b/sdk/objc/components/video_codec/RTCVideoDecoderH264.mm index 3bfb918bf6..69ccc90574 100644 --- a/sdk/objc/components/video_codec/RTCVideoDecoderH264.mm +++ b/sdk/objc/components/video_codec/RTCVideoDecoderH264.mm @@ -26,7 +26,7 @@ #include "modules/video_coding/include/video_error_codes.h" #include "rtc_base/checks.h" #include "rtc_base/logging.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/time_utils.h" #include "sdk/objc/components/video_codec/nalu_rewriter.h" // Struct that we pass to the decoder per frame to decode. We receive it again diff --git a/sdk/objc/components/video_codec/RTCVideoEncoderH264.mm b/sdk/objc/components/video_codec/RTCVideoEncoderH264.mm index f6690b6d86..51fa51e2bb 100644 --- a/sdk/objc/components/video_codec/RTCVideoEncoderH264.mm +++ b/sdk/objc/components/video_codec/RTCVideoEncoderH264.mm @@ -36,7 +36,7 @@ #include "modules/video_coding/include/video_error_codes.h" #include "rtc_base/buffer.h" #include "rtc_base/logging.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/time_utils.h" #include "sdk/objc/components/video_codec/nalu_rewriter.h" #include "third_party/libyuv/include/libyuv/convert_from.h" diff --git a/sdk/objc/native/api/audio_device_module.mm b/sdk/objc/native/api/audio_device_module.mm index 893aaecb4b..e8f2b9a0bc 100644 --- a/sdk/objc/native/api/audio_device_module.mm +++ b/sdk/objc/native/api/audio_device_module.mm @@ -11,7 +11,7 @@ #include "audio_device_module.h" #include "rtc_base/logging.h" -#include "rtc_base/refcountedobject.h" +#include "rtc_base/ref_counted_object.h" #include "sdk/objc/native/src/audio/audio_device_module_ios.h" diff --git a/sdk/objc/native/api/video_capturer.h b/sdk/objc/native/api/video_capturer.h index d6f396b470..c0a7760b76 100644 --- a/sdk/objc/native/api/video_capturer.h +++ b/sdk/objc/native/api/video_capturer.h @@ -13,7 +13,7 @@ #import "base/RTCVideoCapturer.h" -#include "api/mediastreaminterface.h" +#include "api/media_stream_interface.h" #include "rtc_base/scoped_ref_ptr.h" #include "rtc_base/thread.h" diff --git a/sdk/objc/native/api/video_capturer.mm b/sdk/objc/native/api/video_capturer.mm index 3bad9985a1..26185509a7 100644 --- a/sdk/objc/native/api/video_capturer.mm +++ b/sdk/objc/native/api/video_capturer.mm @@ -11,7 +11,7 @@ #include "sdk/objc/native/api/video_capturer.h" #include "absl/memory/memory.h" -#include "api/videosourceproxy.h" +#include "api/video_track_source_proxy.h" #include "sdk/objc/native/src/objc_video_track_source.h" namespace webrtc { diff --git a/sdk/objc/native/src/audio/audio_device_ios.mm b/sdk/objc/native/src/audio/audio_device_ios.mm index ec9a7989e8..efbf463efb 100644 --- a/sdk/objc/native/src/audio/audio_device_ios.mm +++ b/sdk/objc/native/src/audio/audio_device_ios.mm @@ -18,14 +18,14 @@ #include "api/array_view.h" #include "helpers.h" #include "modules/audio_device/fine_audio_buffer.h" -#include "rtc_base/atomicops.h" +#include "rtc_base/atomic_ops.h" #include "rtc_base/bind.h" #include "rtc_base/checks.h" -#include "rtc_base/criticalsection.h" +#include "rtc_base/critical_section.h" #include "rtc_base/logging.h" #include "rtc_base/thread.h" #include "rtc_base/thread_annotations.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/time_utils.h" #include "system_wrappers/include/metrics.h" #import "base/RTCLogging.h" diff --git a/sdk/objc/native/src/audio/audio_device_module_ios.h b/sdk/objc/native/src/audio/audio_device_module_ios.h index 59730b6862..317031348e 100644 --- a/sdk/objc/native/src/audio/audio_device_module_ios.h +++ b/sdk/objc/native/src/audio/audio_device_module_ios.h @@ -18,7 +18,7 @@ #include "modules/audio_device/audio_device_buffer.h" #include "modules/audio_device/include/audio_device.h" #include "rtc_base/checks.h" -#include "rtc_base/criticalsection.h" +#include "rtc_base/critical_section.h" namespace webrtc { diff --git a/sdk/objc/native/src/audio/audio_device_module_ios.mm b/sdk/objc/native/src/audio/audio_device_module_ios.mm index 814ab9076d..ff9da472bc 100644 --- a/sdk/objc/native/src/audio/audio_device_module_ios.mm +++ b/sdk/objc/native/src/audio/audio_device_module_ios.mm @@ -14,8 +14,8 @@ #include "modules/audio_device/audio_device_generic.h" #include "rtc_base/checks.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" #include "system_wrappers/include/metrics.h" #if defined(WEBRTC_IOS) diff --git a/sdk/objc/native/src/audio/audio_session_observer.h b/sdk/objc/native/src/audio/audio_session_observer.h index 2f8bd0cde6..27b1b3833a 100644 --- a/sdk/objc/native/src/audio/audio_session_observer.h +++ b/sdk/objc/native/src/audio/audio_session_observer.h @@ -11,7 +11,7 @@ #ifndef SDK_OBJC_NATIVE_SRC_AUDIO_AUDIO_SESSION_OBSERVER_H_ #define SDK_OBJC_NATIVE_SRC_AUDIO_AUDIO_SESSION_OBSERVER_H_ -#include "rtc_base/asyncinvoker.h" +#include "rtc_base/async_invoker.h" #include "rtc_base/thread.h" namespace webrtc { diff --git a/sdk/objc/native/src/objc_video_decoder_factory.mm b/sdk/objc/native/src/objc_video_decoder_factory.mm index 6e0ff27084..f5c53b0f12 100644 --- a/sdk/objc/native/src/objc_video_decoder_factory.mm +++ b/sdk/objc/native/src/objc_video_decoder_factory.mm @@ -26,7 +26,7 @@ #include "modules/video_coding/include/video_codec_interface.h" #include "modules/video_coding/include/video_error_codes.h" #include "rtc_base/logging.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/time_utils.h" #include "sdk/objc/native/src/objc_frame_buffer.h" namespace webrtc { diff --git a/sdk/objc/native/src/objc_video_frame.mm b/sdk/objc/native/src/objc_video_frame.mm index bf60824bee..76f7add6fc 100644 --- a/sdk/objc/native/src/objc_video_frame.mm +++ b/sdk/objc/native/src/objc_video_frame.mm @@ -10,7 +10,7 @@ #include "sdk/objc/native/src/objc_video_frame.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/time_utils.h" #include "sdk/objc/native/src/objc_frame_buffer.h" namespace webrtc { diff --git a/sdk/objc/native/src/objc_video_track_source.h b/sdk/objc/native/src/objc_video_track_source.h index 7956014809..93e7d15e2f 100644 --- a/sdk/objc/native/src/objc_video_track_source.h +++ b/sdk/objc/native/src/objc_video_track_source.h @@ -14,8 +14,8 @@ #import "base/RTCVideoCapturer.h" #include "base/RTCMacros.h" -#include "media/base/adaptedvideotracksource.h" -#include "rtc_base/timestampaligner.h" +#include "media/base/adapted_video_track_source.h" +#include "rtc_base/timestamp_aligner.h" RTC_FWD_DECL_OBJC_CLASS(RTCVideoFrame); diff --git a/sdk/objc/unittests/ObjCVideoTrackSource_xctest.mm b/sdk/objc/unittests/ObjCVideoTrackSource_xctest.mm index fa864a24e2..291c9f0f80 100644 --- a/sdk/objc/unittests/ObjCVideoTrackSource_xctest.mm +++ b/sdk/objc/unittests/ObjCVideoTrackSource_xctest.mm @@ -20,8 +20,8 @@ #import "frame_buffer_helpers.h" #include "common_video/libyuv/include/webrtc_libyuv.h" -#include "media/base/fakevideorenderer.h" -#include "rtc_base/refcountedobject.h" +#include "media/base/fake_video_renderer.h" +#include "rtc_base/ref_counted_object.h" #include "rtc_base/scoped_ref_ptr.h" #include "sdk/objc/native/api/video_frame.h" diff --git a/stats/BUILD.gn b/stats/BUILD.gn index c16d8d1e1d..85fe091df9 100644 --- a/stats/BUILD.gn +++ b/stats/BUILD.gn @@ -18,9 +18,9 @@ rtc_static_library("rtc_stats") { visibility = [ "*" ] cflags = [] sources = [ - "rtcstats.cc", + "rtc_stats.cc", + "rtc_stats_report.cc", "rtcstats_objects.cc", - "rtcstatsreport.cc", ] deps = [ @@ -34,8 +34,8 @@ rtc_source_set("rtc_stats_test_utils") { visibility = [ "*" ] cflags = [] sources = [ - "test/rtcteststats.cc", - "test/rtcteststats.h", + "test/rtc_test_stats.cc", + "test/rtc_test_stats.h", ] deps = [ @@ -50,8 +50,8 @@ if (rtc_include_tests) { rtc_test("rtc_stats_unittests") { testonly = true sources = [ - "rtcstats_unittest.cc", - "rtcstatsreport_unittest.cc", + "rtc_stats_report_unittest.cc", + "rtc_stats_unittest.cc", ] deps = [ diff --git a/stats/rtc_stats.cc b/stats/rtc_stats.cc index d5ea319eaa..4332fe6acf 100644 --- a/stats/rtc_stats.cc +++ b/stats/rtc_stats.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "api/stats/rtcstats.h" +#include "api/stats/rtc_stats.h" #include #include "rtc_base/arraysize.h" -#include "rtc_base/stringencode.h" +#include "rtc_base/string_encode.h" #include "rtc_base/strings/string_builder.h" namespace webrtc { diff --git a/stats/rtc_stats_report.cc b/stats/rtc_stats_report.cc index 82db8f60d0..bdafd56997 100644 --- a/stats/rtc_stats_report.cc +++ b/stats/rtc_stats_report.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "api/stats/rtcstatsreport.h" +#include "api/stats/rtc_stats_report.h" #include #include diff --git a/stats/rtc_stats_report_unittest.cc b/stats/rtc_stats_report_unittest.cc index 80a6f2dc27..a7d4a42d49 100644 --- a/stats/rtc_stats_report_unittest.cc +++ b/stats/rtc_stats_report_unittest.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "api/stats/rtcstatsreport.h" +#include "api/stats/rtc_stats_report.h" -#include "api/stats/rtcstats.h" +#include "api/stats/rtc_stats.h" #include "rtc_base/checks.h" #include "test/gtest.h" diff --git a/stats/rtc_stats_unittest.cc b/stats/rtc_stats_unittest.cc index 95a40150ea..b079dddc74 100644 --- a/stats/rtc_stats_unittest.cc +++ b/stats/rtc_stats_unittest.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "api/stats/rtcstats.h" +#include "api/stats/rtc_stats.h" #include #include @@ -17,7 +17,7 @@ #include "rtc_base/checks.h" #include "rtc_base/strings/json.h" -#include "stats/test/rtcteststats.h" +#include "stats/test/rtc_test_stats.h" #include "test/gtest.h" namespace webrtc { diff --git a/stats/test/rtc_test_stats.cc b/stats/test/rtc_test_stats.cc index 538f303136..d5576e6c80 100644 --- a/stats/test/rtc_test_stats.cc +++ b/stats/test/rtc_test_stats.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "stats/test/rtcteststats.h" +#include "stats/test/rtc_test_stats.h" #include "rtc_base/checks.h" diff --git a/stats/test/rtc_test_stats.h b/stats/test/rtc_test_stats.h index 766d04589d..1db32c25c1 100644 --- a/stats/test/rtc_test_stats.h +++ b/stats/test/rtc_test_stats.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef STATS_TEST_RTCTESTSTATS_H_ -#define STATS_TEST_RTCTESTSTATS_H_ +#ifndef STATS_TEST_RTC_TEST_STATS_H_ +#define STATS_TEST_RTC_TEST_STATS_H_ #include #include #include -#include "api/stats/rtcstats.h" +#include "api/stats/rtc_stats.h" #include "rtc_base/system/rtc_export.h" namespace webrtc { @@ -46,4 +46,4 @@ class RTC_EXPORT RTCTestStats : public RTCStats { } // namespace webrtc -#endif // STATS_TEST_RTCTESTSTATS_H_ +#endif // STATS_TEST_RTC_TEST_STATS_H_ diff --git a/system_wrappers/include/metrics.h b/system_wrappers/include/metrics.h index d70a7c6ac6..6b29018552 100644 --- a/system_wrappers/include/metrics.h +++ b/system_wrappers/include/metrics.h @@ -16,7 +16,7 @@ #include #include -#include "rtc_base/atomicops.h" +#include "rtc_base/atomic_ops.h" #include "rtc_base/checks.h" // Macros for allowing WebRTC clients (e.g. Chrome) to gather and aggregate diff --git a/system_wrappers/source/clock.cc b/system_wrappers/source/clock.cc index 32cf1de5b1..27624be783 100644 --- a/system_wrappers/source/clock.cc +++ b/system_wrappers/source/clock.cc @@ -17,7 +17,7 @@ #include -#include "rtc_base/criticalsection.h" +#include "rtc_base/critical_section.h" #elif defined(WEBRTC_POSIX) @@ -27,7 +27,7 @@ #endif // defined(WEBRTC_POSIX) #include "rtc_base/synchronization/rw_lock_wrapper.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/time_utils.h" namespace webrtc { diff --git a/system_wrappers/source/metrics.cc b/system_wrappers/source/metrics.cc index 4aa8770b82..f98b4cda69 100644 --- a/system_wrappers/source/metrics.cc +++ b/system_wrappers/source/metrics.cc @@ -11,7 +11,7 @@ #include -#include "rtc_base/criticalsection.h" +#include "rtc_base/critical_section.h" #include "rtc_base/thread_annotations.h" // Default implementation of histogram methods for WebRTC clients that do not diff --git a/test/BUILD.gn b/test/BUILD.gn index ffa6d01ddb..786f3c0035 100644 --- a/test/BUILD.gn +++ b/test/BUILD.gn @@ -398,8 +398,8 @@ if (is_ios) { ":fileutils_override_impl", ] sources = [ - "testsupport/iosfileutils.h", - "testsupport/iosfileutils.mm", + "testsupport/ios_file_utils.h", + "testsupport/ios_file_utils.mm", ] deps = [ "..:webrtc_common", @@ -417,8 +417,8 @@ if (is_mac) { ":fileutils_override_impl", ] sources = [ - "testsupport/macfileutils.h", - "testsupport/macfileutils.mm", + "testsupport/mac_file_utils.h", + "testsupport/mac_file_utils.mm", ] deps = [ "../rtc_base:checks", @@ -430,8 +430,8 @@ rtc_source_set("fileutils") { testonly = true visibility = [ "*" ] sources = [ - "testsupport/fileutils.cc", - "testsupport/fileutils.h", + "testsupport/file_utils.cc", + "testsupport/file_utils.h", ] deps = [ ":fileutils_override_api", @@ -458,7 +458,7 @@ rtc_source_set("fileutils") { rtc_source_set("fileutils_override_api") { testonly = true sources = [ - "testsupport/fileutils_override.h", + "testsupport/file_utils_override.h", ] } @@ -466,7 +466,7 @@ rtc_source_set("fileutils_override_impl") { testonly = true visibility = [ ":fileutils" ] sources = [ - "testsupport/fileutils_override.cc", + "testsupport/file_utils_override.cc", ] deps = [ ":fileutils_override_api", @@ -534,7 +534,7 @@ rtc_source_set("fileutils_unittests") { testonly = true visibility = [ ":*" ] # Only targets in this file can depend on this. sources = [ - "testsupport/fileutils_unittest.cc", + "testsupport/file_utils_unittest.cc", ] deps = [ ":fileutils", diff --git a/test/DEPS b/test/DEPS index 110623082d..d3b03e036f 100644 --- a/test/DEPS +++ b/test/DEPS @@ -37,7 +37,7 @@ specific_include_rules = { "+p2p/base/mdns_message.h", ], ".*pseudotcp_parser_fuzzer\.cc": [ - "+p2p/base/pseudotcp.h", + "+p2p/base/pseudo_tcp.h", ], ".*stun_parser_fuzzer\.cc": [ "+p2p/base/stun.h", diff --git a/test/call_test.cc b/test/call_test.cc index 26c8b446db..fff03237db 100644 --- a/test/call_test.cc +++ b/test/call_test.cc @@ -24,7 +24,7 @@ #include "rtc_base/checks.h" #include "rtc_base/event.h" #include "test/fake_encoder.h" -#include "test/testsupport/fileutils.h" +#include "test/testsupport/file_utils.h" namespace webrtc { namespace test { diff --git a/test/encoder_settings.cc b/test/encoder_settings.cc index d4727b44a5..e576cc4b22 100644 --- a/test/encoder_settings.cc +++ b/test/encoder_settings.cc @@ -15,7 +15,7 @@ #include "api/video_codecs/sdp_video_format.h" #include "call/rtp_config.h" #include "rtc_base/checks.h" -#include "rtc_base/refcountedobject.h" +#include "rtc_base/ref_counted_object.h" #include "rtc_base/scoped_ref_ptr.h" namespace webrtc { diff --git a/test/fake_decoder.cc b/test/fake_decoder.cc index 2114c6493f..2dc5b6424a 100644 --- a/test/fake_decoder.cc +++ b/test/fake_decoder.cc @@ -19,7 +19,7 @@ #include "modules/video_coding/include/video_error_codes.h" #include "rtc_base/checks.h" #include "rtc_base/scoped_ref_ptr.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/time_utils.h" namespace webrtc { namespace test { diff --git a/test/fake_encoder.h b/test/fake_encoder.h index 753b1eaf7b..d9ac76b1ed 100644 --- a/test/fake_encoder.h +++ b/test/fake_encoder.h @@ -24,7 +24,7 @@ #include "common_types.h" // NOLINT(build/include) #include "modules/include/module_common_types.h" #include "modules/video_coding/include/video_codec_interface.h" -#include "rtc_base/criticalsection.h" +#include "rtc_base/critical_section.h" #include "rtc_base/sequenced_task_checker.h" #include "rtc_base/task_queue.h" #include "rtc_base/thread_annotations.h" diff --git a/test/fake_texture_frame.cc b/test/fake_texture_frame.cc index 45d6130210..4fa5e9d242 100644 --- a/test/fake_texture_frame.cc +++ b/test/fake_texture_frame.cc @@ -11,7 +11,7 @@ #include "test/fake_texture_frame.h" #include "api/video/i420_buffer.h" -#include "rtc_base/refcountedobject.h" +#include "rtc_base/ref_counted_object.h" namespace webrtc { namespace test { diff --git a/test/fake_vp8_decoder.cc b/test/fake_vp8_decoder.cc index c5ece83fd7..7b0cea0fae 100644 --- a/test/fake_vp8_decoder.cc +++ b/test/fake_vp8_decoder.cc @@ -19,7 +19,7 @@ #include "api/video/video_rotation.h" #include "modules/video_coding/include/video_error_codes.h" #include "rtc_base/scoped_ref_ptr.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/time_utils.h" namespace webrtc { namespace test { diff --git a/test/frame_generator.h b/test/frame_generator.h index 45cc9f0f13..ba36d38713 100644 --- a/test/frame_generator.h +++ b/test/frame_generator.h @@ -16,7 +16,7 @@ #include "api/video/video_frame.h" #include "api/video/video_source_interface.h" -#include "rtc_base/criticalsection.h" +#include "rtc_base/critical_section.h" namespace webrtc { class Clock; diff --git a/test/frame_generator_capturer.cc b/test/frame_generator_capturer.cc index 768bab5cb1..e1b5c80624 100644 --- a/test/frame_generator_capturer.cc +++ b/test/frame_generator_capturer.cc @@ -18,10 +18,10 @@ #include "absl/memory/memory.h" #include "rtc_base/checks.h" -#include "rtc_base/criticalsection.h" +#include "rtc_base/critical_section.h" #include "rtc_base/logging.h" #include "rtc_base/task_queue.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/time_utils.h" #include "system_wrappers/include/clock.h" namespace webrtc { diff --git a/test/frame_generator_capturer.h b/test/frame_generator_capturer.h index cb76806fbe..217858bfad 100644 --- a/test/frame_generator_capturer.h +++ b/test/frame_generator_capturer.h @@ -14,7 +14,7 @@ #include #include "api/video/video_frame.h" -#include "rtc_base/criticalsection.h" +#include "rtc_base/critical_section.h" #include "rtc_base/task_queue.h" #include "test/frame_generator.h" #include "test/test_video_capturer.h" diff --git a/test/frame_generator_unittest.cc b/test/frame_generator_unittest.cc index bfa19e5cf1..fa6da9a3ad 100644 --- a/test/frame_generator_unittest.cc +++ b/test/frame_generator_unittest.cc @@ -19,7 +19,7 @@ #include "rtc_base/scoped_ref_ptr.h" #include "test/frame_generator.h" #include "test/gtest.h" -#include "test/testsupport/fileutils.h" +#include "test/testsupport/file_utils.h" namespace webrtc { namespace test { diff --git a/test/fuzzers/forward_error_correction_fuzzer.cc b/test/fuzzers/forward_error_correction_fuzzer.cc index 2eb357b74a..1385e54c2a 100644 --- a/test/fuzzers/forward_error_correction_fuzzer.cc +++ b/test/fuzzers/forward_error_correction_fuzzer.cc @@ -12,7 +12,7 @@ #include "modules/rtp_rtcp/source/byte_io.h" #include "modules/rtp_rtcp/source/forward_error_correction.h" -#include "rtc_base/bytebuffer.h" +#include "rtc_base/byte_buffer.h" #include "rtc_base/scoped_ref_ptr.h" namespace webrtc { diff --git a/test/fuzzers/pseudotcp_parser_fuzzer.cc b/test/fuzzers/pseudotcp_parser_fuzzer.cc index bab09df715..78ddf0e455 100644 --- a/test/fuzzers/pseudotcp_parser_fuzzer.cc +++ b/test/fuzzers/pseudotcp_parser_fuzzer.cc @@ -11,7 +11,7 @@ #include #include -#include "p2p/base/pseudotcp.h" +#include "p2p/base/pseudo_tcp.h" #include "rtc_base/thread.h" namespace webrtc { diff --git a/test/fuzzers/residual_echo_detector_fuzzer.cc b/test/fuzzers/residual_echo_detector_fuzzer.cc index b0405ee9e1..99ea06a08e 100644 --- a/test/fuzzers/residual_echo_detector_fuzzer.cc +++ b/test/fuzzers/residual_echo_detector_fuzzer.cc @@ -17,7 +17,7 @@ #include "modules/audio_processing/residual_echo_detector.h" #include "rtc_base/checks.h" -#include "rtc_base/refcountedobject.h" +#include "rtc_base/ref_counted_object.h" namespace webrtc { diff --git a/test/fuzzers/sdp_parser_fuzzer.cc b/test/fuzzers/sdp_parser_fuzzer.cc index 763dbc594a..c85eab4047 100644 --- a/test/fuzzers/sdp_parser_fuzzer.cc +++ b/test/fuzzers/sdp_parser_fuzzer.cc @@ -11,7 +11,7 @@ #include #include -#include "api/jsepsessiondescription.h" +#include "api/jsep_session_description.h" namespace webrtc { void FuzzOneInput(const uint8_t* data, size_t size) { diff --git a/test/fuzzers/turn_unwrap_fuzzer.cc b/test/fuzzers/turn_unwrap_fuzzer.cc index ed9f34d711..47ee7fd205 100644 --- a/test/fuzzers/turn_unwrap_fuzzer.cc +++ b/test/fuzzers/turn_unwrap_fuzzer.cc @@ -11,7 +11,7 @@ #include #include -#include "media/base/turnutils.h" +#include "media/base/turn_utils.h" namespace webrtc { void FuzzOneInput(const uint8_t* data, size_t size) { diff --git a/test/fuzzers/url_decode_fuzzer.cc b/test/fuzzers/url_decode_fuzzer.cc index d47e88d852..bf2a0f336b 100644 --- a/test/fuzzers/url_decode_fuzzer.cc +++ b/test/fuzzers/url_decode_fuzzer.cc @@ -12,7 +12,7 @@ #include #include -#include "rtc_base/stringencode.h" +#include "rtc_base/string_encode.h" namespace webrtc { diff --git a/test/layer_filtering_transport.h b/test/layer_filtering_transport.h index ad825a9b98..95a538820d 100644 --- a/test/layer_filtering_transport.h +++ b/test/layer_filtering_transport.h @@ -16,7 +16,7 @@ #include #include "api/call/transport.h" -#include "api/mediatypes.h" +#include "api/media_types.h" #include "call/call.h" #include "call/simulated_packet_receiver.h" #include "test/direct_transport.h" diff --git a/test/mac/video_renderer_mac.h b/test/mac/video_renderer_mac.h index e6499f07ff..956f50b541 100644 --- a/test/mac/video_renderer_mac.h +++ b/test/mac/video_renderer_mac.h @@ -11,7 +11,7 @@ #ifndef TEST_MAC_VIDEO_RENDERER_MAC_H_ #define TEST_MAC_VIDEO_RENDERER_MAC_H_ -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" #include "test/gl/gl_renderer.h" @class CocoaWindow; diff --git a/test/mock_audio_decoder_factory.h b/test/mock_audio_decoder_factory.h index 247f9fa8d4..b54e109a9b 100644 --- a/test/mock_audio_decoder_factory.h +++ b/test/mock_audio_decoder_factory.h @@ -16,7 +16,7 @@ #include "api/audio_codecs/audio_decoder_factory.h" #include "api/audio_codecs/builtin_audio_decoder_factory.h" -#include "rtc_base/refcountedobject.h" +#include "rtc_base/ref_counted_object.h" #include "rtc_base/scoped_ref_ptr.h" #include "test/gmock.h" diff --git a/test/mock_audio_encoder_factory.h b/test/mock_audio_encoder_factory.h index 340602c35f..55fe2591b4 100644 --- a/test/mock_audio_encoder_factory.h +++ b/test/mock_audio_encoder_factory.h @@ -15,7 +15,7 @@ #include #include "api/audio_codecs/audio_encoder_factory.h" -#include "rtc_base/refcountedobject.h" +#include "rtc_base/ref_counted_object.h" #include "rtc_base/scoped_ref_ptr.h" #include "test/gmock.h" diff --git a/test/pc/e2e/api/peerconnection_quality_test_fixture.h b/test/pc/e2e/api/peerconnection_quality_test_fixture.h index 1640340457..9b3e75c2d6 100644 --- a/test/pc/e2e/api/peerconnection_quality_test_fixture.h +++ b/test/pc/e2e/api/peerconnection_quality_test_fixture.h @@ -14,11 +14,11 @@ #include #include -#include "api/asyncresolverfactory.h" -#include "api/call/callfactoryinterface.h" +#include "api/async_resolver_factory.h" +#include "api/call/call_factory_interface.h" #include "api/fec_controller.h" #include "api/media_transport_interface.h" -#include "api/peerconnectioninterface.h" +#include "api/peer_connection_interface.h" #include "api/test/simulated_network.h" #include "api/transport/network_control.h" #include "api/video_codecs/video_decoder_factory.h" @@ -26,8 +26,8 @@ #include "api/video_codecs/video_encoder_factory.h" #include "logging/rtc_event_log/rtc_event_log_factory_interface.h" #include "rtc_base/network.h" -#include "rtc_base/rtccertificategenerator.h" -#include "rtc_base/sslcertificate.h" +#include "rtc_base/rtc_certificate_generator.h" +#include "rtc_base/ssl_certificate.h" #include "rtc_base/thread.h" #include "test/pc/e2e/api/audio_quality_analyzer_interface.h" #include "test/pc/e2e/api/video_quality_analyzer_interface.h" diff --git a/test/rtp_file_reader.cc b/test/rtp_file_reader.cc index c9eb98681c..203bf3007d 100644 --- a/test/rtp_file_reader.cc +++ b/test/rtp_file_reader.cc @@ -18,7 +18,7 @@ #include "modules/rtp_rtcp/source/rtp_utility.h" #include "rtc_base/checks.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" #include "rtc_base/format_macros.h" #include "rtc_base/logging.h" #include "rtc_base/system/arch.h" diff --git a/test/rtp_file_reader_unittest.cc b/test/rtp_file_reader_unittest.cc index b41f32fc9c..ab5122446e 100644 --- a/test/rtp_file_reader_unittest.cc +++ b/test/rtp_file_reader_unittest.cc @@ -14,7 +14,7 @@ #include "modules/rtp_rtcp/source/rtp_utility.h" #include "test/gtest.h" #include "test/rtp_file_reader.h" -#include "test/testsupport/fileutils.h" +#include "test/testsupport/file_utils.h" namespace webrtc { diff --git a/test/rtp_file_writer.cc b/test/rtp_file_writer.cc index 9bde92aebb..de9f71198e 100644 --- a/test/rtp_file_writer.cc +++ b/test/rtp_file_writer.cc @@ -15,7 +15,7 @@ #include #include "rtc_base/checks.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace webrtc { namespace test { diff --git a/test/rtp_file_writer_unittest.cc b/test/rtp_file_writer_unittest.cc index 18efd08597..6bfad411c0 100644 --- a/test/rtp_file_writer_unittest.cc +++ b/test/rtp_file_writer_unittest.cc @@ -15,7 +15,7 @@ #include "test/gtest.h" #include "test/rtp_file_reader.h" #include "test/rtp_file_writer.h" -#include "test/testsupport/fileutils.h" +#include "test/testsupport/file_utils.h" namespace webrtc { diff --git a/test/rtp_rtcp_observer.h b/test/rtp_rtcp_observer.h index d4aadfe0da..7cff645a2f 100644 --- a/test/rtp_rtcp_observer.h +++ b/test/rtp_rtcp_observer.h @@ -18,7 +18,7 @@ #include "call/simulated_packet_receiver.h" #include "call/video_send_stream.h" #include "modules/rtp_rtcp/include/rtp_header_parser.h" -#include "rtc_base/criticalsection.h" +#include "rtc_base/critical_section.h" #include "rtc_base/event.h" #include "system_wrappers/include/field_trial.h" #include "test/constants.h" diff --git a/test/scenario/audio_stream.cc b/test/scenario/audio_stream.cc index e161b8e636..d924275803 100644 --- a/test/scenario/audio_stream.cc +++ b/test/scenario/audio_stream.cc @@ -10,7 +10,7 @@ #include "test/scenario/audio_stream.h" #include "absl/memory/memory.h" -#include "rtc_base/bitrateallocationstrategy.h" +#include "rtc_base/bitrate_allocation_strategy.h" #include "test/call_test.h" #if WEBRTC_ENABLE_PROTOBUF diff --git a/test/scenario/audio_stream.h b/test/scenario/audio_stream.h index 3ab0a1f2de..430e333470 100644 --- a/test/scenario/audio_stream.h +++ b/test/scenario/audio_stream.h @@ -13,7 +13,7 @@ #include #include -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" #include "test/scenario/call_client.h" #include "test/scenario/column_printer.h" #include "test/scenario/network_node.h" diff --git a/test/scenario/call_client.h b/test/scenario/call_client.h index bea25cbd60..ace6366e12 100644 --- a/test/scenario/call_client.h +++ b/test/scenario/call_client.h @@ -18,7 +18,7 @@ #include "modules/audio_device/include/test_audio_device.h" #include "modules/congestion_controller/test/controller_printer.h" #include "modules/rtp_rtcp/include/rtp_header_parser.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" #include "test/scenario/column_printer.h" #include "test/scenario/network/network_emulation.h" #include "test/scenario/network_node.h" diff --git a/test/scenario/column_printer.h b/test/scenario/column_printer.h index b1299a05ac..5ac9a1b4fe 100644 --- a/test/scenario/column_printer.h +++ b/test/scenario/column_printer.h @@ -14,7 +14,7 @@ #include #include -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" #include "rtc_base/strings/string_builder.h" namespace webrtc { diff --git a/test/scenario/network/network_emulation.h b/test/scenario/network/network_emulation.h index ccb4171f82..ec179b0ea6 100644 --- a/test/scenario/network/network_emulation.h +++ b/test/scenario/network/network_emulation.h @@ -21,9 +21,9 @@ #include "absl/types/optional.h" #include "api/test/simulated_network.h" #include "api/units/timestamp.h" -#include "rtc_base/asyncsocket.h" -#include "rtc_base/copyonwritebuffer.h" -#include "rtc_base/socketaddress.h" +#include "rtc_base/async_socket.h" +#include "rtc_base/copy_on_write_buffer.h" +#include "rtc_base/socket_address.h" #include "rtc_base/thread.h" namespace webrtc { diff --git a/test/scenario/network_node.h b/test/scenario/network_node.h index 190ecb239e..cce1dd9928 100644 --- a/test/scenario/network_node.h +++ b/test/scenario/network_node.h @@ -20,8 +20,8 @@ #include "api/units/timestamp.h" #include "call/call.h" #include "call/simulated_network.h" -#include "rtc_base/constructormagic.h" -#include "rtc_base/copyonwritebuffer.h" +#include "rtc_base/constructor_magic.h" +#include "rtc_base/copy_on_write_buffer.h" #include "test/scenario/column_printer.h" #include "test/scenario/network/network_emulation.h" #include "test/scenario/scenario_config.h" diff --git a/test/scenario/quality_stats.h b/test/scenario/quality_stats.h index 5e0ee48f80..34702ac8d4 100644 --- a/test/scenario/quality_stats.h +++ b/test/scenario/quality_stats.h @@ -20,7 +20,7 @@ #include "api/video/video_sink_interface.h" #include "api/video/video_source_interface.h" #include "rtc_base/task_queue.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/time_utils.h" #include "system_wrappers/include/clock.h" #include "test/scenario/quality_info.h" #include "test/scenario/scenario_config.h" diff --git a/test/scenario/scenario.cc b/test/scenario/scenario.cc index cadb4b5cf2..0efe80c864 100644 --- a/test/scenario/scenario.cc +++ b/test/scenario/scenario.cc @@ -14,9 +14,9 @@ #include "api/audio_codecs/builtin_audio_decoder_factory.h" #include "api/audio_codecs/builtin_audio_encoder_factory.h" #include "rtc_base/flags.h" -#include "rtc_base/socketaddress.h" +#include "rtc_base/socket_address.h" #include "test/scenario/network/network_emulation.h" -#include "test/testsupport/fileutils.h" +#include "test/testsupport/file_utils.h" WEBRTC_DEFINE_bool(scenario_logs, false, "Save logs from scenario framework."); WEBRTC_DEFINE_string(out_root, diff --git a/test/scenario/scenario.h b/test/scenario/scenario.h index b5b29d7fed..f566840d69 100644 --- a/test/scenario/scenario.h +++ b/test/scenario/scenario.h @@ -14,8 +14,8 @@ #include #include -#include "rtc_base/constructormagic.h" -#include "rtc_base/fakeclock.h" +#include "rtc_base/constructor_magic.h" +#include "rtc_base/fake_clock.h" #include "test/scenario/audio_stream.h" #include "test/scenario/call_client.h" #include "test/scenario/column_printer.h" diff --git a/test/scenario/scenario_config.h b/test/scenario/scenario_config.h index 682a1cb4a3..fc0da056fb 100644 --- a/test/scenario/scenario_config.h +++ b/test/scenario/scenario_config.h @@ -14,7 +14,7 @@ #include #include "absl/types/optional.h" -#include "api/rtpparameters.h" +#include "api/rtp_parameters.h" #include "api/transport/network_control.h" #include "api/units/data_rate.h" #include "api/units/data_size.h" diff --git a/test/scenario/simulated_time.cc b/test/scenario/simulated_time.cc index 7be17559c7..18dff32b3b 100644 --- a/test/scenario/simulated_time.cc +++ b/test/scenario/simulated_time.cc @@ -17,7 +17,7 @@ #include "absl/types/optional.h" #include "rtc_base/checks.h" -#include "rtc_base/socketaddress.h" +#include "rtc_base/socket_address.h" namespace webrtc { namespace test { diff --git a/test/scenario/simulated_time.h b/test/scenario/simulated_time.h index be9331ca77..a4cb70a950 100644 --- a/test/scenario/simulated_time.h +++ b/test/scenario/simulated_time.h @@ -24,7 +24,7 @@ #include "api/units/data_size.h" #include "api/units/time_delta.h" #include "api/units/timestamp.h" -#include "rtc_base/copyonwritebuffer.h" +#include "rtc_base/copy_on_write_buffer.h" #include "test/scenario/call_client.h" #include "test/scenario/network_node.h" #include "test/scenario/scenario_config.h" diff --git a/test/scenario/video_stream.cc b/test/scenario/video_stream.cc index b68858b92a..d427a90e0e 100644 --- a/test/scenario/video_stream.cc +++ b/test/scenario/video_stream.cc @@ -15,14 +15,14 @@ #include "absl/memory/memory.h" #include "api/test/video/function_video_encoder_factory.h" #include "api/video/builtin_video_bitrate_allocator_factory.h" -#include "media/base/mediaconstants.h" -#include "media/engine/internaldecoderfactory.h" -#include "media/engine/internalencoderfactory.h" -#include "media/engine/webrtcvideoengine.h" +#include "media/base/media_constants.h" +#include "media/engine/internal_decoder_factory.h" +#include "media/engine/internal_encoder_factory.h" +#include "media/engine/webrtc_video_engine.h" #include "test/call_test.h" #include "test/fake_encoder.h" #include "test/scenario/hardware_codecs.h" -#include "test/testsupport/fileutils.h" +#include "test/testsupport/file_utils.h" namespace webrtc { namespace test { diff --git a/test/scenario/video_stream.h b/test/scenario/video_stream.h index 6604576e32..23994be079 100644 --- a/test/scenario/video_stream.h +++ b/test/scenario/video_stream.h @@ -13,7 +13,7 @@ #include #include -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" #include "test/fake_encoder.h" #include "test/frame_generator_capturer.h" #include "test/scenario/call_client.h" diff --git a/test/single_threaded_task_queue.cc b/test/single_threaded_task_queue.cc index 5c35c2e43b..965cb47547 100644 --- a/test/single_threaded_task_queue.cc +++ b/test/single_threaded_task_queue.cc @@ -15,7 +15,7 @@ #include "absl/memory/memory.h" #include "rtc_base/checks.h" #include "rtc_base/numerics/safe_conversions.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/time_utils.h" namespace webrtc { namespace test { diff --git a/test/single_threaded_task_queue.h b/test/single_threaded_task_queue.h index 0721891263..5458dd1297 100644 --- a/test/single_threaded_task_queue.h +++ b/test/single_threaded_task_queue.h @@ -14,7 +14,7 @@ #include #include -#include "rtc_base/criticalsection.h" +#include "rtc_base/critical_section.h" #include "rtc_base/event.h" #include "rtc_base/platform_thread.h" #include "rtc_base/thread_checker.h" diff --git a/test/test_main_lib.cc b/test/test_main_lib.cc index ef595c7d9c..515285ebb5 100644 --- a/test/test_main_lib.cc +++ b/test/test_main_lib.cc @@ -23,11 +23,11 @@ #include "test/field_trial.h" #include "test/gmock.h" #include "test/gtest.h" -#include "test/testsupport/fileutils.h" +#include "test/testsupport/file_utils.h" #include "test/testsupport/perf_test.h" #if defined(WEBRTC_WIN) -#include "rtc_base/win32socketinit.h" +#include "rtc_base/win32_socket_init.h" #endif #if defined(WEBRTC_IOS) diff --git a/test/test_video_capturer.h b/test/test_video_capturer.h index 250736e604..9c5b498f9f 100644 --- a/test/test_video_capturer.h +++ b/test/test_video_capturer.h @@ -16,8 +16,8 @@ #include "api/video/video_frame.h" #include "api/video/video_source_interface.h" -#include "media/base/videoadapter.h" -#include "media/base/videobroadcaster.h" +#include "media/base/video_adapter.h" +#include "media/base/video_broadcaster.h" namespace webrtc { namespace test { diff --git a/test/testsupport/file_utils.cc b/test/testsupport/file_utils.cc index 45f70910e6..45b2bc2618 100644 --- a/test/testsupport/file_utils.cc +++ b/test/testsupport/file_utils.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "test/testsupport/fileutils.h" +#include "test/testsupport/file_utils.h" #include @@ -47,16 +47,16 @@ #include #if defined(WEBRTC_IOS) -#include "test/testsupport/iosfileutils.h" +#include "test/testsupport/ios_file_utils.h" #endif #if defined(WEBRTC_MAC) -#include "test/testsupport/macfileutils.h" +#include "test/testsupport/mac_file_utils.h" #endif #include "rtc_base/checks.h" -#include "rtc_base/stringutils.h" -#include "test/testsupport/fileutils_override.h" +#include "rtc_base/string_utils.h" +#include "test/testsupport/file_utils_override.h" namespace webrtc { namespace test { diff --git a/test/testsupport/file_utils.h b/test/testsupport/file_utils.h index 8a186988d6..cdf3a3157b 100644 --- a/test/testsupport/file_utils.h +++ b/test/testsupport/file_utils.h @@ -10,8 +10,8 @@ #include -#ifndef TEST_TESTSUPPORT_FILEUTILS_H_ -#define TEST_TESTSUPPORT_FILEUTILS_H_ +#ifndef TEST_TESTSUPPORT_FILE_UTILS_H_ +#define TEST_TESTSUPPORT_FILE_UTILS_H_ #include #include @@ -106,4 +106,4 @@ size_t GetFileSize(const std::string& filename); } // namespace test } // namespace webrtc -#endif // TEST_TESTSUPPORT_FILEUTILS_H_ +#endif // TEST_TESTSUPPORT_FILE_UTILS_H_ diff --git a/test/testsupport/file_utils_override.cc b/test/testsupport/file_utils_override.cc index 5040fa55fa..e2c2c0f00c 100644 --- a/test/testsupport/file_utils_override.cc +++ b/test/testsupport/file_utils_override.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "test/testsupport/fileutils_override.h" +#include "test/testsupport/file_utils_override.h" #include #include @@ -33,17 +33,17 @@ #endif #if defined(WEBRTC_IOS) -#include "test/testsupport/iosfileutils.h" +#include "test/testsupport/ios_file_utils.h" #endif #if defined(WEBRTC_MAC) -#include "test/testsupport/macfileutils.h" +#include "test/testsupport/mac_file_utils.h" #endif #include "absl/types/optional.h" #include "rtc_base/arraysize.h" #include "rtc_base/checks.h" -#include "rtc_base/stringutils.h" +#include "rtc_base/string_utils.h" namespace webrtc { namespace test { diff --git a/test/testsupport/file_utils_override.h b/test/testsupport/file_utils_override.h index 0a631df5e8..a72cd805cf 100644 --- a/test/testsupport/file_utils_override.h +++ b/test/testsupport/file_utils_override.h @@ -10,8 +10,8 @@ #include -#ifndef TEST_TESTSUPPORT_FILEUTILS_OVERRIDE_H_ -#define TEST_TESTSUPPORT_FILEUTILS_OVERRIDE_H_ +#ifndef TEST_TESTSUPPORT_FILE_UTILS_OVERRIDE_H_ +#define TEST_TESTSUPPORT_FILE_UTILS_OVERRIDE_H_ namespace webrtc { namespace test { @@ -53,4 +53,4 @@ std::string ResourcePath(const std::string& name, const std::string& extension); } // namespace test } // namespace webrtc -#endif // TEST_TESTSUPPORT_FILEUTILS_OVERRIDE_H_ +#endif // TEST_TESTSUPPORT_FILE_UTILS_OVERRIDE_H_ diff --git a/test/testsupport/file_utils_unittest.cc b/test/testsupport/file_utils_unittest.cc index 49e30ff1c3..49bc2602e3 100644 --- a/test/testsupport/file_utils_unittest.cc +++ b/test/testsupport/file_utils_unittest.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "test/testsupport/fileutils.h" +#include "test/testsupport/file_utils.h" #include #include diff --git a/test/testsupport/ios_file_utils.h b/test/testsupport/ios_file_utils.h index f0194ba82a..bafe254c11 100644 --- a/test/testsupport/ios_file_utils.h +++ b/test/testsupport/ios_file_utils.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef TEST_TESTSUPPORT_IOSFILEUTILS_H_ -#define TEST_TESTSUPPORT_IOSFILEUTILS_H_ +#ifndef TEST_TESTSUPPORT_IOS_FILE_UTILS_H_ +#define TEST_TESTSUPPORT_IOS_FILE_UTILS_H_ #include @@ -23,4 +23,4 @@ std::string IOSResourcePath(std::string name, std::string extension); } // namespace test } // namespace webrtc -#endif // TEST_TESTSUPPORT_IOSFILEUTILS_H_ +#endif // TEST_TESTSUPPORT_IOS_FILE_UTILS_H_ diff --git a/test/testsupport/mac_file_utils.h b/test/testsupport/mac_file_utils.h index 82ae866efb..c6cbdc580d 100644 --- a/test/testsupport/mac_file_utils.h +++ b/test/testsupport/mac_file_utils.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef TEST_TESTSUPPORT_MACFILEUTILS_H_ -#define TEST_TESTSUPPORT_MACFILEUTILS_H_ +#ifndef TEST_TESTSUPPORT_MAC_FILE_UTILS_H_ +#define TEST_TESTSUPPORT_MAC_FILE_UTILS_H_ #include @@ -21,4 +21,4 @@ void GetNSExecutablePath(std::string* path); } // namespace test } // namespace webrtc -#endif // TEST_TESTSUPPORT_MACFILEUTILS_H_ +#endif // TEST_TESTSUPPORT_MAC_FILE_UTILS_H_ diff --git a/test/testsupport/perf_test.cc b/test/testsupport/perf_test.cc index bd810e3abd..e0a77ae46d 100644 --- a/test/testsupport/perf_test.cc +++ b/test/testsupport/perf_test.cc @@ -10,7 +10,7 @@ #include "test/testsupport/perf_test.h" #include "rtc_base/checks.h" -#include "rtc_base/criticalsection.h" +#include "rtc_base/critical_section.h" #include #include diff --git a/test/testsupport/test_artifacts.cc b/test/testsupport/test_artifacts.cc index 9438cefbc4..f45a92d652 100644 --- a/test/testsupport/test_artifacts.cc +++ b/test/testsupport/test_artifacts.cc @@ -15,7 +15,7 @@ #include "rtc_base/file.h" #include "rtc_base/flags.h" #include "rtc_base/logging.h" -#include "test/testsupport/fileutils.h" +#include "test/testsupport/file_utils.h" namespace { const std::string& DefaultArtifactPath() { diff --git a/test/testsupport/test_artifacts_unittest.cc b/test/testsupport/test_artifacts_unittest.cc index d573dc827d..41c188d502 100644 --- a/test/testsupport/test_artifacts_unittest.cc +++ b/test/testsupport/test_artifacts_unittest.cc @@ -16,7 +16,7 @@ #include "rtc_base/file.h" #include "rtc_base/flags.h" #include "test/gtest.h" -#include "test/testsupport/fileutils.h" +#include "test/testsupport/file_utils.h" WEBRTC_DECLARE_string(test_artifacts_dir); diff --git a/test/testsupport/y4m_frame_writer_unittest.cc b/test/testsupport/y4m_frame_writer_unittest.cc index 6d3aba718c..f1de242c50 100644 --- a/test/testsupport/y4m_frame_writer_unittest.cc +++ b/test/testsupport/y4m_frame_writer_unittest.cc @@ -15,7 +15,7 @@ #include #include "test/gtest.h" -#include "test/testsupport/fileutils.h" +#include "test/testsupport/file_utils.h" #include "test/testsupport/frame_writer.h" namespace webrtc { diff --git a/test/testsupport/yuv_frame_reader.cc b/test/testsupport/yuv_frame_reader.cc index d36a36744a..97b94bb4d1 100644 --- a/test/testsupport/yuv_frame_reader.cc +++ b/test/testsupport/yuv_frame_reader.cc @@ -14,7 +14,7 @@ #include "api/video/i420_buffer.h" #include "rtc_base/scoped_ref_ptr.h" #include "test/frame_utils.h" -#include "test/testsupport/fileutils.h" +#include "test/testsupport/file_utils.h" #include "test/testsupport/frame_reader.h" namespace webrtc { diff --git a/test/testsupport/yuv_frame_reader_unittest.cc b/test/testsupport/yuv_frame_reader_unittest.cc index 4a2b01c84a..cd405f5588 100644 --- a/test/testsupport/yuv_frame_reader_unittest.cc +++ b/test/testsupport/yuv_frame_reader_unittest.cc @@ -17,7 +17,7 @@ #include "api/video/video_frame_buffer.h" #include "rtc_base/scoped_ref_ptr.h" #include "test/gtest.h" -#include "test/testsupport/fileutils.h" +#include "test/testsupport/file_utils.h" #include "test/testsupport/frame_reader.h" namespace webrtc { diff --git a/test/testsupport/yuv_frame_writer_unittest.cc b/test/testsupport/yuv_frame_writer_unittest.cc index a5ceff092c..12094bb2b7 100644 --- a/test/testsupport/yuv_frame_writer_unittest.cc +++ b/test/testsupport/yuv_frame_writer_unittest.cc @@ -15,7 +15,7 @@ #include #include "test/gtest.h" -#include "test/testsupport/fileutils.h" +#include "test/testsupport/file_utils.h" #include "test/testsupport/frame_writer.h" namespace webrtc { diff --git a/tools_webrtc/sanitizers/tsan_suppressions_webrtc.cc b/tools_webrtc/sanitizers/tsan_suppressions_webrtc.cc index 7ff65b573b..96c236c8e8 100644 --- a/tools_webrtc/sanitizers/tsan_suppressions_webrtc.cc +++ b/tools_webrtc/sanitizers/tsan_suppressions_webrtc.cc @@ -31,14 +31,14 @@ char kTSanDefaultSuppressions[] = // rtc_unittests // https://code.google.com/p/webrtc/issues/detail?id=2080 "race:rtc_base/logging.cc\n" - "race:rtc_base/sharedexclusivelock_unittest.cc\n" - "race:rtc_base/signalthread_unittest.cc\n" + "race:rtc_base/shared_exclusive_lock_unittest.cc\n" + "race:rtc_base/signal_thread_unittest.cc\n" // rtc_pc_unittests // https://code.google.com/p/webrtc/issues/detail?id=2079 - "race:rtc_base/testclient.cc\n" - "race:rtc_base/virtualsocketserver.cc\n" - "race:talk/p2p/base/stunserver_unittest.cc\n" + "race:rtc_base/test_client.cc\n" + "race:rtc_base/virtual_socket_server.cc\n" + "race:talk/p2p/base/stun_server_unittest.cc\n" // third_party/usrsctp // TODO(jiayl): https://code.google.com/p/webrtc/issues/detail?id=3492 diff --git a/video/buffered_frame_decryptor.h b/video/buffered_frame_decryptor.h index 28a0b5500f..82732a2ea8 100644 --- a/video/buffered_frame_decryptor.h +++ b/video/buffered_frame_decryptor.h @@ -14,8 +14,8 @@ #include #include -#include "api/crypto/cryptooptions.h" -#include "api/crypto/framedecryptorinterface.h" +#include "api/crypto/crypto_options.h" +#include "api/crypto/frame_decryptor_interface.h" #include "modules/include/module_common_types.h" #include "modules/video_coding/frame_object.h" diff --git a/video/buffered_frame_decryptor_unittest.cc b/video/buffered_frame_decryptor_unittest.cc index 8a0c951c7c..ef807efc4e 100644 --- a/video/buffered_frame_decryptor_unittest.cc +++ b/video/buffered_frame_decryptor_unittest.cc @@ -17,7 +17,7 @@ #include "absl/memory/memory.h" #include "api/test/mock_frame_decryptor.h" #include "modules/video_coding/packet_buffer.h" -#include "rtc_base/refcountedobject.h" +#include "rtc_base/ref_counted_object.h" #include "system_wrappers/include/clock.h" #include "test/gmock.h" #include "test/gtest.h" diff --git a/video/call_stats.h b/video/call_stats.h index 930c3efffd..34519ba0cb 100644 --- a/video/call_stats.h +++ b/video/call_stats.h @@ -16,8 +16,8 @@ #include "modules/include/module.h" #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" -#include "rtc_base/constructormagic.h" -#include "rtc_base/criticalsection.h" +#include "rtc_base/constructor_magic.h" +#include "rtc_base/critical_section.h" #include "rtc_base/thread_checker.h" #include "system_wrappers/include/clock.h" diff --git a/video/cpu_scaling_tests.cc b/video/cpu_scaling_tests.cc index c4d1b1eeaa..c6a897560c 100644 --- a/video/cpu_scaling_tests.cc +++ b/video/cpu_scaling_tests.cc @@ -11,7 +11,7 @@ #include #include -#include "api/rtpparameters.h" +#include "api/rtp_parameters.h" #include "api/video/video_frame.h" #include "api/video/video_sink_interface.h" #include "api/video/video_source_interface.h" diff --git a/video/encoder_rtcp_feedback.h b/video/encoder_rtcp_feedback.h index b838979ee4..bdae914861 100644 --- a/video/encoder_rtcp_feedback.h +++ b/video/encoder_rtcp_feedback.h @@ -13,7 +13,7 @@ #include #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" -#include "rtc_base/criticalsection.h" +#include "rtc_base/critical_section.h" #include "system_wrappers/include/clock.h" namespace webrtc { diff --git a/video/end_to_end_tests/codec_tests.cc b/video/end_to_end_tests/codec_tests.cc index f44622882c..3c9b39cdc8 100644 --- a/video/end_to_end_tests/codec_tests.cc +++ b/video/end_to_end_tests/codec_tests.cc @@ -14,8 +14,8 @@ #include "api/video/color_space.h" #include "api/video/video_rotation.h" #include "common_video/test/utilities.h" -#include "media/engine/internaldecoderfactory.h" -#include "media/engine/internalencoderfactory.h" +#include "media/engine/internal_decoder_factory.h" +#include "media/engine/internal_encoder_factory.h" #include "modules/video_coding/codecs/h264/include/h264.h" #include "modules/video_coding/codecs/multiplex/include/multiplex_decoder_adapter.h" #include "modules/video_coding/codecs/multiplex/include/multiplex_encoder_adapter.h" diff --git a/video/end_to_end_tests/config_tests.cc b/video/end_to_end_tests/config_tests.cc index 448f74cbc8..c5f6e3fd65 100644 --- a/video/end_to_end_tests/config_tests.cc +++ b/video/end_to_end_tests/config_tests.cc @@ -11,7 +11,7 @@ #include #include -#include "api/crypto/cryptooptions.h" +#include "api/crypto/crypto_options.h" #include "api/rtp_headers.h" #include "call/flexfec_receive_stream.h" #include "call/rtp_config.h" diff --git a/video/end_to_end_tests/extended_reports_tests.cc b/video/end_to_end_tests/extended_reports_tests.cc index 2afda42e9e..5b649d5636 100644 --- a/video/end_to_end_tests/extended_reports_tests.cc +++ b/video/end_to_end_tests/extended_reports_tests.cc @@ -31,7 +31,7 @@ #include "common_types.h" // NOLINT(build/include) #include "modules/rtp_rtcp/source/rtcp_packet/dlrr.h" #include "modules/rtp_rtcp/source/rtcp_packet/target_bitrate.h" -#include "rtc_base/criticalsection.h" +#include "rtc_base/critical_section.h" #include "rtc_base/event.h" #include "rtc_base/thread_annotations.h" #include "system_wrappers/include/clock.h" diff --git a/video/end_to_end_tests/fec_tests.cc b/video/end_to_end_tests/fec_tests.cc index a8fa82d318..42215d3470 100644 --- a/video/end_to_end_tests/fec_tests.cc +++ b/video/end_to_end_tests/fec_tests.cc @@ -13,7 +13,7 @@ #include "api/test/video/function_video_encoder_factory.h" #include "call/fake_network_pipe.h" #include "call/simulated_network.h" -#include "media/engine/internaldecoderfactory.h" +#include "media/engine/internal_decoder_factory.h" #include "modules/rtp_rtcp/source/byte_io.h" #include "modules/video_coding/codecs/vp8/include/vp8.h" #include "test/call_test.h" diff --git a/video/end_to_end_tests/frame_encryption_tests.cc b/video/end_to_end_tests/frame_encryption_tests.cc index 8cd7b47849..98b3a4b830 100644 --- a/video/end_to_end_tests/frame_encryption_tests.cc +++ b/video/end_to_end_tests/frame_encryption_tests.cc @@ -10,7 +10,7 @@ #include "api/test/fake_frame_decryptor.h" #include "api/test/fake_frame_encryptor.h" -#include "media/engine/internaldecoderfactory.h" +#include "media/engine/internal_decoder_factory.h" #include "modules/video_coding/codecs/vp8/include/vp8.h" #include "test/call_test.h" #include "test/field_trial.h" diff --git a/video/end_to_end_tests/multi_stream_tester.cc b/video/end_to_end_tests/multi_stream_tester.cc index 5d5ba63415..e9d1d044e8 100644 --- a/video/end_to_end_tests/multi_stream_tester.cc +++ b/video/end_to_end_tests/multi_stream_tester.cc @@ -21,7 +21,7 @@ #include "call/fake_network_pipe.h" #include "call/simulated_network.h" #include "logging/rtc_event_log/rtc_event_log.h" -#include "media/engine/internaldecoderfactory.h" +#include "media/engine/internal_decoder_factory.h" #include "modules/video_coding/codecs/vp8/include/vp8.h" #include "test/call_test.h" #include "test/encoder_settings.h" diff --git a/video/overuse_frame_detector.cc b/video/overuse_frame_detector.cc index cba167dfac..b214b39ad4 100644 --- a/video/overuse_frame_detector.cc +++ b/video/overuse_frame_detector.cc @@ -24,7 +24,7 @@ #include "rtc_base/checks.h" #include "rtc_base/logging.h" #include "rtc_base/numerics/exp_filter.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/time_utils.h" #include "system_wrappers/include/field_trial.h" #if defined(WEBRTC_MAC) && !defined(WEBRTC_IOS) diff --git a/video/overuse_frame_detector.h b/video/overuse_frame_detector.h index ea0d76dd90..3db8643500 100644 --- a/video/overuse_frame_detector.h +++ b/video/overuse_frame_detector.h @@ -17,7 +17,7 @@ #include "absl/types/optional.h" #include "api/video/video_stream_encoder_observer.h" #include "modules/video_coding/utility/quality_scaler.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" #include "rtc_base/numerics/exp_filter.h" #include "rtc_base/sequenced_task_checker.h" #include "rtc_base/task_queue.h" diff --git a/video/overuse_frame_detector_unittest.cc b/video/overuse_frame_detector_unittest.cc index eef2339f21..7e160f7551 100644 --- a/video/overuse_frame_detector_unittest.cc +++ b/video/overuse_frame_detector_unittest.cc @@ -15,7 +15,7 @@ #include "api/video/i420_buffer.h" #include "modules/video_coding/utility/quality_scaler.h" #include "rtc_base/event.h" -#include "rtc_base/fakeclock.h" +#include "rtc_base/fake_clock.h" #include "rtc_base/random.h" #include "test/gmock.h" #include "test/gtest.h" diff --git a/video/picture_id_tests.cc b/video/picture_id_tests.cc index c8f5cf3482..f74cebc237 100644 --- a/video/picture_id_tests.cc +++ b/video/picture_id_tests.cc @@ -13,7 +13,7 @@ #include "api/test/video/function_video_encoder_factory.h" #include "call/fake_network_pipe.h" #include "call/simulated_network.h" -#include "media/engine/internalencoderfactory.h" +#include "media/engine/internal_encoder_factory.h" #include "media/engine/simulcast_encoder_adapter.h" #include "modules/rtp_rtcp/source/rtp_format.h" #include "modules/video_coding/codecs/vp8/include/vp8.h" diff --git a/video/quality_scaling_tests.cc b/video/quality_scaling_tests.cc index 01328f8192..4f68eb1cc1 100644 --- a/video/quality_scaling_tests.cc +++ b/video/quality_scaling_tests.cc @@ -11,7 +11,7 @@ #include #include "api/test/video/function_video_encoder_factory.h" -#include "media/engine/internalencoderfactory.h" +#include "media/engine/internal_encoder_factory.h" #include "modules/video_coding/codecs/h264/include/h264.h" #include "modules/video_coding/codecs/vp8/include/vp8.h" #include "modules/video_coding/codecs/vp9/include/vp9.h" diff --git a/video/receive_statistics_proxy.cc b/video/receive_statistics_proxy.cc index b9da65a6fe..8ad6ef5c62 100644 --- a/video/receive_statistics_proxy.cc +++ b/video/receive_statistics_proxy.cc @@ -18,7 +18,7 @@ #include "rtc_base/checks.h" #include "rtc_base/logging.h" #include "rtc_base/strings/string_builder.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/time_utils.h" #include "system_wrappers/include/clock.h" #include "system_wrappers/include/metrics.h" diff --git a/video/receive_statistics_proxy.h b/video/receive_statistics_proxy.h index 83d5bced4b..e1a07842be 100644 --- a/video/receive_statistics_proxy.h +++ b/video/receive_statistics_proxy.h @@ -19,12 +19,12 @@ #include "absl/types/optional.h" #include "call/video_receive_stream.h" #include "modules/video_coding/include/video_coding_defines.h" -#include "rtc_base/criticalsection.h" +#include "rtc_base/critical_section.h" #include "rtc_base/numerics/histogram_percentile_counter.h" #include "rtc_base/numerics/moving_max_counter.h" #include "rtc_base/numerics/sample_counter.h" #include "rtc_base/rate_statistics.h" -#include "rtc_base/ratetracker.h" +#include "rtc_base/rate_tracker.h" #include "rtc_base/thread_annotations.h" #include "rtc_base/thread_checker.h" #include "video/quality_threshold.h" diff --git a/video/replay.cc b/video/replay.cc index a6d78aa994..030c01a820 100644 --- a/video/replay.cc +++ b/video/replay.cc @@ -21,14 +21,14 @@ #include "call/call.h" #include "common_video/libyuv/include/webrtc_libyuv.h" #include "logging/rtc_event_log/rtc_event_log.h" -#include "media/engine/internaldecoderfactory.h" +#include "media/engine/internal_decoder_factory.h" #include "modules/rtp_rtcp/include/rtp_header_parser.h" #include "rtc_base/checks.h" #include "rtc_base/file.h" #include "rtc_base/flags.h" #include "rtc_base/string_to_number.h" #include "rtc_base/strings/json.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/time_utils.h" #include "system_wrappers/include/clock.h" #include "system_wrappers/include/sleep.h" #include "test/call_test.h" diff --git a/video/rtp_streams_synchronizer.cc b/video/rtp_streams_synchronizer.cc index 31106616c0..9646f9d262 100644 --- a/video/rtp_streams_synchronizer.cc +++ b/video/rtp_streams_synchronizer.cc @@ -13,7 +13,7 @@ #include "absl/types/optional.h" #include "call/syncable.h" #include "rtc_base/checks.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/time_utils.h" #include "rtc_base/trace_event.h" #include "system_wrappers/include/rtp_to_ntp_estimator.h" diff --git a/video/rtp_streams_synchronizer.h b/video/rtp_streams_synchronizer.h index 720ea14d17..0778fc519e 100644 --- a/video/rtp_streams_synchronizer.h +++ b/video/rtp_streams_synchronizer.h @@ -17,7 +17,7 @@ #include #include "modules/include/module.h" -#include "rtc_base/criticalsection.h" +#include "rtc_base/critical_section.h" #include "rtc_base/thread_checker.h" #include "video/stream_synchronization.h" diff --git a/video/rtp_video_stream_receiver.cc b/video/rtp_video_stream_receiver.cc index 0cd3b7ebc0..0986400c82 100644 --- a/video/rtp_video_stream_receiver.cc +++ b/video/rtp_video_stream_receiver.cc @@ -16,7 +16,7 @@ #include "absl/memory/memory.h" -#include "media/base/mediaconstants.h" +#include "media/base/media_constants.h" #include "modules/pacing/packet_router.h" #include "modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h" #include "modules/rtp_rtcp/include/receive_statistics.h" diff --git a/video/rtp_video_stream_receiver.h b/video/rtp_video_stream_receiver.h index f4d71b4aa2..c1ee662870 100644 --- a/video/rtp_video_stream_receiver.h +++ b/video/rtp_video_stream_receiver.h @@ -19,7 +19,7 @@ #include "absl/types/optional.h" -#include "api/crypto/framedecryptorinterface.h" +#include "api/crypto/frame_decryptor_interface.h" #include "api/video/color_space.h" #include "api/video_codecs/video_codec.h" #include "call/rtp_packet_sink_interface.h" @@ -35,8 +35,8 @@ #include "modules/video_coding/include/video_coding_defines.h" #include "modules/video_coding/packet_buffer.h" #include "modules/video_coding/rtp_frame_reference_finder.h" -#include "rtc_base/constructormagic.h" -#include "rtc_base/criticalsection.h" +#include "rtc_base/constructor_magic.h" +#include "rtc_base/critical_section.h" #include "rtc_base/numerics/sequence_number_util.h" #include "rtc_base/sequenced_task_checker.h" #include "rtc_base/thread_annotations.h" diff --git a/video/rtp_video_stream_receiver_unittest.cc b/video/rtp_video_stream_receiver_unittest.cc index ae3751b41b..6ec7046bbb 100644 --- a/video/rtp_video_stream_receiver_unittest.cc +++ b/video/rtp_video_stream_receiver_unittest.cc @@ -13,7 +13,7 @@ #include "absl/memory/memory.h" #include "common_video/h264/h264_common.h" -#include "media/base/mediaconstants.h" +#include "media/base/media_constants.h" #include "modules/pacing/packet_router.h" #include "modules/rtp_rtcp/source/rtp_generic_frame_descriptor.h" #include "modules/rtp_rtcp/source/rtp_generic_frame_descriptor_extension.h" @@ -23,7 +23,7 @@ #include "modules/video_coding/include/video_coding_defines.h" #include "modules/video_coding/packet.h" #include "modules/video_coding/rtp_frame_reference_finder.h" -#include "rtc_base/bytebuffer.h" +#include "rtc_base/byte_buffer.h" #include "rtc_base/logging.h" #include "system_wrappers/include/clock.h" #include "system_wrappers/include/field_trial.h" diff --git a/video/screenshare_loopback.cc b/video/screenshare_loopback.cc index 46fd2afa16..a153e2f131 100644 --- a/video/screenshare_loopback.cc +++ b/video/screenshare_loopback.cc @@ -22,7 +22,7 @@ #include "rtc_base/checks.h" #include "rtc_base/flags.h" #include "rtc_base/logging.h" -#include "rtc_base/stringencode.h" +#include "rtc_base/string_encode.h" #include "system_wrappers/include/field_trial.h" #include "test/field_trial.h" #include "test/gtest.h" diff --git a/video/send_delay_stats.h b/video/send_delay_stats.h index 108795ac35..c3b9dc2d40 100644 --- a/video/send_delay_stats.h +++ b/video/send_delay_stats.h @@ -20,7 +20,7 @@ #include "call/video_send_stream.h" #include "common_types.h" // NOLINT(build/include) #include "modules/include/module_common_types_public.h" -#include "rtc_base/criticalsection.h" +#include "rtc_base/critical_section.h" #include "rtc_base/thread_annotations.h" #include "system_wrappers/include/clock.h" #include "video/stats_counter.h" diff --git a/video/send_statistics_proxy.h b/video/send_statistics_proxy.h index 7316f3b55a..ca8f542368 100644 --- a/video/send_statistics_proxy.h +++ b/video/send_statistics_proxy.h @@ -20,9 +20,9 @@ #include "call/video_send_stream.h" #include "modules/video_coding/include/video_codec_interface.h" #include "modules/video_coding/include/video_coding_defines.h" -#include "rtc_base/criticalsection.h" +#include "rtc_base/critical_section.h" #include "rtc_base/numerics/exp_filter.h" -#include "rtc_base/ratetracker.h" +#include "rtc_base/rate_tracker.h" #include "rtc_base/thread_annotations.h" #include "system_wrappers/include/clock.h" #include "video/report_block_stats.h" diff --git a/video/stats_counter.h b/video/stats_counter.h index 68017391b8..fb6017f415 100644 --- a/video/stats_counter.h +++ b/video/stats_counter.h @@ -14,7 +14,7 @@ #include #include -#include "rtc_base/constructormagic.h" +#include "rtc_base/constructor_magic.h" namespace webrtc { diff --git a/video/sv_loopback.cc b/video/sv_loopback.cc index 635cc56870..8785f154ef 100644 --- a/video/sv_loopback.cc +++ b/video/sv_loopback.cc @@ -22,7 +22,7 @@ #include "rtc_base/checks.h" #include "rtc_base/flags.h" #include "rtc_base/logging.h" -#include "rtc_base/stringencode.h" +#include "rtc_base/string_encode.h" #include "system_wrappers/include/field_trial.h" #include "test/field_trial.h" #include "test/gtest.h" diff --git a/video/video_analyzer.cc b/video/video_analyzer.cc index 950cf680b7..8987a829df 100644 --- a/video/video_analyzer.cc +++ b/video/video_analyzer.cc @@ -21,7 +21,7 @@ #include "rtc_base/memory_usage.h" #include "system_wrappers/include/cpu_info.h" #include "test/call_test.h" -#include "test/testsupport/fileutils.h" +#include "test/testsupport/file_utils.h" #include "test/testsupport/frame_writer.h" #include "test/testsupport/perf_test.h" #include "test/testsupport/test_artifacts.h" diff --git a/video/video_quality_test.cc b/video/video_quality_test.cc index 736d21eb27..2a1bb82dc2 100644 --- a/video/video_quality_test.cc +++ b/video/video_quality_test.cc @@ -23,8 +23,8 @@ #include "logging/rtc_event_log/output/rtc_event_log_output_file.h" #include "media/engine/adm_helpers.h" #include "media/engine/encoder_simulcast_proxy.h" -#include "media/engine/internalencoderfactory.h" -#include "media/engine/webrtcvideoengine.h" +#include "media/engine/internal_encoder_factory.h" +#include "media/engine/webrtc_video_engine.h" #include "modules/audio_device/include/audio_device.h" #include "modules/audio_mixer/audio_mixer_impl.h" #include "modules/video_coding/codecs/h264/include/h264.h" @@ -35,7 +35,7 @@ #include "modules/video_coding/utility/ivf_file_writer.h" #include "rtc_base/strings/string_builder.h" #include "test/run_loop.h" -#include "test/testsupport/fileutils.h" +#include "test/testsupport/file_utils.h" #include "test/vcm_capturer.h" #include "test/video_renderer.h" #include "video/frame_dumping_decoder.h" diff --git a/video/video_quality_test.h b/video/video_quality_test.h index 51686ec3cb..028dddfb58 100644 --- a/video/video_quality_test.h +++ b/video/video_quality_test.h @@ -19,8 +19,8 @@ #include "api/test/video_quality_test_fixture.h" #include "api/video/video_bitrate_allocator_factory.h" #include "call/fake_network_pipe.h" -#include "media/engine/internaldecoderfactory.h" -#include "media/engine/internalencoderfactory.h" +#include "media/engine/internal_decoder_factory.h" +#include "media/engine/internal_encoder_factory.h" #include "test/call_test.h" #include "test/frame_generator.h" #include "test/layer_filtering_transport.h" diff --git a/video/video_receive_stream.cc b/video/video_receive_stream.cc index b34e1b78d5..4a73decdf7 100644 --- a/video/video_receive_stream.cc +++ b/video/video_receive_stream.cc @@ -20,7 +20,7 @@ #include "absl/memory/memory.h" #include "absl/types/optional.h" #include "api/array_view.h" -#include "api/crypto/framedecryptorinterface.h" +#include "api/crypto/frame_decryptor_interface.h" #include "api/video/encoded_image.h" #include "api/video_codecs/sdp_video_format.h" #include "api/video_codecs/video_codec.h" @@ -43,7 +43,7 @@ #include "rtc_base/logging.h" #include "rtc_base/platform_file.h" #include "rtc_base/strings/string_builder.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/time_utils.h" #include "rtc_base/trace_event.h" #include "system_wrappers/include/clock.h" #include "system_wrappers/include/field_trial.h" diff --git a/video/video_receive_stream_unittest.cc b/video/video_receive_stream_unittest.cc index 0ec9e17733..259026ad1e 100644 --- a/video/video_receive_stream_unittest.cc +++ b/video/video_receive_stream_unittest.cc @@ -15,11 +15,11 @@ #include "api/video_codecs/video_decoder.h" #include "call/rtp_stream_receiver_controller.h" -#include "media/base/fakevideorenderer.h" +#include "media/base/fake_video_renderer.h" #include "modules/pacing/packet_router.h" #include "modules/rtp_rtcp/source/rtp_packet_to_send.h" #include "modules/utility/include/process_thread.h" -#include "rtc_base/criticalsection.h" +#include "rtc_base/critical_section.h" #include "rtc_base/event.h" #include "system_wrappers/include/clock.h" #include "test/field_trial.h" diff --git a/video/video_send_stream.h b/video/video_send_stream.h index 0765b52a08..f260304fed 100644 --- a/video/video_send_stream.h +++ b/video/video_send_stream.h @@ -20,7 +20,7 @@ #include "call/bitrate_allocator.h" #include "call/video_receive_stream.h" #include "call/video_send_stream.h" -#include "rtc_base/criticalsection.h" +#include "rtc_base/critical_section.h" #include "rtc_base/event.h" #include "rtc_base/task_queue.h" #include "video/send_delay_stats.h" diff --git a/video/video_send_stream_impl.cc b/video/video_send_stream_impl.cc index 42ec4a0dda..aa7696728b 100644 --- a/video/video_send_stream_impl.cc +++ b/video/video_send_stream_impl.cc @@ -15,14 +15,14 @@ #include #include -#include "api/crypto/cryptooptions.h" -#include "api/rtpparameters.h" +#include "api/crypto/crypto_options.h" +#include "api/rtp_parameters.h" #include "api/video_codecs/video_codec.h" #include "call/rtp_transport_controller_send_interface.h" #include "call/video_send_stream.h" #include "common_types.h" // NOLINT(build/include) #include "modules/pacing/paced_sender.h" -#include "rtc_base/atomicops.h" +#include "rtc_base/atomic_ops.h" #include "rtc_base/checks.h" #include "rtc_base/experiments/alr_experiment.h" #include "rtc_base/logging.h" @@ -30,7 +30,7 @@ #include "rtc_base/scoped_ref_ptr.h" #include "rtc_base/sequenced_task_checker.h" #include "rtc_base/thread_checker.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/time_utils.h" #include "rtc_base/trace_event.h" #include "system_wrappers/include/clock.h" #include "system_wrappers/include/field_trial.h" diff --git a/video/video_send_stream_impl.h b/video/video_send_stream_impl.h index fc89bf18da..cfc332849a 100644 --- a/video/video_send_stream_impl.h +++ b/video/video_send_stream_impl.h @@ -33,7 +33,7 @@ #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" #include "modules/utility/include/process_thread.h" #include "modules/video_coding/include/video_codec_interface.h" -#include "rtc_base/criticalsection.h" +#include "rtc_base/critical_section.h" #include "rtc_base/task_queue.h" #include "rtc_base/thread_annotations.h" #include "rtc_base/weak_ptr.h" diff --git a/video/video_send_stream_impl_unittest.cc b/video/video_send_stream_impl_unittest.cc index 5eb6d7bf63..af8c307488 100644 --- a/video/video_send_stream_impl_unittest.cc +++ b/video/video_send_stream_impl_unittest.cc @@ -18,7 +18,7 @@ #include "modules/utility/include/process_thread.h" #include "modules/video_coding/fec_controller_default.h" #include "rtc_base/experiments/alr_experiment.h" -#include "rtc_base/fakeclock.h" +#include "rtc_base/fake_clock.h" #include "rtc_base/task_queue_for_test.h" #include "test/field_trial.h" #include "test/gmock.h" diff --git a/video/video_send_stream_tests.cc b/video/video_send_stream_tests.cc index c306e84275..3264ce79a9 100644 --- a/video/video_send_stream_tests.cc +++ b/video/video_send_stream_tests.cc @@ -26,13 +26,13 @@ #include "modules/video_coding/codecs/vp9/include/vp9.h" #include "rtc_base/bind.h" #include "rtc_base/checks.h" -#include "rtc_base/criticalsection.h" +#include "rtc_base/critical_section.h" #include "rtc_base/event.h" #include "rtc_base/experiments/alr_experiment.h" #include "rtc_base/logging.h" #include "rtc_base/platform_thread.h" #include "rtc_base/rate_limiter.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/time_utils.h" #include "system_wrappers/include/sleep.h" #include "test/call_test.h" #include "test/configurable_frame_size_encoder.h" diff --git a/video/video_stream_decoder.h b/video/video_stream_decoder.h index df2ab9be4e..5a62d2c239 100644 --- a/video/video_stream_decoder.h +++ b/video/video_stream_decoder.h @@ -19,7 +19,7 @@ #include "api/video/video_sink_interface.h" #include "modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h" #include "modules/video_coding/include/video_coding_defines.h" -#include "rtc_base/criticalsection.h" +#include "rtc_base/critical_section.h" #include "rtc_base/platform_thread.h" #include "rtc_base/scoped_ref_ptr.h" diff --git a/video/video_stream_decoder_impl.cc b/video/video_stream_decoder_impl.cc index 4a22f5d612..fd3c62052c 100644 --- a/video/video_stream_decoder_impl.cc +++ b/video/video_stream_decoder_impl.cc @@ -13,7 +13,7 @@ #include "absl/memory/memory.h" #include "rtc_base/logging.h" #include "rtc_base/numerics/mod_ops.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/time_utils.h" namespace webrtc { diff --git a/video/video_stream_encoder.cc b/video/video_stream_encoder.cc index 0cb6c3b2e0..2d4de8f052 100644 --- a/video/video_stream_encoder.cc +++ b/video/video_stream_encoder.cc @@ -30,7 +30,7 @@ #include "rtc_base/logging.h" #include "rtc_base/strings/string_builder.h" #include "rtc_base/system/fallthrough.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/time_utils.h" #include "rtc_base/trace_event.h" #include "system_wrappers/include/field_trial.h" #include "video/overuse_frame_detector.h" diff --git a/video/video_stream_encoder.h b/video/video_stream_encoder.h index e522d64072..577ca5b562 100644 --- a/video/video_stream_encoder.h +++ b/video/video_stream_encoder.h @@ -27,7 +27,7 @@ #include "modules/video_coding/utility/frame_dropper.h" #include "modules/video_coding/utility/quality_scaler.h" #include "modules/video_coding/video_coding_impl.h" -#include "rtc_base/criticalsection.h" +#include "rtc_base/critical_section.h" #include "rtc_base/event.h" #include "rtc_base/rate_statistics.h" #include "rtc_base/sequenced_task_checker.h" diff --git a/video/video_stream_encoder_unittest.cc b/video/video_stream_encoder_unittest.cc index 7cc1e64efb..e83b04e661 100644 --- a/video/video_stream_encoder_unittest.cc +++ b/video/video_stream_encoder_unittest.cc @@ -18,12 +18,12 @@ #include "api/video/i420_buffer.h" #include "api/video_codecs/create_vp8_temporal_layers.h" #include "api/video_codecs/vp8_temporal_layers.h" -#include "media/base/videoadapter.h" +#include "media/base/video_adapter.h" #include "modules/video_coding/codecs/vp9/include/vp9_globals.h" #include "modules/video_coding/utility/default_video_bitrate_allocator.h" -#include "rtc_base/fakeclock.h" +#include "rtc_base/fake_clock.h" #include "rtc_base/logging.h" -#include "rtc_base/refcountedobject.h" +#include "rtc_base/ref_counted_object.h" #include "system_wrappers/include/metrics.h" #include "system_wrappers/include/sleep.h" #include "test/encoder_settings.h"