From c20978e581a3f71d96ef2f6078fbad350922fff8 Mon Sep 17 00:00:00 2001 From: Edward Lemur Date: Thu, 6 Jul 2017 19:44:34 +0200 Subject: [PATCH] Rename webrtc/base -> webrtc/rtc_base NOPRESUBMIT=True # cpplint errors that aren't caused by this CL. NOTRY=True NOTREECHECKS=True TBR=kwiberg@webrtc.org, kjellander@webrtc.org Bug: webrtc:7634 Change-Id: I3cca0fbaa807b563c95979cccd6d1bec32055f36 Reviewed-on: https://chromium-review.googlesource.com/562156 Commit-Queue: Edward Lemur Reviewed-by: Mirko Bonadei Cr-Commit-Position: refs/heads/master@{#18919} --- webrtc/api/audio/audio_mixer.h | 2 +- webrtc/api/audio_codecs/audio_decoder.cc | 8 ++--- webrtc/api/audio_codecs/audio_decoder.h | 8 ++--- .../api/audio_codecs/audio_decoder_factory.h | 2 +- .../audio_decoder_factory_template.h | 2 +- webrtc/api/audio_codecs/audio_encoder.cc | 4 +-- webrtc/api/audio_codecs/audio_encoder.h | 8 ++--- .../api/audio_codecs/audio_encoder_factory.h | 2 +- .../audio_encoder_factory_template.h | 2 +- webrtc/api/audio_codecs/audio_format.h | 2 +- .../builtin_audio_decoder_factory.h | 2 +- .../builtin_audio_encoder_factory.h | 2 +- .../audio_codecs/g722/audio_decoder_g722.cc | 4 +-- .../audio_codecs/g722/audio_decoder_g722.h | 2 +- .../audio_codecs/g722/audio_encoder_g722.cc | 4 +-- .../audio_codecs/g722/audio_encoder_g722.h | 2 +- .../audio_codecs/ilbc/audio_decoder_ilbc.cc | 2 +- .../audio_codecs/ilbc/audio_decoder_ilbc.h | 2 +- .../audio_codecs/ilbc/audio_encoder_ilbc.cc | 4 +-- .../audio_codecs/ilbc/audio_encoder_ilbc.h | 2 +- .../audio_codecs/opus/audio_decoder_opus.cc | 2 +- .../audio_codecs/opus/audio_decoder_opus.h | 2 +- .../opus/audio_encoder_opus_config.h | 2 +- ...audio_decoder_factory_template_unittest.cc | 2 +- ...audio_encoder_factory_template_unittest.cc | 2 +- webrtc/api/datachannelinterface.h | 9 +++--- webrtc/api/dtmfsenderinterface.h | 2 +- webrtc/api/fakemetricsobserver.cc | 2 +- webrtc/api/fakemetricsobserver.h | 2 +- webrtc/api/jsep.h | 2 +- webrtc/api/jsepicecandidate.h | 2 +- webrtc/api/jsepsessiondescription.h | 2 +- webrtc/api/mediaconstraintsinterface.cc | 2 +- webrtc/api/mediaconstraintsinterface.h | 2 +- webrtc/api/mediastreaminterface.h | 12 +++---- webrtc/api/mediatypes.cc | 2 +- webrtc/api/notifier.h | 2 +- webrtc/api/ortc/mediadescription.h | 2 +- webrtc/api/ortc/ortcfactoryinterface.h | 6 ++-- webrtc/api/ortc/rtptransportinterface.h | 2 +- webrtc/api/ortc/udptransportinterface.h | 2 +- webrtc/api/peerconnectionfactoryproxy.h | 2 +- webrtc/api/peerconnectioninterface.h | 12 +++---- webrtc/api/proxy.h | 4 +-- webrtc/api/rtcerror.cc | 2 +- webrtc/api/rtcerror.h | 4 +-- webrtc/api/rtpparameters.h | 2 +- webrtc/api/rtpreceiverinterface.h | 6 ++-- webrtc/api/rtpsenderinterface.h | 6 ++-- webrtc/api/stats/rtcstats.h | 2 +- webrtc/api/stats/rtcstatscollectorcallback.h | 4 +-- webrtc/api/stats/rtcstatsreport.h | 4 +-- webrtc/api/statstypes.cc | 2 +- webrtc/api/statstypes.h | 12 +++---- webrtc/api/test/fakeconstraints.h | 2 +- webrtc/api/umametrics.h | 2 +- webrtc/api/video/i420_buffer.cc | 4 +-- webrtc/api/video/video_frame.cc | 4 +-- webrtc/api/video/video_frame_buffer.cc | 2 +- webrtc/api/video/video_frame_buffer.h | 4 +-- webrtc/api/video/video_timing.h | 4 +-- webrtc/api/video_codecs/video_encoder.h | 4 +-- webrtc/audio/audio_receive_stream.cc | 6 ++-- webrtc/audio/audio_receive_stream.h | 4 +-- webrtc/audio/audio_send_stream.cc | 12 +++---- webrtc/audio/audio_send_stream.h | 4 +-- webrtc/audio/audio_send_stream_unittest.cc | 4 +-- webrtc/audio/audio_state.cc | 6 ++-- webrtc/audio/audio_state.h | 6 ++-- webrtc/audio/audio_transport_proxy.h | 4 +-- webrtc/audio/scoped_voe_interface.h | 2 +- .../audio/utility/audio_frame_operations.cc | 4 +-- .../audio_frame_operations_unittest.cc | 2 +- webrtc/call/audio_receive_stream.h | 4 +-- webrtc/call/audio_send_stream.h | 2 +- webrtc/call/audio_state.h | 4 +-- webrtc/call/bitrate_allocator.cc | 4 +-- webrtc/call/bitrate_allocator.h | 2 +- webrtc/call/bitrate_estimator_tests.cc | 8 ++--- webrtc/call/call.cc | 22 ++++++------- webrtc/call/call.h | 6 ++-- webrtc/call/call_perf_tests.cc | 6 ++-- webrtc/call/call_unittest.cc | 2 +- webrtc/call/flexfec_receive_stream_impl.cc | 6 ++-- webrtc/call/flexfec_receive_stream_impl.h | 2 +- .../call/flexfec_receive_stream_unittest.cc | 2 +- webrtc/call/rampup_tests.cc | 6 ++-- webrtc/call/rampup_tests.h | 2 +- webrtc/call/rsid_resolution_observer.h | 2 +- webrtc/call/rtcp_demuxer.cc | 2 +- webrtc/call/rtcp_demuxer.h | 4 +-- webrtc/call/rtcp_demuxer_unittest.cc | 8 ++--- webrtc/call/rtcp_packet_sink_interface.h | 2 +- webrtc/call/rtp_demuxer.cc | 4 +-- webrtc/call/rtp_demuxer_unittest.cc | 8 ++--- webrtc/call/rtp_rtcp_demuxer_helper.h | 6 ++-- .../call/rtp_rtcp_demuxer_helper_unittest.cc | 6 ++-- webrtc/call/rtp_stream_receiver_controller.cc | 2 +- webrtc/call/rtp_stream_receiver_controller.h | 2 +- webrtc/call/rtp_transport_controller_send.h | 2 +- webrtc/call/syncable.h | 2 +- webrtc/common_audio/audio_converter.cc | 4 +-- webrtc/common_audio/audio_converter.h | 2 +- .../common_audio/audio_converter_unittest.cc | 4 +-- webrtc/common_audio/audio_ring_buffer.cc | 2 +- webrtc/common_audio/blocker.cc | 2 +- webrtc/common_audio/blocker_unittest.cc | 2 +- webrtc/common_audio/channel_buffer.cc | 2 +- webrtc/common_audio/channel_buffer.h | 4 +-- webrtc/common_audio/fir_filter.cc | 2 +- webrtc/common_audio/fir_filter_neon.cc | 2 +- webrtc/common_audio/fir_filter_sse.cc | 2 +- webrtc/common_audio/include/audio_util.h | 2 +- webrtc/common_audio/lapped_transform.cc | 2 +- webrtc/common_audio/real_fourier.cc | 2 +- webrtc/common_audio/real_fourier_ooura.cc | 2 +- webrtc/common_audio/real_fourier_openmax.cc | 2 +- .../common_audio/resampler/push_resampler.cc | 2 +- .../resampler/push_resampler_unittest.cc | 2 +- .../resampler/push_sinc_resampler.cc | 2 +- .../resampler/push_sinc_resampler.h | 2 +- .../resampler/push_sinc_resampler_unittest.cc | 2 +- .../common_audio/resampler/sinc_resampler.cc | 2 +- .../common_audio/resampler/sinc_resampler.h | 4 +-- .../resampler/sinc_resampler_unittest.cc | 4 +-- .../sinusoidal_linear_chirp_source.h | 2 +- .../dot_product_with_scale.cc | 2 +- .../signal_processing/include/spl_inl.h | 2 +- webrtc/common_audio/smoothing_filter.cc | 2 +- webrtc/common_audio/smoothing_filter.h | 4 +-- .../common_audio/smoothing_filter_unittest.cc | 2 +- webrtc/common_audio/sparse_fir_filter.cc | 2 +- webrtc/common_audio/sparse_fir_filter.h | 2 +- .../sparse_fir_filter_unittest.cc | 2 +- webrtc/common_audio/vad/include/vad.h | 2 +- webrtc/common_audio/vad/vad.cc | 2 +- webrtc/common_audio/vad/vad_unittest.cc | 4 +-- webrtc/common_audio/wav_file.cc | 4 +-- webrtc/common_audio/wav_file.h | 2 +- webrtc/common_audio/wav_header.cc | 2 +- webrtc/common_audio/window_generator.cc | 2 +- webrtc/common_audio/window_generator.h | 2 +- webrtc/common_types.cc | 4 +-- webrtc/common_types.h | 6 ++-- webrtc/common_video/bitrate_adjuster.cc | 4 +-- .../h264/h264_bitstream_parser.cc | 6 ++-- .../common_video/h264/h264_bitstream_parser.h | 2 +- webrtc/common_video/h264/h264_common.h | 2 +- webrtc/common_video/h264/pps_parser.cc | 4 +-- webrtc/common_video/h264/pps_parser.h | 2 +- .../common_video/h264/pps_parser_unittest.cc | 4 +-- webrtc/common_video/h264/sps_parser.cc | 4 +-- webrtc/common_video/h264/sps_parser.h | 2 +- .../common_video/h264/sps_parser_unittest.cc | 6 ++-- webrtc/common_video/h264/sps_vui_rewriter.cc | 8 ++--- webrtc/common_video/h264/sps_vui_rewriter.h | 4 +-- .../h264/sps_vui_rewriter_unittest.cc | 10 +++--- webrtc/common_video/i420_buffer_pool.cc | 2 +- .../common_video/i420_video_frame_unittest.cc | 6 ++-- .../common_video/include/bitrate_adjuster.h | 4 +-- .../common_video/include/i420_buffer_pool.h | 2 +- .../include/incoming_video_stream.h | 4 +-- .../common_video/include/video_frame_buffer.h | 4 +-- webrtc/common_video/incoming_video_stream.cc | 4 +-- webrtc/common_video/libyuv/webrtc_libyuv.cc | 2 +- webrtc/common_video/video_frame.cc | 4 +-- webrtc/common_video/video_frame_buffer.cc | 4 +-- webrtc/common_video/video_render_frames.cc | 4 +-- webrtc/common_video/video_render_frames.h | 2 +- webrtc/config.cc | 2 +- webrtc/config.h | 8 ++--- webrtc/config_unittest.cc | 2 +- .../peerconnection/client/conductor.cc | 6 ++-- .../peerconnection/client/defaults.cc | 2 +- .../examples/peerconnection/client/flagdefs.h | 2 +- .../peerconnection/client/linux/main.cc | 4 +-- .../peerconnection/client/linux/main_wnd.cc | 6 ++-- webrtc/examples/peerconnection/client/main.cc | 9 +++--- .../peerconnection/client/main_wnd.cc | 6 ++-- .../examples/peerconnection/client/main_wnd.h | 2 +- .../client/peer_connection_client.cc | 12 +++---- .../client/peer_connection_client.h | 8 ++--- .../peerconnection/server/peer_channel.cc | 4 +-- .../examples/peerconnection/server/utils.cc | 2 +- .../examples/relayserver/relayserver_main.cc | 2 +- webrtc/examples/stunprober/main.cc | 20 ++++++------ webrtc/examples/stunserver/stunserver_main.cc | 2 +- webrtc/examples/turnserver/turnserver_main.cc | 8 ++--- .../unityplugin/simple_peer_connection.cc | 2 +- webrtc/logging/rtc_event_log/rtc_event_log.cc | 18 +++++------ webrtc/logging/rtc_event_log/rtc_event_log.h | 2 +- .../rtc_event_log/rtc_event_log2rtp_dump.cc | 2 +- .../rtc_event_log/rtc_event_log2stats.cc | 6 ++-- .../rtc_event_log/rtc_event_log2text.cc | 2 +- .../rtc_event_log_helper_thread.cc | 6 ++-- .../rtc_event_log_helper_thread.h | 12 +++---- .../rtc_event_log/rtc_event_log_parser.cc | 6 ++-- .../rtc_event_log/rtc_event_log_parser.h | 2 +- .../rtc_event_log/rtc_event_log_unittest.cc | 8 ++--- .../rtc_event_log_unittest_helper.cc | 2 +- webrtc/media/base/codec.cc | 8 ++--- webrtc/media/base/codec_unittest.cc | 2 +- webrtc/media/base/device.h | 2 +- webrtc/media/base/fakemediaengine.h | 8 ++--- webrtc/media/base/fakenetworkinterface.h | 14 ++++---- webrtc/media/base/fakertp.cc | 2 +- webrtc/media/base/fakevideocapturer.h | 2 +- webrtc/media/base/fakevideorenderer.h | 4 +-- webrtc/media/base/h264_profile_level_id.cc | 2 +- webrtc/media/base/h264_profile_level_id.h | 2 +- webrtc/media/base/mediachannel.h | 20 ++++++------ webrtc/media/base/mediaengine.h | 2 +- webrtc/media/base/rtpdataengine.cc | 10 +++--- webrtc/media/base/rtpdataengine_unittest.cc | 8 ++--- webrtc/media/base/rtputils.cc | 6 ++-- webrtc/media/base/rtputils.h | 2 +- webrtc/media/base/rtputils_unittest.cc | 6 ++-- webrtc/media/base/streamparams.h | 2 +- webrtc/media/base/streamparams_unittest.cc | 4 +-- webrtc/media/base/testutils.cc | 14 ++++---- webrtc/media/base/testutils.h | 8 ++--- webrtc/media/base/turnutils.cc | 4 +-- webrtc/media/base/turnutils_unittest.cc | 2 +- webrtc/media/base/videoadapter.cc | 8 ++--- webrtc/media/base/videoadapter.h | 6 ++-- webrtc/media/base/videoadapter_unittest.cc | 4 +-- webrtc/media/base/videobroadcaster.cc | 4 +-- webrtc/media/base/videobroadcaster.h | 4 +-- .../media/base/videobroadcaster_unittest.cc | 4 +-- webrtc/media/base/videocapturer.cc | 2 +- webrtc/media/base/videocapturer.h | 12 +++---- webrtc/media/base/videocapturer_unittest.cc | 6 ++-- webrtc/media/base/videocommon.cc | 2 +- webrtc/media/base/videocommon.h | 2 +- webrtc/media/base/videocommon_unittest.cc | 2 +- webrtc/media/base/videoengine_unittest.h | 6 ++-- webrtc/media/base/videosourcebase.cc | 2 +- webrtc/media/base/videosourcebase.h | 2 +- webrtc/media/base/videosourceinterface.h | 2 +- webrtc/media/engine/adm_helpers.cc | 2 +- webrtc/media/engine/apm_helpers.cc | 2 +- webrtc/media/engine/fakewebrtccall.cc | 6 ++-- webrtc/media/engine/fakewebrtccall.h | 2 +- webrtc/media/engine/fakewebrtcdeviceinfo.h | 2 +- webrtc/media/engine/fakewebrtcvideoengine.h | 10 +++--- webrtc/media/engine/fakewebrtcvoiceengine.h | 2 +- webrtc/media/engine/internaldecoderfactory.cc | 2 +- webrtc/media/engine/payload_type_mapper.h | 2 +- webrtc/media/engine/simulcast.cc | 4 +-- webrtc/media/engine/simulcast.h | 2 +- .../videodecodersoftwarefallbackwrapper.cc | 6 ++-- ...decodersoftwarefallbackwrapper_unittest.cc | 4 +-- .../videoencodersoftwarefallbackwrapper.cc | 2 +- ...encodersoftwarefallbackwrapper_unittest.cc | 2 +- webrtc/media/engine/webrtcvideocapturer.cc | 18 +++++------ webrtc/media/engine/webrtcvideocapturer.h | 6 ++-- .../engine/webrtcvideocapturer_unittest.cc | 8 ++--- .../media/engine/webrtcvideodecoderfactory.h | 2 +- webrtc/media/engine/webrtcvideoengine.cc | 14 ++++---- webrtc/media/engine/webrtcvideoengine.h | 12 +++---- .../engine/webrtcvideoengine_unittest.cc | 6 ++-- webrtc/media/engine/webrtcvoiceengine.cc | 20 ++++++------ webrtc/media/engine/webrtcvoiceengine.h | 12 +++---- .../engine/webrtcvoiceengine_unittest.cc | 8 ++--- webrtc/media/sctp/sctptransport.cc | 16 +++++----- webrtc/media/sctp/sctptransport.h | 10 +++--- webrtc/media/sctp/sctptransport_unittest.cc | 14 ++++---- webrtc/media/sctp/sctptransportinternal.h | 4 +-- .../audio_coding/acm2/acm_codec_database.cc | 2 +- .../audio_coding/acm2/acm_receive_test.h | 4 +-- .../modules/audio_coding/acm2/acm_receiver.cc | 12 +++---- .../modules/audio_coding/acm2/acm_receiver.h | 8 ++--- .../acm2/acm_receiver_unittest.cc | 4 +-- .../audio_coding/acm2/acm_resampler.cc | 2 +- .../audio_coding/acm2/acm_send_test.cc | 2 +- .../modules/audio_coding/acm2/acm_send_test.h | 2 +- .../audio_coding/acm2/audio_coding_module.cc | 6 ++-- .../acm2/audio_coding_module_unittest.cc | 8 ++--- .../audio_coding/acm2/call_statistics.cc | 2 +- .../audio_coding/acm2/codec_manager.cc | 6 ++-- .../modules/audio_coding/acm2/codec_manager.h | 8 ++--- .../modules/audio_coding/acm2/rent_a_codec.cc | 2 +- .../modules/audio_coding/acm2/rent_a_codec.h | 8 ++--- .../acm2/rent_a_codec_unittest.cc | 2 +- .../audio_network_adaptor_impl.cc | 4 +-- .../audio_network_adaptor_impl.h | 2 +- .../audio_network_adaptor_impl_unittest.cc | 2 +- .../bitrate_controller.cc | 2 +- .../bitrate_controller.h | 2 +- .../channel_controller.cc | 2 +- .../channel_controller.h | 2 +- .../audio_network_adaptor/controller.h | 2 +- .../controller_manager.cc | 4 +-- .../controller_manager.h | 4 +-- .../controller_manager_unittest.cc | 6 ++-- .../debug_dump_writer.cc | 6 ++-- .../audio_network_adaptor/debug_dump_writer.h | 2 +- .../audio_network_adaptor/dtx_controller.cc | 2 +- .../audio_network_adaptor/dtx_controller.h | 2 +- .../audio_network_adaptor/event_log_writer.h | 2 +- .../fec_controller_plr_based.cc | 2 +- .../fec_controller_plr_based.h | 2 +- .../fec_controller_rplr_based.cc | 2 +- .../fec_controller_rplr_based.h | 2 +- .../frame_length_controller.cc | 4 +-- .../frame_length_controller.h | 2 +- .../include/audio_network_adaptor.h | 2 +- .../util/threshold_curve.h | 2 +- .../codecs/audio_format_conversion.cc | 10 +++--- .../builtin_audio_decoder_factory_internal.cc | 4 +-- .../builtin_audio_decoder_factory_internal.h | 2 +- .../builtin_audio_encoder_factory_internal.cc | 6 ++-- .../builtin_audio_encoder_factory_internal.h | 2 +- .../codecs/cng/audio_encoder_cng.h | 2 +- .../codecs/cng/audio_encoder_cng_unittest.cc | 2 +- .../audio_coding/codecs/cng/webrtc_cng.cc | 2 +- .../audio_coding/codecs/cng/webrtc_cng.h | 4 +-- .../codecs/g711/audio_decoder_pcm.h | 4 +-- .../codecs/g711/audio_encoder_pcm.cc | 4 +-- .../codecs/g711/audio_encoder_pcm.h | 2 +- .../codecs/g722/audio_decoder_g722.cc | 4 +-- .../codecs/g722/audio_decoder_g722.h | 2 +- .../codecs/g722/audio_encoder_g722.cc | 6 ++-- .../codecs/g722/audio_encoder_g722.h | 4 +-- .../codecs/ilbc/audio_decoder_ilbc.cc | 4 +-- .../codecs/ilbc/audio_decoder_ilbc.h | 2 +- .../codecs/ilbc/audio_encoder_ilbc.cc | 6 ++-- .../codecs/ilbc/audio_encoder_ilbc.h | 2 +- .../codecs/isac/audio_decoder_isac_t.h | 6 ++-- .../codecs/isac/audio_decoder_isac_t_impl.h | 2 +- .../codecs/isac/audio_encoder_isac_t.h | 4 +-- .../codecs/isac/audio_encoder_isac_t_impl.h | 4 +-- .../codecs/isac/fix/source/isac_fix_type.h | 2 +- .../codecs/isac/locked_bandwidth_info.h | 6 ++-- .../test/ReleaseTest-API/ReleaseTest-API.cc | 2 +- .../audio_coding/codecs/isac/unittest.cc | 2 +- .../codecs/legacy_encoded_audio_frame.h | 2 +- .../codecs/opus/audio_decoder_opus.cc | 2 +- .../codecs/opus/audio_decoder_opus.h | 2 +- .../codecs/opus/audio_encoder_opus.cc | 20 ++++++------ .../codecs/opus/audio_encoder_opus.h | 6 ++-- .../opus/audio_encoder_opus_unittest.cc | 4 +-- .../codecs/opus/opus_complexity_unittest.cc | 4 +-- .../audio_coding/codecs/opus/opus_fec_test.cc | 2 +- .../audio_coding/codecs/opus/opus_inst.h | 2 +- .../audio_coding/codecs/opus/opus_unittest.cc | 2 +- .../codecs/pcm16b/audio_decoder_pcm16b.cc | 2 +- .../codecs/pcm16b/audio_decoder_pcm16b.h | 2 +- .../codecs/pcm16b/audio_encoder_pcm16b.cc | 6 ++-- .../codecs/pcm16b/audio_encoder_pcm16b.h | 2 +- .../codecs/red/audio_encoder_copy_red.cc | 2 +- .../codecs/red/audio_encoder_copy_red.h | 4 +-- .../red/audio_encoder_copy_red_unittest.cc | 2 +- .../codecs/tools/audio_codec_speed_test.cc | 2 +- .../include/audio_coding_module.h | 6 ++-- .../modules/audio_coding/neteq/accelerate.h | 2 +- .../audio_coding/neteq/audio_decoder_impl.cc | 2 +- .../audio_coding/neteq/audio_decoder_impl.h | 2 +- .../audio_coding/neteq/audio_multi_vector.cc | 2 +- .../audio_coding/neteq/audio_multi_vector.h | 2 +- .../audio_coding/neteq/audio_vector.cc | 2 +- .../modules/audio_coding/neteq/audio_vector.h | 4 +-- .../audio_coding/neteq/background_noise.h | 2 +- .../audio_coding/neteq/buffer_level_filter.h | 2 +- .../audio_coding/neteq/comfort_noise.cc | 2 +- .../audio_coding/neteq/comfort_noise.h | 2 +- .../audio_coding/neteq/decision_logic.h | 2 +- .../audio_coding/neteq/decision_logic_fax.h | 2 +- .../neteq/decision_logic_normal.h | 2 +- .../audio_coding/neteq/decoder_database.cc | 4 +-- .../audio_coding/neteq/decoder_database.h | 4 +-- .../audio_coding/neteq/delay_manager.cc | 4 +-- .../audio_coding/neteq/delay_manager.h | 2 +- .../audio_coding/neteq/delay_peak_detector.cc | 4 +-- .../audio_coding/neteq/delay_peak_detector.h | 2 +- .../modules/audio_coding/neteq/dsp_helper.h | 2 +- .../modules/audio_coding/neteq/dtmf_buffer.cc | 4 +-- .../modules/audio_coding/neteq/dtmf_buffer.h | 2 +- .../audio_coding/neteq/dtmf_tone_generator.cc | 4 +-- .../audio_coding/neteq/dtmf_tone_generator.h | 3 +- webrtc/modules/audio_coding/neteq/expand.cc | 2 +- webrtc/modules/audio_coding/neteq/expand.h | 2 +- .../audio_coding/neteq/expand_unittest.cc | 2 +- .../audio_coding/neteq/include/neteq.h | 6 ++-- webrtc/modules/audio_coding/neteq/merge.cc | 4 +-- webrtc/modules/audio_coding/neteq/merge.h | 2 +- .../neteq/mock/mock_external_decoder_pcm16b.h | 2 +- .../audio_coding/neteq/nack_tracker.cc | 2 +- .../modules/audio_coding/neteq/nack_tracker.h | 2 +- .../audio_coding/neteq/neteq_decoder_enum.h | 2 +- .../modules/audio_coding/neteq/neteq_impl.cc | 10 +++--- .../modules/audio_coding/neteq/neteq_impl.h | 8 ++--- .../audio_coding/neteq/neteq_impl_unittest.cc | 2 +- .../audio_coding/neteq/neteq_unittest.cc | 8 ++--- webrtc/modules/audio_coding/neteq/normal.cc | 2 +- webrtc/modules/audio_coding/neteq/normal.h | 6 ++-- webrtc/modules/audio_coding/neteq/packet.h | 2 +- .../audio_coding/neteq/packet_buffer.cc | 2 +- .../audio_coding/neteq/packet_buffer.h | 4 +-- .../audio_coding/neteq/post_decode_vad.h | 2 +- .../audio_coding/neteq/preemptive_expand.h | 2 +- .../audio_coding/neteq/random_vector.h | 2 +- .../neteq/red_payload_splitter.cc | 6 ++-- .../audio_coding/neteq/red_payload_splitter.h | 2 +- webrtc/modules/audio_coding/neteq/rtcp.h | 2 +- .../neteq/statistics_calculator.cc | 4 +-- .../neteq/statistics_calculator.h | 2 +- .../modules/audio_coding/neteq/sync_buffer.cc | 2 +- .../modules/audio_coding/neteq/sync_buffer.h | 2 +- .../audio_coding/neteq/test/RTPencode.cc | 2 +- .../neteq/test/neteq_ilbc_quality_test.cc | 4 +-- .../neteq/test/neteq_pcmu_quality_test.cc | 4 +-- .../modules/audio_coding/neteq/tick_timer.h | 4 +-- .../audio_coding/neteq/time_stretch.cc | 2 +- .../modules/audio_coding/neteq/time_stretch.h | 2 +- .../neteq/time_stretch_unittest.cc | 2 +- .../audio_coding/neteq/timestamp_scaler.h | 2 +- .../audio_coding/neteq/tools/audio_checksum.h | 6 ++-- .../audio_coding/neteq/tools/audio_loop.h | 4 +-- .../audio_coding/neteq/tools/audio_sink.h | 2 +- .../neteq/tools/constant_pcm_packet_source.cc | 2 +- .../neteq/tools/constant_pcm_packet_source.h | 2 +- .../neteq/tools/encode_neteq_input.cc | 4 +-- .../neteq/tools/fake_decode_from_file.cc | 4 +-- .../neteq/tools/fake_decode_from_file.h | 4 +-- .../neteq/tools/input_audio_file.cc | 2 +- .../neteq/tools/input_audio_file.h | 2 +- .../neteq/tools/neteq_delay_analyzer.cc | 2 +- .../neteq/tools/neteq_delay_analyzer.h | 2 +- .../tools/neteq_external_decoder_test.cc | 2 +- .../audio_coding/neteq/tools/neteq_input.h | 4 +-- .../neteq/tools/neteq_packet_source_input.cc | 2 +- .../neteq/tools/neteq_performance_test.cc | 2 +- .../neteq/tools/neteq_quality_test.cc | 2 +- .../neteq/tools/neteq_replacement_input.cc | 2 +- .../audio_coding/neteq/tools/neteq_rtpplay.cc | 2 +- .../neteq/tools/output_audio_file.h | 2 +- .../neteq/tools/output_wav_file.h | 2 +- .../audio_coding/neteq/tools/packet.cc | 2 +- .../modules/audio_coding/neteq/tools/packet.h | 2 +- .../audio_coding/neteq/tools/packet_source.h | 2 +- .../neteq/tools/resample_input_audio_file.cc | 2 +- .../neteq/tools/resample_input_audio_file.h | 2 +- .../neteq/tools/rtc_event_log_source.cc | 3 +- .../neteq/tools/rtc_event_log_source.h | 2 +- .../neteq/tools/rtp_file_source.cc | 2 +- .../neteq/tools/rtp_file_source.h | 2 +- .../audio_coding/neteq/tools/rtp_generator.h | 2 +- .../audio_coding/neteq/tools/rtpcat.cc | 2 +- webrtc/modules/audio_coding/test/APITest.cc | 4 +-- webrtc/modules/audio_coding/test/Channel.cc | 4 +-- webrtc/modules/audio_coding/test/Channel.h | 2 +- webrtc/modules/audio_coding/test/PCMFile.h | 2 +- .../audio_coding/test/TestAllCodecs.cc | 2 +- .../include/audio_conference_mixer_defines.h | 2 +- .../source/audio_conference_mixer_impl.cc | 6 ++-- .../source/audio_conference_mixer_impl.h | 2 +- .../source/memory_pool_posix.h | 2 +- .../source/time_scheduler.cc | 2 +- .../source/time_scheduler.h | 2 +- .../android/audio_device_template.h | 6 ++-- .../android/audio_device_unittest.cc | 10 +++--- .../audio_device/android/audio_manager.cc | 4 +-- .../audio_device/android/audio_manager.h | 6 ++-- .../android/audio_manager_unittest.cc | 4 +-- .../audio_device/android/audio_record_jni.cc | 6 ++-- .../audio_device/android/audio_record_jni.h | 4 +-- .../audio_device/android/audio_track_jni.cc | 6 ++-- .../audio_device/android/audio_track_jni.h | 4 +-- .../android/ensure_initialized.cc | 4 +-- .../audio_device/android/opensles_common.cc | 4 +-- .../audio_device/android/opensles_common.h | 2 ++ .../audio_device/android/opensles_player.cc | 10 +++--- .../audio_device/android/opensles_player.h | 4 +-- .../audio_device/android/opensles_recorder.cc | 10 +++--- .../audio_device/android/opensles_recorder.h | 4 +-- .../audio_device/audio_device_buffer.cc | 12 +++---- .../audio_device/audio_device_buffer.h | 10 +++--- .../audio_device_data_observer.cc | 4 +-- .../audio_device/audio_device_generic.cc | 2 +- .../modules/audio_device/audio_device_impl.cc | 11 +++---- .../modules/audio_device/audio_device_impl.h | 4 +-- .../audio_device/audio_device_unittest.cc | 24 +++++++------- .../audio_device/dummy/file_audio_device.cc | 6 ++-- .../audio_device/dummy/file_audio_device.h | 4 +-- .../dummy/file_audio_device_factory.cc | 2 +- .../modules/audio_device/fine_audio_buffer.cc | 4 +-- .../modules/audio_device/fine_audio_buffer.h | 4 +-- .../fine_audio_buffer_unittest.cc | 2 +- .../audio_device/include/audio_device.h | 2 +- .../include/audio_device_data_observer.h | 2 +- .../audio_device/ios/audio_device_ios.h | 10 +++--- .../audio_device/ios/audio_session_observer.h | 4 +-- .../linux/audio_device_alsa_linux.cc | 2 +- .../linux/audio_device_alsa_linux.h | 4 +-- .../linux/audio_device_pulse_linux.cc | 4 +-- .../linux/audio_device_pulse_linux.h | 6 ++-- .../linux/audio_mixer_manager_alsa_linux.h | 2 +- .../linux/audio_mixer_manager_pulse_linux.cc | 2 +- .../linux/audio_mixer_manager_pulse_linux.h | 2 +- .../linux/latebindingsymboltable_linux.h | 2 +- .../audio_device/mac/audio_device_mac.cc | 10 +++--- .../audio_device/mac/audio_device_mac.h | 4 +-- .../mac/audio_mixer_manager_mac.h | 2 +- .../test/audio_device_test_api.cc | 2 +- .../audio_device/win/audio_device_core_win.cc | 4 +-- .../audio_device/win/audio_device_core_win.h | 4 +-- .../audio_mixer/audio_frame_manipulator.cc | 4 +-- .../modules/audio_mixer/audio_mixer_impl.cc | 2 +- webrtc/modules/audio_mixer/audio_mixer_impl.h | 6 ++-- .../audio_mixer/audio_mixer_impl_unittest.cc | 6 ++-- webrtc/modules/audio_mixer/frame_combiner.cc | 6 ++-- .../audio_mixer/frame_combiner_unittest.cc | 2 +- .../audio_mixer/gain_change_calculator.h | 2 +- .../audio_mixer/sine_wave_generator.cc | 2 +- .../modules/audio_mixer/sine_wave_generator.h | 2 +- .../modules/audio_processing/aec/aec_core.cc | 4 +-- .../modules/audio_processing/aec/aec_core.h | 2 +- .../audio_processing/aec/aec_resampler.cc | 2 +- .../aec/echo_cancellation_unittest.cc | 2 +- .../aec3/adaptive_fir_filter.cc | 2 +- .../aec3/adaptive_fir_filter.h | 4 +-- .../aec3/adaptive_fir_filter_unittest.cc | 6 ++-- .../modules/audio_processing/aec3/aec3_fft.cc | 2 +- .../modules/audio_processing/aec3/aec3_fft.h | 4 +-- .../audio_processing/aec3/aec_state.cc | 6 ++-- .../modules/audio_processing/aec3/aec_state.h | 6 ++-- .../audio_processing/aec3/block_framer.cc | 2 +- .../audio_processing/aec3/block_framer.h | 4 +-- .../audio_processing/aec3/block_processor.cc | 6 ++-- .../aec3/block_processor_metrics.h | 2 +- .../aec3/block_processor_unittest.cc | 4 +-- .../aec3/cascaded_biquad_filter.cc | 2 +- .../aec3/cascaded_biquad_filter.h | 4 +-- .../aec3/comfort_noise_generator.h | 4 +-- .../aec3/comfort_noise_generator_unittest.cc | 4 +-- .../audio_processing/aec3/decimator_by_4.cc | 2 +- .../audio_processing/aec3/decimator_by_4.h | 4 +-- .../audio_processing/aec3/echo_canceller3.cc | 2 +- .../audio_processing/aec3/echo_canceller3.h | 6 ++-- .../aec3/echo_path_delay_estimator.cc | 2 +- .../aec3/echo_path_delay_estimator.h | 4 +-- .../echo_path_delay_estimator_unittest.cc | 2 +- .../audio_processing/aec3/echo_remover.cc | 6 ++-- .../audio_processing/aec3/echo_remover.h | 2 +- .../aec3/echo_remover_metrics.cc | 2 +- .../aec3/echo_remover_metrics.h | 2 +- .../aec3/echo_remover_unittest.cc | 2 +- .../audio_processing/aec3/erl_estimator.h | 2 +- .../audio_processing/aec3/erle_estimator.cc | 2 +- .../audio_processing/aec3/erle_estimator.h | 2 +- .../modules/audio_processing/aec3/fft_data.h | 2 +- .../audio_processing/aec3/frame_blocker.cc | 2 +- .../audio_processing/aec3/frame_blocker.h | 4 +-- .../aec3/main_filter_update_gain.cc | 4 +-- .../aec3/main_filter_update_gain.h | 2 +- .../aec3/main_filter_update_gain_unittest.cc | 4 +-- .../audio_processing/aec3/matched_filter.h | 4 +-- .../aec3/matched_filter_lag_aggregator.h | 4 +-- .../matched_filter_lag_aggregator_unittest.cc | 2 +- .../aec3/matched_filter_unittest.cc | 2 +- .../aec3/mock/mock_echo_remover.h | 2 +- .../aec3/mock/mock_render_delay_controller.h | 4 +-- .../audio_processing/aec3/output_selector.cc | 2 +- .../audio_processing/aec3/output_selector.h | 4 +-- .../audio_processing/aec3/render_buffer.cc | 2 +- .../audio_processing/aec3/render_buffer.h | 4 +-- .../aec3/render_delay_buffer.cc | 6 ++-- .../aec3/render_delay_buffer.h | 2 +- .../aec3/render_delay_buffer_unittest.cc | 4 +-- .../aec3/render_delay_controller.cc | 4 +-- .../aec3/render_delay_controller.h | 4 +-- .../aec3/render_delay_controller_metrics.h | 4 +-- ...ender_delay_controller_metrics_unittest.cc | 4 +-- .../aec3/render_delay_controller_unittest.cc | 2 +- .../aec3/render_signal_analyzer.cc | 2 +- .../aec3/render_signal_analyzer.h | 4 +-- .../aec3/render_signal_analyzer_unittest.cc | 4 +-- .../aec3/residual_echo_estimator.cc | 2 +- .../aec3/residual_echo_estimator.h | 4 +-- .../aec3/residual_echo_estimator_unittest.cc | 4 +-- .../aec3/shadow_filter_update_gain.cc | 2 +- .../aec3/shadow_filter_update_gain.h | 2 +- .../shadow_filter_update_gain_unittest.cc | 4 +-- .../audio_processing/aec3/subtractor.cc | 6 ++-- .../audio_processing/aec3/subtractor.h | 2 +- .../aec3/subtractor_unittest.cc | 2 +- .../aec3/suppression_filter.cc | 2 +- .../aec3/suppression_filter.h | 2 +- .../audio_processing/aec3/suppression_gain.cc | 2 +- .../audio_processing/aec3/suppression_gain.h | 2 +- .../aec3/suppression_gain_unittest.cc | 2 +- .../audio_processing/aec3/vector_math.h | 4 +-- .../aec_dump/aec_dump_factory.h | 2 +- .../aec_dump/aec_dump_impl.cc | 6 ++-- .../audio_processing/aec_dump/aec_dump_impl.h | 10 +++--- .../aec_dump/aec_dump_integration_test.cc | 2 +- .../aec_dump/aec_dump_unittest.cc | 2 +- .../aec_dump/capture_stream_info.h | 6 ++-- .../aec_dump/write_to_file_task.cc | 2 +- .../aec_dump/write_to_file_task.h | 10 +++--- .../audio_processing/aecm/aecm_core.cc | 2 +- .../audio_processing/aecm/aecm_core_c.cc | 2 +- .../audio_processing/aecm/aecm_core_mips.cc | 2 +- .../audio_processing/aecm/aecm_core_neon.cc | 2 +- webrtc/modules/audio_processing/agc/agc.cc | 2 +- .../agc/agc_manager_direct.cc | 6 ++-- .../audio_processing/agc/agc_manager_direct.h | 2 +- .../agc/loudness_histogram.cc | 2 +- .../agc2/digital_gain_applier.h | 2 +- .../audio_processing/agc2/gain_controller2.cc | 4 +-- .../audio_processing/agc2/gain_controller2.h | 4 +-- .../agc2/gain_controller2_unittest.cc | 6 ++-- .../modules/audio_processing/audio_buffer.cc | 4 +-- .../audio_processing/audio_processing_impl.cc | 10 +++--- .../audio_processing/audio_processing_impl.h | 14 ++++---- .../audio_processing_impl_locking_unittest.cc | 10 +++--- .../audio_processing_performance_unittest.cc | 10 +++--- .../audio_processing_unittest.cc | 16 +++++----- .../audio_processing/beamformer/array_util.cc | 2 +- .../audio_processing/beamformer/array_util.h | 2 +- .../beamformer/complex_matrix.h | 2 +- .../audio_processing/beamformer/matrix.h | 4 +-- .../beamformer/nonlinear_beamformer.cc | 2 +- .../beamformer/nonlinear_beamformer_test.cc | 4 +-- .../nonlinear_beamformer_unittest.cc | 2 +- webrtc/modules/audio_processing/common.h | 2 +- .../echo_cancellation_bit_exact_unittest.cc | 2 +- .../echo_cancellation_impl.cc | 2 +- .../audio_processing/echo_cancellation_impl.h | 4 +-- .../echo_control_mobile_impl.cc | 4 +-- .../echo_control_mobile_impl.h | 6 ++-- .../echo_control_mobile_unittest.cc | 2 +- .../echo_detector/circular_buffer.cc | 2 +- .../echo_detector/circular_buffer.h | 2 +- .../echo_detector/mean_variance_estimator.cc | 2 +- .../echo_detector/moving_max.cc | 2 +- .../normalized_covariance_estimator.cc | 2 +- .../gain_control_for_experimental_agc.cc | 4 +-- .../gain_control_for_experimental_agc.h | 6 ++-- .../audio_processing/gain_control_impl.cc | 6 ++-- .../audio_processing/gain_control_impl.h | 8 ++--- .../audio_processing/gain_control_unittest.cc | 2 +- .../audio_processing/include/aec_dump.h | 2 +- .../include/audio_processing.cc | 2 +- .../include/audio_processing.h | 6 ++-- .../modules/audio_processing/include/config.h | 4 +-- .../intelligibility_enhancer.cc | 6 ++-- .../intelligibility_enhancer.h | 2 +- .../intelligibility_enhancer_unittest.cc | 4 +-- .../intelligibility/intelligibility_utils.cc | 2 +- .../intelligibility_utils_unittest.cc | 2 +- .../test/intelligibility_proc.cc | 2 +- .../level_controller/biquad_filter.h | 6 ++-- .../level_controller/down_sampler.cc | 2 +- .../level_controller/down_sampler.h | 4 +-- .../level_controller/gain_applier.cc | 4 +-- .../level_controller/gain_applier.h | 2 +- .../level_controller/gain_selector.cc | 2 +- .../level_controller/gain_selector.h | 2 +- .../level_controller/level_controller.cc | 8 ++--- .../level_controller/level_controller.h | 4 +-- .../level_controller_complexity_unittest.cc | 4 +-- .../level_controller_unittest.cc | 4 +-- .../level_controller/noise_level_estimator.h | 2 +- .../noise_spectrum_estimator.cc | 4 +-- .../noise_spectrum_estimator.h | 4 +-- .../level_controller/peak_level_estimator.h | 2 +- .../saturating_gain_estimator.h | 2 +- .../level_controller/signal_classifier.cc | 4 +-- .../level_controller/signal_classifier.h | 4 +-- .../audio_processing/level_estimator_impl.cc | 2 +- .../audio_processing/level_estimator_impl.h | 4 +-- .../level_estimator_unittest.cc | 2 +- .../logging/apm_data_dumper.cc | 2 +- .../logging/apm_data_dumper.h | 4 +-- .../modules/audio_processing/low_cut_filter.h | 2 +- .../low_cut_filter_unittest.cc | 2 +- .../noise_suppression_impl.cc | 2 +- .../audio_processing/noise_suppression_impl.h | 4 +-- .../noise_suppression_unittest.cc | 2 +- .../residual_echo_detector.cc | 4 +-- .../audio_processing/residual_echo_detector.h | 2 +- ...idual_echo_detector_complexity_unittest.cc | 4 +-- webrtc/modules/audio_processing/rms_level.cc | 2 +- webrtc/modules/audio_processing/rms_level.h | 4 +-- .../audio_processing/rms_level_unittest.cc | 8 ++--- .../audio_processing/splitting_filter.cc | 4 +-- .../test/aec_dump_based_simulator.cc | 2 +- .../test/aec_dump_based_simulator.h | 4 +-- .../test/audio_buffer_tools.h | 2 +- .../test/audio_processing_simulator.cc | 4 +-- .../test/audio_processing_simulator.h | 8 ++--- .../test/bitexactness_tools.cc | 2 +- .../test/bitexactness_tools.h | 2 +- .../test/conversational_speech/generator.cc | 6 ++-- .../generator_unittest.cc | 6 ++-- .../conversational_speech/mock_wavreader.h | 2 +- .../mock_wavreader_factory.cc | 4 +-- .../conversational_speech/multiend_call.cc | 4 +-- .../conversational_speech/multiend_call.h | 4 +-- .../test/conversational_speech/simulator.cc | 10 +++--- .../test/conversational_speech/simulator.h | 2 +- .../test/conversational_speech/timing.cc | 2 +- .../test/conversational_speech/timing.h | 2 +- .../wavreader_factory.cc | 4 +-- .../wavreader_interface.h | 2 +- .../test/debug_dump_replayer.cc | 3 +- .../test/debug_dump_replayer.h | 2 +- .../audio_processing/test/debug_dump_test.cc | 3 +- .../test/echo_canceller_test_tools.cc | 2 +- .../test/echo_canceller_test_tools.h | 6 ++-- .../echo_canceller_test_tools_unittest.cc | 6 ++-- .../test/performance_timer.cc | 2 +- .../audio_processing/test/performance_timer.h | 2 +- .../audio_processing/test/protobuf_utils.h | 4 +-- .../quality_assessment/fake_polqa.cc | 2 +- .../test/simulator_buffers.cc | 2 +- .../audio_processing/test/simulator_buffers.h | 2 +- .../audio_processing/test/test_utils.cc | 2 +- .../audio_processing/test/test_utils.h | 2 +- .../modules/audio_processing/test/unpack.cc | 4 +-- .../test/wav_based_simulator.cc | 2 +- .../test/wav_based_simulator.h | 2 +- .../three_band_filter_bank.cc | 2 +- .../transient/moving_moments.cc | 2 +- .../transient/transient_detector.cc | 2 +- .../transient/transient_suppressor.cc | 6 ++-- .../transient/transient_suppressor.h | 2 +- .../audio_processing/transient/wpd_node.cc | 2 +- .../audio_processing/transient/wpd_tree.cc | 2 +- .../utility/block_mean_calculator.cc | 2 +- .../utility/block_mean_calculator.h | 2 +- .../utility/delay_estimator.cc | 2 +- .../utility/delay_estimator_wrapper.cc | 2 +- .../audio_processing/vad/standalone_vad.cc | 2 +- .../audio_processing/vad/vad_audio_proc.cc | 4 +-- .../vad/voice_activity_detector.cc | 2 +- .../audio_processing/voice_detection_impl.cc | 2 +- .../audio_processing/voice_detection_impl.h | 4 +-- .../voice_detection_unittest.cc | 2 +- .../bitrate_controller_impl.cc | 4 +-- .../bitrate_controller_impl.h | 4 +-- .../send_side_bandwidth_estimation.cc | 4 +-- .../acknowledge_bitrate_estimator.h | 2 +- .../congestion_controller.cc | 8 ++--- .../congestion_controller_unittest.cc | 2 +- .../congestion_controller_unittests_helper.cc | 2 +- .../congestion_controller/delay_based_bwe.cc | 8 ++--- .../congestion_controller/delay_based_bwe.h | 6 ++-- .../delay_based_bwe_unittest.cc | 6 ++-- .../delay_based_bwe_unittest_helper.cc | 4 +-- .../delay_based_bwe_unittest_helper.h | 2 +- .../include/congestion_controller.h | 8 ++--- .../receive_side_congestion_controller.h | 4 +-- .../include/send_side_congestion_controller.h | 8 ++--- .../median_slope_estimator.cc | 2 +- .../median_slope_estimator.h | 4 +-- .../median_slope_estimator_unittest.cc | 4 +-- .../probe_bitrate_estimator.cc | 4 +-- .../congestion_controller/probe_controller.cc | 4 +-- .../congestion_controller/probe_controller.h | 2 +- .../probe_controller_unittest.cc | 2 +- .../receive_side_congestion_controller.cc | 2 +- .../send_side_congestion_controller.cc | 10 +++--- .../transport_feedback_adapter.cc | 6 ++-- .../transport_feedback_adapter.h | 6 ++-- .../transport_feedback_adapter_unittest.cc | 4 +-- .../trendline_estimator.cc | 4 +-- .../trendline_estimator.h | 2 +- .../trendline_estimator_unittest.cc | 4 +-- ...blank_detector_desktop_capturer_wrapper.cc | 2 +- .../desktop_capture/cropped_desktop_frame.cc | 2 +- .../cropping_window_capturer.cc | 2 +- .../cropping_window_capturer_win.cc | 4 +-- .../desktop_and_cursor_composer.cc | 2 +- .../desktop_and_cursor_composer.h | 2 +- .../desktop_capture/desktop_capture_options.h | 4 +-- .../desktop_capturer_differ_wrapper.cc | 4 +-- ...esktop_capturer_differ_wrapper_unittest.cc | 4 +-- .../modules/desktop_capture/desktop_frame.cc | 2 +- .../modules/desktop_capture/desktop_frame.h | 2 +- .../desktop_frame_generator.cc | 4 +-- .../desktop_capture/desktop_frame_rotation.cc | 2 +- .../desktop_capture/desktop_frame_win.cc | 2 +- .../desktop_capture/desktop_frame_win.h | 2 +- .../desktop_capture/desktop_geometry.h | 2 +- .../modules/desktop_capture/desktop_region.h | 2 +- .../fallback_desktop_capturer_wrapper.cc | 2 +- .../mac/desktop_configuration_monitor.cc | 2 +- .../mac/desktop_configuration_monitor.h | 2 +- .../mac/full_screen_chrome_window_detector.cc | 7 ++-- .../mac/full_screen_chrome_window_detector.h | 2 +- .../mac/scoped_pixel_buffer_object.h | 2 +- .../desktop_capture/mac/window_list_utils.cc | 2 +- webrtc/modules/desktop_capture/mouse_cursor.h | 2 +- .../mouse_cursor_monitor_win.cc | 2 +- .../mouse_cursor_monitor_x11.cc | 2 +- .../screen_capture_frame_queue.h | 2 +- .../desktop_capture/screen_capturer_helper.h | 2 +- .../screen_capturer_integration_test.cc | 12 +++---- .../screen_capturer_unittest.cc | 6 ++-- .../desktop_capture/screen_capturer_x11.cc | 10 +++--- .../desktop_capture/screen_drawer_linux.cc | 2 +- .../desktop_capture/screen_drawer_unittest.cc | 6 ++-- .../desktop_capture/shared_desktop_frame.cc | 2 +- .../desktop_capture/shared_desktop_frame.h | 6 ++-- .../modules/desktop_capture/shared_memory.h | 4 +-- webrtc/modules/desktop_capture/test_utils.cc | 2 +- .../desktop_capture/test_utils_unittest.cc | 2 +- webrtc/modules/desktop_capture/win/cursor.cc | 4 +-- .../modules/desktop_capture/win/d3d_device.cc | 2 +- webrtc/modules/desktop_capture/win/desktop.cc | 2 +- webrtc/modules/desktop_capture/win/desktop.h | 2 +- .../win/dxgi_adapter_duplicator.cc | 4 +-- .../win/dxgi_duplicator_controller.cc | 6 ++-- .../win/dxgi_duplicator_controller.h | 4 +-- .../modules/desktop_capture/win/dxgi_frame.cc | 4 +-- .../win/dxgi_output_duplicator.cc | 4 +-- .../win/dxgi_output_duplicator.h | 6 ++-- .../desktop_capture/win/dxgi_texture.cc | 4 +-- .../win/dxgi_texture_mapping.cc | 4 +-- .../win/dxgi_texture_staging.cc | 4 +-- .../desktop_capture/win/scoped_gdi_object.h | 2 +- .../win/scoped_thread_desktop.h | 2 +- .../win/screen_capture_utils.cc | 2 +- .../win/screen_capturer_win_directx.cc | 8 ++--- .../win/screen_capturer_win_directx.h | 4 +-- .../win/screen_capturer_win_gdi.cc | 6 ++-- .../win/screen_capturer_win_gdi.h | 2 +- .../win/screen_capturer_win_magnifier.cc | 6 ++-- .../win/screen_capturer_win_magnifier.h | 2 +- .../win/window_capture_utils.h | 2 +- .../desktop_capture/window_capturer_null.cc | 2 +- .../desktop_capture/window_capturer_win.cc | 8 ++--- .../desktop_capture/window_capturer_x11.cc | 8 ++--- .../desktop_capture/x11/shared_x_display.cc | 4 +-- .../desktop_capture/x11/shared_x_display.h | 4 +-- .../desktop_capture/x11/x_error_trap.h | 2 +- .../x11/x_server_pixel_buffer.cc | 2 +- .../x11/x_server_pixel_buffer.h | 2 +- webrtc/modules/include/module_common_types.h | 8 ++--- webrtc/modules/media_file/media_file_impl.cc | 2 +- webrtc/modules/media_file/media_file_impl.h | 2 +- .../modules/media_file/media_file_utility.cc | 2 +- webrtc/modules/pacing/alr_detector.cc | 6 ++-- webrtc/modules/pacing/alr_detector.h | 4 +-- webrtc/modules/pacing/bitrate_prober.cc | 4 +-- webrtc/modules/pacing/bitrate_prober.h | 2 +- webrtc/modules/pacing/paced_sender.cc | 4 +-- webrtc/modules/pacing/paced_sender.h | 6 ++-- webrtc/modules/pacing/packet_router.cc | 6 ++-- webrtc/modules/pacing/packet_router.h | 8 ++--- .../modules/pacing/packet_router_unittest.cc | 4 +-- .../aimd_rate_control.cc | 4 +-- .../aimd_rate_control.h | 2 +- .../bwe_simulations.cc | 3 +- .../include/bwe_defines.h | 2 +- .../include/send_time_history.h | 4 +-- .../remote_bitrate_estimator/inter_arrival.cc | 2 +- .../remote_bitrate_estimator/inter_arrival.h | 2 +- .../overuse_detector.cc | 6 ++-- .../overuse_detector.h | 2 +- .../overuse_detector_unittest.cc | 4 +-- .../overuse_estimator.cc | 2 +- .../overuse_estimator.h | 2 +- .../remote_bitrate_estimator_abs_send_time.cc | 8 ++--- .../remote_bitrate_estimator_abs_send_time.h | 10 +++--- ...itrate_estimator_abs_send_time_unittest.cc | 2 +- .../remote_bitrate_estimator_single_stream.cc | 6 ++-- .../remote_bitrate_estimator_single_stream.h | 6 ++-- ...itrate_estimator_single_stream_unittest.cc | 2 +- ...emote_bitrate_estimator_unittest_helper.cc | 2 +- ...remote_bitrate_estimator_unittest_helper.h | 2 +- .../remote_bitrate_estimators_test.cc | 4 +-- .../remote_estimator_proxy.cc | 6 ++-- .../remote_estimator_proxy.h | 2 +- .../send_time_history.cc | 2 +- .../remote_bitrate_estimator/test/bwe.cc | 2 +- .../remote_bitrate_estimator/test/bwe.h | 6 ++-- .../remote_bitrate_estimator/test/bwe_test.cc | 2 +- .../remote_bitrate_estimator/test/bwe_test.h | 2 +- .../test/bwe_test_baselinefile.cc | 2 +- .../test/bwe_test_fileutils.h | 2 +- .../test/bwe_test_framework.cc | 4 +-- .../test/bwe_test_framework.h | 4 +-- .../test/bwe_test_framework_unittest.cc | 2 +- .../test/bwe_test_logging.cc | 6 ++-- .../test/bwe_test_logging.h | 4 +-- .../test/bwe_unittest.cc | 2 +- .../test/estimators/nada.cc | 4 +-- .../test/estimators/nada.h | 2 +- .../test/estimators/nada_unittest.cc | 4 +-- .../test/estimators/remb.h | 2 +- .../test/estimators/send_side.cc | 4 +-- .../test/metric_recorder.h | 2 +- .../test/packet_receiver.h | 2 +- .../test/packet_sender.cc | 2 +- .../test/packet_sender.h | 2 +- .../tools/bwe_rtp_play.cc | 2 +- .../tools/rtp_to_text.cc | 2 +- .../rtp_rtcp/include/flexfec_receiver.h | 4 +-- .../modules/rtp_rtcp/include/flexfec_sender.h | 6 ++-- .../include/remote_ntp_time_estimator.h | 2 +- webrtc/modules/rtp_rtcp/include/rtp_cvo.h | 2 +- .../include/rtp_header_extension_map.h | 6 ++-- .../rtp_rtcp/include/rtp_payload_registry.h | 2 +- webrtc/modules/rtp_rtcp/include/rtp_rtcp.h | 6 ++-- .../rtp_rtcp/include/rtp_rtcp_defines.h | 2 +- .../mocks/mock_recovered_packet_receiver.h | 2 +- webrtc/modules/rtp_rtcp/mocks/mock_rtp_rtcp.h | 4 +-- webrtc/modules/rtp_rtcp/source/dtmf_queue.h | 2 +- .../rtp_rtcp/source/fec_test_helper.cc | 2 +- .../modules/rtp_rtcp/source/fec_test_helper.h | 4 +-- .../source/flexfec_header_reader_writer.cc | 4 +-- .../source/flexfec_header_reader_writer.h | 2 +- .../flexfec_header_reader_writer_unittest.cc | 8 ++--- .../rtp_rtcp/source/flexfec_receiver.cc | 4 +-- .../source/flexfec_receiver_unittest.cc | 2 +- .../modules/rtp_rtcp/source/flexfec_sender.cc | 2 +- .../source/forward_error_correction.cc | 4 +-- .../source/forward_error_correction.h | 8 ++--- .../forward_error_correction_internal.cc | 2 +- .../rtp_rtcp/source/nack_rtx_unittest.cc | 2 +- .../rtp_rtcp/source/packet_loss_stats.cc | 2 +- .../rtp_rtcp/source/playout_delay_oracle.cc | 4 +-- .../rtp_rtcp/source/playout_delay_oracle.h | 4 +-- .../source/playout_delay_oracle_unittest.cc | 2 +- .../rtp_rtcp/source/receive_statistics_impl.h | 4 +-- .../source/remote_ntp_time_estimator.cc | 2 +- webrtc/modules/rtp_rtcp/source/rtcp_packet.cc | 2 +- webrtc/modules/rtp_rtcp/source/rtcp_packet.h | 4 +-- .../rtp_rtcp/source/rtcp_packet/app.cc | 4 +-- .../modules/rtp_rtcp/source/rtcp_packet/app.h | 2 +- .../rtp_rtcp/source/rtcp_packet/bye.cc | 4 +-- .../source/rtcp_packet/common_header.cc | 2 +- .../source/rtcp_packet/common_header.h | 2 +- .../source/rtcp_packet/compound_packet.cc | 2 +- .../source/rtcp_packet/compound_packet.h | 4 +-- .../rtp_rtcp/source/rtcp_packet/dlrr.cc | 4 +-- .../rtp_rtcp/source/rtcp_packet/dlrr.h | 2 +- .../rtcp_packet/extended_jitter_report.cc | 4 +-- .../source/rtcp_packet/extended_reports.cc | 4 +-- .../source/rtcp_packet/extended_reports.h | 2 +- .../rtcp_packet/extended_reports_unittest.cc | 2 +- .../rtp_rtcp/source/rtcp_packet/fir.cc | 4 +-- .../modules/rtp_rtcp/source/rtcp_packet/fir.h | 2 +- .../rtp_rtcp/source/rtcp_packet/nack.cc | 4 +-- .../rtp_rtcp/source/rtcp_packet/nack.h | 2 +- .../rtp_rtcp/source/rtcp_packet/pli.cc | 4 +-- .../modules/rtp_rtcp/source/rtcp_packet/pli.h | 2 +- .../rtp_rtcp/source/rtcp_packet/psfb.h | 2 +- .../rtcp_packet/rapid_resync_request.cc | 4 +-- .../source/rtcp_packet/rapid_resync_request.h | 2 +- .../source/rtcp_packet/receiver_report.cc | 4 +-- .../source/rtcp_packet/receiver_report.h | 2 +- .../rtp_rtcp/source/rtcp_packet/remb.cc | 4 +-- .../rtp_rtcp/source/rtcp_packet/remb.h | 2 +- .../source/rtcp_packet/report_block.cc | 4 +-- .../source/rtcp_packet/report_block.h | 2 +- .../rtcp_packet/report_block_unittest.cc | 2 +- .../rtp_rtcp/source/rtcp_packet/rrtr.cc | 2 +- .../rtp_rtcp/source/rtcp_packet/rrtr.h | 2 +- .../rtp_rtcp/source/rtcp_packet/rtpfb.h | 2 +- .../rtp_rtcp/source/rtcp_packet/sdes.cc | 4 +-- .../rtp_rtcp/source/rtcp_packet/sdes.h | 2 +- .../source/rtcp_packet/sender_report.cc | 4 +-- .../source/rtcp_packet/target_bitrate.cc | 2 +- .../source/rtcp_packet/target_bitrate.h | 2 +- .../rtcp_packet/target_bitrate_unittest.cc | 6 ++-- .../rtp_rtcp/source/rtcp_packet/tmmb_item.cc | 4 +-- .../rtp_rtcp/source/rtcp_packet/tmmb_item.h | 2 +- .../rtp_rtcp/source/rtcp_packet/tmmbn.cc | 4 +-- .../rtp_rtcp/source/rtcp_packet/tmmbn.h | 2 +- .../rtp_rtcp/source/rtcp_packet/tmmbr.cc | 4 +-- .../rtp_rtcp/source/rtcp_packet/tmmbr.h | 2 +- .../source/rtcp_packet/transport_feedback.cc | 6 ++-- .../source/rtcp_packet/voip_metric.cc | 2 +- .../rtp_rtcp/source/rtcp_packet/voip_metric.h | 2 +- .../modules/rtp_rtcp/source/rtcp_receiver.cc | 6 ++-- .../modules/rtp_rtcp/source/rtcp_receiver.h | 4 +-- .../rtp_rtcp/source/rtcp_receiver_unittest.cc | 6 ++-- webrtc/modules/rtp_rtcp/source/rtcp_sender.cc | 8 ++--- webrtc/modules/rtp_rtcp/source/rtcp_sender.h | 10 +++--- .../rtp_rtcp/source/rtcp_sender_unittest.cc | 2 +- .../rtp_rtcp/source/rtp_fec_unittest.cc | 4 +-- webrtc/modules/rtp_rtcp/source/rtp_format.h | 2 +- .../rtp_rtcp/source/rtp_format_h264.cc | 12 +++---- .../modules/rtp_rtcp/source/rtp_format_h264.h | 4 +-- .../source/rtp_format_h264_unittest.cc | 2 +- .../source/rtp_format_video_generic.cc | 2 +- .../source/rtp_format_video_generic.h | 2 +- .../rtp_format_video_generic_unittest.cc | 2 +- .../modules/rtp_rtcp/source/rtp_format_vp8.cc | 2 +- .../modules/rtp_rtcp/source/rtp_format_vp8.h | 2 +- .../source/rtp_format_vp8_test_helper.h | 2 +- .../modules/rtp_rtcp/source/rtp_format_vp9.cc | 6 ++-- .../modules/rtp_rtcp/source/rtp_format_vp9.h | 2 +- .../source/rtp_header_extension_map.cc | 6 ++-- .../rtp_rtcp/source/rtp_header_extensions.cc | 4 +-- .../rtp_rtcp/source/rtp_header_extensions.h | 2 +- .../rtp_rtcp/source/rtp_header_parser.cc | 2 +- webrtc/modules/rtp_rtcp/source/rtp_packet.cc | 6 ++-- webrtc/modules/rtp_rtcp/source/rtp_packet.h | 6 ++-- .../rtp_rtcp/source/rtp_packet_history.cc | 4 +-- .../rtp_rtcp/source/rtp_packet_history.h | 6 ++-- .../rtp_rtcp/source/rtp_packet_unittest.cc | 2 +- .../rtp_rtcp/source/rtp_payload_registry.cc | 6 ++-- .../rtp_rtcp/source/rtp_receiver_audio.cc | 4 +-- .../rtp_rtcp/source/rtp_receiver_audio.h | 2 +- .../rtp_rtcp/source/rtp_receiver_impl.cc | 2 +- .../rtp_rtcp/source/rtp_receiver_impl.h | 2 +- .../rtp_rtcp/source/rtp_receiver_strategy.h | 2 +- .../rtp_rtcp/source/rtp_receiver_video.cc | 6 ++-- .../rtp_rtcp/source/rtp_receiver_video.h | 2 +- .../modules/rtp_rtcp/source/rtp_rtcp_impl.cc | 4 +-- .../modules/rtp_rtcp/source/rtp_rtcp_impl.h | 6 ++-- .../rtp_rtcp/source/rtp_rtcp_impl_unittest.cc | 2 +- webrtc/modules/rtp_rtcp/source/rtp_sender.cc | 14 ++++---- webrtc/modules/rtp_rtcp/source/rtp_sender.h | 16 +++++----- .../rtp_rtcp/source/rtp_sender_audio.cc | 6 ++-- .../rtp_rtcp/source/rtp_sender_audio.h | 6 ++-- .../rtp_rtcp/source/rtp_sender_unittest.cc | 4 +-- .../rtp_rtcp/source/rtp_sender_video.cc | 8 ++--- .../rtp_rtcp/source/rtp_sender_video.h | 12 +++---- webrtc/modules/rtp_rtcp/source/rtp_utility.cc | 2 +- webrtc/modules/rtp_rtcp/source/rtp_utility.h | 2 +- webrtc/modules/rtp_rtcp/source/tmmbr_help.cc | 2 +- .../rtp_rtcp/source/ulpfec_generator.cc | 4 +-- .../source/ulpfec_generator_unittest.cc | 2 +- .../source/ulpfec_header_reader_writer.cc | 2 +- .../source/ulpfec_header_reader_writer.h | 2 +- .../ulpfec_header_reader_writer_unittest.cc | 8 ++--- .../rtp_rtcp/source/ulpfec_receiver_impl.cc | 4 +-- .../rtp_rtcp/source/ulpfec_receiver_impl.h | 2 +- .../modules/rtp_rtcp/test/testAPI/test_api.cc | 4 +-- .../rtp_rtcp/test/testAPI/test_api_audio.cc | 2 +- .../rtp_rtcp/test/testAPI/test_api_rtcp.cc | 2 +- .../rtp_rtcp/test/testAPI/test_api_video.cc | 2 +- .../modules/rtp_rtcp/test/testFec/test_fec.cc | 2 +- webrtc/modules/utility/include/jvm_android.h | 2 +- .../include/mock/mock_process_thread.h | 2 +- .../modules/utility/include/process_thread.h | 2 +- .../modules/utility/source/helpers_android.cc | 2 +- webrtc/modules/utility/source/jvm_android.cc | 2 +- .../utility/source/process_thread_impl.cc | 8 ++--- .../utility/source/process_thread_impl.h | 8 ++--- .../source/process_thread_impl_unittest.cc | 6 ++-- .../modules/video_capture/device_info_impl.cc | 2 +- .../external/video_capture_external.cc | 2 +- .../linux/video_capture_linux.cc | 4 +-- .../video_capture/linux/video_capture_linux.h | 4 +-- .../video_capture/objc/video_capture.h | 2 +- .../test/video_capture_unittest.cc | 6 ++-- .../video_capture/video_capture_impl.cc | 8 ++--- .../video_capture/video_capture_impl.h | 4 +-- .../video_capture/windows/sink_filter_ds.cc | 4 +-- .../windows/video_capture_factory_windows.cc | 4 +-- webrtc/modules/video_coding/codec_database.cc | 4 +-- webrtc/modules/video_coding/codec_timer.h | 2 +- .../modules/video_coding/codecs/h264/h264.cc | 4 +-- .../codecs/h264/h264_decoder_impl.cc | 8 ++--- .../codecs/h264/h264_encoder_impl.cc | 6 ++-- .../video_coding/codecs/i420/include/i420.h | 2 +- .../codecs/test/android_test_initializer.cc | 4 +-- .../codecs/test/packet_manipulator.cc | 2 +- .../codecs/test/packet_manipulator.h | 2 +- .../modules/video_coding/codecs/test/stats.cc | 4 +-- .../codecs/test/video_codec_test.h | 6 ++-- .../codecs/test/videoprocessor.cc | 6 ++-- .../video_coding/codecs/test/videoprocessor.h | 6 ++-- .../test/videoprocessor_integrationtest.h | 6 ++-- .../codecs/tools/video_quality_measurement.cc | 2 +- .../codecs/vp8/default_temporal_layers.cc | 4 +-- .../codecs/vp8/default_temporal_layers.h | 2 +- .../codecs/vp8/screenshare_layers.cc | 4 +-- .../codecs/vp8/screenshare_layers.h | 4 +-- .../codecs/vp8/simulcast_encoder_adapter.cc | 2 +- .../codecs/vp8/simulcast_encoder_adapter.h | 4 +-- .../codecs/vp8/simulcast_rate_allocator.cc | 2 +- .../codecs/vp8/simulcast_rate_allocator.h | 2 +- .../codecs/vp8/simulcast_unittest.h | 2 +- .../codecs/vp8/test/vp8_impl_unittest.cc | 6 ++-- .../video_coding/codecs/vp8/vp8_impl.cc | 8 ++--- .../codecs/vp9/screenshare_layers.cc | 4 +-- .../codecs/vp9/vp9_frame_buffer_pool.cc | 4 +-- .../codecs/vp9/vp9_frame_buffer_pool.h | 10 +++--- .../video_coding/codecs/vp9/vp9_impl.cc | 12 +++---- .../video_coding/codecs/vp9/vp9_noop.cc | 2 +- .../vp9/vp9_screenshare_layers_unittest.cc | 2 +- webrtc/modules/video_coding/decoding_state.cc | 2 +- webrtc/modules/video_coding/frame_buffer.cc | 6 ++-- webrtc/modules/video_coding/frame_buffer2.cc | 6 ++-- webrtc/modules/video_coding/frame_buffer2.h | 8 ++--- .../video_coding/frame_buffer2_unittest.cc | 4 +-- webrtc/modules/video_coding/frame_object.cc | 4 +-- webrtc/modules/video_coding/frame_object.h | 2 +- .../modules/video_coding/generic_decoder.cc | 8 ++--- webrtc/modules/video_coding/generic_decoder.h | 4 +-- .../modules/video_coding/generic_encoder.cc | 8 ++--- webrtc/modules/video_coding/generic_encoder.h | 4 +-- .../video_coding/h264_sprop_parameter_sets.cc | 6 ++-- .../video_coding/h264_sprop_parameter_sets.h | 2 +- .../video_coding/h264_sps_pps_tracker.cc | 4 +-- webrtc/modules/video_coding/jitter_buffer.cc | 8 ++--- webrtc/modules/video_coding/jitter_buffer.h | 8 ++--- .../video_coding/jitter_buffer_unittest.cc | 2 +- .../modules/video_coding/jitter_estimator.h | 2 +- webrtc/modules/video_coding/media_opt_util.h | 2 +- .../video_coding/media_optimization.cc | 2 +- .../modules/video_coding/media_optimization.h | 2 +- webrtc/modules/video_coding/nack_module.cc | 4 +-- webrtc/modules/video_coding/nack_module.h | 6 ++-- webrtc/modules/video_coding/packet_buffer.cc | 6 ++-- webrtc/modules/video_coding/packet_buffer.h | 6 ++-- .../protection_bitrate_calculator.h | 2 +- webrtc/modules/video_coding/receiver.cc | 4 +-- webrtc/modules/video_coding/receiver.h | 6 ++-- .../modules/video_coding/receiver_unittest.cc | 2 +- .../rtp_frame_reference_finder.cc | 4 +-- .../video_coding/rtp_frame_reference_finder.h | 4 +-- .../rtp_frame_reference_finder_unittest.cc | 4 +-- .../video_coding/sequence_number_util.h | 2 +- webrtc/modules/video_coding/session_info.cc | 2 +- .../video_coding/test/stream_generator.h | 2 +- webrtc/modules/video_coding/timing.h | 4 +-- .../video_coding/utility/frame_dropper.cc | 2 +- .../video_coding/utility/frame_dropper.h | 2 +- .../utility/frame_dropper_unittest.cc | 2 +- .../video_coding/utility/ivf_file_writer.cc | 4 +-- .../video_coding/utility/ivf_file_writer.h | 6 ++-- .../utility/ivf_file_writer_unittest.cc | 8 ++--- .../video_coding/utility/moving_average.h | 2 +- .../video_coding/utility/quality_scaler.cc | 6 ++-- .../video_coding/utility/quality_scaler.h | 6 ++-- .../utility/quality_scaler_unittest.cc | 4 +-- .../video_coding/utility/vp8_header_parser.cc | 2 +- .../utility/vp9_uncompressed_header_parser.cc | 4 +-- .../video_coding/video_codec_initializer.cc | 4 +-- .../modules/video_coding/video_coding_impl.cc | 4 +-- .../modules/video_coding/video_coding_impl.h | 8 ++--- .../video_packet_buffer_unittest.cc | 2 +- webrtc/modules/video_coding/video_receiver.cc | 8 ++--- webrtc/modules/video_coding/video_sender.cc | 6 ++-- .../video_processing/util/denoiser_filter.cc | 2 +- webrtc/ortc/ortcfactory.cc | 10 +++--- webrtc/ortc/ortcfactory.h | 4 +-- webrtc/ortc/ortcfactory_integrationtest.cc | 8 ++--- webrtc/ortc/ortcfactory_unittest.cc | 6 ++-- webrtc/ortc/ortcrtpreceiver_unittest.cc | 2 +- webrtc/ortc/ortcrtpreceiveradapter.cc | 4 +-- webrtc/ortc/ortcrtpreceiveradapter.h | 6 ++-- webrtc/ortc/ortcrtpsender_unittest.cc | 2 +- webrtc/ortc/ortcrtpsenderadapter.cc | 2 +- webrtc/ortc/ortcrtpsenderadapter.h | 4 +-- webrtc/ortc/rtpparametersconversion.h | 2 +- .../ortc/rtpparametersconversion_unittest.cc | 2 +- webrtc/ortc/rtptransport_unittest.cc | 2 +- webrtc/ortc/rtptransportadapter.cc | 2 +- webrtc/ortc/rtptransportadapter.h | 4 +-- .../ortc/rtptransportcontroller_unittest.cc | 2 +- webrtc/ortc/rtptransportcontrolleradapter.cc | 2 +- webrtc/ortc/rtptransportcontrolleradapter.h | 6 ++-- webrtc/ortc/srtptransport_unittest.cc | 2 +- webrtc/p2p/base/asyncstuntcpsocket.cc | 4 +-- webrtc/p2p/base/asyncstuntcpsocket.h | 6 ++-- .../p2p/base/asyncstuntcpsocket_unittest.cc | 6 ++-- webrtc/p2p/base/basicpacketsocketfactory.cc | 18 +++++------ webrtc/p2p/base/candidate.h | 8 ++--- webrtc/p2p/base/common.h | 2 +- webrtc/p2p/base/dtlstransportchannel.cc | 14 ++++---- webrtc/p2p/base/dtlstransportchannel.h | 10 +++--- .../p2p/base/dtlstransportchannel_unittest.cc | 16 +++++----- webrtc/p2p/base/dtlstransportinternal.h | 4 +-- webrtc/p2p/base/fakedtlstransport.h | 2 +- webrtc/p2p/base/fakeicetransport.h | 4 +-- webrtc/p2p/base/fakepackettransport.h | 4 +-- webrtc/p2p/base/fakeportallocator.h | 2 +- webrtc/p2p/base/faketransportcontroller.h | 6 ++-- webrtc/p2p/base/icetransportinternal.h | 2 +- webrtc/p2p/base/jseptransport.cc | 6 ++-- webrtc/p2p/base/jseptransport.h | 12 +++---- webrtc/p2p/base/jseptransport_unittest.cc | 6 ++-- webrtc/p2p/base/mockicetransport.h | 2 +- webrtc/p2p/base/p2ptransportchannel.cc | 8 ++--- webrtc/p2p/base/p2ptransportchannel.h | 6 ++-- .../p2p/base/p2ptransportchannel_unittest.cc | 32 +++++++++---------- webrtc/p2p/base/packetlossestimator.cc | 2 +- .../p2p/base/packetlossestimator_unittest.cc | 2 +- webrtc/p2p/base/packetsocketfactory.h | 4 +-- webrtc/p2p/base/packettransportinternal.h | 6 ++-- webrtc/p2p/base/port.cc | 22 ++++++------- webrtc/p2p/base/port.h | 18 +++++------ webrtc/p2p/base/port_unittest.cc | 28 ++++++++-------- webrtc/p2p/base/portallocator.cc | 2 +- webrtc/p2p/base/portallocator.h | 8 ++--- webrtc/p2p/base/portallocator_unittest.cc | 6 ++-- webrtc/p2p/base/portinterface.h | 4 +-- webrtc/p2p/base/pseudotcp.cc | 20 ++++++------ webrtc/p2p/base/pseudotcp.h | 4 +-- webrtc/p2p/base/pseudotcp_unittest.cc | 12 +++---- webrtc/p2p/base/relayport.cc | 8 ++--- webrtc/p2p/base/relayport_unittest.cc | 16 +++++----- webrtc/p2p/base/relayserver.cc | 10 +++--- webrtc/p2p/base/relayserver.h | 8 ++--- webrtc/p2p/base/relayserver_unittest.cc | 18 +++++------ webrtc/p2p/base/sessiondescription.h | 2 +- webrtc/p2p/base/stun.cc | 14 ++++---- webrtc/p2p/base/stun.h | 6 ++-- webrtc/p2p/base/stun_unittest.cc | 14 ++++---- webrtc/p2p/base/stunport.cc | 10 +++--- webrtc/p2p/base/stunport.h | 2 +- webrtc/p2p/base/stunport_unittest.cc | 10 +++--- webrtc/p2p/base/stunrequest.cc | 10 +++--- webrtc/p2p/base/stunrequest.h | 4 +-- webrtc/p2p/base/stunrequest_unittest.cc | 12 +++---- webrtc/p2p/base/stunserver.cc | 4 +-- webrtc/p2p/base/stunserver.h | 2 +- webrtc/p2p/base/stunserver_unittest.cc | 12 +++---- webrtc/p2p/base/tcpport.cc | 4 +-- webrtc/p2p/base/tcpport.h | 2 +- webrtc/p2p/base/tcpport_unittest.cc | 6 ++-- webrtc/p2p/base/testrelayserver.h | 8 ++--- webrtc/p2p/base/teststunserver.h | 4 +-- webrtc/p2p/base/testturnserver.h | 4 +-- webrtc/p2p/base/transportchannelimpl.h | 2 +- webrtc/p2p/base/transportcontroller.cc | 6 ++-- webrtc/p2p/base/transportcontroller.h | 10 +++--- .../p2p/base/transportcontroller_unittest.cc | 10 +++--- webrtc/p2p/base/transportdescription.cc | 4 +-- webrtc/p2p/base/transportdescription.h | 2 +- .../p2p/base/transportdescriptionfactory.cc | 8 ++--- webrtc/p2p/base/transportdescriptionfactory.h | 2 +- .../transportdescriptionfactory_unittest.cc | 6 ++-- webrtc/p2p/base/transportinfo.h | 2 +- webrtc/p2p/base/turnport.cc | 16 +++++----- webrtc/p2p/base/turnport.h | 4 +-- webrtc/p2p/base/turnport_unittest.cc | 28 ++++++++-------- webrtc/p2p/base/turnserver.cc | 20 ++++++------ webrtc/p2p/base/turnserver.h | 10 +++--- webrtc/p2p/base/turnserver_unittest.cc | 6 ++-- webrtc/p2p/base/udptransport.cc | 12 +++---- webrtc/p2p/base/udptransport.h | 6 ++-- webrtc/p2p/base/udptransport_unittest.cc | 14 ++++---- webrtc/p2p/client/basicportallocator.cc | 6 ++-- webrtc/p2p/client/basicportallocator.h | 8 ++--- .../p2p/client/basicportallocator_unittest.cc | 30 ++++++++--------- webrtc/p2p/client/socketmonitor.cc | 2 +- webrtc/p2p/client/socketmonitor.h | 6 ++-- webrtc/p2p/quic/quicconnectionhelper.h | 2 +- .../p2p/quic/quicconnectionhelper_unittest.cc | 2 +- webrtc/p2p/quic/quicsession.cc | 8 ++--- webrtc/p2p/quic/quicsession.h | 6 ++-- webrtc/p2p/quic/quicsession_unittest.cc | 4 +-- webrtc/p2p/quic/quictransport.cc | 2 +- webrtc/p2p/quic/quictransport_unittest.cc | 6 ++-- webrtc/p2p/quic/quictransportchannel.cc | 10 +++--- webrtc/p2p/quic/quictransportchannel.h | 4 +-- .../p2p/quic/quictransportchannel_unittest.cc | 4 +-- webrtc/p2p/quic/reliablequicstream.cc | 2 +- webrtc/p2p/quic/reliablequicstream.h | 6 ++-- .../p2p/quic/reliablequicstream_unittest.cc | 8 ++--- webrtc/p2p/stunprober/stunprober.cc | 18 +++++------ webrtc/p2p/stunprober/stunprober.h | 20 ++++++------ webrtc/p2p/stunprober/stunprober_unittest.cc | 12 +++---- webrtc/pc/audiomonitor.h | 4 +-- webrtc/pc/audiotrack.cc | 2 +- webrtc/pc/audiotrack.h | 6 ++-- webrtc/pc/bundlefilter.cc | 2 +- webrtc/pc/bundlefilter.h | 2 +- webrtc/pc/bundlefilter_unittest.cc | 2 +- webrtc/pc/channel.cc | 16 +++++----- webrtc/pc/channel.h | 12 +++---- webrtc/pc/channel_unittest.cc | 14 ++++---- webrtc/pc/channelmanager.cc | 12 +++---- webrtc/pc/channelmanager.h | 4 +-- webrtc/pc/channelmanager_unittest.cc | 6 ++-- webrtc/pc/createpeerconnectionfactory.cc | 6 ++-- webrtc/pc/currentspeakermonitor.cc | 2 +- webrtc/pc/currentspeakermonitor.h | 2 +- webrtc/pc/currentspeakermonitor_unittest.cc | 6 ++-- webrtc/pc/datachannel.cc | 6 ++-- webrtc/pc/datachannel.h | 6 ++-- webrtc/pc/datachannel_unittest.cc | 2 +- webrtc/pc/dtmfsender.cc | 6 ++-- webrtc/pc/dtmfsender.h | 6 ++-- webrtc/pc/dtmfsender_unittest.cc | 8 ++--- webrtc/pc/externalhmac.cc | 2 +- webrtc/pc/iceserverparsing.cc | 2 +- webrtc/pc/iceserverparsing_unittest.cc | 2 +- webrtc/pc/jsepicecandidate.cc | 2 +- webrtc/pc/jsepsessiondescription.cc | 4 +-- webrtc/pc/jsepsessiondescription_unittest.cc | 8 ++--- webrtc/pc/localaudiosource_unittest.cc | 2 +- .../pc/mediaconstraintsinterface_unittest.cc | 2 +- webrtc/pc/mediamonitor.cc | 4 +-- webrtc/pc/mediamonitor.h | 8 ++--- webrtc/pc/mediasession.cc | 12 +++---- webrtc/pc/mediasession_unittest.cc | 10 +++--- webrtc/pc/mediastream.cc | 4 +-- webrtc/pc/mediastream_unittest.cc | 8 ++--- webrtc/pc/mediastreamobserver.h | 4 +-- webrtc/pc/peerconnection.cc | 12 +++---- webrtc/pc/peerconnection_integrationtest.cc | 16 +++++----- webrtc/pc/peerconnectionendtoend_unittest.cc | 16 +++++----- webrtc/pc/peerconnectionfactory.cc | 4 +-- webrtc/pc/peerconnectionfactory.h | 6 ++-- webrtc/pc/peerconnectionfactory_unittest.cc | 4 +-- webrtc/pc/peerconnectioninterface_unittest.cc | 12 +++---- webrtc/pc/proxy_unittest.cc | 6 ++-- webrtc/pc/quicdatachannel.cc | 8 ++--- webrtc/pc/quicdatachannel.h | 6 ++-- webrtc/pc/quicdatachannel_unittest.cc | 6 ++-- webrtc/pc/quicdatatransport.cc | 4 +-- webrtc/pc/quicdatatransport.h | 6 ++-- webrtc/pc/quicdatatransport_unittest.cc | 4 +-- webrtc/pc/remoteaudiosource.cc | 8 ++--- webrtc/pc/remoteaudiosource.h | 2 +- webrtc/pc/rtcpmuxfilter.cc | 2 +- webrtc/pc/rtcpmuxfilter_unittest.cc | 4 +-- webrtc/pc/rtcstats_integrationtest.cc | 10 +++--- webrtc/pc/rtcstatscollector.cc | 4 +-- webrtc/pc/rtcstatscollector.h | 14 ++++---- webrtc/pc/rtcstatscollector_unittest.cc | 18 +++++------ webrtc/pc/rtpreceiver.cc | 2 +- webrtc/pc/rtpreceiver.h | 4 +-- webrtc/pc/rtpsender.cc | 6 ++-- webrtc/pc/rtpsender.h | 4 +-- webrtc/pc/rtpsenderreceiver_unittest.cc | 4 +-- webrtc/pc/rtptransport.cc | 6 ++-- webrtc/pc/rtptransport.h | 2 +- webrtc/pc/rtptransport_unittest.cc | 2 +- webrtc/pc/sctputils.cc | 6 ++-- webrtc/pc/sctputils_unittest.cc | 6 ++-- webrtc/pc/srtpfilter.cc | 16 +++++----- webrtc/pc/srtpfilter.h | 10 +++--- webrtc/pc/srtpfilter_unittest.cc | 10 +++--- webrtc/pc/statscollector.cc | 4 +-- webrtc/pc/statscollector_unittest.cc | 10 +++--- webrtc/pc/test/androidtestinitializer.cc | 6 ++-- webrtc/pc/test/fakeaudiocapturemodule.cc | 8 ++--- webrtc/pc/test/fakeaudiocapturemodule.h | 8 ++--- .../test/fakeaudiocapturemodule_unittest.cc | 8 ++--- webrtc/pc/test/fakedatachannelprovider.h | 2 +- webrtc/pc/test/fakeperiodicvideocapturer.h | 2 +- webrtc/pc/test/fakertccertificategenerator.h | 4 +-- webrtc/pc/test/mock_peerconnection.h | 2 +- webrtc/pc/test/mockpeerconnectionobservers.h | 2 +- webrtc/pc/test/peerconnectiontestwrapper.cc | 2 +- webrtc/pc/test/peerconnectiontestwrapper.h | 2 +- webrtc/pc/test/rtcstatsobtainer.h | 2 +- webrtc/pc/trackmediainfomap.h | 2 +- webrtc/pc/trackmediainfomap_unittest.cc | 2 +- webrtc/pc/videocapturertracksource.cc | 4 +-- webrtc/pc/videocapturertracksource.h | 4 +-- .../pc/videocapturertracksource_unittest.cc | 2 +- webrtc/pc/videotrack.h | 4 +-- webrtc/pc/videotrack_unittest.cc | 4 +-- webrtc/pc/videotracksource.h | 2 +- webrtc/pc/webrtcsdp.cc | 10 +++--- webrtc/pc/webrtcsdp_unittest.cc | 14 ++++---- webrtc/pc/webrtcsession.cc | 14 ++++---- webrtc/pc/webrtcsession.h | 10 +++--- webrtc/pc/webrtcsession_unittest.cc | 24 +++++++------- webrtc/pc/webrtcsessiondescriptionfactory.cc | 4 +-- webrtc/pc/webrtcsessiondescriptionfactory.h | 8 ++--- webrtc/rtc_tools/agc/activity_metric.cc | 4 +-- .../event_log_visualizer/analyzer.cc | 10 +++--- .../rtc_tools/event_log_visualizer/analyzer.h | 2 +- webrtc/rtc_tools/event_log_visualizer/main.cc | 2 +- .../event_log_visualizer/plot_base.cc | 2 +- .../event_log_visualizer/plot_protobuf.h | 2 +- .../rtc_tools/network_tester/config_reader.h | 6 ++-- .../network_tester/network_tester_unittest.cc | 2 +- .../rtc_tools/network_tester/packet_logger.cc | 4 +-- .../rtc_tools/network_tester/packet_logger.h | 4 +-- .../rtc_tools/network_tester/packet_sender.cc | 2 +- .../rtc_tools/network_tester/packet_sender.h | 8 ++--- .../network_tester/test_controller.h | 4 +-- webrtc/rtc_tools/simple_command_line_parser.h | 4 +-- .../android/src/jni/androidmediacodeccommon.h | 5 ++- .../src/jni/androidmediadecoder_jni.cc | 12 +++---- .../src/jni/androidmediaencoder_jni.cc | 18 +++++------ .../src/jni/androidnetworkmonitor_jni.cc | 6 ++-- .../src/jni/androidnetworkmonitor_jni.h | 4 +-- .../src/jni/androidvideotracksource.cc | 2 +- .../android/src/jni/androidvideotracksource.h | 12 +++---- .../src/jni/androidvideotracksource_jni.cc | 2 +- webrtc/sdk/android/src/jni/audio_jni.h | 2 +- .../android/src/jni/filevideocapturer_jni.cc | 4 +-- webrtc/sdk/android/src/jni/jni_helpers.h | 6 ++-- webrtc/sdk/android/src/jni/jni_onload.cc | 2 +- webrtc/sdk/android/src/jni/media_jni.h | 2 +- .../sdk/android/src/jni/native_handle_impl.cc | 12 +++---- .../sdk/android/src/jni/native_handle_impl.h | 2 +- .../android/src/jni/ownedfactoryandthreads.cc | 2 +- .../android/src/jni/ownedfactoryandthreads.h | 2 +- .../sdk/android/src/jni/peerconnection_jni.cc | 24 +++++++------- .../src/jni/surfacetexturehelper_jni.cc | 6 ++-- .../src/jni/surfacetexturehelper_jni.h | 6 ++-- webrtc/sdk/android/src/jni/video_jni.cc | 2 +- webrtc/sdk/android/src/jni/video_jni.h | 2 +- .../src/jni/videodecoderfactorywrapper.cc | 2 +- .../android/src/jni/videodecoderwrapper.cc | 2 +- .../android/src/jni/videofilerenderer_jni.cc | 4 +-- webrtc/sdk/android/src/jni/videotrack_jni.cc | 2 +- .../PeerConnection/RTCDataChannel+Private.h | 2 +- .../RTCPeerConnectionFactory+Private.h | 2 +- .../Classes/Video/corevideo_frame_buffer.cc | 4 +-- .../Classes/Video/objcvideotracksource.h | 2 +- .../Framework/Classes/VideoToolbox/encoder.h | 2 +- .../Classes/VideoToolbox/nalu_rewriter.cc | 4 +-- .../Classes/VideoToolbox/nalu_rewriter.h | 2 +- .../VideoToolbox/nalu_rewriter_unittest.cc | 2 +- .../Framework/Headers/WebRTC/RTCSSLAdapter.h | 2 +- webrtc/stats/rtcstats.cc | 2 +- webrtc/stats/rtcstats_unittest.cc | 4 +-- webrtc/stats/rtcstatsreport_unittest.cc | 4 +-- .../system_wrappers/include/aligned_array.h | 2 +- webrtc/system_wrappers/include/atomic32.h | 2 +- webrtc/system_wrappers/include/file_wrapper.h | 2 +- webrtc/system_wrappers/include/metrics.h | 4 +-- .../system_wrappers/include/rw_lock_wrapper.h | 2 +- .../system_wrappers/include/static_instance.h | 2 +- webrtc/system_wrappers/source/clock.cc | 6 ++-- webrtc/system_wrappers/source/cpu_info.cc | 2 +- webrtc/system_wrappers/source/event.cc | 2 +- .../source/event_timer_posix.cc | 2 +- .../source/event_timer_posix.h | 2 +- .../source/event_timer_posix_unittest.cc | 4 +-- webrtc/system_wrappers/source/file_impl.cc | 2 +- .../source/logcat_trace_context.cc | 2 +- .../system_wrappers/source/metrics_default.cc | 4 +-- .../source/rtp_to_ntp_estimator.cc | 2 +- webrtc/system_wrappers/source/trace_impl.cc | 4 +-- webrtc/system_wrappers/source/trace_impl.h | 4 +-- webrtc/system_wrappers/source/trace_posix.h | 2 +- webrtc/test/call_test.cc | 2 +- .../test/configurable_frame_size_encoder.cc | 2 +- webrtc/test/direct_transport.h | 6 ++-- webrtc/test/drifting_clock.cc | 2 +- webrtc/test/fake_audio_device.cc | 4 +-- webrtc/test/fake_audio_device.h | 10 +++--- webrtc/test/fake_decoder.cc | 2 +- webrtc/test/fake_encoder.cc | 2 +- webrtc/test/fake_encoder.h | 6 ++-- webrtc/test/fake_network_pipe.cc | 2 +- webrtc/test/fake_network_pipe.h | 6 ++-- webrtc/test/fake_texture_frame.h | 2 +- webrtc/test/frame_generator.cc | 6 ++-- webrtc/test/frame_generator.h | 2 +- webrtc/test/frame_generator_capturer.cc | 10 +++--- webrtc/test/frame_generator_capturer.h | 4 +-- webrtc/test/frame_utils.h | 2 +- webrtc/test/fuzzers/audio_decoder_fuzzer.cc | 4 +-- .../test/fuzzers/audio_processing_fuzzer.cc | 2 +- .../audio_processing_fuzzer_configs.cc | 2 +- .../fuzzers/flexfec_header_reader_fuzzer.cc | 2 +- .../test/fuzzers/flexfec_receiver_fuzzer.cc | 4 +-- webrtc/test/fuzzers/neteq_rtp_fuzzer.cc | 2 +- .../test/fuzzers/pseudotcp_parser_fuzzer.cc | 2 +- .../fuzzers/residual_echo_detector_fuzzer.cc | 2 +- webrtc/test/fuzzers/rtcp_receiver_fuzzer.cc | 2 +- ...ort_feedback_packet_loss_tracker_fuzzer.cc | 2 +- .../test/fuzzers/ulpfec_generator_fuzzer.cc | 2 +- .../fuzzers/ulpfec_header_reader_fuzzer.cc | 2 +- webrtc/test/fuzzers/webrtc_fuzzer_main.cc | 2 +- webrtc/test/gl/gl_renderer.cc | 2 +- webrtc/test/gmock.h | 2 +- webrtc/test/gtest.h | 2 +- webrtc/test/layer_filtering_transport.cc | 2 +- webrtc/test/mac/video_renderer_mac.h | 2 +- webrtc/test/mock_audio_decoder_factory.h | 2 +- webrtc/test/mock_audio_encoder.h | 2 +- webrtc/test/mock_audio_encoder_factory.h | 2 +- webrtc/test/rtcp_packet_parser.cc | 4 +-- webrtc/test/rtcp_packet_parser.h | 4 +-- webrtc/test/rtp_file_reader.cc | 8 ++--- webrtc/test/rtp_file_writer.cc | 4 +-- webrtc/test/rtp_rtcp_observer.h | 4 +-- webrtc/test/test_main.cc | 2 +- webrtc/test/testsupport/fileutils.cc | 4 +-- webrtc/test/testsupport/fileutils.h | 2 +- webrtc/test/testsupport/fileutils_unittest.cc | 6 ++-- webrtc/test/testsupport/frame_reader.h | 2 +- webrtc/test/testsupport/isolated_output.cc | 6 ++-- .../testsupport/isolated_output_unittest.cc | 6 ++-- webrtc/test/testsupport/y4m_frame_writer.cc | 2 +- webrtc/test/testsupport/yuv_frame_writer.cc | 2 +- webrtc/test/vcm_capturer.cc | 2 +- webrtc/test/vcm_capturer.h | 4 +-- webrtc/test/video_capturer.cc | 4 +-- webrtc/test/video_capturer.h | 4 +-- webrtc/test/win/d3d_renderer.cc | 2 +- webrtc/test/win/d3d_renderer.h | 2 +- webrtc/video/call_stats.cc | 4 +-- webrtc/video/call_stats.h | 4 +-- webrtc/video/encoder_rtcp_feedback.cc | 2 +- webrtc/video/encoder_rtcp_feedback.h | 2 +- webrtc/video/end_to_end_tests.cc | 12 +++---- webrtc/video/overuse_frame_detector.cc | 8 ++--- webrtc/video/overuse_frame_detector.h | 12 +++---- .../video/overuse_frame_detector_unittest.cc | 6 ++-- webrtc/video/payload_router.cc | 2 +- webrtc/video/payload_router.h | 6 ++-- webrtc/video/quality_threshold.cc | 4 +-- webrtc/video/quality_threshold.h | 2 +- webrtc/video/receive_statistics_proxy.cc | 6 ++-- webrtc/video/receive_statistics_proxy.h | 8 ++--- webrtc/video/replay.cc | 2 +- webrtc/video/rtp_streams_synchronizer.cc | 8 ++--- webrtc/video/rtp_streams_synchronizer.h | 4 +-- webrtc/video/rtp_video_stream_receiver.cc | 6 ++-- webrtc/video/rtp_video_stream_receiver.h | 4 +-- .../rtp_video_stream_receiver_unittest.cc | 8 ++--- webrtc/video/screenshare_loopback.cc | 4 +-- webrtc/video/send_delay_stats.cc | 2 +- webrtc/video/send_delay_stats.h | 4 +-- webrtc/video/send_statistics_proxy.cc | 6 ++-- webrtc/video/send_statistics_proxy.h | 8 ++--- webrtc/video/stats_counter.cc | 2 +- webrtc/video/stats_counter.h | 2 +- webrtc/video/stream_synchronization.cc | 2 +- webrtc/video/transport_adapter.cc | 2 +- webrtc/video/video_loopback.cc | 2 +- webrtc/video/video_quality_test.cc | 16 +++++----- webrtc/video/video_receive_stream.cc | 10 +++--- webrtc/video/video_receive_stream.h | 2 +- webrtc/video/video_receive_stream_unittest.cc | 8 ++--- webrtc/video/video_send_stream.cc | 12 +++---- webrtc/video/video_send_stream.h | 6 ++-- webrtc/video/video_send_stream_tests.cc | 16 +++++----- webrtc/video/video_stream_decoder.cc | 4 +-- webrtc/video/video_stream_decoder.h | 6 ++-- webrtc/video/vie_encoder.cc | 12 +++---- webrtc/video/vie_encoder.h | 8 ++--- webrtc/video/vie_encoder_unittest.cc | 4 +-- webrtc/video_receive_stream.h | 2 +- webrtc/video_send_stream.h | 2 +- webrtc/voice_engine/audio_level.h | 2 +- webrtc/voice_engine/channel.cc | 20 ++++++------ webrtc/voice_engine/channel.h | 8 ++--- webrtc/voice_engine/channel_manager.cc | 2 +- webrtc/voice_engine/channel_manager.h | 8 ++--- webrtc/voice_engine/channel_proxy.cc | 6 ++-- webrtc/voice_engine/channel_proxy.h | 6 ++-- webrtc/voice_engine/file_player.cc | 2 +- webrtc/voice_engine/file_player_unittests.cc | 4 +-- webrtc/voice_engine/file_recorder.cc | 4 +-- webrtc/voice_engine/include/voe_base.h | 2 +- webrtc/voice_engine/output_mixer.cc | 2 +- webrtc/voice_engine/output_mixer.h | 2 +- webrtc/voice_engine/shared_data.h | 10 +++--- webrtc/voice_engine/statistics.h | 2 +- .../auto_test/fakes/conference_transport.cc | 4 +-- .../auto_test/fakes/conference_transport.h | 6 ++-- .../test/auto_test/fakes/loudest_filter.cc | 2 +- .../test/auto_test/fakes/loudest_filter.h | 2 +- .../fixtures/after_initialization_fixture.h | 4 +-- .../test/auto_test/standard/rtp_rtcp_test.cc | 2 +- .../test/auto_test/voe_conference_test.cc | 4 +-- webrtc/voice_engine/transmit_mixer.cc | 6 ++-- webrtc/voice_engine/transmit_mixer.h | 2 +- .../transport_feedback_packet_loss_tracker.cc | 4 +-- .../transport_feedback_packet_loss_tracker.h | 2 +- ...t_feedback_packet_loss_tracker_unittest.cc | 2 +- webrtc/voice_engine/utility.cc | 4 +-- webrtc/voice_engine/utility_unittest.cc | 4 +-- webrtc/voice_engine/voe_base_impl.cc | 6 ++-- webrtc/voice_engine/voe_base_impl.h | 2 +- webrtc/voice_engine/voe_codec_impl.cc | 2 +- webrtc/voice_engine/voe_network_impl.cc | 6 ++-- webrtc/voice_engine/voice_engine_impl.cc | 2 +- 1573 files changed, 3393 insertions(+), 3401 deletions(-) mode change 100755 => 100644 webrtc/modules/desktop_capture/window_capturer_null.cc diff --git a/webrtc/api/audio/audio_mixer.h b/webrtc/api/audio/audio_mixer.h index 931f20eaba..d1abf9a787 100644 --- a/webrtc/api/audio/audio_mixer.h +++ b/webrtc/api/audio/audio_mixer.h @@ -13,8 +13,8 @@ #include -#include "webrtc/base/refcount.h" #include "webrtc/modules/include/module_common_types.h" +#include "webrtc/rtc_base/refcount.h" namespace webrtc { diff --git a/webrtc/api/audio_codecs/audio_decoder.cc b/webrtc/api/audio_codecs/audio_decoder.cc index 90342a83b4..98dd496e63 100644 --- a/webrtc/api/audio_codecs/audio_decoder.cc +++ b/webrtc/api/audio_codecs/audio_decoder.cc @@ -14,10 +14,10 @@ #include #include -#include "webrtc/base/array_view.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/sanitizer.h" -#include "webrtc/base/trace_event.h" +#include "webrtc/rtc_base/array_view.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/sanitizer.h" +#include "webrtc/rtc_base/trace_event.h" namespace webrtc { diff --git a/webrtc/api/audio_codecs/audio_decoder.h b/webrtc/api/audio_codecs/audio_decoder.h index dab7d3b273..d671839ba5 100644 --- a/webrtc/api/audio_codecs/audio_decoder.h +++ b/webrtc/api/audio_codecs/audio_decoder.h @@ -14,10 +14,10 @@ #include #include -#include "webrtc/base/array_view.h" -#include "webrtc/base/buffer.h" -#include "webrtc/base/constructormagic.h" -#include "webrtc/base/optional.h" +#include "webrtc/rtc_base/array_view.h" +#include "webrtc/rtc_base/buffer.h" +#include "webrtc/rtc_base/constructormagic.h" +#include "webrtc/rtc_base/optional.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/api/audio_codecs/audio_decoder_factory.h b/webrtc/api/audio_codecs/audio_decoder_factory.h index 3479a4eec9..0becf6ffc4 100644 --- a/webrtc/api/audio_codecs/audio_decoder_factory.h +++ b/webrtc/api/audio_codecs/audio_decoder_factory.h @@ -16,7 +16,7 @@ #include "webrtc/api/audio_codecs/audio_decoder.h" #include "webrtc/api/audio_codecs/audio_format.h" -#include "webrtc/base/refcount.h" +#include "webrtc/rtc_base/refcount.h" namespace webrtc { diff --git a/webrtc/api/audio_codecs/audio_decoder_factory_template.h b/webrtc/api/audio_codecs/audio_decoder_factory_template.h index f79ead7469..422a514b8a 100644 --- a/webrtc/api/audio_codecs/audio_decoder_factory_template.h +++ b/webrtc/api/audio_codecs/audio_decoder_factory_template.h @@ -15,7 +15,7 @@ #include #include "webrtc/api/audio_codecs/audio_decoder_factory.h" -#include "webrtc/base/scoped_ref_ptr.h" +#include "webrtc/rtc_base/scoped_ref_ptr.h" namespace webrtc { diff --git a/webrtc/api/audio_codecs/audio_encoder.cc b/webrtc/api/audio_codecs/audio_encoder.cc index ac5f89f6fe..3ee371f1ce 100644 --- a/webrtc/api/audio_codecs/audio_encoder.cc +++ b/webrtc/api/audio_codecs/audio_encoder.cc @@ -10,8 +10,8 @@ #include "webrtc/api/audio_codecs/audio_encoder.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/trace_event.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/trace_event.h" namespace webrtc { diff --git a/webrtc/api/audio_codecs/audio_encoder.h b/webrtc/api/audio_codecs/audio_encoder.h index 06e232d0ce..bd8c7deb94 100644 --- a/webrtc/api/audio_codecs/audio_encoder.h +++ b/webrtc/api/audio_codecs/audio_encoder.h @@ -16,10 +16,10 @@ #include #include -#include "webrtc/base/array_view.h" -#include "webrtc/base/buffer.h" -#include "webrtc/base/deprecation.h" -#include "webrtc/base/optional.h" +#include "webrtc/rtc_base/array_view.h" +#include "webrtc/rtc_base/buffer.h" +#include "webrtc/rtc_base/deprecation.h" +#include "webrtc/rtc_base/optional.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/api/audio_codecs/audio_encoder_factory.h b/webrtc/api/audio_codecs/audio_encoder_factory.h index 1c8438e41b..820651f177 100644 --- a/webrtc/api/audio_codecs/audio_encoder_factory.h +++ b/webrtc/api/audio_codecs/audio_encoder_factory.h @@ -16,7 +16,7 @@ #include "webrtc/api/audio_codecs/audio_encoder.h" #include "webrtc/api/audio_codecs/audio_format.h" -#include "webrtc/base/refcount.h" +#include "webrtc/rtc_base/refcount.h" namespace webrtc { diff --git a/webrtc/api/audio_codecs/audio_encoder_factory_template.h b/webrtc/api/audio_codecs/audio_encoder_factory_template.h index a5d5c309a8..00bba46f94 100644 --- a/webrtc/api/audio_codecs/audio_encoder_factory_template.h +++ b/webrtc/api/audio_codecs/audio_encoder_factory_template.h @@ -15,7 +15,7 @@ #include #include "webrtc/api/audio_codecs/audio_encoder_factory.h" -#include "webrtc/base/scoped_ref_ptr.h" +#include "webrtc/rtc_base/scoped_ref_ptr.h" namespace webrtc { diff --git a/webrtc/api/audio_codecs/audio_format.h b/webrtc/api/audio_codecs/audio_format.h index e8e5774e75..c442972788 100644 --- a/webrtc/api/audio_codecs/audio_format.h +++ b/webrtc/api/audio_codecs/audio_format.h @@ -16,7 +16,7 @@ #include #include -#include "webrtc/base/optional.h" +#include "webrtc/rtc_base/optional.h" namespace webrtc { diff --git a/webrtc/api/audio_codecs/builtin_audio_decoder_factory.h b/webrtc/api/audio_codecs/builtin_audio_decoder_factory.h index f7452f495c..5b93158b62 100644 --- a/webrtc/api/audio_codecs/builtin_audio_decoder_factory.h +++ b/webrtc/api/audio_codecs/builtin_audio_decoder_factory.h @@ -12,7 +12,7 @@ #define WEBRTC_API_AUDIO_CODECS_BUILTIN_AUDIO_DECODER_FACTORY_H_ #include "webrtc/api/audio_codecs/audio_decoder_factory.h" -#include "webrtc/base/scoped_ref_ptr.h" +#include "webrtc/rtc_base/scoped_ref_ptr.h" namespace webrtc { diff --git a/webrtc/api/audio_codecs/builtin_audio_encoder_factory.h b/webrtc/api/audio_codecs/builtin_audio_encoder_factory.h index bdc62d8d22..1546cfb575 100644 --- a/webrtc/api/audio_codecs/builtin_audio_encoder_factory.h +++ b/webrtc/api/audio_codecs/builtin_audio_encoder_factory.h @@ -12,7 +12,7 @@ #define WEBRTC_API_AUDIO_CODECS_BUILTIN_AUDIO_ENCODER_FACTORY_H_ #include "webrtc/api/audio_codecs/audio_encoder_factory.h" -#include "webrtc/base/scoped_ref_ptr.h" +#include "webrtc/rtc_base/scoped_ref_ptr.h" namespace webrtc { diff --git a/webrtc/api/audio_codecs/g722/audio_decoder_g722.cc b/webrtc/api/audio_codecs/g722/audio_decoder_g722.cc index 346a7f2779..9c4bff71c5 100644 --- a/webrtc/api/audio_codecs/g722/audio_decoder_g722.cc +++ b/webrtc/api/audio_codecs/g722/audio_decoder_g722.cc @@ -13,10 +13,10 @@ #include #include -#include "webrtc/base/ptr_util.h" -#include "webrtc/base/safe_conversions.h" #include "webrtc/common_types.h" #include "webrtc/modules/audio_coding/codecs/g722/audio_decoder_g722.h" +#include "webrtc/rtc_base/ptr_util.h" +#include "webrtc/rtc_base/safe_conversions.h" namespace webrtc { diff --git a/webrtc/api/audio_codecs/g722/audio_decoder_g722.h b/webrtc/api/audio_codecs/g722/audio_decoder_g722.h index ef536628bb..9b063c2bf0 100644 --- a/webrtc/api/audio_codecs/g722/audio_decoder_g722.h +++ b/webrtc/api/audio_codecs/g722/audio_decoder_g722.h @@ -16,7 +16,7 @@ #include "webrtc/api/audio_codecs/audio_decoder.h" #include "webrtc/api/audio_codecs/audio_format.h" -#include "webrtc/base/optional.h" +#include "webrtc/rtc_base/optional.h" namespace webrtc { diff --git a/webrtc/api/audio_codecs/g722/audio_encoder_g722.cc b/webrtc/api/audio_codecs/g722/audio_encoder_g722.cc index 7f82b9c04b..b3e406304d 100644 --- a/webrtc/api/audio_codecs/g722/audio_encoder_g722.cc +++ b/webrtc/api/audio_codecs/g722/audio_encoder_g722.cc @@ -13,9 +13,9 @@ #include #include -#include "webrtc/base/ptr_util.h" -#include "webrtc/base/safe_conversions.h" #include "webrtc/modules/audio_coding/codecs/g722/audio_encoder_g722.h" +#include "webrtc/rtc_base/ptr_util.h" +#include "webrtc/rtc_base/safe_conversions.h" namespace webrtc { diff --git a/webrtc/api/audio_codecs/g722/audio_encoder_g722.h b/webrtc/api/audio_codecs/g722/audio_encoder_g722.h index 369ebadef7..458a6c5a79 100644 --- a/webrtc/api/audio_codecs/g722/audio_encoder_g722.h +++ b/webrtc/api/audio_codecs/g722/audio_encoder_g722.h @@ -17,7 +17,7 @@ #include "webrtc/api/audio_codecs/audio_encoder.h" #include "webrtc/api/audio_codecs/audio_format.h" #include "webrtc/api/audio_codecs/g722/audio_encoder_g722_config.h" -#include "webrtc/base/optional.h" +#include "webrtc/rtc_base/optional.h" namespace webrtc { diff --git a/webrtc/api/audio_codecs/ilbc/audio_decoder_ilbc.cc b/webrtc/api/audio_codecs/ilbc/audio_decoder_ilbc.cc index da290afeaf..b3053ef471 100644 --- a/webrtc/api/audio_codecs/ilbc/audio_decoder_ilbc.cc +++ b/webrtc/api/audio_codecs/ilbc/audio_decoder_ilbc.cc @@ -13,9 +13,9 @@ #include #include -#include "webrtc/base/ptr_util.h" #include "webrtc/common_types.h" #include "webrtc/modules/audio_coding/codecs/ilbc/audio_decoder_ilbc.h" +#include "webrtc/rtc_base/ptr_util.h" namespace webrtc { diff --git a/webrtc/api/audio_codecs/ilbc/audio_decoder_ilbc.h b/webrtc/api/audio_codecs/ilbc/audio_decoder_ilbc.h index 1d58810047..65a67e2311 100644 --- a/webrtc/api/audio_codecs/ilbc/audio_decoder_ilbc.h +++ b/webrtc/api/audio_codecs/ilbc/audio_decoder_ilbc.h @@ -16,7 +16,7 @@ #include "webrtc/api/audio_codecs/audio_decoder.h" #include "webrtc/api/audio_codecs/audio_format.h" -#include "webrtc/base/optional.h" +#include "webrtc/rtc_base/optional.h" namespace webrtc { diff --git a/webrtc/api/audio_codecs/ilbc/audio_encoder_ilbc.cc b/webrtc/api/audio_codecs/ilbc/audio_encoder_ilbc.cc index a4b3a388b0..13a1c2e029 100644 --- a/webrtc/api/audio_codecs/ilbc/audio_encoder_ilbc.cc +++ b/webrtc/api/audio_codecs/ilbc/audio_encoder_ilbc.cc @@ -13,9 +13,9 @@ #include #include -#include "webrtc/base/ptr_util.h" -#include "webrtc/base/safe_conversions.h" #include "webrtc/modules/audio_coding/codecs/ilbc/audio_encoder_ilbc.h" +#include "webrtc/rtc_base/ptr_util.h" +#include "webrtc/rtc_base/safe_conversions.h" namespace webrtc { namespace { diff --git a/webrtc/api/audio_codecs/ilbc/audio_encoder_ilbc.h b/webrtc/api/audio_codecs/ilbc/audio_encoder_ilbc.h index 42010354a3..6f7a9f6c62 100644 --- a/webrtc/api/audio_codecs/ilbc/audio_encoder_ilbc.h +++ b/webrtc/api/audio_codecs/ilbc/audio_encoder_ilbc.h @@ -17,7 +17,7 @@ #include "webrtc/api/audio_codecs/audio_encoder.h" #include "webrtc/api/audio_codecs/audio_format.h" #include "webrtc/api/audio_codecs/ilbc/audio_encoder_ilbc_config.h" -#include "webrtc/base/optional.h" +#include "webrtc/rtc_base/optional.h" namespace webrtc { diff --git a/webrtc/api/audio_codecs/opus/audio_decoder_opus.cc b/webrtc/api/audio_codecs/opus/audio_decoder_opus.cc index 98f4c0ed27..7f478febd1 100644 --- a/webrtc/api/audio_codecs/opus/audio_decoder_opus.cc +++ b/webrtc/api/audio_codecs/opus/audio_decoder_opus.cc @@ -14,9 +14,9 @@ #include #include -#include "webrtc/base/ptr_util.h" #include "webrtc/common_types.h" #include "webrtc/modules/audio_coding/codecs/opus/audio_decoder_opus.h" +#include "webrtc/rtc_base/ptr_util.h" namespace webrtc { diff --git a/webrtc/api/audio_codecs/opus/audio_decoder_opus.h b/webrtc/api/audio_codecs/opus/audio_decoder_opus.h index c2868bd935..6a9d6da57a 100644 --- a/webrtc/api/audio_codecs/opus/audio_decoder_opus.h +++ b/webrtc/api/audio_codecs/opus/audio_decoder_opus.h @@ -16,7 +16,7 @@ #include "webrtc/api/audio_codecs/audio_decoder.h" #include "webrtc/api/audio_codecs/audio_format.h" -#include "webrtc/base/optional.h" +#include "webrtc/rtc_base/optional.h" namespace webrtc { diff --git a/webrtc/api/audio_codecs/opus/audio_encoder_opus_config.h b/webrtc/api/audio_codecs/opus/audio_encoder_opus_config.h index bd25b540a9..c3fe17b39c 100644 --- a/webrtc/api/audio_codecs/opus/audio_encoder_opus_config.h +++ b/webrtc/api/audio_codecs/opus/audio_encoder_opus_config.h @@ -15,7 +15,7 @@ #include -#include "webrtc/base/optional.h" +#include "webrtc/rtc_base/optional.h" namespace webrtc { diff --git a/webrtc/api/audio_codecs/test/audio_decoder_factory_template_unittest.cc b/webrtc/api/audio_codecs/test/audio_decoder_factory_template_unittest.cc index 04eef27fc8..9b2747cd61 100644 --- a/webrtc/api/audio_codecs/test/audio_decoder_factory_template_unittest.cc +++ b/webrtc/api/audio_codecs/test/audio_decoder_factory_template_unittest.cc @@ -12,7 +12,7 @@ #include "webrtc/api/audio_codecs/g722/audio_decoder_g722.h" #include "webrtc/api/audio_codecs/ilbc/audio_decoder_ilbc.h" #include "webrtc/api/audio_codecs/opus/audio_decoder_opus.h" -#include "webrtc/base/ptr_util.h" +#include "webrtc/rtc_base/ptr_util.h" #include "webrtc/test/gmock.h" #include "webrtc/test/gtest.h" #include "webrtc/test/mock_audio_decoder.h" diff --git a/webrtc/api/audio_codecs/test/audio_encoder_factory_template_unittest.cc b/webrtc/api/audio_codecs/test/audio_encoder_factory_template_unittest.cc index d08e7aa43d..db477fd00c 100644 --- a/webrtc/api/audio_codecs/test/audio_encoder_factory_template_unittest.cc +++ b/webrtc/api/audio_codecs/test/audio_encoder_factory_template_unittest.cc @@ -12,7 +12,7 @@ #include "webrtc/api/audio_codecs/g722/audio_encoder_g722.h" #include "webrtc/api/audio_codecs/ilbc/audio_encoder_ilbc.h" #include "webrtc/api/audio_codecs/opus/audio_encoder_opus.h" -#include "webrtc/base/ptr_util.h" +#include "webrtc/rtc_base/ptr_util.h" #include "webrtc/test/gmock.h" #include "webrtc/test/gtest.h" #include "webrtc/test/mock_audio_encoder.h" diff --git a/webrtc/api/datachannelinterface.h b/webrtc/api/datachannelinterface.h index 92bdee2c0d..1395a2e855 100644 --- a/webrtc/api/datachannelinterface.h +++ b/webrtc/api/datachannelinterface.h @@ -16,11 +16,10 @@ #include -#include "webrtc/base/basictypes.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/copyonwritebuffer.h" -#include "webrtc/base/refcount.h" - +#include "webrtc/rtc_base/basictypes.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/copyonwritebuffer.h" +#include "webrtc/rtc_base/refcount.h" namespace webrtc { diff --git a/webrtc/api/dtmfsenderinterface.h b/webrtc/api/dtmfsenderinterface.h index a1ef3ecec6..68a08ffc92 100644 --- a/webrtc/api/dtmfsenderinterface.h +++ b/webrtc/api/dtmfsenderinterface.h @@ -14,7 +14,7 @@ #include #include "webrtc/api/mediastreaminterface.h" -#include "webrtc/base/refcount.h" +#include "webrtc/rtc_base/refcount.h" namespace webrtc { diff --git a/webrtc/api/fakemetricsobserver.cc b/webrtc/api/fakemetricsobserver.cc index 1b6265d7d5..d804f0dfb9 100644 --- a/webrtc/api/fakemetricsobserver.cc +++ b/webrtc/api/fakemetricsobserver.cc @@ -9,7 +9,7 @@ */ #include "webrtc/api/fakemetricsobserver.h" -#include "webrtc/base/checks.h" +#include "webrtc/rtc_base/checks.h" namespace webrtc { diff --git a/webrtc/api/fakemetricsobserver.h b/webrtc/api/fakemetricsobserver.h index 90046c91bf..760801238c 100644 --- a/webrtc/api/fakemetricsobserver.h +++ b/webrtc/api/fakemetricsobserver.h @@ -16,7 +16,7 @@ #include #include "webrtc/api/peerconnectioninterface.h" -#include "webrtc/base/thread_checker.h" +#include "webrtc/rtc_base/thread_checker.h" namespace webrtc { diff --git a/webrtc/api/jsep.h b/webrtc/api/jsep.h index aa6e9a1354..cfb604d92e 100644 --- a/webrtc/api/jsep.h +++ b/webrtc/api/jsep.h @@ -25,7 +25,7 @@ #include #include -#include "webrtc/base/refcount.h" +#include "webrtc/rtc_base/refcount.h" namespace cricket { class Candidate; diff --git a/webrtc/api/jsepicecandidate.h b/webrtc/api/jsepicecandidate.h index 3566013e75..0b349917b7 100644 --- a/webrtc/api/jsepicecandidate.h +++ b/webrtc/api/jsepicecandidate.h @@ -19,8 +19,8 @@ #include #include "webrtc/api/jsep.h" -#include "webrtc/base/constructormagic.h" #include "webrtc/p2p/base/candidate.h" +#include "webrtc/rtc_base/constructormagic.h" namespace webrtc { diff --git a/webrtc/api/jsepsessiondescription.h b/webrtc/api/jsepsessiondescription.h index e4855b9ac6..cb234b09ca 100644 --- a/webrtc/api/jsepsessiondescription.h +++ b/webrtc/api/jsepsessiondescription.h @@ -20,8 +20,8 @@ #include "webrtc/api/jsep.h" #include "webrtc/api/jsepicecandidate.h" -#include "webrtc/base/constructormagic.h" #include "webrtc/p2p/base/candidate.h" +#include "webrtc/rtc_base/constructormagic.h" namespace cricket { class SessionDescription; diff --git a/webrtc/api/mediaconstraintsinterface.cc b/webrtc/api/mediaconstraintsinterface.cc index f393a2e886..15deebf2a3 100644 --- a/webrtc/api/mediaconstraintsinterface.cc +++ b/webrtc/api/mediaconstraintsinterface.cc @@ -11,7 +11,7 @@ #include "webrtc/api/mediaconstraintsinterface.h" #include "webrtc/api/peerconnectioninterface.h" -#include "webrtc/base/stringencode.h" +#include "webrtc/rtc_base/stringencode.h" namespace { diff --git a/webrtc/api/mediaconstraintsinterface.h b/webrtc/api/mediaconstraintsinterface.h index 8dafea405e..72fdd97866 100644 --- a/webrtc/api/mediaconstraintsinterface.h +++ b/webrtc/api/mediaconstraintsinterface.h @@ -23,8 +23,8 @@ #include #include -#include "webrtc/base/optional.h" #include "webrtc/api/peerconnectioninterface.h" +#include "webrtc/rtc_base/optional.h" namespace webrtc { diff --git a/webrtc/api/mediastreaminterface.h b/webrtc/api/mediastreaminterface.h index 937bb67ae9..cc660e1be2 100644 --- a/webrtc/api/mediastreaminterface.h +++ b/webrtc/api/mediastreaminterface.h @@ -23,18 +23,18 @@ #include #include "webrtc/api/video/video_frame.h" -#include "webrtc/base/optional.h" +#include "webrtc/rtc_base/optional.h" // TODO(zhihuang): Remove unrelated headers once downstream applications stop // relying on them; they were previously transitively included by // mediachannel.h, which is no longer a dependency of this file. -#include "webrtc/base/ratetracker.h" -#include "webrtc/base/refcount.h" -#include "webrtc/base/scoped_ref_ptr.h" -#include "webrtc/base/thread.h" -#include "webrtc/base/timeutils.h" #include "webrtc/media/base/streamparams.h" #include "webrtc/media/base/videosinkinterface.h" #include "webrtc/media/base/videosourceinterface.h" +#include "webrtc/rtc_base/ratetracker.h" +#include "webrtc/rtc_base/refcount.h" +#include "webrtc/rtc_base/scoped_ref_ptr.h" +#include "webrtc/rtc_base/thread.h" +#include "webrtc/rtc_base/timeutils.h" namespace webrtc { diff --git a/webrtc/api/mediatypes.cc b/webrtc/api/mediatypes.cc index 2e3538dad8..108b69795f 100644 --- a/webrtc/api/mediatypes.cc +++ b/webrtc/api/mediatypes.cc @@ -11,7 +11,7 @@ #include "webrtc/api/mediatypes.h" #include "webrtc/api/mediastreaminterface.h" -#include "webrtc/base/checks.h" +#include "webrtc/rtc_base/checks.h" namespace { static const char* kMediaTypeData = "data"; diff --git a/webrtc/api/notifier.h b/webrtc/api/notifier.h index d88305155d..e142d14576 100644 --- a/webrtc/api/notifier.h +++ b/webrtc/api/notifier.h @@ -14,7 +14,7 @@ #include #include "webrtc/api/mediastreaminterface.h" -#include "webrtc/base/checks.h" +#include "webrtc/rtc_base/checks.h" namespace webrtc { diff --git a/webrtc/api/ortc/mediadescription.h b/webrtc/api/ortc/mediadescription.h index 39b67bd1b4..efee6629a1 100644 --- a/webrtc/api/ortc/mediadescription.h +++ b/webrtc/api/ortc/mediadescription.h @@ -15,8 +15,8 @@ #include #include -#include "webrtc/base/optional.h" #include "webrtc/media/base/cryptoparams.h" +#include "webrtc/rtc_base/optional.h" namespace webrtc { diff --git a/webrtc/api/ortc/ortcfactoryinterface.h b/webrtc/api/ortc/ortcfactoryinterface.h index 62ed90d067..4f0a9beb13 100644 --- a/webrtc/api/ortc/ortcfactoryinterface.h +++ b/webrtc/api/ortc/ortcfactoryinterface.h @@ -27,10 +27,10 @@ #include "webrtc/api/ortc/udptransportinterface.h" #include "webrtc/api/rtcerror.h" #include "webrtc/api/rtpparameters.h" -#include "webrtc/base/network.h" -#include "webrtc/base/scoped_ref_ptr.h" -#include "webrtc/base/thread.h" #include "webrtc/p2p/base/packetsocketfactory.h" +#include "webrtc/rtc_base/network.h" +#include "webrtc/rtc_base/scoped_ref_ptr.h" +#include "webrtc/rtc_base/thread.h" namespace webrtc { diff --git a/webrtc/api/ortc/rtptransportinterface.h b/webrtc/api/ortc/rtptransportinterface.h index 942dc506f0..119d662edd 100644 --- a/webrtc/api/ortc/rtptransportinterface.h +++ b/webrtc/api/ortc/rtptransportinterface.h @@ -15,7 +15,7 @@ #include "webrtc/api/ortc/packettransportinterface.h" #include "webrtc/api/rtcerror.h" -#include "webrtc/base/optional.h" +#include "webrtc/rtc_base/optional.h" namespace webrtc { diff --git a/webrtc/api/ortc/udptransportinterface.h b/webrtc/api/ortc/udptransportinterface.h index 9d6866ff62..cdcd3213e2 100644 --- a/webrtc/api/ortc/udptransportinterface.h +++ b/webrtc/api/ortc/udptransportinterface.h @@ -13,7 +13,7 @@ #include "webrtc/api/ortc/packettransportinterface.h" #include "webrtc/api/proxy.h" -#include "webrtc/base/socketaddress.h" +#include "webrtc/rtc_base/socketaddress.h" namespace webrtc { diff --git a/webrtc/api/peerconnectionfactoryproxy.h b/webrtc/api/peerconnectionfactoryproxy.h index dd784f5025..52f510919d 100644 --- a/webrtc/api/peerconnectionfactoryproxy.h +++ b/webrtc/api/peerconnectionfactoryproxy.h @@ -17,7 +17,7 @@ #include "webrtc/api/peerconnectioninterface.h" #include "webrtc/api/proxy.h" -#include "webrtc/base/bind.h" +#include "webrtc/rtc_base/bind.h" namespace webrtc { diff --git a/webrtc/api/peerconnectioninterface.h b/webrtc/api/peerconnectioninterface.h index 609fd4aa93..d6cabf4595 100644 --- a/webrtc/api/peerconnectioninterface.h +++ b/webrtc/api/peerconnectioninterface.h @@ -84,17 +84,17 @@ #include "webrtc/api/stats/rtcstatscollectorcallback.h" #include "webrtc/api/statstypes.h" #include "webrtc/api/umametrics.h" -#include "webrtc/base/fileutils.h" -#include "webrtc/base/network.h" -#include "webrtc/base/rtccertificate.h" -#include "webrtc/base/rtccertificategenerator.h" -#include "webrtc/base/socketaddress.h" -#include "webrtc/base/sslstreamadapter.h" #include "webrtc/call/callfactoryinterface.h" #include "webrtc/logging/rtc_event_log/rtc_event_log_factory_interface.h" #include "webrtc/media/base/mediachannel.h" #include "webrtc/media/base/videocapturer.h" #include "webrtc/p2p/base/portallocator.h" +#include "webrtc/rtc_base/fileutils.h" +#include "webrtc/rtc_base/network.h" +#include "webrtc/rtc_base/rtccertificate.h" +#include "webrtc/rtc_base/rtccertificategenerator.h" +#include "webrtc/rtc_base/socketaddress.h" +#include "webrtc/rtc_base/sslstreamadapter.h" namespace rtc { class SSLIdentity; diff --git a/webrtc/api/proxy.h b/webrtc/api/proxy.h index 862de87655..03b6ff741e 100644 --- a/webrtc/api/proxy.h +++ b/webrtc/api/proxy.h @@ -55,8 +55,8 @@ #include #include -#include "webrtc/base/event.h" -#include "webrtc/base/thread.h" +#include "webrtc/rtc_base/event.h" +#include "webrtc/rtc_base/thread.h" namespace webrtc { diff --git a/webrtc/api/rtcerror.cc b/webrtc/api/rtcerror.cc index 15a3f29191..f956484658 100644 --- a/webrtc/api/rtcerror.cc +++ b/webrtc/api/rtcerror.cc @@ -10,7 +10,7 @@ #include "webrtc/api/rtcerror.h" -#include "webrtc/base/arraysize.h" +#include "webrtc/rtc_base/arraysize.h" namespace { diff --git a/webrtc/api/rtcerror.h b/webrtc/api/rtcerror.h index 5cb123227d..7451fef962 100644 --- a/webrtc/api/rtcerror.h +++ b/webrtc/api/rtcerror.h @@ -15,8 +15,8 @@ #include #include // For std::move. -#include "webrtc/base/checks.h" -#include "webrtc/base/logging.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/logging.h" namespace webrtc { diff --git a/webrtc/api/rtpparameters.h b/webrtc/api/rtpparameters.h index a428804d54..94d9d73039 100644 --- a/webrtc/api/rtpparameters.h +++ b/webrtc/api/rtpparameters.h @@ -16,8 +16,8 @@ #include #include "webrtc/api/mediatypes.h" -#include "webrtc/base/optional.h" #include "webrtc/config.h" +#include "webrtc/rtc_base/optional.h" namespace webrtc { diff --git a/webrtc/api/rtpreceiverinterface.h b/webrtc/api/rtpreceiverinterface.h index 66958ff6bd..ce4abeb511 100644 --- a/webrtc/api/rtpreceiverinterface.h +++ b/webrtc/api/rtpreceiverinterface.h @@ -17,12 +17,12 @@ #include #include -#include "webrtc/api/mediatypes.h" #include "webrtc/api/mediastreaminterface.h" +#include "webrtc/api/mediatypes.h" #include "webrtc/api/proxy.h" #include "webrtc/api/rtpparameters.h" -#include "webrtc/base/refcount.h" -#include "webrtc/base/scoped_ref_ptr.h" +#include "webrtc/rtc_base/refcount.h" +#include "webrtc/rtc_base/scoped_ref_ptr.h" namespace webrtc { diff --git a/webrtc/api/rtpsenderinterface.h b/webrtc/api/rtpsenderinterface.h index f2b676601c..b2d59c4824 100644 --- a/webrtc/api/rtpsenderinterface.h +++ b/webrtc/api/rtpsenderinterface.h @@ -18,12 +18,12 @@ #include #include "webrtc/api/dtmfsenderinterface.h" -#include "webrtc/api/mediatypes.h" #include "webrtc/api/mediastreaminterface.h" +#include "webrtc/api/mediatypes.h" #include "webrtc/api/proxy.h" #include "webrtc/api/rtpparameters.h" -#include "webrtc/base/refcount.h" -#include "webrtc/base/scoped_ref_ptr.h" +#include "webrtc/rtc_base/refcount.h" +#include "webrtc/rtc_base/scoped_ref_ptr.h" namespace webrtc { diff --git a/webrtc/api/stats/rtcstats.h b/webrtc/api/stats/rtcstats.h index b3afee0695..6730672012 100644 --- a/webrtc/api/stats/rtcstats.h +++ b/webrtc/api/stats/rtcstats.h @@ -17,7 +17,7 @@ #include #include -#include "webrtc/base/checks.h" +#include "webrtc/rtc_base/checks.h" namespace webrtc { diff --git a/webrtc/api/stats/rtcstatscollectorcallback.h b/webrtc/api/stats/rtcstatscollectorcallback.h index 2493e49ce2..90e6085876 100644 --- a/webrtc/api/stats/rtcstatscollectorcallback.h +++ b/webrtc/api/stats/rtcstatscollectorcallback.h @@ -12,8 +12,8 @@ #define WEBRTC_API_STATS_RTCSTATSCOLLECTORCALLBACK_H_ #include "webrtc/api/stats/rtcstatsreport.h" -#include "webrtc/base/refcount.h" -#include "webrtc/base/scoped_ref_ptr.h" +#include "webrtc/rtc_base/refcount.h" +#include "webrtc/rtc_base/scoped_ref_ptr.h" namespace webrtc { diff --git a/webrtc/api/stats/rtcstatsreport.h b/webrtc/api/stats/rtcstatsreport.h index 6d9ae6df2a..0ad7396121 100644 --- a/webrtc/api/stats/rtcstatsreport.h +++ b/webrtc/api/stats/rtcstatsreport.h @@ -17,8 +17,8 @@ #include #include "webrtc/api/stats/rtcstats.h" -#include "webrtc/base/refcount.h" -#include "webrtc/base/scoped_ref_ptr.h" +#include "webrtc/rtc_base/refcount.h" +#include "webrtc/rtc_base/scoped_ref_ptr.h" namespace webrtc { diff --git a/webrtc/api/statstypes.cc b/webrtc/api/statstypes.cc index f6f26899e9..3a4e7e7b97 100644 --- a/webrtc/api/statstypes.cc +++ b/webrtc/api/statstypes.cc @@ -12,7 +12,7 @@ #include -#include "webrtc/base/checks.h" +#include "webrtc/rtc_base/checks.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/webrtc/api/statstypes.h b/webrtc/api/statstypes.h index 6fe6f37a6a..30102676c4 100644 --- a/webrtc/api/statstypes.h +++ b/webrtc/api/statstypes.h @@ -20,12 +20,12 @@ #include #include -#include "webrtc/base/basictypes.h" -#include "webrtc/base/constructormagic.h" -#include "webrtc/base/refcount.h" -#include "webrtc/base/scoped_ref_ptr.h" -#include "webrtc/base/stringencode.h" -#include "webrtc/base/thread_checker.h" +#include "webrtc/rtc_base/basictypes.h" +#include "webrtc/rtc_base/constructormagic.h" +#include "webrtc/rtc_base/refcount.h" +#include "webrtc/rtc_base/scoped_ref_ptr.h" +#include "webrtc/rtc_base/stringencode.h" +#include "webrtc/rtc_base/thread_checker.h" namespace webrtc { diff --git a/webrtc/api/test/fakeconstraints.h b/webrtc/api/test/fakeconstraints.h index 82c6728c5d..d7b70118bb 100644 --- a/webrtc/api/test/fakeconstraints.h +++ b/webrtc/api/test/fakeconstraints.h @@ -15,7 +15,7 @@ #include #include "webrtc/api/mediaconstraintsinterface.h" -#include "webrtc/base/stringencode.h" +#include "webrtc/rtc_base/stringencode.h" namespace webrtc { diff --git a/webrtc/api/umametrics.h b/webrtc/api/umametrics.h index 89994476a9..81238c9fea 100644 --- a/webrtc/api/umametrics.h +++ b/webrtc/api/umametrics.h @@ -13,7 +13,7 @@ #ifndef WEBRTC_API_UMAMETRICS_H_ #define WEBRTC_API_UMAMETRICS_H_ -#include "webrtc/base/refcount.h" +#include "webrtc/rtc_base/refcount.h" namespace webrtc { diff --git a/webrtc/api/video/i420_buffer.cc b/webrtc/api/video/i420_buffer.cc index 495009cc31..56b8ecc809 100644 --- a/webrtc/api/video/i420_buffer.cc +++ b/webrtc/api/video/i420_buffer.cc @@ -14,11 +14,11 @@ #include #include -#include "webrtc/base/checks.h" -#include "webrtc/base/keep_ref_until_done.h" #include "libyuv/convert.h" #include "libyuv/planar_functions.h" #include "libyuv/scale.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/keep_ref_until_done.h" // Aligning pointer to 64 bytes for improved performance, e.g. use SIMD. static const int kBufferAlignment = 64; diff --git a/webrtc/api/video/video_frame.cc b/webrtc/api/video/video_frame.cc index b2647461c7..fa3ad3dd88 100644 --- a/webrtc/api/video/video_frame.cc +++ b/webrtc/api/video/video_frame.cc @@ -10,8 +10,8 @@ #include "webrtc/api/video/video_frame.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/timeutils.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/timeutils.h" namespace webrtc { diff --git a/webrtc/api/video/video_frame_buffer.cc b/webrtc/api/video/video_frame_buffer.cc index 057064d555..d771e6ac42 100644 --- a/webrtc/api/video/video_frame_buffer.cc +++ b/webrtc/api/video/video_frame_buffer.cc @@ -12,7 +12,7 @@ #include "libyuv/convert.h" #include "webrtc/api/video/i420_buffer.h" -#include "webrtc/base/checks.h" +#include "webrtc/rtc_base/checks.h" namespace webrtc { diff --git a/webrtc/api/video/video_frame_buffer.h b/webrtc/api/video/video_frame_buffer.h index d8f3e5a2c7..a2ace6e06a 100644 --- a/webrtc/api/video/video_frame_buffer.h +++ b/webrtc/api/video/video_frame_buffer.h @@ -13,8 +13,8 @@ #include -#include "webrtc/base/refcount.h" -#include "webrtc/base/scoped_ref_ptr.h" +#include "webrtc/rtc_base/refcount.h" +#include "webrtc/rtc_base/scoped_ref_ptr.h" namespace webrtc { diff --git a/webrtc/api/video/video_timing.h b/webrtc/api/video/video_timing.h index 05414de34a..44991dfbeb 100644 --- a/webrtc/api/video/video_timing.h +++ b/webrtc/api/video/video_timing.h @@ -15,8 +15,8 @@ #include -#include "webrtc/base/checks.h" -#include "webrtc/base/safe_conversions.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/safe_conversions.h" namespace webrtc { diff --git a/webrtc/api/video_codecs/video_encoder.h b/webrtc/api/video_codecs/video_encoder.h index d0003ccffb..2e39276345 100644 --- a/webrtc/api/video_codecs/video_encoder.h +++ b/webrtc/api/video_codecs/video_encoder.h @@ -16,11 +16,11 @@ #include #include "webrtc/api/video/video_frame.h" -#include "webrtc/base/checks.h" #include "webrtc/common_types.h" #include "webrtc/common_video/include/video_frame.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/optional.h" #include "webrtc/typedefs.h" -#include "webrtc/base/optional.h" namespace webrtc { diff --git a/webrtc/audio/audio_receive_stream.cc b/webrtc/audio/audio_receive_stream.cc index 079e971786..6dedca5f63 100644 --- a/webrtc/audio/audio_receive_stream.cc +++ b/webrtc/audio/audio_receive_stream.cc @@ -17,13 +17,13 @@ #include "webrtc/audio/audio_send_stream.h" #include "webrtc/audio/audio_state.h" #include "webrtc/audio/conversion.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/timeutils.h" #include "webrtc/call/rtp_stream_receiver_controller_interface.h" #include "webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h" #include "webrtc/modules/rtp_rtcp/include/rtp_receiver.h" #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/timeutils.h" #include "webrtc/voice_engine/channel_proxy.h" #include "webrtc/voice_engine/include/voe_base.h" #include "webrtc/voice_engine/voice_engine_impl.h" diff --git a/webrtc/audio/audio_receive_stream.h b/webrtc/audio/audio_receive_stream.h index 92c4763b51..dc7992f400 100644 --- a/webrtc/audio/audio_receive_stream.h +++ b/webrtc/audio/audio_receive_stream.h @@ -16,11 +16,11 @@ #include "webrtc/api/audio/audio_mixer.h" #include "webrtc/audio/audio_state.h" -#include "webrtc/base/constructormagic.h" -#include "webrtc/base/thread_checker.h" #include "webrtc/call/audio_receive_stream.h" #include "webrtc/call/rtp_packet_sink_interface.h" #include "webrtc/call/syncable.h" +#include "webrtc/rtc_base/constructormagic.h" +#include "webrtc/rtc_base/thread_checker.h" namespace webrtc { class PacketRouter; diff --git a/webrtc/audio/audio_send_stream.cc b/webrtc/audio/audio_send_stream.cc index 36ad63d32e..1861cc004f 100644 --- a/webrtc/audio/audio_send_stream.cc +++ b/webrtc/audio/audio_send_stream.cc @@ -17,17 +17,17 @@ #include "webrtc/audio/audio_state.h" #include "webrtc/audio/conversion.h" #include "webrtc/audio/scoped_voe_interface.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/event.h" -#include "webrtc/base/function_view.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/task_queue.h" -#include "webrtc/base/timeutils.h" #include "webrtc/call/rtp_transport_controller_send_interface.h" #include "webrtc/modules/audio_coding/codecs/cng/audio_encoder_cng.h" #include "webrtc/modules/bitrate_controller/include/bitrate_controller.h" #include "webrtc/modules/congestion_controller/include/send_side_congestion_controller.h" #include "webrtc/modules/pacing/paced_sender.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/event.h" +#include "webrtc/rtc_base/function_view.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/task_queue.h" +#include "webrtc/rtc_base/timeutils.h" #include "webrtc/voice_engine/channel_proxy.h" #include "webrtc/voice_engine/include/voe_base.h" #include "webrtc/voice_engine/transmit_mixer.h" diff --git a/webrtc/audio/audio_send_stream.h b/webrtc/audio/audio_send_stream.h index 881c68ed4d..70cf1c874d 100644 --- a/webrtc/audio/audio_send_stream.h +++ b/webrtc/audio/audio_send_stream.h @@ -14,12 +14,12 @@ #include #include -#include "webrtc/base/constructormagic.h" -#include "webrtc/base/thread_checker.h" #include "webrtc/call/audio_send_stream.h" #include "webrtc/call/audio_state.h" #include "webrtc/call/bitrate_allocator.h" #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp.h" +#include "webrtc/rtc_base/constructormagic.h" +#include "webrtc/rtc_base/thread_checker.h" #include "webrtc/voice_engine/transport_feedback_packet_loss_tracker.h" namespace webrtc { diff --git a/webrtc/audio/audio_send_stream_unittest.cc b/webrtc/audio/audio_send_stream_unittest.cc index b685cfbf01..b906443106 100644 --- a/webrtc/audio/audio_send_stream_unittest.cc +++ b/webrtc/audio/audio_send_stream_unittest.cc @@ -15,8 +15,6 @@ #include "webrtc/audio/audio_send_stream.h" #include "webrtc/audio/audio_state.h" #include "webrtc/audio/conversion.h" -#include "webrtc/base/ptr_util.h" -#include "webrtc/base/task_queue.h" #include "webrtc/call/fake_rtp_transport_controller_send.h" #include "webrtc/call/rtp_transport_controller_send_interface.h" #include "webrtc/logging/rtc_event_log/mock/mock_rtc_event_log.h" @@ -27,6 +25,8 @@ #include "webrtc/modules/pacing/paced_sender.h" #include "webrtc/modules/rtp_rtcp/mocks/mock_rtcp_rtt_stats.h" #include "webrtc/modules/rtp_rtcp/mocks/mock_rtp_rtcp.h" +#include "webrtc/rtc_base/ptr_util.h" +#include "webrtc/rtc_base/task_queue.h" #include "webrtc/test/gtest.h" #include "webrtc/test/mock_audio_encoder.h" #include "webrtc/test/mock_audio_encoder_factory.h" diff --git a/webrtc/audio/audio_state.cc b/webrtc/audio/audio_state.cc index 961e772a9d..90147ca606 100644 --- a/webrtc/audio/audio_state.cc +++ b/webrtc/audio/audio_state.cc @@ -10,10 +10,10 @@ #include "webrtc/audio/audio_state.h" -#include "webrtc/base/atomicops.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/logging.h" #include "webrtc/modules/audio_device/include/audio_device.h" +#include "webrtc/rtc_base/atomicops.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/logging.h" #include "webrtc/voice_engine/include/voe_errors.h" namespace webrtc { diff --git a/webrtc/audio/audio_state.h b/webrtc/audio/audio_state.h index 8a98d5739e..90bbadb029 100644 --- a/webrtc/audio/audio_state.h +++ b/webrtc/audio/audio_state.h @@ -13,10 +13,10 @@ #include "webrtc/audio/audio_transport_proxy.h" #include "webrtc/audio/scoped_voe_interface.h" -#include "webrtc/base/constructormagic.h" -#include "webrtc/base/criticalsection.h" -#include "webrtc/base/thread_checker.h" #include "webrtc/call/audio_state.h" +#include "webrtc/rtc_base/constructormagic.h" +#include "webrtc/rtc_base/criticalsection.h" +#include "webrtc/rtc_base/thread_checker.h" #include "webrtc/voice_engine/include/voe_base.h" namespace webrtc { diff --git a/webrtc/audio/audio_transport_proxy.h b/webrtc/audio/audio_transport_proxy.h index fda9339171..7d2dea1f94 100644 --- a/webrtc/audio/audio_transport_proxy.h +++ b/webrtc/audio/audio_transport_proxy.h @@ -12,11 +12,11 @@ #define WEBRTC_AUDIO_AUDIO_TRANSPORT_PROXY_H_ #include "webrtc/api/audio/audio_mixer.h" -#include "webrtc/base/constructormagic.h" -#include "webrtc/base/scoped_ref_ptr.h" #include "webrtc/common_audio/resampler/include/push_resampler.h" #include "webrtc/modules/audio_device/include/audio_device_defines.h" #include "webrtc/modules/audio_processing/include/audio_processing.h" +#include "webrtc/rtc_base/constructormagic.h" +#include "webrtc/rtc_base/scoped_ref_ptr.h" namespace webrtc { diff --git a/webrtc/audio/scoped_voe_interface.h b/webrtc/audio/scoped_voe_interface.h index 1029337228..59631bfd16 100644 --- a/webrtc/audio/scoped_voe_interface.h +++ b/webrtc/audio/scoped_voe_interface.h @@ -11,7 +11,7 @@ #ifndef WEBRTC_AUDIO_SCOPED_VOE_INTERFACE_H_ #define WEBRTC_AUDIO_SCOPED_VOE_INTERFACE_H_ -#include "webrtc/base/checks.h" +#include "webrtc/rtc_base/checks.h" namespace webrtc { diff --git a/webrtc/audio/utility/audio_frame_operations.cc b/webrtc/audio/utility/audio_frame_operations.cc index beb3e4cc93..1299e04028 100644 --- a/webrtc/audio/utility/audio_frame_operations.cc +++ b/webrtc/audio/utility/audio_frame_operations.cc @@ -12,9 +12,9 @@ #include -#include "webrtc/base/checks.h" -#include "webrtc/base/safe_conversions.h" #include "webrtc/modules/include/module_common_types.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/safe_conversions.h" namespace webrtc { namespace { diff --git a/webrtc/audio/utility/audio_frame_operations_unittest.cc b/webrtc/audio/utility/audio_frame_operations_unittest.cc index e3e9804c6c..deab9bd97b 100644 --- a/webrtc/audio/utility/audio_frame_operations_unittest.cc +++ b/webrtc/audio/utility/audio_frame_operations_unittest.cc @@ -9,8 +9,8 @@ */ #include "webrtc/audio/utility/audio_frame_operations.h" -#include "webrtc/base/checks.h" #include "webrtc/modules/include/module_common_types.h" +#include "webrtc/rtc_base/checks.h" #include "webrtc/test/gtest.h" namespace webrtc { diff --git a/webrtc/call/audio_receive_stream.h b/webrtc/call/audio_receive_stream.h index e3bdd45247..5837b2ef62 100644 --- a/webrtc/call/audio_receive_stream.h +++ b/webrtc/call/audio_receive_stream.h @@ -19,10 +19,10 @@ #include "webrtc/api/audio_codecs/audio_decoder_factory.h" #include "webrtc/api/call/transport.h" #include "webrtc/api/rtpreceiverinterface.h" -#include "webrtc/base/optional.h" -#include "webrtc/base/scoped_ref_ptr.h" #include "webrtc/common_types.h" #include "webrtc/config.h" +#include "webrtc/rtc_base/optional.h" +#include "webrtc/rtc_base/scoped_ref_ptr.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/call/audio_send_stream.h b/webrtc/call/audio_send_stream.h index 6c7e707d93..e0fe47db6d 100644 --- a/webrtc/call/audio_send_stream.h +++ b/webrtc/call/audio_send_stream.h @@ -18,8 +18,8 @@ #include "webrtc/api/audio_codecs/audio_encoder_factory.h" #include "webrtc/api/audio_codecs/audio_format.h" #include "webrtc/api/call/transport.h" -#include "webrtc/base/optional.h" #include "webrtc/config.h" +#include "webrtc/rtc_base/optional.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/call/audio_state.h b/webrtc/call/audio_state.h index 32b7ada3f8..826b31d12a 100644 --- a/webrtc/call/audio_state.h +++ b/webrtc/call/audio_state.h @@ -11,8 +11,8 @@ #define WEBRTC_CALL_AUDIO_STATE_H_ #include "webrtc/api/audio/audio_mixer.h" -#include "webrtc/base/refcount.h" -#include "webrtc/base/scoped_ref_ptr.h" +#include "webrtc/rtc_base/refcount.h" +#include "webrtc/rtc_base/scoped_ref_ptr.h" namespace webrtc { diff --git a/webrtc/call/bitrate_allocator.cc b/webrtc/call/bitrate_allocator.cc index 9aecc6e3e8..1e22c00a97 100644 --- a/webrtc/call/bitrate_allocator.cc +++ b/webrtc/call/bitrate_allocator.cc @@ -14,9 +14,9 @@ #include #include -#include "webrtc/base/checks.h" -#include "webrtc/base/logging.h" #include "webrtc/modules/bitrate_controller/include/bitrate_controller.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/logging.h" #include "webrtc/system_wrappers/include/clock.h" #include "webrtc/system_wrappers/include/metrics.h" diff --git a/webrtc/call/bitrate_allocator.h b/webrtc/call/bitrate_allocator.h index e92eac90e6..b36d38e652 100644 --- a/webrtc/call/bitrate_allocator.h +++ b/webrtc/call/bitrate_allocator.h @@ -17,7 +17,7 @@ #include #include -#include "webrtc/base/sequenced_task_checker.h" +#include "webrtc/rtc_base/sequenced_task_checker.h" namespace webrtc { diff --git a/webrtc/call/bitrate_estimator_tests.cc b/webrtc/call/bitrate_estimator_tests.cc index ef7aba83e3..de12ef7618 100644 --- a/webrtc/call/bitrate_estimator_tests.cc +++ b/webrtc/call/bitrate_estimator_tests.cc @@ -12,11 +12,11 @@ #include #include -#include "webrtc/base/checks.h" -#include "webrtc/base/event.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/thread_annotations.h" #include "webrtc/call/call.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/event.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/thread_annotations.h" #include "webrtc/test/call_test.h" #include "webrtc/test/direct_transport.h" #include "webrtc/test/encoder_settings.h" diff --git a/webrtc/call/call.cc b/webrtc/call/call.cc index 1caf0d2376..41f53feee7 100644 --- a/webrtc/call/call.cc +++ b/webrtc/call/call.cc @@ -20,17 +20,6 @@ #include "webrtc/audio/audio_send_stream.h" #include "webrtc/audio/audio_state.h" #include "webrtc/audio/scoped_voe_interface.h" -#include "webrtc/base/basictypes.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/constructormagic.h" -#include "webrtc/base/location.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/optional.h" -#include "webrtc/base/ptr_util.h" -#include "webrtc/base/task_queue.h" -#include "webrtc/base/thread_annotations.h" -#include "webrtc/base/thread_checker.h" -#include "webrtc/base/trace_event.h" #include "webrtc/call/bitrate_allocator.h" #include "webrtc/call/call.h" #include "webrtc/call/flexfec_receive_stream_impl.h" @@ -47,6 +36,17 @@ #include "webrtc/modules/rtp_rtcp/source/byte_io.h" #include "webrtc/modules/rtp_rtcp/source/rtp_packet_received.h" #include "webrtc/modules/utility/include/process_thread.h" +#include "webrtc/rtc_base/basictypes.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/constructormagic.h" +#include "webrtc/rtc_base/location.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/optional.h" +#include "webrtc/rtc_base/ptr_util.h" +#include "webrtc/rtc_base/task_queue.h" +#include "webrtc/rtc_base/thread_annotations.h" +#include "webrtc/rtc_base/thread_checker.h" +#include "webrtc/rtc_base/trace_event.h" #include "webrtc/system_wrappers/include/clock.h" #include "webrtc/system_wrappers/include/cpu_info.h" #include "webrtc/system_wrappers/include/metrics.h" diff --git a/webrtc/call/call.h b/webrtc/call/call.h index 842ed60887..86142f0fea 100644 --- a/webrtc/call/call.h +++ b/webrtc/call/call.h @@ -16,15 +16,15 @@ #include #include "webrtc/api/rtcerror.h" -#include "webrtc/base/networkroute.h" -#include "webrtc/base/platform_file.h" -#include "webrtc/base/socket.h" #include "webrtc/call/audio_receive_stream.h" #include "webrtc/call/audio_send_stream.h" #include "webrtc/call/audio_state.h" #include "webrtc/call/flexfec_receive_stream.h" #include "webrtc/call/rtp_transport_controller_send_interface.h" #include "webrtc/common_types.h" +#include "webrtc/rtc_base/networkroute.h" +#include "webrtc/rtc_base/platform_file.h" +#include "webrtc/rtc_base/socket.h" #include "webrtc/video_receive_stream.h" #include "webrtc/video_send_stream.h" diff --git a/webrtc/call/call_perf_tests.cc b/webrtc/call/call_perf_tests.cc index 0c0a0cfd29..f8461bffaa 100644 --- a/webrtc/call/call_perf_tests.cc +++ b/webrtc/call/call_perf_tests.cc @@ -14,15 +14,15 @@ #include #include "webrtc/api/audio_codecs/builtin_audio_encoder_factory.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/constructormagic.h" -#include "webrtc/base/thread_annotations.h" #include "webrtc/call/call.h" #include "webrtc/config.h" #include "webrtc/logging/rtc_event_log/rtc_event_log.h" #include "webrtc/modules/audio_coding/include/audio_coding_module.h" #include "webrtc/modules/audio_mixer/audio_mixer_impl.h" #include "webrtc/modules/rtp_rtcp/include/rtp_header_parser.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/constructormagic.h" +#include "webrtc/rtc_base/thread_annotations.h" #include "webrtc/system_wrappers/include/metrics_default.h" #include "webrtc/test/call_test.h" #include "webrtc/test/direct_transport.h" diff --git a/webrtc/call/call_unittest.cc b/webrtc/call/call_unittest.cc index 5267e7a6ee..2524de6d19 100644 --- a/webrtc/call/call_unittest.cc +++ b/webrtc/call/call_unittest.cc @@ -14,7 +14,6 @@ #include #include "webrtc/api/test/mock_audio_mixer.h" -#include "webrtc/base/ptr_util.h" #include "webrtc/call/audio_state.h" #include "webrtc/call/call.h" #include "webrtc/call/fake_rtp_transport_controller_send.h" @@ -23,6 +22,7 @@ #include "webrtc/modules/audio_mixer/audio_mixer_impl.h" #include "webrtc/modules/congestion_controller/include/mock/mock_send_side_congestion_controller.h" #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp.h" +#include "webrtc/rtc_base/ptr_util.h" #include "webrtc/test/gtest.h" #include "webrtc/test/mock_audio_decoder_factory.h" #include "webrtc/test/mock_transport.h" diff --git a/webrtc/call/flexfec_receive_stream_impl.cc b/webrtc/call/flexfec_receive_stream_impl.cc index c73d9e98e5..a1e9bc64ec 100644 --- a/webrtc/call/flexfec_receive_stream_impl.cc +++ b/webrtc/call/flexfec_receive_stream_impl.cc @@ -12,15 +12,15 @@ #include -#include "webrtc/base/checks.h" -#include "webrtc/base/location.h" -#include "webrtc/base/logging.h" #include "webrtc/call/rtp_stream_receiver_controller_interface.h" #include "webrtc/modules/rtp_rtcp/include/flexfec_receiver.h" #include "webrtc/modules/rtp_rtcp/include/receive_statistics.h" #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp.h" #include "webrtc/modules/rtp_rtcp/source/rtp_packet_received.h" #include "webrtc/modules/utility/include/process_thread.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/location.h" +#include "webrtc/rtc_base/logging.h" #include "webrtc/system_wrappers/include/clock.h" namespace webrtc { diff --git a/webrtc/call/flexfec_receive_stream_impl.h b/webrtc/call/flexfec_receive_stream_impl.h index a89940f8c3..81c09d6fac 100644 --- a/webrtc/call/flexfec_receive_stream_impl.h +++ b/webrtc/call/flexfec_receive_stream_impl.h @@ -13,9 +13,9 @@ #include -#include "webrtc/base/criticalsection.h" #include "webrtc/call/flexfec_receive_stream.h" #include "webrtc/call/rtp_packet_sink_interface.h" +#include "webrtc/rtc_base/criticalsection.h" namespace webrtc { diff --git a/webrtc/call/flexfec_receive_stream_unittest.cc b/webrtc/call/flexfec_receive_stream_unittest.cc index 1788efd076..7ce4b557e1 100644 --- a/webrtc/call/flexfec_receive_stream_unittest.cc +++ b/webrtc/call/flexfec_receive_stream_unittest.cc @@ -13,7 +13,6 @@ #include #include -#include "webrtc/base/array_view.h" #include "webrtc/call/rtp_stream_receiver_controller.h" #include "webrtc/modules/pacing/packet_router.h" #include "webrtc/modules/rtp_rtcp/include/flexfec_receiver.h" @@ -22,6 +21,7 @@ #include "webrtc/modules/rtp_rtcp/source/byte_io.h" #include "webrtc/modules/rtp_rtcp/source/rtp_header_extensions.h" #include "webrtc/modules/utility/include/mock/mock_process_thread.h" +#include "webrtc/rtc_base/array_view.h" #include "webrtc/rtc_base/ptr_util.h" #include "webrtc/test/gmock.h" #include "webrtc/test/gtest.h" diff --git a/webrtc/call/rampup_tests.cc b/webrtc/call/rampup_tests.cc index 5128d50451..a50abee66b 100644 --- a/webrtc/call/rampup_tests.cc +++ b/webrtc/call/rampup_tests.cc @@ -10,9 +10,9 @@ #include "webrtc/call/rampup_tests.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/platform_thread.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/platform_thread.h" #include "webrtc/test/encoder_settings.h" #include "webrtc/test/gtest.h" #include "webrtc/test/testsupport/perf_test.h" diff --git a/webrtc/call/rampup_tests.h b/webrtc/call/rampup_tests.h index 6710dd12f8..eedef7bea7 100644 --- a/webrtc/call/rampup_tests.h +++ b/webrtc/call/rampup_tests.h @@ -15,9 +15,9 @@ #include #include -#include "webrtc/base/event.h" #include "webrtc/call/call.h" #include "webrtc/logging/rtc_event_log/rtc_event_log.h" +#include "webrtc/rtc_base/event.h" #include "webrtc/test/call_test.h" namespace webrtc { diff --git a/webrtc/call/rsid_resolution_observer.h b/webrtc/call/rsid_resolution_observer.h index b14fa9da3f..ea08045cf1 100644 --- a/webrtc/call/rsid_resolution_observer.h +++ b/webrtc/call/rsid_resolution_observer.h @@ -12,7 +12,7 @@ #include -#include "webrtc/base/basictypes.h" +#include "webrtc/rtc_base/basictypes.h" namespace webrtc { diff --git a/webrtc/call/rtcp_demuxer.cc b/webrtc/call/rtcp_demuxer.cc index 6054fc0541..a8003f86eb 100644 --- a/webrtc/call/rtcp_demuxer.cc +++ b/webrtc/call/rtcp_demuxer.cc @@ -10,10 +10,10 @@ #include "webrtc/call/rtcp_demuxer.h" -#include "webrtc/base/checks.h" #include "webrtc/call/rtcp_packet_sink_interface.h" #include "webrtc/call/rtp_rtcp_demuxer_helper.h" #include "webrtc/common_types.h" +#include "webrtc/rtc_base/checks.h" namespace webrtc { diff --git a/webrtc/call/rtcp_demuxer.h b/webrtc/call/rtcp_demuxer.h index c5c1621036..591e0110e8 100644 --- a/webrtc/call/rtcp_demuxer.h +++ b/webrtc/call/rtcp_demuxer.h @@ -15,9 +15,9 @@ #include #include -#include "webrtc/base/array_view.h" -#include "webrtc/base/basictypes.h" #include "webrtc/call/rsid_resolution_observer.h" +#include "webrtc/rtc_base/array_view.h" +#include "webrtc/rtc_base/basictypes.h" namespace webrtc { diff --git a/webrtc/call/rtcp_demuxer_unittest.cc b/webrtc/call/rtcp_demuxer_unittest.cc index 49f037c4f5..89b712b3c6 100644 --- a/webrtc/call/rtcp_demuxer_unittest.cc +++ b/webrtc/call/rtcp_demuxer_unittest.cc @@ -12,13 +12,13 @@ #include -#include "webrtc/base/arraysize.h" -#include "webrtc/base/basictypes.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/ptr_util.h" #include "webrtc/call/rtcp_packet_sink_interface.h" #include "webrtc/common_types.h" #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/bye.h" +#include "webrtc/rtc_base/arraysize.h" +#include "webrtc/rtc_base/basictypes.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/ptr_util.h" #include "webrtc/test/gmock.h" #include "webrtc/test/gtest.h" diff --git a/webrtc/call/rtcp_packet_sink_interface.h b/webrtc/call/rtcp_packet_sink_interface.h index e26bd37c50..1b3cfba4e9 100644 --- a/webrtc/call/rtcp_packet_sink_interface.h +++ b/webrtc/call/rtcp_packet_sink_interface.h @@ -10,7 +10,7 @@ #ifndef WEBRTC_CALL_RTCP_PACKET_SINK_INTERFACE_H_ #define WEBRTC_CALL_RTCP_PACKET_SINK_INTERFACE_H_ -#include "webrtc/base/array_view.h" +#include "webrtc/rtc_base/array_view.h" namespace webrtc { diff --git a/webrtc/call/rtp_demuxer.cc b/webrtc/call/rtp_demuxer.cc index 205498fd84..ce1234208f 100644 --- a/webrtc/call/rtp_demuxer.cc +++ b/webrtc/call/rtp_demuxer.cc @@ -10,13 +10,13 @@ #include "webrtc/call/rtp_demuxer.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/logging.h" #include "webrtc/call/rsid_resolution_observer.h" #include "webrtc/call/rtp_packet_sink_interface.h" #include "webrtc/call/rtp_rtcp_demuxer_helper.h" #include "webrtc/modules/rtp_rtcp/source/rtp_header_extensions.h" #include "webrtc/modules/rtp_rtcp/source/rtp_packet_received.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/logging.h" namespace webrtc { diff --git a/webrtc/call/rtp_demuxer_unittest.cc b/webrtc/call/rtp_demuxer_unittest.cc index 6d61f57894..8c2eab11bf 100644 --- a/webrtc/call/rtp_demuxer_unittest.cc +++ b/webrtc/call/rtp_demuxer_unittest.cc @@ -13,16 +13,16 @@ #include #include -#include "webrtc/base/arraysize.h" -#include "webrtc/base/basictypes.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/ptr_util.h" #include "webrtc/call/rsid_resolution_observer.h" #include "webrtc/call/rtp_packet_sink_interface.h" #include "webrtc/common_types.h" #include "webrtc/modules/rtp_rtcp/include/rtp_header_extension_map.h" #include "webrtc/modules/rtp_rtcp/source/rtp_header_extensions.h" #include "webrtc/modules/rtp_rtcp/source/rtp_packet_received.h" +#include "webrtc/rtc_base/arraysize.h" +#include "webrtc/rtc_base/basictypes.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/ptr_util.h" #include "webrtc/test/gmock.h" #include "webrtc/test/gtest.h" diff --git a/webrtc/call/rtp_rtcp_demuxer_helper.h b/webrtc/call/rtp_rtcp_demuxer_helper.h index 19bd603244..4791e55ca3 100644 --- a/webrtc/call/rtp_rtcp_demuxer_helper.h +++ b/webrtc/call/rtp_rtcp_demuxer_helper.h @@ -15,9 +15,9 @@ #include #include -#include "webrtc/base/array_view.h" -#include "webrtc/base/basictypes.h" -#include "webrtc/base/optional.h" +#include "webrtc/rtc_base/array_view.h" +#include "webrtc/rtc_base/basictypes.h" +#include "webrtc/rtc_base/optional.h" namespace webrtc { diff --git a/webrtc/call/rtp_rtcp_demuxer_helper_unittest.cc b/webrtc/call/rtp_rtcp_demuxer_helper_unittest.cc index e51002f6ad..96a1383c59 100644 --- a/webrtc/call/rtp_rtcp_demuxer_helper_unittest.cc +++ b/webrtc/call/rtp_rtcp_demuxer_helper_unittest.cc @@ -12,9 +12,6 @@ #include "webrtc/call/rtp_rtcp_demuxer_helper.h" -#include "webrtc/base/arraysize.h" -#include "webrtc/base/basictypes.h" -#include "webrtc/base/buffer.h" #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/bye.h" #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/extended_jitter_report.h" #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/extended_reports.h" @@ -22,6 +19,9 @@ #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/rapid_resync_request.h" #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/receiver_report.h" #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/sender_report.h" +#include "webrtc/rtc_base/arraysize.h" +#include "webrtc/rtc_base/basictypes.h" +#include "webrtc/rtc_base/buffer.h" #include "webrtc/test/gtest.h" namespace webrtc { diff --git a/webrtc/call/rtp_stream_receiver_controller.cc b/webrtc/call/rtp_stream_receiver_controller.cc index a4b1e36ae2..1238665352 100644 --- a/webrtc/call/rtp_stream_receiver_controller.cc +++ b/webrtc/call/rtp_stream_receiver_controller.cc @@ -9,7 +9,7 @@ */ #include "webrtc/call/rtp_stream_receiver_controller.h" -#include "webrtc/base/ptr_util.h" +#include "webrtc/rtc_base/ptr_util.h" namespace webrtc { diff --git a/webrtc/call/rtp_stream_receiver_controller.h b/webrtc/call/rtp_stream_receiver_controller.h index 5c8ed6775e..0fbf669513 100644 --- a/webrtc/call/rtp_stream_receiver_controller.h +++ b/webrtc/call/rtp_stream_receiver_controller.h @@ -12,9 +12,9 @@ #include -#include "webrtc/base/criticalsection.h" #include "webrtc/call/rtp_demuxer.h" #include "webrtc/call/rtp_stream_receiver_controller_interface.h" +#include "webrtc/rtc_base/criticalsection.h" namespace webrtc { diff --git a/webrtc/call/rtp_transport_controller_send.h b/webrtc/call/rtp_transport_controller_send.h index cec8a74578..da3ae007aa 100644 --- a/webrtc/call/rtp_transport_controller_send.h +++ b/webrtc/call/rtp_transport_controller_send.h @@ -11,9 +11,9 @@ #ifndef WEBRTC_CALL_RTP_TRANSPORT_CONTROLLER_SEND_H_ #define WEBRTC_CALL_RTP_TRANSPORT_CONTROLLER_SEND_H_ -#include "webrtc/base/constructormagic.h" #include "webrtc/call/rtp_transport_controller_send_interface.h" #include "webrtc/modules/congestion_controller/include/send_side_congestion_controller.h" +#include "webrtc/rtc_base/constructormagic.h" namespace webrtc { class Clock; diff --git a/webrtc/call/syncable.h b/webrtc/call/syncable.h index 3459f9eb81..734d20ec06 100644 --- a/webrtc/call/syncable.h +++ b/webrtc/call/syncable.h @@ -16,7 +16,7 @@ #include -#include "webrtc/base/optional.h" +#include "webrtc/rtc_base/optional.h" namespace webrtc { diff --git a/webrtc/common_audio/audio_converter.cc b/webrtc/common_audio/audio_converter.cc index e8595333f6..9e4bdaa334 100644 --- a/webrtc/common_audio/audio_converter.cc +++ b/webrtc/common_audio/audio_converter.cc @@ -15,10 +15,10 @@ #include #include -#include "webrtc/base/checks.h" -#include "webrtc/base/safe_conversions.h" #include "webrtc/common_audio/channel_buffer.h" #include "webrtc/common_audio/resampler/push_sinc_resampler.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/safe_conversions.h" using rtc::checked_cast; diff --git a/webrtc/common_audio/audio_converter.h b/webrtc/common_audio/audio_converter.h index d3c65acee1..8b2388f44a 100644 --- a/webrtc/common_audio/audio_converter.h +++ b/webrtc/common_audio/audio_converter.h @@ -13,7 +13,7 @@ #include -#include "webrtc/base/constructormagic.h" +#include "webrtc/rtc_base/constructormagic.h" namespace webrtc { diff --git a/webrtc/common_audio/audio_converter_unittest.cc b/webrtc/common_audio/audio_converter_unittest.cc index 320c1dae42..2c44998a4e 100644 --- a/webrtc/common_audio/audio_converter_unittest.cc +++ b/webrtc/common_audio/audio_converter_unittest.cc @@ -13,11 +13,11 @@ #include #include -#include "webrtc/base/arraysize.h" -#include "webrtc/base/format_macros.h" #include "webrtc/common_audio/audio_converter.h" #include "webrtc/common_audio/channel_buffer.h" #include "webrtc/common_audio/resampler/push_sinc_resampler.h" +#include "webrtc/rtc_base/arraysize.h" +#include "webrtc/rtc_base/format_macros.h" #include "webrtc/test/gtest.h" namespace webrtc { diff --git a/webrtc/common_audio/audio_ring_buffer.cc b/webrtc/common_audio/audio_ring_buffer.cc index a29e53a61c..e5631b2966 100644 --- a/webrtc/common_audio/audio_ring_buffer.cc +++ b/webrtc/common_audio/audio_ring_buffer.cc @@ -10,8 +10,8 @@ #include "webrtc/common_audio/audio_ring_buffer.h" -#include "webrtc/base/checks.h" #include "webrtc/common_audio/ring_buffer.h" +#include "webrtc/rtc_base/checks.h" // This is a simple multi-channel wrapper over the ring_buffer.h C interface. diff --git a/webrtc/common_audio/blocker.cc b/webrtc/common_audio/blocker.cc index 86dfdf3644..6969332836 100644 --- a/webrtc/common_audio/blocker.cc +++ b/webrtc/common_audio/blocker.cc @@ -12,7 +12,7 @@ #include -#include "webrtc/base/checks.h" +#include "webrtc/rtc_base/checks.h" namespace { diff --git a/webrtc/common_audio/blocker_unittest.cc b/webrtc/common_audio/blocker_unittest.cc index 1c675db730..3af9699cbc 100644 --- a/webrtc/common_audio/blocker_unittest.cc +++ b/webrtc/common_audio/blocker_unittest.cc @@ -12,7 +12,7 @@ #include "webrtc/common_audio/blocker.h" -#include "webrtc/base/arraysize.h" +#include "webrtc/rtc_base/arraysize.h" #include "webrtc/test/gtest.h" namespace { diff --git a/webrtc/common_audio/channel_buffer.cc b/webrtc/common_audio/channel_buffer.cc index 0f364114c6..e7912bbd4d 100644 --- a/webrtc/common_audio/channel_buffer.cc +++ b/webrtc/common_audio/channel_buffer.cc @@ -10,7 +10,7 @@ #include "webrtc/common_audio/channel_buffer.h" -#include "webrtc/base/checks.h" +#include "webrtc/rtc_base/checks.h" namespace webrtc { diff --git a/webrtc/common_audio/channel_buffer.h b/webrtc/common_audio/channel_buffer.h index 930dd73553..5d4fb88956 100644 --- a/webrtc/common_audio/channel_buffer.h +++ b/webrtc/common_audio/channel_buffer.h @@ -15,9 +15,9 @@ #include -#include "webrtc/base/checks.h" -#include "webrtc/base/gtest_prod_util.h" #include "webrtc/common_audio/include/audio_util.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/gtest_prod_util.h" namespace webrtc { diff --git a/webrtc/common_audio/fir_filter.cc b/webrtc/common_audio/fir_filter.cc index 5f5e210ce1..f069af3b52 100644 --- a/webrtc/common_audio/fir_filter.cc +++ b/webrtc/common_audio/fir_filter.cc @@ -14,9 +14,9 @@ #include -#include "webrtc/base/checks.h" #include "webrtc/common_audio/fir_filter_neon.h" #include "webrtc/common_audio/fir_filter_sse.h" +#include "webrtc/rtc_base/checks.h" #include "webrtc/system_wrappers/include/cpu_features_wrapper.h" namespace webrtc { diff --git a/webrtc/common_audio/fir_filter_neon.cc b/webrtc/common_audio/fir_filter_neon.cc index 54e58d0d7a..26d119503e 100644 --- a/webrtc/common_audio/fir_filter_neon.cc +++ b/webrtc/common_audio/fir_filter_neon.cc @@ -13,7 +13,7 @@ #include #include -#include "webrtc/base/checks.h" +#include "webrtc/rtc_base/checks.h" #include "webrtc/system_wrappers/include/aligned_malloc.h" namespace webrtc { diff --git a/webrtc/common_audio/fir_filter_sse.cc b/webrtc/common_audio/fir_filter_sse.cc index 308eeb676f..3e7c2afe7c 100644 --- a/webrtc/common_audio/fir_filter_sse.cc +++ b/webrtc/common_audio/fir_filter_sse.cc @@ -14,7 +14,7 @@ #include #include -#include "webrtc/base/checks.h" +#include "webrtc/rtc_base/checks.h" #include "webrtc/system_wrappers/include/aligned_malloc.h" namespace webrtc { diff --git a/webrtc/common_audio/include/audio_util.h b/webrtc/common_audio/include/audio_util.h index 9307c556ad..f1077c6325 100644 --- a/webrtc/common_audio/include/audio_util.h +++ b/webrtc/common_audio/include/audio_util.h @@ -15,7 +15,7 @@ #include #include -#include "webrtc/base/checks.h" +#include "webrtc/rtc_base/checks.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/common_audio/lapped_transform.cc b/webrtc/common_audio/lapped_transform.cc index 6825bebb7a..227b866c3b 100644 --- a/webrtc/common_audio/lapped_transform.cc +++ b/webrtc/common_audio/lapped_transform.cc @@ -14,8 +14,8 @@ #include #include -#include "webrtc/base/checks.h" #include "webrtc/common_audio/real_fourier.h" +#include "webrtc/rtc_base/checks.h" namespace webrtc { diff --git a/webrtc/common_audio/real_fourier.cc b/webrtc/common_audio/real_fourier.cc index e721346f31..ed1ad111d5 100644 --- a/webrtc/common_audio/real_fourier.cc +++ b/webrtc/common_audio/real_fourier.cc @@ -10,10 +10,10 @@ #include "webrtc/common_audio/real_fourier.h" -#include "webrtc/base/checks.h" #include "webrtc/common_audio/real_fourier_ooura.h" #include "webrtc/common_audio/real_fourier_openmax.h" #include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" +#include "webrtc/rtc_base/checks.h" namespace webrtc { diff --git a/webrtc/common_audio/real_fourier_ooura.cc b/webrtc/common_audio/real_fourier_ooura.cc index 8cd4c86b5b..26a8a7d362 100644 --- a/webrtc/common_audio/real_fourier_ooura.cc +++ b/webrtc/common_audio/real_fourier_ooura.cc @@ -13,8 +13,8 @@ #include #include -#include "webrtc/base/checks.h" #include "webrtc/common_audio/fft4g.h" +#include "webrtc/rtc_base/checks.h" namespace webrtc { diff --git a/webrtc/common_audio/real_fourier_openmax.cc b/webrtc/common_audio/real_fourier_openmax.cc index bc3e7347cb..4d971da573 100644 --- a/webrtc/common_audio/real_fourier_openmax.cc +++ b/webrtc/common_audio/real_fourier_openmax.cc @@ -13,7 +13,7 @@ #include #include "dl/sp/api/omxSP.h" -#include "webrtc/base/checks.h" +#include "webrtc/rtc_base/checks.h" namespace webrtc { diff --git a/webrtc/common_audio/resampler/push_resampler.cc b/webrtc/common_audio/resampler/push_resampler.cc index ec904b81c8..38cdf2b172 100644 --- a/webrtc/common_audio/resampler/push_resampler.cc +++ b/webrtc/common_audio/resampler/push_resampler.cc @@ -12,10 +12,10 @@ #include -#include "webrtc/base/checks.h" #include "webrtc/common_audio/include/audio_util.h" #include "webrtc/common_audio/resampler/include/resampler.h" #include "webrtc/common_audio/resampler/push_sinc_resampler.h" +#include "webrtc/rtc_base/checks.h" namespace webrtc { namespace { diff --git a/webrtc/common_audio/resampler/push_resampler_unittest.cc b/webrtc/common_audio/resampler/push_resampler_unittest.cc index 9a5cb5defc..eb08f704ab 100644 --- a/webrtc/common_audio/resampler/push_resampler_unittest.cc +++ b/webrtc/common_audio/resampler/push_resampler_unittest.cc @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/base/checks.h" // RTC_DCHECK_IS_ON #include "webrtc/common_audio/resampler/include/push_resampler.h" +#include "webrtc/rtc_base/checks.h" // RTC_DCHECK_IS_ON #include "webrtc/test/gtest.h" // Quality testing of PushResampler is handled through output_mixer_unittest.cc. diff --git a/webrtc/common_audio/resampler/push_sinc_resampler.cc b/webrtc/common_audio/resampler/push_sinc_resampler.cc index a740423eec..3b603dbb58 100644 --- a/webrtc/common_audio/resampler/push_sinc_resampler.cc +++ b/webrtc/common_audio/resampler/push_sinc_resampler.cc @@ -12,8 +12,8 @@ #include -#include "webrtc/base/checks.h" #include "webrtc/common_audio/include/audio_util.h" +#include "webrtc/rtc_base/checks.h" namespace webrtc { diff --git a/webrtc/common_audio/resampler/push_sinc_resampler.h b/webrtc/common_audio/resampler/push_sinc_resampler.h index 2ba60cac9c..7af85c8c4c 100644 --- a/webrtc/common_audio/resampler/push_sinc_resampler.h +++ b/webrtc/common_audio/resampler/push_sinc_resampler.h @@ -13,8 +13,8 @@ #include -#include "webrtc/base/constructormagic.h" #include "webrtc/common_audio/resampler/sinc_resampler.h" +#include "webrtc/rtc_base/constructormagic.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/common_audio/resampler/push_sinc_resampler_unittest.cc b/webrtc/common_audio/resampler/push_sinc_resampler_unittest.cc index eab46efb9b..cb156cce44 100644 --- a/webrtc/common_audio/resampler/push_sinc_resampler_unittest.cc +++ b/webrtc/common_audio/resampler/push_sinc_resampler_unittest.cc @@ -13,10 +13,10 @@ #include #include -#include "webrtc/base/timeutils.h" #include "webrtc/common_audio/include/audio_util.h" #include "webrtc/common_audio/resampler/push_sinc_resampler.h" #include "webrtc/common_audio/resampler/sinusoidal_linear_chirp_source.h" +#include "webrtc/rtc_base/timeutils.h" #include "webrtc/test/gmock.h" #include "webrtc/test/gtest.h" #include "webrtc/typedefs.h" diff --git a/webrtc/common_audio/resampler/sinc_resampler.cc b/webrtc/common_audio/resampler/sinc_resampler.cc index 1203f771f4..acf7d0fae9 100644 --- a/webrtc/common_audio/resampler/sinc_resampler.cc +++ b/webrtc/common_audio/resampler/sinc_resampler.cc @@ -92,7 +92,7 @@ #include -#include "webrtc/base/checks.h" +#include "webrtc/rtc_base/checks.h" #include "webrtc/system_wrappers/include/cpu_features_wrapper.h" #include "webrtc/typedefs.h" diff --git a/webrtc/common_audio/resampler/sinc_resampler.h b/webrtc/common_audio/resampler/sinc_resampler.h index ecfd64c0a6..fa92163f86 100644 --- a/webrtc/common_audio/resampler/sinc_resampler.h +++ b/webrtc/common_audio/resampler/sinc_resampler.h @@ -16,8 +16,8 @@ #include -#include "webrtc/base/constructormagic.h" -#include "webrtc/base/gtest_prod_util.h" +#include "webrtc/rtc_base/constructormagic.h" +#include "webrtc/rtc_base/gtest_prod_util.h" #include "webrtc/system_wrappers/include/aligned_malloc.h" #include "webrtc/typedefs.h" diff --git a/webrtc/common_audio/resampler/sinc_resampler_unittest.cc b/webrtc/common_audio/resampler/sinc_resampler_unittest.cc index 990580dd2d..8a3d1ec893 100644 --- a/webrtc/common_audio/resampler/sinc_resampler_unittest.cc +++ b/webrtc/common_audio/resampler/sinc_resampler_unittest.cc @@ -19,10 +19,10 @@ #include #include -#include "webrtc/base/stringize_macros.h" -#include "webrtc/base/timeutils.h" #include "webrtc/common_audio/resampler/sinc_resampler.h" #include "webrtc/common_audio/resampler/sinusoidal_linear_chirp_source.h" +#include "webrtc/rtc_base/stringize_macros.h" +#include "webrtc/rtc_base/timeutils.h" #include "webrtc/system_wrappers/include/cpu_features_wrapper.h" #include "webrtc/test/gmock.h" #include "webrtc/test/gtest.h" diff --git a/webrtc/common_audio/resampler/sinusoidal_linear_chirp_source.h b/webrtc/common_audio/resampler/sinusoidal_linear_chirp_source.h index 1807f86a19..80ccd8072a 100644 --- a/webrtc/common_audio/resampler/sinusoidal_linear_chirp_source.h +++ b/webrtc/common_audio/resampler/sinusoidal_linear_chirp_source.h @@ -14,8 +14,8 @@ #ifndef WEBRTC_COMMON_AUDIO_RESAMPLER_SINUSOIDAL_LINEAR_CHIRP_SOURCE_H_ #define WEBRTC_COMMON_AUDIO_RESAMPLER_SINUSOIDAL_LINEAR_CHIRP_SOURCE_H_ -#include "webrtc/base/constructormagic.h" #include "webrtc/common_audio/resampler/sinc_resampler.h" +#include "webrtc/rtc_base/constructormagic.h" namespace webrtc { diff --git a/webrtc/common_audio/signal_processing/dot_product_with_scale.cc b/webrtc/common_audio/signal_processing/dot_product_with_scale.cc index 4067ab5599..7cd6e91ba3 100644 --- a/webrtc/common_audio/signal_processing/dot_product_with_scale.cc +++ b/webrtc/common_audio/signal_processing/dot_product_with_scale.cc @@ -10,7 +10,7 @@ #include "webrtc/common_audio/signal_processing/dot_product_with_scale.h" -#include "webrtc/base/safe_conversions.h" +#include "webrtc/rtc_base/safe_conversions.h" int32_t WebRtcSpl_DotProductWithScale(const int16_t* vector1, const int16_t* vector2, diff --git a/webrtc/common_audio/signal_processing/include/spl_inl.h b/webrtc/common_audio/signal_processing/include/spl_inl.h index 2eb958ffc3..c5aec272de 100644 --- a/webrtc/common_audio/signal_processing/include/spl_inl.h +++ b/webrtc/common_audio/signal_processing/include/spl_inl.h @@ -15,7 +15,7 @@ #ifndef WEBRTC_COMMON_AUDIO_SIGNAL_PROCESSING_INCLUDE_SPL_INL_H_ #define WEBRTC_COMMON_AUDIO_SIGNAL_PROCESSING_INCLUDE_SPL_INL_H_ -#include "webrtc/base/compile_assert_c.h" +#include "webrtc/rtc_base/compile_assert_c.h" extern const int8_t kWebRtcSpl_CountLeadingZeros32_Table[64]; diff --git a/webrtc/common_audio/smoothing_filter.cc b/webrtc/common_audio/smoothing_filter.cc index 91bcb22a25..d95662ca18 100644 --- a/webrtc/common_audio/smoothing_filter.cc +++ b/webrtc/common_audio/smoothing_filter.cc @@ -12,7 +12,7 @@ #include -#include "webrtc/base/timeutils.h" +#include "webrtc/rtc_base/timeutils.h" namespace webrtc { diff --git a/webrtc/common_audio/smoothing_filter.h b/webrtc/common_audio/smoothing_filter.h index 39bc56a48d..c59842ec8c 100644 --- a/webrtc/common_audio/smoothing_filter.h +++ b/webrtc/common_audio/smoothing_filter.h @@ -11,8 +11,8 @@ #ifndef WEBRTC_COMMON_AUDIO_SMOOTHING_FILTER_H_ #define WEBRTC_COMMON_AUDIO_SMOOTHING_FILTER_H_ -#include "webrtc/base/constructormagic.h" -#include "webrtc/base/optional.h" +#include "webrtc/rtc_base/constructormagic.h" +#include "webrtc/rtc_base/optional.h" #include "webrtc/system_wrappers/include/clock.h" namespace webrtc { diff --git a/webrtc/common_audio/smoothing_filter_unittest.cc b/webrtc/common_audio/smoothing_filter_unittest.cc index 5075545f13..6e0bde85cb 100644 --- a/webrtc/common_audio/smoothing_filter_unittest.cc +++ b/webrtc/common_audio/smoothing_filter_unittest.cc @@ -11,8 +11,8 @@ #include #include -#include "webrtc/base/fakeclock.h" #include "webrtc/common_audio/smoothing_filter.h" +#include "webrtc/rtc_base/fakeclock.h" #include "webrtc/test/gtest.h" namespace webrtc { diff --git a/webrtc/common_audio/sparse_fir_filter.cc b/webrtc/common_audio/sparse_fir_filter.cc index 2928004a0d..299028f1ff 100644 --- a/webrtc/common_audio/sparse_fir_filter.cc +++ b/webrtc/common_audio/sparse_fir_filter.cc @@ -10,7 +10,7 @@ #include "webrtc/common_audio/sparse_fir_filter.h" -#include "webrtc/base/checks.h" +#include "webrtc/rtc_base/checks.h" namespace webrtc { diff --git a/webrtc/common_audio/sparse_fir_filter.h b/webrtc/common_audio/sparse_fir_filter.h index 2d406a0f19..6bc5528b5d 100644 --- a/webrtc/common_audio/sparse_fir_filter.h +++ b/webrtc/common_audio/sparse_fir_filter.h @@ -14,7 +14,7 @@ #include #include -#include "webrtc/base/constructormagic.h" +#include "webrtc/rtc_base/constructormagic.h" namespace webrtc { diff --git a/webrtc/common_audio/sparse_fir_filter_unittest.cc b/webrtc/common_audio/sparse_fir_filter_unittest.cc index e7ba5d20f9..a000596c34 100644 --- a/webrtc/common_audio/sparse_fir_filter_unittest.cc +++ b/webrtc/common_audio/sparse_fir_filter_unittest.cc @@ -12,8 +12,8 @@ #include "webrtc/common_audio/sparse_fir_filter.h" -#include "webrtc/base/arraysize.h" #include "webrtc/common_audio/fir_filter.h" +#include "webrtc/rtc_base/arraysize.h" #include "webrtc/test/gtest.h" namespace webrtc { diff --git a/webrtc/common_audio/vad/include/vad.h b/webrtc/common_audio/vad/include/vad.h index 86e6f66e0d..ed649f5c48 100644 --- a/webrtc/common_audio/vad/include/vad.h +++ b/webrtc/common_audio/vad/include/vad.h @@ -13,8 +13,8 @@ #include -#include "webrtc/base/checks.h" #include "webrtc/common_audio/vad/include/webrtc_vad.h" +#include "webrtc/rtc_base/checks.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/common_audio/vad/vad.cc b/webrtc/common_audio/vad/vad.cc index e634aa2ffd..5f3443e6f5 100644 --- a/webrtc/common_audio/vad/vad.cc +++ b/webrtc/common_audio/vad/vad.cc @@ -12,7 +12,7 @@ #include -#include "webrtc/base/checks.h" +#include "webrtc/rtc_base/checks.h" namespace webrtc { diff --git a/webrtc/common_audio/vad/vad_unittest.cc b/webrtc/common_audio/vad/vad_unittest.cc index f2210d9784..69d6a7b345 100644 --- a/webrtc/common_audio/vad/vad_unittest.cc +++ b/webrtc/common_audio/vad/vad_unittest.cc @@ -12,10 +12,10 @@ #include -#include "webrtc/base/arraysize.h" -#include "webrtc/base/checks.h" #include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" #include "webrtc/common_audio/vad/include/webrtc_vad.h" +#include "webrtc/rtc_base/arraysize.h" +#include "webrtc/rtc_base/checks.h" #include "webrtc/test/gtest.h" #include "webrtc/typedefs.h" diff --git a/webrtc/common_audio/wav_file.cc b/webrtc/common_audio/wav_file.cc index 0f37f9cdea..3b1b9eef6c 100644 --- a/webrtc/common_audio/wav_file.cc +++ b/webrtc/common_audio/wav_file.cc @@ -15,10 +15,10 @@ #include #include -#include "webrtc/base/checks.h" -#include "webrtc/base/safe_conversions.h" #include "webrtc/common_audio/include/audio_util.h" #include "webrtc/common_audio/wav_header.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/safe_conversions.h" namespace webrtc { diff --git a/webrtc/common_audio/wav_file.h b/webrtc/common_audio/wav_file.h index 812c21dafa..1ec6c65449 100644 --- a/webrtc/common_audio/wav_file.h +++ b/webrtc/common_audio/wav_file.h @@ -17,7 +17,7 @@ #include #include -#include "webrtc/base/constructormagic.h" +#include "webrtc/rtc_base/constructormagic.h" namespace webrtc { diff --git a/webrtc/common_audio/wav_header.cc b/webrtc/common_audio/wav_header.cc index 402ea17916..0423c089c5 100644 --- a/webrtc/common_audio/wav_header.cc +++ b/webrtc/common_audio/wav_header.cc @@ -19,8 +19,8 @@ #include #include -#include "webrtc/base/checks.h" #include "webrtc/common_audio/include/audio_util.h" +#include "webrtc/rtc_base/checks.h" namespace webrtc { namespace { diff --git a/webrtc/common_audio/window_generator.cc b/webrtc/common_audio/window_generator.cc index ab983b736f..ea5198a360 100644 --- a/webrtc/common_audio/window_generator.cc +++ b/webrtc/common_audio/window_generator.cc @@ -15,7 +15,7 @@ #include #include -#include "webrtc/base/checks.h" +#include "webrtc/rtc_base/checks.h" using std::complex; diff --git a/webrtc/common_audio/window_generator.h b/webrtc/common_audio/window_generator.h index 25dd233b44..3bbf21a8d0 100644 --- a/webrtc/common_audio/window_generator.h +++ b/webrtc/common_audio/window_generator.h @@ -13,7 +13,7 @@ #include -#include "webrtc/base/constructormagic.h" +#include "webrtc/rtc_base/constructormagic.h" namespace webrtc { diff --git a/webrtc/common_types.cc b/webrtc/common_types.cc index 70e5d2e9ac..a76175fbd9 100644 --- a/webrtc/common_types.cc +++ b/webrtc/common_types.cc @@ -15,8 +15,8 @@ #include #include -#include "webrtc/base/checks.h" -#include "webrtc/base/stringutils.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/stringutils.h" namespace webrtc { diff --git a/webrtc/common_types.h b/webrtc/common_types.h index c3752f5b62..03d8ac9281 100644 --- a/webrtc/common_types.h +++ b/webrtc/common_types.h @@ -20,9 +20,9 @@ #include "webrtc/api/video/video_content_type.h" #include "webrtc/api/video/video_rotation.h" #include "webrtc/api/video/video_timing.h" -#include "webrtc/base/array_view.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/optional.h" +#include "webrtc/rtc_base/array_view.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/optional.h" #include "webrtc/typedefs.h" #if defined(_MSC_VER) diff --git a/webrtc/common_video/bitrate_adjuster.cc b/webrtc/common_video/bitrate_adjuster.cc index 9c5c077a83..7f58ec973c 100644 --- a/webrtc/common_video/bitrate_adjuster.cc +++ b/webrtc/common_video/bitrate_adjuster.cc @@ -13,8 +13,8 @@ #include #include -#include "webrtc/base/checks.h" -#include "webrtc/base/logging.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/logging.h" #include "webrtc/system_wrappers/include/clock.h" namespace webrtc { diff --git a/webrtc/common_video/h264/h264_bitstream_parser.cc b/webrtc/common_video/h264/h264_bitstream_parser.cc index 8bc474749d..4661687cff 100644 --- a/webrtc/common_video/h264/h264_bitstream_parser.cc +++ b/webrtc/common_video/h264/h264_bitstream_parser.cc @@ -12,11 +12,11 @@ #include #include -#include "webrtc/base/bitbuffer.h" -#include "webrtc/base/checks.h" +#include "webrtc/rtc_base/bitbuffer.h" +#include "webrtc/rtc_base/checks.h" #include "webrtc/common_video/h264/h264_common.h" -#include "webrtc/base/logging.h" +#include "webrtc/rtc_base/logging.h" namespace { const int kMaxAbsQpDeltaValue = 51; diff --git a/webrtc/common_video/h264/h264_bitstream_parser.h b/webrtc/common_video/h264/h264_bitstream_parser.h index aa0155239a..136c90317f 100644 --- a/webrtc/common_video/h264/h264_bitstream_parser.h +++ b/webrtc/common_video/h264/h264_bitstream_parser.h @@ -13,9 +13,9 @@ #include #include -#include "webrtc/base/optional.h" #include "webrtc/common_video/h264/pps_parser.h" #include "webrtc/common_video/h264/sps_parser.h" +#include "webrtc/rtc_base/optional.h" namespace rtc { class BitBufferWriter; diff --git a/webrtc/common_video/h264/h264_common.h b/webrtc/common_video/h264/h264_common.h index c63875feb5..fc3448497b 100644 --- a/webrtc/common_video/h264/h264_common.h +++ b/webrtc/common_video/h264/h264_common.h @@ -14,7 +14,7 @@ #include #include -#include "webrtc/base/buffer.h" +#include "webrtc/rtc_base/buffer.h" namespace webrtc { diff --git a/webrtc/common_video/h264/pps_parser.cc b/webrtc/common_video/h264/pps_parser.cc index 228d8538d0..0df0289bdd 100644 --- a/webrtc/common_video/h264/pps_parser.cc +++ b/webrtc/common_video/h264/pps_parser.cc @@ -14,8 +14,8 @@ #include #include "webrtc/common_video/h264/h264_common.h" -#include "webrtc/base/bitbuffer.h" -#include "webrtc/base/logging.h" +#include "webrtc/rtc_base/bitbuffer.h" +#include "webrtc/rtc_base/logging.h" #define RETURN_EMPTY_ON_FAIL(x) \ if (!(x)) { \ diff --git a/webrtc/common_video/h264/pps_parser.h b/webrtc/common_video/h264/pps_parser.h index 02167a85c1..941b99e71e 100644 --- a/webrtc/common_video/h264/pps_parser.h +++ b/webrtc/common_video/h264/pps_parser.h @@ -11,7 +11,7 @@ #ifndef WEBRTC_COMMON_VIDEO_H264_PPS_PARSER_H_ #define WEBRTC_COMMON_VIDEO_H264_PPS_PARSER_H_ -#include "webrtc/base/optional.h" +#include "webrtc/rtc_base/optional.h" namespace rtc { class BitBuffer; diff --git a/webrtc/common_video/h264/pps_parser_unittest.cc b/webrtc/common_video/h264/pps_parser_unittest.cc index 03490647c0..886808aa8e 100644 --- a/webrtc/common_video/h264/pps_parser_unittest.cc +++ b/webrtc/common_video/h264/pps_parser_unittest.cc @@ -13,9 +13,9 @@ #include #include -#include "webrtc/base/bitbuffer.h" -#include "webrtc/base/buffer.h" #include "webrtc/common_video/h264/h264_common.h" +#include "webrtc/rtc_base/bitbuffer.h" +#include "webrtc/rtc_base/buffer.h" #include "webrtc/test/gtest.h" namespace webrtc { diff --git a/webrtc/common_video/h264/sps_parser.cc b/webrtc/common_video/h264/sps_parser.cc index 3bf08539bf..fbf7ee7794 100644 --- a/webrtc/common_video/h264/sps_parser.cc +++ b/webrtc/common_video/h264/sps_parser.cc @@ -14,8 +14,8 @@ #include #include "webrtc/common_video/h264/h264_common.h" -#include "webrtc/base/bitbuffer.h" -#include "webrtc/base/logging.h" +#include "webrtc/rtc_base/bitbuffer.h" +#include "webrtc/rtc_base/logging.h" typedef rtc::Optional OptionalSps; diff --git a/webrtc/common_video/h264/sps_parser.h b/webrtc/common_video/h264/sps_parser.h index dfd4b6b4b1..ea14f79202 100644 --- a/webrtc/common_video/h264/sps_parser.h +++ b/webrtc/common_video/h264/sps_parser.h @@ -11,7 +11,7 @@ #ifndef WEBRTC_COMMON_VIDEO_H264_SPS_PARSER_H_ #define WEBRTC_COMMON_VIDEO_H264_SPS_PARSER_H_ -#include "webrtc/base/optional.h" +#include "webrtc/rtc_base/optional.h" namespace rtc { class BitBuffer; diff --git a/webrtc/common_video/h264/sps_parser_unittest.cc b/webrtc/common_video/h264/sps_parser_unittest.cc index 958ddc05eb..5a0df9a1b0 100644 --- a/webrtc/common_video/h264/sps_parser_unittest.cc +++ b/webrtc/common_video/h264/sps_parser_unittest.cc @@ -10,10 +10,10 @@ #include "webrtc/common_video/h264/sps_parser.h" -#include "webrtc/base/arraysize.h" -#include "webrtc/base/bitbuffer.h" -#include "webrtc/base/buffer.h" #include "webrtc/common_video/h264/h264_common.h" +#include "webrtc/rtc_base/arraysize.h" +#include "webrtc/rtc_base/bitbuffer.h" +#include "webrtc/rtc_base/buffer.h" #include "webrtc/test/gtest.h" namespace webrtc { diff --git a/webrtc/common_video/h264/sps_vui_rewriter.cc b/webrtc/common_video/h264/sps_vui_rewriter.cc index 534e75c865..1d1b76e8fc 100644 --- a/webrtc/common_video/h264/sps_vui_rewriter.cc +++ b/webrtc/common_video/h264/sps_vui_rewriter.cc @@ -15,10 +15,10 @@ #include #include -#include "webrtc/base/bitbuffer.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/safe_minmax.h" +#include "webrtc/rtc_base/bitbuffer.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/safe_minmax.h" #include "webrtc/common_video/h264/h264_common.h" #include "webrtc/common_video/h264/sps_parser.h" diff --git a/webrtc/common_video/h264/sps_vui_rewriter.h b/webrtc/common_video/h264/sps_vui_rewriter.h index bf052b3a23..6eff1abcea 100644 --- a/webrtc/common_video/h264/sps_vui_rewriter.h +++ b/webrtc/common_video/h264/sps_vui_rewriter.h @@ -12,9 +12,9 @@ #ifndef WEBRTC_COMMON_VIDEO_H264_SPS_VUI_REWRITER_H_ #define WEBRTC_COMMON_VIDEO_H264_SPS_VUI_REWRITER_H_ -#include "webrtc/base/buffer.h" -#include "webrtc/base/optional.h" #include "webrtc/common_video/h264/sps_parser.h" +#include "webrtc/rtc_base/buffer.h" +#include "webrtc/rtc_base/optional.h" namespace rtc { class BitBuffer; diff --git a/webrtc/common_video/h264/sps_vui_rewriter_unittest.cc b/webrtc/common_video/h264/sps_vui_rewriter_unittest.cc index 44c6287588..4f36e58f1d 100644 --- a/webrtc/common_video/h264/sps_vui_rewriter_unittest.cc +++ b/webrtc/common_video/h264/sps_vui_rewriter_unittest.cc @@ -10,13 +10,13 @@ #include -#include "webrtc/base/bitbuffer.h" -#include "webrtc/base/buffer.h" -#include "webrtc/base/fileutils.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/pathutils.h" #include "webrtc/common_video/h264/h264_common.h" #include "webrtc/common_video/h264/sps_vui_rewriter.h" +#include "webrtc/rtc_base/bitbuffer.h" +#include "webrtc/rtc_base/buffer.h" +#include "webrtc/rtc_base/fileutils.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/pathutils.h" #include "webrtc/test/gtest.h" namespace webrtc { diff --git a/webrtc/common_video/i420_buffer_pool.cc b/webrtc/common_video/i420_buffer_pool.cc index aa9c32ecd0..8dab614914 100644 --- a/webrtc/common_video/i420_buffer_pool.cc +++ b/webrtc/common_video/i420_buffer_pool.cc @@ -10,7 +10,7 @@ #include "webrtc/common_video/include/i420_buffer_pool.h" -#include "webrtc/base/checks.h" +#include "webrtc/rtc_base/checks.h" namespace webrtc { diff --git a/webrtc/common_video/i420_video_frame_unittest.cc b/webrtc/common_video/i420_video_frame_unittest.cc index 0b564ff298..025c54b6ff 100644 --- a/webrtc/common_video/i420_video_frame_unittest.cc +++ b/webrtc/common_video/i420_video_frame_unittest.cc @@ -11,10 +11,10 @@ #include #include -#include "webrtc/api/video/video_frame.h" #include "webrtc/api/video/i420_buffer.h" -#include "webrtc/base/bind.h" -#include "webrtc/base/timeutils.h" +#include "webrtc/api/video/video_frame.h" +#include "webrtc/rtc_base/bind.h" +#include "webrtc/rtc_base/timeutils.h" #include "webrtc/test/fake_texture_frame.h" #include "webrtc/test/frame_utils.h" #include "webrtc/test/gtest.h" diff --git a/webrtc/common_video/include/bitrate_adjuster.h b/webrtc/common_video/include/bitrate_adjuster.h index 5fd1e3851b..1b70ebdbd9 100644 --- a/webrtc/common_video/include/bitrate_adjuster.h +++ b/webrtc/common_video/include/bitrate_adjuster.h @@ -13,8 +13,8 @@ #include -#include "webrtc/base/criticalsection.h" -#include "webrtc/base/rate_statistics.h" +#include "webrtc/rtc_base/criticalsection.h" +#include "webrtc/rtc_base/rate_statistics.h" namespace webrtc { diff --git a/webrtc/common_video/include/i420_buffer_pool.h b/webrtc/common_video/include/i420_buffer_pool.h index 454a8cd9d7..85206ee904 100644 --- a/webrtc/common_video/include/i420_buffer_pool.h +++ b/webrtc/common_video/include/i420_buffer_pool.h @@ -15,7 +15,7 @@ #include #include "webrtc/api/video/i420_buffer.h" -#include "webrtc/base/race_checker.h" +#include "webrtc/rtc_base/race_checker.h" namespace webrtc { diff --git a/webrtc/common_video/include/incoming_video_stream.h b/webrtc/common_video/include/incoming_video_stream.h index ff407c56d8..927336a8e8 100644 --- a/webrtc/common_video/include/incoming_video_stream.h +++ b/webrtc/common_video/include/incoming_video_stream.h @@ -11,10 +11,10 @@ #ifndef WEBRTC_COMMON_VIDEO_INCLUDE_INCOMING_VIDEO_STREAM_H_ #define WEBRTC_COMMON_VIDEO_INCLUDE_INCOMING_VIDEO_STREAM_H_ -#include "webrtc/base/race_checker.h" -#include "webrtc/base/task_queue.h" #include "webrtc/common_video/video_render_frames.h" #include "webrtc/media/base/videosinkinterface.h" +#include "webrtc/rtc_base/race_checker.h" +#include "webrtc/rtc_base/task_queue.h" namespace webrtc { diff --git a/webrtc/common_video/include/video_frame_buffer.h b/webrtc/common_video/include/video_frame_buffer.h index 8016c65521..cdeb7cd98c 100644 --- a/webrtc/common_video/include/video_frame_buffer.h +++ b/webrtc/common_video/include/video_frame_buffer.h @@ -14,8 +14,8 @@ #include #include "webrtc/api/video/video_frame_buffer.h" -#include "webrtc/base/callback.h" -#include "webrtc/base/scoped_ref_ptr.h" +#include "webrtc/rtc_base/callback.h" +#include "webrtc/rtc_base/scoped_ref_ptr.h" namespace webrtc { diff --git a/webrtc/common_video/incoming_video_stream.cc b/webrtc/common_video/incoming_video_stream.cc index 8f5d474870..be16cfbac0 100644 --- a/webrtc/common_video/incoming_video_stream.cc +++ b/webrtc/common_video/incoming_video_stream.cc @@ -12,9 +12,9 @@ #include -#include "webrtc/base/timeutils.h" -#include "webrtc/base/trace_event.h" #include "webrtc/common_video/video_render_frames.h" +#include "webrtc/rtc_base/timeutils.h" +#include "webrtc/rtc_base/trace_event.h" #include "webrtc/system_wrappers/include/event_wrapper.h" namespace webrtc { diff --git a/webrtc/common_video/libyuv/webrtc_libyuv.cc b/webrtc/common_video/libyuv/webrtc_libyuv.cc index 0b3957a9cf..0cb3b04969 100644 --- a/webrtc/common_video/libyuv/webrtc_libyuv.cc +++ b/webrtc/common_video/libyuv/webrtc_libyuv.cc @@ -12,7 +12,7 @@ #include -#include "webrtc/base/checks.h" +#include "webrtc/rtc_base/checks.h" // TODO(nisse): Only needed for the deprecated ConvertToI420. #include "webrtc/api/video/i420_buffer.h" diff --git a/webrtc/common_video/video_frame.cc b/webrtc/common_video/video_frame.cc index f062b732ef..862905fd2f 100644 --- a/webrtc/common_video/video_frame.cc +++ b/webrtc/common_video/video_frame.cc @@ -14,8 +14,8 @@ #include // swap -#include "webrtc/base/bind.h" -#include "webrtc/base/checks.h" +#include "webrtc/rtc_base/bind.h" +#include "webrtc/rtc_base/checks.h" namespace webrtc { diff --git a/webrtc/common_video/video_frame_buffer.cc b/webrtc/common_video/video_frame_buffer.cc index 3c4d2a0a9f..f26e627786 100644 --- a/webrtc/common_video/video_frame_buffer.cc +++ b/webrtc/common_video/video_frame_buffer.cc @@ -13,11 +13,11 @@ #include -#include "webrtc/base/checks.h" -#include "webrtc/base/keep_ref_until_done.h" #include "libyuv/convert.h" #include "libyuv/planar_functions.h" #include "libyuv/scale.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/keep_ref_until_done.h" namespace webrtc { diff --git a/webrtc/common_video/video_render_frames.cc b/webrtc/common_video/video_render_frames.cc index 31415c5306..2cb8d0cd80 100644 --- a/webrtc/common_video/video_render_frames.cc +++ b/webrtc/common_video/video_render_frames.cc @@ -12,9 +12,9 @@ #include -#include "webrtc/base/logging.h" -#include "webrtc/base/timeutils.h" #include "webrtc/modules/include/module_common_types.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/timeutils.h" #include "webrtc/system_wrappers/include/trace.h" namespace webrtc { diff --git a/webrtc/common_video/video_render_frames.h b/webrtc/common_video/video_render_frames.h index 5ed076069c..4f043e16ba 100644 --- a/webrtc/common_video/video_render_frames.h +++ b/webrtc/common_video/video_render_frames.h @@ -16,7 +16,7 @@ #include #include "webrtc/api/video/video_frame.h" -#include "webrtc/base/optional.h" +#include "webrtc/rtc_base/optional.h" namespace webrtc { diff --git a/webrtc/config.cc b/webrtc/config.cc index 36e9c3ab9a..96308da568 100644 --- a/webrtc/config.cc +++ b/webrtc/config.cc @@ -13,7 +13,7 @@ #include #include -#include "webrtc/base/checks.h" +#include "webrtc/rtc_base/checks.h" namespace webrtc { std::string NackConfig::ToString() const { diff --git a/webrtc/config.h b/webrtc/config.h index 8211a6619a..13b2f14268 100644 --- a/webrtc/config.h +++ b/webrtc/config.h @@ -16,11 +16,11 @@ #include #include -#include "webrtc/base/basictypes.h" -#include "webrtc/base/optional.h" -#include "webrtc/base/refcount.h" -#include "webrtc/base/scoped_ref_ptr.h" #include "webrtc/common_types.h" +#include "webrtc/rtc_base/basictypes.h" +#include "webrtc/rtc_base/optional.h" +#include "webrtc/rtc_base/refcount.h" +#include "webrtc/rtc_base/scoped_ref_ptr.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/config_unittest.cc b/webrtc/config_unittest.cc index 6a8e3b7747..03784d4afc 100644 --- a/webrtc/config_unittest.cc +++ b/webrtc/config_unittest.cc @@ -12,7 +12,7 @@ #include -#include "webrtc/base/gunit.h" +#include "webrtc/rtc_base/gunit.h" using webrtc::RtpExtension; diff --git a/webrtc/examples/peerconnection/client/conductor.cc b/webrtc/examples/peerconnection/client/conductor.cc index 7c41027474..8a1b9a276e 100644 --- a/webrtc/examples/peerconnection/client/conductor.cc +++ b/webrtc/examples/peerconnection/client/conductor.cc @@ -15,12 +15,12 @@ #include #include "webrtc/api/test/fakeconstraints.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/json.h" -#include "webrtc/base/logging.h" #include "webrtc/examples/peerconnection/client/defaults.h" #include "webrtc/media/engine/webrtcvideocapturerfactory.h" #include "webrtc/modules/video_capture/video_capture_factory.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/json.h" +#include "webrtc/rtc_base/logging.h" // Names used for a IceCandidate JSON object. const char kCandidateSdpMidName[] = "sdpMid"; diff --git a/webrtc/examples/peerconnection/client/defaults.cc b/webrtc/examples/peerconnection/client/defaults.cc index 5a202423a9..ed8cdb1e1c 100644 --- a/webrtc/examples/peerconnection/client/defaults.cc +++ b/webrtc/examples/peerconnection/client/defaults.cc @@ -19,7 +19,7 @@ #include #endif -#include "webrtc/base/arraysize.h" +#include "webrtc/rtc_base/arraysize.h" const char kAudioLabel[] = "audio_label"; const char kVideoLabel[] = "video_label"; diff --git a/webrtc/examples/peerconnection/client/flagdefs.h b/webrtc/examples/peerconnection/client/flagdefs.h index 19a2b02c36..f3dda765e5 100644 --- a/webrtc/examples/peerconnection/client/flagdefs.h +++ b/webrtc/examples/peerconnection/client/flagdefs.h @@ -11,7 +11,7 @@ #ifndef WEBRTC_EXAMPLES_PEERCONNECTION_CLIENT_FLAGDEFS_H_ #define WEBRTC_EXAMPLES_PEERCONNECTION_CLIENT_FLAGDEFS_H_ -#include "webrtc/base/flags.h" +#include "webrtc/rtc_base/flags.h" extern const uint16_t kDefaultServerPort; // From defaults.[h|cc] diff --git a/webrtc/examples/peerconnection/client/linux/main.cc b/webrtc/examples/peerconnection/client/linux/main.cc index 7886f766f9..d57bc982f4 100644 --- a/webrtc/examples/peerconnection/client/linux/main.cc +++ b/webrtc/examples/peerconnection/client/linux/main.cc @@ -15,8 +15,8 @@ #include "webrtc/examples/peerconnection/client/linux/main_wnd.h" #include "webrtc/examples/peerconnection/client/peer_connection_client.h" -#include "webrtc/base/ssladapter.h" -#include "webrtc/base/thread.h" +#include "webrtc/rtc_base/ssladapter.h" +#include "webrtc/rtc_base/thread.h" class CustomSocketServer : public rtc::PhysicalSocketServer { public: diff --git a/webrtc/examples/peerconnection/client/linux/main_wnd.cc b/webrtc/examples/peerconnection/client/linux/main_wnd.cc index 151faaaec1..d9f32bc52e 100644 --- a/webrtc/examples/peerconnection/client/linux/main_wnd.cc +++ b/webrtc/examples/peerconnection/client/linux/main_wnd.cc @@ -17,9 +17,9 @@ #include "libyuv/convert_from.h" #include "webrtc/api/video/i420_buffer.h" #include "webrtc/examples/peerconnection/client/defaults.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/stringutils.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/stringutils.h" using rtc::sprintfn; diff --git a/webrtc/examples/peerconnection/client/main.cc b/webrtc/examples/peerconnection/client/main.cc index 5ec1a7ae7d..bd69be9531 100644 --- a/webrtc/examples/peerconnection/client/main.cc +++ b/webrtc/examples/peerconnection/client/main.cc @@ -12,11 +12,10 @@ #include "webrtc/examples/peerconnection/client/flagdefs.h" #include "webrtc/examples/peerconnection/client/main_wnd.h" #include "webrtc/examples/peerconnection/client/peer_connection_client.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/ssladapter.h" -#include "webrtc/base/win32socketinit.h" -#include "webrtc/base/win32socketserver.h" - +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/ssladapter.h" +#include "webrtc/rtc_base/win32socketinit.h" +#include "webrtc/rtc_base/win32socketserver.h" int PASCAL wWinMain(HINSTANCE instance, HINSTANCE prev_instance, wchar_t* cmd_line, int cmd_show) { diff --git a/webrtc/examples/peerconnection/client/main_wnd.cc b/webrtc/examples/peerconnection/client/main_wnd.cc index e7c4c6e922..da21c5f953 100644 --- a/webrtc/examples/peerconnection/client/main_wnd.cc +++ b/webrtc/examples/peerconnection/client/main_wnd.cc @@ -15,9 +15,9 @@ #include "libyuv/convert_argb.h" #include "webrtc/api/video/i420_buffer.h" #include "webrtc/examples/peerconnection/client/defaults.h" -#include "webrtc/base/arraysize.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/logging.h" +#include "webrtc/rtc_base/arraysize.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/logging.h" ATOM MainWnd::wnd_class_ = 0; const wchar_t MainWnd::kClassName[] = L"WebRTC_MainWnd"; diff --git a/webrtc/examples/peerconnection/client/main_wnd.h b/webrtc/examples/peerconnection/client/main_wnd.h index 01c8823f0e..18f56a708d 100644 --- a/webrtc/examples/peerconnection/client/main_wnd.h +++ b/webrtc/examples/peerconnection/client/main_wnd.h @@ -17,10 +17,10 @@ #include "webrtc/api/mediastreaminterface.h" #include "webrtc/api/video/video_frame.h" -#include "webrtc/base/win32.h" #include "webrtc/examples/peerconnection/client/peer_connection_client.h" #include "webrtc/media/base/mediachannel.h" #include "webrtc/media/base/videocommon.h" +#include "webrtc/rtc_base/win32.h" class MainWndCallback { public: diff --git a/webrtc/examples/peerconnection/client/peer_connection_client.cc b/webrtc/examples/peerconnection/client/peer_connection_client.cc index 8c391a8368..2f5916774c 100644 --- a/webrtc/examples/peerconnection/client/peer_connection_client.cc +++ b/webrtc/examples/peerconnection/client/peer_connection_client.cc @@ -10,15 +10,15 @@ #include "webrtc/examples/peerconnection/client/peer_connection_client.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/nethelpers.h" -#include "webrtc/base/stringutils.h" -#include "webrtc/base/thread.h" #include "webrtc/examples/peerconnection/client/defaults.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/nethelpers.h" +#include "webrtc/rtc_base/stringutils.h" +#include "webrtc/rtc_base/thread.h" #ifdef WIN32 -#include "webrtc/base/win32socketserver.h" +#include "webrtc/rtc_base/win32socketserver.h" #endif using rtc::sprintfn; diff --git a/webrtc/examples/peerconnection/client/peer_connection_client.h b/webrtc/examples/peerconnection/client/peer_connection_client.h index a15924bc05..2b4f35c2aa 100644 --- a/webrtc/examples/peerconnection/client/peer_connection_client.h +++ b/webrtc/examples/peerconnection/client/peer_connection_client.h @@ -15,10 +15,10 @@ #include #include -#include "webrtc/base/messagehandler.h" -#include "webrtc/base/nethelpers.h" -#include "webrtc/base/physicalsocketserver.h" -#include "webrtc/base/sigslot.h" +#include "webrtc/rtc_base/messagehandler.h" +#include "webrtc/rtc_base/nethelpers.h" +#include "webrtc/rtc_base/physicalsocketserver.h" +#include "webrtc/rtc_base/sigslot.h" typedef std::map Peers; diff --git a/webrtc/examples/peerconnection/server/peer_channel.cc b/webrtc/examples/peerconnection/server/peer_channel.cc index 35d592eb76..5a0585b799 100644 --- a/webrtc/examples/peerconnection/server/peer_channel.cc +++ b/webrtc/examples/peerconnection/server/peer_channel.cc @@ -18,8 +18,8 @@ #include "webrtc/examples/peerconnection/server/data_socket.h" #include "webrtc/examples/peerconnection/server/utils.h" -#include "webrtc/base/stringencode.h" -#include "webrtc/base/stringutils.h" +#include "webrtc/rtc_base/stringencode.h" +#include "webrtc/rtc_base/stringutils.h" using rtc::sprintfn; diff --git a/webrtc/examples/peerconnection/server/utils.cc b/webrtc/examples/peerconnection/server/utils.cc index 93a6d05342..85f5f9e225 100644 --- a/webrtc/examples/peerconnection/server/utils.cc +++ b/webrtc/examples/peerconnection/server/utils.cc @@ -12,7 +12,7 @@ #include -#include "webrtc/base/stringencode.h" +#include "webrtc/rtc_base/stringencode.h" using rtc::ToString; diff --git a/webrtc/examples/relayserver/relayserver_main.cc b/webrtc/examples/relayserver/relayserver_main.cc index c14ea459c8..02f5438c03 100644 --- a/webrtc/examples/relayserver/relayserver_main.cc +++ b/webrtc/examples/relayserver/relayserver_main.cc @@ -12,7 +12,7 @@ #include #include "webrtc/p2p/base/relayserver.h" -#include "webrtc/base/thread.h" +#include "webrtc/rtc_base/thread.h" int main(int argc, char **argv) { if (argc != 3) { diff --git a/webrtc/examples/stunprober/main.cc b/webrtc/examples/stunprober/main.cc index a3ce992e9f..8c3b424f82 100644 --- a/webrtc/examples/stunprober/main.cc +++ b/webrtc/examples/stunprober/main.cc @@ -16,18 +16,18 @@ #include #include -#include "webrtc/base/checks.h" -#include "webrtc/base/flags.h" -#include "webrtc/base/helpers.h" -#include "webrtc/base/nethelpers.h" -#include "webrtc/base/network.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/ssladapter.h" -#include "webrtc/base/stringutils.h" -#include "webrtc/base/thread.h" -#include "webrtc/base/timeutils.h" #include "webrtc/p2p/base/basicpacketsocketfactory.h" #include "webrtc/p2p/stunprober/stunprober.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/flags.h" +#include "webrtc/rtc_base/helpers.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/nethelpers.h" +#include "webrtc/rtc_base/network.h" +#include "webrtc/rtc_base/ssladapter.h" +#include "webrtc/rtc_base/stringutils.h" +#include "webrtc/rtc_base/thread.h" +#include "webrtc/rtc_base/timeutils.h" using stunprober::StunProber; using stunprober::AsyncCallback; diff --git a/webrtc/examples/stunserver/stunserver_main.cc b/webrtc/examples/stunserver/stunserver_main.cc index 9bdf58ac3f..b084606e69 100644 --- a/webrtc/examples/stunserver/stunserver_main.cc +++ b/webrtc/examples/stunserver/stunserver_main.cc @@ -15,7 +15,7 @@ #include #include "webrtc/p2p/base/stunserver.h" -#include "webrtc/base/thread.h" +#include "webrtc/rtc_base/thread.h" using cricket::StunServer; diff --git a/webrtc/examples/turnserver/turnserver_main.cc b/webrtc/examples/turnserver/turnserver_main.cc index e7b464f19c..c232ce9ad7 100644 --- a/webrtc/examples/turnserver/turnserver_main.cc +++ b/webrtc/examples/turnserver/turnserver_main.cc @@ -12,10 +12,10 @@ #include "webrtc/p2p/base/basicpacketsocketfactory.h" #include "webrtc/p2p/base/turnserver.h" -#include "webrtc/base/asyncudpsocket.h" -#include "webrtc/base/optionsfile.h" -#include "webrtc/base/stringencode.h" -#include "webrtc/base/thread.h" +#include "webrtc/rtc_base/asyncudpsocket.h" +#include "webrtc/rtc_base/optionsfile.h" +#include "webrtc/rtc_base/stringencode.h" +#include "webrtc/rtc_base/thread.h" static const char kSoftware[] = "libjingle TurnServer"; diff --git a/webrtc/examples/unityplugin/simple_peer_connection.cc b/webrtc/examples/unityplugin/simple_peer_connection.cc index ee959b7aab..c302e9c433 100644 --- a/webrtc/examples/unityplugin/simple_peer_connection.cc +++ b/webrtc/examples/unityplugin/simple_peer_connection.cc @@ -13,9 +13,9 @@ #include #include "webrtc/api/test/fakeconstraints.h" -#include "webrtc/base/json.h" #include "webrtc/media/engine/webrtcvideocapturerfactory.h" #include "webrtc/modules/video_capture/video_capture_factory.h" +#include "webrtc/rtc_base/json.h" // Names used for a IceCandidate JSON object. const char kCandidateSdpMidName[] = "sdpMid"; diff --git a/webrtc/logging/rtc_event_log/rtc_event_log.cc b/webrtc/logging/rtc_event_log/rtc_event_log.cc index 6b0783116a..c2f17b7680 100644 --- a/webrtc/logging/rtc_event_log/rtc_event_log.cc +++ b/webrtc/logging/rtc_event_log/rtc_event_log.cc @@ -13,15 +13,6 @@ #include #include -#include "webrtc/base/atomicops.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/constructormagic.h" -#include "webrtc/base/event.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/protobuf_utils.h" -#include "webrtc/base/swap_queue.h" -#include "webrtc/base/thread_checker.h" -#include "webrtc/base/timeutils.h" #include "webrtc/logging/rtc_event_log/rtc_event_log_helper_thread.h" #include "webrtc/modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor.h" #include "webrtc/modules/remote_bitrate_estimator/include/bwe_defines.h" @@ -37,6 +28,15 @@ #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/rtpfb.h" #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/sdes.h" #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/sender_report.h" +#include "webrtc/rtc_base/atomicops.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/constructormagic.h" +#include "webrtc/rtc_base/event.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/protobuf_utils.h" +#include "webrtc/rtc_base/swap_queue.h" +#include "webrtc/rtc_base/thread_checker.h" +#include "webrtc/rtc_base/timeutils.h" #include "webrtc/system_wrappers/include/file_wrapper.h" #ifdef ENABLE_RTC_EVENT_LOG diff --git a/webrtc/logging/rtc_event_log/rtc_event_log.h b/webrtc/logging/rtc_event_log/rtc_event_log.h index 0d45552bb1..dc3351120c 100644 --- a/webrtc/logging/rtc_event_log/rtc_event_log.h +++ b/webrtc/logging/rtc_event_log/rtc_event_log.h @@ -15,8 +15,8 @@ #include #include -#include "webrtc/base/platform_file.h" #include "webrtc/config.h" +#include "webrtc/rtc_base/platform_file.h" namespace webrtc { diff --git a/webrtc/logging/rtc_event_log/rtc_event_log2rtp_dump.cc b/webrtc/logging/rtc_event_log/rtc_event_log2rtp_dump.cc index e22f1f31a8..23d69416e7 100644 --- a/webrtc/logging/rtc_event_log/rtc_event_log2rtp_dump.cc +++ b/webrtc/logging/rtc_event_log/rtc_event_log2rtp_dump.cc @@ -14,11 +14,11 @@ #include #include "gflags/gflags.h" -#include "webrtc/base/checks.h" #include "webrtc/logging/rtc_event_log/rtc_event_log.h" #include "webrtc/logging/rtc_event_log/rtc_event_log_parser.h" #include "webrtc/modules/rtp_rtcp/source/byte_io.h" #include "webrtc/modules/rtp_rtcp/source/rtp_utility.h" +#include "webrtc/rtc_base/checks.h" #include "webrtc/test/rtp_file_writer.h" namespace { diff --git a/webrtc/logging/rtc_event_log/rtc_event_log2stats.cc b/webrtc/logging/rtc_event_log/rtc_event_log2stats.cc index 8d24e318e7..eb290b8845 100644 --- a/webrtc/logging/rtc_event_log/rtc_event_log2stats.cc +++ b/webrtc/logging/rtc_event_log/rtc_event_log2stats.cc @@ -20,10 +20,10 @@ #include #include "gflags/gflags.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/ignore_wundef.h" -#include "webrtc/base/logging.h" #include "webrtc/logging/rtc_event_log/rtc_event_log.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/ignore_wundef.h" +#include "webrtc/rtc_base/logging.h" // Files generated at build-time by the protobuf compiler. RTC_PUSH_IGNORING_WUNDEF() diff --git a/webrtc/logging/rtc_event_log/rtc_event_log2text.cc b/webrtc/logging/rtc_event_log/rtc_event_log2text.cc index 7467ae62ab..c17a3b5802 100644 --- a/webrtc/logging/rtc_event_log/rtc_event_log2text.cc +++ b/webrtc/logging/rtc_event_log/rtc_event_log2text.cc @@ -15,7 +15,6 @@ #include // pair #include "gflags/gflags.h" -#include "webrtc/base/checks.h" #include "webrtc/common_types.h" #include "webrtc/logging/rtc_event_log/rtc_event_log_parser.h" #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/bye.h" @@ -33,6 +32,7 @@ #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmbr.h" #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h" #include "webrtc/modules/rtp_rtcp/source/rtp_utility.h" +#include "webrtc/rtc_base/checks.h" namespace { diff --git a/webrtc/logging/rtc_event_log/rtc_event_log_helper_thread.cc b/webrtc/logging/rtc_event_log/rtc_event_log_helper_thread.cc index cdc30f9c36..a98336fa52 100644 --- a/webrtc/logging/rtc_event_log/rtc_event_log_helper_thread.cc +++ b/webrtc/logging/rtc_event_log/rtc_event_log_helper_thread.cc @@ -12,9 +12,9 @@ #include -#include "webrtc/base/checks.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/timeutils.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/timeutils.h" #ifdef ENABLE_RTC_EVENT_LOG diff --git a/webrtc/logging/rtc_event_log/rtc_event_log_helper_thread.h b/webrtc/logging/rtc_event_log/rtc_event_log_helper_thread.h index e8a983c9d8..0d9ad4dc96 100644 --- a/webrtc/logging/rtc_event_log/rtc_event_log_helper_thread.h +++ b/webrtc/logging/rtc_event_log/rtc_event_log_helper_thread.h @@ -17,12 +17,12 @@ #include #include -#include "webrtc/base/constructormagic.h" -#include "webrtc/base/event.h" -#include "webrtc/base/ignore_wundef.h" -#include "webrtc/base/platform_thread.h" -#include "webrtc/base/protobuf_utils.h" -#include "webrtc/base/swap_queue.h" +#include "webrtc/rtc_base/constructormagic.h" +#include "webrtc/rtc_base/event.h" +#include "webrtc/rtc_base/ignore_wundef.h" +#include "webrtc/rtc_base/platform_thread.h" +#include "webrtc/rtc_base/protobuf_utils.h" +#include "webrtc/rtc_base/swap_queue.h" #include "webrtc/system_wrappers/include/file_wrapper.h" #ifdef ENABLE_RTC_EVENT_LOG diff --git a/webrtc/logging/rtc_event_log/rtc_event_log_parser.cc b/webrtc/logging/rtc_event_log/rtc_event_log_parser.cc index 78dd4fdce7..8a8d8e3d47 100644 --- a/webrtc/logging/rtc_event_log/rtc_event_log_parser.cc +++ b/webrtc/logging/rtc_event_log/rtc_event_log_parser.cc @@ -19,13 +19,13 @@ #include #include -#include "webrtc/base/checks.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/protobuf_utils.h" #include "webrtc/logging/rtc_event_log/rtc_event_log.h" #include "webrtc/modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor.h" #include "webrtc/modules/remote_bitrate_estimator/include/bwe_defines.h" #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/protobuf_utils.h" namespace webrtc { diff --git a/webrtc/logging/rtc_event_log/rtc_event_log_parser.h b/webrtc/logging/rtc_event_log/rtc_event_log_parser.h index cd431bf111..cf2f22e865 100644 --- a/webrtc/logging/rtc_event_log/rtc_event_log_parser.h +++ b/webrtc/logging/rtc_event_log/rtc_event_log_parser.h @@ -15,10 +15,10 @@ #include // pair #include -#include "webrtc/base/ignore_wundef.h" #include "webrtc/logging/rtc_event_log/rtc_event_log.h" #include "webrtc/modules/rtp_rtcp/include/rtp_header_extension_map.h" #include "webrtc/modules/rtp_rtcp/source/byte_io.h" +#include "webrtc/rtc_base/ignore_wundef.h" #include "webrtc/video_receive_stream.h" #include "webrtc/video_send_stream.h" diff --git a/webrtc/logging/rtc_event_log/rtc_event_log_unittest.cc b/webrtc/logging/rtc_event_log/rtc_event_log_unittest.cc index 0a13be3a30..e908ccd5fb 100644 --- a/webrtc/logging/rtc_event_log/rtc_event_log_unittest.cc +++ b/webrtc/logging/rtc_event_log/rtc_event_log_unittest.cc @@ -14,10 +14,6 @@ #include #include -#include "webrtc/base/buffer.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/fakeclock.h" -#include "webrtc/base/random.h" #include "webrtc/call/call.h" #include "webrtc/logging/rtc_event_log/rtc_event_log.h" #include "webrtc/logging/rtc_event_log/rtc_event_log_parser.h" @@ -29,6 +25,10 @@ #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/sender_report.h" #include "webrtc/modules/rtp_rtcp/source/rtp_header_extensions.h" #include "webrtc/modules/rtp_rtcp/source/rtp_packet_to_send.h" +#include "webrtc/rtc_base/buffer.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/fakeclock.h" +#include "webrtc/rtc_base/random.h" #include "webrtc/test/gtest.h" #include "webrtc/test/testsupport/fileutils.h" diff --git a/webrtc/logging/rtc_event_log/rtc_event_log_unittest_helper.cc b/webrtc/logging/rtc_event_log/rtc_event_log_unittest_helper.cc index 280158dcff..9d98855d4a 100644 --- a/webrtc/logging/rtc_event_log/rtc_event_log_unittest_helper.cc +++ b/webrtc/logging/rtc_event_log/rtc_event_log_unittest_helper.cc @@ -15,9 +15,9 @@ #include #include -#include "webrtc/base/checks.h" #include "webrtc/modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor.h" #include "webrtc/modules/remote_bitrate_estimator/include/bwe_defines.h" +#include "webrtc/rtc_base/checks.h" #include "webrtc/test/gtest.h" #include "webrtc/test/testsupport/fileutils.h" diff --git a/webrtc/media/base/codec.cc b/webrtc/media/base/codec.cc index 49c990e78b..a94940227b 100644 --- a/webrtc/media/base/codec.cc +++ b/webrtc/media/base/codec.cc @@ -13,11 +13,11 @@ #include #include -#include "webrtc/base/checks.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/stringencode.h" -#include "webrtc/base/stringutils.h" #include "webrtc/media/base/h264_profile_level_id.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/stringencode.h" +#include "webrtc/rtc_base/stringutils.h" namespace cricket { diff --git a/webrtc/media/base/codec_unittest.cc b/webrtc/media/base/codec_unittest.cc index f59304ca9d..26966bbcba 100644 --- a/webrtc/media/base/codec_unittest.cc +++ b/webrtc/media/base/codec_unittest.cc @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/base/gunit.h" #include "webrtc/media/base/codec.h" +#include "webrtc/rtc_base/gunit.h" using cricket::AudioCodec; using cricket::Codec; diff --git a/webrtc/media/base/device.h b/webrtc/media/base/device.h index 621dd15dc9..7eb630f7da 100644 --- a/webrtc/media/base/device.h +++ b/webrtc/media/base/device.h @@ -11,7 +11,7 @@ #ifndef WEBRTC_MEDIA_BASE_DEVICE_H_ #define WEBRTC_MEDIA_BASE_DEVICE_H_ -#include "webrtc/base/stringencode.h" +#include "webrtc/rtc_base/stringencode.h" namespace cricket { diff --git a/webrtc/media/base/fakemediaengine.h b/webrtc/media/base/fakemediaengine.h index 04dfae0a59..0082391d76 100644 --- a/webrtc/media/base/fakemediaengine.h +++ b/webrtc/media/base/fakemediaengine.h @@ -19,16 +19,16 @@ #include #include "webrtc/api/call/audio_sink.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/copyonwritebuffer.h" -#include "webrtc/base/networkroute.h" -#include "webrtc/base/stringutils.h" #include "webrtc/media/base/audiosource.h" #include "webrtc/media/base/mediaengine.h" #include "webrtc/media/base/rtputils.h" #include "webrtc/media/base/streamparams.h" #include "webrtc/modules/audio_processing/include/audio_processing.h" #include "webrtc/p2p/base/sessiondescription.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/copyonwritebuffer.h" +#include "webrtc/rtc_base/networkroute.h" +#include "webrtc/rtc_base/stringutils.h" using webrtc::RtpExtension; diff --git a/webrtc/media/base/fakenetworkinterface.h b/webrtc/media/base/fakenetworkinterface.h index ed8b2326d2..a6a40ed1e8 100644 --- a/webrtc/media/base/fakenetworkinterface.h +++ b/webrtc/media/base/fakenetworkinterface.h @@ -14,15 +14,15 @@ #include #include -#include "webrtc/base/byteorder.h" -#include "webrtc/base/copyonwritebuffer.h" -#include "webrtc/base/criticalsection.h" -#include "webrtc/base/dscp.h" -#include "webrtc/base/messagehandler.h" -#include "webrtc/base/messagequeue.h" -#include "webrtc/base/thread.h" #include "webrtc/media/base/mediachannel.h" #include "webrtc/media/base/rtputils.h" +#include "webrtc/rtc_base/byteorder.h" +#include "webrtc/rtc_base/copyonwritebuffer.h" +#include "webrtc/rtc_base/criticalsection.h" +#include "webrtc/rtc_base/dscp.h" +#include "webrtc/rtc_base/messagehandler.h" +#include "webrtc/rtc_base/messagequeue.h" +#include "webrtc/rtc_base/thread.h" namespace cricket { diff --git a/webrtc/media/base/fakertp.cc b/webrtc/media/base/fakertp.cc index f9c880f98b..1c67d87544 100644 --- a/webrtc/media/base/fakertp.cc +++ b/webrtc/media/base/fakertp.cc @@ -10,8 +10,8 @@ #include -#include "webrtc/base/gunit.h" #include "webrtc/media/base/fakertp.h" +#include "webrtc/rtc_base/gunit.h" void CompareHeaderExtensions(const char* packet1, size_t packet1_size, const char* packet2, size_t packet2_size, diff --git a/webrtc/media/base/fakevideocapturer.h b/webrtc/media/base/fakevideocapturer.h index 34f9dbf48b..f5148df642 100644 --- a/webrtc/media/base/fakevideocapturer.h +++ b/webrtc/media/base/fakevideocapturer.h @@ -18,9 +18,9 @@ #include "webrtc/api/video/i420_buffer.h" #include "webrtc/api/video/video_frame.h" -#include "webrtc/base/timeutils.h" #include "webrtc/media/base/videocapturer.h" #include "webrtc/media/base/videocommon.h" +#include "webrtc/rtc_base/timeutils.h" namespace cricket { diff --git a/webrtc/media/base/fakevideorenderer.h b/webrtc/media/base/fakevideorenderer.h index a678c97510..a6753d2743 100644 --- a/webrtc/media/base/fakevideorenderer.h +++ b/webrtc/media/base/fakevideorenderer.h @@ -12,9 +12,9 @@ #define WEBRTC_MEDIA_BASE_FAKEVIDEORENDERER_H_ #include "webrtc/api/video/video_frame.h" -#include "webrtc/base/criticalsection.h" -#include "webrtc/base/logging.h" #include "webrtc/media/base/videosinkinterface.h" +#include "webrtc/rtc_base/criticalsection.h" +#include "webrtc/rtc_base/logging.h" namespace cricket { diff --git a/webrtc/media/base/h264_profile_level_id.cc b/webrtc/media/base/h264_profile_level_id.cc index a651d530a9..3f43a30008 100644 --- a/webrtc/media/base/h264_profile_level_id.cc +++ b/webrtc/media/base/h264_profile_level_id.cc @@ -14,7 +14,7 @@ #include #include -#include "webrtc/base/arraysize.h" +#include "webrtc/rtc_base/arraysize.h" namespace webrtc { namespace H264 { diff --git a/webrtc/media/base/h264_profile_level_id.h b/webrtc/media/base/h264_profile_level_id.h index de5eedb16f..7b1d8c5c80 100644 --- a/webrtc/media/base/h264_profile_level_id.h +++ b/webrtc/media/base/h264_profile_level_id.h @@ -14,8 +14,8 @@ #include #include -#include "webrtc/base/optional.h" #include "webrtc/common_types.h" +#include "webrtc/rtc_base/optional.h" namespace webrtc { namespace H264 { diff --git a/webrtc/media/base/mediachannel.h b/webrtc/media/base/mediachannel.h index 1bea916f30..de2a7cdd4e 100644 --- a/webrtc/media/base/mediachannel.h +++ b/webrtc/media/base/mediachannel.h @@ -18,22 +18,22 @@ #include "webrtc/api/rtpparameters.h" #include "webrtc/api/rtpreceiverinterface.h" #include "webrtc/api/video/video_timing.h" -#include "webrtc/base/basictypes.h" -#include "webrtc/base/buffer.h" -#include "webrtc/base/copyonwritebuffer.h" -#include "webrtc/base/dscp.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/networkroute.h" -#include "webrtc/base/optional.h" -#include "webrtc/base/sigslot.h" -#include "webrtc/base/socket.h" -#include "webrtc/base/window.h" #include "webrtc/config.h" #include "webrtc/media/base/codec.h" #include "webrtc/media/base/mediaconstants.h" #include "webrtc/media/base/streamparams.h" #include "webrtc/media/base/videosinkinterface.h" #include "webrtc/media/base/videosourceinterface.h" +#include "webrtc/rtc_base/basictypes.h" +#include "webrtc/rtc_base/buffer.h" +#include "webrtc/rtc_base/copyonwritebuffer.h" +#include "webrtc/rtc_base/dscp.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/networkroute.h" +#include "webrtc/rtc_base/optional.h" +#include "webrtc/rtc_base/sigslot.h" +#include "webrtc/rtc_base/socket.h" +#include "webrtc/rtc_base/window.h" // TODO(juberti): re-evaluate this include #include "webrtc/pc/audiomonitor.h" diff --git a/webrtc/media/base/mediaengine.h b/webrtc/media/base/mediaengine.h index 911b971648..8ce60753d0 100644 --- a/webrtc/media/base/mediaengine.h +++ b/webrtc/media/base/mediaengine.h @@ -21,11 +21,11 @@ #include "webrtc/api/audio_codecs/audio_decoder_factory.h" #include "webrtc/api/audio_codecs/audio_encoder_factory.h" #include "webrtc/api/rtpparameters.h" -#include "webrtc/base/fileutils.h" #include "webrtc/call/audio_state.h" #include "webrtc/media/base/codec.h" #include "webrtc/media/base/mediachannel.h" #include "webrtc/media/base/videocommon.h" +#include "webrtc/rtc_base/fileutils.h" #if defined(GOOGLE_CHROME_BUILD) || defined(CHROMIUM_BUILD) #define DISABLE_MEDIA_ENGINE_FACTORY diff --git a/webrtc/media/base/rtpdataengine.cc b/webrtc/media/base/rtpdataengine.cc index 96f5a3b95f..89099e712d 100644 --- a/webrtc/media/base/rtpdataengine.cc +++ b/webrtc/media/base/rtpdataengine.cc @@ -10,15 +10,15 @@ #include "webrtc/media/base/rtpdataengine.h" -#include "webrtc/base/copyonwritebuffer.h" -#include "webrtc/base/helpers.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/ratelimiter.h" -#include "webrtc/base/stringutils.h" #include "webrtc/media/base/codec.h" #include "webrtc/media/base/mediaconstants.h" #include "webrtc/media/base/rtputils.h" #include "webrtc/media/base/streamparams.h" +#include "webrtc/rtc_base/copyonwritebuffer.h" +#include "webrtc/rtc_base/helpers.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/ratelimiter.h" +#include "webrtc/rtc_base/stringutils.h" namespace cricket { diff --git a/webrtc/media/base/rtpdataengine_unittest.cc b/webrtc/media/base/rtpdataengine_unittest.cc index dca509df8a..a06040ae0a 100644 --- a/webrtc/media/base/rtpdataengine_unittest.cc +++ b/webrtc/media/base/rtpdataengine_unittest.cc @@ -11,14 +11,14 @@ #include #include -#include "webrtc/base/copyonwritebuffer.h" -#include "webrtc/base/gunit.h" -#include "webrtc/base/helpers.h" -#include "webrtc/base/ssladapter.h" #include "webrtc/media/base/fakenetworkinterface.h" #include "webrtc/media/base/mediaconstants.h" #include "webrtc/media/base/rtpdataengine.h" #include "webrtc/media/base/rtputils.h" +#include "webrtc/rtc_base/copyonwritebuffer.h" +#include "webrtc/rtc_base/gunit.h" +#include "webrtc/rtc_base/helpers.h" +#include "webrtc/rtc_base/ssladapter.h" class FakeDataReceiver : public sigslot::has_slots<> { public: diff --git a/webrtc/media/base/rtputils.cc b/webrtc/media/base/rtputils.cc index 1f81d621c4..ea1c91971e 100644 --- a/webrtc/media/base/rtputils.cc +++ b/webrtc/media/base/rtputils.cc @@ -12,10 +12,10 @@ // PacketTimeUpdateParams is defined in asyncpacketsocket.h. // TODO(sergeyu): Find more appropriate place for PacketTimeUpdateParams. -#include "webrtc/base/asyncpacketsocket.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/messagedigest.h" #include "webrtc/media/base/turnutils.h" +#include "webrtc/rtc_base/asyncpacketsocket.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/messagedigest.h" namespace cricket { diff --git a/webrtc/media/base/rtputils.h b/webrtc/media/base/rtputils.h index f7aa85c828..a823cf7eef 100644 --- a/webrtc/media/base/rtputils.h +++ b/webrtc/media/base/rtputils.h @@ -11,7 +11,7 @@ #ifndef WEBRTC_MEDIA_BASE_RTPUTILS_H_ #define WEBRTC_MEDIA_BASE_RTPUTILS_H_ -#include "webrtc/base/byteorder.h" +#include "webrtc/rtc_base/byteorder.h" namespace rtc { struct PacketTimeUpdateParams; diff --git a/webrtc/media/base/rtputils_unittest.cc b/webrtc/media/base/rtputils_unittest.cc index e6597bdcae..2a998eab6e 100644 --- a/webrtc/media/base/rtputils_unittest.cc +++ b/webrtc/media/base/rtputils_unittest.cc @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/base/asyncpacketsocket.h" -#include "webrtc/base/gunit.h" -#include "webrtc/media/base/fakertp.h" #include "webrtc/media/base/rtputils.h" +#include "webrtc/media/base/fakertp.h" +#include "webrtc/rtc_base/asyncpacketsocket.h" +#include "webrtc/rtc_base/gunit.h" namespace cricket { diff --git a/webrtc/media/base/streamparams.h b/webrtc/media/base/streamparams.h index 5d7feafbe3..1fc8134017 100644 --- a/webrtc/media/base/streamparams.h +++ b/webrtc/media/base/streamparams.h @@ -33,7 +33,7 @@ #include #include -#include "webrtc/base/constructormagic.h" +#include "webrtc/rtc_base/constructormagic.h" namespace cricket { diff --git a/webrtc/media/base/streamparams_unittest.cc b/webrtc/media/base/streamparams_unittest.cc index dc48a721ac..9dc034c829 100644 --- a/webrtc/media/base/streamparams_unittest.cc +++ b/webrtc/media/base/streamparams_unittest.cc @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/base/arraysize.h" -#include "webrtc/base/gunit.h" #include "webrtc/media/base/streamparams.h" #include "webrtc/media/base/testutils.h" +#include "webrtc/rtc_base/arraysize.h" +#include "webrtc/rtc_base/gunit.h" static const uint32_t kSsrcs1[] = {1}; static const uint32_t kSsrcs2[] = {1, 2}; diff --git a/webrtc/media/base/testutils.cc b/webrtc/media/base/testutils.cc index aa92aea1a1..ac40df8743 100644 --- a/webrtc/media/base/testutils.cc +++ b/webrtc/media/base/testutils.cc @@ -15,14 +15,14 @@ #include #include "webrtc/api/video/video_frame.h" -#include "webrtc/base/bytebuffer.h" -#include "webrtc/base/fileutils.h" -#include "webrtc/base/gunit.h" -#include "webrtc/base/pathutils.h" -#include "webrtc/base/stream.h" -#include "webrtc/base/stringutils.h" -#include "webrtc/base/testutils.h" #include "webrtc/media/base/videocapturer.h" +#include "webrtc/rtc_base/bytebuffer.h" +#include "webrtc/rtc_base/fileutils.h" +#include "webrtc/rtc_base/gunit.h" +#include "webrtc/rtc_base/pathutils.h" +#include "webrtc/rtc_base/stream.h" +#include "webrtc/rtc_base/stringutils.h" +#include "webrtc/rtc_base/testutils.h" namespace cricket { diff --git a/webrtc/media/base/testutils.h b/webrtc/media/base/testutils.h index f7cb934bb0..a7cb216bc6 100644 --- a/webrtc/media/base/testutils.h +++ b/webrtc/media/base/testutils.h @@ -14,13 +14,13 @@ #include #include -#include "webrtc/base/arraysize.h" -#include "webrtc/base/basictypes.h" -#include "webrtc/base/sigslot.h" -#include "webrtc/base/window.h" #include "webrtc/media/base/mediachannel.h" #include "webrtc/media/base/videocapturer.h" #include "webrtc/media/base/videocommon.h" +#include "webrtc/rtc_base/arraysize.h" +#include "webrtc/rtc_base/basictypes.h" +#include "webrtc/rtc_base/sigslot.h" +#include "webrtc/rtc_base/window.h" namespace rtc { class ByteBufferReader; diff --git a/webrtc/media/base/turnutils.cc b/webrtc/media/base/turnutils.cc index 1fd396084d..f1daec48dd 100644 --- a/webrtc/media/base/turnutils.cc +++ b/webrtc/media/base/turnutils.cc @@ -10,9 +10,9 @@ #include "webrtc/media/base/turnutils.h" -#include "webrtc/base/byteorder.h" -#include "webrtc/base/checks.h" #include "webrtc/p2p/base/stun.h" +#include "webrtc/rtc_base/byteorder.h" +#include "webrtc/rtc_base/checks.h" namespace cricket { diff --git a/webrtc/media/base/turnutils_unittest.cc b/webrtc/media/base/turnutils_unittest.cc index 1a9951b7cd..72b1f7b0e0 100644 --- a/webrtc/media/base/turnutils_unittest.cc +++ b/webrtc/media/base/turnutils_unittest.cc @@ -12,7 +12,7 @@ #include -#include "webrtc/base/gunit.h" +#include "webrtc/rtc_base/gunit.h" namespace cricket { diff --git a/webrtc/media/base/videoadapter.cc b/webrtc/media/base/videoadapter.cc index bee2a57301..73a5638bb3 100644 --- a/webrtc/media/base/videoadapter.cc +++ b/webrtc/media/base/videoadapter.cc @@ -15,12 +15,12 @@ #include #include -#include "webrtc/base/arraysize.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/optional.h" #include "webrtc/media/base/mediaconstants.h" #include "webrtc/media/base/videocommon.h" +#include "webrtc/rtc_base/arraysize.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/optional.h" namespace { struct Fraction { diff --git a/webrtc/media/base/videoadapter.h b/webrtc/media/base/videoadapter.h index eb2257b9e0..135f411b0a 100644 --- a/webrtc/media/base/videoadapter.h +++ b/webrtc/media/base/videoadapter.h @@ -11,10 +11,10 @@ #ifndef WEBRTC_MEDIA_BASE_VIDEOADAPTER_H_ #define WEBRTC_MEDIA_BASE_VIDEOADAPTER_H_ -#include "webrtc/base/constructormagic.h" -#include "webrtc/base/criticalsection.h" -#include "webrtc/base/optional.h" #include "webrtc/media/base/videocommon.h" +#include "webrtc/rtc_base/constructormagic.h" +#include "webrtc/rtc_base/criticalsection.h" +#include "webrtc/rtc_base/optional.h" namespace cricket { diff --git a/webrtc/media/base/videoadapter_unittest.cc b/webrtc/media/base/videoadapter_unittest.cc index cd9df981bc..d3a66c189d 100644 --- a/webrtc/media/base/videoadapter_unittest.cc +++ b/webrtc/media/base/videoadapter_unittest.cc @@ -14,12 +14,12 @@ #include #include -#include "webrtc/base/gunit.h" -#include "webrtc/base/logging.h" #include "webrtc/media/base/fakevideocapturer.h" #include "webrtc/media/base/mediachannel.h" #include "webrtc/media/base/testutils.h" #include "webrtc/media/base/videoadapter.h" +#include "webrtc/rtc_base/gunit.h" +#include "webrtc/rtc_base/logging.h" namespace cricket { namespace { diff --git a/webrtc/media/base/videobroadcaster.cc b/webrtc/media/base/videobroadcaster.cc index c5b1484110..8bd65c4fa4 100644 --- a/webrtc/media/base/videobroadcaster.cc +++ b/webrtc/media/base/videobroadcaster.cc @@ -13,8 +13,8 @@ #include #include "webrtc/api/video/i420_buffer.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/logging.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/logging.h" namespace rtc { diff --git a/webrtc/media/base/videobroadcaster.h b/webrtc/media/base/videobroadcaster.h index ccf5b3dd91..312ec7be1f 100644 --- a/webrtc/media/base/videobroadcaster.h +++ b/webrtc/media/base/videobroadcaster.h @@ -16,10 +16,10 @@ #include #include "webrtc/api/video/video_frame.h" -#include "webrtc/base/criticalsection.h" -#include "webrtc/base/thread_checker.h" #include "webrtc/media/base/videosinkinterface.h" #include "webrtc/media/base/videosourcebase.h" +#include "webrtc/rtc_base/criticalsection.h" +#include "webrtc/rtc_base/thread_checker.h" namespace rtc { diff --git a/webrtc/media/base/videobroadcaster_unittest.cc b/webrtc/media/base/videobroadcaster_unittest.cc index ad9ccb7dbc..5e934e7e70 100644 --- a/webrtc/media/base/videobroadcaster_unittest.cc +++ b/webrtc/media/base/videobroadcaster_unittest.cc @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ +#include "webrtc/media/base/videobroadcaster.h" #include "webrtc/api/video/i420_buffer.h" #include "webrtc/api/video/video_frame.h" -#include "webrtc/base/gunit.h" #include "webrtc/media/base/fakevideorenderer.h" -#include "webrtc/media/base/videobroadcaster.h" +#include "webrtc/rtc_base/gunit.h" using rtc::VideoBroadcaster; using rtc::VideoSinkWants; diff --git a/webrtc/media/base/videocapturer.cc b/webrtc/media/base/videocapturer.cc index df1eafc0d8..b65eeec536 100644 --- a/webrtc/media/base/videocapturer.cc +++ b/webrtc/media/base/videocapturer.cc @@ -16,7 +16,7 @@ #include "webrtc/api/video/i420_buffer.h" #include "webrtc/api/video/video_frame.h" -#include "webrtc/base/logging.h" +#include "webrtc/rtc_base/logging.h" namespace cricket { diff --git a/webrtc/media/base/videocapturer.h b/webrtc/media/base/videocapturer.h index 76ab95a2b8..a65d40e5ef 100644 --- a/webrtc/media/base/videocapturer.h +++ b/webrtc/media/base/videocapturer.h @@ -20,15 +20,15 @@ #include #include -#include "webrtc/base/constructormagic.h" -#include "webrtc/base/criticalsection.h" -#include "webrtc/media/base/videosourceinterface.h" -#include "webrtc/base/sigslot.h" -#include "webrtc/base/thread_checker.h" -#include "webrtc/base/timestampaligner.h" #include "webrtc/media/base/videoadapter.h" #include "webrtc/media/base/videobroadcaster.h" #include "webrtc/media/base/videocommon.h" +#include "webrtc/media/base/videosourceinterface.h" +#include "webrtc/rtc_base/constructormagic.h" +#include "webrtc/rtc_base/criticalsection.h" +#include "webrtc/rtc_base/sigslot.h" +#include "webrtc/rtc_base/thread_checker.h" +#include "webrtc/rtc_base/timestampaligner.h" namespace webrtc { class VideoFrame; diff --git a/webrtc/media/base/videocapturer_unittest.cc b/webrtc/media/base/videocapturer_unittest.cc index 2dc5cec70c..402682e511 100644 --- a/webrtc/media/base/videocapturer_unittest.cc +++ b/webrtc/media/base/videocapturer_unittest.cc @@ -13,13 +13,13 @@ #include #include -#include "webrtc/base/gunit.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/thread.h" #include "webrtc/media/base/fakevideocapturer.h" #include "webrtc/media/base/fakevideorenderer.h" #include "webrtc/media/base/testutils.h" #include "webrtc/media/base/videocapturer.h" +#include "webrtc/rtc_base/gunit.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/thread.h" using cricket::FakeVideoCapturer; diff --git a/webrtc/media/base/videocommon.cc b/webrtc/media/base/videocommon.cc index ec1255a1e4..4bc0267ed1 100644 --- a/webrtc/media/base/videocommon.cc +++ b/webrtc/media/base/videocommon.cc @@ -14,7 +14,7 @@ #include #include -#include "webrtc/base/arraysize.h" +#include "webrtc/rtc_base/arraysize.h" namespace cricket { diff --git a/webrtc/media/base/videocommon.h b/webrtc/media/base/videocommon.h index 47cfb85629..10ad383cf1 100644 --- a/webrtc/media/base/videocommon.h +++ b/webrtc/media/base/videocommon.h @@ -17,7 +17,7 @@ #include -#include "webrtc/base/timeutils.h" +#include "webrtc/rtc_base/timeutils.h" namespace cricket { diff --git a/webrtc/media/base/videocommon_unittest.cc b/webrtc/media/base/videocommon_unittest.cc index c28a5d25ba..8430b800e4 100644 --- a/webrtc/media/base/videocommon_unittest.cc +++ b/webrtc/media/base/videocommon_unittest.cc @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/base/gunit.h" #include "webrtc/media/base/videocommon.h" +#include "webrtc/rtc_base/gunit.h" namespace cricket { diff --git a/webrtc/media/base/videoengine_unittest.h b/webrtc/media/base/videoengine_unittest.h index ac430b2ede..77062ecf49 100644 --- a/webrtc/media/base/videoengine_unittest.h +++ b/webrtc/media/base/videoengine_unittest.h @@ -15,9 +15,6 @@ #include #include -#include "webrtc/base/bytebuffer.h" -#include "webrtc/base/gunit.h" -#include "webrtc/base/timeutils.h" #include "webrtc/call/call.h" #include "webrtc/logging/rtc_event_log/rtc_event_log.h" #include "webrtc/media/base/fakenetworkinterface.h" @@ -26,6 +23,9 @@ #include "webrtc/media/base/mediachannel.h" #include "webrtc/media/base/streamparams.h" #include "webrtc/media/engine/fakewebrtccall.h" +#include "webrtc/rtc_base/bytebuffer.h" +#include "webrtc/rtc_base/gunit.h" +#include "webrtc/rtc_base/timeutils.h" #define EXPECT_FRAME_WAIT(c, w, h, t) \ EXPECT_EQ_WAIT((c), renderer_.num_rendered_frames(), (t)); \ diff --git a/webrtc/media/base/videosourcebase.cc b/webrtc/media/base/videosourcebase.cc index 514072efda..222adc457f 100644 --- a/webrtc/media/base/videosourcebase.cc +++ b/webrtc/media/base/videosourcebase.cc @@ -10,7 +10,7 @@ #include "webrtc/media/base/videosourcebase.h" -#include "webrtc/base/checks.h" +#include "webrtc/rtc_base/checks.h" namespace rtc { diff --git a/webrtc/media/base/videosourcebase.h b/webrtc/media/base/videosourcebase.h index 36c6e4e7ce..c83abb5772 100644 --- a/webrtc/media/base/videosourcebase.h +++ b/webrtc/media/base/videosourcebase.h @@ -14,8 +14,8 @@ #include #include "webrtc/api/video/video_frame.h" -#include "webrtc/base/thread_checker.h" #include "webrtc/media/base/videosourceinterface.h" +#include "webrtc/rtc_base/thread_checker.h" namespace rtc { diff --git a/webrtc/media/base/videosourceinterface.h b/webrtc/media/base/videosourceinterface.h index e7c0d38807..6ebff334da 100644 --- a/webrtc/media/base/videosourceinterface.h +++ b/webrtc/media/base/videosourceinterface.h @@ -12,7 +12,7 @@ #define WEBRTC_MEDIA_BASE_VIDEOSOURCEINTERFACE_H_ #include "webrtc/media/base/videosinkinterface.h" -#include "webrtc/base/optional.h" +#include "webrtc/rtc_base/optional.h" namespace rtc { diff --git a/webrtc/media/engine/adm_helpers.cc b/webrtc/media/engine/adm_helpers.cc index d8409f0df8..7902889477 100644 --- a/webrtc/media/engine/adm_helpers.cc +++ b/webrtc/media/engine/adm_helpers.cc @@ -10,8 +10,8 @@ #include "webrtc/media/engine/adm_helpers.h" -#include "webrtc/base/logging.h" #include "webrtc/modules/audio_device/include/audio_device.h" +#include "webrtc/rtc_base/logging.h" namespace webrtc { namespace adm_helpers { diff --git a/webrtc/media/engine/apm_helpers.cc b/webrtc/media/engine/apm_helpers.cc index e11cac73ef..784b47c457 100644 --- a/webrtc/media/engine/apm_helpers.cc +++ b/webrtc/media/engine/apm_helpers.cc @@ -10,9 +10,9 @@ #include "webrtc/media/engine/apm_helpers.h" -#include "webrtc/base/logging.h" #include "webrtc/modules/audio_device/include/audio_device.h" #include "webrtc/modules/audio_processing/include/audio_processing.h" +#include "webrtc/rtc_base/logging.h" #include "webrtc/voice_engine/transmit_mixer.h" namespace webrtc { diff --git a/webrtc/media/engine/fakewebrtccall.cc b/webrtc/media/engine/fakewebrtccall.cc index 0f26a51c28..2e793b8525 100644 --- a/webrtc/media/engine/fakewebrtccall.cc +++ b/webrtc/media/engine/fakewebrtccall.cc @@ -14,10 +14,10 @@ #include #include "webrtc/api/call/audio_sink.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/platform_file.h" -#include "webrtc/base/gunit.h" #include "webrtc/media/base/rtputils.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/gunit.h" +#include "webrtc/rtc_base/platform_file.h" namespace cricket { FakeAudioSendStream::FakeAudioSendStream( diff --git a/webrtc/media/engine/fakewebrtccall.h b/webrtc/media/engine/fakewebrtccall.h index e0e0f7a7ce..10a5e9f746 100644 --- a/webrtc/media/engine/fakewebrtccall.h +++ b/webrtc/media/engine/fakewebrtccall.h @@ -25,11 +25,11 @@ #include #include "webrtc/api/video/video_frame.h" -#include "webrtc/base/buffer.h" #include "webrtc/call/audio_receive_stream.h" #include "webrtc/call/audio_send_stream.h" #include "webrtc/call/call.h" #include "webrtc/call/flexfec_receive_stream.h" +#include "webrtc/rtc_base/buffer.h" #include "webrtc/video_receive_stream.h" #include "webrtc/video_send_stream.h" diff --git a/webrtc/media/engine/fakewebrtcdeviceinfo.h b/webrtc/media/engine/fakewebrtcdeviceinfo.h index 0e34001135..38f9810e6b 100644 --- a/webrtc/media/engine/fakewebrtcdeviceinfo.h +++ b/webrtc/media/engine/fakewebrtcdeviceinfo.h @@ -13,8 +13,8 @@ #include -#include "webrtc/base/stringutils.h" #include "webrtc/media/engine/webrtcvideocapturer.h" +#include "webrtc/rtc_base/stringutils.h" // Fake class for mocking out webrtc::VideoCaptureModule::DeviceInfo. class FakeWebRtcDeviceInfo : public webrtc::VideoCaptureModule::DeviceInfo { diff --git a/webrtc/media/engine/fakewebrtcvideoengine.h b/webrtc/media/engine/fakewebrtcvideoengine.h index 081005d0f6..604728cd02 100644 --- a/webrtc/media/engine/fakewebrtcvideoengine.h +++ b/webrtc/media/engine/fakewebrtcvideoengine.h @@ -18,15 +18,15 @@ #include "webrtc/api/video_codecs/video_decoder.h" #include "webrtc/api/video_codecs/video_encoder.h" -#include "webrtc/base/basictypes.h" -#include "webrtc/base/criticalsection.h" -#include "webrtc/base/gunit.h" -#include "webrtc/base/stringutils.h" -#include "webrtc/base/thread_annotations.h" #include "webrtc/media/base/codec.h" #include "webrtc/media/engine/webrtcvideodecoderfactory.h" #include "webrtc/media/engine/webrtcvideoencoderfactory.h" #include "webrtc/modules/video_coding/include/video_error_codes.h" +#include "webrtc/rtc_base/basictypes.h" +#include "webrtc/rtc_base/criticalsection.h" +#include "webrtc/rtc_base/gunit.h" +#include "webrtc/rtc_base/stringutils.h" +#include "webrtc/rtc_base/thread_annotations.h" namespace cricket { static const int kEventTimeoutMs = 10000; diff --git a/webrtc/media/engine/fakewebrtcvoiceengine.h b/webrtc/media/engine/fakewebrtcvoiceengine.h index f8343f2e49..b6f5ed7deb 100644 --- a/webrtc/media/engine/fakewebrtcvoiceengine.h +++ b/webrtc/media/engine/fakewebrtcvoiceengine.h @@ -14,8 +14,8 @@ #include #include -#include "webrtc/base/checks.h" #include "webrtc/media/engine/webrtcvoe.h" +#include "webrtc/rtc_base/checks.h" namespace webrtc { namespace voe { diff --git a/webrtc/media/engine/internaldecoderfactory.cc b/webrtc/media/engine/internaldecoderfactory.cc index 5bc8c4b01c..7a1c099f19 100644 --- a/webrtc/media/engine/internaldecoderfactory.cc +++ b/webrtc/media/engine/internaldecoderfactory.cc @@ -12,10 +12,10 @@ #include -#include "webrtc/base/logging.h" #include "webrtc/modules/video_coding/codecs/h264/include/h264.h" #include "webrtc/modules/video_coding/codecs/vp8/include/vp8.h" #include "webrtc/modules/video_coding/codecs/vp9/include/vp9.h" +#include "webrtc/rtc_base/logging.h" namespace cricket { diff --git a/webrtc/media/engine/payload_type_mapper.h b/webrtc/media/engine/payload_type_mapper.h index e634c9aae0..1a74f21008 100644 --- a/webrtc/media/engine/payload_type_mapper.h +++ b/webrtc/media/engine/payload_type_mapper.h @@ -15,8 +15,8 @@ #include #include "webrtc/api/audio_codecs/audio_format.h" -#include "webrtc/base/optional.h" #include "webrtc/media/base/codec.h" +#include "webrtc/rtc_base/optional.h" namespace cricket { diff --git a/webrtc/media/engine/simulcast.cc b/webrtc/media/engine/simulcast.cc index 4dd8c3147b..f25eaf9760 100644 --- a/webrtc/media/engine/simulcast.cc +++ b/webrtc/media/engine/simulcast.cc @@ -10,11 +10,11 @@ #include -#include "webrtc/base/arraysize.h" -#include "webrtc/base/logging.h" #include "webrtc/media/base/streamparams.h" #include "webrtc/media/engine/constants.h" #include "webrtc/media/engine/simulcast.h" +#include "webrtc/rtc_base/arraysize.h" +#include "webrtc/rtc_base/logging.h" #include "webrtc/system_wrappers/include/field_trial.h" namespace cricket { diff --git a/webrtc/media/engine/simulcast.h b/webrtc/media/engine/simulcast.h index 3aae70f59d..4531bccaf3 100644 --- a/webrtc/media/engine/simulcast.h +++ b/webrtc/media/engine/simulcast.h @@ -13,8 +13,8 @@ #include -#include "webrtc/base/basictypes.h" #include "webrtc/config.h" +#include "webrtc/rtc_base/basictypes.h" namespace cricket { struct StreamParams; diff --git a/webrtc/media/engine/videodecodersoftwarefallbackwrapper.cc b/webrtc/media/engine/videodecodersoftwarefallbackwrapper.cc index 34d851e013..f5b54e11d3 100644 --- a/webrtc/media/engine/videodecodersoftwarefallbackwrapper.cc +++ b/webrtc/media/engine/videodecodersoftwarefallbackwrapper.cc @@ -12,11 +12,11 @@ #include -#include "webrtc/base/checks.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/trace_event.h" #include "webrtc/media/engine/internaldecoderfactory.h" #include "webrtc/modules/video_coding/include/video_error_codes.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/trace_event.h" namespace webrtc { diff --git a/webrtc/media/engine/videodecodersoftwarefallbackwrapper_unittest.cc b/webrtc/media/engine/videodecodersoftwarefallbackwrapper_unittest.cc index 4ac84856f2..b4fc7caf83 100644 --- a/webrtc/media/engine/videodecodersoftwarefallbackwrapper_unittest.cc +++ b/webrtc/media/engine/videodecodersoftwarefallbackwrapper_unittest.cc @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/api/video_codecs/video_decoder.h" -#include "webrtc/base/checks.h" #include "webrtc/media/engine/videodecodersoftwarefallbackwrapper.h" +#include "webrtc/api/video_codecs/video_decoder.h" #include "webrtc/modules/video_coding/include/video_error_codes.h" +#include "webrtc/rtc_base/checks.h" #include "webrtc/test/gtest.h" namespace webrtc { diff --git a/webrtc/media/engine/videoencodersoftwarefallbackwrapper.cc b/webrtc/media/engine/videoencodersoftwarefallbackwrapper.cc index 8bf3ed4165..d9d6f32935 100644 --- a/webrtc/media/engine/videoencodersoftwarefallbackwrapper.cc +++ b/webrtc/media/engine/videoencodersoftwarefallbackwrapper.cc @@ -10,9 +10,9 @@ #include "webrtc/media/engine/videoencodersoftwarefallbackwrapper.h" -#include "webrtc/base/logging.h" #include "webrtc/media/engine/internalencoderfactory.h" #include "webrtc/modules/video_coding/include/video_error_codes.h" +#include "webrtc/rtc_base/logging.h" namespace webrtc { diff --git a/webrtc/media/engine/videoencodersoftwarefallbackwrapper_unittest.cc b/webrtc/media/engine/videoencodersoftwarefallbackwrapper_unittest.cc index ae6e4d98e5..e196587f05 100644 --- a/webrtc/media/engine/videoencodersoftwarefallbackwrapper_unittest.cc +++ b/webrtc/media/engine/videoencodersoftwarefallbackwrapper_unittest.cc @@ -13,11 +13,11 @@ #include #include "webrtc/api/video/i420_buffer.h" -#include "webrtc/base/checks.h" #include "webrtc/modules/video_coding/codecs/vp8/simulcast_rate_allocator.h" #include "webrtc/modules/video_coding/codecs/vp8/temporal_layers.h" #include "webrtc/modules/video_coding/include/video_codec_interface.h" #include "webrtc/modules/video_coding/include/video_error_codes.h" +#include "webrtc/rtc_base/checks.h" #include "webrtc/test/gtest.h" namespace webrtc { diff --git a/webrtc/media/engine/webrtcvideocapturer.cc b/webrtc/media/engine/webrtcvideocapturer.cc index 9e5c9219ec..3560098086 100644 --- a/webrtc/media/engine/webrtcvideocapturer.cc +++ b/webrtc/media/engine/webrtcvideocapturer.cc @@ -10,17 +10,17 @@ #include "webrtc/media/engine/webrtcvideocapturer.h" -#include "webrtc/base/arraysize.h" -#include "webrtc/base/bind.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/criticalsection.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/safe_conversions.h" -#include "webrtc/base/thread.h" -#include "webrtc/base/timeutils.h" +#include "webrtc/rtc_base/arraysize.h" +#include "webrtc/rtc_base/bind.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/criticalsection.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/safe_conversions.h" +#include "webrtc/rtc_base/thread.h" +#include "webrtc/rtc_base/timeutils.h" -#include "webrtc/base/win32.h" // Need this to #include the impl files. #include "webrtc/modules/video_capture/video_capture_factory.h" +#include "webrtc/rtc_base/win32.h" // Need this to #include the impl files. #include "webrtc/system_wrappers/include/field_trial.h" namespace cricket { diff --git a/webrtc/media/engine/webrtcvideocapturer.h b/webrtc/media/engine/webrtcvideocapturer.h index 1687ce85c3..1cbfa08fe0 100644 --- a/webrtc/media/engine/webrtcvideocapturer.h +++ b/webrtc/media/engine/webrtcvideocapturer.h @@ -15,13 +15,13 @@ #include #include -#include "webrtc/base/asyncinvoker.h" -#include "webrtc/base/messagehandler.h" -#include "webrtc/base/scoped_ref_ptr.h" #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" #include "webrtc/media/base/device.h" #include "webrtc/media/base/videocapturer.h" #include "webrtc/modules/video_capture/video_capture.h" +#include "webrtc/rtc_base/asyncinvoker.h" +#include "webrtc/rtc_base/messagehandler.h" +#include "webrtc/rtc_base/scoped_ref_ptr.h" namespace cricket { diff --git a/webrtc/media/engine/webrtcvideocapturer_unittest.cc b/webrtc/media/engine/webrtcvideocapturer_unittest.cc index f660e43ab4..a4414f1e2a 100644 --- a/webrtc/media/engine/webrtcvideocapturer_unittest.cc +++ b/webrtc/media/engine/webrtcvideocapturer_unittest.cc @@ -15,14 +15,14 @@ #include #include -#include "webrtc/base/gunit.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/stringutils.h" -#include "webrtc/base/thread.h" #include "webrtc/media/base/testutils.h" #include "webrtc/media/base/videocommon.h" #include "webrtc/media/engine/fakewebrtcvcmfactory.h" #include "webrtc/media/engine/webrtcvideocapturer.h" +#include "webrtc/rtc_base/gunit.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/stringutils.h" +#include "webrtc/rtc_base/thread.h" using cricket::VideoFormat; diff --git a/webrtc/media/engine/webrtcvideodecoderfactory.h b/webrtc/media/engine/webrtcvideodecoderfactory.h index 7f0921fd12..64a8faa1e4 100644 --- a/webrtc/media/engine/webrtcvideodecoderfactory.h +++ b/webrtc/media/engine/webrtcvideodecoderfactory.h @@ -11,8 +11,8 @@ #ifndef WEBRTC_MEDIA_ENGINE_WEBRTCVIDEODECODERFACTORY_H_ #define WEBRTC_MEDIA_ENGINE_WEBRTCVIDEODECODERFACTORY_H_ -#include "webrtc/base/refcount.h" #include "webrtc/common_types.h" +#include "webrtc/rtc_base/refcount.h" namespace webrtc { class VideoDecoder; diff --git a/webrtc/media/engine/webrtcvideoengine.cc b/webrtc/media/engine/webrtcvideoengine.cc index 2eab3ceaa7..428353d793 100644 --- a/webrtc/media/engine/webrtcvideoengine.cc +++ b/webrtc/media/engine/webrtcvideoengine.cc @@ -19,23 +19,23 @@ #include "webrtc/api/video/i420_buffer.h" #include "webrtc/api/video_codecs/video_decoder.h" #include "webrtc/api/video_codecs/video_encoder.h" -#include "webrtc/base/copyonwritebuffer.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/stringutils.h" -#include "webrtc/base/timeutils.h" -#include "webrtc/base/trace_event.h" #include "webrtc/call/call.h" #include "webrtc/common_video/h264/profile_level_id.h" #include "webrtc/media/engine/constants.h" -#include "webrtc/media/engine/internalencoderfactory.h" #include "webrtc/media/engine/internaldecoderfactory.h" +#include "webrtc/media/engine/internalencoderfactory.h" #include "webrtc/media/engine/simulcast.h" -#include "webrtc/media/engine/videoencodersoftwarefallbackwrapper.h" #include "webrtc/media/engine/videodecodersoftwarefallbackwrapper.h" +#include "webrtc/media/engine/videoencodersoftwarefallbackwrapper.h" #include "webrtc/media/engine/webrtcmediaengine.h" #include "webrtc/media/engine/webrtcvideoencoderfactory.h" #include "webrtc/media/engine/webrtcvoiceengine.h" #include "webrtc/modules/video_coding/codecs/vp8/simulcast_encoder_adapter.h" +#include "webrtc/rtc_base/copyonwritebuffer.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/stringutils.h" +#include "webrtc/rtc_base/timeutils.h" +#include "webrtc/rtc_base/trace_event.h" #include "webrtc/system_wrappers/include/field_trial.h" using DegradationPreference = webrtc::VideoSendStream::DegradationPreference; diff --git a/webrtc/media/engine/webrtcvideoengine.h b/webrtc/media/engine/webrtcvideoengine.h index c51aa69989..0d51aa758f 100644 --- a/webrtc/media/engine/webrtcvideoengine.h +++ b/webrtc/media/engine/webrtcvideoengine.h @@ -19,12 +19,6 @@ #include "webrtc/api/call/transport.h" #include "webrtc/api/video/video_frame.h" -#include "webrtc/base/asyncinvoker.h" -#include "webrtc/base/criticalsection.h" -#include "webrtc/base/networkroute.h" -#include "webrtc/base/optional.h" -#include "webrtc/base/thread_annotations.h" -#include "webrtc/base/thread_checker.h" #include "webrtc/call/call.h" #include "webrtc/call/flexfec_receive_stream.h" #include "webrtc/media/base/mediaengine.h" @@ -32,6 +26,12 @@ #include "webrtc/media/base/videosourceinterface.h" #include "webrtc/media/engine/webrtcvideodecoderfactory.h" #include "webrtc/media/engine/webrtcvideoencoderfactory.h" +#include "webrtc/rtc_base/asyncinvoker.h" +#include "webrtc/rtc_base/criticalsection.h" +#include "webrtc/rtc_base/networkroute.h" +#include "webrtc/rtc_base/optional.h" +#include "webrtc/rtc_base/thread_annotations.h" +#include "webrtc/rtc_base/thread_checker.h" #include "webrtc/video_receive_stream.h" #include "webrtc/video_send_stream.h" diff --git a/webrtc/media/engine/webrtcvideoengine_unittest.cc b/webrtc/media/engine/webrtcvideoengine_unittest.cc index e14f3267db..9d4c809f4d 100644 --- a/webrtc/media/engine/webrtcvideoengine_unittest.cc +++ b/webrtc/media/engine/webrtcvideoengine_unittest.cc @@ -14,9 +14,6 @@ #include #include "webrtc/api/video_codecs/video_encoder.h" -#include "webrtc/base/arraysize.h" -#include "webrtc/base/gunit.h" -#include "webrtc/base/stringutils.h" #include "webrtc/call/flexfec_receive_stream.h" #include "webrtc/common_video/h264/profile_level_id.h" #include "webrtc/logging/rtc_event_log/rtc_event_log.h" @@ -30,6 +27,9 @@ #include "webrtc/media/engine/simulcast.h" #include "webrtc/media/engine/webrtcvideoengine.h" #include "webrtc/media/engine/webrtcvoiceengine.h" +#include "webrtc/rtc_base/arraysize.h" +#include "webrtc/rtc_base/gunit.h" +#include "webrtc/rtc_base/stringutils.h" #include "webrtc/test/field_trial.h" using webrtc::RtpExtension; diff --git a/webrtc/media/engine/webrtcvoiceengine.cc b/webrtc/media/engine/webrtcvoiceengine.cc index 1f9794944e..8b269c4aea 100644 --- a/webrtc/media/engine/webrtcvoiceengine.cc +++ b/webrtc/media/engine/webrtcvoiceengine.cc @@ -19,16 +19,6 @@ #include #include "webrtc/api/call/audio_sink.h" -#include "webrtc/base/arraysize.h" -#include "webrtc/base/base64.h" -#include "webrtc/base/byteorder.h" -#include "webrtc/base/constructormagic.h" -#include "webrtc/base/helpers.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/race_checker.h" -#include "webrtc/base/stringencode.h" -#include "webrtc/base/stringutils.h" -#include "webrtc/base/trace_event.h" #include "webrtc/media/base/audiosource.h" #include "webrtc/media/base/mediaconstants.h" #include "webrtc/media/base/streamparams.h" @@ -40,6 +30,16 @@ #include "webrtc/modules/audio_mixer/audio_mixer_impl.h" #include "webrtc/modules/audio_processing/aec_dump/aec_dump_factory.h" #include "webrtc/modules/audio_processing/include/audio_processing.h" +#include "webrtc/rtc_base/arraysize.h" +#include "webrtc/rtc_base/base64.h" +#include "webrtc/rtc_base/byteorder.h" +#include "webrtc/rtc_base/constructormagic.h" +#include "webrtc/rtc_base/helpers.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/race_checker.h" +#include "webrtc/rtc_base/stringencode.h" +#include "webrtc/rtc_base/stringutils.h" +#include "webrtc/rtc_base/trace_event.h" #include "webrtc/system_wrappers/include/field_trial.h" #include "webrtc/system_wrappers/include/metrics.h" #include "webrtc/system_wrappers/include/trace.h" diff --git a/webrtc/media/engine/webrtcvoiceengine.h b/webrtc/media/engine/webrtcvoiceengine.h index d154d0a442..93101fcc00 100644 --- a/webrtc/media/engine/webrtcvoiceengine.h +++ b/webrtc/media/engine/webrtcvoiceengine.h @@ -18,12 +18,6 @@ #include "webrtc/api/audio_codecs/audio_encoder_factory.h" #include "webrtc/api/rtpreceiverinterface.h" -#include "webrtc/base/buffer.h" -#include "webrtc/base/constructormagic.h" -#include "webrtc/base/networkroute.h" -#include "webrtc/base/scoped_ref_ptr.h" -#include "webrtc/base/task_queue.h" -#include "webrtc/base/thread_checker.h" #include "webrtc/call/audio_state.h" #include "webrtc/call/call.h" #include "webrtc/config.h" @@ -33,6 +27,12 @@ #include "webrtc/media/engine/webrtcvoe.h" #include "webrtc/modules/audio_processing/include/audio_processing.h" #include "webrtc/pc/channel.h" +#include "webrtc/rtc_base/buffer.h" +#include "webrtc/rtc_base/constructormagic.h" +#include "webrtc/rtc_base/networkroute.h" +#include "webrtc/rtc_base/scoped_ref_ptr.h" +#include "webrtc/rtc_base/task_queue.h" +#include "webrtc/rtc_base/thread_checker.h" namespace webrtc { namespace voe { diff --git a/webrtc/media/engine/webrtcvoiceengine_unittest.cc b/webrtc/media/engine/webrtcvoiceengine_unittest.cc index 85158d83bd..334e63fab1 100644 --- a/webrtc/media/engine/webrtcvoiceengine_unittest.cc +++ b/webrtc/media/engine/webrtcvoiceengine_unittest.cc @@ -12,10 +12,6 @@ #include "webrtc/api/audio_codecs/builtin_audio_decoder_factory.h" #include "webrtc/api/audio_codecs/builtin_audio_encoder_factory.h" -#include "webrtc/base/arraysize.h" -#include "webrtc/base/byteorder.h" -#include "webrtc/base/safe_conversions.h" -#include "webrtc/base/scoped_ref_ptr.h" #include "webrtc/call/call.h" #include "webrtc/logging/rtc_event_log/rtc_event_log.h" #include "webrtc/media/base/fakemediaengine.h" @@ -28,6 +24,10 @@ #include "webrtc/modules/audio_device/include/mock_audio_device.h" #include "webrtc/modules/audio_processing/include/mock_audio_processing.h" #include "webrtc/pc/channel.h" +#include "webrtc/rtc_base/arraysize.h" +#include "webrtc/rtc_base/byteorder.h" +#include "webrtc/rtc_base/safe_conversions.h" +#include "webrtc/rtc_base/scoped_ref_ptr.h" #include "webrtc/test/field_trial.h" #include "webrtc/test/gtest.h" #include "webrtc/test/mock_audio_decoder_factory.h" diff --git a/webrtc/media/sctp/sctptransport.cc b/webrtc/media/sctp/sctptransport.cc index 45e8decb38..2dcc339032 100644 --- a/webrtc/media/sctp/sctptransport.cc +++ b/webrtc/media/sctp/sctptransport.cc @@ -27,18 +27,18 @@ enum PreservedErrno { #include #include "usrsctplib/usrsctp.h" -#include "webrtc/base/arraysize.h" -#include "webrtc/base/copyonwritebuffer.h" -#include "webrtc/base/criticalsection.h" -#include "webrtc/base/helpers.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/safe_conversions.h" -#include "webrtc/base/thread_checker.h" -#include "webrtc/base/trace_event.h" #include "webrtc/media/base/codec.h" #include "webrtc/media/base/mediaconstants.h" #include "webrtc/media/base/streamparams.h" #include "webrtc/p2p/base/dtlstransportinternal.h" // For PF_NORMAL +#include "webrtc/rtc_base/arraysize.h" +#include "webrtc/rtc_base/copyonwritebuffer.h" +#include "webrtc/rtc_base/criticalsection.h" +#include "webrtc/rtc_base/helpers.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/safe_conversions.h" +#include "webrtc/rtc_base/thread_checker.h" +#include "webrtc/rtc_base/trace_event.h" namespace { diff --git a/webrtc/media/sctp/sctptransport.h b/webrtc/media/sctp/sctptransport.h index b34db80c3b..8733603003 100644 --- a/webrtc/media/sctp/sctptransport.h +++ b/webrtc/media/sctp/sctptransport.h @@ -18,11 +18,11 @@ #include #include -#include "webrtc/base/asyncinvoker.h" -#include "webrtc/base/constructormagic.h" -#include "webrtc/base/copyonwritebuffer.h" -#include "webrtc/base/sigslot.h" -#include "webrtc/base/thread.h" +#include "webrtc/rtc_base/asyncinvoker.h" +#include "webrtc/rtc_base/constructormagic.h" +#include "webrtc/rtc_base/copyonwritebuffer.h" +#include "webrtc/rtc_base/sigslot.h" +#include "webrtc/rtc_base/thread.h" // For SendDataParams/ReceiveDataParams. #include "webrtc/media/base/mediachannel.h" #include "webrtc/media/sctp/sctptransportinternal.h" diff --git a/webrtc/media/sctp/sctptransport_unittest.cc b/webrtc/media/sctp/sctptransport_unittest.cc index b8495d081a..b2d7848798 100644 --- a/webrtc/media/sctp/sctptransport_unittest.cc +++ b/webrtc/media/sctp/sctptransport_unittest.cc @@ -16,15 +16,15 @@ #include #include -#include "webrtc/base/bind.h" -#include "webrtc/base/copyonwritebuffer.h" -#include "webrtc/base/criticalsection.h" -#include "webrtc/base/gunit.h" -#include "webrtc/base/helpers.h" -#include "webrtc/base/ssladapter.h" -#include "webrtc/base/thread.h" #include "webrtc/media/sctp/sctptransport.h" #include "webrtc/p2p/base/fakedtlstransport.h" +#include "webrtc/rtc_base/bind.h" +#include "webrtc/rtc_base/copyonwritebuffer.h" +#include "webrtc/rtc_base/criticalsection.h" +#include "webrtc/rtc_base/gunit.h" +#include "webrtc/rtc_base/helpers.h" +#include "webrtc/rtc_base/ssladapter.h" +#include "webrtc/rtc_base/thread.h" namespace { static const int kDefaultTimeout = 10000; // 10 seconds. diff --git a/webrtc/media/sctp/sctptransportinternal.h b/webrtc/media/sctp/sctptransportinternal.h index e0f44e51a1..620fdd6307 100644 --- a/webrtc/media/sctp/sctptransportinternal.h +++ b/webrtc/media/sctp/sctptransportinternal.h @@ -18,8 +18,8 @@ #include #include -#include "webrtc/base/copyonwritebuffer.h" -#include "webrtc/base/thread.h" +#include "webrtc/rtc_base/copyonwritebuffer.h" +#include "webrtc/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. diff --git a/webrtc/modules/audio_coding/acm2/acm_codec_database.cc b/webrtc/modules/audio_coding/acm2/acm_codec_database.cc index c6d17d30d5..7bd8ee7576 100644 --- a/webrtc/modules/audio_coding/acm2/acm_codec_database.cc +++ b/webrtc/modules/audio_coding/acm2/acm_codec_database.cc @@ -19,7 +19,7 @@ #include -#include "webrtc/base/checks.h" +#include "webrtc/rtc_base/checks.h" #if ((defined WEBRTC_CODEC_ISAC) && (defined WEBRTC_CODEC_ISACFX)) #error iSAC and iSACFX codecs cannot be enabled at the same time diff --git a/webrtc/modules/audio_coding/acm2/acm_receive_test.h b/webrtc/modules/audio_coding/acm2/acm_receive_test.h index 107697854e..c7faa567ba 100644 --- a/webrtc/modules/audio_coding/acm2/acm_receive_test.h +++ b/webrtc/modules/audio_coding/acm2/acm_receive_test.h @@ -15,8 +15,8 @@ #include #include "webrtc/api/audio_codecs/audio_decoder_factory.h" -#include "webrtc/base/constructormagic.h" -#include "webrtc/base/scoped_ref_ptr.h" +#include "webrtc/rtc_base/constructormagic.h" +#include "webrtc/rtc_base/scoped_ref_ptr.h" #include "webrtc/system_wrappers/include/clock.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/acm2/acm_receiver.cc b/webrtc/modules/audio_coding/acm2/acm_receiver.cc index 8be08a2097..2e0d8bc7c9 100644 --- a/webrtc/modules/audio_coding/acm2/acm_receiver.cc +++ b/webrtc/modules/audio_coding/acm2/acm_receiver.cc @@ -16,17 +16,17 @@ #include #include "webrtc/api/audio_codecs/audio_decoder.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/format_macros.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/safe_conversions.h" #include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" #include "webrtc/common_types.h" #include "webrtc/modules/audio_coding/acm2/acm_resampler.h" #include "webrtc/modules/audio_coding/acm2/call_statistics.h" -#include "webrtc/modules/audio_coding/neteq/include/neteq.h" -#include "webrtc/system_wrappers/include/clock.h" #include "webrtc/modules/audio_coding/acm2/rent_a_codec.h" +#include "webrtc/modules/audio_coding/neteq/include/neteq.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/format_macros.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/safe_conversions.h" +#include "webrtc/system_wrappers/include/clock.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/acm2/acm_receiver.h b/webrtc/modules/audio_coding/acm2/acm_receiver.h index b374495b3b..f51f9b7121 100644 --- a/webrtc/modules/audio_coding/acm2/acm_receiver.h +++ b/webrtc/modules/audio_coding/acm2/acm_receiver.h @@ -16,16 +16,16 @@ #include #include -#include "webrtc/base/array_view.h" -#include "webrtc/base/criticalsection.h" -#include "webrtc/base/optional.h" -#include "webrtc/base/thread_annotations.h" #include "webrtc/common_audio/vad/include/webrtc_vad.h" #include "webrtc/modules/audio_coding/acm2/acm_resampler.h" #include "webrtc/modules/audio_coding/acm2/call_statistics.h" #include "webrtc/modules/audio_coding/include/audio_coding_module.h" #include "webrtc/modules/audio_coding/neteq/include/neteq.h" #include "webrtc/modules/include/module_common_types.h" +#include "webrtc/rtc_base/array_view.h" +#include "webrtc/rtc_base/criticalsection.h" +#include "webrtc/rtc_base/optional.h" +#include "webrtc/rtc_base/thread_annotations.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/acm2/acm_receiver_unittest.cc b/webrtc/modules/audio_coding/acm2/acm_receiver_unittest.cc index af23e17ac4..4026c5b8e4 100644 --- a/webrtc/modules/audio_coding/acm2/acm_receiver_unittest.cc +++ b/webrtc/modules/audio_coding/acm2/acm_receiver_unittest.cc @@ -14,11 +14,11 @@ #include #include "webrtc/api/audio_codecs/builtin_audio_decoder_factory.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/safe_conversions.h" #include "webrtc/modules/audio_coding/acm2/rent_a_codec.h" #include "webrtc/modules/audio_coding/include/audio_coding_module.h" #include "webrtc/modules/audio_coding/neteq/tools/rtp_generator.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/safe_conversions.h" #include "webrtc/system_wrappers/include/clock.h" #include "webrtc/test/gtest.h" #include "webrtc/test/testsupport/fileutils.h" diff --git a/webrtc/modules/audio_coding/acm2/acm_resampler.cc b/webrtc/modules/audio_coding/acm2/acm_resampler.cc index da0d2e531e..555263a2d1 100644 --- a/webrtc/modules/audio_coding/acm2/acm_resampler.cc +++ b/webrtc/modules/audio_coding/acm2/acm_resampler.cc @@ -14,7 +14,7 @@ #include #include "webrtc/common_audio/resampler/include/resampler.h" -#include "webrtc/base/logging.h" +#include "webrtc/rtc_base/logging.h" namespace webrtc { namespace acm2 { diff --git a/webrtc/modules/audio_coding/acm2/acm_send_test.cc b/webrtc/modules/audio_coding/acm2/acm_send_test.cc index 787bea8947..a88ba7d3a0 100644 --- a/webrtc/modules/audio_coding/acm2/acm_send_test.cc +++ b/webrtc/modules/audio_coding/acm2/acm_send_test.cc @@ -15,10 +15,10 @@ #include #include "webrtc/api/audio_codecs/audio_encoder.h" -#include "webrtc/base/checks.h" #include "webrtc/modules/audio_coding/include/audio_coding_module.h" #include "webrtc/modules/audio_coding/neteq/tools/input_audio_file.h" #include "webrtc/modules/audio_coding/neteq/tools/packet.h" +#include "webrtc/rtc_base/checks.h" #include "webrtc/test/gtest.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/acm2/acm_send_test.h b/webrtc/modules/audio_coding/acm2/acm_send_test.h index 96531a3294..b451e994c6 100644 --- a/webrtc/modules/audio_coding/acm2/acm_send_test.h +++ b/webrtc/modules/audio_coding/acm2/acm_send_test.h @@ -14,9 +14,9 @@ #include #include -#include "webrtc/base/constructormagic.h" #include "webrtc/modules/audio_coding/include/audio_coding_module.h" #include "webrtc/modules/audio_coding/neteq/tools/packet_source.h" +#include "webrtc/rtc_base/constructormagic.h" #include "webrtc/system_wrappers/include/clock.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/acm2/audio_coding_module.cc b/webrtc/modules/audio_coding/acm2/audio_coding_module.cc index d231a8447e..efdfcd472b 100644 --- a/webrtc/modules/audio_coding/acm2/audio_coding_module.cc +++ b/webrtc/modules/audio_coding/acm2/audio_coding_module.cc @@ -11,13 +11,13 @@ #include "webrtc/modules/audio_coding/include/audio_coding_module.h" #include "webrtc/api/audio_codecs/builtin_audio_decoder_factory.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/safe_conversions.h" #include "webrtc/modules/audio_coding/acm2/acm_receiver.h" #include "webrtc/modules/audio_coding/acm2/acm_resampler.h" #include "webrtc/modules/audio_coding/acm2/codec_manager.h" #include "webrtc/modules/audio_coding/acm2/rent_a_codec.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/safe_conversions.h" #include "webrtc/system_wrappers/include/metrics.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/acm2/audio_coding_module_unittest.cc b/webrtc/modules/audio_coding/acm2/audio_coding_module_unittest.cc index 236501a6f9..00bedd9f10 100644 --- a/webrtc/modules/audio_coding/acm2/audio_coding_module_unittest.cc +++ b/webrtc/modules/audio_coding/acm2/audio_coding_module_unittest.cc @@ -15,10 +15,6 @@ #include "webrtc/api/audio_codecs/audio_encoder.h" #include "webrtc/api/audio_codecs/builtin_audio_decoder_factory.h" -#include "webrtc/base/criticalsection.h" -#include "webrtc/base/md5digest.h" -#include "webrtc/base/platform_thread.h" -#include "webrtc/base/thread_annotations.h" #include "webrtc/modules/audio_coding/acm2/acm_receive_test.h" #include "webrtc/modules/audio_coding/acm2/acm_send_test.h" #include "webrtc/modules/audio_coding/codecs/audio_format_conversion.h" @@ -38,6 +34,10 @@ #include "webrtc/modules/audio_coding/neteq/tools/packet.h" #include "webrtc/modules/audio_coding/neteq/tools/rtp_file_source.h" #include "webrtc/modules/include/module_common_types.h" +#include "webrtc/rtc_base/criticalsection.h" +#include "webrtc/rtc_base/md5digest.h" +#include "webrtc/rtc_base/platform_thread.h" +#include "webrtc/rtc_base/thread_annotations.h" #include "webrtc/system_wrappers/include/clock.h" #include "webrtc/system_wrappers/include/event_wrapper.h" #include "webrtc/system_wrappers/include/sleep.h" diff --git a/webrtc/modules/audio_coding/acm2/call_statistics.cc b/webrtc/modules/audio_coding/acm2/call_statistics.cc index 7ac9fc4b0f..28511e90b6 100644 --- a/webrtc/modules/audio_coding/acm2/call_statistics.cc +++ b/webrtc/modules/audio_coding/acm2/call_statistics.cc @@ -10,7 +10,7 @@ #include "webrtc/modules/audio_coding/acm2/call_statistics.h" -#include "webrtc/base/checks.h" +#include "webrtc/rtc_base/checks.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/acm2/codec_manager.cc b/webrtc/modules/audio_coding/acm2/codec_manager.cc index e218080057..7bbafc732a 100644 --- a/webrtc/modules/audio_coding/acm2/codec_manager.cc +++ b/webrtc/modules/audio_coding/acm2/codec_manager.cc @@ -10,10 +10,10 @@ #include "webrtc/modules/audio_coding/acm2/codec_manager.h" -#include "webrtc/base/checks.h" -//#include "webrtc/base/format_macros.h" -#include "webrtc/base/logging.h" +#include "webrtc/rtc_base/checks.h" +//#include "webrtc/rtc_base/format_macros.h" #include "webrtc/modules/audio_coding/acm2/rent_a_codec.h" +#include "webrtc/rtc_base/logging.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/acm2/codec_manager.h b/webrtc/modules/audio_coding/acm2/codec_manager.h index b60b7e7bcb..3d45b335bc 100644 --- a/webrtc/modules/audio_coding/acm2/codec_manager.h +++ b/webrtc/modules/audio_coding/acm2/codec_manager.h @@ -13,13 +13,13 @@ #include -#include "webrtc/base/constructormagic.h" -#include "webrtc/base/optional.h" -#include "webrtc/base/thread_checker.h" +#include "webrtc/common_types.h" #include "webrtc/modules/audio_coding/acm2/rent_a_codec.h" #include "webrtc/modules/audio_coding/include/audio_coding_module.h" #include "webrtc/modules/audio_coding/include/audio_coding_module_typedefs.h" -#include "webrtc/common_types.h" +#include "webrtc/rtc_base/constructormagic.h" +#include "webrtc/rtc_base/optional.h" +#include "webrtc/rtc_base/thread_checker.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/acm2/rent_a_codec.cc b/webrtc/modules/audio_coding/acm2/rent_a_codec.cc index 8456285e49..491df316ba 100644 --- a/webrtc/modules/audio_coding/acm2/rent_a_codec.cc +++ b/webrtc/modules/audio_coding/acm2/rent_a_codec.cc @@ -13,9 +13,9 @@ #include #include -#include "webrtc/base/logging.h" #include "webrtc/modules/audio_coding/codecs/cng/audio_encoder_cng.h" #include "webrtc/modules/audio_coding/codecs/g711/audio_encoder_pcm.h" +#include "webrtc/rtc_base/logging.h" #ifdef WEBRTC_CODEC_G722 #include "webrtc/modules/audio_coding/codecs/g722/audio_encoder_g722.h" #endif diff --git a/webrtc/modules/audio_coding/acm2/rent_a_codec.h b/webrtc/modules/audio_coding/acm2/rent_a_codec.h index 85393dcd3e..a9ed85ca9e 100644 --- a/webrtc/modules/audio_coding/acm2/rent_a_codec.h +++ b/webrtc/modules/audio_coding/acm2/rent_a_codec.h @@ -17,12 +17,12 @@ #include "webrtc/api/audio_codecs/audio_decoder.h" #include "webrtc/api/audio_codecs/audio_encoder.h" -#include "webrtc/base/array_view.h" -#include "webrtc/base/constructormagic.h" -#include "webrtc/base/optional.h" -#include "webrtc/base/scoped_ref_ptr.h" #include "webrtc/modules/audio_coding/include/audio_coding_module_typedefs.h" #include "webrtc/modules/audio_coding/neteq/neteq_decoder_enum.h" +#include "webrtc/rtc_base/array_view.h" +#include "webrtc/rtc_base/constructormagic.h" +#include "webrtc/rtc_base/optional.h" +#include "webrtc/rtc_base/scoped_ref_ptr.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/acm2/rent_a_codec_unittest.cc b/webrtc/modules/audio_coding/acm2/rent_a_codec_unittest.cc index 4363e6337d..dcf63834ef 100644 --- a/webrtc/modules/audio_coding/acm2/rent_a_codec_unittest.cc +++ b/webrtc/modules/audio_coding/acm2/rent_a_codec_unittest.cc @@ -10,8 +10,8 @@ #include -#include "webrtc/base/arraysize.h" #include "webrtc/modules/audio_coding/acm2/rent_a_codec.h" +#include "webrtc/rtc_base/arraysize.h" #include "webrtc/test/gtest.h" #include "webrtc/test/mock_audio_encoder.h" diff --git a/webrtc/modules/audio_coding/audio_network_adaptor/audio_network_adaptor_impl.cc b/webrtc/modules/audio_coding/audio_network_adaptor/audio_network_adaptor_impl.cc index d41a0381fc..7645c4a1f2 100644 --- a/webrtc/modules/audio_coding/audio_network_adaptor/audio_network_adaptor_impl.cc +++ b/webrtc/modules/audio_coding/audio_network_adaptor/audio_network_adaptor_impl.cc @@ -12,8 +12,8 @@ #include -#include "webrtc/base/logging.h" -#include "webrtc/base/timeutils.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/timeutils.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/audio_network_adaptor/audio_network_adaptor_impl.h b/webrtc/modules/audio_coding/audio_network_adaptor/audio_network_adaptor_impl.h index 358a01472b..7d7a2cb086 100644 --- a/webrtc/modules/audio_coding/audio_network_adaptor/audio_network_adaptor_impl.h +++ b/webrtc/modules/audio_coding/audio_network_adaptor/audio_network_adaptor_impl.h @@ -13,12 +13,12 @@ #include -#include "webrtc/base/constructormagic.h" #include "webrtc/modules/audio_coding/audio_network_adaptor/controller.h" #include "webrtc/modules/audio_coding/audio_network_adaptor/controller_manager.h" #include "webrtc/modules/audio_coding/audio_network_adaptor/debug_dump_writer.h" #include "webrtc/modules/audio_coding/audio_network_adaptor/event_log_writer.h" #include "webrtc/modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor.h" +#include "webrtc/rtc_base/constructormagic.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/audio_network_adaptor/audio_network_adaptor_impl_unittest.cc b/webrtc/modules/audio_coding/audio_network_adaptor/audio_network_adaptor_impl_unittest.cc index a8cecb334b..1914939566 100644 --- a/webrtc/modules/audio_coding/audio_network_adaptor/audio_network_adaptor_impl_unittest.cc +++ b/webrtc/modules/audio_coding/audio_network_adaptor/audio_network_adaptor_impl_unittest.cc @@ -11,12 +11,12 @@ #include #include -#include "webrtc/base/fakeclock.h" #include "webrtc/logging/rtc_event_log/mock/mock_rtc_event_log.h" #include "webrtc/modules/audio_coding/audio_network_adaptor/audio_network_adaptor_impl.h" #include "webrtc/modules/audio_coding/audio_network_adaptor/mock/mock_controller.h" #include "webrtc/modules/audio_coding/audio_network_adaptor/mock/mock_controller_manager.h" #include "webrtc/modules/audio_coding/audio_network_adaptor/mock/mock_debug_dump_writer.h" +#include "webrtc/rtc_base/fakeclock.h" #include "webrtc/test/gtest.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/audio_network_adaptor/bitrate_controller.cc b/webrtc/modules/audio_coding/audio_network_adaptor/bitrate_controller.cc index 92a9fada46..23db2cdd0c 100644 --- a/webrtc/modules/audio_coding/audio_network_adaptor/bitrate_controller.cc +++ b/webrtc/modules/audio_coding/audio_network_adaptor/bitrate_controller.cc @@ -12,7 +12,7 @@ #include -#include "webrtc/base/checks.h" +#include "webrtc/rtc_base/checks.h" #include "webrtc/system_wrappers/include/field_trial.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/audio_network_adaptor/bitrate_controller.h b/webrtc/modules/audio_coding/audio_network_adaptor/bitrate_controller.h index ac13c50be8..740edbd4e0 100644 --- a/webrtc/modules/audio_coding/audio_network_adaptor/bitrate_controller.h +++ b/webrtc/modules/audio_coding/audio_network_adaptor/bitrate_controller.h @@ -11,8 +11,8 @@ #ifndef WEBRTC_MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_BITRATE_CONTROLLER_H_ #define WEBRTC_MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_BITRATE_CONTROLLER_H_ -#include "webrtc/base/constructormagic.h" #include "webrtc/modules/audio_coding/audio_network_adaptor/controller.h" +#include "webrtc/rtc_base/constructormagic.h" namespace webrtc { namespace audio_network_adaptor { diff --git a/webrtc/modules/audio_coding/audio_network_adaptor/channel_controller.cc b/webrtc/modules/audio_coding/audio_network_adaptor/channel_controller.cc index 90c1e56417..052808d71a 100644 --- a/webrtc/modules/audio_coding/audio_network_adaptor/channel_controller.cc +++ b/webrtc/modules/audio_coding/audio_network_adaptor/channel_controller.cc @@ -11,7 +11,7 @@ #include #include "webrtc/modules/audio_coding/audio_network_adaptor/channel_controller.h" -#include "webrtc/base/checks.h" +#include "webrtc/rtc_base/checks.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/audio_network_adaptor/channel_controller.h b/webrtc/modules/audio_coding/audio_network_adaptor/channel_controller.h index 9355d30db8..4920668d79 100644 --- a/webrtc/modules/audio_coding/audio_network_adaptor/channel_controller.h +++ b/webrtc/modules/audio_coding/audio_network_adaptor/channel_controller.h @@ -11,8 +11,8 @@ #ifndef WEBRTC_MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_CHANNEL_CONTROLLER_H_ #define WEBRTC_MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_CHANNEL_CONTROLLER_H_ -#include "webrtc/base/constructormagic.h" #include "webrtc/modules/audio_coding/audio_network_adaptor/controller.h" +#include "webrtc/rtc_base/constructormagic.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/audio_network_adaptor/controller.h b/webrtc/modules/audio_coding/audio_network_adaptor/controller.h index 4ae7951bab..ab9cfb706f 100644 --- a/webrtc/modules/audio_coding/audio_network_adaptor/controller.h +++ b/webrtc/modules/audio_coding/audio_network_adaptor/controller.h @@ -11,8 +11,8 @@ #ifndef WEBRTC_MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_CONTROLLER_H_ #define WEBRTC_MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_CONTROLLER_H_ -#include "webrtc/base/optional.h" #include "webrtc/modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor.h" +#include "webrtc/rtc_base/optional.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/audio_network_adaptor/controller_manager.cc b/webrtc/modules/audio_coding/audio_network_adaptor/controller_manager.cc index 8cb142f2c9..f3f0049c76 100644 --- a/webrtc/modules/audio_coding/audio_network_adaptor/controller_manager.cc +++ b/webrtc/modules/audio_coding/audio_network_adaptor/controller_manager.cc @@ -13,8 +13,6 @@ #include #include -#include "webrtc/base/ignore_wundef.h" -#include "webrtc/base/timeutils.h" #include "webrtc/modules/audio_coding/audio_network_adaptor/bitrate_controller.h" #include "webrtc/modules/audio_coding/audio_network_adaptor/channel_controller.h" #include "webrtc/modules/audio_coding/audio_network_adaptor/dtx_controller.h" @@ -22,6 +20,8 @@ #include "webrtc/modules/audio_coding/audio_network_adaptor/fec_controller_rplr_based.h" #include "webrtc/modules/audio_coding/audio_network_adaptor/frame_length_controller.h" #include "webrtc/modules/audio_coding/audio_network_adaptor/util/threshold_curve.h" +#include "webrtc/rtc_base/ignore_wundef.h" +#include "webrtc/rtc_base/timeutils.h" #if WEBRTC_ENABLE_PROTOBUF RTC_PUSH_IGNORING_WUNDEF() diff --git a/webrtc/modules/audio_coding/audio_network_adaptor/controller_manager.h b/webrtc/modules/audio_coding/audio_network_adaptor/controller_manager.h index f3faf518ab..741a28d05a 100644 --- a/webrtc/modules/audio_coding/audio_network_adaptor/controller_manager.h +++ b/webrtc/modules/audio_coding/audio_network_adaptor/controller_manager.h @@ -15,9 +15,9 @@ #include #include -#include "webrtc/base/constructormagic.h" -#include "webrtc/base/protobuf_utils.h" #include "webrtc/modules/audio_coding/audio_network_adaptor/controller.h" +#include "webrtc/rtc_base/constructormagic.h" +#include "webrtc/rtc_base/protobuf_utils.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/audio_network_adaptor/controller_manager_unittest.cc b/webrtc/modules/audio_coding/audio_network_adaptor/controller_manager_unittest.cc index a2deb7bfbb..442db715c5 100644 --- a/webrtc/modules/audio_coding/audio_network_adaptor/controller_manager_unittest.cc +++ b/webrtc/modules/audio_coding/audio_network_adaptor/controller_manager_unittest.cc @@ -10,11 +10,11 @@ #include -#include "webrtc/base/fakeclock.h" -#include "webrtc/base/ignore_wundef.h" -#include "webrtc/base/protobuf_utils.h" #include "webrtc/modules/audio_coding/audio_network_adaptor/controller_manager.h" #include "webrtc/modules/audio_coding/audio_network_adaptor/mock/mock_controller.h" +#include "webrtc/rtc_base/fakeclock.h" +#include "webrtc/rtc_base/ignore_wundef.h" +#include "webrtc/rtc_base/protobuf_utils.h" #include "webrtc/test/gtest.h" #if WEBRTC_ENABLE_PROTOBUF diff --git a/webrtc/modules/audio_coding/audio_network_adaptor/debug_dump_writer.cc b/webrtc/modules/audio_coding/audio_network_adaptor/debug_dump_writer.cc index fdedf6cd9d..8ff0f489dd 100644 --- a/webrtc/modules/audio_coding/audio_network_adaptor/debug_dump_writer.cc +++ b/webrtc/modules/audio_coding/audio_network_adaptor/debug_dump_writer.cc @@ -10,9 +10,9 @@ #include "webrtc/modules/audio_coding/audio_network_adaptor/debug_dump_writer.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/ignore_wundef.h" -#include "webrtc/base/protobuf_utils.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/ignore_wundef.h" +#include "webrtc/rtc_base/protobuf_utils.h" #if WEBRTC_ENABLE_PROTOBUF RTC_PUSH_IGNORING_WUNDEF() diff --git a/webrtc/modules/audio_coding/audio_network_adaptor/debug_dump_writer.h b/webrtc/modules/audio_coding/audio_network_adaptor/debug_dump_writer.h index 1a53d1e0ae..9ce70339e4 100644 --- a/webrtc/modules/audio_coding/audio_network_adaptor/debug_dump_writer.h +++ b/webrtc/modules/audio_coding/audio_network_adaptor/debug_dump_writer.h @@ -13,9 +13,9 @@ #include -#include "webrtc/base/constructormagic.h" #include "webrtc/modules/audio_coding/audio_network_adaptor/controller.h" #include "webrtc/modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor.h" +#include "webrtc/rtc_base/constructormagic.h" #include "webrtc/system_wrappers/include/file_wrapper.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/audio_network_adaptor/dtx_controller.cc b/webrtc/modules/audio_coding/audio_network_adaptor/dtx_controller.cc index fc1f44d84a..1941a5e171 100644 --- a/webrtc/modules/audio_coding/audio_network_adaptor/dtx_controller.cc +++ b/webrtc/modules/audio_coding/audio_network_adaptor/dtx_controller.cc @@ -9,7 +9,7 @@ */ #include "webrtc/modules/audio_coding/audio_network_adaptor/dtx_controller.h" -#include "webrtc/base/checks.h" +#include "webrtc/rtc_base/checks.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/audio_network_adaptor/dtx_controller.h b/webrtc/modules/audio_coding/audio_network_adaptor/dtx_controller.h index 583ef3c65f..2945e1163a 100644 --- a/webrtc/modules/audio_coding/audio_network_adaptor/dtx_controller.h +++ b/webrtc/modules/audio_coding/audio_network_adaptor/dtx_controller.h @@ -11,8 +11,8 @@ #ifndef WEBRTC_MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_DTX_CONTROLLER_H_ #define WEBRTC_MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_DTX_CONTROLLER_H_ -#include "webrtc/base/constructormagic.h" #include "webrtc/modules/audio_coding/audio_network_adaptor/controller.h" +#include "webrtc/rtc_base/constructormagic.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/audio_network_adaptor/event_log_writer.h b/webrtc/modules/audio_coding/audio_network_adaptor/event_log_writer.h index d0b38bd25f..7f7acef17f 100644 --- a/webrtc/modules/audio_coding/audio_network_adaptor/event_log_writer.h +++ b/webrtc/modules/audio_coding/audio_network_adaptor/event_log_writer.h @@ -11,8 +11,8 @@ #ifndef WEBRTC_MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_EVENT_LOG_WRITER_H_ #define WEBRTC_MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_EVENT_LOG_WRITER_H_ -#include "webrtc/base/constructormagic.h" #include "webrtc/modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor.h" +#include "webrtc/rtc_base/constructormagic.h" namespace webrtc { class RtcEventLog; diff --git a/webrtc/modules/audio_coding/audio_network_adaptor/fec_controller_plr_based.cc b/webrtc/modules/audio_coding/audio_network_adaptor/fec_controller_plr_based.cc index 481f78d7cd..58644b9f1a 100644 --- a/webrtc/modules/audio_coding/audio_network_adaptor/fec_controller_plr_based.cc +++ b/webrtc/modules/audio_coding/audio_network_adaptor/fec_controller_plr_based.cc @@ -13,7 +13,7 @@ #include #include -#include "webrtc/base/checks.h" +#include "webrtc/rtc_base/checks.h" #include "webrtc/system_wrappers/include/field_trial.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/audio_network_adaptor/fec_controller_plr_based.h b/webrtc/modules/audio_coding/audio_network_adaptor/fec_controller_plr_based.h index 3913abbdaa..9259f309a4 100644 --- a/webrtc/modules/audio_coding/audio_network_adaptor/fec_controller_plr_based.h +++ b/webrtc/modules/audio_coding/audio_network_adaptor/fec_controller_plr_based.h @@ -13,10 +13,10 @@ #include -#include "webrtc/base/constructormagic.h" #include "webrtc/common_audio/smoothing_filter.h" #include "webrtc/modules/audio_coding/audio_network_adaptor/controller.h" #include "webrtc/modules/audio_coding/audio_network_adaptor/util/threshold_curve.h" +#include "webrtc/rtc_base/constructormagic.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/audio_network_adaptor/fec_controller_rplr_based.cc b/webrtc/modules/audio_coding/audio_network_adaptor/fec_controller_rplr_based.cc index a51c277b66..0cf6d3bc39 100644 --- a/webrtc/modules/audio_coding/audio_network_adaptor/fec_controller_rplr_based.cc +++ b/webrtc/modules/audio_coding/audio_network_adaptor/fec_controller_rplr_based.cc @@ -13,7 +13,7 @@ #include #include -#include "webrtc/base/checks.h" +#include "webrtc/rtc_base/checks.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/audio_network_adaptor/fec_controller_rplr_based.h b/webrtc/modules/audio_coding/audio_network_adaptor/fec_controller_rplr_based.h index b2904b38be..ce04dc7698 100644 --- a/webrtc/modules/audio_coding/audio_network_adaptor/fec_controller_rplr_based.h +++ b/webrtc/modules/audio_coding/audio_network_adaptor/fec_controller_rplr_based.h @@ -13,9 +13,9 @@ #include -#include "webrtc/base/constructormagic.h" #include "webrtc/modules/audio_coding/audio_network_adaptor/controller.h" #include "webrtc/modules/audio_coding/audio_network_adaptor/util/threshold_curve.h" +#include "webrtc/rtc_base/constructormagic.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/audio_network_adaptor/frame_length_controller.cc b/webrtc/modules/audio_coding/audio_network_adaptor/frame_length_controller.cc index 5111b8a2b8..49b1d4deb3 100644 --- a/webrtc/modules/audio_coding/audio_network_adaptor/frame_length_controller.cc +++ b/webrtc/modules/audio_coding/audio_network_adaptor/frame_length_controller.cc @@ -12,8 +12,8 @@ #include -#include "webrtc/base/checks.h" -#include "webrtc/base/logging.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/logging.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/audio_network_adaptor/frame_length_controller.h b/webrtc/modules/audio_coding/audio_network_adaptor/frame_length_controller.h index 458938271d..47a48fcd6f 100644 --- a/webrtc/modules/audio_coding/audio_network_adaptor/frame_length_controller.h +++ b/webrtc/modules/audio_coding/audio_network_adaptor/frame_length_controller.h @@ -14,8 +14,8 @@ #include #include -#include "webrtc/base/constructormagic.h" #include "webrtc/modules/audio_coding/audio_network_adaptor/controller.h" +#include "webrtc/rtc_base/constructormagic.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor.h b/webrtc/modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor.h index 2ef88542ee..6d03730a17 100644 --- a/webrtc/modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor.h +++ b/webrtc/modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor.h @@ -11,7 +11,7 @@ #ifndef WEBRTC_MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_INCLUDE_AUDIO_NETWORK_ADAPTOR_H_ #define WEBRTC_MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_INCLUDE_AUDIO_NETWORK_ADAPTOR_H_ -#include "webrtc/base/optional.h" +#include "webrtc/rtc_base/optional.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/audio_network_adaptor/util/threshold_curve.h b/webrtc/modules/audio_coding/audio_network_adaptor/util/threshold_curve.h index 87ffc02495..2f816db6a7 100644 --- a/webrtc/modules/audio_coding/audio_network_adaptor/util/threshold_curve.h +++ b/webrtc/modules/audio_coding/audio_network_adaptor/util/threshold_curve.h @@ -11,7 +11,7 @@ #ifndef WEBRTC_MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_UTIL_THRESHOLD_CURVE_H_ #define WEBRTC_MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_UTIL_THRESHOLD_CURVE_H_ -#include "webrtc/base/checks.h" +#include "webrtc/rtc_base/checks.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/codecs/audio_format_conversion.cc b/webrtc/modules/audio_coding/codecs/audio_format_conversion.cc index a858053c78..af58bc481f 100644 --- a/webrtc/modules/audio_coding/codecs/audio_format_conversion.cc +++ b/webrtc/modules/audio_coding/codecs/audio_format_conversion.cc @@ -12,11 +12,11 @@ #include -#include "webrtc/base/array_view.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/optional.h" -#include "webrtc/base/safe_conversions.h" -#include "webrtc/base/sanitizer.h" +#include "webrtc/rtc_base/array_view.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/optional.h" +#include "webrtc/rtc_base/safe_conversions.h" +#include "webrtc/rtc_base/sanitizer.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/codecs/builtin_audio_decoder_factory_internal.cc b/webrtc/modules/audio_coding/codecs/builtin_audio_decoder_factory_internal.cc index 8d8025718a..3624c79f27 100644 --- a/webrtc/modules/audio_coding/codecs/builtin_audio_decoder_factory_internal.cc +++ b/webrtc/modules/audio_coding/codecs/builtin_audio_decoder_factory_internal.cc @@ -13,11 +13,11 @@ #include #include -#include "webrtc/base/checks.h" -#include "webrtc/base/optional.h" #include "webrtc/common_types.h" #include "webrtc/modules/audio_coding/codecs/cng/webrtc_cng.h" #include "webrtc/modules/audio_coding/codecs/g711/audio_decoder_pcm.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/optional.h" #ifdef WEBRTC_CODEC_G722 #include "webrtc/modules/audio_coding/codecs/g722/audio_decoder_g722.h" #endif diff --git a/webrtc/modules/audio_coding/codecs/builtin_audio_decoder_factory_internal.h b/webrtc/modules/audio_coding/codecs/builtin_audio_decoder_factory_internal.h index 10f356affc..c856954512 100644 --- a/webrtc/modules/audio_coding/codecs/builtin_audio_decoder_factory_internal.h +++ b/webrtc/modules/audio_coding/codecs/builtin_audio_decoder_factory_internal.h @@ -12,7 +12,7 @@ #define WEBRTC_MODULES_AUDIO_CODING_CODECS_BUILTIN_AUDIO_DECODER_FACTORY_INTERNAL_H_ #include "webrtc/api/audio_codecs/audio_decoder_factory.h" -#include "webrtc/base/scoped_ref_ptr.h" +#include "webrtc/rtc_base/scoped_ref_ptr.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/codecs/builtin_audio_encoder_factory_internal.cc b/webrtc/modules/audio_coding/codecs/builtin_audio_encoder_factory_internal.cc index 3c8c03065a..2876440525 100644 --- a/webrtc/modules/audio_coding/codecs/builtin_audio_encoder_factory_internal.cc +++ b/webrtc/modules/audio_coding/codecs/builtin_audio_encoder_factory_internal.cc @@ -13,11 +13,11 @@ #include #include -#include "webrtc/base/checks.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/optional.h" #include "webrtc/common_types.h" #include "webrtc/modules/audio_coding/codecs/g711/audio_encoder_pcm.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/optional.h" #ifdef WEBRTC_CODEC_G722 #include "webrtc/modules/audio_coding/codecs/g722/audio_encoder_g722.h" #endif diff --git a/webrtc/modules/audio_coding/codecs/builtin_audio_encoder_factory_internal.h b/webrtc/modules/audio_coding/codecs/builtin_audio_encoder_factory_internal.h index 81833317d2..327e6ca4e5 100644 --- a/webrtc/modules/audio_coding/codecs/builtin_audio_encoder_factory_internal.h +++ b/webrtc/modules/audio_coding/codecs/builtin_audio_encoder_factory_internal.h @@ -12,7 +12,7 @@ #define WEBRTC_MODULES_AUDIO_CODING_CODECS_BUILTIN_AUDIO_ENCODER_FACTORY_INTERNAL_H_ #include "webrtc/api/audio_codecs/audio_encoder_factory.h" -#include "webrtc/base/scoped_ref_ptr.h" +#include "webrtc/rtc_base/scoped_ref_ptr.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/codecs/cng/audio_encoder_cng.h b/webrtc/modules/audio_coding/codecs/cng/audio_encoder_cng.h index 9e85edf0c4..563e997ebb 100644 --- a/webrtc/modules/audio_coding/codecs/cng/audio_encoder_cng.h +++ b/webrtc/modules/audio_coding/codecs/cng/audio_encoder_cng.h @@ -15,9 +15,9 @@ #include #include "webrtc/api/audio_codecs/audio_encoder.h" -#include "webrtc/base/constructormagic.h" #include "webrtc/common_audio/vad/include/vad.h" #include "webrtc/modules/audio_coding/codecs/cng/webrtc_cng.h" +#include "webrtc/rtc_base/constructormagic.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/codecs/cng/audio_encoder_cng_unittest.cc b/webrtc/modules/audio_coding/codecs/cng/audio_encoder_cng_unittest.cc index 87466df814..5de1b03c84 100644 --- a/webrtc/modules/audio_coding/codecs/cng/audio_encoder_cng_unittest.cc +++ b/webrtc/modules/audio_coding/codecs/cng/audio_encoder_cng_unittest.cc @@ -11,9 +11,9 @@ #include #include -#include "webrtc/base/constructormagic.h" #include "webrtc/common_audio/vad/mock/mock_vad.h" #include "webrtc/modules/audio_coding/codecs/cng/audio_encoder_cng.h" +#include "webrtc/rtc_base/constructormagic.h" #include "webrtc/test/gtest.h" #include "webrtc/test/mock_audio_encoder.h" diff --git a/webrtc/modules/audio_coding/codecs/cng/webrtc_cng.cc b/webrtc/modules/audio_coding/codecs/cng/webrtc_cng.cc index 886b5fc325..9461cd00b9 100644 --- a/webrtc/modules/audio_coding/codecs/cng/webrtc_cng.cc +++ b/webrtc/modules/audio_coding/codecs/cng/webrtc_cng.cc @@ -12,8 +12,8 @@ #include -#include "webrtc/base/safe_conversions.h" #include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" +#include "webrtc/rtc_base/safe_conversions.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/codecs/cng/webrtc_cng.h b/webrtc/modules/audio_coding/codecs/cng/webrtc_cng.h index fb0a53df27..c7513413d8 100644 --- a/webrtc/modules/audio_coding/codecs/cng/webrtc_cng.h +++ b/webrtc/modules/audio_coding/codecs/cng/webrtc_cng.h @@ -14,8 +14,8 @@ #include -#include "webrtc/base/array_view.h" -#include "webrtc/base/buffer.h" +#include "webrtc/rtc_base/array_view.h" +#include "webrtc/rtc_base/buffer.h" #include "webrtc/typedefs.h" #define WEBRTC_CNG_MAX_LPC_ORDER 12 diff --git a/webrtc/modules/audio_coding/codecs/g711/audio_decoder_pcm.h b/webrtc/modules/audio_coding/codecs/g711/audio_decoder_pcm.h index 563d6aeaad..f72f202f37 100644 --- a/webrtc/modules/audio_coding/codecs/g711/audio_decoder_pcm.h +++ b/webrtc/modules/audio_coding/codecs/g711/audio_decoder_pcm.h @@ -12,8 +12,8 @@ #define WEBRTC_MODULES_AUDIO_CODING_CODECS_G711_AUDIO_DECODER_PCM_H_ #include "webrtc/api/audio_codecs/audio_decoder.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/constructormagic.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/constructormagic.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/codecs/g711/audio_encoder_pcm.cc b/webrtc/modules/audio_coding/codecs/g711/audio_encoder_pcm.cc index 113fb63f55..8bff2ec1ee 100644 --- a/webrtc/modules/audio_coding/codecs/g711/audio_encoder_pcm.cc +++ b/webrtc/modules/audio_coding/codecs/g711/audio_encoder_pcm.cc @@ -13,10 +13,10 @@ #include #include -#include "webrtc/base/checks.h" -#include "webrtc/base/string_to_number.h" #include "webrtc/common_types.h" #include "webrtc/modules/audio_coding/codecs/g711/g711_interface.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/string_to_number.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/codecs/g711/audio_encoder_pcm.h b/webrtc/modules/audio_coding/codecs/g711/audio_encoder_pcm.h index b563af17bd..be8164aeee 100644 --- a/webrtc/modules/audio_coding/codecs/g711/audio_encoder_pcm.h +++ b/webrtc/modules/audio_coding/codecs/g711/audio_encoder_pcm.h @@ -15,7 +15,7 @@ #include "webrtc/api/audio_codecs/audio_encoder.h" #include "webrtc/api/audio_codecs/audio_format.h" -#include "webrtc/base/constructormagic.h" +#include "webrtc/rtc_base/constructormagic.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/codecs/g722/audio_decoder_g722.cc b/webrtc/modules/audio_coding/codecs/g722/audio_decoder_g722.cc index f092e516ed..7e597f80ac 100644 --- a/webrtc/modules/audio_coding/codecs/g722/audio_decoder_g722.cc +++ b/webrtc/modules/audio_coding/codecs/g722/audio_decoder_g722.cc @@ -12,9 +12,9 @@ #include -#include "webrtc/base/checks.h" -#include "webrtc/modules/audio_coding/codecs/legacy_encoded_audio_frame.h" #include "webrtc/modules/audio_coding/codecs/g722/g722_interface.h" +#include "webrtc/modules/audio_coding/codecs/legacy_encoded_audio_frame.h" +#include "webrtc/rtc_base/checks.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/codecs/g722/audio_decoder_g722.h b/webrtc/modules/audio_coding/codecs/g722/audio_decoder_g722.h index 0a530190fe..ee2270f323 100644 --- a/webrtc/modules/audio_coding/codecs/g722/audio_decoder_g722.h +++ b/webrtc/modules/audio_coding/codecs/g722/audio_decoder_g722.h @@ -12,7 +12,7 @@ #define WEBRTC_MODULES_AUDIO_CODING_CODECS_G722_AUDIO_DECODER_G722_H_ #include "webrtc/api/audio_codecs/audio_decoder.h" -#include "webrtc/base/constructormagic.h" +#include "webrtc/rtc_base/constructormagic.h" typedef struct WebRtcG722DecInst G722DecInst; diff --git a/webrtc/modules/audio_coding/codecs/g722/audio_encoder_g722.cc b/webrtc/modules/audio_coding/codecs/g722/audio_encoder_g722.cc index 8d254b83cc..f936e815a7 100644 --- a/webrtc/modules/audio_coding/codecs/g722/audio_encoder_g722.cc +++ b/webrtc/modules/audio_coding/codecs/g722/audio_encoder_g722.cc @@ -13,11 +13,11 @@ #include #include -#include "webrtc/base/checks.h" -#include "webrtc/base/safe_conversions.h" -#include "webrtc/base/string_to_number.h" #include "webrtc/common_types.h" #include "webrtc/modules/audio_coding/codecs/g722/g722_interface.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/safe_conversions.h" +#include "webrtc/rtc_base/string_to_number.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/codecs/g722/audio_encoder_g722.h b/webrtc/modules/audio_coding/codecs/g722/audio_encoder_g722.h index ce87b2cdd3..00d1c0f3e6 100644 --- a/webrtc/modules/audio_coding/codecs/g722/audio_encoder_g722.h +++ b/webrtc/modules/audio_coding/codecs/g722/audio_encoder_g722.h @@ -16,9 +16,9 @@ #include "webrtc/api/audio_codecs/audio_encoder.h" #include "webrtc/api/audio_codecs/audio_format.h" #include "webrtc/api/audio_codecs/g722/audio_encoder_g722_config.h" -#include "webrtc/base/buffer.h" -#include "webrtc/base/constructormagic.h" #include "webrtc/modules/audio_coding/codecs/g722/g722_interface.h" +#include "webrtc/rtc_base/buffer.h" +#include "webrtc/rtc_base/constructormagic.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/codecs/ilbc/audio_decoder_ilbc.cc b/webrtc/modules/audio_coding/codecs/ilbc/audio_decoder_ilbc.cc index a95c7d5a17..61ec7bd562 100644 --- a/webrtc/modules/audio_coding/codecs/ilbc/audio_decoder_ilbc.cc +++ b/webrtc/modules/audio_coding/codecs/ilbc/audio_decoder_ilbc.cc @@ -12,10 +12,10 @@ #include -#include "webrtc/base/checks.h" -#include "webrtc/base/logging.h" #include "webrtc/modules/audio_coding/codecs/ilbc/ilbc.h" #include "webrtc/modules/audio_coding/codecs/legacy_encoded_audio_frame.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/logging.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/codecs/ilbc/audio_decoder_ilbc.h b/webrtc/modules/audio_coding/codecs/ilbc/audio_decoder_ilbc.h index 5269f4d456..f2320fadff 100644 --- a/webrtc/modules/audio_coding/codecs/ilbc/audio_decoder_ilbc.h +++ b/webrtc/modules/audio_coding/codecs/ilbc/audio_decoder_ilbc.h @@ -12,7 +12,7 @@ #define WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_AUDIO_DECODER_ILBC_H_ #include "webrtc/api/audio_codecs/audio_decoder.h" -#include "webrtc/base/constructormagic.h" +#include "webrtc/rtc_base/constructormagic.h" typedef struct iLBC_decinst_t_ IlbcDecoderInstance; diff --git a/webrtc/modules/audio_coding/codecs/ilbc/audio_encoder_ilbc.cc b/webrtc/modules/audio_coding/codecs/ilbc/audio_encoder_ilbc.cc index 0dc9bb4d1c..5a0090ab23 100644 --- a/webrtc/modules/audio_coding/codecs/ilbc/audio_encoder_ilbc.cc +++ b/webrtc/modules/audio_coding/codecs/ilbc/audio_encoder_ilbc.cc @@ -12,11 +12,11 @@ #include #include -#include "webrtc/base/checks.h" -#include "webrtc/base/safe_conversions.h" -#include "webrtc/base/string_to_number.h" #include "webrtc/common_types.h" #include "webrtc/modules/audio_coding/codecs/ilbc/ilbc.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/safe_conversions.h" +#include "webrtc/rtc_base/string_to_number.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/codecs/ilbc/audio_encoder_ilbc.h b/webrtc/modules/audio_coding/codecs/ilbc/audio_encoder_ilbc.h index 0d9b366747..c83be61fe9 100644 --- a/webrtc/modules/audio_coding/codecs/ilbc/audio_encoder_ilbc.h +++ b/webrtc/modules/audio_coding/codecs/ilbc/audio_encoder_ilbc.h @@ -14,8 +14,8 @@ #include "webrtc/api/audio_codecs/audio_encoder.h" #include "webrtc/api/audio_codecs/audio_format.h" #include "webrtc/api/audio_codecs/ilbc/audio_encoder_ilbc_config.h" -#include "webrtc/base/constructormagic.h" #include "webrtc/modules/audio_coding/codecs/ilbc/ilbc.h" +#include "webrtc/rtc_base/constructormagic.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/codecs/isac/audio_decoder_isac_t.h b/webrtc/modules/audio_coding/codecs/isac/audio_decoder_isac_t.h index 1017cbc9d3..387b34b5da 100644 --- a/webrtc/modules/audio_coding/codecs/isac/audio_decoder_isac_t.h +++ b/webrtc/modules/audio_coding/codecs/isac/audio_decoder_isac_t.h @@ -14,10 +14,10 @@ #include #include "webrtc/api/audio_codecs/audio_decoder.h" -#include "webrtc/base/constructormagic.h" -#include "webrtc/base/optional.h" -#include "webrtc/base/scoped_ref_ptr.h" #include "webrtc/modules/audio_coding/codecs/isac/locked_bandwidth_info.h" +#include "webrtc/rtc_base/constructormagic.h" +#include "webrtc/rtc_base/optional.h" +#include "webrtc/rtc_base/scoped_ref_ptr.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/codecs/isac/audio_decoder_isac_t_impl.h b/webrtc/modules/audio_coding/codecs/isac/audio_decoder_isac_t_impl.h index e19f882006..1abfe37fa7 100644 --- a/webrtc/modules/audio_coding/codecs/isac/audio_decoder_isac_t_impl.h +++ b/webrtc/modules/audio_coding/codecs/isac/audio_decoder_isac_t_impl.h @@ -13,7 +13,7 @@ #include "webrtc/modules/audio_coding/codecs/isac/main/include/audio_decoder_isac.h" -#include "webrtc/base/checks.h" +#include "webrtc/rtc_base/checks.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/codecs/isac/audio_encoder_isac_t.h b/webrtc/modules/audio_coding/codecs/isac/audio_encoder_isac_t.h index bef25d5a41..2cc23db9fe 100644 --- a/webrtc/modules/audio_coding/codecs/isac/audio_encoder_isac_t.h +++ b/webrtc/modules/audio_coding/codecs/isac/audio_encoder_isac_t.h @@ -15,9 +15,9 @@ #include "webrtc/api/audio_codecs/audio_encoder.h" #include "webrtc/api/audio_codecs/audio_format.h" -#include "webrtc/base/constructormagic.h" -#include "webrtc/base/scoped_ref_ptr.h" #include "webrtc/modules/audio_coding/codecs/isac/locked_bandwidth_info.h" +#include "webrtc/rtc_base/constructormagic.h" +#include "webrtc/rtc_base/scoped_ref_ptr.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/codecs/isac/audio_encoder_isac_t_impl.h b/webrtc/modules/audio_coding/codecs/isac/audio_encoder_isac_t_impl.h index ebe4d6a0e2..bda379c8d2 100644 --- a/webrtc/modules/audio_coding/codecs/isac/audio_encoder_isac_t_impl.h +++ b/webrtc/modules/audio_coding/codecs/isac/audio_encoder_isac_t_impl.h @@ -11,9 +11,9 @@ #ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_AUDIO_ENCODER_ISAC_T_IMPL_H_ #define WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_AUDIO_ENCODER_ISAC_T_IMPL_H_ -#include "webrtc/base/checks.h" -#include "webrtc/base/string_to_number.h" #include "webrtc/common_types.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/string_to_number.h" namespace webrtc { namespace { // NOLINT (not a "regular" header file) diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/source/isac_fix_type.h b/webrtc/modules/audio_coding/codecs/isac/fix/source/isac_fix_type.h index d6385314a1..a39444e418 100644 --- a/webrtc/modules/audio_coding/codecs/isac/fix/source/isac_fix_type.h +++ b/webrtc/modules/audio_coding/codecs/isac/fix/source/isac_fix_type.h @@ -11,8 +11,8 @@ #ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_ISAC_FIX_TYPE_H_ #define WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_ISAC_FIX_TYPE_H_ -#include "webrtc/base/checks.h" #include "webrtc/modules/audio_coding/codecs/isac/fix/include/isacfix.h" +#include "webrtc/rtc_base/checks.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/codecs/isac/locked_bandwidth_info.h b/webrtc/modules/audio_coding/codecs/isac/locked_bandwidth_info.h index 1ab5ae9d63..65bea4c924 100644 --- a/webrtc/modules/audio_coding/codecs/isac/locked_bandwidth_info.h +++ b/webrtc/modules/audio_coding/codecs/isac/locked_bandwidth_info.h @@ -11,10 +11,10 @@ #ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_LOCKED_BANDWIDTH_INFO_H_ #define WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_LOCKED_BANDWIDTH_INFO_H_ -#include "webrtc/base/atomicops.h" -#include "webrtc/base/criticalsection.h" -#include "webrtc/base/thread_annotations.h" #include "webrtc/modules/audio_coding/codecs/isac/bandwidth_info.h" +#include "webrtc/rtc_base/atomicops.h" +#include "webrtc/rtc_base/criticalsection.h" +#include "webrtc/rtc_base/thread_annotations.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/codecs/isac/main/test/ReleaseTest-API/ReleaseTest-API.cc b/webrtc/modules/audio_coding/codecs/isac/main/test/ReleaseTest-API/ReleaseTest-API.cc index 33518a718e..9c11d23bca 100644 --- a/webrtc/modules/audio_coding/codecs/isac/main/test/ReleaseTest-API/ReleaseTest-API.cc +++ b/webrtc/modules/audio_coding/codecs/isac/main/test/ReleaseTest-API/ReleaseTest-API.cc @@ -21,7 +21,7 @@ /* include API */ #include "isac.h" #include "utility.h" -#include "webrtc/base/format_macros.h" +#include "webrtc/rtc_base/format_macros.h" /* Defines */ #define SEED_FILE "randseed.txt" /* Used when running decoder on garbage data */ diff --git a/webrtc/modules/audio_coding/codecs/isac/unittest.cc b/webrtc/modules/audio_coding/codecs/isac/unittest.cc index d68c24d1e6..1f4ae804a1 100644 --- a/webrtc/modules/audio_coding/codecs/isac/unittest.cc +++ b/webrtc/modules/audio_coding/codecs/isac/unittest.cc @@ -13,10 +13,10 @@ #include #include -#include "webrtc/base/buffer.h" #include "webrtc/modules/audio_coding/codecs/isac/fix/include/audio_encoder_isacfix.h" #include "webrtc/modules/audio_coding/codecs/isac/main/include/audio_encoder_isac.h" #include "webrtc/modules/audio_coding/neteq/tools/input_audio_file.h" +#include "webrtc/rtc_base/buffer.h" #include "webrtc/test/gtest.h" #include "webrtc/test/testsupport/fileutils.h" diff --git a/webrtc/modules/audio_coding/codecs/legacy_encoded_audio_frame.h b/webrtc/modules/audio_coding/codecs/legacy_encoded_audio_frame.h index 46b91ce8e3..65f46544e8 100644 --- a/webrtc/modules/audio_coding/codecs/legacy_encoded_audio_frame.h +++ b/webrtc/modules/audio_coding/codecs/legacy_encoded_audio_frame.h @@ -14,7 +14,7 @@ #include #include "webrtc/api/audio_codecs/audio_decoder.h" -#include "webrtc/base/array_view.h" +#include "webrtc/rtc_base/array_view.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/codecs/opus/audio_decoder_opus.cc b/webrtc/modules/audio_coding/codecs/opus/audio_decoder_opus.cc index 28a7b1090a..2270ff4d9d 100644 --- a/webrtc/modules/audio_coding/codecs/opus/audio_decoder_opus.cc +++ b/webrtc/modules/audio_coding/codecs/opus/audio_decoder_opus.cc @@ -12,7 +12,7 @@ #include -#include "webrtc/base/checks.h" +#include "webrtc/rtc_base/checks.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/codecs/opus/audio_decoder_opus.h b/webrtc/modules/audio_coding/codecs/opus/audio_decoder_opus.h index dcdaf9281e..d8512ec53c 100644 --- a/webrtc/modules/audio_coding/codecs/opus/audio_decoder_opus.h +++ b/webrtc/modules/audio_coding/codecs/opus/audio_decoder_opus.h @@ -12,8 +12,8 @@ #define WEBRTC_MODULES_AUDIO_CODING_CODECS_OPUS_AUDIO_DECODER_OPUS_H_ #include "webrtc/api/audio_codecs/audio_decoder.h" -#include "webrtc/base/constructormagic.h" #include "webrtc/modules/audio_coding/codecs/opus/opus_interface.h" +#include "webrtc/rtc_base/constructormagic.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/codecs/opus/audio_encoder_opus.cc b/webrtc/modules/audio_coding/codecs/opus/audio_encoder_opus.cc index 9ebb63d849..9b3a367c0f 100644 --- a/webrtc/modules/audio_coding/codecs/opus/audio_encoder_opus.cc +++ b/webrtc/modules/audio_coding/codecs/opus/audio_encoder_opus.cc @@ -14,20 +14,20 @@ #include #include -#include "webrtc/base/arraysize.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/numerics/exp_filter.h" -#include "webrtc/base/protobuf_utils.h" -#include "webrtc/base/ptr_util.h" -#include "webrtc/base/safe_conversions.h" -#include "webrtc/base/safe_minmax.h" -#include "webrtc/base/string_to_number.h" -#include "webrtc/base/timeutils.h" #include "webrtc/common_types.h" #include "webrtc/modules/audio_coding/audio_network_adaptor/audio_network_adaptor_impl.h" #include "webrtc/modules/audio_coding/audio_network_adaptor/controller_manager.h" #include "webrtc/modules/audio_coding/codecs/opus/opus_interface.h" +#include "webrtc/rtc_base/arraysize.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/numerics/exp_filter.h" +#include "webrtc/rtc_base/protobuf_utils.h" +#include "webrtc/rtc_base/ptr_util.h" +#include "webrtc/rtc_base/safe_conversions.h" +#include "webrtc/rtc_base/safe_minmax.h" +#include "webrtc/rtc_base/string_to_number.h" +#include "webrtc/rtc_base/timeutils.h" #include "webrtc/system_wrappers/include/field_trial.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/codecs/opus/audio_encoder_opus.h b/webrtc/modules/audio_coding/codecs/opus/audio_encoder_opus.h index e50441b4c2..473a65d29d 100644 --- a/webrtc/modules/audio_coding/codecs/opus/audio_encoder_opus.h +++ b/webrtc/modules/audio_coding/codecs/opus/audio_encoder_opus.h @@ -19,12 +19,12 @@ #include "webrtc/api/audio_codecs/audio_encoder.h" #include "webrtc/api/audio_codecs/audio_format.h" #include "webrtc/api/audio_codecs/opus/audio_encoder_opus_config.h" -#include "webrtc/base/constructormagic.h" -#include "webrtc/base/optional.h" -#include "webrtc/base/protobuf_utils.h" #include "webrtc/common_audio/smoothing_filter.h" #include "webrtc/modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor.h" #include "webrtc/modules/audio_coding/codecs/opus/opus_interface.h" +#include "webrtc/rtc_base/constructormagic.h" +#include "webrtc/rtc_base/optional.h" +#include "webrtc/rtc_base/protobuf_utils.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/codecs/opus/audio_encoder_opus_unittest.cc b/webrtc/modules/audio_coding/codecs/opus/audio_encoder_opus_unittest.cc index ecaea5dbdb..08e168b099 100644 --- a/webrtc/modules/audio_coding/codecs/opus/audio_encoder_opus_unittest.cc +++ b/webrtc/modules/audio_coding/codecs/opus/audio_encoder_opus_unittest.cc @@ -12,13 +12,13 @@ #include #include -#include "webrtc/base/checks.h" -#include "webrtc/base/fakeclock.h" #include "webrtc/common_audio/mocks/mock_smoothing_filter.h" #include "webrtc/common_types.h" #include "webrtc/modules/audio_coding/audio_network_adaptor/mock/mock_audio_network_adaptor.h" #include "webrtc/modules/audio_coding/codecs/opus/audio_encoder_opus.h" #include "webrtc/modules/audio_coding/neteq/tools/audio_loop.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/fakeclock.h" #include "webrtc/test/field_trial.h" #include "webrtc/test/gmock.h" #include "webrtc/test/gtest.h" diff --git a/webrtc/modules/audio_coding/codecs/opus/opus_complexity_unittest.cc b/webrtc/modules/audio_coding/codecs/opus/opus_complexity_unittest.cc index 8b8f9a1ec0..28d5175e96 100644 --- a/webrtc/modules/audio_coding/codecs/opus/opus_complexity_unittest.cc +++ b/webrtc/modules/audio_coding/codecs/opus/opus_complexity_unittest.cc @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/base/format_macros.h" -#include "webrtc/base/timeutils.h" #include "webrtc/modules/audio_coding/codecs/opus/audio_encoder_opus.h" #include "webrtc/modules/audio_coding/neteq/tools/audio_loop.h" +#include "webrtc/rtc_base/format_macros.h" +#include "webrtc/rtc_base/timeutils.h" #include "webrtc/test/gtest.h" #include "webrtc/test/testsupport/fileutils.h" #include "webrtc/test/testsupport/perf_test.h" diff --git a/webrtc/modules/audio_coding/codecs/opus/opus_fec_test.cc b/webrtc/modules/audio_coding/codecs/opus/opus_fec_test.cc index 8748162eb1..8f42bf4ea7 100644 --- a/webrtc/modules/audio_coding/codecs/opus/opus_fec_test.cc +++ b/webrtc/modules/audio_coding/codecs/opus/opus_fec_test.cc @@ -10,8 +10,8 @@ #include -#include "webrtc/base/format_macros.h" #include "webrtc/modules/audio_coding/codecs/opus/opus_interface.h" +#include "webrtc/rtc_base/format_macros.h" #include "webrtc/test/gtest.h" #include "webrtc/test/testsupport/fileutils.h" diff --git a/webrtc/modules/audio_coding/codecs/opus/opus_inst.h b/webrtc/modules/audio_coding/codecs/opus/opus_inst.h index b2be12aee7..976f09ea71 100644 --- a/webrtc/modules/audio_coding/codecs/opus/opus_inst.h +++ b/webrtc/modules/audio_coding/codecs/opus/opus_inst.h @@ -13,7 +13,7 @@ #include -#include "webrtc/base/ignore_wundef.h" +#include "webrtc/rtc_base/ignore_wundef.h" RTC_PUSH_IGNORING_WUNDEF() #include "opus.h" diff --git a/webrtc/modules/audio_coding/codecs/opus/opus_unittest.cc b/webrtc/modules/audio_coding/codecs/opus/opus_unittest.cc index c2614abd6e..9cff920ce7 100644 --- a/webrtc/modules/audio_coding/codecs/opus/opus_unittest.cc +++ b/webrtc/modules/audio_coding/codecs/opus/opus_unittest.cc @@ -11,10 +11,10 @@ #include #include -#include "webrtc/base/checks.h" #include "webrtc/modules/audio_coding/codecs/opus/opus_inst.h" #include "webrtc/modules/audio_coding/codecs/opus/opus_interface.h" #include "webrtc/modules/audio_coding/neteq/tools/audio_loop.h" +#include "webrtc/rtc_base/checks.h" #include "webrtc/test/gtest.h" #include "webrtc/test/testsupport/fileutils.h" diff --git a/webrtc/modules/audio_coding/codecs/pcm16b/audio_decoder_pcm16b.cc b/webrtc/modules/audio_coding/codecs/pcm16b/audio_decoder_pcm16b.cc index 692e212ed9..57724a34bc 100644 --- a/webrtc/modules/audio_coding/codecs/pcm16b/audio_decoder_pcm16b.cc +++ b/webrtc/modules/audio_coding/codecs/pcm16b/audio_decoder_pcm16b.cc @@ -10,9 +10,9 @@ #include "webrtc/modules/audio_coding/codecs/pcm16b/audio_decoder_pcm16b.h" -#include "webrtc/base/checks.h" #include "webrtc/modules/audio_coding/codecs/legacy_encoded_audio_frame.h" #include "webrtc/modules/audio_coding/codecs/pcm16b/pcm16b.h" +#include "webrtc/rtc_base/checks.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/codecs/pcm16b/audio_decoder_pcm16b.h b/webrtc/modules/audio_coding/codecs/pcm16b/audio_decoder_pcm16b.h index 969aa4e6d9..46dfbb266f 100644 --- a/webrtc/modules/audio_coding/codecs/pcm16b/audio_decoder_pcm16b.h +++ b/webrtc/modules/audio_coding/codecs/pcm16b/audio_decoder_pcm16b.h @@ -12,7 +12,7 @@ #define WEBRTC_MODULES_AUDIO_CODING_CODECS_PCM16B_AUDIO_DECODER_PCM16B_H_ #include "webrtc/api/audio_codecs/audio_decoder.h" -#include "webrtc/base/constructormagic.h" +#include "webrtc/rtc_base/constructormagic.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/codecs/pcm16b/audio_encoder_pcm16b.cc b/webrtc/modules/audio_coding/codecs/pcm16b/audio_encoder_pcm16b.cc index f57cc7ebdc..897eed23f4 100644 --- a/webrtc/modules/audio_coding/codecs/pcm16b/audio_encoder_pcm16b.cc +++ b/webrtc/modules/audio_coding/codecs/pcm16b/audio_encoder_pcm16b.cc @@ -12,11 +12,11 @@ #include -#include "webrtc/base/checks.h" -#include "webrtc/base/safe_conversions.h" -#include "webrtc/base/string_to_number.h" #include "webrtc/common_types.h" #include "webrtc/modules/audio_coding/codecs/pcm16b/pcm16b.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/safe_conversions.h" +#include "webrtc/rtc_base/string_to_number.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/codecs/pcm16b/audio_encoder_pcm16b.h b/webrtc/modules/audio_coding/codecs/pcm16b/audio_encoder_pcm16b.h index deb0e1e80f..79f56c9788 100644 --- a/webrtc/modules/audio_coding/codecs/pcm16b/audio_encoder_pcm16b.h +++ b/webrtc/modules/audio_coding/codecs/pcm16b/audio_encoder_pcm16b.h @@ -11,8 +11,8 @@ #ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_PCM16B_AUDIO_ENCODER_PCM16B_H_ #define WEBRTC_MODULES_AUDIO_CODING_CODECS_PCM16B_AUDIO_ENCODER_PCM16B_H_ -#include "webrtc/base/constructormagic.h" #include "webrtc/modules/audio_coding/codecs/g711/audio_encoder_pcm.h" +#include "webrtc/rtc_base/constructormagic.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/codecs/red/audio_encoder_copy_red.cc b/webrtc/modules/audio_coding/codecs/red/audio_encoder_copy_red.cc index 251a1045dc..0ce7d345ec 100644 --- a/webrtc/modules/audio_coding/codecs/red/audio_encoder_copy_red.cc +++ b/webrtc/modules/audio_coding/codecs/red/audio_encoder_copy_red.cc @@ -14,7 +14,7 @@ #include -#include "webrtc/base/checks.h" +#include "webrtc/rtc_base/checks.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/codecs/red/audio_encoder_copy_red.h b/webrtc/modules/audio_coding/codecs/red/audio_encoder_copy_red.h index 4731ddf029..4261c472d1 100644 --- a/webrtc/modules/audio_coding/codecs/red/audio_encoder_copy_red.h +++ b/webrtc/modules/audio_coding/codecs/red/audio_encoder_copy_red.h @@ -15,8 +15,8 @@ #include #include "webrtc/api/audio_codecs/audio_encoder.h" -#include "webrtc/base/buffer.h" -#include "webrtc/base/constructormagic.h" +#include "webrtc/rtc_base/buffer.h" +#include "webrtc/rtc_base/constructormagic.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/codecs/red/audio_encoder_copy_red_unittest.cc b/webrtc/modules/audio_coding/codecs/red/audio_encoder_copy_red_unittest.cc index c82569e1d6..a79bb1c638 100644 --- a/webrtc/modules/audio_coding/codecs/red/audio_encoder_copy_red_unittest.cc +++ b/webrtc/modules/audio_coding/codecs/red/audio_encoder_copy_red_unittest.cc @@ -11,8 +11,8 @@ #include #include -#include "webrtc/base/checks.h" #include "webrtc/modules/audio_coding/codecs/red/audio_encoder_copy_red.h" +#include "webrtc/rtc_base/checks.h" #include "webrtc/test/gtest.h" #include "webrtc/test/mock_audio_encoder.h" diff --git a/webrtc/modules/audio_coding/codecs/tools/audio_codec_speed_test.cc b/webrtc/modules/audio_coding/codecs/tools/audio_codec_speed_test.cc index 5b0f02ef66..b9332e0b04 100644 --- a/webrtc/modules/audio_coding/codecs/tools/audio_codec_speed_test.cc +++ b/webrtc/modules/audio_coding/codecs/tools/audio_codec_speed_test.cc @@ -10,7 +10,7 @@ #include "webrtc/modules/audio_coding/codecs/tools/audio_codec_speed_test.h" -#include "webrtc/base/format_macros.h" +#include "webrtc/rtc_base/format_macros.h" #include "webrtc/test/gtest.h" #include "webrtc/test/testsupport/fileutils.h" diff --git a/webrtc/modules/audio_coding/include/audio_coding_module.h b/webrtc/modules/audio_coding/include/audio_coding_module.h index 9d13f8d1d0..44eec75666 100644 --- a/webrtc/modules/audio_coding/include/audio_coding_module.h +++ b/webrtc/modules/audio_coding/include/audio_coding_module.h @@ -17,13 +17,13 @@ #include "webrtc/api/audio_codecs/audio_decoder_factory.h" #include "webrtc/api/audio_codecs/audio_encoder.h" -#include "webrtc/base/deprecation.h" -#include "webrtc/base/function_view.h" -#include "webrtc/base/optional.h" #include "webrtc/common_types.h" #include "webrtc/modules/audio_coding/include/audio_coding_module_typedefs.h" #include "webrtc/modules/audio_coding/neteq/include/neteq.h" #include "webrtc/modules/include/module.h" +#include "webrtc/rtc_base/deprecation.h" +#include "webrtc/rtc_base/function_view.h" +#include "webrtc/rtc_base/optional.h" #include "webrtc/system_wrappers/include/clock.h" #include "webrtc/typedefs.h" diff --git a/webrtc/modules/audio_coding/neteq/accelerate.h b/webrtc/modules/audio_coding/neteq/accelerate.h index f66bc8ed34..713344e3d0 100644 --- a/webrtc/modules/audio_coding/neteq/accelerate.h +++ b/webrtc/modules/audio_coding/neteq/accelerate.h @@ -13,9 +13,9 @@ #include -#include "webrtc/base/constructormagic.h" #include "webrtc/modules/audio_coding/neteq/audio_multi_vector.h" #include "webrtc/modules/audio_coding/neteq/time_stretch.h" +#include "webrtc/rtc_base/constructormagic.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/neteq/audio_decoder_impl.cc b/webrtc/modules/audio_coding/neteq/audio_decoder_impl.cc index 4087973adb..d60f4bf7d1 100644 --- a/webrtc/modules/audio_coding/neteq/audio_decoder_impl.cc +++ b/webrtc/modules/audio_coding/neteq/audio_decoder_impl.cc @@ -12,8 +12,8 @@ #include -#include "webrtc/base/checks.h" #include "webrtc/modules/audio_coding/codecs/g711/audio_decoder_pcm.h" +#include "webrtc/rtc_base/checks.h" #ifdef WEBRTC_CODEC_G722 #include "webrtc/modules/audio_coding/codecs/g722/audio_decoder_g722.h" #endif diff --git a/webrtc/modules/audio_coding/neteq/audio_decoder_impl.h b/webrtc/modules/audio_coding/neteq/audio_decoder_impl.h index 325674f3e9..8dc746c856 100644 --- a/webrtc/modules/audio_coding/neteq/audio_decoder_impl.h +++ b/webrtc/modules/audio_coding/neteq/audio_decoder_impl.h @@ -14,8 +14,8 @@ #include #include "webrtc/api/audio_codecs/audio_decoder.h" -#include "webrtc/base/constructormagic.h" #include "webrtc/modules/audio_coding/neteq/neteq_decoder_enum.h" +#include "webrtc/rtc_base/constructormagic.h" #include "webrtc/typedefs.h" #ifdef WEBRTC_CODEC_G722 diff --git a/webrtc/modules/audio_coding/neteq/audio_multi_vector.cc b/webrtc/modules/audio_coding/neteq/audio_multi_vector.cc index c80909d7b5..8263752593 100644 --- a/webrtc/modules/audio_coding/neteq/audio_multi_vector.cc +++ b/webrtc/modules/audio_coding/neteq/audio_multi_vector.cc @@ -14,7 +14,7 @@ #include -#include "webrtc/base/checks.h" +#include "webrtc/rtc_base/checks.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/neteq/audio_multi_vector.h b/webrtc/modules/audio_coding/neteq/audio_multi_vector.h index 1c28648816..b6f1d393a4 100644 --- a/webrtc/modules/audio_coding/neteq/audio_multi_vector.h +++ b/webrtc/modules/audio_coding/neteq/audio_multi_vector.h @@ -15,8 +15,8 @@ #include -#include "webrtc/base/constructormagic.h" #include "webrtc/modules/audio_coding/neteq/audio_vector.h" +#include "webrtc/rtc_base/constructormagic.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/neteq/audio_vector.cc b/webrtc/modules/audio_coding/neteq/audio_vector.cc index 5cc1a44966..c819daacaa 100644 --- a/webrtc/modules/audio_coding/neteq/audio_vector.cc +++ b/webrtc/modules/audio_coding/neteq/audio_vector.cc @@ -15,7 +15,7 @@ #include #include -#include "webrtc/base/checks.h" +#include "webrtc/rtc_base/checks.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/neteq/audio_vector.h b/webrtc/modules/audio_coding/neteq/audio_vector.h index 57e01ab2e1..f3dfdd613e 100644 --- a/webrtc/modules/audio_coding/neteq/audio_vector.h +++ b/webrtc/modules/audio_coding/neteq/audio_vector.h @@ -14,8 +14,8 @@ #include // Access to size_t. #include -#include "webrtc/base/checks.h" -#include "webrtc/base/constructormagic.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/constructormagic.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/neteq/background_noise.h b/webrtc/modules/audio_coding/neteq/background_noise.h index 2e5466796e..0c662bd384 100644 --- a/webrtc/modules/audio_coding/neteq/background_noise.h +++ b/webrtc/modules/audio_coding/neteq/background_noise.h @@ -14,9 +14,9 @@ #include // size_t #include -#include "webrtc/base/constructormagic.h" #include "webrtc/modules/audio_coding/neteq/audio_multi_vector.h" #include "webrtc/modules/audio_coding/neteq/include/neteq.h" +#include "webrtc/rtc_base/constructormagic.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/neteq/buffer_level_filter.h b/webrtc/modules/audio_coding/neteq/buffer_level_filter.h index 030870653c..bc9a10e25c 100644 --- a/webrtc/modules/audio_coding/neteq/buffer_level_filter.h +++ b/webrtc/modules/audio_coding/neteq/buffer_level_filter.h @@ -13,7 +13,7 @@ #include -#include "webrtc/base/constructormagic.h" +#include "webrtc/rtc_base/constructormagic.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/neteq/comfort_noise.cc b/webrtc/modules/audio_coding/neteq/comfort_noise.cc index ef3129b76a..8482e8dd12 100644 --- a/webrtc/modules/audio_coding/neteq/comfort_noise.cc +++ b/webrtc/modules/audio_coding/neteq/comfort_noise.cc @@ -13,10 +13,10 @@ #include #include "webrtc/api/audio_codecs/audio_decoder.h" -#include "webrtc/base/logging.h" #include "webrtc/modules/audio_coding/neteq/decoder_database.h" #include "webrtc/modules/audio_coding/neteq/dsp_helper.h" #include "webrtc/modules/audio_coding/neteq/sync_buffer.h" +#include "webrtc/rtc_base/logging.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/neteq/comfort_noise.h b/webrtc/modules/audio_coding/neteq/comfort_noise.h index 7476784791..fe663cc7b4 100644 --- a/webrtc/modules/audio_coding/neteq/comfort_noise.h +++ b/webrtc/modules/audio_coding/neteq/comfort_noise.h @@ -11,8 +11,8 @@ #ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_COMFORT_NOISE_H_ #define WEBRTC_MODULES_AUDIO_CODING_NETEQ_COMFORT_NOISE_H_ -#include "webrtc/base/constructormagic.h" #include "webrtc/modules/audio_coding/neteq/audio_multi_vector.h" +#include "webrtc/rtc_base/constructormagic.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/neteq/decision_logic.h b/webrtc/modules/audio_coding/neteq/decision_logic.h index 66c940d7a6..7d9ba60fc2 100644 --- a/webrtc/modules/audio_coding/neteq/decision_logic.h +++ b/webrtc/modules/audio_coding/neteq/decision_logic.h @@ -11,10 +11,10 @@ #ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_DECISION_LOGIC_H_ #define WEBRTC_MODULES_AUDIO_CODING_NETEQ_DECISION_LOGIC_H_ -#include "webrtc/base/constructormagic.h" #include "webrtc/modules/audio_coding/neteq/defines.h" #include "webrtc/modules/audio_coding/neteq/include/neteq.h" #include "webrtc/modules/audio_coding/neteq/tick_timer.h" +#include "webrtc/rtc_base/constructormagic.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/neteq/decision_logic_fax.h b/webrtc/modules/audio_coding/neteq/decision_logic_fax.h index 6726126537..4efb874775 100644 --- a/webrtc/modules/audio_coding/neteq/decision_logic_fax.h +++ b/webrtc/modules/audio_coding/neteq/decision_logic_fax.h @@ -11,8 +11,8 @@ #ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_DECISION_LOGIC_FAX_H_ #define WEBRTC_MODULES_AUDIO_CODING_NETEQ_DECISION_LOGIC_FAX_H_ -#include "webrtc/base/constructormagic.h" #include "webrtc/modules/audio_coding/neteq/decision_logic.h" +#include "webrtc/rtc_base/constructormagic.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/neteq/decision_logic_normal.h b/webrtc/modules/audio_coding/neteq/decision_logic_normal.h index 06058674e9..b676bd4deb 100644 --- a/webrtc/modules/audio_coding/neteq/decision_logic_normal.h +++ b/webrtc/modules/audio_coding/neteq/decision_logic_normal.h @@ -11,8 +11,8 @@ #ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_DECISION_LOGIC_NORMAL_H_ #define WEBRTC_MODULES_AUDIO_CODING_NETEQ_DECISION_LOGIC_NORMAL_H_ -#include "webrtc/base/constructormagic.h" #include "webrtc/modules/audio_coding/neteq/decision_logic.h" +#include "webrtc/rtc_base/constructormagic.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/neteq/decoder_database.cc b/webrtc/modules/audio_coding/neteq/decoder_database.cc index 8cd438656a..526d159c86 100644 --- a/webrtc/modules/audio_coding/neteq/decoder_database.cc +++ b/webrtc/modules/audio_coding/neteq/decoder_database.cc @@ -13,8 +13,8 @@ #include // pair #include "webrtc/api/audio_codecs/audio_decoder.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/logging.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/logging.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/neteq/decoder_database.h b/webrtc/modules/audio_coding/neteq/decoder_database.h index 35d1d0da08..5feadd1bf1 100644 --- a/webrtc/modules/audio_coding/neteq/decoder_database.h +++ b/webrtc/modules/audio_coding/neteq/decoder_database.h @@ -17,12 +17,12 @@ #include "webrtc/api/audio_codecs/audio_decoder_factory.h" #include "webrtc/api/audio_codecs/audio_format.h" -#include "webrtc/base/constructormagic.h" -#include "webrtc/base/scoped_ref_ptr.h" #include "webrtc/common_types.h" // NULL #include "webrtc/modules/audio_coding/codecs/cng/webrtc_cng.h" #include "webrtc/modules/audio_coding/neteq/audio_decoder_impl.h" #include "webrtc/modules/audio_coding/neteq/packet.h" +#include "webrtc/rtc_base/constructormagic.h" +#include "webrtc/rtc_base/scoped_ref_ptr.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/neteq/delay_manager.cc b/webrtc/modules/audio_coding/neteq/delay_manager.cc index 2941126c02..bf92588656 100644 --- a/webrtc/modules/audio_coding/neteq/delay_manager.cc +++ b/webrtc/modules/audio_coding/neteq/delay_manager.cc @@ -15,11 +15,11 @@ #include // max, min -#include "webrtc/base/logging.h" -#include "webrtc/base/safe_conversions.h" #include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" #include "webrtc/modules/audio_coding/neteq/delay_peak_detector.h" #include "webrtc/modules/include/module_common_types.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/safe_conversions.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/neteq/delay_manager.h b/webrtc/modules/audio_coding/neteq/delay_manager.h index f91c1dec33..ac1de25c2f 100644 --- a/webrtc/modules/audio_coding/neteq/delay_manager.h +++ b/webrtc/modules/audio_coding/neteq/delay_manager.h @@ -16,9 +16,9 @@ #include #include -#include "webrtc/base/constructormagic.h" #include "webrtc/modules/audio_coding/neteq/audio_decoder_impl.h" #include "webrtc/modules/audio_coding/neteq/tick_timer.h" +#include "webrtc/rtc_base/constructormagic.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/neteq/delay_peak_detector.cc b/webrtc/modules/audio_coding/neteq/delay_peak_detector.cc index 5763572bad..b3fe8a746a 100644 --- a/webrtc/modules/audio_coding/neteq/delay_peak_detector.cc +++ b/webrtc/modules/audio_coding/neteq/delay_peak_detector.cc @@ -12,8 +12,8 @@ #include // max -#include "webrtc/base/checks.h" -#include "webrtc/base/safe_conversions.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/safe_conversions.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/neteq/delay_peak_detector.h b/webrtc/modules/audio_coding/neteq/delay_peak_detector.h index f57d3bd71e..455d4e95a0 100644 --- a/webrtc/modules/audio_coding/neteq/delay_peak_detector.h +++ b/webrtc/modules/audio_coding/neteq/delay_peak_detector.h @@ -16,8 +16,8 @@ #include #include -#include "webrtc/base/constructormagic.h" #include "webrtc/modules/audio_coding/neteq/tick_timer.h" +#include "webrtc/rtc_base/constructormagic.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/neteq/dsp_helper.h b/webrtc/modules/audio_coding/neteq/dsp_helper.h index 23543fe383..599110aa49 100644 --- a/webrtc/modules/audio_coding/neteq/dsp_helper.h +++ b/webrtc/modules/audio_coding/neteq/dsp_helper.h @@ -13,8 +13,8 @@ #include // Access to size_t. -#include "webrtc/base/constructormagic.h" #include "webrtc/modules/audio_coding/neteq/audio_multi_vector.h" +#include "webrtc/rtc_base/constructormagic.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/neteq/dtmf_buffer.cc b/webrtc/modules/audio_coding/neteq/dtmf_buffer.cc index 3685fc1ef4..c5e5adf1a7 100644 --- a/webrtc/modules/audio_coding/neteq/dtmf_buffer.cc +++ b/webrtc/modules/audio_coding/neteq/dtmf_buffer.cc @@ -13,8 +13,8 @@ #include #include // max -#include "webrtc/base/checks.h" -#include "webrtc/base/logging.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/logging.h" // Modify the code to obtain backwards bit-exactness. Once bit-exactness is no // longer required, this #define should be removed (and the code that it diff --git a/webrtc/modules/audio_coding/neteq/dtmf_buffer.h b/webrtc/modules/audio_coding/neteq/dtmf_buffer.h index 1f415ce81f..068ad64d84 100644 --- a/webrtc/modules/audio_coding/neteq/dtmf_buffer.h +++ b/webrtc/modules/audio_coding/neteq/dtmf_buffer.h @@ -14,7 +14,7 @@ #include #include // size_t -#include "webrtc/base/constructormagic.h" +#include "webrtc/rtc_base/constructormagic.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/neteq/dtmf_tone_generator.cc b/webrtc/modules/audio_coding/neteq/dtmf_tone_generator.cc index 2079d2ebeb..416835b189 100644 --- a/webrtc/modules/audio_coding/neteq/dtmf_tone_generator.cc +++ b/webrtc/modules/audio_coding/neteq/dtmf_tone_generator.cc @@ -30,8 +30,8 @@ #include "webrtc/modules/audio_coding/neteq/dtmf_tone_generator.h" -#include "webrtc/base/arraysize.h" -#include "webrtc/base/checks.h" +#include "webrtc/rtc_base/arraysize.h" +#include "webrtc/rtc_base/checks.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/neteq/dtmf_tone_generator.h b/webrtc/modules/audio_coding/neteq/dtmf_tone_generator.h index 9abd03eb09..713987d7e7 100644 --- a/webrtc/modules/audio_coding/neteq/dtmf_tone_generator.h +++ b/webrtc/modules/audio_coding/neteq/dtmf_tone_generator.h @@ -11,9 +11,8 @@ #ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_DTMF_TONE_GENERATOR_H_ #define WEBRTC_MODULES_AUDIO_CODING_NETEQ_DTMF_TONE_GENERATOR_H_ - -#include "webrtc/base/constructormagic.h" #include "webrtc/modules/audio_coding/neteq/audio_multi_vector.h" +#include "webrtc/rtc_base/constructormagic.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/neteq/expand.cc b/webrtc/modules/audio_coding/neteq/expand.cc index 0c527fe041..f8ae526b3c 100644 --- a/webrtc/modules/audio_coding/neteq/expand.cc +++ b/webrtc/modules/audio_coding/neteq/expand.cc @@ -16,7 +16,6 @@ #include // min, max #include // numeric_limits -#include "webrtc/base/safe_conversions.h" #include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" #include "webrtc/modules/audio_coding/neteq/background_noise.h" #include "webrtc/modules/audio_coding/neteq/cross_correlation.h" @@ -24,6 +23,7 @@ #include "webrtc/modules/audio_coding/neteq/random_vector.h" #include "webrtc/modules/audio_coding/neteq/statistics_calculator.h" #include "webrtc/modules/audio_coding/neteq/sync_buffer.h" +#include "webrtc/rtc_base/safe_conversions.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/neteq/expand.h b/webrtc/modules/audio_coding/neteq/expand.h index 0feba3693a..af1543283b 100644 --- a/webrtc/modules/audio_coding/neteq/expand.h +++ b/webrtc/modules/audio_coding/neteq/expand.h @@ -14,8 +14,8 @@ #include #include -#include "webrtc/base/constructormagic.h" #include "webrtc/modules/audio_coding/neteq/audio_multi_vector.h" +#include "webrtc/rtc_base/constructormagic.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/neteq/expand_unittest.cc b/webrtc/modules/audio_coding/neteq/expand_unittest.cc index 55b048f0c5..40cb2eb321 100644 --- a/webrtc/modules/audio_coding/neteq/expand_unittest.cc +++ b/webrtc/modules/audio_coding/neteq/expand_unittest.cc @@ -12,13 +12,13 @@ #include "webrtc/modules/audio_coding/neteq/expand.h" -#include "webrtc/base/safe_conversions.h" #include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" #include "webrtc/modules/audio_coding/neteq/background_noise.h" #include "webrtc/modules/audio_coding/neteq/random_vector.h" #include "webrtc/modules/audio_coding/neteq/statistics_calculator.h" #include "webrtc/modules/audio_coding/neteq/sync_buffer.h" #include "webrtc/modules/audio_coding/neteq/tools/resample_input_audio_file.h" +#include "webrtc/rtc_base/safe_conversions.h" #include "webrtc/test/gtest.h" #include "webrtc/test/testsupport/fileutils.h" diff --git a/webrtc/modules/audio_coding/neteq/include/neteq.h b/webrtc/modules/audio_coding/neteq/include/neteq.h index 648c04f8f5..61bdd1f953 100644 --- a/webrtc/modules/audio_coding/neteq/include/neteq.h +++ b/webrtc/modules/audio_coding/neteq/include/neteq.h @@ -16,11 +16,11 @@ #include #include -#include "webrtc/base/constructormagic.h" -#include "webrtc/base/optional.h" -#include "webrtc/base/scoped_ref_ptr.h" #include "webrtc/common_types.h" #include "webrtc/modules/audio_coding/neteq/audio_decoder_impl.h" +#include "webrtc/rtc_base/constructormagic.h" +#include "webrtc/rtc_base/optional.h" +#include "webrtc/rtc_base/scoped_ref_ptr.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/neteq/merge.cc b/webrtc/modules/audio_coding/neteq/merge.cc index 9efbe4fb9c..df4f792c4a 100644 --- a/webrtc/modules/audio_coding/neteq/merge.cc +++ b/webrtc/modules/audio_coding/neteq/merge.cc @@ -16,14 +16,14 @@ #include // min, max #include -#include "webrtc/base/safe_conversions.h" -#include "webrtc/base/safe_minmax.h" #include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" #include "webrtc/modules/audio_coding/neteq/audio_multi_vector.h" #include "webrtc/modules/audio_coding/neteq/cross_correlation.h" #include "webrtc/modules/audio_coding/neteq/dsp_helper.h" #include "webrtc/modules/audio_coding/neteq/expand.h" #include "webrtc/modules/audio_coding/neteq/sync_buffer.h" +#include "webrtc/rtc_base/safe_conversions.h" +#include "webrtc/rtc_base/safe_minmax.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/neteq/merge.h b/webrtc/modules/audio_coding/neteq/merge.h index 48f09a1672..34e6639ff8 100644 --- a/webrtc/modules/audio_coding/neteq/merge.h +++ b/webrtc/modules/audio_coding/neteq/merge.h @@ -13,8 +13,8 @@ #include -#include "webrtc/base/constructormagic.h" #include "webrtc/modules/audio_coding/neteq/audio_multi_vector.h" +#include "webrtc/rtc_base/constructormagic.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/neteq/mock/mock_external_decoder_pcm16b.h b/webrtc/modules/audio_coding/neteq/mock/mock_external_decoder_pcm16b.h index a8919f25dc..38486801d7 100644 --- a/webrtc/modules/audio_coding/neteq/mock/mock_external_decoder_pcm16b.h +++ b/webrtc/modules/audio_coding/neteq/mock/mock_external_decoder_pcm16b.h @@ -12,8 +12,8 @@ #define WEBRTC_MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_EXTERNAL_DECODER_PCM16B_H_ #include "webrtc/api/audio_codecs/audio_decoder.h" -#include "webrtc/base/constructormagic.h" #include "webrtc/modules/audio_coding/codecs/pcm16b/pcm16b.h" +#include "webrtc/rtc_base/constructormagic.h" #include "webrtc/test/gmock.h" #include "webrtc/typedefs.h" diff --git a/webrtc/modules/audio_coding/neteq/nack_tracker.cc b/webrtc/modules/audio_coding/neteq/nack_tracker.cc index af3476c958..9829cf93c7 100644 --- a/webrtc/modules/audio_coding/neteq/nack_tracker.cc +++ b/webrtc/modules/audio_coding/neteq/nack_tracker.cc @@ -14,8 +14,8 @@ #include // For std::max. -#include "webrtc/base/checks.h" #include "webrtc/modules/include/module_common_types.h" +#include "webrtc/rtc_base/checks.h" namespace webrtc { namespace { diff --git a/webrtc/modules/audio_coding/neteq/nack_tracker.h b/webrtc/modules/audio_coding/neteq/nack_tracker.h index de97d91cf2..4f98c82c9c 100644 --- a/webrtc/modules/audio_coding/neteq/nack_tracker.h +++ b/webrtc/modules/audio_coding/neteq/nack_tracker.h @@ -14,8 +14,8 @@ #include #include -#include "webrtc/base/gtest_prod_util.h" #include "webrtc/modules/audio_coding/include/audio_coding_module_typedefs.h" +#include "webrtc/rtc_base/gtest_prod_util.h" // // The NackTracker class keeps track of the lost packets, an estimate of diff --git a/webrtc/modules/audio_coding/neteq/neteq_decoder_enum.h b/webrtc/modules/audio_coding/neteq/neteq_decoder_enum.h index 6eb9300822..a36034ccdf 100644 --- a/webrtc/modules/audio_coding/neteq/neteq_decoder_enum.h +++ b/webrtc/modules/audio_coding/neteq/neteq_decoder_enum.h @@ -12,7 +12,7 @@ #define WEBRTC_MODULES_AUDIO_CODING_NETEQ_NETEQ_DECODER_ENUM_H_ #include "webrtc/api/audio_codecs/audio_format.h" -#include "webrtc/base/optional.h" +#include "webrtc/rtc_base/optional.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/neteq/neteq_impl.cc b/webrtc/modules/audio_coding/neteq/neteq_impl.cc index 5085e1fc38..88e07e857c 100644 --- a/webrtc/modules/audio_coding/neteq/neteq_impl.cc +++ b/webrtc/modules/audio_coding/neteq/neteq_impl.cc @@ -17,11 +17,6 @@ #include #include "webrtc/api/audio_codecs/audio_decoder.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/safe_conversions.h" -#include "webrtc/base/sanitizer.h" -#include "webrtc/base/trace_event.h" #include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" #include "webrtc/modules/audio_coding/neteq/accelerate.h" #include "webrtc/modules/audio_coding/neteq/background_noise.h" @@ -47,6 +42,11 @@ #include "webrtc/modules/audio_coding/neteq/tick_timer.h" #include "webrtc/modules/audio_coding/neteq/timestamp_scaler.h" #include "webrtc/modules/include/module_common_types.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/safe_conversions.h" +#include "webrtc/rtc_base/sanitizer.h" +#include "webrtc/rtc_base/trace_event.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/neteq/neteq_impl.h b/webrtc/modules/audio_coding/neteq/neteq_impl.h index d1d2039be7..0eeff2e45f 100644 --- a/webrtc/modules/audio_coding/neteq/neteq_impl.h +++ b/webrtc/modules/audio_coding/neteq/neteq_impl.h @@ -14,10 +14,6 @@ #include #include -#include "webrtc/base/constructormagic.h" -#include "webrtc/base/criticalsection.h" -#include "webrtc/base/optional.h" -#include "webrtc/base/thread_annotations.h" #include "webrtc/modules/audio_coding/neteq/audio_multi_vector.h" #include "webrtc/modules/audio_coding/neteq/defines.h" #include "webrtc/modules/audio_coding/neteq/include/neteq.h" @@ -27,6 +23,10 @@ #include "webrtc/modules/audio_coding/neteq/statistics_calculator.h" #include "webrtc/modules/audio_coding/neteq/tick_timer.h" #include "webrtc/modules/include/module_common_types.h" +#include "webrtc/rtc_base/constructormagic.h" +#include "webrtc/rtc_base/criticalsection.h" +#include "webrtc/rtc_base/optional.h" +#include "webrtc/rtc_base/thread_annotations.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/neteq/neteq_impl_unittest.cc b/webrtc/modules/audio_coding/neteq/neteq_impl_unittest.cc index 0676ad6803..9d9be30b9a 100644 --- a/webrtc/modules/audio_coding/neteq/neteq_impl_unittest.cc +++ b/webrtc/modules/audio_coding/neteq/neteq_impl_unittest.cc @@ -11,7 +11,6 @@ #include #include "webrtc/api/audio_codecs/builtin_audio_decoder_factory.h" -#include "webrtc/base/safe_conversions.h" #include "webrtc/common_types.h" #include "webrtc/modules/audio_coding/neteq/accelerate.h" #include "webrtc/modules/audio_coding/neteq/expand.h" @@ -29,6 +28,7 @@ #include "webrtc/modules/audio_coding/neteq/sync_buffer.h" #include "webrtc/modules/audio_coding/neteq/timestamp_scaler.h" #include "webrtc/modules/include/module_common_types.h" +#include "webrtc/rtc_base/safe_conversions.h" #include "webrtc/test/gmock.h" #include "webrtc/test/gtest.h" #include "webrtc/test/mock_audio_decoder.h" diff --git a/webrtc/modules/audio_coding/neteq/neteq_unittest.cc b/webrtc/modules/audio_coding/neteq/neteq_unittest.cc index 54b7eb34e5..612c2c6b18 100644 --- a/webrtc/modules/audio_coding/neteq/neteq_unittest.cc +++ b/webrtc/modules/audio_coding/neteq/neteq_unittest.cc @@ -22,15 +22,15 @@ #include "gflags/gflags.h" #include "webrtc/api/audio_codecs/builtin_audio_decoder_factory.h" -#include "webrtc/base/ignore_wundef.h" -#include "webrtc/base/protobuf_utils.h" -#include "webrtc/base/sha1digest.h" -#include "webrtc/base/stringencode.h" #include "webrtc/common_types.h" #include "webrtc/modules/audio_coding/codecs/pcm16b/pcm16b.h" #include "webrtc/modules/audio_coding/neteq/tools/audio_loop.h" #include "webrtc/modules/audio_coding/neteq/tools/rtp_file_source.h" #include "webrtc/modules/include/module_common_types.h" +#include "webrtc/rtc_base/ignore_wundef.h" +#include "webrtc/rtc_base/protobuf_utils.h" +#include "webrtc/rtc_base/sha1digest.h" +#include "webrtc/rtc_base/stringencode.h" #include "webrtc/test/gtest.h" #include "webrtc/test/testsupport/fileutils.h" #include "webrtc/typedefs.h" diff --git a/webrtc/modules/audio_coding/neteq/normal.cc b/webrtc/modules/audio_coding/neteq/normal.cc index 7442df1384..551fd9bbe7 100644 --- a/webrtc/modules/audio_coding/neteq/normal.cc +++ b/webrtc/modules/audio_coding/neteq/normal.cc @@ -15,12 +15,12 @@ #include // min #include "webrtc/api/audio_codecs/audio_decoder.h" -#include "webrtc/base/checks.h" #include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" #include "webrtc/modules/audio_coding/neteq/audio_multi_vector.h" #include "webrtc/modules/audio_coding/neteq/background_noise.h" #include "webrtc/modules/audio_coding/neteq/decoder_database.h" #include "webrtc/modules/audio_coding/neteq/expand.h" +#include "webrtc/rtc_base/checks.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/neteq/normal.h b/webrtc/modules/audio_coding/neteq/normal.h index 019bcf8b14..c764155eff 100644 --- a/webrtc/modules/audio_coding/neteq/normal.h +++ b/webrtc/modules/audio_coding/neteq/normal.h @@ -15,11 +15,11 @@ #include -#include "webrtc/base/checks.h" -#include "webrtc/base/constructormagic.h" -#include "webrtc/base/safe_conversions.h" #include "webrtc/modules/audio_coding/neteq/audio_multi_vector.h" #include "webrtc/modules/audio_coding/neteq/defines.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/constructormagic.h" +#include "webrtc/rtc_base/safe_conversions.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/neteq/packet.h b/webrtc/modules/audio_coding/neteq/packet.h index 7d91f25796..52a9a13401 100644 --- a/webrtc/modules/audio_coding/neteq/packet.h +++ b/webrtc/modules/audio_coding/neteq/packet.h @@ -15,8 +15,8 @@ #include #include "webrtc/api/audio_codecs/audio_decoder.h" -#include "webrtc/base/buffer.h" #include "webrtc/modules/audio_coding/neteq/tick_timer.h" +#include "webrtc/rtc_base/buffer.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/neteq/packet_buffer.cc b/webrtc/modules/audio_coding/neteq/packet_buffer.cc index 4c8c462a24..efb350542a 100644 --- a/webrtc/modules/audio_coding/neteq/packet_buffer.cc +++ b/webrtc/modules/audio_coding/neteq/packet_buffer.cc @@ -17,10 +17,10 @@ #include // find_if() #include "webrtc/api/audio_codecs/audio_decoder.h" -#include "webrtc/base/logging.h" #include "webrtc/modules/audio_coding/neteq/decoder_database.h" #include "webrtc/modules/audio_coding/neteq/statistics_calculator.h" #include "webrtc/modules/audio_coding/neteq/tick_timer.h" +#include "webrtc/rtc_base/logging.h" namespace webrtc { namespace { diff --git a/webrtc/modules/audio_coding/neteq/packet_buffer.h b/webrtc/modules/audio_coding/neteq/packet_buffer.h index f93732242f..806ca70c64 100644 --- a/webrtc/modules/audio_coding/neteq/packet_buffer.h +++ b/webrtc/modules/audio_coding/neteq/packet_buffer.h @@ -11,10 +11,10 @@ #ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_PACKET_BUFFER_H_ #define WEBRTC_MODULES_AUDIO_CODING_NETEQ_PACKET_BUFFER_H_ -#include "webrtc/base/constructormagic.h" -#include "webrtc/base/optional.h" #include "webrtc/modules/audio_coding/neteq/packet.h" #include "webrtc/modules/include/module_common_types.h" +#include "webrtc/rtc_base/constructormagic.h" +#include "webrtc/rtc_base/optional.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/neteq/post_decode_vad.h b/webrtc/modules/audio_coding/neteq/post_decode_vad.h index dd648185de..a98992f939 100644 --- a/webrtc/modules/audio_coding/neteq/post_decode_vad.h +++ b/webrtc/modules/audio_coding/neteq/post_decode_vad.h @@ -14,11 +14,11 @@ #include // size_t #include "webrtc/api/audio_codecs/audio_decoder.h" -#include "webrtc/base/constructormagic.h" #include "webrtc/common_audio/vad/include/webrtc_vad.h" #include "webrtc/common_types.h" // NULL #include "webrtc/modules/audio_coding/neteq/defines.h" #include "webrtc/modules/audio_coding/neteq/packet.h" +#include "webrtc/rtc_base/constructormagic.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/neteq/preemptive_expand.h b/webrtc/modules/audio_coding/neteq/preemptive_expand.h index c4c236080c..1275a37f08 100644 --- a/webrtc/modules/audio_coding/neteq/preemptive_expand.h +++ b/webrtc/modules/audio_coding/neteq/preemptive_expand.h @@ -13,9 +13,9 @@ #include -#include "webrtc/base/constructormagic.h" #include "webrtc/modules/audio_coding/neteq/audio_multi_vector.h" #include "webrtc/modules/audio_coding/neteq/time_stretch.h" +#include "webrtc/rtc_base/constructormagic.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/neteq/random_vector.h b/webrtc/modules/audio_coding/neteq/random_vector.h index 61651e57c2..394e940d3d 100644 --- a/webrtc/modules/audio_coding/neteq/random_vector.h +++ b/webrtc/modules/audio_coding/neteq/random_vector.h @@ -13,7 +13,7 @@ #include // size_t -#include "webrtc/base/constructormagic.h" +#include "webrtc/rtc_base/constructormagic.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/neteq/red_payload_splitter.cc b/webrtc/modules/audio_coding/neteq/red_payload_splitter.cc index c14986dc39..daf24e7455 100644 --- a/webrtc/modules/audio_coding/neteq/red_payload_splitter.cc +++ b/webrtc/modules/audio_coding/neteq/red_payload_splitter.cc @@ -13,10 +13,10 @@ #include #include -#include "webrtc/base/checks.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/safe_conversions.h" #include "webrtc/modules/audio_coding/neteq/decoder_database.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/safe_conversions.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/neteq/red_payload_splitter.h b/webrtc/modules/audio_coding/neteq/red_payload_splitter.h index deb86eb166..8134bfc508 100644 --- a/webrtc/modules/audio_coding/neteq/red_payload_splitter.h +++ b/webrtc/modules/audio_coding/neteq/red_payload_splitter.h @@ -11,8 +11,8 @@ #ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_RED_PAYLOAD_SPLITTER_H_ #define WEBRTC_MODULES_AUDIO_CODING_NETEQ_RED_PAYLOAD_SPLITTER_H_ -#include "webrtc/base/constructormagic.h" #include "webrtc/modules/audio_coding/neteq/packet.h" +#include "webrtc/rtc_base/constructormagic.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/neteq/rtcp.h b/webrtc/modules/audio_coding/neteq/rtcp.h index d222cea7bc..ae0ed8d785 100644 --- a/webrtc/modules/audio_coding/neteq/rtcp.h +++ b/webrtc/modules/audio_coding/neteq/rtcp.h @@ -11,8 +11,8 @@ #ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_RTCP_H_ #define WEBRTC_MODULES_AUDIO_CODING_NETEQ_RTCP_H_ -#include "webrtc/base/constructormagic.h" #include "webrtc/modules/audio_coding/neteq/include/neteq.h" +#include "webrtc/rtc_base/constructormagic.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/neteq/statistics_calculator.cc b/webrtc/modules/audio_coding/neteq/statistics_calculator.cc index c6d274f432..145d99ab89 100644 --- a/webrtc/modules/audio_coding/neteq/statistics_calculator.cc +++ b/webrtc/modules/audio_coding/neteq/statistics_calculator.cc @@ -14,10 +14,10 @@ #include // memset #include -#include "webrtc/base/checks.h" -#include "webrtc/base/safe_conversions.h" #include "webrtc/modules/audio_coding/neteq/decision_logic.h" #include "webrtc/modules/audio_coding/neteq/delay_manager.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/safe_conversions.h" #include "webrtc/system_wrappers/include/metrics.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/neteq/statistics_calculator.h b/webrtc/modules/audio_coding/neteq/statistics_calculator.h index 320a74a065..0f8bdeee73 100644 --- a/webrtc/modules/audio_coding/neteq/statistics_calculator.h +++ b/webrtc/modules/audio_coding/neteq/statistics_calculator.h @@ -14,8 +14,8 @@ #include #include -#include "webrtc/base/constructormagic.h" #include "webrtc/modules/audio_coding/neteq/include/neteq.h" +#include "webrtc/rtc_base/constructormagic.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/neteq/sync_buffer.cc b/webrtc/modules/audio_coding/neteq/sync_buffer.cc index 9285bbc093..29630b631f 100644 --- a/webrtc/modules/audio_coding/neteq/sync_buffer.cc +++ b/webrtc/modules/audio_coding/neteq/sync_buffer.cc @@ -10,8 +10,8 @@ #include // Access to min. -#include "webrtc/base/checks.h" #include "webrtc/modules/audio_coding/neteq/sync_buffer.h" +#include "webrtc/rtc_base/checks.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/neteq/sync_buffer.h b/webrtc/modules/audio_coding/neteq/sync_buffer.h index eb90034eb1..a3a78f5ca5 100644 --- a/webrtc/modules/audio_coding/neteq/sync_buffer.h +++ b/webrtc/modules/audio_coding/neteq/sync_buffer.h @@ -11,9 +11,9 @@ #ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_SYNC_BUFFER_H_ #define WEBRTC_MODULES_AUDIO_CODING_NETEQ_SYNC_BUFFER_H_ -#include "webrtc/base/constructormagic.h" #include "webrtc/modules/audio_coding/neteq/audio_multi_vector.h" #include "webrtc/modules/include/module_common_types.h" +#include "webrtc/rtc_base/constructormagic.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/neteq/test/RTPencode.cc b/webrtc/modules/audio_coding/neteq/test/RTPencode.cc index 8e8de11ab0..8ad50903f5 100644 --- a/webrtc/modules/audio_coding/neteq/test/RTPencode.cc +++ b/webrtc/modules/audio_coding/neteq/test/RTPencode.cc @@ -25,7 +25,7 @@ #include -#include "webrtc/base/checks.h" +#include "webrtc/rtc_base/checks.h" #include "webrtc/typedefs.h" // needed for NetEqDecoder diff --git a/webrtc/modules/audio_coding/neteq/test/neteq_ilbc_quality_test.cc b/webrtc/modules/audio_coding/neteq/test/neteq_ilbc_quality_test.cc index b3524a3a6d..4e5f1592cb 100644 --- a/webrtc/modules/audio_coding/neteq/test/neteq_ilbc_quality_test.cc +++ b/webrtc/modules/audio_coding/neteq/test/neteq_ilbc_quality_test.cc @@ -10,10 +10,10 @@ #include -#include "webrtc/base/checks.h" -#include "webrtc/base/safe_conversions.h" #include "webrtc/modules/audio_coding/codecs/ilbc/audio_encoder_ilbc.h" #include "webrtc/modules/audio_coding/neteq/tools/neteq_quality_test.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/safe_conversions.h" #include "webrtc/test/testsupport/fileutils.h" using google::RegisterFlagValidator; diff --git a/webrtc/modules/audio_coding/neteq/test/neteq_pcmu_quality_test.cc b/webrtc/modules/audio_coding/neteq/test/neteq_pcmu_quality_test.cc index 27350abaa3..eb75fda029 100644 --- a/webrtc/modules/audio_coding/neteq/test/neteq_pcmu_quality_test.cc +++ b/webrtc/modules/audio_coding/neteq/test/neteq_pcmu_quality_test.cc @@ -10,10 +10,10 @@ #include -#include "webrtc/base/checks.h" -#include "webrtc/base/safe_conversions.h" #include "webrtc/modules/audio_coding/codecs/g711/audio_encoder_pcm.h" #include "webrtc/modules/audio_coding/neteq/tools/neteq_quality_test.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/safe_conversions.h" #include "webrtc/test/testsupport/fileutils.h" using google::RegisterFlagValidator; diff --git a/webrtc/modules/audio_coding/neteq/tick_timer.h b/webrtc/modules/audio_coding/neteq/tick_timer.h index 8f17f43596..55e9eab361 100644 --- a/webrtc/modules/audio_coding/neteq/tick_timer.h +++ b/webrtc/modules/audio_coding/neteq/tick_timer.h @@ -13,8 +13,8 @@ #include -#include "webrtc/base/checks.h" -#include "webrtc/base/constructormagic.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/constructormagic.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/neteq/time_stretch.cc b/webrtc/modules/audio_coding/neteq/time_stretch.cc index 0b3bad9e91..630051b122 100644 --- a/webrtc/modules/audio_coding/neteq/time_stretch.cc +++ b/webrtc/modules/audio_coding/neteq/time_stretch.cc @@ -13,11 +13,11 @@ #include // min, max #include -#include "webrtc/base/safe_conversions.h" #include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" #include "webrtc/modules/audio_coding/neteq/background_noise.h" #include "webrtc/modules/audio_coding/neteq/cross_correlation.h" #include "webrtc/modules/audio_coding/neteq/dsp_helper.h" +#include "webrtc/rtc_base/safe_conversions.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/neteq/time_stretch.h b/webrtc/modules/audio_coding/neteq/time_stretch.h index 00a141508b..ff056e61d4 100644 --- a/webrtc/modules/audio_coding/neteq/time_stretch.h +++ b/webrtc/modules/audio_coding/neteq/time_stretch.h @@ -14,8 +14,8 @@ #include #include // memset, size_t -#include "webrtc/base/constructormagic.h" #include "webrtc/modules/audio_coding/neteq/audio_multi_vector.h" +#include "webrtc/rtc_base/constructormagic.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/neteq/time_stretch_unittest.cc b/webrtc/modules/audio_coding/neteq/time_stretch_unittest.cc index 8299924adf..f549b27c28 100644 --- a/webrtc/modules/audio_coding/neteq/time_stretch_unittest.cc +++ b/webrtc/modules/audio_coding/neteq/time_stretch_unittest.cc @@ -16,10 +16,10 @@ #include #include -#include "webrtc/base/checks.h" #include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" #include "webrtc/modules/audio_coding/neteq/background_noise.h" #include "webrtc/modules/audio_coding/neteq/tools/input_audio_file.h" +#include "webrtc/rtc_base/checks.h" #include "webrtc/test/gtest.h" #include "webrtc/test/testsupport/fileutils.h" diff --git a/webrtc/modules/audio_coding/neteq/timestamp_scaler.h b/webrtc/modules/audio_coding/neteq/timestamp_scaler.h index 9129d843bf..bfb8d9c25e 100644 --- a/webrtc/modules/audio_coding/neteq/timestamp_scaler.h +++ b/webrtc/modules/audio_coding/neteq/timestamp_scaler.h @@ -11,8 +11,8 @@ #ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_TIMESTAMP_SCALER_H_ #define WEBRTC_MODULES_AUDIO_CODING_NETEQ_TIMESTAMP_SCALER_H_ -#include "webrtc/base/constructormagic.h" #include "webrtc/modules/audio_coding/neteq/packet.h" +#include "webrtc/rtc_base/constructormagic.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/neteq/tools/audio_checksum.h b/webrtc/modules/audio_coding/neteq/tools/audio_checksum.h index a302cff908..48fde65c45 100644 --- a/webrtc/modules/audio_coding/neteq/tools/audio_checksum.h +++ b/webrtc/modules/audio_coding/neteq/tools/audio_checksum.h @@ -13,10 +13,10 @@ #include -#include "webrtc/base/constructormagic.h" -#include "webrtc/base/md5digest.h" -#include "webrtc/base/stringencode.h" #include "webrtc/modules/audio_coding/neteq/tools/audio_sink.h" +#include "webrtc/rtc_base/constructormagic.h" +#include "webrtc/rtc_base/md5digest.h" +#include "webrtc/rtc_base/stringencode.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/neteq/tools/audio_loop.h b/webrtc/modules/audio_coding/neteq/tools/audio_loop.h index 40b2c55aef..2c4aed86a9 100644 --- a/webrtc/modules/audio_coding/neteq/tools/audio_loop.h +++ b/webrtc/modules/audio_coding/neteq/tools/audio_loop.h @@ -14,8 +14,8 @@ #include #include -#include "webrtc/base/array_view.h" -#include "webrtc/base/constructormagic.h" +#include "webrtc/rtc_base/array_view.h" +#include "webrtc/rtc_base/constructormagic.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/neteq/tools/audio_sink.h b/webrtc/modules/audio_coding/neteq/tools/audio_sink.h index 5927b02758..076b408e82 100644 --- a/webrtc/modules/audio_coding/neteq/tools/audio_sink.h +++ b/webrtc/modules/audio_coding/neteq/tools/audio_sink.h @@ -11,8 +11,8 @@ #ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_AUDIO_SINK_H_ #define WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_AUDIO_SINK_H_ -#include "webrtc/base/constructormagic.h" #include "webrtc/modules/include/module_common_types.h" +#include "webrtc/rtc_base/constructormagic.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/neteq/tools/constant_pcm_packet_source.cc b/webrtc/modules/audio_coding/neteq/tools/constant_pcm_packet_source.cc index fbbd468df8..29e3402a74 100644 --- a/webrtc/modules/audio_coding/neteq/tools/constant_pcm_packet_source.cc +++ b/webrtc/modules/audio_coding/neteq/tools/constant_pcm_packet_source.cc @@ -12,9 +12,9 @@ #include -#include "webrtc/base/checks.h" #include "webrtc/modules/audio_coding/codecs/pcm16b/pcm16b.h" #include "webrtc/modules/audio_coding/neteq/tools/packet.h" +#include "webrtc/rtc_base/checks.h" namespace webrtc { namespace test { diff --git a/webrtc/modules/audio_coding/neteq/tools/constant_pcm_packet_source.h b/webrtc/modules/audio_coding/neteq/tools/constant_pcm_packet_source.h index d1f88771b9..12503339cb 100644 --- a/webrtc/modules/audio_coding/neteq/tools/constant_pcm_packet_source.h +++ b/webrtc/modules/audio_coding/neteq/tools/constant_pcm_packet_source.h @@ -14,9 +14,9 @@ #include #include -#include "webrtc/base/constructormagic.h" #include "webrtc/common_types.h" #include "webrtc/modules/audio_coding/neteq/tools/packet_source.h" +#include "webrtc/rtc_base/constructormagic.h" namespace webrtc { namespace test { diff --git a/webrtc/modules/audio_coding/neteq/tools/encode_neteq_input.cc b/webrtc/modules/audio_coding/neteq/tools/encode_neteq_input.cc index 5fabb6f492..41bed7c31b 100644 --- a/webrtc/modules/audio_coding/neteq/tools/encode_neteq_input.cc +++ b/webrtc/modules/audio_coding/neteq/tools/encode_neteq_input.cc @@ -12,8 +12,8 @@ #include -#include "webrtc/base/checks.h" -#include "webrtc/base/safe_conversions.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/safe_conversions.h" namespace webrtc { namespace test { diff --git a/webrtc/modules/audio_coding/neteq/tools/fake_decode_from_file.cc b/webrtc/modules/audio_coding/neteq/tools/fake_decode_from_file.cc index 1cc814fa88..eef32df4cf 100644 --- a/webrtc/modules/audio_coding/neteq/tools/fake_decode_from_file.cc +++ b/webrtc/modules/audio_coding/neteq/tools/fake_decode_from_file.cc @@ -10,9 +10,9 @@ #include "webrtc/modules/audio_coding/neteq/tools/fake_decode_from_file.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/safe_conversions.h" #include "webrtc/modules/rtp_rtcp/source/byte_io.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/safe_conversions.h" namespace webrtc { namespace test { diff --git a/webrtc/modules/audio_coding/neteq/tools/fake_decode_from_file.h b/webrtc/modules/audio_coding/neteq/tools/fake_decode_from_file.h index 9f91c81e40..d39af1e9e6 100644 --- a/webrtc/modules/audio_coding/neteq/tools/fake_decode_from_file.h +++ b/webrtc/modules/audio_coding/neteq/tools/fake_decode_from_file.h @@ -14,9 +14,9 @@ #include #include "webrtc/api/audio_codecs/audio_decoder.h" -#include "webrtc/base/array_view.h" -#include "webrtc/base/optional.h" #include "webrtc/modules/audio_coding/neteq/tools/input_audio_file.h" +#include "webrtc/rtc_base/array_view.h" +#include "webrtc/rtc_base/optional.h" namespace webrtc { namespace test { diff --git a/webrtc/modules/audio_coding/neteq/tools/input_audio_file.cc b/webrtc/modules/audio_coding/neteq/tools/input_audio_file.cc index 17c48144a8..97d20bc973 100644 --- a/webrtc/modules/audio_coding/neteq/tools/input_audio_file.cc +++ b/webrtc/modules/audio_coding/neteq/tools/input_audio_file.cc @@ -10,7 +10,7 @@ #include "webrtc/modules/audio_coding/neteq/tools/input_audio_file.h" -#include "webrtc/base/checks.h" +#include "webrtc/rtc_base/checks.h" namespace webrtc { namespace test { diff --git a/webrtc/modules/audio_coding/neteq/tools/input_audio_file.h b/webrtc/modules/audio_coding/neteq/tools/input_audio_file.h index a6e12db24d..271c513587 100644 --- a/webrtc/modules/audio_coding/neteq/tools/input_audio_file.h +++ b/webrtc/modules/audio_coding/neteq/tools/input_audio_file.h @@ -15,7 +15,7 @@ #include -#include "webrtc/base/constructormagic.h" +#include "webrtc/rtc_base/constructormagic.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/neteq/tools/neteq_delay_analyzer.cc b/webrtc/modules/audio_coding/neteq/tools/neteq_delay_analyzer.cc index 6421d0ce1a..a0f5aa7217 100644 --- a/webrtc/modules/audio_coding/neteq/tools/neteq_delay_analyzer.cc +++ b/webrtc/modules/audio_coding/neteq/tools/neteq_delay_analyzer.cc @@ -17,7 +17,7 @@ #include #include -#include "webrtc/base/checks.h" +#include "webrtc/rtc_base/checks.h" namespace webrtc { namespace test { diff --git a/webrtc/modules/audio_coding/neteq/tools/neteq_delay_analyzer.h b/webrtc/modules/audio_coding/neteq/tools/neteq_delay_analyzer.h index 87bed2fc4e..b652bf2290 100644 --- a/webrtc/modules/audio_coding/neteq/tools/neteq_delay_analyzer.h +++ b/webrtc/modules/audio_coding/neteq/tools/neteq_delay_analyzer.h @@ -16,9 +16,9 @@ #include #include -#include "webrtc/base/optional.h" #include "webrtc/modules/audio_coding/neteq/tools/neteq_input.h" #include "webrtc/modules/audio_coding/neteq/tools/neteq_test.h" +#include "webrtc/rtc_base/optional.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/neteq/tools/neteq_external_decoder_test.cc b/webrtc/modules/audio_coding/neteq/tools/neteq_external_decoder_test.cc index 8b7ca0910c..8d88b08caa 100644 --- a/webrtc/modules/audio_coding/neteq/tools/neteq_external_decoder_test.cc +++ b/webrtc/modules/audio_coding/neteq/tools/neteq_external_decoder_test.cc @@ -12,7 +12,7 @@ #include "webrtc/modules/audio_coding/neteq/tools/neteq_external_decoder_test.h" #include "webrtc/api/audio_codecs/builtin_audio_decoder_factory.h" -#include "webrtc/base/format_macros.h" +#include "webrtc/rtc_base/format_macros.h" #include "webrtc/test/gtest.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/neteq/tools/neteq_input.h b/webrtc/modules/audio_coding/neteq/tools/neteq_input.h index a1e51a3045..1e0889336a 100644 --- a/webrtc/modules/audio_coding/neteq/tools/neteq_input.h +++ b/webrtc/modules/audio_coding/neteq/tools/neteq_input.h @@ -15,11 +15,11 @@ #include #include -#include "webrtc/base/buffer.h" -#include "webrtc/base/optional.h" #include "webrtc/common_types.h" #include "webrtc/modules/audio_coding/neteq/tools/packet.h" #include "webrtc/modules/audio_coding/neteq/tools/packet_source.h" +#include "webrtc/rtc_base/buffer.h" +#include "webrtc/rtc_base/optional.h" namespace webrtc { namespace test { diff --git a/webrtc/modules/audio_coding/neteq/tools/neteq_packet_source_input.cc b/webrtc/modules/audio_coding/neteq/tools/neteq_packet_source_input.cc index 7d5aa3bd62..13a061f976 100644 --- a/webrtc/modules/audio_coding/neteq/tools/neteq_packet_source_input.cc +++ b/webrtc/modules/audio_coding/neteq/tools/neteq_packet_source_input.cc @@ -13,9 +13,9 @@ #include #include -#include "webrtc/base/checks.h" #include "webrtc/modules/audio_coding/neteq/tools/rtc_event_log_source.h" #include "webrtc/modules/audio_coding/neteq/tools/rtp_file_source.h" +#include "webrtc/rtc_base/checks.h" namespace webrtc { namespace test { diff --git a/webrtc/modules/audio_coding/neteq/tools/neteq_performance_test.cc b/webrtc/modules/audio_coding/neteq/tools/neteq_performance_test.cc index 77787d87bd..ef0e31e2f6 100644 --- a/webrtc/modules/audio_coding/neteq/tools/neteq_performance_test.cc +++ b/webrtc/modules/audio_coding/neteq/tools/neteq_performance_test.cc @@ -11,13 +11,13 @@ #include "webrtc/modules/audio_coding/neteq/tools/neteq_performance_test.h" #include "webrtc/api/audio_codecs/builtin_audio_decoder_factory.h" -#include "webrtc/base/checks.h" #include "webrtc/common_types.h" #include "webrtc/modules/audio_coding/codecs/pcm16b/pcm16b.h" #include "webrtc/modules/audio_coding/neteq/include/neteq.h" #include "webrtc/modules/audio_coding/neteq/tools/audio_loop.h" #include "webrtc/modules/audio_coding/neteq/tools/rtp_generator.h" #include "webrtc/modules/include/module_common_types.h" +#include "webrtc/rtc_base/checks.h" #include "webrtc/system_wrappers/include/clock.h" #include "webrtc/test/testsupport/fileutils.h" #include "webrtc/typedefs.h" diff --git a/webrtc/modules/audio_coding/neteq/tools/neteq_quality_test.cc b/webrtc/modules/audio_coding/neteq/tools/neteq_quality_test.cc index eb026fed32..bca24d899e 100644 --- a/webrtc/modules/audio_coding/neteq/tools/neteq_quality_test.cc +++ b/webrtc/modules/audio_coding/neteq/tools/neteq_quality_test.cc @@ -12,11 +12,11 @@ #include #include "webrtc/api/audio_codecs/builtin_audio_decoder_factory.h" -#include "webrtc/base/checks.h" #include "webrtc/modules/audio_coding/neteq/tools/neteq_quality_test.h" #include "webrtc/modules/audio_coding/neteq/tools/output_audio_file.h" #include "webrtc/modules/audio_coding/neteq/tools/output_wav_file.h" #include "webrtc/modules/audio_coding/neteq/tools/resample_input_audio_file.h" +#include "webrtc/rtc_base/checks.h" #include "webrtc/test/testsupport/fileutils.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/neteq/tools/neteq_replacement_input.cc b/webrtc/modules/audio_coding/neteq/tools/neteq_replacement_input.cc index b2c3eef9f0..553c71f1a4 100644 --- a/webrtc/modules/audio_coding/neteq/tools/neteq_replacement_input.cc +++ b/webrtc/modules/audio_coding/neteq/tools/neteq_replacement_input.cc @@ -10,8 +10,8 @@ #include "webrtc/modules/audio_coding/neteq/tools/neteq_replacement_input.h" -#include "webrtc/base/checks.h" #include "webrtc/modules/audio_coding/neteq/tools/fake_decode_from_file.h" +#include "webrtc/rtc_base/checks.h" namespace webrtc { namespace test { diff --git a/webrtc/modules/audio_coding/neteq/tools/neteq_rtpplay.cc b/webrtc/modules/audio_coding/neteq/tools/neteq_rtpplay.cc index c9082f4a01..3fd36bc747 100644 --- a/webrtc/modules/audio_coding/neteq/tools/neteq_rtpplay.cc +++ b/webrtc/modules/audio_coding/neteq/tools/neteq_rtpplay.cc @@ -22,7 +22,6 @@ #include #include "gflags/gflags.h" -#include "webrtc/base/checks.h" #include "webrtc/modules/audio_coding/neteq/include/neteq.h" #include "webrtc/modules/audio_coding/neteq/tools/fake_decode_from_file.h" #include "webrtc/modules/audio_coding/neteq/tools/input_audio_file.h" @@ -34,6 +33,7 @@ #include "webrtc/modules/audio_coding/neteq/tools/output_wav_file.h" #include "webrtc/modules/audio_coding/neteq/tools/rtp_file_source.h" #include "webrtc/modules/include/module_common_types.h" +#include "webrtc/rtc_base/checks.h" #include "webrtc/test/testsupport/fileutils.h" #include "webrtc/typedefs.h" diff --git a/webrtc/modules/audio_coding/neteq/tools/output_audio_file.h b/webrtc/modules/audio_coding/neteq/tools/output_audio_file.h index a9142a63c1..79344703de 100644 --- a/webrtc/modules/audio_coding/neteq/tools/output_audio_file.h +++ b/webrtc/modules/audio_coding/neteq/tools/output_audio_file.h @@ -15,8 +15,8 @@ #include #include -#include "webrtc/base/constructormagic.h" #include "webrtc/modules/audio_coding/neteq/tools/audio_sink.h" +#include "webrtc/rtc_base/constructormagic.h" namespace webrtc { namespace test { diff --git a/webrtc/modules/audio_coding/neteq/tools/output_wav_file.h b/webrtc/modules/audio_coding/neteq/tools/output_wav_file.h index c36c7da983..7b3431d378 100644 --- a/webrtc/modules/audio_coding/neteq/tools/output_wav_file.h +++ b/webrtc/modules/audio_coding/neteq/tools/output_wav_file.h @@ -13,9 +13,9 @@ #include -#include "webrtc/base/constructormagic.h" #include "webrtc/common_audio/wav_file.h" #include "webrtc/modules/audio_coding/neteq/tools/audio_sink.h" +#include "webrtc/rtc_base/constructormagic.h" namespace webrtc { namespace test { diff --git a/webrtc/modules/audio_coding/neteq/tools/packet.cc b/webrtc/modules/audio_coding/neteq/tools/packet.cc index 901aa850d5..b5b1b2f97a 100644 --- a/webrtc/modules/audio_coding/neteq/tools/packet.cc +++ b/webrtc/modules/audio_coding/neteq/tools/packet.cc @@ -14,9 +14,9 @@ #include -#include "webrtc/base/checks.h" #include "webrtc/modules/include/module_common_types.h" #include "webrtc/modules/rtp_rtcp/include/rtp_header_parser.h" +#include "webrtc/rtc_base/checks.h" namespace webrtc { namespace test { diff --git a/webrtc/modules/audio_coding/neteq/tools/packet.h b/webrtc/modules/audio_coding/neteq/tools/packet.h index 5d78ffa8f5..ce9ef5a466 100644 --- a/webrtc/modules/audio_coding/neteq/tools/packet.h +++ b/webrtc/modules/audio_coding/neteq/tools/packet.h @@ -14,8 +14,8 @@ #include #include -#include "webrtc/base/constructormagic.h" #include "webrtc/common_types.h" +#include "webrtc/rtc_base/constructormagic.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/neteq/tools/packet_source.h b/webrtc/modules/audio_coding/neteq/tools/packet_source.h index caae4ae790..233ddec018 100644 --- a/webrtc/modules/audio_coding/neteq/tools/packet_source.h +++ b/webrtc/modules/audio_coding/neteq/tools/packet_source.h @@ -14,8 +14,8 @@ #include #include -#include "webrtc/base/constructormagic.h" #include "webrtc/modules/audio_coding/neteq/tools/packet.h" +#include "webrtc/rtc_base/constructormagic.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/neteq/tools/resample_input_audio_file.cc b/webrtc/modules/audio_coding/neteq/tools/resample_input_audio_file.cc index f5fe16691e..45c5b2028c 100644 --- a/webrtc/modules/audio_coding/neteq/tools/resample_input_audio_file.cc +++ b/webrtc/modules/audio_coding/neteq/tools/resample_input_audio_file.cc @@ -12,7 +12,7 @@ #include -#include "webrtc/base/checks.h" +#include "webrtc/rtc_base/checks.h" namespace webrtc { namespace test { diff --git a/webrtc/modules/audio_coding/neteq/tools/resample_input_audio_file.h b/webrtc/modules/audio_coding/neteq/tools/resample_input_audio_file.h index c0af3546b0..b008d19562 100644 --- a/webrtc/modules/audio_coding/neteq/tools/resample_input_audio_file.h +++ b/webrtc/modules/audio_coding/neteq/tools/resample_input_audio_file.h @@ -13,9 +13,9 @@ #include -#include "webrtc/base/constructormagic.h" #include "webrtc/common_audio/resampler/include/resampler.h" #include "webrtc/modules/audio_coding/neteq/tools/input_audio_file.h" +#include "webrtc/rtc_base/constructormagic.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/neteq/tools/rtc_event_log_source.cc b/webrtc/modules/audio_coding/neteq/tools/rtc_event_log_source.cc index d9692e06e8..f54f91eb69 100644 --- a/webrtc/modules/audio_coding/neteq/tools/rtc_event_log_source.cc +++ b/webrtc/modules/audio_coding/neteq/tools/rtc_event_log_source.cc @@ -15,11 +15,10 @@ #include #include -#include "webrtc/base/checks.h" #include "webrtc/call/call.h" #include "webrtc/modules/audio_coding/neteq/tools/packet.h" #include "webrtc/modules/rtp_rtcp/include/rtp_header_parser.h" - +#include "webrtc/rtc_base/checks.h" namespace webrtc { namespace test { diff --git a/webrtc/modules/audio_coding/neteq/tools/rtc_event_log_source.h b/webrtc/modules/audio_coding/neteq/tools/rtc_event_log_source.h index fad491e8a2..15e3ce7eb8 100644 --- a/webrtc/modules/audio_coding/neteq/tools/rtc_event_log_source.h +++ b/webrtc/modules/audio_coding/neteq/tools/rtc_event_log_source.h @@ -14,10 +14,10 @@ #include #include -#include "webrtc/base/constructormagic.h" #include "webrtc/logging/rtc_event_log/rtc_event_log_parser.h" #include "webrtc/modules/audio_coding/neteq/tools/packet_source.h" #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" +#include "webrtc/rtc_base/constructormagic.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/neteq/tools/rtp_file_source.cc b/webrtc/modules/audio_coding/neteq/tools/rtp_file_source.cc index 814def12db..5ea8de919f 100644 --- a/webrtc/modules/audio_coding/neteq/tools/rtp_file_source.cc +++ b/webrtc/modules/audio_coding/neteq/tools/rtp_file_source.cc @@ -20,9 +20,9 @@ #include -#include "webrtc/base/checks.h" #include "webrtc/modules/audio_coding/neteq/tools/packet.h" #include "webrtc/modules/rtp_rtcp/include/rtp_header_parser.h" +#include "webrtc/rtc_base/checks.h" #include "webrtc/test/rtp_file_reader.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/neteq/tools/rtp_file_source.h b/webrtc/modules/audio_coding/neteq/tools/rtp_file_source.h index 1b98d6cb32..9b0160f4ef 100644 --- a/webrtc/modules/audio_coding/neteq/tools/rtp_file_source.h +++ b/webrtc/modules/audio_coding/neteq/tools/rtp_file_source.h @@ -16,10 +16,10 @@ #include #include -#include "webrtc/base/constructormagic.h" #include "webrtc/common_types.h" #include "webrtc/modules/audio_coding/neteq/tools/packet_source.h" #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" +#include "webrtc/rtc_base/constructormagic.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/neteq/tools/rtp_generator.h b/webrtc/modules/audio_coding/neteq/tools/rtp_generator.h index c733fff563..154a38cb72 100644 --- a/webrtc/modules/audio_coding/neteq/tools/rtp_generator.h +++ b/webrtc/modules/audio_coding/neteq/tools/rtp_generator.h @@ -11,8 +11,8 @@ #ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_RTP_GENERATOR_H_ #define WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_RTP_GENERATOR_H_ -#include "webrtc/base/constructormagic.h" #include "webrtc/common_types.h" +#include "webrtc/rtc_base/constructormagic.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/neteq/tools/rtpcat.cc b/webrtc/modules/audio_coding/neteq/tools/rtpcat.cc index e1f49f7896..d903ca2486 100644 --- a/webrtc/modules/audio_coding/neteq/tools/rtpcat.cc +++ b/webrtc/modules/audio_coding/neteq/tools/rtpcat.cc @@ -12,7 +12,7 @@ #include -#include "webrtc/base/checks.h" +#include "webrtc/rtc_base/checks.h" #include "webrtc/test/rtp_file_reader.h" #include "webrtc/test/rtp_file_writer.h" diff --git a/webrtc/modules/audio_coding/test/APITest.cc b/webrtc/modules/audio_coding/test/APITest.cc index 6a458334e8..d18cdef018 100644 --- a/webrtc/modules/audio_coding/test/APITest.cc +++ b/webrtc/modules/audio_coding/test/APITest.cc @@ -19,11 +19,11 @@ #include #include -#include "webrtc/base/platform_thread.h" -#include "webrtc/base/timeutils.h" #include "webrtc/common_types.h" #include "webrtc/modules/audio_coding/codecs/audio_format_conversion.h" #include "webrtc/modules/audio_coding/test/utility.h" +#include "webrtc/rtc_base/platform_thread.h" +#include "webrtc/rtc_base/timeutils.h" #include "webrtc/system_wrappers/include/event_wrapper.h" #include "webrtc/system_wrappers/include/trace.h" #include "webrtc/test/gtest.h" diff --git a/webrtc/modules/audio_coding/test/Channel.cc b/webrtc/modules/audio_coding/test/Channel.cc index 46c398b1b7..4c659530b1 100644 --- a/webrtc/modules/audio_coding/test/Channel.cc +++ b/webrtc/modules/audio_coding/test/Channel.cc @@ -13,8 +13,8 @@ #include #include -#include "webrtc/base/format_macros.h" -#include "webrtc/base/timeutils.h" +#include "webrtc/rtc_base/format_macros.h" +#include "webrtc/rtc_base/timeutils.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/test/Channel.h b/webrtc/modules/audio_coding/test/Channel.h index c45864acbb..aeb535a574 100644 --- a/webrtc/modules/audio_coding/test/Channel.h +++ b/webrtc/modules/audio_coding/test/Channel.h @@ -13,9 +13,9 @@ #include -#include "webrtc/base/criticalsection.h" #include "webrtc/modules/audio_coding/include/audio_coding_module.h" #include "webrtc/modules/include/module_common_types.h" +#include "webrtc/rtc_base/criticalsection.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/test/PCMFile.h b/webrtc/modules/audio_coding/test/PCMFile.h index 63ab960d66..fd1c53a10b 100644 --- a/webrtc/modules/audio_coding/test/PCMFile.h +++ b/webrtc/modules/audio_coding/test/PCMFile.h @@ -16,8 +16,8 @@ #include -#include "webrtc/base/optional.h" #include "webrtc/modules/include/module_common_types.h" +#include "webrtc/rtc_base/optional.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/test/TestAllCodecs.cc b/webrtc/modules/audio_coding/test/TestAllCodecs.cc index 96c52414a0..aedf82c089 100644 --- a/webrtc/modules/audio_coding/test/TestAllCodecs.cc +++ b/webrtc/modules/audio_coding/test/TestAllCodecs.cc @@ -14,12 +14,12 @@ #include #include -#include "webrtc/base/logging.h" #include "webrtc/common_types.h" #include "webrtc/modules/audio_coding/codecs/audio_format_conversion.h" #include "webrtc/modules/audio_coding/include/audio_coding_module.h" #include "webrtc/modules/audio_coding/include/audio_coding_module_typedefs.h" #include "webrtc/modules/audio_coding/test/utility.h" +#include "webrtc/rtc_base/logging.h" #include "webrtc/test/gtest.h" #include "webrtc/test/testsupport/fileutils.h" #include "webrtc/typedefs.h" diff --git a/webrtc/modules/audio_conference_mixer/include/audio_conference_mixer_defines.h b/webrtc/modules/audio_conference_mixer/include/audio_conference_mixer_defines.h index e1c5aedc88..c7b07a0bfd 100644 --- a/webrtc/modules/audio_conference_mixer/include/audio_conference_mixer_defines.h +++ b/webrtc/modules/audio_conference_mixer/include/audio_conference_mixer_defines.h @@ -11,8 +11,8 @@ #ifndef WEBRTC_MODULES_AUDIO_CONFERENCE_MIXER_INCLUDE_AUDIO_CONFERENCE_MIXER_DEFINES_H_ #define WEBRTC_MODULES_AUDIO_CONFERENCE_MIXER_INCLUDE_AUDIO_CONFERENCE_MIXER_DEFINES_H_ -#include "webrtc/base/checks.h" #include "webrtc/modules/include/module_common_types.h" +#include "webrtc/rtc_base/checks.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/audio_conference_mixer/source/audio_conference_mixer_impl.cc b/webrtc/modules/audio_conference_mixer/source/audio_conference_mixer_impl.cc index 3679bcec8e..8e8b657d6b 100644 --- a/webrtc/modules/audio_conference_mixer/source/audio_conference_mixer_impl.cc +++ b/webrtc/modules/audio_conference_mixer/source/audio_conference_mixer_impl.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/audio/utility/audio_frame_operations.h" -#include "webrtc/base/logging.h" -#include "webrtc/modules/audio_conference_mixer/include/audio_conference_mixer_defines.h" #include "webrtc/modules/audio_conference_mixer/source/audio_conference_mixer_impl.h" +#include "webrtc/audio/utility/audio_frame_operations.h" +#include "webrtc/modules/audio_conference_mixer/include/audio_conference_mixer_defines.h" #include "webrtc/modules/audio_conference_mixer/source/audio_frame_manipulator.h" #include "webrtc/modules/audio_processing/include/audio_processing.h" +#include "webrtc/rtc_base/logging.h" namespace webrtc { namespace { diff --git a/webrtc/modules/audio_conference_mixer/source/audio_conference_mixer_impl.h b/webrtc/modules/audio_conference_mixer/source/audio_conference_mixer_impl.h index 6ed716329a..865de6f5e5 100644 --- a/webrtc/modules/audio_conference_mixer/source/audio_conference_mixer_impl.h +++ b/webrtc/modules/audio_conference_mixer/source/audio_conference_mixer_impl.h @@ -15,11 +15,11 @@ #include #include -#include "webrtc/base/criticalsection.h" #include "webrtc/modules/audio_conference_mixer/include/audio_conference_mixer.h" #include "webrtc/modules/audio_conference_mixer/source/memory_pool.h" #include "webrtc/modules/audio_conference_mixer/source/time_scheduler.h" #include "webrtc/modules/include/module_common_types.h" +#include "webrtc/rtc_base/criticalsection.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/audio_conference_mixer/source/memory_pool_posix.h b/webrtc/modules/audio_conference_mixer/source/memory_pool_posix.h index 8e726f9fca..695878dbb2 100644 --- a/webrtc/modules/audio_conference_mixer/source/memory_pool_posix.h +++ b/webrtc/modules/audio_conference_mixer/source/memory_pool_posix.h @@ -14,7 +14,7 @@ #include #include -#include "webrtc/base/criticalsection.h" +#include "webrtc/rtc_base/criticalsection.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/audio_conference_mixer/source/time_scheduler.cc b/webrtc/modules/audio_conference_mixer/source/time_scheduler.cc index 877d98b053..5600e0ccb0 100644 --- a/webrtc/modules/audio_conference_mixer/source/time_scheduler.cc +++ b/webrtc/modules/audio_conference_mixer/source/time_scheduler.cc @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/base/timeutils.h" #include "webrtc/modules/audio_conference_mixer/source/time_scheduler.h" +#include "webrtc/rtc_base/timeutils.h" namespace webrtc { TimeScheduler::TimeScheduler(const int64_t periodicityInMs) diff --git a/webrtc/modules/audio_conference_mixer/source/time_scheduler.h b/webrtc/modules/audio_conference_mixer/source/time_scheduler.h index 52403422d2..e3531c4874 100644 --- a/webrtc/modules/audio_conference_mixer/source/time_scheduler.h +++ b/webrtc/modules/audio_conference_mixer/source/time_scheduler.h @@ -11,7 +11,7 @@ // The TimeScheduler class keeps track of periodic events. It is non-drifting // and keeps track of any missed periods so that it is possible to catch up. // (compare to a metronome) -#include "webrtc/base/criticalsection.h" +#include "webrtc/rtc_base/criticalsection.h" #ifndef WEBRTC_MODULES_AUDIO_CONFERENCE_MIXER_SOURCE_TIME_SCHEDULER_H_ #define WEBRTC_MODULES_AUDIO_CONFERENCE_MIXER_SOURCE_TIME_SCHEDULER_H_ diff --git a/webrtc/modules/audio_device/android/audio_device_template.h b/webrtc/modules/audio_device/android/audio_device_template.h index f8307f5105..52107cc8b7 100644 --- a/webrtc/modules/audio_device/android/audio_device_template.h +++ b/webrtc/modules/audio_device/android/audio_device_template.h @@ -11,11 +11,11 @@ #ifndef WEBRTC_MODULES_AUDIO_DEVICE_ANDROID_AUDIO_DEVICE_TEMPLATE_H_ #define WEBRTC_MODULES_AUDIO_DEVICE_ANDROID_AUDIO_DEVICE_TEMPLATE_H_ -#include "webrtc/base/checks.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/thread_checker.h" #include "webrtc/modules/audio_device/android/audio_manager.h" #include "webrtc/modules/audio_device/audio_device_generic.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/thread_checker.h" namespace webrtc { diff --git a/webrtc/modules/audio_device/android/audio_device_unittest.cc b/webrtc/modules/audio_device/android/audio_device_unittest.cc index 680d3a1592..49403c95ea 100644 --- a/webrtc/modules/audio_device/android/audio_device_unittest.cc +++ b/webrtc/modules/audio_device/android/audio_device_unittest.cc @@ -16,11 +16,6 @@ #include #include -#include "webrtc/base/arraysize.h" -#include "webrtc/base/criticalsection.h" -#include "webrtc/base/format_macros.h" -#include "webrtc/base/scoped_ref_ptr.h" -#include "webrtc/base/timeutils.h" #include "webrtc/modules/audio_device/android/audio_common.h" #include "webrtc/modules/audio_device/android/audio_manager.h" #include "webrtc/modules/audio_device/android/build_info.h" @@ -28,6 +23,11 @@ #include "webrtc/modules/audio_device/audio_device_impl.h" #include "webrtc/modules/audio_device/include/audio_device.h" #include "webrtc/modules/audio_device/include/mock_audio_transport.h" +#include "webrtc/rtc_base/arraysize.h" +#include "webrtc/rtc_base/criticalsection.h" +#include "webrtc/rtc_base/format_macros.h" +#include "webrtc/rtc_base/scoped_ref_ptr.h" +#include "webrtc/rtc_base/timeutils.h" #include "webrtc/system_wrappers/include/event_wrapper.h" #include "webrtc/test/gmock.h" #include "webrtc/test/gtest.h" diff --git a/webrtc/modules/audio_device/android/audio_manager.cc b/webrtc/modules/audio_device/android/audio_manager.cc index d56e9c1bef..da348d2117 100644 --- a/webrtc/modules/audio_device/android/audio_manager.cc +++ b/webrtc/modules/audio_device/android/audio_manager.cc @@ -14,10 +14,10 @@ #include -#include "webrtc/base/arraysize.h" -#include "webrtc/base/checks.h" #include "webrtc/modules/audio_device/android/audio_common.h" #include "webrtc/modules/utility/include/helpers_android.h" +#include "webrtc/rtc_base/arraysize.h" +#include "webrtc/rtc_base/checks.h" #define TAG "AudioManager" #define ALOGV(...) __android_log_print(ANDROID_LOG_VERBOSE, TAG, __VA_ARGS__) diff --git a/webrtc/modules/audio_device/android/audio_manager.h b/webrtc/modules/audio_device/android/audio_manager.h index 6540cc505d..e15e4aaf77 100644 --- a/webrtc/modules/audio_device/android/audio_manager.h +++ b/webrtc/modules/audio_device/android/audio_manager.h @@ -16,14 +16,14 @@ #include #include -#include "webrtc/base/thread_checker.h" #include "webrtc/modules/audio_device/android/audio_common.h" -#include "webrtc/modules/audio_device/audio_device_config.h" -#include "webrtc/modules/audio_device/include/audio_device_defines.h" #include "webrtc/modules/audio_device/android/opensles_common.h" +#include "webrtc/modules/audio_device/audio_device_config.h" #include "webrtc/modules/audio_device/audio_device_generic.h" +#include "webrtc/modules/audio_device/include/audio_device_defines.h" #include "webrtc/modules/utility/include/helpers_android.h" #include "webrtc/modules/utility/include/jvm_android.h" +#include "webrtc/rtc_base/thread_checker.h" namespace webrtc { diff --git a/webrtc/modules/audio_device/android/audio_manager_unittest.cc b/webrtc/modules/audio_device/android/audio_manager_unittest.cc index 2507976522..0ebc66258e 100644 --- a/webrtc/modules/audio_device/android/audio_manager_unittest.cc +++ b/webrtc/modules/audio_device/android/audio_manager_unittest.cc @@ -10,11 +10,11 @@ #include -#include "webrtc/base/arraysize.h" -#include "webrtc/base/format_macros.h" #include "webrtc/modules/audio_device/android/audio_manager.h" #include "webrtc/modules/audio_device/android/build_info.h" #include "webrtc/modules/audio_device/android/ensure_initialized.h" +#include "webrtc/rtc_base/arraysize.h" +#include "webrtc/rtc_base/format_macros.h" #include "webrtc/test/gtest.h" #define PRINT(...) fprintf(stderr, __VA_ARGS__); diff --git a/webrtc/modules/audio_device/android/audio_record_jni.cc b/webrtc/modules/audio_device/android/audio_record_jni.cc index 2a9eacf838..ad8c02756e 100644 --- a/webrtc/modules/audio_device/android/audio_record_jni.cc +++ b/webrtc/modules/audio_device/android/audio_record_jni.cc @@ -14,10 +14,10 @@ #include -#include "webrtc/base/arraysize.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/format_macros.h" #include "webrtc/modules/audio_device/android/audio_common.h" +#include "webrtc/rtc_base/arraysize.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/format_macros.h" #define TAG "AudioRecordJni" #define ALOGV(...) __android_log_print(ANDROID_LOG_VERBOSE, TAG, __VA_ARGS__) diff --git a/webrtc/modules/audio_device/android/audio_record_jni.h b/webrtc/modules/audio_device/android/audio_record_jni.h index 3a1a94aa41..385c9ade34 100644 --- a/webrtc/modules/audio_device/android/audio_record_jni.h +++ b/webrtc/modules/audio_device/android/audio_record_jni.h @@ -15,12 +15,12 @@ #include -#include "webrtc/base/thread_checker.h" #include "webrtc/modules/audio_device/android/audio_manager.h" -#include "webrtc/modules/audio_device/include/audio_device_defines.h" #include "webrtc/modules/audio_device/audio_device_generic.h" +#include "webrtc/modules/audio_device/include/audio_device_defines.h" #include "webrtc/modules/utility/include/helpers_android.h" #include "webrtc/modules/utility/include/jvm_android.h" +#include "webrtc/rtc_base/thread_checker.h" namespace webrtc { diff --git a/webrtc/modules/audio_device/android/audio_track_jni.cc b/webrtc/modules/audio_device/android/audio_track_jni.cc index 83c01c969a..e4a2198d77 100644 --- a/webrtc/modules/audio_device/android/audio_track_jni.cc +++ b/webrtc/modules/audio_device/android/audio_track_jni.cc @@ -15,9 +15,9 @@ #include -#include "webrtc/base/arraysize.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/format_macros.h" +#include "webrtc/rtc_base/arraysize.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/format_macros.h" #define TAG "AudioTrackJni" #define ALOGV(...) __android_log_print(ANDROID_LOG_VERBOSE, TAG, __VA_ARGS__) diff --git a/webrtc/modules/audio_device/android/audio_track_jni.h b/webrtc/modules/audio_device/android/audio_track_jni.h index 2c78a5901c..392299bf8e 100644 --- a/webrtc/modules/audio_device/android/audio_track_jni.h +++ b/webrtc/modules/audio_device/android/audio_track_jni.h @@ -15,13 +15,13 @@ #include -#include "webrtc/base/thread_checker.h" #include "webrtc/modules/audio_device/android/audio_common.h" #include "webrtc/modules/audio_device/android/audio_manager.h" -#include "webrtc/modules/audio_device/include/audio_device_defines.h" #include "webrtc/modules/audio_device/audio_device_generic.h" +#include "webrtc/modules/audio_device/include/audio_device_defines.h" #include "webrtc/modules/utility/include/helpers_android.h" #include "webrtc/modules/utility/include/jvm_android.h" +#include "webrtc/rtc_base/thread_checker.h" namespace webrtc { diff --git a/webrtc/modules/audio_device/android/ensure_initialized.cc b/webrtc/modules/audio_device/android/ensure_initialized.cc index b82d4b7a4c..6407a64dcb 100644 --- a/webrtc/modules/audio_device/android/ensure_initialized.cc +++ b/webrtc/modules/audio_device/android/ensure_initialized.cc @@ -12,17 +12,17 @@ #include -#include "webrtc/base/ignore_wundef.h" +#include "webrtc/rtc_base/ignore_wundef.h" // Note: this dependency is dangerous since it reaches into Chromium's base. // There's a risk of e.g. macro clashes. This file may only be used in tests. RTC_PUSH_IGNORING_WUNDEF() #include "base/android/jni_android.h" RTC_POP_IGNORING_WUNDEF() -#include "webrtc/base/checks.h" #include "webrtc/modules/audio_device/android/audio_record_jni.h" #include "webrtc/modules/audio_device/android/audio_track_jni.h" #include "webrtc/modules/utility/include/jvm_android.h" +#include "webrtc/rtc_base/checks.h" namespace webrtc { namespace audiodevicemodule { diff --git a/webrtc/modules/audio_device/android/opensles_common.cc b/webrtc/modules/audio_device/android/opensles_common.cc index e25f8635d7..65ffbbea7f 100644 --- a/webrtc/modules/audio_device/android/opensles_common.cc +++ b/webrtc/modules/audio_device/android/opensles_common.cc @@ -12,8 +12,8 @@ #include -#include "webrtc/base/arraysize.h" -#include "webrtc/base/checks.h" +#include "webrtc/rtc_base/arraysize.h" +#include "webrtc/rtc_base/checks.h" namespace webrtc { diff --git a/webrtc/modules/audio_device/android/opensles_common.h b/webrtc/modules/audio_device/android/opensles_common.h index b0859c2b6a..c71ae8d72f 100644 --- a/webrtc/modules/audio_device/android/opensles_common.h +++ b/webrtc/modules/audio_device/android/opensles_common.h @@ -14,6 +14,8 @@ #include #include +#include "webrtc/rtc_base/checks.h" + namespace webrtc { // Returns a string representation given an integer SL_RESULT_XXX code. diff --git a/webrtc/modules/audio_device/android/opensles_player.cc b/webrtc/modules/audio_device/android/opensles_player.cc index f79f4f6ee7..0ffb2594a5 100644 --- a/webrtc/modules/audio_device/android/opensles_player.cc +++ b/webrtc/modules/audio_device/android/opensles_player.cc @@ -12,14 +12,14 @@ #include -#include "webrtc/base/array_view.h" -#include "webrtc/base/arraysize.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/format_macros.h" -#include "webrtc/base/timeutils.h" #include "webrtc/modules/audio_device/android/audio_common.h" #include "webrtc/modules/audio_device/android/audio_manager.h" #include "webrtc/modules/audio_device/fine_audio_buffer.h" +#include "webrtc/rtc_base/array_view.h" +#include "webrtc/rtc_base/arraysize.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/format_macros.h" +#include "webrtc/rtc_base/timeutils.h" #define TAG "OpenSLESPlayer" #define ALOGV(...) __android_log_print(ANDROID_LOG_VERBOSE, TAG, __VA_ARGS__) diff --git a/webrtc/modules/audio_device/android/opensles_player.h b/webrtc/modules/audio_device/android/opensles_player.h index 62de50eacd..d6fcd464ac 100644 --- a/webrtc/modules/audio_device/android/opensles_player.h +++ b/webrtc/modules/audio_device/android/opensles_player.h @@ -15,13 +15,13 @@ #include #include -#include "webrtc/base/thread_checker.h" #include "webrtc/modules/audio_device/android/audio_common.h" #include "webrtc/modules/audio_device/android/audio_manager.h" #include "webrtc/modules/audio_device/android/opensles_common.h" -#include "webrtc/modules/audio_device/include/audio_device_defines.h" #include "webrtc/modules/audio_device/audio_device_generic.h" +#include "webrtc/modules/audio_device/include/audio_device_defines.h" #include "webrtc/modules/utility/include/helpers_android.h" +#include "webrtc/rtc_base/thread_checker.h" namespace webrtc { diff --git a/webrtc/modules/audio_device/android/opensles_recorder.cc b/webrtc/modules/audio_device/android/opensles_recorder.cc index 9f5de20774..b180254918 100644 --- a/webrtc/modules/audio_device/android/opensles_recorder.cc +++ b/webrtc/modules/audio_device/android/opensles_recorder.cc @@ -12,14 +12,14 @@ #include -#include "webrtc/base/array_view.h" -#include "webrtc/base/arraysize.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/format_macros.h" -#include "webrtc/base/timeutils.h" #include "webrtc/modules/audio_device/android/audio_common.h" #include "webrtc/modules/audio_device/android/audio_manager.h" #include "webrtc/modules/audio_device/fine_audio_buffer.h" +#include "webrtc/rtc_base/array_view.h" +#include "webrtc/rtc_base/arraysize.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/format_macros.h" +#include "webrtc/rtc_base/timeutils.h" #define TAG "OpenSLESRecorder" #define ALOGV(...) __android_log_print(ANDROID_LOG_VERBOSE, TAG, __VA_ARGS__) diff --git a/webrtc/modules/audio_device/android/opensles_recorder.h b/webrtc/modules/audio_device/android/opensles_recorder.h index 952371a43a..5f8da40c9c 100644 --- a/webrtc/modules/audio_device/android/opensles_recorder.h +++ b/webrtc/modules/audio_device/android/opensles_recorder.h @@ -17,13 +17,13 @@ #include -#include "webrtc/base/thread_checker.h" #include "webrtc/modules/audio_device/android/audio_common.h" #include "webrtc/modules/audio_device/android/audio_manager.h" #include "webrtc/modules/audio_device/android/opensles_common.h" -#include "webrtc/modules/audio_device/include/audio_device_defines.h" #include "webrtc/modules/audio_device/audio_device_generic.h" +#include "webrtc/modules/audio_device/include/audio_device_defines.h" #include "webrtc/modules/utility/include/helpers_android.h" +#include "webrtc/rtc_base/thread_checker.h" namespace webrtc { diff --git a/webrtc/modules/audio_device/audio_device_buffer.cc b/webrtc/modules/audio_device/audio_device_buffer.cc index b074c67157..8227d5b077 100644 --- a/webrtc/modules/audio_device/audio_device_buffer.cc +++ b/webrtc/modules/audio_device/audio_device_buffer.cc @@ -13,14 +13,14 @@ #include "webrtc/modules/audio_device/audio_device_buffer.h" -#include "webrtc/base/arraysize.h" -#include "webrtc/base/bind.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/format_macros.h" -#include "webrtc/base/timeutils.h" #include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" #include "webrtc/modules/audio_device/audio_device_config.h" +#include "webrtc/rtc_base/arraysize.h" +#include "webrtc/rtc_base/bind.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/format_macros.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/timeutils.h" #include "webrtc/system_wrappers/include/metrics.h" namespace webrtc { diff --git a/webrtc/modules/audio_device/audio_device_buffer.h b/webrtc/modules/audio_device/audio_device_buffer.h index c2ea638ab4..04e1be8687 100644 --- a/webrtc/modules/audio_device/audio_device_buffer.h +++ b/webrtc/modules/audio_device/audio_device_buffer.h @@ -11,12 +11,12 @@ #ifndef WEBRTC_MODULES_AUDIO_DEVICE_AUDIO_DEVICE_BUFFER_H_ #define WEBRTC_MODULES_AUDIO_DEVICE_AUDIO_DEVICE_BUFFER_H_ -#include "webrtc/base/buffer.h" -#include "webrtc/base/criticalsection.h" -#include "webrtc/base/task_queue.h" -#include "webrtc/base/thread_annotations.h" -#include "webrtc/base/thread_checker.h" #include "webrtc/modules/audio_device/include/audio_device.h" +#include "webrtc/rtc_base/buffer.h" +#include "webrtc/rtc_base/criticalsection.h" +#include "webrtc/rtc_base/task_queue.h" +#include "webrtc/rtc_base/thread_annotations.h" +#include "webrtc/rtc_base/thread_checker.h" #include "webrtc/system_wrappers/include/file_wrapper.h" #include "webrtc/typedefs.h" diff --git a/webrtc/modules/audio_device/audio_device_data_observer.cc b/webrtc/modules/audio_device/audio_device_data_observer.cc index 08ca1693b2..849f529adc 100644 --- a/webrtc/modules/audio_device/audio_device_data_observer.cc +++ b/webrtc/modules/audio_device/audio_device_data_observer.cc @@ -9,8 +9,8 @@ */ #include "webrtc/modules/audio_device/include/audio_device_data_observer.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/refcountedobject.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/refcountedobject.h" namespace webrtc { diff --git a/webrtc/modules/audio_device/audio_device_generic.cc b/webrtc/modules/audio_device/audio_device_generic.cc index f0511e9fe3..e1c6e6f5b4 100644 --- a/webrtc/modules/audio_device/audio_device_generic.cc +++ b/webrtc/modules/audio_device/audio_device_generic.cc @@ -9,7 +9,7 @@ */ #include "webrtc/modules/audio_device/audio_device_generic.h" -#include "webrtc/base/logging.h" +#include "webrtc/rtc_base/logging.h" namespace webrtc { diff --git a/webrtc/modules/audio_device/audio_device_impl.cc b/webrtc/modules/audio_device/audio_device_impl.cc index 45bc3a5aaf..1731c38716 100644 --- a/webrtc/modules/audio_device/audio_device_impl.cc +++ b/webrtc/modules/audio_device/audio_device_impl.cc @@ -8,15 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/base/checks.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/refcount.h" -#include "webrtc/base/timeutils.h" +#include "webrtc/modules/audio_device/audio_device_impl.h" #include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" #include "webrtc/modules/audio_device/audio_device_config.h" #include "webrtc/modules/audio_device/audio_device_generic.h" -#include "webrtc/modules/audio_device/audio_device_impl.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/refcount.h" +#include "webrtc/rtc_base/timeutils.h" #include "webrtc/system_wrappers/include/metrics.h" #include diff --git a/webrtc/modules/audio_device/audio_device_impl.h b/webrtc/modules/audio_device/audio_device_impl.h index 709eb769bd..072039003e 100644 --- a/webrtc/modules/audio_device/audio_device_impl.h +++ b/webrtc/modules/audio_device/audio_device_impl.h @@ -15,10 +15,10 @@ #include -#include "webrtc/base/checks.h" -#include "webrtc/base/criticalsection.h" #include "webrtc/modules/audio_device/audio_device_buffer.h" #include "webrtc/modules/audio_device/include/audio_device.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/criticalsection.h" namespace webrtc { diff --git a/webrtc/modules/audio_device/audio_device_unittest.cc b/webrtc/modules/audio_device/audio_device_unittest.cc index 4f86d100bd..1327cda801 100644 --- a/webrtc/modules/audio_device/audio_device_unittest.cc +++ b/webrtc/modules/audio_device/audio_device_unittest.cc @@ -12,21 +12,21 @@ #include #include -#include "webrtc/base/array_view.h" -#include "webrtc/base/buffer.h" -#include "webrtc/base/criticalsection.h" -#include "webrtc/base/event.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/optional.h" -#include "webrtc/base/race_checker.h" -#include "webrtc/base/safe_conversions.h" -#include "webrtc/base/scoped_ref_ptr.h" -#include "webrtc/base/thread_annotations.h" -#include "webrtc/base/thread_checker.h" -#include "webrtc/base/timeutils.h" #include "webrtc/modules/audio_device/audio_device_impl.h" #include "webrtc/modules/audio_device/include/audio_device.h" #include "webrtc/modules/audio_device/include/mock_audio_transport.h" +#include "webrtc/rtc_base/array_view.h" +#include "webrtc/rtc_base/buffer.h" +#include "webrtc/rtc_base/criticalsection.h" +#include "webrtc/rtc_base/event.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/optional.h" +#include "webrtc/rtc_base/race_checker.h" +#include "webrtc/rtc_base/safe_conversions.h" +#include "webrtc/rtc_base/scoped_ref_ptr.h" +#include "webrtc/rtc_base/thread_annotations.h" +#include "webrtc/rtc_base/thread_checker.h" +#include "webrtc/rtc_base/timeutils.h" #include "webrtc/test/gmock.h" #include "webrtc/test/gtest.h" diff --git a/webrtc/modules/audio_device/dummy/file_audio_device.cc b/webrtc/modules/audio_device/dummy/file_audio_device.cc index 92b09e0a9d..14230edbfa 100644 --- a/webrtc/modules/audio_device/dummy/file_audio_device.cc +++ b/webrtc/modules/audio_device/dummy/file_audio_device.cc @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/base/checks.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/platform_thread.h" #include "webrtc/modules/audio_device/dummy/file_audio_device.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/platform_thread.h" #include "webrtc/system_wrappers/include/sleep.h" namespace webrtc { diff --git a/webrtc/modules/audio_device/dummy/file_audio_device.h b/webrtc/modules/audio_device/dummy/file_audio_device.h index 41760552c3..160ba1b2e0 100644 --- a/webrtc/modules/audio_device/dummy/file_audio_device.h +++ b/webrtc/modules/audio_device/dummy/file_audio_device.h @@ -16,9 +16,9 @@ #include #include -#include "webrtc/base/criticalsection.h" -#include "webrtc/base/timeutils.h" #include "webrtc/modules/audio_device/audio_device_generic.h" +#include "webrtc/rtc_base/criticalsection.h" +#include "webrtc/rtc_base/timeutils.h" #include "webrtc/system_wrappers/include/file_wrapper.h" namespace rtc { diff --git a/webrtc/modules/audio_device/dummy/file_audio_device_factory.cc b/webrtc/modules/audio_device/dummy/file_audio_device_factory.cc index cc526ead5f..bce6be4633 100644 --- a/webrtc/modules/audio_device/dummy/file_audio_device_factory.cc +++ b/webrtc/modules/audio_device/dummy/file_audio_device_factory.cc @@ -13,8 +13,8 @@ #include #include -#include "webrtc/base/logging.h" #include "webrtc/modules/audio_device/dummy/file_audio_device.h" +#include "webrtc/rtc_base/logging.h" namespace webrtc { diff --git a/webrtc/modules/audio_device/fine_audio_buffer.cc b/webrtc/modules/audio_device/fine_audio_buffer.cc index 27d1937868..848721061a 100644 --- a/webrtc/modules/audio_device/fine_audio_buffer.cc +++ b/webrtc/modules/audio_device/fine_audio_buffer.cc @@ -14,9 +14,9 @@ #include #include -#include "webrtc/base/checks.h" -#include "webrtc/base/logging.h" #include "webrtc/modules/audio_device/audio_device_buffer.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/logging.h" namespace webrtc { diff --git a/webrtc/modules/audio_device/fine_audio_buffer.h b/webrtc/modules/audio_device/fine_audio_buffer.h index 9f3bb5e2b7..f2ee20fc33 100644 --- a/webrtc/modules/audio_device/fine_audio_buffer.h +++ b/webrtc/modules/audio_device/fine_audio_buffer.h @@ -13,8 +13,8 @@ #include -#include "webrtc/base/array_view.h" -#include "webrtc/base/buffer.h" +#include "webrtc/rtc_base/array_view.h" +#include "webrtc/rtc_base/buffer.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/audio_device/fine_audio_buffer_unittest.cc b/webrtc/modules/audio_device/fine_audio_buffer_unittest.cc index c7fef57097..21043eaaf5 100644 --- a/webrtc/modules/audio_device/fine_audio_buffer_unittest.cc +++ b/webrtc/modules/audio_device/fine_audio_buffer_unittest.cc @@ -13,8 +13,8 @@ #include #include -#include "webrtc/base/array_view.h" #include "webrtc/modules/audio_device/mock_audio_device_buffer.h" +#include "webrtc/rtc_base/array_view.h" #include "webrtc/test/gmock.h" #include "webrtc/test/gtest.h" diff --git a/webrtc/modules/audio_device/include/audio_device.h b/webrtc/modules/audio_device/include/audio_device.h index dfa58aa964..8fdd21246e 100644 --- a/webrtc/modules/audio_device/include/audio_device.h +++ b/webrtc/modules/audio_device/include/audio_device.h @@ -11,9 +11,9 @@ #ifndef MODULES_AUDIO_DEVICE_INCLUDE_AUDIO_DEVICE_H_ #define MODULES_AUDIO_DEVICE_INCLUDE_AUDIO_DEVICE_H_ -#include "webrtc/base/scoped_ref_ptr.h" #include "webrtc/modules/audio_device/include/audio_device_defines.h" #include "webrtc/modules/include/module.h" +#include "webrtc/rtc_base/scoped_ref_ptr.h" namespace webrtc { diff --git a/webrtc/modules/audio_device/include/audio_device_data_observer.h b/webrtc/modules/audio_device/include/audio_device_data_observer.h index f1a3d684da..e96720c696 100644 --- a/webrtc/modules/audio_device/include/audio_device_data_observer.h +++ b/webrtc/modules/audio_device/include/audio_device_data_observer.h @@ -11,8 +11,8 @@ #ifndef WEBRTC_MODULES_AUDIO_DEVICE_INCLUDE_AUDIO_DEVICE_DATA_OBSERVER_H_ #define WEBRTC_MODULES_AUDIO_DEVICE_INCLUDE_AUDIO_DEVICE_DATA_OBSERVER_H_ -#include "webrtc/base/scoped_ref_ptr.h" #include "webrtc/modules/audio_device/include/audio_device.h" +#include "webrtc/rtc_base/scoped_ref_ptr.h" namespace webrtc { diff --git a/webrtc/modules/audio_device/ios/audio_device_ios.h b/webrtc/modules/audio_device/ios/audio_device_ios.h index 0ad23577e5..641aba0891 100644 --- a/webrtc/modules/audio_device/ios/audio_device_ios.h +++ b/webrtc/modules/audio_device/ios/audio_device_ios.h @@ -14,14 +14,14 @@ #include #include "WebRTC/RTCMacros.h" -#include "webrtc/base/buffer.h" -#include "webrtc/base/gtest_prod_util.h" -#include "webrtc/base/thread.h" -#include "webrtc/base/thread_annotations.h" -#include "webrtc/base/thread_checker.h" #include "webrtc/modules/audio_device/audio_device_generic.h" #include "webrtc/modules/audio_device/ios/audio_session_observer.h" #include "webrtc/modules/audio_device/ios/voice_processing_audio_unit.h" +#include "webrtc/rtc_base/buffer.h" +#include "webrtc/rtc_base/gtest_prod_util.h" +#include "webrtc/rtc_base/thread.h" +#include "webrtc/rtc_base/thread_annotations.h" +#include "webrtc/rtc_base/thread_checker.h" RTC_FWD_DECL_OBJC_CLASS(RTCAudioSessionDelegateAdapter); diff --git a/webrtc/modules/audio_device/ios/audio_session_observer.h b/webrtc/modules/audio_device/ios/audio_session_observer.h index be714553f5..459226fb75 100644 --- a/webrtc/modules/audio_device/ios/audio_session_observer.h +++ b/webrtc/modules/audio_device/ios/audio_session_observer.h @@ -11,8 +11,8 @@ #ifndef WEBRTC_MODULES_AUDIO_DEVICE_IOS_AUDIO_SESSION_OBSERVER_H_ #define WEBRTC_MODULES_AUDIO_DEVICE_IOS_AUDIO_SESSION_OBSERVER_H_ -#include "webrtc/base/asyncinvoker.h" -#include "webrtc/base/thread.h" +#include "webrtc/rtc_base/asyncinvoker.h" +#include "webrtc/rtc_base/thread.h" namespace webrtc { diff --git a/webrtc/modules/audio_device/linux/audio_device_alsa_linux.cc b/webrtc/modules/audio_device/linux/audio_device_alsa_linux.cc index defae6b680..140dbcb327 100644 --- a/webrtc/modules/audio_device/linux/audio_device_alsa_linux.cc +++ b/webrtc/modules/audio_device/linux/audio_device_alsa_linux.cc @@ -10,9 +10,9 @@ #include -#include "webrtc/base/logging.h" #include "webrtc/modules/audio_device/audio_device_config.h" #include "webrtc/modules/audio_device/linux/audio_device_alsa_linux.h" +#include "webrtc/rtc_base/logging.h" #include "webrtc/system_wrappers/include/event_wrapper.h" #include "webrtc/system_wrappers/include/sleep.h" diff --git a/webrtc/modules/audio_device/linux/audio_device_alsa_linux.h b/webrtc/modules/audio_device/linux/audio_device_alsa_linux.h index 40525982bb..42d63b56da 100644 --- a/webrtc/modules/audio_device/linux/audio_device_alsa_linux.h +++ b/webrtc/modules/audio_device/linux/audio_device_alsa_linux.h @@ -13,10 +13,10 @@ #include -#include "webrtc/base/criticalsection.h" -#include "webrtc/base/platform_thread.h" #include "webrtc/modules/audio_device/audio_device_generic.h" #include "webrtc/modules/audio_device/linux/audio_mixer_manager_alsa_linux.h" +#include "webrtc/rtc_base/criticalsection.h" +#include "webrtc/rtc_base/platform_thread.h" #if defined(USE_X11) #include diff --git a/webrtc/modules/audio_device/linux/audio_device_pulse_linux.cc b/webrtc/modules/audio_device/linux/audio_device_pulse_linux.cc index 54fabb56ed..3f090c6b99 100644 --- a/webrtc/modules/audio_device/linux/audio_device_pulse_linux.cc +++ b/webrtc/modules/audio_device/linux/audio_device_pulse_linux.cc @@ -10,10 +10,10 @@ #include -#include "webrtc/base/checks.h" -#include "webrtc/base/logging.h" #include "webrtc/modules/audio_device/audio_device_config.h" #include "webrtc/modules/audio_device/linux/audio_device_pulse_linux.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/logging.h" #include "webrtc/system_wrappers/include/event_wrapper.h" #include "webrtc/system_wrappers/include/trace.h" diff --git a/webrtc/modules/audio_device/linux/audio_device_pulse_linux.h b/webrtc/modules/audio_device/linux/audio_device_pulse_linux.h index 58934583db..78909c185a 100644 --- a/webrtc/modules/audio_device/linux/audio_device_pulse_linux.h +++ b/webrtc/modules/audio_device/linux/audio_device_pulse_linux.h @@ -13,11 +13,11 @@ #include -#include "webrtc/base/criticalsection.h" -#include "webrtc/base/platform_thread.h" -#include "webrtc/base/thread_checker.h" #include "webrtc/modules/audio_device/audio_device_generic.h" #include "webrtc/modules/audio_device/linux/audio_mixer_manager_pulse_linux.h" +#include "webrtc/rtc_base/criticalsection.h" +#include "webrtc/rtc_base/platform_thread.h" +#include "webrtc/rtc_base/thread_checker.h" #include #include diff --git a/webrtc/modules/audio_device/linux/audio_mixer_manager_alsa_linux.h b/webrtc/modules/audio_device/linux/audio_mixer_manager_alsa_linux.h index 0ad11c8b6d..d9838328d1 100644 --- a/webrtc/modules/audio_device/linux/audio_mixer_manager_alsa_linux.h +++ b/webrtc/modules/audio_device/linux/audio_mixer_manager_alsa_linux.h @@ -11,9 +11,9 @@ #ifndef WEBRTC_AUDIO_DEVICE_AUDIO_MIXER_MANAGER_ALSA_LINUX_H #define WEBRTC_AUDIO_DEVICE_AUDIO_MIXER_MANAGER_ALSA_LINUX_H -#include "webrtc/base/criticalsection.h" #include "webrtc/modules/audio_device/include/audio_device.h" #include "webrtc/modules/audio_device/linux/alsasymboltable_linux.h" +#include "webrtc/rtc_base/criticalsection.h" #include "webrtc/typedefs.h" #include diff --git a/webrtc/modules/audio_device/linux/audio_mixer_manager_pulse_linux.cc b/webrtc/modules/audio_device/linux/audio_mixer_manager_pulse_linux.cc index a9b3d47936..8325b505e9 100644 --- a/webrtc/modules/audio_device/linux/audio_mixer_manager_pulse_linux.cc +++ b/webrtc/modules/audio_device/linux/audio_mixer_manager_pulse_linux.cc @@ -11,8 +11,8 @@ #include #include "webrtc/modules/audio_device/linux/audio_mixer_manager_pulse_linux.h" +#include "webrtc/rtc_base/checks.h" #include "webrtc/system_wrappers/include/trace.h" -#include "webrtc/base/checks.h" extern webrtc::adm_linux_pulse::PulseAudioSymbolTable PaSymbolTable; diff --git a/webrtc/modules/audio_device/linux/audio_mixer_manager_pulse_linux.h b/webrtc/modules/audio_device/linux/audio_mixer_manager_pulse_linux.h index b9c8a1d55e..a5806af96e 100644 --- a/webrtc/modules/audio_device/linux/audio_mixer_manager_pulse_linux.h +++ b/webrtc/modules/audio_device/linux/audio_mixer_manager_pulse_linux.h @@ -13,8 +13,8 @@ #include "webrtc/modules/audio_device/include/audio_device.h" #include "webrtc/modules/audio_device/linux/pulseaudiosymboltable_linux.h" +#include "webrtc/rtc_base/thread_checker.h" #include "webrtc/typedefs.h" -#include "webrtc/base/thread_checker.h" #include #include diff --git a/webrtc/modules/audio_device/linux/latebindingsymboltable_linux.h b/webrtc/modules/audio_device/linux/latebindingsymboltable_linux.h index d62f00a822..03f0b719d9 100644 --- a/webrtc/modules/audio_device/linux/latebindingsymboltable_linux.h +++ b/webrtc/modules/audio_device/linux/latebindingsymboltable_linux.h @@ -15,7 +15,7 @@ #include // for NULL #include -#include "webrtc/base/constructormagic.h" +#include "webrtc/rtc_base/constructormagic.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/webrtc/modules/audio_device/mac/audio_device_mac.cc b/webrtc/modules/audio_device/mac/audio_device_mac.cc index 0ea052fbb8..e40d23c725 100644 --- a/webrtc/modules/audio_device/mac/audio_device_mac.cc +++ b/webrtc/modules/audio_device/mac/audio_device_mac.cc @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/base/arraysize.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/platform_thread.h" -#include "webrtc/modules/audio_device/audio_device_config.h" #include "webrtc/modules/audio_device/mac/audio_device_mac.h" +#include "webrtc/modules/audio_device/audio_device_config.h" #include "webrtc/modules/audio_device/mac/portaudio/pa_ringbuffer.h" +#include "webrtc/rtc_base/arraysize.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/platform_thread.h" #include "webrtc/system_wrappers/include/event_wrapper.h" #include "webrtc/system_wrappers/include/trace.h" diff --git a/webrtc/modules/audio_device/mac/audio_device_mac.h b/webrtc/modules/audio_device/mac/audio_device_mac.h index 52b44eb4ff..0acf752ac4 100644 --- a/webrtc/modules/audio_device/mac/audio_device_mac.h +++ b/webrtc/modules/audio_device/mac/audio_device_mac.h @@ -13,10 +13,10 @@ #include -#include "webrtc/base/criticalsection.h" -#include "webrtc/base/thread_annotations.h" #include "webrtc/modules/audio_device/audio_device_generic.h" #include "webrtc/modules/audio_device/mac/audio_mixer_manager_mac.h" +#include "webrtc/rtc_base/criticalsection.h" +#include "webrtc/rtc_base/thread_annotations.h" #include "webrtc/system_wrappers/include/event_wrapper.h" #include diff --git a/webrtc/modules/audio_device/mac/audio_mixer_manager_mac.h b/webrtc/modules/audio_device/mac/audio_mixer_manager_mac.h index 17515a6720..17e7b25e1d 100644 --- a/webrtc/modules/audio_device/mac/audio_mixer_manager_mac.h +++ b/webrtc/modules/audio_device/mac/audio_mixer_manager_mac.h @@ -11,8 +11,8 @@ #ifndef WEBRTC_AUDIO_DEVICE_AUDIO_MIXER_MANAGER_MAC_H #define WEBRTC_AUDIO_DEVICE_AUDIO_MIXER_MANAGER_MAC_H -#include "webrtc/base/criticalsection.h" #include "webrtc/modules/audio_device/include/audio_device.h" +#include "webrtc/rtc_base/criticalsection.h" #include "webrtc/system_wrappers/include/trace.h" #include "webrtc/typedefs.h" diff --git a/webrtc/modules/audio_device/test/audio_device_test_api.cc b/webrtc/modules/audio_device/test/audio_device_test_api.cc index 5bf01e6eae..a518654873 100644 --- a/webrtc/modules/audio_device/test/audio_device_test_api.cc +++ b/webrtc/modules/audio_device/test/audio_device_test_api.cc @@ -14,11 +14,11 @@ #include -#include "webrtc/base/location.h" #include "webrtc/modules/audio_device/audio_device_config.h" #include "webrtc/modules/audio_device/audio_device_impl.h" #include "webrtc/modules/audio_device/test/audio_device_test_defines.h" #include "webrtc/modules/utility/include/process_thread.h" +#include "webrtc/rtc_base/location.h" #include "webrtc/system_wrappers/include/sleep.h" #include "webrtc/test/gtest.h" #include "webrtc/test/testsupport/fileutils.h" diff --git a/webrtc/modules/audio_device/win/audio_device_core_win.cc b/webrtc/modules/audio_device/win/audio_device_core_win.cc index 370bb599a0..2b0a3adfd8 100644 --- a/webrtc/modules/audio_device/win/audio_device_core_win.cc +++ b/webrtc/modules/audio_device/win/audio_device_core_win.cc @@ -35,8 +35,8 @@ #include #include -#include "webrtc/base/logging.h" -#include "webrtc/base/platform_thread.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/platform_thread.h" #include "webrtc/system_wrappers/include/sleep.h" #include "webrtc/system_wrappers/include/trace.h" diff --git a/webrtc/modules/audio_device/win/audio_device_core_win.h b/webrtc/modules/audio_device/win/audio_device_core_win.h index 812b96b468..60ee9ef890 100644 --- a/webrtc/modules/audio_device/win/audio_device_core_win.h +++ b/webrtc/modules/audio_device/win/audio_device_core_win.h @@ -24,8 +24,8 @@ #include #include // IMediaObject -#include "webrtc/base/criticalsection.h" -#include "webrtc/base/scoped_ref_ptr.h" +#include "webrtc/rtc_base/criticalsection.h" +#include "webrtc/rtc_base/scoped_ref_ptr.h" // Use Multimedia Class Scheduler Service (MMCSS) to boost the thread priority #pragma comment( lib, "avrt.lib" ) diff --git a/webrtc/modules/audio_mixer/audio_frame_manipulator.cc b/webrtc/modules/audio_mixer/audio_frame_manipulator.cc index fff79a38cf..3f16bf7823 100644 --- a/webrtc/modules/audio_mixer/audio_frame_manipulator.cc +++ b/webrtc/modules/audio_mixer/audio_frame_manipulator.cc @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/audio/utility/audio_frame_operations.h" -#include "webrtc/base/checks.h" #include "webrtc/modules/audio_mixer/audio_frame_manipulator.h" +#include "webrtc/audio/utility/audio_frame_operations.h" #include "webrtc/modules/include/module_common_types.h" +#include "webrtc/rtc_base/checks.h" namespace webrtc { diff --git a/webrtc/modules/audio_mixer/audio_mixer_impl.cc b/webrtc/modules/audio_mixer/audio_mixer_impl.cc index 22fa7ae248..2ad4a3459f 100644 --- a/webrtc/modules/audio_mixer/audio_mixer_impl.cc +++ b/webrtc/modules/audio_mixer/audio_mixer_impl.cc @@ -15,9 +15,9 @@ #include #include -#include "webrtc/base/logging.h" #include "webrtc/modules/audio_mixer/audio_frame_manipulator.h" #include "webrtc/modules/audio_mixer/default_output_rate_calculator.h" +#include "webrtc/rtc_base/logging.h" namespace webrtc { namespace { diff --git a/webrtc/modules/audio_mixer/audio_mixer_impl.h b/webrtc/modules/audio_mixer/audio_mixer_impl.h index e729755842..93eea98168 100644 --- a/webrtc/modules/audio_mixer/audio_mixer_impl.h +++ b/webrtc/modules/audio_mixer/audio_mixer_impl.h @@ -15,13 +15,13 @@ #include #include "webrtc/api/audio/audio_mixer.h" -#include "webrtc/base/scoped_ref_ptr.h" -#include "webrtc/base/thread_annotations.h" -#include "webrtc/base/race_checker.h" #include "webrtc/modules/audio_mixer/frame_combiner.h" #include "webrtc/modules/audio_mixer/output_rate_calculator.h" #include "webrtc/modules/audio_processing/include/audio_processing.h" #include "webrtc/modules/include/module_common_types.h" +#include "webrtc/rtc_base/race_checker.h" +#include "webrtc/rtc_base/scoped_ref_ptr.h" +#include "webrtc/rtc_base/thread_annotations.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/audio_mixer/audio_mixer_impl_unittest.cc b/webrtc/modules/audio_mixer/audio_mixer_impl_unittest.cc index 70f06d0566..3ac61892b3 100644 --- a/webrtc/modules/audio_mixer/audio_mixer_impl_unittest.cc +++ b/webrtc/modules/audio_mixer/audio_mixer_impl_unittest.cc @@ -17,11 +17,11 @@ #include #include "webrtc/api/audio/audio_mixer.h" -#include "webrtc/base/bind.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/thread.h" #include "webrtc/modules/audio_mixer/audio_mixer_impl.h" #include "webrtc/modules/audio_mixer/default_output_rate_calculator.h" +#include "webrtc/rtc_base/bind.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/thread.h" #include "webrtc/test/gmock.h" using testing::_; diff --git a/webrtc/modules/audio_mixer/frame_combiner.cc b/webrtc/modules/audio_mixer/frame_combiner.cc index 7732c7cdcd..35b9949224 100644 --- a/webrtc/modules/audio_mixer/frame_combiner.cc +++ b/webrtc/modules/audio_mixer/frame_combiner.cc @@ -16,11 +16,11 @@ #include #include "webrtc/audio/utility/audio_frame_operations.h" -#include "webrtc/base/array_view.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/logging.h" #include "webrtc/modules/audio_mixer/audio_frame_manipulator.h" #include "webrtc/modules/audio_mixer/audio_mixer_impl.h" +#include "webrtc/rtc_base/array_view.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/logging.h" namespace webrtc { namespace { diff --git a/webrtc/modules/audio_mixer/frame_combiner_unittest.cc b/webrtc/modules/audio_mixer/frame_combiner_unittest.cc index 250c6e1954..fc048d0b2c 100644 --- a/webrtc/modules/audio_mixer/frame_combiner_unittest.cc +++ b/webrtc/modules/audio_mixer/frame_combiner_unittest.cc @@ -15,9 +15,9 @@ #include #include "webrtc/audio/utility/audio_frame_operations.h" -#include "webrtc/base/checks.h" #include "webrtc/modules/audio_mixer/gain_change_calculator.h" #include "webrtc/modules/audio_mixer/sine_wave_generator.h" +#include "webrtc/rtc_base/checks.h" #include "webrtc/test/gtest.h" namespace webrtc { diff --git a/webrtc/modules/audio_mixer/gain_change_calculator.h b/webrtc/modules/audio_mixer/gain_change_calculator.h index ca7bf031a2..cb742cd35b 100644 --- a/webrtc/modules/audio_mixer/gain_change_calculator.h +++ b/webrtc/modules/audio_mixer/gain_change_calculator.h @@ -11,7 +11,7 @@ #ifndef WEBRTC_MODULES_AUDIO_MIXER_GAIN_CHANGE_CALCULATOR_H_ #define WEBRTC_MODULES_AUDIO_MIXER_GAIN_CHANGE_CALCULATOR_H_ -#include "webrtc/base/array_view.h" +#include "webrtc/rtc_base/array_view.h" namespace webrtc { diff --git a/webrtc/modules/audio_mixer/sine_wave_generator.cc b/webrtc/modules/audio_mixer/sine_wave_generator.cc index f295045de0..e3acfe4748 100644 --- a/webrtc/modules/audio_mixer/sine_wave_generator.cc +++ b/webrtc/modules/audio_mixer/sine_wave_generator.cc @@ -12,7 +12,7 @@ #include -#include "webrtc/base/safe_conversions.h" +#include "webrtc/rtc_base/safe_conversions.h" namespace webrtc { diff --git a/webrtc/modules/audio_mixer/sine_wave_generator.h b/webrtc/modules/audio_mixer/sine_wave_generator.h index 7d17293ef0..910f5ae185 100644 --- a/webrtc/modules/audio_mixer/sine_wave_generator.h +++ b/webrtc/modules/audio_mixer/sine_wave_generator.h @@ -11,8 +11,8 @@ #ifndef WEBRTC_MODULES_AUDIO_MIXER_SINE_WAVE_GENERATOR_H_ #define WEBRTC_MODULES_AUDIO_MIXER_SINE_WAVE_GENERATOR_H_ -#include "webrtc/base/checks.h" #include "webrtc/modules/include/module_common_types.h" +#include "webrtc/rtc_base/checks.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/aec/aec_core.cc b/webrtc/modules/audio_processing/aec/aec_core.cc index f9e96ace04..3155bad972 100644 --- a/webrtc/modules/audio_processing/aec/aec_core.cc +++ b/webrtc/modules/audio_processing/aec/aec_core.cc @@ -20,16 +20,16 @@ #include #include -#include "webrtc/base/checks.h" +#include "webrtc/rtc_base/checks.h" extern "C" { #include "webrtc/common_audio/ring_buffer.h" } -#include "webrtc/base/checks.h" #include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" #include "webrtc/modules/audio_processing/aec/aec_common.h" #include "webrtc/modules/audio_processing/aec/aec_core_optimized_methods.h" #include "webrtc/modules/audio_processing/logging/apm_data_dumper.h" #include "webrtc/modules/audio_processing/utility/delay_estimator_wrapper.h" +#include "webrtc/rtc_base/checks.h" #include "webrtc/system_wrappers/include/cpu_features_wrapper.h" #include "webrtc/system_wrappers/include/metrics.h" #include "webrtc/typedefs.h" diff --git a/webrtc/modules/audio_processing/aec/aec_core.h b/webrtc/modules/audio_processing/aec/aec_core.h index 78cb787fa7..9a4c241915 100644 --- a/webrtc/modules/audio_processing/aec/aec_core.h +++ b/webrtc/modules/audio_processing/aec/aec_core.h @@ -22,11 +22,11 @@ extern "C" { #include "webrtc/common_audio/ring_buffer.h" } -#include "webrtc/base/constructormagic.h" #include "webrtc/common_audio/wav_file.h" #include "webrtc/modules/audio_processing/aec/aec_common.h" #include "webrtc/modules/audio_processing/utility/block_mean_calculator.h" #include "webrtc/modules/audio_processing/utility/ooura_fft.h" +#include "webrtc/rtc_base/constructormagic.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/aec/aec_resampler.cc b/webrtc/modules/audio_processing/aec/aec_resampler.cc index 2630841d4a..174fd20c34 100644 --- a/webrtc/modules/audio_processing/aec/aec_resampler.cc +++ b/webrtc/modules/audio_processing/aec/aec_resampler.cc @@ -18,8 +18,8 @@ #include #include -#include "webrtc/base/checks.h" #include "webrtc/modules/audio_processing/aec/aec_core.h" +#include "webrtc/rtc_base/checks.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/aec/echo_cancellation_unittest.cc b/webrtc/modules/audio_processing/aec/echo_cancellation_unittest.cc index 20b63d667d..647e90cda2 100644 --- a/webrtc/modules/audio_processing/aec/echo_cancellation_unittest.cc +++ b/webrtc/modules/audio_processing/aec/echo_cancellation_unittest.cc @@ -15,8 +15,8 @@ #include #include -#include "webrtc/base/checks.h" #include "webrtc/modules/audio_processing/aec/aec_core.h" +#include "webrtc/rtc_base/checks.h" #include "webrtc/test/gtest.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/aec3/adaptive_fir_filter.cc b/webrtc/modules/audio_processing/aec3/adaptive_fir_filter.cc index 7c29558c7e..b372df531d 100644 --- a/webrtc/modules/audio_processing/aec3/adaptive_fir_filter.cc +++ b/webrtc/modules/audio_processing/aec3/adaptive_fir_filter.cc @@ -20,8 +20,8 @@ #include #include -#include "webrtc/base/checks.h" #include "webrtc/modules/audio_processing/aec3/fft_data.h" +#include "webrtc/rtc_base/checks.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/aec3/adaptive_fir_filter.h b/webrtc/modules/audio_processing/aec3/adaptive_fir_filter.h index 75c418bf0f..d77cbcae15 100644 --- a/webrtc/modules/audio_processing/aec3/adaptive_fir_filter.h +++ b/webrtc/modules/audio_processing/aec3/adaptive_fir_filter.h @@ -15,13 +15,13 @@ #include #include -#include "webrtc/base/array_view.h" -#include "webrtc/base/constructormagic.h" #include "webrtc/modules/audio_processing/aec3/aec3_common.h" #include "webrtc/modules/audio_processing/aec3/aec3_fft.h" #include "webrtc/modules/audio_processing/aec3/fft_data.h" #include "webrtc/modules/audio_processing/aec3/render_buffer.h" #include "webrtc/modules/audio_processing/logging/apm_data_dumper.h" +#include "webrtc/rtc_base/array_view.h" +#include "webrtc/rtc_base/constructormagic.h" namespace webrtc { namespace aec3 { diff --git a/webrtc/modules/audio_processing/aec3/adaptive_fir_filter_unittest.cc b/webrtc/modules/audio_processing/aec3/adaptive_fir_filter_unittest.cc index 83c3ac8a8c..474174c2ee 100644 --- a/webrtc/modules/audio_processing/aec3/adaptive_fir_filter_unittest.cc +++ b/webrtc/modules/audio_processing/aec3/adaptive_fir_filter_unittest.cc @@ -18,9 +18,6 @@ #if defined(WEBRTC_ARCH_X86_FAMILY) #include #endif -#include "webrtc/base/arraysize.h" -#include "webrtc/base/random.h" -#include "webrtc/base/safe_minmax.h" #include "webrtc/modules/audio_processing/aec3/aec3_fft.h" #include "webrtc/modules/audio_processing/aec3/aec_state.h" #include "webrtc/modules/audio_processing/aec3/cascaded_biquad_filter.h" @@ -28,6 +25,9 @@ #include "webrtc/modules/audio_processing/aec3/shadow_filter_update_gain.h" #include "webrtc/modules/audio_processing/logging/apm_data_dumper.h" #include "webrtc/modules/audio_processing/test/echo_canceller_test_tools.h" +#include "webrtc/rtc_base/arraysize.h" +#include "webrtc/rtc_base/random.h" +#include "webrtc/rtc_base/safe_minmax.h" #include "webrtc/system_wrappers/include/cpu_features_wrapper.h" #include "webrtc/test/gtest.h" diff --git a/webrtc/modules/audio_processing/aec3/aec3_fft.cc b/webrtc/modules/audio_processing/aec3/aec3_fft.cc index 3f9ff44e9c..cb06956d21 100644 --- a/webrtc/modules/audio_processing/aec3/aec3_fft.cc +++ b/webrtc/modules/audio_processing/aec3/aec3_fft.cc @@ -12,7 +12,7 @@ #include -#include "webrtc/base/checks.h" +#include "webrtc/rtc_base/checks.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/aec3/aec3_fft.h b/webrtc/modules/audio_processing/aec3/aec3_fft.h index 6cfe3bd9e7..f0b98b3e6e 100644 --- a/webrtc/modules/audio_processing/aec3/aec3_fft.h +++ b/webrtc/modules/audio_processing/aec3/aec3_fft.h @@ -13,11 +13,11 @@ #include -#include "webrtc/base/array_view.h" -#include "webrtc/base/constructormagic.h" #include "webrtc/modules/audio_processing/aec3/aec3_common.h" #include "webrtc/modules/audio_processing/aec3/fft_data.h" #include "webrtc/modules/audio_processing/utility/ooura_fft.h" +#include "webrtc/rtc_base/array_view.h" +#include "webrtc/rtc_base/constructormagic.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/aec3/aec_state.cc b/webrtc/modules/audio_processing/aec3/aec_state.cc index 316f888717..3840ef9601 100644 --- a/webrtc/modules/audio_processing/aec3/aec_state.cc +++ b/webrtc/modules/audio_processing/aec3/aec_state.cc @@ -14,10 +14,10 @@ #include #include -#include "webrtc/base/array_view.h" -#include "webrtc/base/atomicops.h" -#include "webrtc/base/checks.h" #include "webrtc/modules/audio_processing/logging/apm_data_dumper.h" +#include "webrtc/rtc_base/array_view.h" +#include "webrtc/rtc_base/atomicops.h" +#include "webrtc/rtc_base/checks.h" namespace webrtc { namespace { diff --git a/webrtc/modules/audio_processing/aec3/aec_state.h b/webrtc/modules/audio_processing/aec3/aec_state.h index 87089360a4..1b00bf55ff 100644 --- a/webrtc/modules/audio_processing/aec3/aec_state.h +++ b/webrtc/modules/audio_processing/aec3/aec_state.h @@ -15,14 +15,14 @@ #include #include -#include "webrtc/base/array_view.h" -#include "webrtc/base/constructormagic.h" -#include "webrtc/base/optional.h" #include "webrtc/modules/audio_processing/aec3/aec3_common.h" #include "webrtc/modules/audio_processing/aec3/echo_path_variability.h" #include "webrtc/modules/audio_processing/aec3/erl_estimator.h" #include "webrtc/modules/audio_processing/aec3/erle_estimator.h" #include "webrtc/modules/audio_processing/aec3/render_buffer.h" +#include "webrtc/rtc_base/array_view.h" +#include "webrtc/rtc_base/constructormagic.h" +#include "webrtc/rtc_base/optional.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/aec3/block_framer.cc b/webrtc/modules/audio_processing/aec3/block_framer.cc index 6425dae8c8..80ac83645e 100644 --- a/webrtc/modules/audio_processing/aec3/block_framer.cc +++ b/webrtc/modules/audio_processing/aec3/block_framer.cc @@ -12,7 +12,7 @@ #include -#include "webrtc/base/checks.h" +#include "webrtc/rtc_base/checks.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/aec3/block_framer.h b/webrtc/modules/audio_processing/aec3/block_framer.h index c8bca8ea44..d6c9144d3d 100644 --- a/webrtc/modules/audio_processing/aec3/block_framer.h +++ b/webrtc/modules/audio_processing/aec3/block_framer.h @@ -13,9 +13,9 @@ #include -#include "webrtc/base/array_view.h" -#include "webrtc/base/constructormagic.h" #include "webrtc/modules/audio_processing/aec3/aec3_common.h" +#include "webrtc/rtc_base/array_view.h" +#include "webrtc/rtc_base/constructormagic.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/aec3/block_processor.cc b/webrtc/modules/audio_processing/aec3/block_processor.cc index 2cf56066bd..3a32f3c80b 100644 --- a/webrtc/modules/audio_processing/aec3/block_processor.cc +++ b/webrtc/modules/audio_processing/aec3/block_processor.cc @@ -9,13 +9,13 @@ */ #include "webrtc/modules/audio_processing/aec3/block_processor.h" -#include "webrtc/base/atomicops.h" -#include "webrtc/base/constructormagic.h" -#include "webrtc/base/optional.h" #include "webrtc/modules/audio_processing/aec3/aec3_common.h" #include "webrtc/modules/audio_processing/aec3/block_processor_metrics.h" #include "webrtc/modules/audio_processing/aec3/echo_path_variability.h" #include "webrtc/modules/audio_processing/logging/apm_data_dumper.h" +#include "webrtc/rtc_base/atomicops.h" +#include "webrtc/rtc_base/constructormagic.h" +#include "webrtc/rtc_base/optional.h" namespace webrtc { namespace { diff --git a/webrtc/modules/audio_processing/aec3/block_processor_metrics.h b/webrtc/modules/audio_processing/aec3/block_processor_metrics.h index 6c278cd793..1cff2a8d3e 100644 --- a/webrtc/modules/audio_processing/aec3/block_processor_metrics.h +++ b/webrtc/modules/audio_processing/aec3/block_processor_metrics.h @@ -11,7 +11,7 @@ #ifndef WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_BLOCK_PROCESSOR_METRICS_H_ #define WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_BLOCK_PROCESSOR_METRICS_H_ -#include "webrtc/base/constructormagic.h" +#include "webrtc/rtc_base/constructormagic.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/aec3/block_processor_unittest.cc b/webrtc/modules/audio_processing/aec3/block_processor_unittest.cc index 1c04536723..9f402ed846 100644 --- a/webrtc/modules/audio_processing/aec3/block_processor_unittest.cc +++ b/webrtc/modules/audio_processing/aec3/block_processor_unittest.cc @@ -15,13 +15,13 @@ #include #include -#include "webrtc/base/checks.h" -#include "webrtc/base/random.h" #include "webrtc/modules/audio_processing/aec3/aec3_common.h" #include "webrtc/modules/audio_processing/aec3/mock/mock_echo_remover.h" #include "webrtc/modules/audio_processing/aec3/mock/mock_render_delay_buffer.h" #include "webrtc/modules/audio_processing/aec3/mock/mock_render_delay_controller.h" #include "webrtc/modules/audio_processing/test/echo_canceller_test_tools.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/random.h" #include "webrtc/test/gmock.h" #include "webrtc/test/gtest.h" diff --git a/webrtc/modules/audio_processing/aec3/cascaded_biquad_filter.cc b/webrtc/modules/audio_processing/aec3/cascaded_biquad_filter.cc index 33cb910e7d..3ac86c0029 100644 --- a/webrtc/modules/audio_processing/aec3/cascaded_biquad_filter.cc +++ b/webrtc/modules/audio_processing/aec3/cascaded_biquad_filter.cc @@ -9,7 +9,7 @@ */ #include "webrtc/modules/audio_processing/aec3/cascaded_biquad_filter.h" -#include "webrtc/base/checks.h" +#include "webrtc/rtc_base/checks.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/aec3/cascaded_biquad_filter.h b/webrtc/modules/audio_processing/aec3/cascaded_biquad_filter.h index 438a166eae..8e11a8d983 100644 --- a/webrtc/modules/audio_processing/aec3/cascaded_biquad_filter.h +++ b/webrtc/modules/audio_processing/aec3/cascaded_biquad_filter.h @@ -13,8 +13,8 @@ #include -#include "webrtc/base/array_view.h" -#include "webrtc/base/constructormagic.h" +#include "webrtc/rtc_base/array_view.h" +#include "webrtc/rtc_base/constructormagic.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/aec3/comfort_noise_generator.h b/webrtc/modules/audio_processing/aec3/comfort_noise_generator.h index 14332f7881..3684f48fee 100644 --- a/webrtc/modules/audio_processing/aec3/comfort_noise_generator.h +++ b/webrtc/modules/audio_processing/aec3/comfort_noise_generator.h @@ -14,10 +14,10 @@ #include #include -#include "webrtc/base/constructormagic.h" -#include "webrtc/modules/audio_processing/aec3/aec_state.h" #include "webrtc/modules/audio_processing/aec3/aec3_common.h" +#include "webrtc/modules/audio_processing/aec3/aec_state.h" #include "webrtc/modules/audio_processing/aec3/fft_data.h" +#include "webrtc/rtc_base/constructormagic.h" namespace webrtc { namespace aec3 { diff --git a/webrtc/modules/audio_processing/aec3/comfort_noise_generator_unittest.cc b/webrtc/modules/audio_processing/aec3/comfort_noise_generator_unittest.cc index ce86f2db2c..9e10ee8ce3 100644 --- a/webrtc/modules/audio_processing/aec3/comfort_noise_generator_unittest.cc +++ b/webrtc/modules/audio_processing/aec3/comfort_noise_generator_unittest.cc @@ -13,10 +13,10 @@ #include #include -#include "webrtc/typedefs.h" -#include "webrtc/base/random.h" +#include "webrtc/rtc_base/random.h" #include "webrtc/system_wrappers/include/cpu_features_wrapper.h" #include "webrtc/test/gtest.h" +#include "webrtc/typedefs.h" namespace webrtc { namespace aec3 { diff --git a/webrtc/modules/audio_processing/aec3/decimator_by_4.cc b/webrtc/modules/audio_processing/aec3/decimator_by_4.cc index aa6480f4e1..94d11d26f3 100644 --- a/webrtc/modules/audio_processing/aec3/decimator_by_4.cc +++ b/webrtc/modules/audio_processing/aec3/decimator_by_4.cc @@ -9,7 +9,7 @@ */ #include "webrtc/modules/audio_processing/aec3/decimator_by_4.h" -#include "webrtc/base/checks.h" +#include "webrtc/rtc_base/checks.h" namespace webrtc { namespace { diff --git a/webrtc/modules/audio_processing/aec3/decimator_by_4.h b/webrtc/modules/audio_processing/aec3/decimator_by_4.h index 5afc68118b..93b4b58b87 100644 --- a/webrtc/modules/audio_processing/aec3/decimator_by_4.h +++ b/webrtc/modules/audio_processing/aec3/decimator_by_4.h @@ -13,10 +13,10 @@ #include -#include "webrtc/base/array_view.h" -#include "webrtc/base/constructormagic.h" #include "webrtc/modules/audio_processing/aec3/aec3_common.h" #include "webrtc/modules/audio_processing/aec3/cascaded_biquad_filter.h" +#include "webrtc/rtc_base/array_view.h" +#include "webrtc/rtc_base/constructormagic.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/aec3/echo_canceller3.cc b/webrtc/modules/audio_processing/aec3/echo_canceller3.cc index c85116d72c..95dfe8a743 100644 --- a/webrtc/modules/audio_processing/aec3/echo_canceller3.cc +++ b/webrtc/modules/audio_processing/aec3/echo_canceller3.cc @@ -11,8 +11,8 @@ #include -#include "webrtc/base/atomicops.h" #include "webrtc/modules/audio_processing/logging/apm_data_dumper.h" +#include "webrtc/rtc_base/atomicops.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/aec3/echo_canceller3.h b/webrtc/modules/audio_processing/aec3/echo_canceller3.h index 6324cc6bda..d857dfbed5 100644 --- a/webrtc/modules/audio_processing/aec3/echo_canceller3.h +++ b/webrtc/modules/audio_processing/aec3/echo_canceller3.h @@ -11,9 +11,6 @@ #ifndef WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_ECHO_CANCELLER3_H_ #define WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_ECHO_CANCELLER3_H_ -#include "webrtc/base/constructormagic.h" -#include "webrtc/base/race_checker.h" -#include "webrtc/base/swap_queue.h" #include "webrtc/modules/audio_processing/aec3/block_framer.h" #include "webrtc/modules/audio_processing/aec3/block_processor.h" #include "webrtc/modules/audio_processing/aec3/cascaded_biquad_filter.h" @@ -21,6 +18,9 @@ #include "webrtc/modules/audio_processing/audio_buffer.h" #include "webrtc/modules/audio_processing/include/audio_processing.h" #include "webrtc/modules/audio_processing/logging/apm_data_dumper.h" +#include "webrtc/rtc_base/constructormagic.h" +#include "webrtc/rtc_base/race_checker.h" +#include "webrtc/rtc_base/swap_queue.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/aec3/echo_path_delay_estimator.cc b/webrtc/modules/audio_processing/aec3/echo_path_delay_estimator.cc index be6a2aacc1..8f84f59609 100644 --- a/webrtc/modules/audio_processing/aec3/echo_path_delay_estimator.cc +++ b/webrtc/modules/audio_processing/aec3/echo_path_delay_estimator.cc @@ -12,10 +12,10 @@ #include #include -#include "webrtc/base/checks.h" #include "webrtc/modules/audio_processing/aec3/aec3_common.h" #include "webrtc/modules/audio_processing/include/audio_processing.h" #include "webrtc/modules/audio_processing/logging/apm_data_dumper.h" +#include "webrtc/rtc_base/checks.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/aec3/echo_path_delay_estimator.h b/webrtc/modules/audio_processing/aec3/echo_path_delay_estimator.h index 1129838f70..d392044fb5 100644 --- a/webrtc/modules/audio_processing/aec3/echo_path_delay_estimator.h +++ b/webrtc/modules/audio_processing/aec3/echo_path_delay_estimator.h @@ -13,12 +13,12 @@ #include -#include "webrtc/base/constructormagic.h" -#include "webrtc/base/optional.h" #include "webrtc/modules/audio_processing/aec3/decimator_by_4.h" #include "webrtc/modules/audio_processing/aec3/downsampled_render_buffer.h" #include "webrtc/modules/audio_processing/aec3/matched_filter.h" #include "webrtc/modules/audio_processing/aec3/matched_filter_lag_aggregator.h" +#include "webrtc/rtc_base/constructormagic.h" +#include "webrtc/rtc_base/optional.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/aec3/echo_path_delay_estimator_unittest.cc b/webrtc/modules/audio_processing/aec3/echo_path_delay_estimator_unittest.cc index 7bfadddd4d..aaaf87d7c2 100644 --- a/webrtc/modules/audio_processing/aec3/echo_path_delay_estimator_unittest.cc +++ b/webrtc/modules/audio_processing/aec3/echo_path_delay_estimator_unittest.cc @@ -14,11 +14,11 @@ #include #include -#include "webrtc/base/random.h" #include "webrtc/modules/audio_processing/aec3/aec3_common.h" #include "webrtc/modules/audio_processing/aec3/render_delay_buffer.h" #include "webrtc/modules/audio_processing/logging/apm_data_dumper.h" #include "webrtc/modules/audio_processing/test/echo_canceller_test_tools.h" +#include "webrtc/rtc_base/random.h" #include "webrtc/test/gtest.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/aec3/echo_remover.cc b/webrtc/modules/audio_processing/aec3/echo_remover.cc index 9828192b91..842c3854e5 100644 --- a/webrtc/modules/audio_processing/aec3/echo_remover.cc +++ b/webrtc/modules/audio_processing/aec3/echo_remover.cc @@ -15,9 +15,6 @@ #include #include -#include "webrtc/base/array_view.h" -#include "webrtc/base/atomicops.h" -#include "webrtc/base/constructormagic.h" #include "webrtc/modules/audio_processing/aec3/aec3_common.h" #include "webrtc/modules/audio_processing/aec3/aec_state.h" #include "webrtc/modules/audio_processing/aec3/comfort_noise_generator.h" @@ -32,6 +29,9 @@ #include "webrtc/modules/audio_processing/aec3/suppression_filter.h" #include "webrtc/modules/audio_processing/aec3/suppression_gain.h" #include "webrtc/modules/audio_processing/logging/apm_data_dumper.h" +#include "webrtc/rtc_base/array_view.h" +#include "webrtc/rtc_base/atomicops.h" +#include "webrtc/rtc_base/constructormagic.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/aec3/echo_remover.h b/webrtc/modules/audio_processing/aec3/echo_remover.h index 4704f316bf..ce43fa8a72 100644 --- a/webrtc/modules/audio_processing/aec3/echo_remover.h +++ b/webrtc/modules/audio_processing/aec3/echo_remover.h @@ -13,10 +13,10 @@ #include -#include "webrtc/base/optional.h" #include "webrtc/modules/audio_processing/aec3/echo_path_variability.h" #include "webrtc/modules/audio_processing/aec3/render_buffer.h" #include "webrtc/modules/audio_processing/include/audio_processing.h" +#include "webrtc/rtc_base/optional.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/aec3/echo_remover_metrics.cc b/webrtc/modules/audio_processing/aec3/echo_remover_metrics.cc index bc7e600cfa..d70e4a121f 100644 --- a/webrtc/modules/audio_processing/aec3/echo_remover_metrics.cc +++ b/webrtc/modules/audio_processing/aec3/echo_remover_metrics.cc @@ -14,7 +14,7 @@ #include #include -#include "webrtc/base/safe_minmax.h" +#include "webrtc/rtc_base/safe_minmax.h" #include "webrtc/system_wrappers/include/metrics.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/aec3/echo_remover_metrics.h b/webrtc/modules/audio_processing/aec3/echo_remover_metrics.h index aaca1596d7..57e123ed87 100644 --- a/webrtc/modules/audio_processing/aec3/echo_remover_metrics.h +++ b/webrtc/modules/audio_processing/aec3/echo_remover_metrics.h @@ -11,8 +11,8 @@ #ifndef WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_ECHO_REMOVER_METRICS_H_ #define WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_ECHO_REMOVER_METRICS_H_ -#include "webrtc/base/constructormagic.h" #include "webrtc/modules/audio_processing/aec3/aec_state.h" +#include "webrtc/rtc_base/constructormagic.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/aec3/echo_remover_unittest.cc b/webrtc/modules/audio_processing/aec3/echo_remover_unittest.cc index d5ffb667df..f2f895d549 100644 --- a/webrtc/modules/audio_processing/aec3/echo_remover_unittest.cc +++ b/webrtc/modules/audio_processing/aec3/echo_remover_unittest.cc @@ -16,12 +16,12 @@ #include #include -#include "webrtc/base/random.h" #include "webrtc/modules/audio_processing/aec3/aec3_common.h" #include "webrtc/modules/audio_processing/aec3/render_buffer.h" #include "webrtc/modules/audio_processing/aec3/render_delay_buffer.h" #include "webrtc/modules/audio_processing/logging/apm_data_dumper.h" #include "webrtc/modules/audio_processing/test/echo_canceller_test_tools.h" +#include "webrtc/rtc_base/random.h" #include "webrtc/test/gtest.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/aec3/erl_estimator.h b/webrtc/modules/audio_processing/aec3/erl_estimator.h index 33eba26536..bc81926209 100644 --- a/webrtc/modules/audio_processing/aec3/erl_estimator.h +++ b/webrtc/modules/audio_processing/aec3/erl_estimator.h @@ -13,8 +13,8 @@ #include -#include "webrtc/base/constructormagic.h" #include "webrtc/modules/audio_processing/aec3/aec3_common.h" +#include "webrtc/rtc_base/constructormagic.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/aec3/erle_estimator.cc b/webrtc/modules/audio_processing/aec3/erle_estimator.cc index 7faf22cf60..8cdaee56be 100644 --- a/webrtc/modules/audio_processing/aec3/erle_estimator.cc +++ b/webrtc/modules/audio_processing/aec3/erle_estimator.cc @@ -12,7 +12,7 @@ #include -#include "webrtc/base/safe_minmax.h" +#include "webrtc/rtc_base/safe_minmax.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/aec3/erle_estimator.h b/webrtc/modules/audio_processing/aec3/erle_estimator.h index d504ef2876..48bb75a668 100644 --- a/webrtc/modules/audio_processing/aec3/erle_estimator.h +++ b/webrtc/modules/audio_processing/aec3/erle_estimator.h @@ -13,8 +13,8 @@ #include -#include "webrtc/base/constructormagic.h" #include "webrtc/modules/audio_processing/aec3/aec3_common.h" +#include "webrtc/rtc_base/constructormagic.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/aec3/fft_data.h b/webrtc/modules/audio_processing/aec3/fft_data.h index 5a92d91d62..b5dfe24161 100644 --- a/webrtc/modules/audio_processing/aec3/fft_data.h +++ b/webrtc/modules/audio_processing/aec3/fft_data.h @@ -18,8 +18,8 @@ #include #include -#include "webrtc/base/array_view.h" #include "webrtc/modules/audio_processing/aec3/aec3_common.h" +#include "webrtc/rtc_base/array_view.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/aec3/frame_blocker.cc b/webrtc/modules/audio_processing/aec3/frame_blocker.cc index a4e7893489..a8b04d909d 100644 --- a/webrtc/modules/audio_processing/aec3/frame_blocker.cc +++ b/webrtc/modules/audio_processing/aec3/frame_blocker.cc @@ -12,7 +12,7 @@ #include -#include "webrtc/base/checks.h" +#include "webrtc/rtc_base/checks.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/aec3/frame_blocker.h b/webrtc/modules/audio_processing/aec3/frame_blocker.h index c4217202d5..7b29071ec9 100644 --- a/webrtc/modules/audio_processing/aec3/frame_blocker.h +++ b/webrtc/modules/audio_processing/aec3/frame_blocker.h @@ -14,9 +14,9 @@ #include #include -#include "webrtc/base/array_view.h" -#include "webrtc/base/constructormagic.h" #include "webrtc/modules/audio_processing/aec3/aec3_common.h" +#include "webrtc/rtc_base/array_view.h" +#include "webrtc/rtc_base/constructormagic.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/aec3/main_filter_update_gain.cc b/webrtc/modules/audio_processing/aec3/main_filter_update_gain.cc index 3c4959c11c..75254ba492 100644 --- a/webrtc/modules/audio_processing/aec3/main_filter_update_gain.cc +++ b/webrtc/modules/audio_processing/aec3/main_filter_update_gain.cc @@ -13,10 +13,10 @@ #include #include -#include "webrtc/base/atomicops.h" -#include "webrtc/base/checks.h" #include "webrtc/modules/audio_processing/aec3/aec3_common.h" #include "webrtc/modules/audio_processing/logging/apm_data_dumper.h" +#include "webrtc/rtc_base/atomicops.h" +#include "webrtc/rtc_base/checks.h" namespace webrtc { namespace { diff --git a/webrtc/modules/audio_processing/aec3/main_filter_update_gain.h b/webrtc/modules/audio_processing/aec3/main_filter_update_gain.h index dc6f578f17..5818a106ba 100644 --- a/webrtc/modules/audio_processing/aec3/main_filter_update_gain.h +++ b/webrtc/modules/audio_processing/aec3/main_filter_update_gain.h @@ -14,12 +14,12 @@ #include #include -#include "webrtc/base/constructormagic.h" #include "webrtc/modules/audio_processing/aec3/adaptive_fir_filter.h" #include "webrtc/modules/audio_processing/aec3/aec3_common.h" #include "webrtc/modules/audio_processing/aec3/render_buffer.h" #include "webrtc/modules/audio_processing/aec3/render_signal_analyzer.h" #include "webrtc/modules/audio_processing/aec3/subtractor_output.h" +#include "webrtc/rtc_base/constructormagic.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/aec3/main_filter_update_gain_unittest.cc b/webrtc/modules/audio_processing/aec3/main_filter_update_gain_unittest.cc index 8b958a5051..fc33e12a6c 100644 --- a/webrtc/modules/audio_processing/aec3/main_filter_update_gain_unittest.cc +++ b/webrtc/modules/audio_processing/aec3/main_filter_update_gain_unittest.cc @@ -14,8 +14,6 @@ #include #include -#include "webrtc/base/random.h" -#include "webrtc/base/safe_minmax.h" #include "webrtc/modules/audio_processing/aec3/adaptive_fir_filter.h" #include "webrtc/modules/audio_processing/aec3/aec_state.h" #include "webrtc/modules/audio_processing/aec3/render_buffer.h" @@ -24,6 +22,8 @@ #include "webrtc/modules/audio_processing/aec3/subtractor_output.h" #include "webrtc/modules/audio_processing/logging/apm_data_dumper.h" #include "webrtc/modules/audio_processing/test/echo_canceller_test_tools.h" +#include "webrtc/rtc_base/random.h" +#include "webrtc/rtc_base/safe_minmax.h" #include "webrtc/test/gtest.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/aec3/matched_filter.h b/webrtc/modules/audio_processing/aec3/matched_filter.h index 91df5c9d32..fd20625594 100644 --- a/webrtc/modules/audio_processing/aec3/matched_filter.h +++ b/webrtc/modules/audio_processing/aec3/matched_filter.h @@ -15,10 +15,10 @@ #include #include -#include "webrtc/base/constructormagic.h" -#include "webrtc/base/optional.h" #include "webrtc/modules/audio_processing/aec3/aec3_common.h" #include "webrtc/modules/audio_processing/aec3/downsampled_render_buffer.h" +#include "webrtc/rtc_base/constructormagic.h" +#include "webrtc/rtc_base/optional.h" namespace webrtc { namespace aec3 { diff --git a/webrtc/modules/audio_processing/aec3/matched_filter_lag_aggregator.h b/webrtc/modules/audio_processing/aec3/matched_filter_lag_aggregator.h index 8ce32e2435..983ae3b7f3 100644 --- a/webrtc/modules/audio_processing/aec3/matched_filter_lag_aggregator.h +++ b/webrtc/modules/audio_processing/aec3/matched_filter_lag_aggregator.h @@ -13,9 +13,9 @@ #include -#include "webrtc/base/constructormagic.h" -#include "webrtc/base/optional.h" #include "webrtc/modules/audio_processing/aec3/matched_filter.h" +#include "webrtc/rtc_base/constructormagic.h" +#include "webrtc/rtc_base/optional.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/aec3/matched_filter_lag_aggregator_unittest.cc b/webrtc/modules/audio_processing/aec3/matched_filter_lag_aggregator_unittest.cc index a0b86e55a4..1c2e5ab449 100644 --- a/webrtc/modules/audio_processing/aec3/matched_filter_lag_aggregator_unittest.cc +++ b/webrtc/modules/audio_processing/aec3/matched_filter_lag_aggregator_unittest.cc @@ -14,9 +14,9 @@ #include #include -#include "webrtc/base/array_view.h" #include "webrtc/modules/audio_processing/aec3/aec3_common.h" #include "webrtc/modules/audio_processing/logging/apm_data_dumper.h" +#include "webrtc/rtc_base/array_view.h" #include "webrtc/test/gtest.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/aec3/matched_filter_unittest.cc b/webrtc/modules/audio_processing/aec3/matched_filter_unittest.cc index 02d91bb834..b2978b6bf4 100644 --- a/webrtc/modules/audio_processing/aec3/matched_filter_unittest.cc +++ b/webrtc/modules/audio_processing/aec3/matched_filter_unittest.cc @@ -18,12 +18,12 @@ #include #include -#include "webrtc/base/random.h" #include "webrtc/modules/audio_processing/aec3/aec3_common.h" #include "webrtc/modules/audio_processing/aec3/decimator_by_4.h" #include "webrtc/modules/audio_processing/aec3/render_delay_buffer.h" #include "webrtc/modules/audio_processing/logging/apm_data_dumper.h" #include "webrtc/modules/audio_processing/test/echo_canceller_test_tools.h" +#include "webrtc/rtc_base/random.h" #include "webrtc/system_wrappers/include/cpu_features_wrapper.h" #include "webrtc/test/gtest.h" diff --git a/webrtc/modules/audio_processing/aec3/mock/mock_echo_remover.h b/webrtc/modules/audio_processing/aec3/mock/mock_echo_remover.h index b016a7f5d5..008fca669f 100644 --- a/webrtc/modules/audio_processing/aec3/mock/mock_echo_remover.h +++ b/webrtc/modules/audio_processing/aec3/mock/mock_echo_remover.h @@ -13,10 +13,10 @@ #include -#include "webrtc/base/optional.h" #include "webrtc/modules/audio_processing/aec3/echo_path_variability.h" #include "webrtc/modules/audio_processing/aec3/echo_remover.h" #include "webrtc/modules/audio_processing/aec3/render_buffer.h" +#include "webrtc/rtc_base/optional.h" #include "webrtc/test/gmock.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/aec3/mock/mock_render_delay_controller.h b/webrtc/modules/audio_processing/aec3/mock/mock_render_delay_controller.h index bdc1bc5c54..6a00b5e8d2 100644 --- a/webrtc/modules/audio_processing/aec3/mock/mock_render_delay_controller.h +++ b/webrtc/modules/audio_processing/aec3/mock/mock_render_delay_controller.h @@ -11,10 +11,10 @@ #ifndef WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_MOCK_MOCK_RENDER_DELAY_CONTROLLER_H_ #define WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_MOCK_MOCK_RENDER_DELAY_CONTROLLER_H_ -#include "webrtc/base/array_view.h" -#include "webrtc/base/optional.h" #include "webrtc/modules/audio_processing/aec3/downsampled_render_buffer.h" #include "webrtc/modules/audio_processing/aec3/render_delay_controller.h" +#include "webrtc/rtc_base/array_view.h" +#include "webrtc/rtc_base/optional.h" #include "webrtc/test/gmock.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/aec3/output_selector.cc b/webrtc/modules/audio_processing/aec3/output_selector.cc index 966c35518f..21e24e527b 100644 --- a/webrtc/modules/audio_processing/aec3/output_selector.cc +++ b/webrtc/modules/audio_processing/aec3/output_selector.cc @@ -13,7 +13,7 @@ #include #include -#include "webrtc/base/checks.h" +#include "webrtc/rtc_base/checks.h" namespace webrtc { namespace { diff --git a/webrtc/modules/audio_processing/aec3/output_selector.h b/webrtc/modules/audio_processing/aec3/output_selector.h index 505bb3f19e..8876e23802 100644 --- a/webrtc/modules/audio_processing/aec3/output_selector.h +++ b/webrtc/modules/audio_processing/aec3/output_selector.h @@ -11,8 +11,8 @@ #ifndef WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_OUTPUT_SELECTOR_H_ #define WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_OUTPUT_SELECTOR_H_ -#include "webrtc/base/array_view.h" -#include "webrtc/base/constructormagic.h" +#include "webrtc/rtc_base/array_view.h" +#include "webrtc/rtc_base/constructormagic.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/aec3/render_buffer.cc b/webrtc/modules/audio_processing/aec3/render_buffer.cc index a3700dd150..2bedfcb639 100644 --- a/webrtc/modules/audio_processing/aec3/render_buffer.cc +++ b/webrtc/modules/audio_processing/aec3/render_buffer.cc @@ -12,8 +12,8 @@ #include -#include "webrtc/base/checks.h" #include "webrtc/modules/audio_processing/aec3/aec3_common.h" +#include "webrtc/rtc_base/checks.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/aec3/render_buffer.h b/webrtc/modules/audio_processing/aec3/render_buffer.h index c3acdd916f..ba7aa5394d 100644 --- a/webrtc/modules/audio_processing/aec3/render_buffer.h +++ b/webrtc/modules/audio_processing/aec3/render_buffer.h @@ -14,10 +14,10 @@ #include #include -#include "webrtc/base/array_view.h" -#include "webrtc/base/constructormagic.h" #include "webrtc/modules/audio_processing/aec3/aec3_fft.h" #include "webrtc/modules/audio_processing/aec3/fft_data.h" +#include "webrtc/rtc_base/array_view.h" +#include "webrtc/rtc_base/constructormagic.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/aec3/render_delay_buffer.cc b/webrtc/modules/audio_processing/aec3/render_delay_buffer.cc index 12dae1b8b4..73dadadac6 100644 --- a/webrtc/modules/audio_processing/aec3/render_delay_buffer.cc +++ b/webrtc/modules/audio_processing/aec3/render_delay_buffer.cc @@ -13,13 +13,13 @@ #include #include -#include "webrtc/base/checks.h" -#include "webrtc/base/constructormagic.h" -#include "webrtc/base/logging.h" #include "webrtc/modules/audio_processing/aec3/aec3_common.h" #include "webrtc/modules/audio_processing/aec3/block_processor.h" #include "webrtc/modules/audio_processing/aec3/decimator_by_4.h" #include "webrtc/modules/audio_processing/aec3/fft_data.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/constructormagic.h" +#include "webrtc/rtc_base/logging.h" namespace webrtc { namespace { diff --git a/webrtc/modules/audio_processing/aec3/render_delay_buffer.h b/webrtc/modules/audio_processing/aec3/render_delay_buffer.h index 786113802e..17a75da8d0 100644 --- a/webrtc/modules/audio_processing/aec3/render_delay_buffer.h +++ b/webrtc/modules/audio_processing/aec3/render_delay_buffer.h @@ -15,11 +15,11 @@ #include #include -#include "webrtc/base/array_view.h" #include "webrtc/modules/audio_processing/aec3/aec3_common.h" #include "webrtc/modules/audio_processing/aec3/downsampled_render_buffer.h" #include "webrtc/modules/audio_processing/aec3/fft_data.h" #include "webrtc/modules/audio_processing/aec3/render_buffer.h" +#include "webrtc/rtc_base/array_view.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/aec3/render_delay_buffer_unittest.cc b/webrtc/modules/audio_processing/aec3/render_delay_buffer_unittest.cc index 8ed49eb0a5..4a16fee3b2 100644 --- a/webrtc/modules/audio_processing/aec3/render_delay_buffer_unittest.cc +++ b/webrtc/modules/audio_processing/aec3/render_delay_buffer_unittest.cc @@ -15,10 +15,10 @@ #include #include -#include "webrtc/base/array_view.h" -#include "webrtc/base/random.h" #include "webrtc/modules/audio_processing/aec3/aec3_common.h" #include "webrtc/modules/audio_processing/logging/apm_data_dumper.h" +#include "webrtc/rtc_base/array_view.h" +#include "webrtc/rtc_base/random.h" #include "webrtc/test/gtest.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/aec3/render_delay_controller.cc b/webrtc/modules/audio_processing/aec3/render_delay_controller.cc index 0a64ac203f..06074e2cdb 100644 --- a/webrtc/modules/audio_processing/aec3/render_delay_controller.cc +++ b/webrtc/modules/audio_processing/aec3/render_delay_controller.cc @@ -14,11 +14,11 @@ #include #include -#include "webrtc/base/atomicops.h" -#include "webrtc/base/constructormagic.h" #include "webrtc/modules/audio_processing/aec3/aec3_common.h" #include "webrtc/modules/audio_processing/aec3/echo_path_delay_estimator.h" #include "webrtc/modules/audio_processing/aec3/render_delay_controller_metrics.h" +#include "webrtc/rtc_base/atomicops.h" +#include "webrtc/rtc_base/constructormagic.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/aec3/render_delay_controller.h b/webrtc/modules/audio_processing/aec3/render_delay_controller.h index 469d571ddb..e3a8ee3550 100644 --- a/webrtc/modules/audio_processing/aec3/render_delay_controller.h +++ b/webrtc/modules/audio_processing/aec3/render_delay_controller.h @@ -11,11 +11,11 @@ #ifndef WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_RENDER_DELAY_CONTROLLER_H_ #define WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_RENDER_DELAY_CONTROLLER_H_ -#include "webrtc/base/array_view.h" -#include "webrtc/base/optional.h" #include "webrtc/modules/audio_processing/aec3/downsampled_render_buffer.h" #include "webrtc/modules/audio_processing/aec3/render_delay_buffer.h" #include "webrtc/modules/audio_processing/logging/apm_data_dumper.h" +#include "webrtc/rtc_base/array_view.h" +#include "webrtc/rtc_base/optional.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/aec3/render_delay_controller_metrics.h b/webrtc/modules/audio_processing/aec3/render_delay_controller_metrics.h index 9b9ea86437..0cef897c34 100644 --- a/webrtc/modules/audio_processing/aec3/render_delay_controller_metrics.h +++ b/webrtc/modules/audio_processing/aec3/render_delay_controller_metrics.h @@ -11,8 +11,8 @@ #ifndef WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_RENDER_DELAY_CONTROLLER_METRICS_H_ #define WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_RENDER_DELAY_CONTROLLER_METRICS_H_ -#include "webrtc/base/constructormagic.h" -#include "webrtc/base/optional.h" +#include "webrtc/rtc_base/constructormagic.h" +#include "webrtc/rtc_base/optional.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/aec3/render_delay_controller_metrics_unittest.cc b/webrtc/modules/audio_processing/aec3/render_delay_controller_metrics_unittest.cc index 2551e8a704..5f24fe3d7f 100644 --- a/webrtc/modules/audio_processing/aec3/render_delay_controller_metrics_unittest.cc +++ b/webrtc/modules/audio_processing/aec3/render_delay_controller_metrics_unittest.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/base/optional.h" -#include "webrtc/modules/audio_processing/aec3/aec3_common.h" #include "webrtc/modules/audio_processing/aec3/render_delay_controller_metrics.h" +#include "webrtc/modules/audio_processing/aec3/aec3_common.h" +#include "webrtc/rtc_base/optional.h" #include "webrtc/test/gtest.h" diff --git a/webrtc/modules/audio_processing/aec3/render_delay_controller_unittest.cc b/webrtc/modules/audio_processing/aec3/render_delay_controller_unittest.cc index 164d237b27..af0778bc22 100644 --- a/webrtc/modules/audio_processing/aec3/render_delay_controller_unittest.cc +++ b/webrtc/modules/audio_processing/aec3/render_delay_controller_unittest.cc @@ -16,13 +16,13 @@ #include #include -#include "webrtc/base/random.h" #include "webrtc/modules/audio_processing/aec3/aec3_common.h" #include "webrtc/modules/audio_processing/aec3/block_processor.h" #include "webrtc/modules/audio_processing/aec3/decimator_by_4.h" #include "webrtc/modules/audio_processing/aec3/render_delay_buffer.h" #include "webrtc/modules/audio_processing/logging/apm_data_dumper.h" #include "webrtc/modules/audio_processing/test/echo_canceller_test_tools.h" +#include "webrtc/rtc_base/random.h" #include "webrtc/test/gtest.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/aec3/render_signal_analyzer.cc b/webrtc/modules/audio_processing/aec3/render_signal_analyzer.cc index 695ec8407c..fd154e80dd 100644 --- a/webrtc/modules/audio_processing/aec3/render_signal_analyzer.cc +++ b/webrtc/modules/audio_processing/aec3/render_signal_analyzer.cc @@ -12,7 +12,7 @@ #include -#include "webrtc/base/checks.h" +#include "webrtc/rtc_base/checks.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/aec3/render_signal_analyzer.h b/webrtc/modules/audio_processing/aec3/render_signal_analyzer.h index a791f4dee4..9cabea2e66 100644 --- a/webrtc/modules/audio_processing/aec3/render_signal_analyzer.h +++ b/webrtc/modules/audio_processing/aec3/render_signal_analyzer.h @@ -14,10 +14,10 @@ #include #include -#include "webrtc/base/constructormagic.h" -#include "webrtc/base/optional.h" #include "webrtc/modules/audio_processing/aec3/aec3_common.h" #include "webrtc/modules/audio_processing/aec3/render_buffer.h" +#include "webrtc/rtc_base/constructormagic.h" +#include "webrtc/rtc_base/optional.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/aec3/render_signal_analyzer_unittest.cc b/webrtc/modules/audio_processing/aec3/render_signal_analyzer_unittest.cc index 9b25f181c1..d6701e2dfa 100644 --- a/webrtc/modules/audio_processing/aec3/render_signal_analyzer_unittest.cc +++ b/webrtc/modules/audio_processing/aec3/render_signal_analyzer_unittest.cc @@ -14,13 +14,13 @@ #include #include -#include "webrtc/base/array_view.h" -#include "webrtc/base/random.h" #include "webrtc/modules/audio_processing/aec3/aec3_common.h" #include "webrtc/modules/audio_processing/aec3/aec3_fft.h" #include "webrtc/modules/audio_processing/aec3/fft_data.h" #include "webrtc/modules/audio_processing/aec3/render_buffer.h" #include "webrtc/modules/audio_processing/test/echo_canceller_test_tools.h" +#include "webrtc/rtc_base/array_view.h" +#include "webrtc/rtc_base/random.h" #include "webrtc/test/gtest.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/aec3/residual_echo_estimator.cc b/webrtc/modules/audio_processing/aec3/residual_echo_estimator.cc index d36720f651..6ec00e40fa 100644 --- a/webrtc/modules/audio_processing/aec3/residual_echo_estimator.cc +++ b/webrtc/modules/audio_processing/aec3/residual_echo_estimator.cc @@ -13,7 +13,7 @@ #include #include -#include "webrtc/base/checks.h" +#include "webrtc/rtc_base/checks.h" namespace webrtc { namespace { diff --git a/webrtc/modules/audio_processing/aec3/residual_echo_estimator.h b/webrtc/modules/audio_processing/aec3/residual_echo_estimator.h index c8e6a28ea7..ea287c0f87 100644 --- a/webrtc/modules/audio_processing/aec3/residual_echo_estimator.h +++ b/webrtc/modules/audio_processing/aec3/residual_echo_estimator.h @@ -15,11 +15,11 @@ #include #include -#include "webrtc/base/array_view.h" -#include "webrtc/base/constructormagic.h" #include "webrtc/modules/audio_processing/aec3/aec3_common.h" #include "webrtc/modules/audio_processing/aec3/aec_state.h" #include "webrtc/modules/audio_processing/aec3/render_buffer.h" +#include "webrtc/rtc_base/array_view.h" +#include "webrtc/rtc_base/constructormagic.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/aec3/residual_echo_estimator_unittest.cc b/webrtc/modules/audio_processing/aec3/residual_echo_estimator_unittest.cc index 6d34128829..b28cf51797 100644 --- a/webrtc/modules/audio_processing/aec3/residual_echo_estimator_unittest.cc +++ b/webrtc/modules/audio_processing/aec3/residual_echo_estimator_unittest.cc @@ -10,10 +10,10 @@ #include "webrtc/modules/audio_processing/aec3/residual_echo_estimator.h" -#include "webrtc/base/random.h" -#include "webrtc/modules/audio_processing/aec3/aec_state.h" #include "webrtc/modules/audio_processing/aec3/aec3_fft.h" +#include "webrtc/modules/audio_processing/aec3/aec_state.h" #include "webrtc/modules/audio_processing/test/echo_canceller_test_tools.h" +#include "webrtc/rtc_base/random.h" #include "webrtc/test/gtest.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/aec3/shadow_filter_update_gain.cc b/webrtc/modules/audio_processing/aec3/shadow_filter_update_gain.cc index 61a1f575b1..6287110e09 100644 --- a/webrtc/modules/audio_processing/aec3/shadow_filter_update_gain.cc +++ b/webrtc/modules/audio_processing/aec3/shadow_filter_update_gain.cc @@ -13,7 +13,7 @@ #include #include -#include "webrtc/base/checks.h" +#include "webrtc/rtc_base/checks.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/aec3/shadow_filter_update_gain.h b/webrtc/modules/audio_processing/aec3/shadow_filter_update_gain.h index 72218b6608..be1102d12e 100644 --- a/webrtc/modules/audio_processing/aec3/shadow_filter_update_gain.h +++ b/webrtc/modules/audio_processing/aec3/shadow_filter_update_gain.h @@ -11,10 +11,10 @@ #ifndef WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_SHADOW_FILTER_UPDATE_GAIN_H_ #define WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_SHADOW_FILTER_UPDATE_GAIN_H_ -#include "webrtc/base/constructormagic.h" #include "webrtc/modules/audio_processing/aec3/aec3_common.h" #include "webrtc/modules/audio_processing/aec3/render_buffer.h" #include "webrtc/modules/audio_processing/aec3/render_signal_analyzer.h" +#include "webrtc/rtc_base/constructormagic.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/aec3/shadow_filter_update_gain_unittest.cc b/webrtc/modules/audio_processing/aec3/shadow_filter_update_gain_unittest.cc index 47838555c8..1ceb634278 100644 --- a/webrtc/modules/audio_processing/aec3/shadow_filter_update_gain_unittest.cc +++ b/webrtc/modules/audio_processing/aec3/shadow_filter_update_gain_unittest.cc @@ -15,12 +15,12 @@ #include #include -#include "webrtc/base/random.h" -#include "webrtc/base/safe_minmax.h" #include "webrtc/modules/audio_processing/aec3/adaptive_fir_filter.h" #include "webrtc/modules/audio_processing/aec3/aec3_common.h" #include "webrtc/modules/audio_processing/aec3/aec_state.h" #include "webrtc/modules/audio_processing/test/echo_canceller_test_tools.h" +#include "webrtc/rtc_base/random.h" +#include "webrtc/rtc_base/safe_minmax.h" #include "webrtc/test/gtest.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/aec3/subtractor.cc b/webrtc/modules/audio_processing/aec3/subtractor.cc index dc3ec0688e..a7bf84d16b 100644 --- a/webrtc/modules/audio_processing/aec3/subtractor.cc +++ b/webrtc/modules/audio_processing/aec3/subtractor.cc @@ -12,10 +12,10 @@ #include -#include "webrtc/base/array_view.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/safe_minmax.h" #include "webrtc/modules/audio_processing/logging/apm_data_dumper.h" +#include "webrtc/rtc_base/array_view.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/safe_minmax.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/aec3/subtractor.h b/webrtc/modules/audio_processing/aec3/subtractor.h index a127141be3..c194b2ca1f 100644 --- a/webrtc/modules/audio_processing/aec3/subtractor.h +++ b/webrtc/modules/audio_processing/aec3/subtractor.h @@ -15,7 +15,6 @@ #include #include -#include "webrtc/base/constructormagic.h" #include "webrtc/modules/audio_processing/aec3/adaptive_fir_filter.h" #include "webrtc/modules/audio_processing/aec3/aec3_common.h" #include "webrtc/modules/audio_processing/aec3/aec3_fft.h" @@ -27,6 +26,7 @@ #include "webrtc/modules/audio_processing/aec3/subtractor_output.h" #include "webrtc/modules/audio_processing/logging/apm_data_dumper.h" #include "webrtc/modules/audio_processing/utility/ooura_fft.h" +#include "webrtc/rtc_base/constructormagic.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/aec3/subtractor_unittest.cc b/webrtc/modules/audio_processing/aec3/subtractor_unittest.cc index 0c4392332f..a5e2a4e624 100644 --- a/webrtc/modules/audio_processing/aec3/subtractor_unittest.cc +++ b/webrtc/modules/audio_processing/aec3/subtractor_unittest.cc @@ -14,9 +14,9 @@ #include #include -#include "webrtc/base/random.h" #include "webrtc/modules/audio_processing/aec3/aec_state.h" #include "webrtc/modules/audio_processing/test/echo_canceller_test_tools.h" +#include "webrtc/rtc_base/random.h" #include "webrtc/test/gtest.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/aec3/suppression_filter.cc b/webrtc/modules/audio_processing/aec3/suppression_filter.cc index 1121c74efe..5ad491151d 100644 --- a/webrtc/modules/audio_processing/aec3/suppression_filter.cc +++ b/webrtc/modules/audio_processing/aec3/suppression_filter.cc @@ -16,8 +16,8 @@ #include #include -#include "webrtc/base/safe_minmax.h" #include "webrtc/modules/audio_processing/utility/ooura_fft.h" +#include "webrtc/rtc_base/safe_minmax.h" namespace webrtc { namespace { diff --git a/webrtc/modules/audio_processing/aec3/suppression_filter.h b/webrtc/modules/audio_processing/aec3/suppression_filter.h index 4aec2fc861..44ce6beeab 100644 --- a/webrtc/modules/audio_processing/aec3/suppression_filter.h +++ b/webrtc/modules/audio_processing/aec3/suppression_filter.h @@ -14,9 +14,9 @@ #include #include -#include "webrtc/base/constructormagic.h" #include "webrtc/modules/audio_processing/aec3/aec3_common.h" #include "webrtc/modules/audio_processing/aec3/aec3_fft.h" +#include "webrtc/rtc_base/constructormagic.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/aec3/suppression_gain.cc b/webrtc/modules/audio_processing/aec3/suppression_gain.cc index af1e718607..c8465eaff6 100644 --- a/webrtc/modules/audio_processing/aec3/suppression_gain.cc +++ b/webrtc/modules/audio_processing/aec3/suppression_gain.cc @@ -19,8 +19,8 @@ #include #include -#include "webrtc/base/checks.h" #include "webrtc/modules/audio_processing/aec3/vector_math.h" +#include "webrtc/rtc_base/checks.h" namespace webrtc { namespace { diff --git a/webrtc/modules/audio_processing/aec3/suppression_gain.h b/webrtc/modules/audio_processing/aec3/suppression_gain.h index c34b804d21..c774c41252 100644 --- a/webrtc/modules/audio_processing/aec3/suppression_gain.h +++ b/webrtc/modules/audio_processing/aec3/suppression_gain.h @@ -14,8 +14,8 @@ #include #include -#include "webrtc/base/constructormagic.h" #include "webrtc/modules/audio_processing/aec3/aec3_common.h" +#include "webrtc/rtc_base/constructormagic.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/aec3/suppression_gain_unittest.cc b/webrtc/modules/audio_processing/aec3/suppression_gain_unittest.cc index 9a6521c67b..b6d6aaeb2e 100644 --- a/webrtc/modules/audio_processing/aec3/suppression_gain_unittest.cc +++ b/webrtc/modules/audio_processing/aec3/suppression_gain_unittest.cc @@ -10,7 +10,7 @@ #include "webrtc/modules/audio_processing/aec3/suppression_gain.h" -#include "webrtc/base/checks.h" +#include "webrtc/rtc_base/checks.h" #include "webrtc/system_wrappers/include/cpu_features_wrapper.h" #include "webrtc/test/gtest.h" #include "webrtc/typedefs.h" diff --git a/webrtc/modules/audio_processing/aec3/vector_math.h b/webrtc/modules/audio_processing/aec3/vector_math.h index b943f2bedd..008aa86f96 100644 --- a/webrtc/modules/audio_processing/aec3/vector_math.h +++ b/webrtc/modules/audio_processing/aec3/vector_math.h @@ -23,9 +23,9 @@ #include #include -#include "webrtc/base/array_view.h" -#include "webrtc/base/checks.h" #include "webrtc/modules/audio_processing/aec3/aec3_common.h" +#include "webrtc/rtc_base/array_view.h" +#include "webrtc/rtc_base/checks.h" namespace webrtc { namespace aec3 { diff --git a/webrtc/modules/audio_processing/aec_dump/aec_dump_factory.h b/webrtc/modules/audio_processing/aec_dump/aec_dump_factory.h index 98596a4568..f868572c02 100644 --- a/webrtc/modules/audio_processing/aec_dump/aec_dump_factory.h +++ b/webrtc/modules/audio_processing/aec_dump/aec_dump_factory.h @@ -14,8 +14,8 @@ #include #include -#include "webrtc/base/platform_file.h" #include "webrtc/modules/audio_processing/include/aec_dump.h" +#include "webrtc/rtc_base/platform_file.h" namespace rtc { class TaskQueue; diff --git a/webrtc/modules/audio_processing/aec_dump/aec_dump_impl.cc b/webrtc/modules/audio_processing/aec_dump/aec_dump_impl.cc index 9f68b548f9..497a12e974 100644 --- a/webrtc/modules/audio_processing/aec_dump/aec_dump_impl.cc +++ b/webrtc/modules/audio_processing/aec_dump/aec_dump_impl.cc @@ -12,10 +12,10 @@ #include "webrtc/modules/audio_processing/aec_dump/aec_dump_impl.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/event.h" -#include "webrtc/base/ptr_util.h" #include "webrtc/modules/audio_processing/aec_dump/aec_dump_factory.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/event.h" +#include "webrtc/rtc_base/ptr_util.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/aec_dump/aec_dump_impl.h b/webrtc/modules/audio_processing/aec_dump/aec_dump_impl.h index d9da14b979..2109cf5855 100644 --- a/webrtc/modules/audio_processing/aec_dump/aec_dump_impl.h +++ b/webrtc/modules/audio_processing/aec_dump/aec_dump_impl.h @@ -15,15 +15,15 @@ #include #include -#include "webrtc/base/ignore_wundef.h" -#include "webrtc/base/platform_file.h" -#include "webrtc/base/race_checker.h" -#include "webrtc/base/task_queue.h" -#include "webrtc/base/thread_annotations.h" #include "webrtc/modules/audio_processing/aec_dump/capture_stream_info.h" #include "webrtc/modules/audio_processing/aec_dump/write_to_file_task.h" #include "webrtc/modules/audio_processing/include/aec_dump.h" #include "webrtc/modules/include/module_common_types.h" +#include "webrtc/rtc_base/ignore_wundef.h" +#include "webrtc/rtc_base/platform_file.h" +#include "webrtc/rtc_base/race_checker.h" +#include "webrtc/rtc_base/task_queue.h" +#include "webrtc/rtc_base/thread_annotations.h" #include "webrtc/system_wrappers/include/file_wrapper.h" // Files generated at build-time by the protobuf compiler. diff --git a/webrtc/modules/audio_processing/aec_dump/aec_dump_integration_test.cc b/webrtc/modules/audio_processing/aec_dump/aec_dump_integration_test.cc index b1c30ef006..c77cf91923 100644 --- a/webrtc/modules/audio_processing/aec_dump/aec_dump_integration_test.cc +++ b/webrtc/modules/audio_processing/aec_dump/aec_dump_integration_test.cc @@ -10,9 +10,9 @@ #include -#include "webrtc/base/ptr_util.h" #include "webrtc/modules/audio_processing/aec_dump/mock_aec_dump.h" #include "webrtc/modules/audio_processing/include/audio_processing.h" +#include "webrtc/rtc_base/ptr_util.h" using testing::_; using testing::AtLeast; diff --git a/webrtc/modules/audio_processing/aec_dump/aec_dump_unittest.cc b/webrtc/modules/audio_processing/aec_dump/aec_dump_unittest.cc index 3061c23246..d6f361789f 100644 --- a/webrtc/modules/audio_processing/aec_dump/aec_dump_unittest.cc +++ b/webrtc/modules/audio_processing/aec_dump/aec_dump_unittest.cc @@ -12,8 +12,8 @@ #include "webrtc/modules/audio_processing/aec_dump/aec_dump_factory.h" -#include "webrtc/base/task_queue.h" #include "webrtc/modules/include/module_common_types.h" +#include "webrtc/rtc_base/task_queue.h" #include "webrtc/test/gtest.h" #include "webrtc/test/testsupport/fileutils.h" diff --git a/webrtc/modules/audio_processing/aec_dump/capture_stream_info.h b/webrtc/modules/audio_processing/aec_dump/capture_stream_info.h index 36b860cea4..cd870206bd 100644 --- a/webrtc/modules/audio_processing/aec_dump/capture_stream_info.h +++ b/webrtc/modules/audio_processing/aec_dump/capture_stream_info.h @@ -15,12 +15,12 @@ #include #include -#include "webrtc/base/checks.h" -#include "webrtc/base/ignore_wundef.h" -#include "webrtc/base/logging.h" #include "webrtc/modules/audio_processing/aec_dump/write_to_file_task.h" #include "webrtc/modules/audio_processing/include/aec_dump.h" #include "webrtc/modules/include/module_common_types.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/ignore_wundef.h" +#include "webrtc/rtc_base/logging.h" // Files generated at build-time by the protobuf compiler. RTC_PUSH_IGNORING_WUNDEF() diff --git a/webrtc/modules/audio_processing/aec_dump/write_to_file_task.cc b/webrtc/modules/audio_processing/aec_dump/write_to_file_task.cc index f9aa567a84..f94f57bf5f 100644 --- a/webrtc/modules/audio_processing/aec_dump/write_to_file_task.cc +++ b/webrtc/modules/audio_processing/aec_dump/write_to_file_task.cc @@ -10,7 +10,7 @@ #include "webrtc/modules/audio_processing/aec_dump/write_to_file_task.h" -#include "webrtc/base/protobuf_utils.h" +#include "webrtc/rtc_base/protobuf_utils.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/aec_dump/write_to_file_task.h b/webrtc/modules/audio_processing/aec_dump/write_to_file_task.h index 717f645c23..5f20ed8243 100644 --- a/webrtc/modules/audio_processing/aec_dump/write_to_file_task.h +++ b/webrtc/modules/audio_processing/aec_dump/write_to_file_task.h @@ -15,11 +15,11 @@ #include #include -#include "webrtc/base/checks.h" -#include "webrtc/base/event.h" -#include "webrtc/base/ignore_wundef.h" -#include "webrtc/base/platform_file.h" -#include "webrtc/base/task_queue.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/event.h" +#include "webrtc/rtc_base/ignore_wundef.h" +#include "webrtc/rtc_base/platform_file.h" +#include "webrtc/rtc_base/task_queue.h" #include "webrtc/system_wrappers/include/file_wrapper.h" // Files generated at build-time by the protobuf compiler. diff --git a/webrtc/modules/audio_processing/aecm/aecm_core.cc b/webrtc/modules/audio_processing/aecm/aecm_core.cc index 97f91a2254..0e0b6ffbfd 100644 --- a/webrtc/modules/audio_processing/aecm/aecm_core.cc +++ b/webrtc/modules/audio_processing/aecm/aecm_core.cc @@ -23,7 +23,7 @@ extern "C" { #include "webrtc/system_wrappers/include/cpu_features_wrapper.h" } -#include "webrtc/base/checks.h" +#include "webrtc/rtc_base/checks.h" #include "webrtc/typedefs.h" #ifdef AEC_DEBUG diff --git a/webrtc/modules/audio_processing/aecm/aecm_core_c.cc b/webrtc/modules/audio_processing/aecm/aecm_core_c.cc index d868d6a2a5..32f26569f8 100644 --- a/webrtc/modules/audio_processing/aecm/aecm_core_c.cc +++ b/webrtc/modules/audio_processing/aecm/aecm_core_c.cc @@ -23,7 +23,7 @@ extern "C" { #include "webrtc/system_wrappers/include/cpu_features_wrapper.h" } -#include "webrtc/base/checks.h" +#include "webrtc/rtc_base/checks.h" #include "webrtc/typedefs.h" // Square root of Hanning window in Q14. diff --git a/webrtc/modules/audio_processing/aecm/aecm_core_mips.cc b/webrtc/modules/audio_processing/aecm/aecm_core_mips.cc index 7d898f8cf4..fcd659fee2 100644 --- a/webrtc/modules/audio_processing/aecm/aecm_core_mips.cc +++ b/webrtc/modules/audio_processing/aecm/aecm_core_mips.cc @@ -10,9 +10,9 @@ #include "webrtc/modules/audio_processing/aecm/aecm_core.h" -#include "webrtc/base/checks.h" #include "webrtc/modules/audio_processing/aecm/echo_control_mobile.h" #include "webrtc/modules/audio_processing/utility/delay_estimator_wrapper.h" +#include "webrtc/rtc_base/checks.h" static const ALIGN8_BEG int16_t WebRtcAecm_kSqrtHanning[] ALIGN8_END = { 0, 399, 798, 1196, 1594, 1990, 2386, 2780, 3172, diff --git a/webrtc/modules/audio_processing/aecm/aecm_core_neon.cc b/webrtc/modules/audio_processing/aecm/aecm_core_neon.cc index a34bcabfa2..ccf1985d64 100644 --- a/webrtc/modules/audio_processing/aecm/aecm_core_neon.cc +++ b/webrtc/modules/audio_processing/aecm/aecm_core_neon.cc @@ -12,8 +12,8 @@ #include -#include "webrtc/base/checks.h" #include "webrtc/common_audio/signal_processing/include/real_fft.h" +#include "webrtc/rtc_base/checks.h" // TODO(kma): Re-write the corresponding assembly file, the offset // generating script and makefile, to replace these C functions. diff --git a/webrtc/modules/audio_processing/agc/agc.cc b/webrtc/modules/audio_processing/agc/agc.cc index 3eca1483d5..1370d38cc3 100644 --- a/webrtc/modules/audio_processing/agc/agc.cc +++ b/webrtc/modules/audio_processing/agc/agc.cc @@ -16,10 +16,10 @@ #include #include -#include "webrtc/base/checks.h" #include "webrtc/modules/audio_processing/agc/loudness_histogram.h" #include "webrtc/modules/audio_processing/agc/utility.h" #include "webrtc/modules/include/module_common_types.h" +#include "webrtc/rtc_base/checks.h" namespace webrtc { namespace { diff --git a/webrtc/modules/audio_processing/agc/agc_manager_direct.cc b/webrtc/modules/audio_processing/agc/agc_manager_direct.cc index 6a19945f33..0bf5ec8ffc 100644 --- a/webrtc/modules/audio_processing/agc/agc_manager_direct.cc +++ b/webrtc/modules/audio_processing/agc/agc_manager_direct.cc @@ -16,12 +16,12 @@ #include #endif -#include "webrtc/base/checks.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/safe_minmax.h" #include "webrtc/modules/audio_processing/agc/gain_map_internal.h" #include "webrtc/modules/audio_processing/gain_control_impl.h" #include "webrtc/modules/include/module_common_types.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/safe_minmax.h" #include "webrtc/system_wrappers/include/metrics.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/agc/agc_manager_direct.h b/webrtc/modules/audio_processing/agc/agc_manager_direct.h index 578a0f38f7..7a2e3ef77e 100644 --- a/webrtc/modules/audio_processing/agc/agc_manager_direct.h +++ b/webrtc/modules/audio_processing/agc/agc_manager_direct.h @@ -13,8 +13,8 @@ #include -#include "webrtc/base/constructormagic.h" #include "webrtc/modules/audio_processing/agc/agc.h" +#include "webrtc/rtc_base/constructormagic.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/agc/loudness_histogram.cc b/webrtc/modules/audio_processing/agc/loudness_histogram.cc index 9112fbbe80..cc21f2ae3d 100644 --- a/webrtc/modules/audio_processing/agc/loudness_histogram.cc +++ b/webrtc/modules/audio_processing/agc/loudness_histogram.cc @@ -13,8 +13,8 @@ #include #include -#include "webrtc/base/checks.h" #include "webrtc/modules/include/module_common_types.h" +#include "webrtc/rtc_base/checks.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/agc2/digital_gain_applier.h b/webrtc/modules/audio_processing/agc2/digital_gain_applier.h index fb7ecbbb88..d9ad1d935a 100644 --- a/webrtc/modules/audio_processing/agc2/digital_gain_applier.h +++ b/webrtc/modules/audio_processing/agc2/digital_gain_applier.h @@ -11,8 +11,8 @@ #ifndef WEBRTC_MODULES_AUDIO_PROCESSING_AGC2_DIGITAL_GAIN_APPLIER_H_ #define WEBRTC_MODULES_AUDIO_PROCESSING_AGC2_DIGITAL_GAIN_APPLIER_H_ -#include "webrtc/base/array_view.h" #include "webrtc/modules/audio_processing/audio_buffer.h" +#include "webrtc/rtc_base/array_view.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/agc2/gain_controller2.cc b/webrtc/modules/audio_processing/agc2/gain_controller2.cc index d0b1b39b7f..20680f64a8 100644 --- a/webrtc/modules/audio_processing/agc2/gain_controller2.cc +++ b/webrtc/modules/audio_processing/agc2/gain_controller2.cc @@ -10,10 +10,10 @@ #include "webrtc/modules/audio_processing/agc2/gain_controller2.h" -#include "webrtc/base/atomicops.h" -#include "webrtc/base/checks.h" #include "webrtc/modules/audio_processing/audio_buffer.h" #include "webrtc/modules/audio_processing/logging/apm_data_dumper.h" +#include "webrtc/rtc_base/atomicops.h" +#include "webrtc/rtc_base/checks.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/agc2/gain_controller2.h b/webrtc/modules/audio_processing/agc2/gain_controller2.h index a385044d08..1a8bb7f39c 100644 --- a/webrtc/modules/audio_processing/agc2/gain_controller2.h +++ b/webrtc/modules/audio_processing/agc2/gain_controller2.h @@ -14,9 +14,9 @@ #include #include -#include "webrtc/base/constructormagic.h" -#include "webrtc/modules/audio_processing/include/audio_processing.h" #include "webrtc/modules/audio_processing/agc2/digital_gain_applier.h" +#include "webrtc/modules/audio_processing/include/audio_processing.h" +#include "webrtc/rtc_base/constructormagic.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/agc2/gain_controller2_unittest.cc b/webrtc/modules/audio_processing/agc2/gain_controller2_unittest.cc index ea945983cd..faa8d169e6 100644 --- a/webrtc/modules/audio_processing/agc2/gain_controller2_unittest.cc +++ b/webrtc/modules/audio_processing/agc2/gain_controller2_unittest.cc @@ -11,10 +11,10 @@ #include #include -#include "webrtc/base/array_view.h" -#include "webrtc/modules/audio_processing/audio_buffer.h" -#include "webrtc/modules/audio_processing/agc2/gain_controller2.h" #include "webrtc/modules/audio_processing/agc2/digital_gain_applier.h" +#include "webrtc/modules/audio_processing/agc2/gain_controller2.h" +#include "webrtc/modules/audio_processing/audio_buffer.h" +#include "webrtc/rtc_base/array_view.h" #include "webrtc/test/gtest.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/audio_buffer.cc b/webrtc/modules/audio_processing/audio_buffer.cc index 5f90e0f547..6c8ddd6255 100644 --- a/webrtc/modules/audio_processing/audio_buffer.cc +++ b/webrtc/modules/audio_processing/audio_buffer.cc @@ -10,12 +10,12 @@ #include "webrtc/modules/audio_processing/audio_buffer.h" -#include "webrtc/base/checks.h" +#include "webrtc/common_audio/channel_buffer.h" #include "webrtc/common_audio/include/audio_util.h" #include "webrtc/common_audio/resampler/push_sinc_resampler.h" #include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" -#include "webrtc/common_audio/channel_buffer.h" #include "webrtc/modules/audio_processing/common.h" +#include "webrtc/rtc_base/checks.h" namespace webrtc { namespace { diff --git a/webrtc/modules/audio_processing/audio_processing_impl.cc b/webrtc/modules/audio_processing/audio_processing_impl.cc index 292611e099..f9659b82c4 100644 --- a/webrtc/modules/audio_processing/audio_processing_impl.cc +++ b/webrtc/modules/audio_processing/audio_processing_impl.cc @@ -14,18 +14,14 @@ #include #include -#include "webrtc/base/checks.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/platform_file.h" -#include "webrtc/base/trace_event.h" #include "webrtc/common_audio/audio_converter.h" #include "webrtc/common_audio/channel_buffer.h" #include "webrtc/common_audio/include/audio_util.h" #include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" #include "webrtc/modules/audio_processing/aec/aec_core.h" #include "webrtc/modules/audio_processing/aec3/echo_canceller3.h" -#include "webrtc/modules/audio_processing/agc2/gain_controller2.h" #include "webrtc/modules/audio_processing/agc/agc_manager_direct.h" +#include "webrtc/modules/audio_processing/agc2/gain_controller2.h" #include "webrtc/modules/audio_processing/audio_buffer.h" #include "webrtc/modules/audio_processing/beamformer/nonlinear_beamformer.h" #include "webrtc/modules/audio_processing/common.h" @@ -33,6 +29,10 @@ #include "webrtc/modules/audio_processing/echo_control_mobile_impl.h" #include "webrtc/modules/audio_processing/gain_control_for_experimental_agc.h" #include "webrtc/modules/audio_processing/gain_control_impl.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/platform_file.h" +#include "webrtc/rtc_base/trace_event.h" #if WEBRTC_INTELLIGIBILITY_ENHANCER #include "webrtc/modules/audio_processing/intelligibility/intelligibility_enhancer.h" #endif diff --git a/webrtc/modules/audio_processing/audio_processing_impl.h b/webrtc/modules/audio_processing/audio_processing_impl.h index 4f70bd66b2..4f7b2bb113 100644 --- a/webrtc/modules/audio_processing/audio_processing_impl.h +++ b/webrtc/modules/audio_processing/audio_processing_impl.h @@ -15,18 +15,18 @@ #include #include -#include "webrtc/base/criticalsection.h" -#include "webrtc/base/function_view.h" -#include "webrtc/base/gtest_prod_util.h" -#include "webrtc/base/ignore_wundef.h" -#include "webrtc/base/protobuf_utils.h" -#include "webrtc/base/swap_queue.h" -#include "webrtc/base/thread_annotations.h" #include "webrtc/modules/audio_processing/audio_buffer.h" #include "webrtc/modules/audio_processing/include/aec_dump.h" #include "webrtc/modules/audio_processing/include/audio_processing.h" #include "webrtc/modules/audio_processing/render_queue_item_verifier.h" #include "webrtc/modules/audio_processing/rms_level.h" +#include "webrtc/rtc_base/criticalsection.h" +#include "webrtc/rtc_base/function_view.h" +#include "webrtc/rtc_base/gtest_prod_util.h" +#include "webrtc/rtc_base/ignore_wundef.h" +#include "webrtc/rtc_base/protobuf_utils.h" +#include "webrtc/rtc_base/swap_queue.h" +#include "webrtc/rtc_base/thread_annotations.h" #include "webrtc/system_wrappers/include/file_wrapper.h" #ifdef WEBRTC_AUDIOPROC_DEBUG_DUMP diff --git a/webrtc/modules/audio_processing/audio_processing_impl_locking_unittest.cc b/webrtc/modules/audio_processing/audio_processing_impl_locking_unittest.cc index 19d90fae11..db2aacbf04 100644 --- a/webrtc/modules/audio_processing/audio_processing_impl_locking_unittest.cc +++ b/webrtc/modules/audio_processing/audio_processing_impl_locking_unittest.cc @@ -14,14 +14,14 @@ #include #include -#include "webrtc/base/array_view.h" -#include "webrtc/base/criticalsection.h" -#include "webrtc/base/event.h" -#include "webrtc/base/platform_thread.h" -#include "webrtc/base/random.h" #include "webrtc/config.h" #include "webrtc/modules/audio_processing/test/test_utils.h" #include "webrtc/modules/include/module_common_types.h" +#include "webrtc/rtc_base/array_view.h" +#include "webrtc/rtc_base/criticalsection.h" +#include "webrtc/rtc_base/event.h" +#include "webrtc/rtc_base/platform_thread.h" +#include "webrtc/rtc_base/random.h" #include "webrtc/system_wrappers/include/sleep.h" #include "webrtc/test/gtest.h" diff --git a/webrtc/modules/audio_processing/audio_processing_performance_unittest.cc b/webrtc/modules/audio_processing/audio_processing_performance_unittest.cc index 26d30d8c48..2c20c0fb72 100644 --- a/webrtc/modules/audio_processing/audio_processing_performance_unittest.cc +++ b/webrtc/modules/audio_processing/audio_processing_performance_unittest.cc @@ -15,14 +15,14 @@ #include #include -#include "webrtc/base/array_view.h" -#include "webrtc/base/atomicops.h" -#include "webrtc/base/platform_thread.h" -#include "webrtc/base/random.h" -#include "webrtc/base/safe_conversions.h" #include "webrtc/config.h" #include "webrtc/modules/audio_processing/test/test_utils.h" #include "webrtc/modules/include/module_common_types.h" +#include "webrtc/rtc_base/array_view.h" +#include "webrtc/rtc_base/atomicops.h" +#include "webrtc/rtc_base/platform_thread.h" +#include "webrtc/rtc_base/random.h" +#include "webrtc/rtc_base/safe_conversions.h" #include "webrtc/system_wrappers/include/clock.h" #include "webrtc/system_wrappers/include/event_wrapper.h" #include "webrtc/test/gtest.h" diff --git a/webrtc/modules/audio_processing/audio_processing_unittest.cc b/webrtc/modules/audio_processing/audio_processing_unittest.cc index 59fbb914c5..243a140440 100644 --- a/webrtc/modules/audio_processing/audio_processing_unittest.cc +++ b/webrtc/modules/audio_processing/audio_processing_unittest.cc @@ -15,14 +15,6 @@ #include #include -#include "webrtc/base/arraysize.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/gtest_prod_util.h" -#include "webrtc/base/ignore_wundef.h" -#include "webrtc/base/protobuf_utils.h" -#include "webrtc/base/safe_minmax.h" -#include "webrtc/base/task_queue.h" -#include "webrtc/base/thread.h" #include "webrtc/common_audio/include/audio_util.h" #include "webrtc/common_audio/resampler/include/push_resampler.h" #include "webrtc/common_audio/resampler/push_sinc_resampler.h" @@ -36,6 +28,14 @@ #include "webrtc/modules/audio_processing/test/protobuf_utils.h" #include "webrtc/modules/audio_processing/test/test_utils.h" #include "webrtc/modules/include/module_common_types.h" +#include "webrtc/rtc_base/arraysize.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/gtest_prod_util.h" +#include "webrtc/rtc_base/ignore_wundef.h" +#include "webrtc/rtc_base/protobuf_utils.h" +#include "webrtc/rtc_base/safe_minmax.h" +#include "webrtc/rtc_base/task_queue.h" +#include "webrtc/rtc_base/thread.h" #include "webrtc/system_wrappers/include/event_wrapper.h" #include "webrtc/system_wrappers/include/trace.h" #include "webrtc/test/gtest.h" diff --git a/webrtc/modules/audio_processing/beamformer/array_util.cc b/webrtc/modules/audio_processing/beamformer/array_util.cc index 244f5c88e8..e42a98e632 100644 --- a/webrtc/modules/audio_processing/beamformer/array_util.cc +++ b/webrtc/modules/audio_processing/beamformer/array_util.cc @@ -13,7 +13,7 @@ #include #include -#include "webrtc/base/checks.h" +#include "webrtc/rtc_base/checks.h" namespace webrtc { namespace { diff --git a/webrtc/modules/audio_processing/beamformer/array_util.h b/webrtc/modules/audio_processing/beamformer/array_util.h index f86ad5dee6..bfb9dfdb65 100644 --- a/webrtc/modules/audio_processing/beamformer/array_util.h +++ b/webrtc/modules/audio_processing/beamformer/array_util.h @@ -14,7 +14,7 @@ #include #include -#include "webrtc/base/optional.h" +#include "webrtc/rtc_base/optional.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/beamformer/complex_matrix.h b/webrtc/modules/audio_processing/beamformer/complex_matrix.h index fe0e24c074..1080f18bb4 100644 --- a/webrtc/modules/audio_processing/beamformer/complex_matrix.h +++ b/webrtc/modules/audio_processing/beamformer/complex_matrix.h @@ -13,8 +13,8 @@ #include -#include "webrtc/base/checks.h" #include "webrtc/modules/audio_processing/beamformer/matrix.h" +#include "webrtc/rtc_base/checks.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/beamformer/matrix.h b/webrtc/modules/audio_processing/beamformer/matrix.h index 40b4793426..d0e41ca9b0 100644 --- a/webrtc/modules/audio_processing/beamformer/matrix.h +++ b/webrtc/modules/audio_processing/beamformer/matrix.h @@ -16,8 +16,8 @@ #include #include -#include "webrtc/base/checks.h" -#include "webrtc/base/constructormagic.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/constructormagic.h" namespace { diff --git a/webrtc/modules/audio_processing/beamformer/nonlinear_beamformer.cc b/webrtc/modules/audio_processing/beamformer/nonlinear_beamformer.cc index de49965c91..b7d23f59f2 100644 --- a/webrtc/modules/audio_processing/beamformer/nonlinear_beamformer.cc +++ b/webrtc/modules/audio_processing/beamformer/nonlinear_beamformer.cc @@ -17,9 +17,9 @@ #include #include -#include "webrtc/base/arraysize.h" #include "webrtc/common_audio/window_generator.h" #include "webrtc/modules/audio_processing/beamformer/covariance_matrix_generator.h" +#include "webrtc/rtc_base/arraysize.h" namespace webrtc { namespace { diff --git a/webrtc/modules/audio_processing/beamformer/nonlinear_beamformer_test.cc b/webrtc/modules/audio_processing/beamformer/nonlinear_beamformer_test.cc index 233d406430..3ac68d4435 100644 --- a/webrtc/modules/audio_processing/beamformer/nonlinear_beamformer_test.cc +++ b/webrtc/modules/audio_processing/beamformer/nonlinear_beamformer_test.cc @@ -11,12 +11,12 @@ #include #include "gflags/gflags.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/format_macros.h" #include "webrtc/common_audio/channel_buffer.h" #include "webrtc/common_audio/wav_file.h" #include "webrtc/modules/audio_processing/beamformer/nonlinear_beamformer.h" #include "webrtc/modules/audio_processing/test/test_utils.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/format_macros.h" DEFINE_string(i, "", "The name of the input file to read from."); DEFINE_string(o, "out.wav", "Name of the output file to write to."); diff --git a/webrtc/modules/audio_processing/beamformer/nonlinear_beamformer_unittest.cc b/webrtc/modules/audio_processing/beamformer/nonlinear_beamformer_unittest.cc index 7983d71555..c81d76cc27 100644 --- a/webrtc/modules/audio_processing/beamformer/nonlinear_beamformer_unittest.cc +++ b/webrtc/modules/audio_processing/beamformer/nonlinear_beamformer_unittest.cc @@ -15,10 +15,10 @@ #include -#include "webrtc/base/array_view.h" #include "webrtc/modules/audio_processing/audio_buffer.h" #include "webrtc/modules/audio_processing/test/audio_buffer_tools.h" #include "webrtc/modules/audio_processing/test/bitexactness_tools.h" +#include "webrtc/rtc_base/array_view.h" #include "webrtc/test/gtest.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/common.h b/webrtc/modules/audio_processing/common.h index 184e2a5511..30cee9403a 100644 --- a/webrtc/modules/audio_processing/common.h +++ b/webrtc/modules/audio_processing/common.h @@ -11,8 +11,8 @@ #ifndef WEBRTC_MODULES_AUDIO_PROCESSING_COMMON_H_ #define WEBRTC_MODULES_AUDIO_PROCESSING_COMMON_H_ -#include "webrtc/base/checks.h" #include "webrtc/modules/audio_processing/include/audio_processing.h" +#include "webrtc/rtc_base/checks.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/echo_cancellation_bit_exact_unittest.cc b/webrtc/modules/audio_processing/echo_cancellation_bit_exact_unittest.cc index 93eaa04b9f..a4bc4f6108 100644 --- a/webrtc/modules/audio_processing/echo_cancellation_bit_exact_unittest.cc +++ b/webrtc/modules/audio_processing/echo_cancellation_bit_exact_unittest.cc @@ -9,11 +9,11 @@ */ #include -#include "webrtc/base/array_view.h" #include "webrtc/modules/audio_processing/audio_buffer.h" #include "webrtc/modules/audio_processing/echo_cancellation_impl.h" #include "webrtc/modules/audio_processing/test/audio_buffer_tools.h" #include "webrtc/modules/audio_processing/test/bitexactness_tools.h" +#include "webrtc/rtc_base/array_view.h" #include "webrtc/test/gtest.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/echo_cancellation_impl.cc b/webrtc/modules/audio_processing/echo_cancellation_impl.cc index 9918bb4738..b1ea486df1 100644 --- a/webrtc/modules/audio_processing/echo_cancellation_impl.cc +++ b/webrtc/modules/audio_processing/echo_cancellation_impl.cc @@ -12,10 +12,10 @@ #include -#include "webrtc/base/checks.h" #include "webrtc/modules/audio_processing/aec/aec_core.h" #include "webrtc/modules/audio_processing/aec/echo_cancellation.h" #include "webrtc/modules/audio_processing/audio_buffer.h" +#include "webrtc/rtc_base/checks.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/echo_cancellation_impl.h b/webrtc/modules/audio_processing/echo_cancellation_impl.h index 19da98196e..2bce6332d4 100644 --- a/webrtc/modules/audio_processing/echo_cancellation_impl.h +++ b/webrtc/modules/audio_processing/echo_cancellation_impl.h @@ -14,9 +14,9 @@ #include #include -#include "webrtc/base/constructormagic.h" -#include "webrtc/base/criticalsection.h" #include "webrtc/modules/audio_processing/include/audio_processing.h" +#include "webrtc/rtc_base/constructormagic.h" +#include "webrtc/rtc_base/criticalsection.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/echo_control_mobile_impl.cc b/webrtc/modules/audio_processing/echo_control_mobile_impl.cc index 0eb688d75a..4104a7f259 100644 --- a/webrtc/modules/audio_processing/echo_control_mobile_impl.cc +++ b/webrtc/modules/audio_processing/echo_control_mobile_impl.cc @@ -12,10 +12,10 @@ #include -#include "webrtc/base/constructormagic.h" -#include "webrtc/base/logging.h" #include "webrtc/modules/audio_processing/aecm/echo_control_mobile.h" #include "webrtc/modules/audio_processing/audio_buffer.h" +#include "webrtc/rtc_base/constructormagic.h" +#include "webrtc/rtc_base/logging.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/echo_control_mobile_impl.h b/webrtc/modules/audio_processing/echo_control_mobile_impl.h index 571de36add..2c604ca0d9 100644 --- a/webrtc/modules/audio_processing/echo_control_mobile_impl.h +++ b/webrtc/modules/audio_processing/echo_control_mobile_impl.h @@ -14,11 +14,11 @@ #include #include -#include "webrtc/base/constructormagic.h" -#include "webrtc/base/criticalsection.h" -#include "webrtc/base/swap_queue.h" #include "webrtc/modules/audio_processing/include/audio_processing.h" #include "webrtc/modules/audio_processing/render_queue_item_verifier.h" +#include "webrtc/rtc_base/constructormagic.h" +#include "webrtc/rtc_base/criticalsection.h" +#include "webrtc/rtc_base/swap_queue.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/echo_control_mobile_unittest.cc b/webrtc/modules/audio_processing/echo_control_mobile_unittest.cc index 253421a13c..aa4ad3cec9 100644 --- a/webrtc/modules/audio_processing/echo_control_mobile_unittest.cc +++ b/webrtc/modules/audio_processing/echo_control_mobile_unittest.cc @@ -9,11 +9,11 @@ */ #include -#include "webrtc/base/array_view.h" #include "webrtc/modules/audio_processing/audio_buffer.h" #include "webrtc/modules/audio_processing/echo_control_mobile_impl.h" #include "webrtc/modules/audio_processing/test/audio_buffer_tools.h" #include "webrtc/modules/audio_processing/test/bitexactness_tools.h" +#include "webrtc/rtc_base/array_view.h" #include "webrtc/test/gtest.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/echo_detector/circular_buffer.cc b/webrtc/modules/audio_processing/echo_detector/circular_buffer.cc index c67be05416..a24fc3e67a 100644 --- a/webrtc/modules/audio_processing/echo_detector/circular_buffer.cc +++ b/webrtc/modules/audio_processing/echo_detector/circular_buffer.cc @@ -12,7 +12,7 @@ #include -#include "webrtc/base/checks.h" +#include "webrtc/rtc_base/checks.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/echo_detector/circular_buffer.h b/webrtc/modules/audio_processing/echo_detector/circular_buffer.h index 667b1f8824..9fadb0d66f 100644 --- a/webrtc/modules/audio_processing/echo_detector/circular_buffer.h +++ b/webrtc/modules/audio_processing/echo_detector/circular_buffer.h @@ -13,7 +13,7 @@ #include -#include "webrtc/base/optional.h" +#include "webrtc/rtc_base/optional.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/echo_detector/mean_variance_estimator.cc b/webrtc/modules/audio_processing/echo_detector/mean_variance_estimator.cc index f0de0f09fe..e6e29e5ddb 100644 --- a/webrtc/modules/audio_processing/echo_detector/mean_variance_estimator.cc +++ b/webrtc/modules/audio_processing/echo_detector/mean_variance_estimator.cc @@ -12,7 +12,7 @@ #include -#include "webrtc/base/checks.h" +#include "webrtc/rtc_base/checks.h" namespace webrtc { namespace { diff --git a/webrtc/modules/audio_processing/echo_detector/moving_max.cc b/webrtc/modules/audio_processing/echo_detector/moving_max.cc index 699a0254fc..9c37ab63ff 100644 --- a/webrtc/modules/audio_processing/echo_detector/moving_max.cc +++ b/webrtc/modules/audio_processing/echo_detector/moving_max.cc @@ -10,7 +10,7 @@ #include "webrtc/modules/audio_processing/echo_detector/moving_max.h" -#include "webrtc/base/checks.h" +#include "webrtc/rtc_base/checks.h" namespace webrtc { namespace { diff --git a/webrtc/modules/audio_processing/echo_detector/normalized_covariance_estimator.cc b/webrtc/modules/audio_processing/echo_detector/normalized_covariance_estimator.cc index 8408f01404..24e1810197 100644 --- a/webrtc/modules/audio_processing/echo_detector/normalized_covariance_estimator.cc +++ b/webrtc/modules/audio_processing/echo_detector/normalized_covariance_estimator.cc @@ -12,7 +12,7 @@ #include -#include "webrtc/base/checks.h" +#include "webrtc/rtc_base/checks.h" namespace webrtc { namespace { diff --git a/webrtc/modules/audio_processing/gain_control_for_experimental_agc.cc b/webrtc/modules/audio_processing/gain_control_for_experimental_agc.cc index f8063865b6..308ee1224e 100644 --- a/webrtc/modules/audio_processing/gain_control_for_experimental_agc.cc +++ b/webrtc/modules/audio_processing/gain_control_for_experimental_agc.cc @@ -10,10 +10,10 @@ #include "webrtc/modules/audio_processing/gain_control_for_experimental_agc.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/criticalsection.h" #include "webrtc/modules/audio_processing/include/audio_processing.h" #include "webrtc/modules/audio_processing/logging/apm_data_dumper.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/criticalsection.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/gain_control_for_experimental_agc.h b/webrtc/modules/audio_processing/gain_control_for_experimental_agc.h index 75d87d17c3..977685bb1b 100644 --- a/webrtc/modules/audio_processing/gain_control_for_experimental_agc.h +++ b/webrtc/modules/audio_processing/gain_control_for_experimental_agc.h @@ -11,11 +11,11 @@ #ifndef WEBRTC_MODULES_AUDIO_PROCESSING_GAIN_CONTROL_FOR_EXPERIMENTAL_AGC_H_ #define WEBRTC_MODULES_AUDIO_PROCESSING_GAIN_CONTROL_FOR_EXPERIMENTAL_AGC_H_ -#include "webrtc/base/constructormagic.h" -#include "webrtc/base/criticalsection.h" -#include "webrtc/base/thread_checker.h" #include "webrtc/modules/audio_processing/agc/agc_manager_direct.h" #include "webrtc/modules/audio_processing/include/audio_processing.h" +#include "webrtc/rtc_base/constructormagic.h" +#include "webrtc/rtc_base/criticalsection.h" +#include "webrtc/rtc_base/thread_checker.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/gain_control_impl.cc b/webrtc/modules/audio_processing/gain_control_impl.cc index ce0872e883..e5760183f0 100644 --- a/webrtc/modules/audio_processing/gain_control_impl.cc +++ b/webrtc/modules/audio_processing/gain_control_impl.cc @@ -10,11 +10,11 @@ #include "webrtc/modules/audio_processing/gain_control_impl.h" -#include "webrtc/base/constructormagic.h" -#include "webrtc/base/optional.h" -#include "webrtc/modules/audio_processing/audio_buffer.h" #include "webrtc/modules/audio_processing/agc/legacy/gain_control.h" +#include "webrtc/modules/audio_processing/audio_buffer.h" #include "webrtc/modules/audio_processing/logging/apm_data_dumper.h" +#include "webrtc/rtc_base/constructormagic.h" +#include "webrtc/rtc_base/optional.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/gain_control_impl.h b/webrtc/modules/audio_processing/gain_control_impl.h index bd56ed452d..03bb5fa7d2 100644 --- a/webrtc/modules/audio_processing/gain_control_impl.h +++ b/webrtc/modules/audio_processing/gain_control_impl.h @@ -14,12 +14,12 @@ #include #include -#include "webrtc/base/constructormagic.h" -#include "webrtc/base/criticalsection.h" -#include "webrtc/base/swap_queue.h" -#include "webrtc/base/thread_annotations.h" #include "webrtc/modules/audio_processing/include/audio_processing.h" #include "webrtc/modules/audio_processing/render_queue_item_verifier.h" +#include "webrtc/rtc_base/constructormagic.h" +#include "webrtc/rtc_base/criticalsection.h" +#include "webrtc/rtc_base/swap_queue.h" +#include "webrtc/rtc_base/thread_annotations.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/gain_control_unittest.cc b/webrtc/modules/audio_processing/gain_control_unittest.cc index 1c89d76f52..e047c10d2e 100644 --- a/webrtc/modules/audio_processing/gain_control_unittest.cc +++ b/webrtc/modules/audio_processing/gain_control_unittest.cc @@ -9,11 +9,11 @@ */ #include -#include "webrtc/base/array_view.h" #include "webrtc/modules/audio_processing/audio_buffer.h" #include "webrtc/modules/audio_processing/gain_control_impl.h" #include "webrtc/modules/audio_processing/test/audio_buffer_tools.h" #include "webrtc/modules/audio_processing/test/bitexactness_tools.h" +#include "webrtc/rtc_base/array_view.h" #include "webrtc/test/gtest.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/include/aec_dump.h b/webrtc/modules/audio_processing/include/aec_dump.h index 2640f07284..84bba85939 100644 --- a/webrtc/modules/audio_processing/include/aec_dump.h +++ b/webrtc/modules/audio_processing/include/aec_dump.h @@ -15,7 +15,7 @@ #include #include -#include "webrtc/base/array_view.h" +#include "webrtc/rtc_base/array_view.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/include/audio_processing.cc b/webrtc/modules/audio_processing/include/audio_processing.cc index 52a57aa6e7..2c4b61f914 100644 --- a/webrtc/modules/audio_processing/include/audio_processing.cc +++ b/webrtc/modules/audio_processing/include/audio_processing.cc @@ -10,7 +10,7 @@ #include "webrtc/modules/audio_processing/include/audio_processing.h" -#include "webrtc/base/checks.h" +#include "webrtc/rtc_base/checks.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/include/audio_processing.h b/webrtc/modules/audio_processing/include/audio_processing.h index 05be5feeb1..4c4bc2f6d9 100644 --- a/webrtc/modules/audio_processing/include/audio_processing.h +++ b/webrtc/modules/audio_processing/include/audio_processing.h @@ -19,11 +19,11 @@ #include // FILE #include -#include "webrtc/base/arraysize.h" -#include "webrtc/base/platform_file.h" -#include "webrtc/base/refcount.h" #include "webrtc/modules/audio_processing/beamformer/array_util.h" #include "webrtc/modules/audio_processing/include/config.h" +#include "webrtc/rtc_base/arraysize.h" +#include "webrtc/rtc_base/platform_file.h" +#include "webrtc/rtc_base/refcount.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/include/config.h b/webrtc/modules/audio_processing/include/config.h index 0473d2d8cb..35836e8636 100644 --- a/webrtc/modules/audio_processing/include/config.h +++ b/webrtc/modules/audio_processing/include/config.h @@ -13,8 +13,8 @@ #include -#include "webrtc/base/basictypes.h" -#include "webrtc/base/constructormagic.h" +#include "webrtc/rtc_base/basictypes.h" +#include "webrtc/rtc_base/constructormagic.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/intelligibility/intelligibility_enhancer.cc b/webrtc/modules/audio_processing/intelligibility/intelligibility_enhancer.cc index f5414aa878..817d9ddff4 100644 --- a/webrtc/modules/audio_processing/intelligibility/intelligibility_enhancer.cc +++ b/webrtc/modules/audio_processing/intelligibility/intelligibility_enhancer.cc @@ -16,11 +16,11 @@ #include #include -#include "webrtc/base/checks.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/safe_minmax.h" #include "webrtc/common_audio/include/audio_util.h" #include "webrtc/common_audio/window_generator.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/safe_minmax.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/intelligibility/intelligibility_enhancer.h b/webrtc/modules/audio_processing/intelligibility/intelligibility_enhancer.h index f7306cb6a0..8faf919920 100644 --- a/webrtc/modules/audio_processing/intelligibility/intelligibility_enhancer.h +++ b/webrtc/modules/audio_processing/intelligibility/intelligibility_enhancer.h @@ -15,13 +15,13 @@ #include #include -#include "webrtc/base/swap_queue.h" #include "webrtc/common_audio/channel_buffer.h" #include "webrtc/common_audio/lapped_transform.h" #include "webrtc/modules/audio_processing/audio_buffer.h" #include "webrtc/modules/audio_processing/intelligibility/intelligibility_utils.h" #include "webrtc/modules/audio_processing/render_queue_item_verifier.h" #include "webrtc/modules/audio_processing/vad/voice_activity_detector.h" +#include "webrtc/rtc_base/swap_queue.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/intelligibility/intelligibility_enhancer_unittest.cc b/webrtc/modules/audio_processing/intelligibility/intelligibility_enhancer_unittest.cc index 0f9467cbe4..e84568735c 100644 --- a/webrtc/modules/audio_processing/intelligibility/intelligibility_enhancer_unittest.cc +++ b/webrtc/modules/audio_processing/intelligibility/intelligibility_enhancer_unittest.cc @@ -15,14 +15,14 @@ #include #include -#include "webrtc/base/array_view.h" -#include "webrtc/base/arraysize.h" #include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" #include "webrtc/modules/audio_processing/audio_buffer.h" #include "webrtc/modules/audio_processing/intelligibility/intelligibility_enhancer.h" #include "webrtc/modules/audio_processing/noise_suppression_impl.h" #include "webrtc/modules/audio_processing/test/audio_buffer_tools.h" #include "webrtc/modules/audio_processing/test/bitexactness_tools.h" +#include "webrtc/rtc_base/array_view.h" +#include "webrtc/rtc_base/arraysize.h" #include "webrtc/test/gtest.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/intelligibility/intelligibility_utils.cc b/webrtc/modules/audio_processing/intelligibility/intelligibility_utils.cc index deaeb27f44..3e6c93e192 100644 --- a/webrtc/modules/audio_processing/intelligibility/intelligibility_utils.cc +++ b/webrtc/modules/audio_processing/intelligibility/intelligibility_utils.cc @@ -16,7 +16,7 @@ #include #include -#include "webrtc/base/safe_minmax.h" +#include "webrtc/rtc_base/safe_minmax.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/intelligibility/intelligibility_utils_unittest.cc b/webrtc/modules/audio_processing/intelligibility/intelligibility_utils_unittest.cc index b7c212d956..4687c924d8 100644 --- a/webrtc/modules/audio_processing/intelligibility/intelligibility_utils_unittest.cc +++ b/webrtc/modules/audio_processing/intelligibility/intelligibility_utils_unittest.cc @@ -12,8 +12,8 @@ #include #include -#include "webrtc/base/arraysize.h" #include "webrtc/modules/audio_processing/intelligibility/intelligibility_utils.h" +#include "webrtc/rtc_base/arraysize.h" #include "webrtc/test/gtest.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/intelligibility/test/intelligibility_proc.cc b/webrtc/modules/audio_processing/intelligibility/test/intelligibility_proc.cc index ddcf1674f9..cd76a9557a 100644 --- a/webrtc/modules/audio_processing/intelligibility/test/intelligibility_proc.cc +++ b/webrtc/modules/audio_processing/intelligibility/test/intelligibility_proc.cc @@ -9,13 +9,13 @@ */ #include "gflags/gflags.h" -#include "webrtc/base/criticalsection.h" #include "webrtc/common_audio/channel_buffer.h" #include "webrtc/common_audio/include/audio_util.h" #include "webrtc/common_audio/wav_file.h" #include "webrtc/modules/audio_processing/audio_buffer.h" #include "webrtc/modules/audio_processing/intelligibility/intelligibility_enhancer.h" #include "webrtc/modules/audio_processing/noise_suppression_impl.h" +#include "webrtc/rtc_base/criticalsection.h" #include "webrtc/test/gtest.h" using std::complex; diff --git a/webrtc/modules/audio_processing/level_controller/biquad_filter.h b/webrtc/modules/audio_processing/level_controller/biquad_filter.h index 7e073b6f56..62bacf2018 100644 --- a/webrtc/modules/audio_processing/level_controller/biquad_filter.h +++ b/webrtc/modules/audio_processing/level_controller/biquad_filter.h @@ -13,9 +13,9 @@ #include -#include "webrtc/base/array_view.h" -#include "webrtc/base/arraysize.h" -#include "webrtc/base/constructormagic.h" +#include "webrtc/rtc_base/array_view.h" +#include "webrtc/rtc_base/arraysize.h" +#include "webrtc/rtc_base/constructormagic.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/level_controller/down_sampler.cc b/webrtc/modules/audio_processing/level_controller/down_sampler.cc index f4a08ee346..09da95bfbc 100644 --- a/webrtc/modules/audio_processing/level_controller/down_sampler.cc +++ b/webrtc/modules/audio_processing/level_controller/down_sampler.cc @@ -14,10 +14,10 @@ #include #include -#include "webrtc/base/checks.h" #include "webrtc/modules/audio_processing/include/audio_processing.h" #include "webrtc/modules/audio_processing/level_controller/biquad_filter.h" #include "webrtc/modules/audio_processing/logging/apm_data_dumper.h" +#include "webrtc/rtc_base/checks.h" namespace webrtc { namespace { diff --git a/webrtc/modules/audio_processing/level_controller/down_sampler.h b/webrtc/modules/audio_processing/level_controller/down_sampler.h index 5c8aaf3dee..95e3248054 100644 --- a/webrtc/modules/audio_processing/level_controller/down_sampler.h +++ b/webrtc/modules/audio_processing/level_controller/down_sampler.h @@ -11,9 +11,9 @@ #ifndef WEBRTC_MODULES_AUDIO_PROCESSING_LEVEL_CONTROLLER_DOWN_SAMPLER_H_ #define WEBRTC_MODULES_AUDIO_PROCESSING_LEVEL_CONTROLLER_DOWN_SAMPLER_H_ -#include "webrtc/base/array_view.h" -#include "webrtc/base/constructormagic.h" #include "webrtc/modules/audio_processing/level_controller/biquad_filter.h" +#include "webrtc/rtc_base/array_view.h" +#include "webrtc/rtc_base/constructormagic.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/level_controller/gain_applier.cc b/webrtc/modules/audio_processing/level_controller/gain_applier.cc index d646861328..9e2fba0c23 100644 --- a/webrtc/modules/audio_processing/level_controller/gain_applier.cc +++ b/webrtc/modules/audio_processing/level_controller/gain_applier.cc @@ -12,8 +12,8 @@ #include -#include "webrtc/base/array_view.h" -#include "webrtc/base/checks.h" +#include "webrtc/rtc_base/array_view.h" +#include "webrtc/rtc_base/checks.h" #include "webrtc/modules/audio_processing/audio_buffer.h" #include "webrtc/modules/audio_processing/logging/apm_data_dumper.h" diff --git a/webrtc/modules/audio_processing/level_controller/gain_applier.h b/webrtc/modules/audio_processing/level_controller/gain_applier.h index 2fc3543f84..33e26c1e0a 100644 --- a/webrtc/modules/audio_processing/level_controller/gain_applier.h +++ b/webrtc/modules/audio_processing/level_controller/gain_applier.h @@ -11,7 +11,7 @@ #ifndef WEBRTC_MODULES_AUDIO_PROCESSING_LEVEL_CONTROLLER_GAIN_APPLIER_H_ #define WEBRTC_MODULES_AUDIO_PROCESSING_LEVEL_CONTROLLER_GAIN_APPLIER_H_ -#include "webrtc/base/constructormagic.h" +#include "webrtc/rtc_base/constructormagic.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/level_controller/gain_selector.cc b/webrtc/modules/audio_processing/level_controller/gain_selector.cc index cf90d8d26b..844b8de02e 100644 --- a/webrtc/modules/audio_processing/level_controller/gain_selector.cc +++ b/webrtc/modules/audio_processing/level_controller/gain_selector.cc @@ -13,9 +13,9 @@ #include #include -#include "webrtc/base/checks.h" #include "webrtc/modules/audio_processing/include/audio_processing.h" #include "webrtc/modules/audio_processing/level_controller/level_controller_constants.h" +#include "webrtc/rtc_base/checks.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/level_controller/gain_selector.h b/webrtc/modules/audio_processing/level_controller/gain_selector.h index 78b9101500..690d49bace 100644 --- a/webrtc/modules/audio_processing/level_controller/gain_selector.h +++ b/webrtc/modules/audio_processing/level_controller/gain_selector.h @@ -11,7 +11,7 @@ #ifndef WEBRTC_MODULES_AUDIO_PROCESSING_LEVEL_CONTROLLER_GAIN_SELECTOR_H_ #define WEBRTC_MODULES_AUDIO_PROCESSING_LEVEL_CONTROLLER_GAIN_SELECTOR_H_ -#include "webrtc/base/constructormagic.h" +#include "webrtc/rtc_base/constructormagic.h" #include "webrtc/modules/audio_processing/level_controller/signal_classifier.h" diff --git a/webrtc/modules/audio_processing/level_controller/level_controller.cc b/webrtc/modules/audio_processing/level_controller/level_controller.cc index 3d36940187..bc6b7069cc 100644 --- a/webrtc/modules/audio_processing/level_controller/level_controller.cc +++ b/webrtc/modules/audio_processing/level_controller/level_controller.cc @@ -14,10 +14,6 @@ #include #include -#include "webrtc/base/array_view.h" -#include "webrtc/base/arraysize.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/logging.h" #include "webrtc/modules/audio_processing/audio_buffer.h" #include "webrtc/modules/audio_processing/level_controller/gain_applier.h" #include "webrtc/modules/audio_processing/level_controller/gain_selector.h" @@ -26,6 +22,10 @@ #include "webrtc/modules/audio_processing/level_controller/saturating_gain_estimator.h" #include "webrtc/modules/audio_processing/level_controller/signal_classifier.h" #include "webrtc/modules/audio_processing/logging/apm_data_dumper.h" +#include "webrtc/rtc_base/array_view.h" +#include "webrtc/rtc_base/arraysize.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/logging.h" #include "webrtc/system_wrappers/include/metrics.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/level_controller/level_controller.h b/webrtc/modules/audio_processing/level_controller/level_controller.h index 1030f7952e..e04620f19c 100644 --- a/webrtc/modules/audio_processing/level_controller/level_controller.h +++ b/webrtc/modules/audio_processing/level_controller/level_controller.h @@ -14,8 +14,6 @@ #include #include -#include "webrtc/base/constructormagic.h" -#include "webrtc/base/optional.h" #include "webrtc/modules/audio_processing/include/audio_processing.h" #include "webrtc/modules/audio_processing/level_controller/gain_applier.h" #include "webrtc/modules/audio_processing/level_controller/gain_selector.h" @@ -23,6 +21,8 @@ #include "webrtc/modules/audio_processing/level_controller/peak_level_estimator.h" #include "webrtc/modules/audio_processing/level_controller/saturating_gain_estimator.h" #include "webrtc/modules/audio_processing/level_controller/signal_classifier.h" +#include "webrtc/rtc_base/constructormagic.h" +#include "webrtc/rtc_base/optional.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/level_controller/level_controller_complexity_unittest.cc b/webrtc/modules/audio_processing/level_controller/level_controller_complexity_unittest.cc index a530d8d4d2..10be164f8b 100644 --- a/webrtc/modules/audio_processing/level_controller/level_controller_complexity_unittest.cc +++ b/webrtc/modules/audio_processing/level_controller/level_controller_complexity_unittest.cc @@ -11,8 +11,6 @@ #include #include -#include "webrtc/base/array_view.h" -#include "webrtc/base/random.h" #include "webrtc/modules/audio_processing/audio_buffer.h" #include "webrtc/modules/audio_processing/include/audio_processing.h" #include "webrtc/modules/audio_processing/level_controller/level_controller.h" @@ -20,6 +18,8 @@ #include "webrtc/modules/audio_processing/test/bitexactness_tools.h" #include "webrtc/modules/audio_processing/test/performance_timer.h" #include "webrtc/modules/audio_processing/test/simulator_buffers.h" +#include "webrtc/rtc_base/array_view.h" +#include "webrtc/rtc_base/random.h" #include "webrtc/system_wrappers/include/clock.h" #include "webrtc/test/gtest.h" #include "webrtc/test/testsupport/perf_test.h" diff --git a/webrtc/modules/audio_processing/level_controller/level_controller_unittest.cc b/webrtc/modules/audio_processing/level_controller/level_controller_unittest.cc index 3c07cb6dcb..633bfaf1ad 100644 --- a/webrtc/modules/audio_processing/level_controller/level_controller_unittest.cc +++ b/webrtc/modules/audio_processing/level_controller/level_controller_unittest.cc @@ -10,13 +10,13 @@ #include -#include "webrtc/base/array_view.h" -#include "webrtc/base/optional.h" #include "webrtc/modules/audio_processing/audio_buffer.h" #include "webrtc/modules/audio_processing/include/audio_processing.h" #include "webrtc/modules/audio_processing/level_controller/level_controller.h" #include "webrtc/modules/audio_processing/test/audio_buffer_tools.h" #include "webrtc/modules/audio_processing/test/bitexactness_tools.h" +#include "webrtc/rtc_base/array_view.h" +#include "webrtc/rtc_base/optional.h" #include "webrtc/test/gtest.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/level_controller/noise_level_estimator.h b/webrtc/modules/audio_processing/level_controller/noise_level_estimator.h index 235b139dfb..017ecc2cd6 100644 --- a/webrtc/modules/audio_processing/level_controller/noise_level_estimator.h +++ b/webrtc/modules/audio_processing/level_controller/noise_level_estimator.h @@ -11,8 +11,8 @@ #ifndef WEBRTC_MODULES_AUDIO_PROCESSING_LEVEL_CONTROLLER_NOISE_LEVEL_ESTIMATOR_H_ #define WEBRTC_MODULES_AUDIO_PROCESSING_LEVEL_CONTROLLER_NOISE_LEVEL_ESTIMATOR_H_ -#include "webrtc/base/constructormagic.h" #include "webrtc/modules/audio_processing/level_controller/signal_classifier.h" +#include "webrtc/rtc_base/constructormagic.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/level_controller/noise_spectrum_estimator.cc b/webrtc/modules/audio_processing/level_controller/noise_spectrum_estimator.cc index 2fbe200fa7..44ef82007b 100644 --- a/webrtc/modules/audio_processing/level_controller/noise_spectrum_estimator.cc +++ b/webrtc/modules/audio_processing/level_controller/noise_spectrum_estimator.cc @@ -13,9 +13,9 @@ #include #include -#include "webrtc/base/array_view.h" -#include "webrtc/base/arraysize.h" #include "webrtc/modules/audio_processing/logging/apm_data_dumper.h" +#include "webrtc/rtc_base/array_view.h" +#include "webrtc/rtc_base/arraysize.h" namespace webrtc { namespace { diff --git a/webrtc/modules/audio_processing/level_controller/noise_spectrum_estimator.h b/webrtc/modules/audio_processing/level_controller/noise_spectrum_estimator.h index 4bf81e39fe..11029666a5 100644 --- a/webrtc/modules/audio_processing/level_controller/noise_spectrum_estimator.h +++ b/webrtc/modules/audio_processing/level_controller/noise_spectrum_estimator.h @@ -11,8 +11,8 @@ #ifndef WEBRTC_MODULES_AUDIO_PROCESSING_LEVEL_CONTROLLER_NOISE_SPECTRUM_ESTIMATOR_H_ #define WEBRTC_MODULES_AUDIO_PROCESSING_LEVEL_CONTROLLER_NOISE_SPECTRUM_ESTIMATOR_H_ -#include "webrtc/base/array_view.h" -#include "webrtc/base/constructormagic.h" +#include "webrtc/rtc_base/array_view.h" +#include "webrtc/rtc_base/constructormagic.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/level_controller/peak_level_estimator.h b/webrtc/modules/audio_processing/level_controller/peak_level_estimator.h index f908717445..23c10060a8 100644 --- a/webrtc/modules/audio_processing/level_controller/peak_level_estimator.h +++ b/webrtc/modules/audio_processing/level_controller/peak_level_estimator.h @@ -11,9 +11,9 @@ #ifndef WEBRTC_MODULES_AUDIO_PROCESSING_LEVEL_CONTROLLER_PEAK_LEVEL_ESTIMATOR_H_ #define WEBRTC_MODULES_AUDIO_PROCESSING_LEVEL_CONTROLLER_PEAK_LEVEL_ESTIMATOR_H_ -#include "webrtc/base/constructormagic.h" #include "webrtc/modules/audio_processing/level_controller/level_controller_constants.h" #include "webrtc/modules/audio_processing/level_controller/signal_classifier.h" +#include "webrtc/rtc_base/constructormagic.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/level_controller/saturating_gain_estimator.h b/webrtc/modules/audio_processing/level_controller/saturating_gain_estimator.h index 1ec723de13..35275f32d7 100644 --- a/webrtc/modules/audio_processing/level_controller/saturating_gain_estimator.h +++ b/webrtc/modules/audio_processing/level_controller/saturating_gain_estimator.h @@ -11,7 +11,7 @@ #ifndef WEBRTC_MODULES_AUDIO_PROCESSING_LEVEL_CONTROLLER_SATURATING_GAIN_ESTIMATOR_H_ #define WEBRTC_MODULES_AUDIO_PROCESSING_LEVEL_CONTROLLER_SATURATING_GAIN_ESTIMATOR_H_ -#include "webrtc/base/constructormagic.h" +#include "webrtc/rtc_base/constructormagic.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/level_controller/signal_classifier.cc b/webrtc/modules/audio_processing/level_controller/signal_classifier.cc index 59cdc34c18..98686ac028 100644 --- a/webrtc/modules/audio_processing/level_controller/signal_classifier.cc +++ b/webrtc/modules/audio_processing/level_controller/signal_classifier.cc @@ -14,12 +14,12 @@ #include #include -#include "webrtc/base/array_view.h" -#include "webrtc/base/constructormagic.h" #include "webrtc/modules/audio_processing/audio_buffer.h" #include "webrtc/modules/audio_processing/level_controller/down_sampler.h" #include "webrtc/modules/audio_processing/level_controller/noise_spectrum_estimator.h" #include "webrtc/modules/audio_processing/logging/apm_data_dumper.h" +#include "webrtc/rtc_base/array_view.h" +#include "webrtc/rtc_base/constructormagic.h" namespace webrtc { namespace { diff --git a/webrtc/modules/audio_processing/level_controller/signal_classifier.h b/webrtc/modules/audio_processing/level_controller/signal_classifier.h index 8c791fec7e..5e0749a6fe 100644 --- a/webrtc/modules/audio_processing/level_controller/signal_classifier.h +++ b/webrtc/modules/audio_processing/level_controller/signal_classifier.h @@ -14,11 +14,11 @@ #include #include -#include "webrtc/base/array_view.h" -#include "webrtc/base/constructormagic.h" #include "webrtc/modules/audio_processing/level_controller/down_sampler.h" #include "webrtc/modules/audio_processing/level_controller/noise_spectrum_estimator.h" #include "webrtc/modules/audio_processing/utility/ooura_fft.h" +#include "webrtc/rtc_base/array_view.h" +#include "webrtc/rtc_base/constructormagic.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/level_estimator_impl.cc b/webrtc/modules/audio_processing/level_estimator_impl.cc index 4a402a1ead..1e52728bc8 100644 --- a/webrtc/modules/audio_processing/level_estimator_impl.cc +++ b/webrtc/modules/audio_processing/level_estimator_impl.cc @@ -10,9 +10,9 @@ #include "webrtc/modules/audio_processing/level_estimator_impl.h" -#include "webrtc/base/array_view.h" #include "webrtc/modules/audio_processing/audio_buffer.h" #include "webrtc/modules/audio_processing/rms_level.h" +#include "webrtc/rtc_base/array_view.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/level_estimator_impl.h b/webrtc/modules/audio_processing/level_estimator_impl.h index 11dbdbe587..db7217493d 100644 --- a/webrtc/modules/audio_processing/level_estimator_impl.h +++ b/webrtc/modules/audio_processing/level_estimator_impl.h @@ -13,9 +13,9 @@ #include -#include "webrtc/base/constructormagic.h" -#include "webrtc/base/criticalsection.h" #include "webrtc/modules/audio_processing/include/audio_processing.h" +#include "webrtc/rtc_base/constructormagic.h" +#include "webrtc/rtc_base/criticalsection.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/level_estimator_unittest.cc b/webrtc/modules/audio_processing/level_estimator_unittest.cc index 2675e0a4ce..cdb9c4eef2 100644 --- a/webrtc/modules/audio_processing/level_estimator_unittest.cc +++ b/webrtc/modules/audio_processing/level_estimator_unittest.cc @@ -9,11 +9,11 @@ */ #include -#include "webrtc/base/array_view.h" #include "webrtc/modules/audio_processing/audio_buffer.h" #include "webrtc/modules/audio_processing/level_estimator_impl.h" #include "webrtc/modules/audio_processing/test/audio_buffer_tools.h" #include "webrtc/modules/audio_processing/test/bitexactness_tools.h" +#include "webrtc/rtc_base/array_view.h" #include "webrtc/test/gtest.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/logging/apm_data_dumper.cc b/webrtc/modules/audio_processing/logging/apm_data_dumper.cc index 66ec5178d0..719dd050af 100644 --- a/webrtc/modules/audio_processing/logging/apm_data_dumper.cc +++ b/webrtc/modules/audio_processing/logging/apm_data_dumper.cc @@ -12,7 +12,7 @@ #include -#include "webrtc/base/stringutils.h" +#include "webrtc/rtc_base/stringutils.h" // Check to verify that the define is properly set. #if !defined(WEBRTC_APM_DEBUG_DUMP) || \ diff --git a/webrtc/modules/audio_processing/logging/apm_data_dumper.h b/webrtc/modules/audio_processing/logging/apm_data_dumper.h index e342fab365..82dc122e34 100644 --- a/webrtc/modules/audio_processing/logging/apm_data_dumper.h +++ b/webrtc/modules/audio_processing/logging/apm_data_dumper.h @@ -17,9 +17,9 @@ #include #include -#include "webrtc/base/array_view.h" -#include "webrtc/base/constructormagic.h" #include "webrtc/common_audio/wav_file.h" +#include "webrtc/rtc_base/array_view.h" +#include "webrtc/rtc_base/constructormagic.h" // Check to verify that the define is properly set. #if !defined(WEBRTC_APM_DEBUG_DUMP) || \ diff --git a/webrtc/modules/audio_processing/low_cut_filter.h b/webrtc/modules/audio_processing/low_cut_filter.h index 3a4da71d8b..047bcac1ac 100644 --- a/webrtc/modules/audio_processing/low_cut_filter.h +++ b/webrtc/modules/audio_processing/low_cut_filter.h @@ -14,7 +14,7 @@ #include #include -#include "webrtc/base/constructormagic.h" +#include "webrtc/rtc_base/constructormagic.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/low_cut_filter_unittest.cc b/webrtc/modules/audio_processing/low_cut_filter_unittest.cc index 0273472c03..736f0dc7ab 100644 --- a/webrtc/modules/audio_processing/low_cut_filter_unittest.cc +++ b/webrtc/modules/audio_processing/low_cut_filter_unittest.cc @@ -9,11 +9,11 @@ */ #include -#include "webrtc/base/array_view.h" #include "webrtc/modules/audio_processing/audio_buffer.h" #include "webrtc/modules/audio_processing/low_cut_filter.h" #include "webrtc/modules/audio_processing/test/audio_buffer_tools.h" #include "webrtc/modules/audio_processing/test/bitexactness_tools.h" +#include "webrtc/rtc_base/array_view.h" #include "webrtc/test/gtest.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/noise_suppression_impl.cc b/webrtc/modules/audio_processing/noise_suppression_impl.cc index 628b951f57..37af1032ab 100644 --- a/webrtc/modules/audio_processing/noise_suppression_impl.cc +++ b/webrtc/modules/audio_processing/noise_suppression_impl.cc @@ -10,8 +10,8 @@ #include "webrtc/modules/audio_processing/noise_suppression_impl.h" -#include "webrtc/base/constructormagic.h" #include "webrtc/modules/audio_processing/audio_buffer.h" +#include "webrtc/rtc_base/constructormagic.h" #if defined(WEBRTC_NS_FLOAT) #include "webrtc/modules/audio_processing/ns/noise_suppression.h" #define NS_CREATE WebRtcNs_Create diff --git a/webrtc/modules/audio_processing/noise_suppression_impl.h b/webrtc/modules/audio_processing/noise_suppression_impl.h index 111e8e17b6..ac5909fd8b 100644 --- a/webrtc/modules/audio_processing/noise_suppression_impl.h +++ b/webrtc/modules/audio_processing/noise_suppression_impl.h @@ -14,9 +14,9 @@ #include #include -#include "webrtc/base/constructormagic.h" -#include "webrtc/base/criticalsection.h" #include "webrtc/modules/audio_processing/include/audio_processing.h" +#include "webrtc/rtc_base/constructormagic.h" +#include "webrtc/rtc_base/criticalsection.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/noise_suppression_unittest.cc b/webrtc/modules/audio_processing/noise_suppression_unittest.cc index 78c3cc52ae..835d396585 100644 --- a/webrtc/modules/audio_processing/noise_suppression_unittest.cc +++ b/webrtc/modules/audio_processing/noise_suppression_unittest.cc @@ -9,11 +9,11 @@ */ #include -#include "webrtc/base/array_view.h" #include "webrtc/modules/audio_processing/audio_buffer.h" #include "webrtc/modules/audio_processing/noise_suppression_impl.h" #include "webrtc/modules/audio_processing/test/audio_buffer_tools.h" #include "webrtc/modules/audio_processing/test/bitexactness_tools.h" +#include "webrtc/rtc_base/array_view.h" #include "webrtc/test/gtest.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/residual_echo_detector.cc b/webrtc/modules/audio_processing/residual_echo_detector.cc index c73911ce0e..67bf4a1f99 100644 --- a/webrtc/modules/audio_processing/residual_echo_detector.cc +++ b/webrtc/modules/audio_processing/residual_echo_detector.cc @@ -13,10 +13,10 @@ #include #include -#include "webrtc/base/atomicops.h" -#include "webrtc/base/logging.h" #include "webrtc/modules/audio_processing/audio_buffer.h" #include "webrtc/modules/audio_processing/logging/apm_data_dumper.h" +#include "webrtc/rtc_base/atomicops.h" +#include "webrtc/rtc_base/logging.h" #include "webrtc/system_wrappers/include/metrics.h" namespace { diff --git a/webrtc/modules/audio_processing/residual_echo_detector.h b/webrtc/modules/audio_processing/residual_echo_detector.h index 92dd71db8a..8ac25fb0e4 100644 --- a/webrtc/modules/audio_processing/residual_echo_detector.h +++ b/webrtc/modules/audio_processing/residual_echo_detector.h @@ -13,11 +13,11 @@ #include -#include "webrtc/base/array_view.h" #include "webrtc/modules/audio_processing/echo_detector/circular_buffer.h" #include "webrtc/modules/audio_processing/echo_detector/mean_variance_estimator.h" #include "webrtc/modules/audio_processing/echo_detector/moving_max.h" #include "webrtc/modules/audio_processing/echo_detector/normalized_covariance_estimator.h" +#include "webrtc/rtc_base/array_view.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/residual_echo_detector_complexity_unittest.cc b/webrtc/modules/audio_processing/residual_echo_detector_complexity_unittest.cc index a42b408b8b..57a465a85a 100644 --- a/webrtc/modules/audio_processing/residual_echo_detector_complexity_unittest.cc +++ b/webrtc/modules/audio_processing/residual_echo_detector_complexity_unittest.cc @@ -11,14 +11,14 @@ #include #include -#include "webrtc/base/array_view.h" -#include "webrtc/base/random.h" #include "webrtc/modules/audio_processing/audio_buffer.h" #include "webrtc/modules/audio_processing/include/audio_processing.h" #include "webrtc/modules/audio_processing/residual_echo_detector.h" #include "webrtc/modules/audio_processing/test/audio_buffer_tools.h" #include "webrtc/modules/audio_processing/test/performance_timer.h" #include "webrtc/modules/audio_processing/test/simulator_buffers.h" +#include "webrtc/rtc_base/array_view.h" +#include "webrtc/rtc_base/random.h" #include "webrtc/system_wrappers/include/clock.h" #include "webrtc/test/gtest.h" #include "webrtc/test/testsupport/perf_test.h" diff --git a/webrtc/modules/audio_processing/rms_level.cc b/webrtc/modules/audio_processing/rms_level.cc index 8a77b3f7d9..391843cb6f 100644 --- a/webrtc/modules/audio_processing/rms_level.cc +++ b/webrtc/modules/audio_processing/rms_level.cc @@ -14,7 +14,7 @@ #include #include -#include "webrtc/base/checks.h" +#include "webrtc/rtc_base/checks.h" namespace webrtc { namespace { diff --git a/webrtc/modules/audio_processing/rms_level.h b/webrtc/modules/audio_processing/rms_level.h index a186bcf608..4701e0ce1c 100644 --- a/webrtc/modules/audio_processing/rms_level.h +++ b/webrtc/modules/audio_processing/rms_level.h @@ -11,8 +11,8 @@ #ifndef WEBRTC_MODULES_AUDIO_PROCESSING_RMS_LEVEL_H_ #define WEBRTC_MODULES_AUDIO_PROCESSING_RMS_LEVEL_H_ -#include "webrtc/base/array_view.h" -#include "webrtc/base/optional.h" +#include "webrtc/rtc_base/array_view.h" +#include "webrtc/rtc_base/optional.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/rms_level_unittest.cc b/webrtc/modules/audio_processing/rms_level_unittest.cc index cf0fd4d739..89338eafa7 100644 --- a/webrtc/modules/audio_processing/rms_level_unittest.cc +++ b/webrtc/modules/audio_processing/rms_level_unittest.cc @@ -11,11 +11,11 @@ #include #include -#include "webrtc/base/array_view.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/mathutils.h" -#include "webrtc/base/safe_conversions.h" #include "webrtc/modules/audio_processing/rms_level.h" +#include "webrtc/rtc_base/array_view.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/mathutils.h" +#include "webrtc/rtc_base/safe_conversions.h" #include "webrtc/test/gtest.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/splitting_filter.cc b/webrtc/modules/audio_processing/splitting_filter.cc index 9f10935699..203201ebe3 100644 --- a/webrtc/modules/audio_processing/splitting_filter.cc +++ b/webrtc/modules/audio_processing/splitting_filter.cc @@ -10,9 +10,9 @@ #include "webrtc/modules/audio_processing/splitting_filter.h" -#include "webrtc/base/checks.h" -#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" #include "webrtc/common_audio/channel_buffer.h" +#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" +#include "webrtc/rtc_base/checks.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/test/aec_dump_based_simulator.cc b/webrtc/modules/audio_processing/test/aec_dump_based_simulator.cc index 4a5ada53c0..c2e262ae6f 100644 --- a/webrtc/modules/audio_processing/test/aec_dump_based_simulator.cc +++ b/webrtc/modules/audio_processing/test/aec_dump_based_simulator.cc @@ -12,8 +12,8 @@ #include "webrtc/modules/audio_processing/test/aec_dump_based_simulator.h" -#include "webrtc/base/checks.h" #include "webrtc/modules/audio_processing/test/protobuf_utils.h" +#include "webrtc/rtc_base/checks.h" #include "webrtc/test/testsupport/trace_to_stderr.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/test/aec_dump_based_simulator.h b/webrtc/modules/audio_processing/test/aec_dump_based_simulator.h index 5f7d138aa4..3fb1d5528f 100644 --- a/webrtc/modules/audio_processing/test/aec_dump_based_simulator.h +++ b/webrtc/modules/audio_processing/test/aec_dump_based_simulator.h @@ -13,8 +13,8 @@ #include "webrtc/modules/audio_processing/test/audio_processing_simulator.h" -#include "webrtc/base/constructormagic.h" -#include "webrtc/base/ignore_wundef.h" +#include "webrtc/rtc_base/constructormagic.h" +#include "webrtc/rtc_base/ignore_wundef.h" RTC_PUSH_IGNORING_WUNDEF() #ifdef WEBRTC_ANDROID_PLATFORM_BUILD diff --git a/webrtc/modules/audio_processing/test/audio_buffer_tools.h b/webrtc/modules/audio_processing/test/audio_buffer_tools.h index 1fac758c59..f35e9a795f 100644 --- a/webrtc/modules/audio_processing/test/audio_buffer_tools.h +++ b/webrtc/modules/audio_processing/test/audio_buffer_tools.h @@ -12,9 +12,9 @@ #define WEBRTC_MODULES_AUDIO_PROCESSING_TEST_AUDIO_BUFFER_TOOLS_H_ #include -#include "webrtc/base/array_view.h" #include "webrtc/modules/audio_processing/audio_buffer.h" #include "webrtc/modules/audio_processing/include/audio_processing.h" +#include "webrtc/rtc_base/array_view.h" namespace webrtc { namespace test { diff --git a/webrtc/modules/audio_processing/test/audio_processing_simulator.cc b/webrtc/modules/audio_processing/test/audio_processing_simulator.cc index 35e2d2c4d8..461fc71c5e 100644 --- a/webrtc/modules/audio_processing/test/audio_processing_simulator.cc +++ b/webrtc/modules/audio_processing/test/audio_processing_simulator.cc @@ -16,11 +16,11 @@ #include #include -#include "webrtc/base/checks.h" -#include "webrtc/base/stringutils.h" #include "webrtc/common_audio/include/audio_util.h" #include "webrtc/modules/audio_processing/aec_dump/aec_dump_factory.h" #include "webrtc/modules/audio_processing/include/audio_processing.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/stringutils.h" namespace webrtc { namespace test { diff --git a/webrtc/modules/audio_processing/test/audio_processing_simulator.h b/webrtc/modules/audio_processing/test/audio_processing_simulator.h index 1b838d9770..1ae465cbef 100644 --- a/webrtc/modules/audio_processing/test/audio_processing_simulator.h +++ b/webrtc/modules/audio_processing/test/audio_processing_simulator.h @@ -17,13 +17,13 @@ #include #include -#include "webrtc/base/constructormagic.h" -#include "webrtc/base/optional.h" -#include "webrtc/base/task_queue.h" -#include "webrtc/base/timeutils.h" #include "webrtc/common_audio/channel_buffer.h" #include "webrtc/modules/audio_processing/include/audio_processing.h" #include "webrtc/modules/audio_processing/test/test_utils.h" +#include "webrtc/rtc_base/constructormagic.h" +#include "webrtc/rtc_base/optional.h" +#include "webrtc/rtc_base/task_queue.h" +#include "webrtc/rtc_base/timeutils.h" namespace webrtc { namespace test { diff --git a/webrtc/modules/audio_processing/test/bitexactness_tools.cc b/webrtc/modules/audio_processing/test/bitexactness_tools.cc index 9c8a97ce0c..ae3d2163e4 100644 --- a/webrtc/modules/audio_processing/test/bitexactness_tools.cc +++ b/webrtc/modules/audio_processing/test/bitexactness_tools.cc @@ -15,7 +15,7 @@ #include #include -#include "webrtc/base/array_view.h" +#include "webrtc/rtc_base/array_view.h" #include "webrtc/test/testsupport/fileutils.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/test/bitexactness_tools.h b/webrtc/modules/audio_processing/test/bitexactness_tools.h index 4ddc7e3bae..e4b863ac31 100644 --- a/webrtc/modules/audio_processing/test/bitexactness_tools.h +++ b/webrtc/modules/audio_processing/test/bitexactness_tools.h @@ -14,8 +14,8 @@ #include -#include "webrtc/base/array_view.h" #include "webrtc/modules/audio_coding/neteq/tools/input_audio_file.h" +#include "webrtc/rtc_base/array_view.h" #include "webrtc/test/gtest.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/test/conversational_speech/generator.cc b/webrtc/modules/audio_processing/test/conversational_speech/generator.cc index 57996c14a4..c7f86dec1e 100644 --- a/webrtc/modules/audio_processing/test/conversational_speech/generator.cc +++ b/webrtc/modules/audio_processing/test/conversational_speech/generator.cc @@ -11,12 +11,12 @@ #include #include "gflags/gflags.h" -#include "webrtc/base/ptr_util.h" #include "webrtc/modules/audio_processing/test/conversational_speech/config.h" -#include "webrtc/modules/audio_processing/test/conversational_speech/timing.h" -#include "webrtc/modules/audio_processing/test/conversational_speech/wavreader_factory.h" #include "webrtc/modules/audio_processing/test/conversational_speech/multiend_call.h" #include "webrtc/modules/audio_processing/test/conversational_speech/simulator.h" +#include "webrtc/modules/audio_processing/test/conversational_speech/timing.h" +#include "webrtc/modules/audio_processing/test/conversational_speech/wavreader_factory.h" +#include "webrtc/rtc_base/ptr_util.h" #include "webrtc/test/testsupport/fileutils.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/test/conversational_speech/generator_unittest.cc b/webrtc/modules/audio_processing/test/conversational_speech/generator_unittest.cc index c38fc435c5..9a52e5cc1f 100644 --- a/webrtc/modules/audio_processing/test/conversational_speech/generator_unittest.cc +++ b/webrtc/modules/audio_processing/test/conversational_speech/generator_unittest.cc @@ -42,9 +42,6 @@ #include #include -#include "webrtc/base/logging.h" -#include "webrtc/base/optional.h" -#include "webrtc/base/pathutils.h" #include "webrtc/common_audio/wav_file.h" #include "webrtc/modules/audio_processing/test/conversational_speech/config.h" #include "webrtc/modules/audio_processing/test/conversational_speech/mock_wavreader_factory.h" @@ -52,6 +49,9 @@ #include "webrtc/modules/audio_processing/test/conversational_speech/simulator.h" #include "webrtc/modules/audio_processing/test/conversational_speech/timing.h" #include "webrtc/modules/audio_processing/test/conversational_speech/wavreader_factory.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/optional.h" +#include "webrtc/rtc_base/pathutils.h" #include "webrtc/test/gmock.h" #include "webrtc/test/gtest.h" #include "webrtc/test/testsupport/fileutils.h" diff --git a/webrtc/modules/audio_processing/test/conversational_speech/mock_wavreader.h b/webrtc/modules/audio_processing/test/conversational_speech/mock_wavreader.h index 98dfaa27e8..a49ba2c74d 100644 --- a/webrtc/modules/audio_processing/test/conversational_speech/mock_wavreader.h +++ b/webrtc/modules/audio_processing/test/conversational_speech/mock_wavreader.h @@ -14,8 +14,8 @@ #include #include -#include "webrtc/base/array_view.h" #include "webrtc/modules/audio_processing/test/conversational_speech/wavreader_interface.h" +#include "webrtc/rtc_base/array_view.h" #include "webrtc/test/gmock.h" #include "webrtc/typedefs.h" diff --git a/webrtc/modules/audio_processing/test/conversational_speech/mock_wavreader_factory.cc b/webrtc/modules/audio_processing/test/conversational_speech/mock_wavreader_factory.cc index 2dd21dadf1..0483a33cec 100644 --- a/webrtc/modules/audio_processing/test/conversational_speech/mock_wavreader_factory.cc +++ b/webrtc/modules/audio_processing/test/conversational_speech/mock_wavreader_factory.cc @@ -10,9 +10,9 @@ #include "webrtc/modules/audio_processing/test/conversational_speech/mock_wavreader_factory.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/pathutils.h" #include "webrtc/modules/audio_processing/test/conversational_speech/mock_wavreader.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/pathutils.h" #include "webrtc/test/gmock.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/test/conversational_speech/multiend_call.cc b/webrtc/modules/audio_processing/test/conversational_speech/multiend_call.cc index f83923cb15..dffbfcbe1e 100644 --- a/webrtc/modules/audio_processing/test/conversational_speech/multiend_call.cc +++ b/webrtc/modules/audio_processing/test/conversational_speech/multiend_call.cc @@ -13,8 +13,8 @@ #include #include -#include "webrtc/base/logging.h" -#include "webrtc/base/pathutils.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/pathutils.h" namespace webrtc { namespace test { diff --git a/webrtc/modules/audio_processing/test/conversational_speech/multiend_call.h b/webrtc/modules/audio_processing/test/conversational_speech/multiend_call.h index 1daeea0279..b28dc9b01f 100644 --- a/webrtc/modules/audio_processing/test/conversational_speech/multiend_call.h +++ b/webrtc/modules/audio_processing/test/conversational_speech/multiend_call.h @@ -19,11 +19,11 @@ #include #include -#include "webrtc/base/array_view.h" -#include "webrtc/base/constructormagic.h" #include "webrtc/modules/audio_processing/test/conversational_speech/timing.h" #include "webrtc/modules/audio_processing/test/conversational_speech/wavreader_abstract_factory.h" #include "webrtc/modules/audio_processing/test/conversational_speech/wavreader_interface.h" +#include "webrtc/rtc_base/array_view.h" +#include "webrtc/rtc_base/constructormagic.h" namespace webrtc { namespace test { diff --git a/webrtc/modules/audio_processing/test/conversational_speech/simulator.cc b/webrtc/modules/audio_processing/test/conversational_speech/simulator.cc index 705b1df847..cb4bcfa7b8 100644 --- a/webrtc/modules/audio_processing/test/conversational_speech/simulator.cc +++ b/webrtc/modules/audio_processing/test/conversational_speech/simulator.cc @@ -14,13 +14,13 @@ #include #include -#include "webrtc/base/array_view.h" -#include "webrtc/base/constructormagic.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/pathutils.h" -#include "webrtc/base/ptr_util.h" #include "webrtc/common_audio/wav_file.h" #include "webrtc/modules/audio_processing/test/conversational_speech/wavreader_interface.h" +#include "webrtc/rtc_base/array_view.h" +#include "webrtc/rtc_base/constructormagic.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/pathutils.h" +#include "webrtc/rtc_base/ptr_util.h" namespace webrtc { namespace test { diff --git a/webrtc/modules/audio_processing/test/conversational_speech/simulator.h b/webrtc/modules/audio_processing/test/conversational_speech/simulator.h index 6224162c25..6882cca124 100644 --- a/webrtc/modules/audio_processing/test/conversational_speech/simulator.h +++ b/webrtc/modules/audio_processing/test/conversational_speech/simulator.h @@ -16,8 +16,8 @@ #include #include -#include "webrtc/base/constructormagic.h" #include "webrtc/modules/audio_processing/test/conversational_speech/multiend_call.h" +#include "webrtc/rtc_base/constructormagic.h" namespace webrtc { namespace test { diff --git a/webrtc/modules/audio_processing/test/conversational_speech/timing.cc b/webrtc/modules/audio_processing/test/conversational_speech/timing.cc index 53076f1cac..59ca867f25 100644 --- a/webrtc/modules/audio_processing/test/conversational_speech/timing.cc +++ b/webrtc/modules/audio_processing/test/conversational_speech/timing.cc @@ -13,7 +13,7 @@ #include #include -#include "webrtc/base/stringencode.h" +#include "webrtc/rtc_base/stringencode.h" namespace webrtc { namespace test { diff --git a/webrtc/modules/audio_processing/test/conversational_speech/timing.h b/webrtc/modules/audio_processing/test/conversational_speech/timing.h index 6498e79588..43a533cd0c 100644 --- a/webrtc/modules/audio_processing/test/conversational_speech/timing.h +++ b/webrtc/modules/audio_processing/test/conversational_speech/timing.h @@ -14,7 +14,7 @@ #include #include -#include "webrtc/base/array_view.h" +#include "webrtc/rtc_base/array_view.h" namespace webrtc { namespace test { diff --git a/webrtc/modules/audio_processing/test/conversational_speech/wavreader_factory.cc b/webrtc/modules/audio_processing/test/conversational_speech/wavreader_factory.cc index db126d04e3..85ab76d071 100644 --- a/webrtc/modules/audio_processing/test/conversational_speech/wavreader_factory.cc +++ b/webrtc/modules/audio_processing/test/conversational_speech/wavreader_factory.cc @@ -12,9 +12,9 @@ #include -#include "webrtc/base/array_view.h" -#include "webrtc/base/checks.h" #include "webrtc/common_audio/wav_file.h" +#include "webrtc/rtc_base/array_view.h" +#include "webrtc/rtc_base/checks.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/test/conversational_speech/wavreader_interface.h b/webrtc/modules/audio_processing/test/conversational_speech/wavreader_interface.h index 57342b4d1f..1d1459f28b 100644 --- a/webrtc/modules/audio_processing/test/conversational_speech/wavreader_interface.h +++ b/webrtc/modules/audio_processing/test/conversational_speech/wavreader_interface.h @@ -13,7 +13,7 @@ #include -#include "webrtc/base/array_view.h" +#include "webrtc/rtc_base/array_view.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/test/debug_dump_replayer.cc b/webrtc/modules/audio_processing/test/debug_dump_replayer.cc index c34a14ef73..b88692cee3 100644 --- a/webrtc/modules/audio_processing/test/debug_dump_replayer.cc +++ b/webrtc/modules/audio_processing/test/debug_dump_replayer.cc @@ -10,9 +10,8 @@ #include "webrtc/modules/audio_processing/test/debug_dump_replayer.h" -#include "webrtc/base/checks.h" #include "webrtc/modules/audio_processing/test/protobuf_utils.h" - +#include "webrtc/rtc_base/checks.h" namespace webrtc { namespace test { diff --git a/webrtc/modules/audio_processing/test/debug_dump_replayer.h b/webrtc/modules/audio_processing/test/debug_dump_replayer.h index 3bf886c090..9ee4a6349e 100644 --- a/webrtc/modules/audio_processing/test/debug_dump_replayer.h +++ b/webrtc/modules/audio_processing/test/debug_dump_replayer.h @@ -14,9 +14,9 @@ #include #include -#include "webrtc/base/ignore_wundef.h" #include "webrtc/common_audio/channel_buffer.h" #include "webrtc/modules/audio_processing/include/audio_processing.h" +#include "webrtc/rtc_base/ignore_wundef.h" RTC_PUSH_IGNORING_WUNDEF() #include "webrtc/modules/audio_processing/debug.pb.h" diff --git a/webrtc/modules/audio_processing/test/debug_dump_test.cc b/webrtc/modules/audio_processing/test/debug_dump_test.cc index 0e554537af..acaadf391e 100644 --- a/webrtc/modules/audio_processing/test/debug_dump_test.cc +++ b/webrtc/modules/audio_processing/test/debug_dump_test.cc @@ -14,15 +14,14 @@ #include #include -#include "webrtc/base/task_queue.h" #include "webrtc/modules/audio_coding/neteq/tools/resample_input_audio_file.h" #include "webrtc/modules/audio_processing/aec_dump/aec_dump_factory.h" #include "webrtc/modules/audio_processing/test/debug_dump_replayer.h" #include "webrtc/modules/audio_processing/test/test_utils.h" +#include "webrtc/rtc_base/task_queue.h" #include "webrtc/test/gtest.h" #include "webrtc/test/testsupport/fileutils.h" - namespace webrtc { namespace test { diff --git a/webrtc/modules/audio_processing/test/echo_canceller_test_tools.cc b/webrtc/modules/audio_processing/test/echo_canceller_test_tools.cc index 59f1da9dea..9593da45f0 100644 --- a/webrtc/modules/audio_processing/test/echo_canceller_test_tools.cc +++ b/webrtc/modules/audio_processing/test/echo_canceller_test_tools.cc @@ -10,7 +10,7 @@ #include "webrtc/modules/audio_processing/test/echo_canceller_test_tools.h" -#include "webrtc/base/checks.h" +#include "webrtc/rtc_base/checks.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/test/echo_canceller_test_tools.h b/webrtc/modules/audio_processing/test/echo_canceller_test_tools.h index 59e1cadebb..27f75acd77 100644 --- a/webrtc/modules/audio_processing/test/echo_canceller_test_tools.h +++ b/webrtc/modules/audio_processing/test/echo_canceller_test_tools.h @@ -14,9 +14,9 @@ #include #include -#include "webrtc/base/array_view.h" -#include "webrtc/base/constructormagic.h" -#include "webrtc/base/random.h" +#include "webrtc/rtc_base/array_view.h" +#include "webrtc/rtc_base/constructormagic.h" +#include "webrtc/rtc_base/random.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/test/echo_canceller_test_tools_unittest.cc b/webrtc/modules/audio_processing/test/echo_canceller_test_tools_unittest.cc index 18223fd480..aaef88d58d 100644 --- a/webrtc/modules/audio_processing/test/echo_canceller_test_tools_unittest.cc +++ b/webrtc/modules/audio_processing/test/echo_canceller_test_tools_unittest.cc @@ -12,9 +12,9 @@ #include -#include "webrtc/base/array_view.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/random.h" +#include "webrtc/rtc_base/array_view.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/random.h" #include "webrtc/test/gtest.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/test/performance_timer.cc b/webrtc/modules/audio_processing/test/performance_timer.cc index a002fe35a0..1e9c68ccb8 100644 --- a/webrtc/modules/audio_processing/test/performance_timer.cc +++ b/webrtc/modules/audio_processing/test/performance_timer.cc @@ -14,7 +14,7 @@ #include -#include "webrtc/base/checks.h" +#include "webrtc/rtc_base/checks.h" namespace webrtc { namespace test { diff --git a/webrtc/modules/audio_processing/test/performance_timer.h b/webrtc/modules/audio_processing/test/performance_timer.h index 92cda8bd5d..3e75e3f5f5 100644 --- a/webrtc/modules/audio_processing/test/performance_timer.h +++ b/webrtc/modules/audio_processing/test/performance_timer.h @@ -13,7 +13,7 @@ #include -#include "webrtc/base/optional.h" +#include "webrtc/rtc_base/optional.h" #include "webrtc/system_wrappers/include/clock.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/test/protobuf_utils.h b/webrtc/modules/audio_processing/test/protobuf_utils.h index 8941338917..13ae0cf674 100644 --- a/webrtc/modules/audio_processing/test/protobuf_utils.h +++ b/webrtc/modules/audio_processing/test/protobuf_utils.h @@ -13,8 +13,8 @@ #include -#include "webrtc/base/ignore_wundef.h" -#include "webrtc/base/protobuf_utils.h" +#include "webrtc/rtc_base/ignore_wundef.h" +#include "webrtc/rtc_base/protobuf_utils.h" RTC_PUSH_IGNORING_WUNDEF() #include "webrtc/modules/audio_processing/debug.pb.h" diff --git a/webrtc/modules/audio_processing/test/py_quality_assessment/quality_assessment/fake_polqa.cc b/webrtc/modules/audio_processing/test/py_quality_assessment/quality_assessment/fake_polqa.cc index d15c5223d0..9345a87baa 100644 --- a/webrtc/modules/audio_processing/test/py_quality_assessment/quality_assessment/fake_polqa.cc +++ b/webrtc/modules/audio_processing/test/py_quality_assessment/quality_assessment/fake_polqa.cc @@ -11,7 +11,7 @@ #include #include -#include "webrtc/base/checks.h" +#include "webrtc/rtc_base/checks.h" namespace webrtc { namespace test { diff --git a/webrtc/modules/audio_processing/test/simulator_buffers.cc b/webrtc/modules/audio_processing/test/simulator_buffers.cc index 67fb10d3d5..cecee71ac4 100644 --- a/webrtc/modules/audio_processing/test/simulator_buffers.cc +++ b/webrtc/modules/audio_processing/test/simulator_buffers.cc @@ -10,8 +10,8 @@ #include "webrtc/modules/audio_processing/test/simulator_buffers.h" -#include "webrtc/base/checks.h" #include "webrtc/modules/audio_processing/test/audio_buffer_tools.h" +#include "webrtc/rtc_base/checks.h" namespace webrtc { namespace test { diff --git a/webrtc/modules/audio_processing/test/simulator_buffers.h b/webrtc/modules/audio_processing/test/simulator_buffers.h index 9dff1e6de2..5e6689751a 100644 --- a/webrtc/modules/audio_processing/test/simulator_buffers.h +++ b/webrtc/modules/audio_processing/test/simulator_buffers.h @@ -14,9 +14,9 @@ #include #include -#include "webrtc/base/random.h" #include "webrtc/modules/audio_processing/audio_buffer.h" #include "webrtc/modules/audio_processing/include/audio_processing.h" +#include "webrtc/rtc_base/random.h" namespace webrtc { namespace test { diff --git a/webrtc/modules/audio_processing/test/test_utils.cc b/webrtc/modules/audio_processing/test/test_utils.cc index 24e9b0ebd2..7c354d0348 100644 --- a/webrtc/modules/audio_processing/test/test_utils.cc +++ b/webrtc/modules/audio_processing/test/test_utils.cc @@ -10,8 +10,8 @@ #include -#include "webrtc/base/checks.h" #include "webrtc/modules/audio_processing/test/test_utils.h" +#include "webrtc/rtc_base/checks.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/test/test_utils.h b/webrtc/modules/audio_processing/test/test_utils.h index ca66520cb5..e6c7259c47 100644 --- a/webrtc/modules/audio_processing/test/test_utils.h +++ b/webrtc/modules/audio_processing/test/test_utils.h @@ -18,11 +18,11 @@ #include #include -#include "webrtc/base/constructormagic.h" #include "webrtc/common_audio/channel_buffer.h" #include "webrtc/common_audio/wav_file.h" #include "webrtc/modules/audio_processing/include/audio_processing.h" #include "webrtc/modules/include/module_common_types.h" +#include "webrtc/rtc_base/constructormagic.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/test/unpack.cc b/webrtc/modules/audio_processing/test/unpack.cc index 61e1ebe91c..4c6c18dc47 100644 --- a/webrtc/modules/audio_processing/test/unpack.cc +++ b/webrtc/modules/audio_processing/test/unpack.cc @@ -18,10 +18,10 @@ #include #include "gflags/gflags.h" -#include "webrtc/base/format_macros.h" -#include "webrtc/base/ignore_wundef.h" #include "webrtc/modules/audio_processing/test/protobuf_utils.h" #include "webrtc/modules/audio_processing/test/test_utils.h" +#include "webrtc/rtc_base/format_macros.h" +#include "webrtc/rtc_base/ignore_wundef.h" #include "webrtc/typedefs.h" RTC_PUSH_IGNORING_WUNDEF() diff --git a/webrtc/modules/audio_processing/test/wav_based_simulator.cc b/webrtc/modules/audio_processing/test/wav_based_simulator.cc index 6cf0b744e6..40253964b1 100644 --- a/webrtc/modules/audio_processing/test/wav_based_simulator.cc +++ b/webrtc/modules/audio_processing/test/wav_based_simulator.cc @@ -13,8 +13,8 @@ #include #include -#include "webrtc/base/checks.h" #include "webrtc/modules/audio_processing/test/test_utils.h" +#include "webrtc/rtc_base/checks.h" #include "webrtc/test/testsupport/trace_to_stderr.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/test/wav_based_simulator.h b/webrtc/modules/audio_processing/test/wav_based_simulator.h index c1fcf6163b..245367e237 100644 --- a/webrtc/modules/audio_processing/test/wav_based_simulator.h +++ b/webrtc/modules/audio_processing/test/wav_based_simulator.h @@ -15,7 +15,7 @@ #include "webrtc/modules/audio_processing/test/audio_processing_simulator.h" -#include "webrtc/base/constructormagic.h" +#include "webrtc/rtc_base/constructormagic.h" namespace webrtc { namespace test { diff --git a/webrtc/modules/audio_processing/three_band_filter_bank.cc b/webrtc/modules/audio_processing/three_band_filter_bank.cc index 61071bbff5..4c62e7ec83 100644 --- a/webrtc/modules/audio_processing/three_band_filter_bank.cc +++ b/webrtc/modules/audio_processing/three_band_filter_bank.cc @@ -37,7 +37,7 @@ #include -#include "webrtc/base/checks.h" +#include "webrtc/rtc_base/checks.h" namespace webrtc { namespace { diff --git a/webrtc/modules/audio_processing/transient/moving_moments.cc b/webrtc/modules/audio_processing/transient/moving_moments.cc index 8bca505aef..5701a00270 100644 --- a/webrtc/modules/audio_processing/transient/moving_moments.cc +++ b/webrtc/modules/audio_processing/transient/moving_moments.cc @@ -13,7 +13,7 @@ #include #include -#include "webrtc/base/checks.h" +#include "webrtc/rtc_base/checks.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/transient/transient_detector.cc b/webrtc/modules/audio_processing/transient/transient_detector.cc index 987ff8130b..65fdc738eb 100644 --- a/webrtc/modules/audio_processing/transient/transient_detector.cc +++ b/webrtc/modules/audio_processing/transient/transient_detector.cc @@ -16,11 +16,11 @@ #include -#include "webrtc/base/checks.h" #include "webrtc/modules/audio_processing/transient/common.h" #include "webrtc/modules/audio_processing/transient/daubechies_8_wavelet_coeffs.h" #include "webrtc/modules/audio_processing/transient/moving_moments.h" #include "webrtc/modules/audio_processing/transient/wpd_tree.h" +#include "webrtc/rtc_base/checks.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/transient/transient_suppressor.cc b/webrtc/modules/audio_processing/transient/transient_suppressor.cc index 81e5eba9e7..1b05d265b6 100644 --- a/webrtc/modules/audio_processing/transient/transient_suppressor.cc +++ b/webrtc/modules/audio_processing/transient/transient_suppressor.cc @@ -17,14 +17,14 @@ #include #include -#include "webrtc/base/checks.h" -#include "webrtc/base/logging.h" #include "webrtc/common_audio/fft4g.h" #include "webrtc/common_audio/include/audio_util.h" #include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" +#include "webrtc/modules/audio_processing/ns/windows_private.h" #include "webrtc/modules/audio_processing/transient/common.h" #include "webrtc/modules/audio_processing/transient/transient_detector.h" -#include "webrtc/modules/audio_processing/ns/windows_private.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/logging.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/transient/transient_suppressor.h b/webrtc/modules/audio_processing/transient/transient_suppressor.h index 17c2a3964d..74decea7e2 100644 --- a/webrtc/modules/audio_processing/transient/transient_suppressor.h +++ b/webrtc/modules/audio_processing/transient/transient_suppressor.h @@ -15,7 +15,7 @@ #include #include -#include "webrtc/base/gtest_prod_util.h" +#include "webrtc/rtc_base/gtest_prod_util.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/transient/wpd_node.cc b/webrtc/modules/audio_processing/transient/wpd_node.cc index de382b4242..88ad24d740 100644 --- a/webrtc/modules/audio_processing/transient/wpd_node.cc +++ b/webrtc/modules/audio_processing/transient/wpd_node.cc @@ -13,9 +13,9 @@ #include #include -#include "webrtc/base/checks.h" #include "webrtc/common_audio/fir_filter.h" #include "webrtc/modules/audio_processing/transient/dyadic_decimator.h" +#include "webrtc/rtc_base/checks.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/transient/wpd_tree.cc b/webrtc/modules/audio_processing/transient/wpd_tree.cc index fece6863fc..187a8cd0ff 100644 --- a/webrtc/modules/audio_processing/transient/wpd_tree.cc +++ b/webrtc/modules/audio_processing/transient/wpd_tree.cc @@ -13,9 +13,9 @@ #include #include -#include "webrtc/base/checks.h" #include "webrtc/modules/audio_processing/transient/dyadic_decimator.h" #include "webrtc/modules/audio_processing/transient/wpd_node.h" +#include "webrtc/rtc_base/checks.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/utility/block_mean_calculator.cc b/webrtc/modules/audio_processing/utility/block_mean_calculator.cc index 7f4508ecc7..37919f028a 100644 --- a/webrtc/modules/audio_processing/utility/block_mean_calculator.cc +++ b/webrtc/modules/audio_processing/utility/block_mean_calculator.cc @@ -10,7 +10,7 @@ #include "webrtc/modules/audio_processing/utility/block_mean_calculator.h" -#include "webrtc/base/checks.h" +#include "webrtc/rtc_base/checks.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/utility/block_mean_calculator.h b/webrtc/modules/audio_processing/utility/block_mean_calculator.h index 71e8b63ce8..3dd7d407af 100644 --- a/webrtc/modules/audio_processing/utility/block_mean_calculator.h +++ b/webrtc/modules/audio_processing/utility/block_mean_calculator.h @@ -13,7 +13,7 @@ #include -#include "webrtc/base/constructormagic.h" +#include "webrtc/rtc_base/constructormagic.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/utility/delay_estimator.cc b/webrtc/modules/audio_processing/utility/delay_estimator.cc index bc67ba1fe2..e01495ea69 100644 --- a/webrtc/modules/audio_processing/utility/delay_estimator.cc +++ b/webrtc/modules/audio_processing/utility/delay_estimator.cc @@ -14,7 +14,7 @@ #include #include -#include "webrtc/base/checks.h" +#include "webrtc/rtc_base/checks.h" // Number of right shifts for scaling is linearly depending on number of bits in // the far-end binary spectrum. diff --git a/webrtc/modules/audio_processing/utility/delay_estimator_wrapper.cc b/webrtc/modules/audio_processing/utility/delay_estimator_wrapper.cc index 2dd092ce2a..afd07ac114 100644 --- a/webrtc/modules/audio_processing/utility/delay_estimator_wrapper.cc +++ b/webrtc/modules/audio_processing/utility/delay_estimator_wrapper.cc @@ -13,9 +13,9 @@ #include #include -#include "webrtc/base/checks.h" #include "webrtc/modules/audio_processing/utility/delay_estimator.h" #include "webrtc/modules/audio_processing/utility/delay_estimator_internal.h" +#include "webrtc/rtc_base/checks.h" // Only bit |kBandFirst| through bit |kBandLast| are processed and // |kBandFirst| - |kBandLast| must be < 32. diff --git a/webrtc/modules/audio_processing/vad/standalone_vad.cc b/webrtc/modules/audio_processing/vad/standalone_vad.cc index 95d498210d..7848134215 100644 --- a/webrtc/modules/audio_processing/vad/standalone_vad.cc +++ b/webrtc/modules/audio_processing/vad/standalone_vad.cc @@ -11,8 +11,8 @@ #include "webrtc/modules/audio_processing/vad/standalone_vad.h" #include "webrtc/audio/utility/audio_frame_operations.h" -#include "webrtc/base/checks.h" #include "webrtc/modules/include/module_common_types.h" +#include "webrtc/rtc_base/checks.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/vad/vad_audio_proc.cc b/webrtc/modules/audio_processing/vad/vad_audio_proc.cc index b934588597..d5f6b3bcd7 100644 --- a/webrtc/modules/audio_processing/vad/vad_audio_proc.cc +++ b/webrtc/modules/audio_processing/vad/vad_audio_proc.cc @@ -13,11 +13,11 @@ #include #include -#include "webrtc/base/checks.h" #include "webrtc/common_audio/fft4g.h" -#include "webrtc/modules/audio_processing/vad/vad_audio_proc_internal.h" #include "webrtc/modules/audio_processing/vad/pitch_internal.h" #include "webrtc/modules/audio_processing/vad/pole_zero_filter.h" +#include "webrtc/modules/audio_processing/vad/vad_audio_proc_internal.h" +#include "webrtc/rtc_base/checks.h" extern "C" { #include "webrtc/modules/audio_coding/codecs/isac/main/source/codec.h" #include "webrtc/modules/audio_coding/codecs/isac/main/source/lpc_analysis.h" diff --git a/webrtc/modules/audio_processing/vad/voice_activity_detector.cc b/webrtc/modules/audio_processing/vad/voice_activity_detector.cc index 6aa58adaa6..8942a03c3c 100644 --- a/webrtc/modules/audio_processing/vad/voice_activity_detector.cc +++ b/webrtc/modules/audio_processing/vad/voice_activity_detector.cc @@ -12,7 +12,7 @@ #include -#include "webrtc/base/checks.h" +#include "webrtc/rtc_base/checks.h" namespace webrtc { namespace { diff --git a/webrtc/modules/audio_processing/voice_detection_impl.cc b/webrtc/modules/audio_processing/voice_detection_impl.cc index 5365ed083c..9c9e0916d1 100644 --- a/webrtc/modules/audio_processing/voice_detection_impl.cc +++ b/webrtc/modules/audio_processing/voice_detection_impl.cc @@ -10,9 +10,9 @@ #include "webrtc/modules/audio_processing/voice_detection_impl.h" -#include "webrtc/base/constructormagic.h" #include "webrtc/common_audio/vad/include/webrtc_vad.h" #include "webrtc/modules/audio_processing/audio_buffer.h" +#include "webrtc/rtc_base/constructormagic.h" namespace webrtc { class VoiceDetectionImpl::Vad { diff --git a/webrtc/modules/audio_processing/voice_detection_impl.h b/webrtc/modules/audio_processing/voice_detection_impl.h index 6ba43dbc9e..3f515ce059 100644 --- a/webrtc/modules/audio_processing/voice_detection_impl.h +++ b/webrtc/modules/audio_processing/voice_detection_impl.h @@ -13,9 +13,9 @@ #include -#include "webrtc/base/constructormagic.h" -#include "webrtc/base/criticalsection.h" #include "webrtc/modules/audio_processing/include/audio_processing.h" +#include "webrtc/rtc_base/constructormagic.h" +#include "webrtc/rtc_base/criticalsection.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/voice_detection_unittest.cc b/webrtc/modules/audio_processing/voice_detection_unittest.cc index 7dee44de69..32a4da5037 100644 --- a/webrtc/modules/audio_processing/voice_detection_unittest.cc +++ b/webrtc/modules/audio_processing/voice_detection_unittest.cc @@ -9,11 +9,11 @@ */ #include -#include "webrtc/base/array_view.h" #include "webrtc/modules/audio_processing/audio_buffer.h" #include "webrtc/modules/audio_processing/test/audio_buffer_tools.h" #include "webrtc/modules/audio_processing/test/bitexactness_tools.h" #include "webrtc/modules/audio_processing/voice_detection_impl.h" +#include "webrtc/rtc_base/array_view.h" #include "webrtc/test/gtest.h" namespace webrtc { diff --git a/webrtc/modules/bitrate_controller/bitrate_controller_impl.cc b/webrtc/modules/bitrate_controller/bitrate_controller_impl.cc index 757ffb5f3b..70efe3e5cd 100644 --- a/webrtc/modules/bitrate_controller/bitrate_controller_impl.cc +++ b/webrtc/modules/bitrate_controller/bitrate_controller_impl.cc @@ -14,10 +14,10 @@ #include #include -#include "webrtc/base/checks.h" -#include "webrtc/base/logging.h" #include "webrtc/modules/remote_bitrate_estimator/test/bwe_test_logging.h" #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/logging.h" namespace webrtc { diff --git a/webrtc/modules/bitrate_controller/bitrate_controller_impl.h b/webrtc/modules/bitrate_controller/bitrate_controller_impl.h index ff271531b4..11a5850773 100644 --- a/webrtc/modules/bitrate_controller/bitrate_controller_impl.h +++ b/webrtc/modules/bitrate_controller/bitrate_controller_impl.h @@ -22,9 +22,9 @@ #include #include -#include "webrtc/base/constructormagic.h" -#include "webrtc/base/criticalsection.h" #include "webrtc/modules/bitrate_controller/send_side_bandwidth_estimation.h" +#include "webrtc/rtc_base/constructormagic.h" +#include "webrtc/rtc_base/criticalsection.h" namespace webrtc { diff --git a/webrtc/modules/bitrate_controller/send_side_bandwidth_estimation.cc b/webrtc/modules/bitrate_controller/send_side_bandwidth_estimation.cc index 416afbe1f7..6def9ba480 100644 --- a/webrtc/modules/bitrate_controller/send_side_bandwidth_estimation.cc +++ b/webrtc/modules/bitrate_controller/send_side_bandwidth_estimation.cc @@ -15,10 +15,10 @@ #include #include -#include "webrtc/base/checks.h" -#include "webrtc/base/logging.h" #include "webrtc/logging/rtc_event_log/rtc_event_log.h" #include "webrtc/modules/remote_bitrate_estimator/include/bwe_defines.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/logging.h" #include "webrtc/system_wrappers/include/field_trial.h" #include "webrtc/system_wrappers/include/metrics.h" diff --git a/webrtc/modules/congestion_controller/acknowledge_bitrate_estimator.h b/webrtc/modules/congestion_controller/acknowledge_bitrate_estimator.h index 7a9d669a1c..0bc2dacf03 100644 --- a/webrtc/modules/congestion_controller/acknowledge_bitrate_estimator.h +++ b/webrtc/modules/congestion_controller/acknowledge_bitrate_estimator.h @@ -13,7 +13,7 @@ #include -#include "webrtc/base/optional.h" +#include "webrtc/rtc_base/optional.h" namespace webrtc { diff --git a/webrtc/modules/congestion_controller/congestion_controller.cc b/webrtc/modules/congestion_controller/congestion_controller.cc index 62772b7f13..7c00693d39 100644 --- a/webrtc/modules/congestion_controller/congestion_controller.cc +++ b/webrtc/modules/congestion_controller/congestion_controller.cc @@ -14,15 +14,15 @@ #include #include -#include "webrtc/base/checks.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/rate_limiter.h" -#include "webrtc/base/socket.h" #include "webrtc/modules/bitrate_controller/include/bitrate_controller.h" #include "webrtc/modules/congestion_controller/probe_controller.h" #include "webrtc/modules/remote_bitrate_estimator/include/bwe_defines.h" #include "webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time.h" #include "webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/rate_limiter.h" +#include "webrtc/rtc_base/socket.h" namespace webrtc { diff --git a/webrtc/modules/congestion_controller/congestion_controller_unittest.cc b/webrtc/modules/congestion_controller/congestion_controller_unittest.cc index 46a1bd5720..e8eef8c707 100644 --- a/webrtc/modules/congestion_controller/congestion_controller_unittest.cc +++ b/webrtc/modules/congestion_controller/congestion_controller_unittest.cc @@ -9,7 +9,6 @@ */ #include "webrtc/modules/congestion_controller/include/congestion_controller.h" -#include "webrtc/base/socket.h" #include "webrtc/logging/rtc_event_log/mock/mock_rtc_event_log.h" #include "webrtc/modules/bitrate_controller/include/bitrate_controller.h" #include "webrtc/modules/congestion_controller/congestion_controller_unittests_helper.h" @@ -19,6 +18,7 @@ #include "webrtc/modules/remote_bitrate_estimator/include/mock/mock_remote_bitrate_observer.h" #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h" +#include "webrtc/rtc_base/socket.h" #include "webrtc/system_wrappers/include/clock.h" #include "webrtc/test/gmock.h" #include "webrtc/test/gtest.h" diff --git a/webrtc/modules/congestion_controller/congestion_controller_unittests_helper.cc b/webrtc/modules/congestion_controller/congestion_controller_unittests_helper.cc index f70b360028..4fb1130f50 100644 --- a/webrtc/modules/congestion_controller/congestion_controller_unittests_helper.cc +++ b/webrtc/modules/congestion_controller/congestion_controller_unittests_helper.cc @@ -10,7 +10,7 @@ #include "webrtc/modules/congestion_controller/congestion_controller_unittests_helper.h" -#include "webrtc/base/checks.h" +#include "webrtc/rtc_base/checks.h" #include "webrtc/test/gtest.h" namespace webrtc { diff --git a/webrtc/modules/congestion_controller/delay_based_bwe.cc b/webrtc/modules/congestion_controller/delay_based_bwe.cc index 4b9dcca79c..c50f0d4b45 100644 --- a/webrtc/modules/congestion_controller/delay_based_bwe.cc +++ b/webrtc/modules/congestion_controller/delay_based_bwe.cc @@ -14,15 +14,15 @@ #include #include -#include "webrtc/base/checks.h" -#include "webrtc/base/constructormagic.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/thread_annotations.h" #include "webrtc/logging/rtc_event_log/rtc_event_log.h" #include "webrtc/modules/congestion_controller/include/congestion_controller.h" #include "webrtc/modules/pacing/paced_sender.h" #include "webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h" #include "webrtc/modules/remote_bitrate_estimator/test/bwe_test_logging.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/constructormagic.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/thread_annotations.h" #include "webrtc/system_wrappers/include/field_trial.h" #include "webrtc/system_wrappers/include/metrics.h" #include "webrtc/typedefs.h" diff --git a/webrtc/modules/congestion_controller/delay_based_bwe.h b/webrtc/modules/congestion_controller/delay_based_bwe.h index 53eee84286..429797af05 100644 --- a/webrtc/modules/congestion_controller/delay_based_bwe.h +++ b/webrtc/modules/congestion_controller/delay_based_bwe.h @@ -15,9 +15,6 @@ #include #include -#include "webrtc/base/checks.h" -#include "webrtc/base/constructormagic.h" -#include "webrtc/base/race_checker.h" #include "webrtc/modules/congestion_controller/median_slope_estimator.h" #include "webrtc/modules/congestion_controller/probe_bitrate_estimator.h" #include "webrtc/modules/congestion_controller/trendline_estimator.h" @@ -26,6 +23,9 @@ #include "webrtc/modules/remote_bitrate_estimator/inter_arrival.h" #include "webrtc/modules/remote_bitrate_estimator/overuse_detector.h" #include "webrtc/modules/remote_bitrate_estimator/overuse_estimator.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/constructormagic.h" +#include "webrtc/rtc_base/race_checker.h" namespace webrtc { diff --git a/webrtc/modules/congestion_controller/delay_based_bwe_unittest.cc b/webrtc/modules/congestion_controller/delay_based_bwe_unittest.cc index 4b01c7eb85..ce55be46ce 100644 --- a/webrtc/modules/congestion_controller/delay_based_bwe_unittest.cc +++ b/webrtc/modules/congestion_controller/delay_based_bwe_unittest.cc @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/test/gtest.h" -#include "webrtc/base/constructormagic.h" -#include "webrtc/modules/pacing/paced_sender.h" #include "webrtc/modules/congestion_controller/delay_based_bwe.h" #include "webrtc/modules/congestion_controller/delay_based_bwe_unittest_helper.h" +#include "webrtc/modules/pacing/paced_sender.h" +#include "webrtc/rtc_base/constructormagic.h" #include "webrtc/system_wrappers/include/clock.h" #include "webrtc/test/field_trial.h" +#include "webrtc/test/gtest.h" namespace webrtc { diff --git a/webrtc/modules/congestion_controller/delay_based_bwe_unittest_helper.cc b/webrtc/modules/congestion_controller/delay_based_bwe_unittest_helper.cc index 62c9f881bc..9a86d9fe72 100644 --- a/webrtc/modules/congestion_controller/delay_based_bwe_unittest_helper.cc +++ b/webrtc/modules/congestion_controller/delay_based_bwe_unittest_helper.cc @@ -13,9 +13,9 @@ #include #include -#include "webrtc/base/checks.h" -#include "webrtc/base/ptr_util.h" #include "webrtc/modules/congestion_controller/delay_based_bwe.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/ptr_util.h" namespace webrtc { diff --git a/webrtc/modules/congestion_controller/delay_based_bwe_unittest_helper.h b/webrtc/modules/congestion_controller/delay_based_bwe_unittest_helper.h index a12bee52b9..4e9c21ceb2 100644 --- a/webrtc/modules/congestion_controller/delay_based_bwe_unittest_helper.h +++ b/webrtc/modules/congestion_controller/delay_based_bwe_unittest_helper.h @@ -17,10 +17,10 @@ #include #include -#include "webrtc/base/constructormagic.h" #include "webrtc/modules/congestion_controller/acknowledge_bitrate_estimator.h" #include "webrtc/modules/congestion_controller/delay_based_bwe.h" #include "webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h" +#include "webrtc/rtc_base/constructormagic.h" #include "webrtc/system_wrappers/include/clock.h" #include "webrtc/test/gtest.h" diff --git a/webrtc/modules/congestion_controller/include/congestion_controller.h b/webrtc/modules/congestion_controller/include/congestion_controller.h index 00eb0d7f41..ce9fbc58b0 100644 --- a/webrtc/modules/congestion_controller/include/congestion_controller.h +++ b/webrtc/modules/congestion_controller/include/congestion_controller.h @@ -15,10 +15,6 @@ #include #include -#include "webrtc/base/constructormagic.h" -#include "webrtc/base/criticalsection.h" -#include "webrtc/base/networkroute.h" -#include "webrtc/base/thread_checker.h" #include "webrtc/common_types.h" #include "webrtc/modules/congestion_controller/delay_based_bwe.h" #include "webrtc/modules/congestion_controller/include/receive_side_congestion_controller.h" @@ -28,6 +24,10 @@ #include "webrtc/modules/include/module_common_types.h" #include "webrtc/modules/pacing/paced_sender.h" #include "webrtc/modules/pacing/packet_router.h" +#include "webrtc/rtc_base/constructormagic.h" +#include "webrtc/rtc_base/criticalsection.h" +#include "webrtc/rtc_base/networkroute.h" +#include "webrtc/rtc_base/thread_checker.h" namespace rtc { struct SentPacket; diff --git a/webrtc/modules/congestion_controller/include/receive_side_congestion_controller.h b/webrtc/modules/congestion_controller/include/receive_side_congestion_controller.h index 2fa5919f8c..8544068ebd 100644 --- a/webrtc/modules/congestion_controller/include/receive_side_congestion_controller.h +++ b/webrtc/modules/congestion_controller/include/receive_side_congestion_controller.h @@ -14,9 +14,9 @@ #include #include -#include "webrtc/base/constructormagic.h" -#include "webrtc/base/criticalsection.h" #include "webrtc/modules/remote_bitrate_estimator/remote_estimator_proxy.h" +#include "webrtc/rtc_base/constructormagic.h" +#include "webrtc/rtc_base/criticalsection.h" namespace webrtc { class RemoteBitrateEstimator; diff --git a/webrtc/modules/congestion_controller/include/send_side_congestion_controller.h b/webrtc/modules/congestion_controller/include/send_side_congestion_controller.h index 660750b4e3..7a8f362c31 100644 --- a/webrtc/modules/congestion_controller/include/send_side_congestion_controller.h +++ b/webrtc/modules/congestion_controller/include/send_side_congestion_controller.h @@ -14,10 +14,6 @@ #include #include -#include "webrtc/base/constructormagic.h" -#include "webrtc/base/criticalsection.h" -#include "webrtc/base/networkroute.h" -#include "webrtc/base/race_checker.h" #include "webrtc/common_types.h" #include "webrtc/modules/congestion_controller/delay_based_bwe.h" #include "webrtc/modules/congestion_controller/transport_feedback_adapter.h" @@ -25,6 +21,10 @@ #include "webrtc/modules/include/module_common_types.h" #include "webrtc/modules/pacing/paced_sender.h" #include "webrtc/modules/pacing/packet_router.h" +#include "webrtc/rtc_base/constructormagic.h" +#include "webrtc/rtc_base/criticalsection.h" +#include "webrtc/rtc_base/networkroute.h" +#include "webrtc/rtc_base/race_checker.h" namespace rtc { struct SentPacket; diff --git a/webrtc/modules/congestion_controller/median_slope_estimator.cc b/webrtc/modules/congestion_controller/median_slope_estimator.cc index 181f8969f6..ad5133b72f 100644 --- a/webrtc/modules/congestion_controller/median_slope_estimator.cc +++ b/webrtc/modules/congestion_controller/median_slope_estimator.cc @@ -13,9 +13,9 @@ #include #include -#include "webrtc/base/logging.h" #include "webrtc/modules/remote_bitrate_estimator/include/bwe_defines.h" #include "webrtc/modules/remote_bitrate_estimator/test/bwe_test_logging.h" +#include "webrtc/rtc_base/logging.h" namespace webrtc { diff --git a/webrtc/modules/congestion_controller/median_slope_estimator.h b/webrtc/modules/congestion_controller/median_slope_estimator.h index f360aa790b..c2c1b7d12e 100644 --- a/webrtc/modules/congestion_controller/median_slope_estimator.h +++ b/webrtc/modules/congestion_controller/median_slope_estimator.h @@ -16,8 +16,8 @@ #include #include -#include "webrtc/base/constructormagic.h" -#include "webrtc/base/numerics/percentile_filter.h" +#include "webrtc/rtc_base/constructormagic.h" +#include "webrtc/rtc_base/numerics/percentile_filter.h" namespace webrtc { diff --git a/webrtc/modules/congestion_controller/median_slope_estimator_unittest.cc b/webrtc/modules/congestion_controller/median_slope_estimator_unittest.cc index 5be0e9b3cb..4dabd50e5c 100644 --- a/webrtc/modules/congestion_controller/median_slope_estimator_unittest.cc +++ b/webrtc/modules/congestion_controller/median_slope_estimator_unittest.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/test/gtest.h" -#include "webrtc/base/random.h" #include "webrtc/modules/congestion_controller/median_slope_estimator.h" +#include "webrtc/rtc_base/random.h" +#include "webrtc/test/gtest.h" namespace webrtc { diff --git a/webrtc/modules/congestion_controller/probe_bitrate_estimator.cc b/webrtc/modules/congestion_controller/probe_bitrate_estimator.cc index 6a6ce2c0d8..8fa22e7dcd 100644 --- a/webrtc/modules/congestion_controller/probe_bitrate_estimator.cc +++ b/webrtc/modules/congestion_controller/probe_bitrate_estimator.cc @@ -12,9 +12,9 @@ #include -#include "webrtc/base/checks.h" -#include "webrtc/base/logging.h" #include "webrtc/logging/rtc_event_log/rtc_event_log.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/logging.h" namespace { // The minumum number of probes we need to receive feedback about in percent diff --git a/webrtc/modules/congestion_controller/probe_controller.cc b/webrtc/modules/congestion_controller/probe_controller.cc index 91340aa430..43889bce9a 100644 --- a/webrtc/modules/congestion_controller/probe_controller.cc +++ b/webrtc/modules/congestion_controller/probe_controller.cc @@ -13,8 +13,8 @@ #include #include -#include "webrtc/base/logging.h" -#include "webrtc/base/safe_conversions.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/safe_conversions.h" #include "webrtc/system_wrappers/include/metrics.h" namespace webrtc { diff --git a/webrtc/modules/congestion_controller/probe_controller.h b/webrtc/modules/congestion_controller/probe_controller.h index 28cd10225f..4a3071cc59 100644 --- a/webrtc/modules/congestion_controller/probe_controller.h +++ b/webrtc/modules/congestion_controller/probe_controller.h @@ -13,9 +13,9 @@ #include -#include "webrtc/base/criticalsection.h" #include "webrtc/common_types.h" #include "webrtc/modules/pacing/paced_sender.h" +#include "webrtc/rtc_base/criticalsection.h" namespace webrtc { diff --git a/webrtc/modules/congestion_controller/probe_controller_unittest.cc b/webrtc/modules/congestion_controller/probe_controller_unittest.cc index 4ed2deeed1..9fc0f55088 100644 --- a/webrtc/modules/congestion_controller/probe_controller_unittest.cc +++ b/webrtc/modules/congestion_controller/probe_controller_unittest.cc @@ -9,9 +9,9 @@ */ #include -#include "webrtc/base/logging.h" #include "webrtc/modules/congestion_controller/probe_controller.h" #include "webrtc/modules/pacing/mock/mock_paced_sender.h" +#include "webrtc/rtc_base/logging.h" #include "webrtc/system_wrappers/include/clock.h" #include "webrtc/test/gmock.h" #include "webrtc/test/gtest.h" diff --git a/webrtc/modules/congestion_controller/receive_side_congestion_controller.cc b/webrtc/modules/congestion_controller/receive_side_congestion_controller.cc index b481b26565..3224906974 100644 --- a/webrtc/modules/congestion_controller/receive_side_congestion_controller.cc +++ b/webrtc/modules/congestion_controller/receive_side_congestion_controller.cc @@ -10,10 +10,10 @@ #include "webrtc/modules/congestion_controller/include/receive_side_congestion_controller.h" -#include "webrtc/base/logging.h" #include "webrtc/modules/pacing/packet_router.h" #include "webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time.h" #include "webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream.h" +#include "webrtc/rtc_base/logging.h" namespace webrtc { diff --git a/webrtc/modules/congestion_controller/send_side_congestion_controller.cc b/webrtc/modules/congestion_controller/send_side_congestion_controller.cc index d5f966aeaa..60e692ccdf 100644 --- a/webrtc/modules/congestion_controller/send_side_congestion_controller.cc +++ b/webrtc/modules/congestion_controller/send_side_congestion_controller.cc @@ -14,15 +14,15 @@ #include #include -#include "webrtc/base/checks.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/ptr_util.h" -#include "webrtc/base/rate_limiter.h" -#include "webrtc/base/socket.h" #include "webrtc/modules/bitrate_controller/include/bitrate_controller.h" #include "webrtc/modules/congestion_controller/acknowledge_bitrate_estimator.h" #include "webrtc/modules/congestion_controller/probe_controller.h" #include "webrtc/modules/remote_bitrate_estimator/include/bwe_defines.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/ptr_util.h" +#include "webrtc/rtc_base/rate_limiter.h" +#include "webrtc/rtc_base/socket.h" namespace webrtc { namespace { diff --git a/webrtc/modules/congestion_controller/transport_feedback_adapter.cc b/webrtc/modules/congestion_controller/transport_feedback_adapter.cc index 88caad41d6..7f3f744ecf 100644 --- a/webrtc/modules/congestion_controller/transport_feedback_adapter.cc +++ b/webrtc/modules/congestion_controller/transport_feedback_adapter.cc @@ -10,11 +10,11 @@ #include "webrtc/modules/congestion_controller/transport_feedback_adapter.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/mod_ops.h" #include "webrtc/modules/congestion_controller/delay_based_bwe.h" #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/mod_ops.h" #include "webrtc/system_wrappers/include/field_trial.h" namespace webrtc { diff --git a/webrtc/modules/congestion_controller/transport_feedback_adapter.h b/webrtc/modules/congestion_controller/transport_feedback_adapter.h index 2e70e448da..063b34dcfb 100644 --- a/webrtc/modules/congestion_controller/transport_feedback_adapter.h +++ b/webrtc/modules/congestion_controller/transport_feedback_adapter.h @@ -13,10 +13,10 @@ #include -#include "webrtc/base/criticalsection.h" -#include "webrtc/base/thread_annotations.h" -#include "webrtc/base/thread_checker.h" #include "webrtc/modules/remote_bitrate_estimator/include/send_time_history.h" +#include "webrtc/rtc_base/criticalsection.h" +#include "webrtc/rtc_base/thread_annotations.h" +#include "webrtc/rtc_base/thread_checker.h" #include "webrtc/system_wrappers/include/clock.h" namespace webrtc { diff --git a/webrtc/modules/congestion_controller/transport_feedback_adapter_unittest.cc b/webrtc/modules/congestion_controller/transport_feedback_adapter_unittest.cc index 97b7f5f2a5..3479814cde 100644 --- a/webrtc/modules/congestion_controller/transport_feedback_adapter_unittest.cc +++ b/webrtc/modules/congestion_controller/transport_feedback_adapter_unittest.cc @@ -12,13 +12,13 @@ #include #include -#include "webrtc/base/checks.h" -#include "webrtc/base/safe_conversions.h" #include "webrtc/modules/bitrate_controller/include/mock/mock_bitrate_controller.h" #include "webrtc/modules/congestion_controller/congestion_controller_unittests_helper.h" #include "webrtc/modules/congestion_controller/transport_feedback_adapter.h" #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/safe_conversions.h" #include "webrtc/system_wrappers/include/clock.h" #include "webrtc/test/gmock.h" #include "webrtc/test/gtest.h" diff --git a/webrtc/modules/congestion_controller/trendline_estimator.cc b/webrtc/modules/congestion_controller/trendline_estimator.cc index 6edcd8182d..4d25b45bba 100644 --- a/webrtc/modules/congestion_controller/trendline_estimator.cc +++ b/webrtc/modules/congestion_controller/trendline_estimator.cc @@ -12,9 +12,9 @@ #include -#include "webrtc/base/checks.h" -#include "webrtc/base/optional.h" #include "webrtc/modules/remote_bitrate_estimator/test/bwe_test_logging.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/optional.h" namespace webrtc { diff --git a/webrtc/modules/congestion_controller/trendline_estimator.h b/webrtc/modules/congestion_controller/trendline_estimator.h index f09ccb5629..9e4655822d 100644 --- a/webrtc/modules/congestion_controller/trendline_estimator.h +++ b/webrtc/modules/congestion_controller/trendline_estimator.h @@ -16,7 +16,7 @@ #include #include -#include "webrtc/base/constructormagic.h" +#include "webrtc/rtc_base/constructormagic.h" namespace webrtc { diff --git a/webrtc/modules/congestion_controller/trendline_estimator_unittest.cc b/webrtc/modules/congestion_controller/trendline_estimator_unittest.cc index cf2d021af0..6f541ca5d7 100644 --- a/webrtc/modules/congestion_controller/trendline_estimator_unittest.cc +++ b/webrtc/modules/congestion_controller/trendline_estimator_unittest.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/test/gtest.h" -#include "webrtc/base/random.h" #include "webrtc/modules/congestion_controller/trendline_estimator.h" +#include "webrtc/rtc_base/random.h" +#include "webrtc/test/gtest.h" namespace webrtc { diff --git a/webrtc/modules/desktop_capture/blank_detector_desktop_capturer_wrapper.cc b/webrtc/modules/desktop_capture/blank_detector_desktop_capturer_wrapper.cc index d909db4f24..13d50d5032 100644 --- a/webrtc/modules/desktop_capture/blank_detector_desktop_capturer_wrapper.cc +++ b/webrtc/modules/desktop_capture/blank_detector_desktop_capturer_wrapper.cc @@ -13,8 +13,8 @@ #include #include -#include "webrtc/base/checks.h" #include "webrtc/modules/desktop_capture/desktop_geometry.h" +#include "webrtc/rtc_base/checks.h" namespace webrtc { diff --git a/webrtc/modules/desktop_capture/cropped_desktop_frame.cc b/webrtc/modules/desktop_capture/cropped_desktop_frame.cc index b26d5b0600..9d4d123212 100644 --- a/webrtc/modules/desktop_capture/cropped_desktop_frame.cc +++ b/webrtc/modules/desktop_capture/cropped_desktop_frame.cc @@ -12,7 +12,7 @@ #include "webrtc/modules/desktop_capture/cropped_desktop_frame.h" -#include "webrtc/base/constructormagic.h" +#include "webrtc/rtc_base/constructormagic.h" namespace webrtc { diff --git a/webrtc/modules/desktop_capture/cropping_window_capturer.cc b/webrtc/modules/desktop_capture/cropping_window_capturer.cc index d2ee330b14..a0f89f66fc 100644 --- a/webrtc/modules/desktop_capture/cropping_window_capturer.cc +++ b/webrtc/modules/desktop_capture/cropping_window_capturer.cc @@ -10,8 +10,8 @@ #include "webrtc/modules/desktop_capture/cropping_window_capturer.h" -#include "webrtc/base/logging.h" #include "webrtc/modules/desktop_capture/cropped_desktop_frame.h" +#include "webrtc/rtc_base/logging.h" namespace webrtc { diff --git a/webrtc/modules/desktop_capture/cropping_window_capturer_win.cc b/webrtc/modules/desktop_capture/cropping_window_capturer_win.cc index 14cd3c3cc7..2d2dee2ab5 100644 --- a/webrtc/modules/desktop_capture/cropping_window_capturer_win.cc +++ b/webrtc/modules/desktop_capture/cropping_window_capturer_win.cc @@ -10,11 +10,11 @@ #include "webrtc/modules/desktop_capture/cropping_window_capturer.h" -#include "webrtc/base/win32.h" -#include "webrtc/base/logging.h" #include "webrtc/modules/desktop_capture/win/scoped_gdi_object.h" #include "webrtc/modules/desktop_capture/win/screen_capture_utils.h" #include "webrtc/modules/desktop_capture/win/window_capture_utils.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/win32.h" namespace webrtc { diff --git a/webrtc/modules/desktop_capture/desktop_and_cursor_composer.cc b/webrtc/modules/desktop_capture/desktop_and_cursor_composer.cc index d9d4b12215..c899a76801 100644 --- a/webrtc/modules/desktop_capture/desktop_and_cursor_composer.cc +++ b/webrtc/modules/desktop_capture/desktop_and_cursor_composer.cc @@ -12,10 +12,10 @@ #include -#include "webrtc/base/constructormagic.h" #include "webrtc/modules/desktop_capture/desktop_capturer.h" #include "webrtc/modules/desktop_capture/desktop_frame.h" #include "webrtc/modules/desktop_capture/mouse_cursor.h" +#include "webrtc/rtc_base/constructormagic.h" namespace webrtc { diff --git a/webrtc/modules/desktop_capture/desktop_and_cursor_composer.h b/webrtc/modules/desktop_capture/desktop_and_cursor_composer.h index 3e339e8149..c5cc3aa188 100644 --- a/webrtc/modules/desktop_capture/desktop_and_cursor_composer.h +++ b/webrtc/modules/desktop_capture/desktop_and_cursor_composer.h @@ -13,9 +13,9 @@ #include -#include "webrtc/base/constructormagic.h" #include "webrtc/modules/desktop_capture/desktop_capturer.h" #include "webrtc/modules/desktop_capture/mouse_cursor_monitor.h" +#include "webrtc/rtc_base/constructormagic.h" namespace webrtc { diff --git a/webrtc/modules/desktop_capture/desktop_capture_options.h b/webrtc/modules/desktop_capture/desktop_capture_options.h index 22f3fd54d6..e10cab7abe 100644 --- a/webrtc/modules/desktop_capture/desktop_capture_options.h +++ b/webrtc/modules/desktop_capture/desktop_capture_options.h @@ -10,8 +10,8 @@ #ifndef WEBRTC_MODULES_DESKTOP_CAPTURE_DESKTOP_CAPTURE_OPTIONS_H_ #define WEBRTC_MODULES_DESKTOP_CAPTURE_DESKTOP_CAPTURE_OPTIONS_H_ -#include "webrtc/base/constructormagic.h" -#include "webrtc/base/scoped_ref_ptr.h" +#include "webrtc/rtc_base/constructormagic.h" +#include "webrtc/rtc_base/scoped_ref_ptr.h" #if defined(USE_X11) #include "webrtc/modules/desktop_capture/x11/shared_x_display.h" diff --git a/webrtc/modules/desktop_capture/desktop_capturer_differ_wrapper.cc b/webrtc/modules/desktop_capture/desktop_capturer_differ_wrapper.cc index 196a987836..9dbcd68e5b 100644 --- a/webrtc/modules/desktop_capture/desktop_capturer_differ_wrapper.cc +++ b/webrtc/modules/desktop_capture/desktop_capturer_differ_wrapper.cc @@ -15,10 +15,10 @@ #include #include -#include "webrtc/base/checks.h" -#include "webrtc/base/timeutils.h" #include "webrtc/modules/desktop_capture/desktop_geometry.h" #include "webrtc/modules/desktop_capture/differ_block.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/timeutils.h" namespace webrtc { diff --git a/webrtc/modules/desktop_capture/desktop_capturer_differ_wrapper_unittest.cc b/webrtc/modules/desktop_capture/desktop_capturer_differ_wrapper_unittest.cc index eb6012a908..fbd24770e4 100644 --- a/webrtc/modules/desktop_capture/desktop_capturer_differ_wrapper_unittest.cc +++ b/webrtc/modules/desktop_capture/desktop_capturer_differ_wrapper_unittest.cc @@ -15,13 +15,13 @@ #include #include -#include "webrtc/base/random.h" -#include "webrtc/base/timeutils.h" #include "webrtc/modules/desktop_capture/desktop_geometry.h" #include "webrtc/modules/desktop_capture/desktop_region.h" #include "webrtc/modules/desktop_capture/differ_block.h" #include "webrtc/modules/desktop_capture/fake_desktop_capturer.h" #include "webrtc/modules/desktop_capture/mock_desktop_capturer_callback.h" +#include "webrtc/rtc_base/random.h" +#include "webrtc/rtc_base/timeutils.h" #include "webrtc/system_wrappers/include/cpu_features_wrapper.h" #include "webrtc/test/gtest.h" #include "webrtc/typedefs.h" diff --git a/webrtc/modules/desktop_capture/desktop_frame.cc b/webrtc/modules/desktop_capture/desktop_frame.cc index 1c3939b988..6756718d64 100644 --- a/webrtc/modules/desktop_capture/desktop_frame.cc +++ b/webrtc/modules/desktop_capture/desktop_frame.cc @@ -14,7 +14,7 @@ #include -#include "webrtc/base/checks.h" +#include "webrtc/rtc_base/checks.h" namespace webrtc { diff --git a/webrtc/modules/desktop_capture/desktop_frame.h b/webrtc/modules/desktop_capture/desktop_frame.h index c0eaf03aa6..cd60fcce62 100644 --- a/webrtc/modules/desktop_capture/desktop_frame.h +++ b/webrtc/modules/desktop_capture/desktop_frame.h @@ -13,11 +13,11 @@ #include -#include "webrtc/base/constructormagic.h" #include "webrtc/modules/desktop_capture/desktop_capture_types.h" #include "webrtc/modules/desktop_capture/desktop_geometry.h" #include "webrtc/modules/desktop_capture/desktop_region.h" #include "webrtc/modules/desktop_capture/shared_memory.h" +#include "webrtc/rtc_base/constructormagic.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/desktop_capture/desktop_frame_generator.cc b/webrtc/modules/desktop_capture/desktop_frame_generator.cc index 608c8407d8..30a08f2708 100644 --- a/webrtc/modules/desktop_capture/desktop_frame_generator.cc +++ b/webrtc/modules/desktop_capture/desktop_frame_generator.cc @@ -15,9 +15,9 @@ #include -#include "webrtc/base/random.h" -#include "webrtc/base/timeutils.h" #include "webrtc/modules/desktop_capture/rgba_color.h" +#include "webrtc/rtc_base/random.h" +#include "webrtc/rtc_base/timeutils.h" namespace webrtc { diff --git a/webrtc/modules/desktop_capture/desktop_frame_rotation.cc b/webrtc/modules/desktop_capture/desktop_frame_rotation.cc index 71cd74b4e5..000f6ae5af 100644 --- a/webrtc/modules/desktop_capture/desktop_frame_rotation.cc +++ b/webrtc/modules/desktop_capture/desktop_frame_rotation.cc @@ -12,8 +12,8 @@ #include -#include "webrtc/base/checks.h" #include "third_party/libyuv/include/libyuv/rotate_argb.h" +#include "webrtc/rtc_base/checks.h" namespace webrtc { diff --git a/webrtc/modules/desktop_capture/desktop_frame_win.cc b/webrtc/modules/desktop_capture/desktop_frame_win.cc index 9a3f973639..c694f55b31 100644 --- a/webrtc/modules/desktop_capture/desktop_frame_win.cc +++ b/webrtc/modules/desktop_capture/desktop_frame_win.cc @@ -12,7 +12,7 @@ #include -#include "webrtc/base/logging.h" +#include "webrtc/rtc_base/logging.h" namespace webrtc { diff --git a/webrtc/modules/desktop_capture/desktop_frame_win.h b/webrtc/modules/desktop_capture/desktop_frame_win.h index faf3c8d9f6..96256113ba 100644 --- a/webrtc/modules/desktop_capture/desktop_frame_win.h +++ b/webrtc/modules/desktop_capture/desktop_frame_win.h @@ -15,8 +15,8 @@ #include -#include "webrtc/base/constructormagic.h" #include "webrtc/modules/desktop_capture/desktop_frame.h" +#include "webrtc/rtc_base/constructormagic.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/desktop_capture/desktop_geometry.h b/webrtc/modules/desktop_capture/desktop_geometry.h index 1e0deda893..e14ab7085f 100644 --- a/webrtc/modules/desktop_capture/desktop_geometry.h +++ b/webrtc/modules/desktop_capture/desktop_geometry.h @@ -11,7 +11,7 @@ #ifndef WEBRTC_MODULES_DESKTOP_CAPTURE_DESKTOP_GEOMETRY_H_ #define WEBRTC_MODULES_DESKTOP_CAPTURE_DESKTOP_GEOMETRY_H_ -#include "webrtc/base/constructormagic.h" +#include "webrtc/rtc_base/constructormagic.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/desktop_capture/desktop_region.h b/webrtc/modules/desktop_capture/desktop_region.h index 5278159412..1c05e98bdd 100644 --- a/webrtc/modules/desktop_capture/desktop_region.h +++ b/webrtc/modules/desktop_capture/desktop_region.h @@ -14,8 +14,8 @@ #include #include -#include "webrtc/base/constructormagic.h" #include "webrtc/modules/desktop_capture/desktop_geometry.h" +#include "webrtc/rtc_base/constructormagic.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/desktop_capture/fallback_desktop_capturer_wrapper.cc b/webrtc/modules/desktop_capture/fallback_desktop_capturer_wrapper.cc index f7f91ceecf..0fd9b8aebf 100644 --- a/webrtc/modules/desktop_capture/fallback_desktop_capturer_wrapper.cc +++ b/webrtc/modules/desktop_capture/fallback_desktop_capturer_wrapper.cc @@ -12,7 +12,7 @@ #include -#include "webrtc/base/checks.h" +#include "webrtc/rtc_base/checks.h" namespace webrtc { diff --git a/webrtc/modules/desktop_capture/mac/desktop_configuration_monitor.cc b/webrtc/modules/desktop_capture/mac/desktop_configuration_monitor.cc index c4f2fb6265..21c06f730a 100644 --- a/webrtc/modules/desktop_capture/mac/desktop_configuration_monitor.cc +++ b/webrtc/modules/desktop_capture/mac/desktop_configuration_monitor.cc @@ -10,8 +10,8 @@ #include "webrtc/modules/desktop_capture/mac/desktop_configuration_monitor.h" -#include "webrtc/base/logging.h" #include "webrtc/modules/desktop_capture/mac/desktop_configuration.h" +#include "webrtc/rtc_base/logging.h" #include "webrtc/system_wrappers/include/event_wrapper.h" namespace webrtc { diff --git a/webrtc/modules/desktop_capture/mac/desktop_configuration_monitor.h b/webrtc/modules/desktop_capture/mac/desktop_configuration_monitor.h index 329beef23d..7b4ade7739 100644 --- a/webrtc/modules/desktop_capture/mac/desktop_configuration_monitor.h +++ b/webrtc/modules/desktop_capture/mac/desktop_configuration_monitor.h @@ -16,8 +16,8 @@ #include #include -#include "webrtc/base/constructormagic.h" #include "webrtc/modules/desktop_capture/mac/desktop_configuration.h" +#include "webrtc/rtc_base/constructormagic.h" #include "webrtc/system_wrappers/include/atomic32.h" namespace webrtc { diff --git a/webrtc/modules/desktop_capture/mac/full_screen_chrome_window_detector.cc b/webrtc/modules/desktop_capture/mac/full_screen_chrome_window_detector.cc index 086b6b563a..ec3974a653 100644 --- a/webrtc/modules/desktop_capture/mac/full_screen_chrome_window_detector.cc +++ b/webrtc/modules/desktop_capture/mac/full_screen_chrome_window_detector.cc @@ -14,11 +14,10 @@ #include #include -#include "webrtc/base/macutils.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/timeutils.h" #include "webrtc/modules/desktop_capture/mac/window_list_utils.h" - +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/macutils.h" +#include "webrtc/rtc_base/timeutils.h" namespace webrtc { diff --git a/webrtc/modules/desktop_capture/mac/full_screen_chrome_window_detector.h b/webrtc/modules/desktop_capture/mac/full_screen_chrome_window_detector.h index 7a10b4203c..01c1a95be6 100644 --- a/webrtc/modules/desktop_capture/mac/full_screen_chrome_window_detector.h +++ b/webrtc/modules/desktop_capture/mac/full_screen_chrome_window_detector.h @@ -13,8 +13,8 @@ #include -#include "webrtc/base/constructormagic.h" #include "webrtc/modules/desktop_capture/desktop_capturer.h" +#include "webrtc/rtc_base/constructormagic.h" #include "webrtc/system_wrappers/include/atomic32.h" namespace webrtc { diff --git a/webrtc/modules/desktop_capture/mac/scoped_pixel_buffer_object.h b/webrtc/modules/desktop_capture/mac/scoped_pixel_buffer_object.h index a32d470954..91d1295578 100644 --- a/webrtc/modules/desktop_capture/mac/scoped_pixel_buffer_object.h +++ b/webrtc/modules/desktop_capture/mac/scoped_pixel_buffer_object.h @@ -14,7 +14,7 @@ #include #include -#include "webrtc/base/constructormagic.h" +#include "webrtc/rtc_base/constructormagic.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/desktop_capture/mac/window_list_utils.cc b/webrtc/modules/desktop_capture/mac/window_list_utils.cc index bcb8798c39..7dcfae93f8 100644 --- a/webrtc/modules/desktop_capture/mac/window_list_utils.cc +++ b/webrtc/modules/desktop_capture/mac/window_list_utils.cc @@ -12,7 +12,7 @@ #include -#include "webrtc/base/macutils.h" +#include "webrtc/rtc_base/macutils.h" namespace webrtc { diff --git a/webrtc/modules/desktop_capture/mouse_cursor.h b/webrtc/modules/desktop_capture/mouse_cursor.h index 4662feaded..45e1fa535a 100644 --- a/webrtc/modules/desktop_capture/mouse_cursor.h +++ b/webrtc/modules/desktop_capture/mouse_cursor.h @@ -13,8 +13,8 @@ #include -#include "webrtc/base/constructormagic.h" #include "webrtc/modules/desktop_capture/desktop_geometry.h" +#include "webrtc/rtc_base/constructormagic.h" namespace webrtc { diff --git a/webrtc/modules/desktop_capture/mouse_cursor_monitor_win.cc b/webrtc/modules/desktop_capture/mouse_cursor_monitor_win.cc index 0ace98f511..83a581cdc2 100644 --- a/webrtc/modules/desktop_capture/mouse_cursor_monitor_win.cc +++ b/webrtc/modules/desktop_capture/mouse_cursor_monitor_win.cc @@ -15,12 +15,12 @@ #include -#include "webrtc/base/logging.h" #include "webrtc/modules/desktop_capture/desktop_frame.h" #include "webrtc/modules/desktop_capture/desktop_geometry.h" #include "webrtc/modules/desktop_capture/mouse_cursor.h" #include "webrtc/modules/desktop_capture/win/cursor.h" #include "webrtc/modules/desktop_capture/win/window_capture_utils.h" +#include "webrtc/rtc_base/logging.h" namespace webrtc { diff --git a/webrtc/modules/desktop_capture/mouse_cursor_monitor_x11.cc b/webrtc/modules/desktop_capture/mouse_cursor_monitor_x11.cc index 22339d4221..795242e648 100644 --- a/webrtc/modules/desktop_capture/mouse_cursor_monitor_x11.cc +++ b/webrtc/modules/desktop_capture/mouse_cursor_monitor_x11.cc @@ -16,11 +16,11 @@ #include #include -#include "webrtc/base/logging.h" #include "webrtc/modules/desktop_capture/desktop_capture_options.h" #include "webrtc/modules/desktop_capture/desktop_frame.h" #include "webrtc/modules/desktop_capture/mouse_cursor.h" #include "webrtc/modules/desktop_capture/x11/x_error_trap.h" +#include "webrtc/rtc_base/logging.h" namespace { diff --git a/webrtc/modules/desktop_capture/screen_capture_frame_queue.h b/webrtc/modules/desktop_capture/screen_capture_frame_queue.h index b7945b0921..50201fb944 100644 --- a/webrtc/modules/desktop_capture/screen_capture_frame_queue.h +++ b/webrtc/modules/desktop_capture/screen_capture_frame_queue.h @@ -13,7 +13,7 @@ #include -#include "webrtc/base/constructormagic.h" +#include "webrtc/rtc_base/constructormagic.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 "webrtc/modules/desktop_capture/desktop_frame.h" // Remove diff --git a/webrtc/modules/desktop_capture/screen_capturer_helper.h b/webrtc/modules/desktop_capture/screen_capturer_helper.h index 458bccc1ed..5527bbb185 100644 --- a/webrtc/modules/desktop_capture/screen_capturer_helper.h +++ b/webrtc/modules/desktop_capture/screen_capturer_helper.h @@ -13,9 +13,9 @@ #include -#include "webrtc/base/constructormagic.h" #include "webrtc/modules/desktop_capture/desktop_geometry.h" #include "webrtc/modules/desktop_capture/desktop_region.h" +#include "webrtc/rtc_base/constructormagic.h" #include "webrtc/system_wrappers/include/rw_lock_wrapper.h" namespace webrtc { diff --git a/webrtc/modules/desktop_capture/screen_capturer_integration_test.cc b/webrtc/modules/desktop_capture/screen_capturer_integration_test.cc index 28d780e688..96a8084a46 100644 --- a/webrtc/modules/desktop_capture/screen_capturer_integration_test.cc +++ b/webrtc/modules/desktop_capture/screen_capturer_integration_test.cc @@ -17,23 +17,23 @@ #include // TODO(zijiehe): Remove once flaky has been resolved. -#include "webrtc/base/base64.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/constructormagic.h" -#include "webrtc/base/logging.h" -#include "webrtc/modules/desktop_capture/desktop_capturer.h" #include "webrtc/modules/desktop_capture/desktop_capture_options.h" +#include "webrtc/modules/desktop_capture/desktop_capturer.h" #include "webrtc/modules/desktop_capture/desktop_frame.h" #include "webrtc/modules/desktop_capture/desktop_region.h" #include "webrtc/modules/desktop_capture/mock_desktop_capturer_callback.h" #include "webrtc/modules/desktop_capture/rgba_color.h" #include "webrtc/modules/desktop_capture/screen_drawer.h" +#include "webrtc/rtc_base/base64.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/constructormagic.h" +#include "webrtc/rtc_base/logging.h" #include "webrtc/test/gmock.h" #include "webrtc/test/gtest.h" #if defined(WEBRTC_WIN) -#include "webrtc/base/win32.h" #include "webrtc/modules/desktop_capture/win/screen_capturer_win_directx.h" +#include "webrtc/rtc_base/win32.h" #endif // defined(WEBRTC_WIN) using ::testing::_; diff --git a/webrtc/modules/desktop_capture/screen_capturer_unittest.cc b/webrtc/modules/desktop_capture/screen_capturer_unittest.cc index 81ca87a8e4..4aa32202d0 100644 --- a/webrtc/modules/desktop_capture/screen_capturer_unittest.cc +++ b/webrtc/modules/desktop_capture/screen_capturer_unittest.cc @@ -10,13 +10,13 @@ #include -#include "webrtc/base/constructormagic.h" -#include "webrtc/base/logging.h" -#include "webrtc/modules/desktop_capture/desktop_capturer.h" #include "webrtc/modules/desktop_capture/desktop_capture_options.h" +#include "webrtc/modules/desktop_capture/desktop_capturer.h" #include "webrtc/modules/desktop_capture/desktop_frame.h" #include "webrtc/modules/desktop_capture/desktop_region.h" #include "webrtc/modules/desktop_capture/mock_desktop_capturer_callback.h" +#include "webrtc/rtc_base/constructormagic.h" +#include "webrtc/rtc_base/logging.h" #include "webrtc/test/gmock.h" #include "webrtc/test/gtest.h" diff --git a/webrtc/modules/desktop_capture/screen_capturer_x11.cc b/webrtc/modules/desktop_capture/screen_capturer_x11.cc index 8cc77afe0b..ecc2c96533 100644 --- a/webrtc/modules/desktop_capture/screen_capturer_x11.cc +++ b/webrtc/modules/desktop_capture/screen_capturer_x11.cc @@ -19,17 +19,17 @@ #include #include -#include "webrtc/base/checks.h" -#include "webrtc/base/constructormagic.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/timeutils.h" -#include "webrtc/modules/desktop_capture/desktop_capturer.h" #include "webrtc/modules/desktop_capture/desktop_capture_options.h" +#include "webrtc/modules/desktop_capture/desktop_capturer.h" #include "webrtc/modules/desktop_capture/desktop_frame.h" #include "webrtc/modules/desktop_capture/screen_capture_frame_queue.h" #include "webrtc/modules/desktop_capture/screen_capturer_helper.h" #include "webrtc/modules/desktop_capture/shared_desktop_frame.h" #include "webrtc/modules/desktop_capture/x11/x_server_pixel_buffer.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/constructormagic.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/timeutils.h" namespace webrtc { namespace { diff --git a/webrtc/modules/desktop_capture/screen_drawer_linux.cc b/webrtc/modules/desktop_capture/screen_drawer_linux.cc index 0dd4036219..9a9c20db47 100644 --- a/webrtc/modules/desktop_capture/screen_drawer_linux.cc +++ b/webrtc/modules/desktop_capture/screen_drawer_linux.cc @@ -16,9 +16,9 @@ #include -#include "webrtc/base/checks.h" #include "webrtc/modules/desktop_capture/screen_drawer.h" #include "webrtc/modules/desktop_capture/x11/shared_x_display.h" +#include "webrtc/rtc_base/checks.h" #include "webrtc/system_wrappers/include/sleep.h" namespace webrtc { diff --git a/webrtc/modules/desktop_capture/screen_drawer_unittest.cc b/webrtc/modules/desktop_capture/screen_drawer_unittest.cc index e6f02eff4e..a99395b4df 100644 --- a/webrtc/modules/desktop_capture/screen_drawer_unittest.cc +++ b/webrtc/modules/desktop_capture/screen_drawer_unittest.cc @@ -12,9 +12,9 @@ #include -#include "webrtc/base/logging.h" -#include "webrtc/base/random.h" -#include "webrtc/base/timeutils.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/random.h" +#include "webrtc/rtc_base/timeutils.h" #include "webrtc/system_wrappers/include/sleep.h" #include "webrtc/test/gtest.h" diff --git a/webrtc/modules/desktop_capture/shared_desktop_frame.cc b/webrtc/modules/desktop_capture/shared_desktop_frame.cc index d825140828..651e43af60 100644 --- a/webrtc/modules/desktop_capture/shared_desktop_frame.cc +++ b/webrtc/modules/desktop_capture/shared_desktop_frame.cc @@ -12,7 +12,7 @@ #include -#include "webrtc/base/constructormagic.h" +#include "webrtc/rtc_base/constructormagic.h" namespace webrtc { diff --git a/webrtc/modules/desktop_capture/shared_desktop_frame.h b/webrtc/modules/desktop_capture/shared_desktop_frame.h index f4c3b67342..4b1d7ba04f 100644 --- a/webrtc/modules/desktop_capture/shared_desktop_frame.h +++ b/webrtc/modules/desktop_capture/shared_desktop_frame.h @@ -11,10 +11,10 @@ #ifndef WEBRTC_MODULES_DESKTOP_CAPTURE_SHARED_DESKTOP_FRAME_H_ #define WEBRTC_MODULES_DESKTOP_CAPTURE_SHARED_DESKTOP_FRAME_H_ -#include "webrtc/base/constructormagic.h" -#include "webrtc/base/refcount.h" -#include "webrtc/base/scoped_ref_ptr.h" #include "webrtc/modules/desktop_capture/desktop_frame.h" +#include "webrtc/rtc_base/constructormagic.h" +#include "webrtc/rtc_base/refcount.h" +#include "webrtc/rtc_base/scoped_ref_ptr.h" namespace webrtc { diff --git a/webrtc/modules/desktop_capture/shared_memory.h b/webrtc/modules/desktop_capture/shared_memory.h index e654d95f2d..8d283fbcbe 100644 --- a/webrtc/modules/desktop_capture/shared_memory.h +++ b/webrtc/modules/desktop_capture/shared_memory.h @@ -19,8 +19,8 @@ #include -#include "webrtc/base/constructormagic.h" -#include "webrtc/base/thread_checker.h" +#include "webrtc/rtc_base/constructormagic.h" +#include "webrtc/rtc_base/thread_checker.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/desktop_capture/test_utils.cc b/webrtc/modules/desktop_capture/test_utils.cc index a312a3feac..e2b428ed46 100644 --- a/webrtc/modules/desktop_capture/test_utils.cc +++ b/webrtc/modules/desktop_capture/test_utils.cc @@ -12,7 +12,7 @@ #include -#include "webrtc/base/checks.h" +#include "webrtc/rtc_base/checks.h" namespace webrtc { diff --git a/webrtc/modules/desktop_capture/test_utils_unittest.cc b/webrtc/modules/desktop_capture/test_utils_unittest.cc index 8d3389f715..fd8fa942cf 100644 --- a/webrtc/modules/desktop_capture/test_utils_unittest.cc +++ b/webrtc/modules/desktop_capture/test_utils_unittest.cc @@ -10,8 +10,8 @@ #include "webrtc/modules/desktop_capture/test_utils.h" -#include "webrtc/base/checks.h" #include "webrtc/modules/desktop_capture/rgba_color.h" +#include "webrtc/rtc_base/checks.h" #include "webrtc/test/gtest.h" namespace webrtc { diff --git a/webrtc/modules/desktop_capture/win/cursor.cc b/webrtc/modules/desktop_capture/win/cursor.cc index ebdd20dea2..8e3d34b39a 100644 --- a/webrtc/modules/desktop_capture/win/cursor.cc +++ b/webrtc/modules/desktop_capture/win/cursor.cc @@ -13,11 +13,11 @@ #include #include -#include "webrtc/base/logging.h" -#include "webrtc/modules/desktop_capture/win/scoped_gdi_object.h" #include "webrtc/modules/desktop_capture/desktop_frame.h" #include "webrtc/modules/desktop_capture/desktop_geometry.h" #include "webrtc/modules/desktop_capture/mouse_cursor.h" +#include "webrtc/modules/desktop_capture/win/scoped_gdi_object.h" +#include "webrtc/rtc_base/logging.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/desktop_capture/win/d3d_device.cc b/webrtc/modules/desktop_capture/win/d3d_device.cc index f1d3c57242..190993c3e6 100644 --- a/webrtc/modules/desktop_capture/win/d3d_device.cc +++ b/webrtc/modules/desktop_capture/win/d3d_device.cc @@ -12,7 +12,7 @@ #include -#include "webrtc/base/logging.h" +#include "webrtc/rtc_base/logging.h" namespace webrtc { diff --git a/webrtc/modules/desktop_capture/win/desktop.cc b/webrtc/modules/desktop_capture/win/desktop.cc index 72d1570a6b..4a7c263402 100644 --- a/webrtc/modules/desktop_capture/win/desktop.cc +++ b/webrtc/modules/desktop_capture/win/desktop.cc @@ -12,7 +12,7 @@ #include -#include "webrtc/base/logging.h" +#include "webrtc/rtc_base/logging.h" namespace webrtc { diff --git a/webrtc/modules/desktop_capture/win/desktop.h b/webrtc/modules/desktop_capture/win/desktop.h index bc4192d848..673731679f 100644 --- a/webrtc/modules/desktop_capture/win/desktop.h +++ b/webrtc/modules/desktop_capture/win/desktop.h @@ -14,7 +14,7 @@ #include #include -#include "webrtc/base/constructormagic.h" +#include "webrtc/rtc_base/constructormagic.h" namespace webrtc { diff --git a/webrtc/modules/desktop_capture/win/dxgi_adapter_duplicator.cc b/webrtc/modules/desktop_capture/win/dxgi_adapter_duplicator.cc index 0d76bd7c31..4870c754d2 100644 --- a/webrtc/modules/desktop_capture/win/dxgi_adapter_duplicator.cc +++ b/webrtc/modules/desktop_capture/win/dxgi_adapter_duplicator.cc @@ -15,8 +15,8 @@ #include -#include "webrtc/base/checks.h" -#include "webrtc/base/logging.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/logging.h" namespace webrtc { diff --git a/webrtc/modules/desktop_capture/win/dxgi_duplicator_controller.cc b/webrtc/modules/desktop_capture/win/dxgi_duplicator_controller.cc index 9ade05b3a3..1c015e4a82 100644 --- a/webrtc/modules/desktop_capture/win/dxgi_duplicator_controller.cc +++ b/webrtc/modules/desktop_capture/win/dxgi_duplicator_controller.cc @@ -15,12 +15,12 @@ #include #include -#include "webrtc/base/checks.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/timeutils.h" #include "webrtc/modules/desktop_capture/desktop_capture_types.h" #include "webrtc/modules/desktop_capture/win/dxgi_frame.h" #include "webrtc/modules/desktop_capture/win/screen_capture_utils.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/timeutils.h" #include "webrtc/system_wrappers/include/sleep.h" namespace webrtc { diff --git a/webrtc/modules/desktop_capture/win/dxgi_duplicator_controller.h b/webrtc/modules/desktop_capture/win/dxgi_duplicator_controller.h index a254b6d141..41a876b1f3 100644 --- a/webrtc/modules/desktop_capture/win/dxgi_duplicator_controller.h +++ b/webrtc/modules/desktop_capture/win/dxgi_duplicator_controller.h @@ -16,8 +16,6 @@ #include #include -#include "webrtc/base/criticalsection.h" -#include "webrtc/base/scoped_ref_ptr.h" #include "webrtc/modules/desktop_capture/desktop_geometry.h" #include "webrtc/modules/desktop_capture/resolution_change_detector.h" #include "webrtc/modules/desktop_capture/shared_desktop_frame.h" @@ -25,6 +23,8 @@ #include "webrtc/modules/desktop_capture/win/dxgi_adapter_duplicator.h" #include "webrtc/modules/desktop_capture/win/dxgi_context.h" #include "webrtc/modules/desktop_capture/win/dxgi_frame.h" +#include "webrtc/rtc_base/criticalsection.h" +#include "webrtc/rtc_base/scoped_ref_ptr.h" namespace webrtc { diff --git a/webrtc/modules/desktop_capture/win/dxgi_frame.cc b/webrtc/modules/desktop_capture/win/dxgi_frame.cc index 79a9016b0f..5213f9059e 100644 --- a/webrtc/modules/desktop_capture/win/dxgi_frame.cc +++ b/webrtc/modules/desktop_capture/win/dxgi_frame.cc @@ -14,10 +14,10 @@ #include -#include "webrtc/base/checks.h" -#include "webrtc/base/logging.h" #include "webrtc/modules/desktop_capture/desktop_frame.h" #include "webrtc/modules/desktop_capture/win/dxgi_duplicator_controller.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/logging.h" namespace webrtc { diff --git a/webrtc/modules/desktop_capture/win/dxgi_output_duplicator.cc b/webrtc/modules/desktop_capture/win/dxgi_output_duplicator.cc index c02fc91fa2..741d5dad3f 100644 --- a/webrtc/modules/desktop_capture/win/dxgi_output_duplicator.cc +++ b/webrtc/modules/desktop_capture/win/dxgi_output_duplicator.cc @@ -19,10 +19,10 @@ #include -#include "webrtc/base/checks.h" -#include "webrtc/base/logging.h" #include "webrtc/modules/desktop_capture/win/dxgi_texture_mapping.h" #include "webrtc/modules/desktop_capture/win/dxgi_texture_staging.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/logging.h" namespace webrtc { diff --git a/webrtc/modules/desktop_capture/win/dxgi_output_duplicator.h b/webrtc/modules/desktop_capture/win/dxgi_output_duplicator.h index dfc19af61c..0aa7eddcaa 100644 --- a/webrtc/modules/desktop_capture/win/dxgi_output_duplicator.h +++ b/webrtc/modules/desktop_capture/win/dxgi_output_duplicator.h @@ -19,15 +19,15 @@ #include #include -#include "webrtc/base/criticalsection.h" -#include "webrtc/base/thread_annotations.h" +#include "webrtc/modules/desktop_capture/desktop_frame_rotation.h" #include "webrtc/modules/desktop_capture/desktop_geometry.h" #include "webrtc/modules/desktop_capture/desktop_region.h" -#include "webrtc/modules/desktop_capture/desktop_frame_rotation.h" #include "webrtc/modules/desktop_capture/shared_desktop_frame.h" #include "webrtc/modules/desktop_capture/win/d3d_device.h" #include "webrtc/modules/desktop_capture/win/dxgi_context.h" #include "webrtc/modules/desktop_capture/win/dxgi_texture.h" +#include "webrtc/rtc_base/criticalsection.h" +#include "webrtc/rtc_base/thread_annotations.h" namespace webrtc { diff --git a/webrtc/modules/desktop_capture/win/dxgi_texture.cc b/webrtc/modules/desktop_capture/win/dxgi_texture.cc index 4fc27d6641..60f181bc93 100644 --- a/webrtc/modules/desktop_capture/win/dxgi_texture.cc +++ b/webrtc/modules/desktop_capture/win/dxgi_texture.cc @@ -14,9 +14,9 @@ #include #include -#include "webrtc/base/checks.h" -#include "webrtc/base/logging.h" #include "webrtc/modules/desktop_capture/desktop_region.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/logging.h" using Microsoft::WRL::ComPtr; diff --git a/webrtc/modules/desktop_capture/win/dxgi_texture_mapping.cc b/webrtc/modules/desktop_capture/win/dxgi_texture_mapping.cc index 02c49592b4..90d8e896f1 100644 --- a/webrtc/modules/desktop_capture/win/dxgi_texture_mapping.cc +++ b/webrtc/modules/desktop_capture/win/dxgi_texture_mapping.cc @@ -14,8 +14,8 @@ #include #include -#include "webrtc/base/checks.h" -#include "webrtc/base/logging.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/logging.h" namespace webrtc { diff --git a/webrtc/modules/desktop_capture/win/dxgi_texture_staging.cc b/webrtc/modules/desktop_capture/win/dxgi_texture_staging.cc index d0a50ba66d..48dc02748b 100644 --- a/webrtc/modules/desktop_capture/win/dxgi_texture_staging.cc +++ b/webrtc/modules/desktop_capture/win/dxgi_texture_staging.cc @@ -15,8 +15,8 @@ #include #include -#include "webrtc/base/checks.h" -#include "webrtc/base/logging.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/logging.h" using Microsoft::WRL::ComPtr; diff --git a/webrtc/modules/desktop_capture/win/scoped_gdi_object.h b/webrtc/modules/desktop_capture/win/scoped_gdi_object.h index 1cac63e43d..f0d5477aa5 100644 --- a/webrtc/modules/desktop_capture/win/scoped_gdi_object.h +++ b/webrtc/modules/desktop_capture/win/scoped_gdi_object.h @@ -13,7 +13,7 @@ #include -#include "webrtc/base/constructormagic.h" +#include "webrtc/rtc_base/constructormagic.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/desktop_capture/win/scoped_thread_desktop.h b/webrtc/modules/desktop_capture/win/scoped_thread_desktop.h index 023e6df9a8..a495bebbf5 100644 --- a/webrtc/modules/desktop_capture/win/scoped_thread_desktop.h +++ b/webrtc/modules/desktop_capture/win/scoped_thread_desktop.h @@ -15,7 +15,7 @@ #include -#include "webrtc/base/constructormagic.h" +#include "webrtc/rtc_base/constructormagic.h" namespace webrtc { diff --git a/webrtc/modules/desktop_capture/win/screen_capture_utils.cc b/webrtc/modules/desktop_capture/win/screen_capture_utils.cc index 7d9203f27b..9fa5c8b12d 100644 --- a/webrtc/modules/desktop_capture/win/screen_capture_utils.cc +++ b/webrtc/modules/desktop_capture/win/screen_capture_utils.cc @@ -12,7 +12,7 @@ #include -#include "webrtc/base/checks.h" +#include "webrtc/rtc_base/checks.h" namespace webrtc { diff --git a/webrtc/modules/desktop_capture/win/screen_capturer_win_directx.cc b/webrtc/modules/desktop_capture/win/screen_capturer_win_directx.cc index f865a1e6e0..74b7b4501a 100644 --- a/webrtc/modules/desktop_capture/win/screen_capturer_win_directx.cc +++ b/webrtc/modules/desktop_capture/win/screen_capturer_win_directx.cc @@ -13,11 +13,11 @@ #include #include -#include "webrtc/base/checks.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/ptr_util.h" -#include "webrtc/base/timeutils.h" #include "webrtc/modules/desktop_capture/desktop_frame.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/ptr_util.h" +#include "webrtc/rtc_base/timeutils.h" namespace webrtc { diff --git a/webrtc/modules/desktop_capture/win/screen_capturer_win_directx.h b/webrtc/modules/desktop_capture/win/screen_capturer_win_directx.h index 67f177e2ca..5064a9623b 100644 --- a/webrtc/modules/desktop_capture/win/screen_capturer_win_directx.h +++ b/webrtc/modules/desktop_capture/win/screen_capturer_win_directx.h @@ -16,13 +16,13 @@ #include #include -#include "webrtc/base/scoped_ref_ptr.h" -#include "webrtc/modules/desktop_capture/desktop_capturer.h" #include "webrtc/modules/desktop_capture/desktop_capture_options.h" +#include "webrtc/modules/desktop_capture/desktop_capturer.h" #include "webrtc/modules/desktop_capture/desktop_region.h" #include "webrtc/modules/desktop_capture/screen_capture_frame_queue.h" #include "webrtc/modules/desktop_capture/win/dxgi_duplicator_controller.h" #include "webrtc/modules/desktop_capture/win/dxgi_frame.h" +#include "webrtc/rtc_base/scoped_ref_ptr.h" namespace webrtc { diff --git a/webrtc/modules/desktop_capture/win/screen_capturer_win_gdi.cc b/webrtc/modules/desktop_capture/win/screen_capturer_win_gdi.cc index 5525381486..44c81ff12c 100644 --- a/webrtc/modules/desktop_capture/win/screen_capturer_win_gdi.cc +++ b/webrtc/modules/desktop_capture/win/screen_capturer_win_gdi.cc @@ -12,9 +12,6 @@ #include -#include "webrtc/base/checks.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/timeutils.h" #include "webrtc/modules/desktop_capture/desktop_capture_options.h" #include "webrtc/modules/desktop_capture/desktop_frame.h" #include "webrtc/modules/desktop_capture/desktop_frame_win.h" @@ -23,6 +20,9 @@ #include "webrtc/modules/desktop_capture/win/cursor.h" #include "webrtc/modules/desktop_capture/win/desktop.h" #include "webrtc/modules/desktop_capture/win/screen_capture_utils.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/timeutils.h" namespace webrtc { diff --git a/webrtc/modules/desktop_capture/win/screen_capturer_win_gdi.h b/webrtc/modules/desktop_capture/win/screen_capturer_win_gdi.h index 05c0283a36..70a939d760 100644 --- a/webrtc/modules/desktop_capture/win/screen_capturer_win_gdi.h +++ b/webrtc/modules/desktop_capture/win/screen_capturer_win_gdi.h @@ -15,11 +15,11 @@ #include -#include "webrtc/base/constructormagic.h" #include "webrtc/modules/desktop_capture/desktop_capturer.h" #include "webrtc/modules/desktop_capture/screen_capture_frame_queue.h" #include "webrtc/modules/desktop_capture/shared_desktop_frame.h" #include "webrtc/modules/desktop_capture/win/scoped_thread_desktop.h" +#include "webrtc/rtc_base/constructormagic.h" namespace webrtc { diff --git a/webrtc/modules/desktop_capture/win/screen_capturer_win_magnifier.cc b/webrtc/modules/desktop_capture/win/screen_capturer_win_magnifier.cc index b1cbacd745..f744f42aaf 100644 --- a/webrtc/modules/desktop_capture/win/screen_capturer_win_magnifier.cc +++ b/webrtc/modules/desktop_capture/win/screen_capturer_win_magnifier.cc @@ -12,9 +12,6 @@ #include -#include "webrtc/base/checks.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/timeutils.h" #include "webrtc/modules/desktop_capture/desktop_capture_options.h" #include "webrtc/modules/desktop_capture/desktop_frame.h" #include "webrtc/modules/desktop_capture/desktop_frame_win.h" @@ -23,6 +20,9 @@ #include "webrtc/modules/desktop_capture/win/cursor.h" #include "webrtc/modules/desktop_capture/win/desktop.h" #include "webrtc/modules/desktop_capture/win/screen_capture_utils.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/timeutils.h" namespace webrtc { diff --git a/webrtc/modules/desktop_capture/win/screen_capturer_win_magnifier.h b/webrtc/modules/desktop_capture/win/screen_capturer_win_magnifier.h index 7f1f55a121..680bac3ff8 100644 --- a/webrtc/modules/desktop_capture/win/screen_capturer_win_magnifier.h +++ b/webrtc/modules/desktop_capture/win/screen_capturer_win_magnifier.h @@ -17,12 +17,12 @@ #include #include -#include "webrtc/base/constructormagic.h" #include "webrtc/modules/desktop_capture/desktop_capturer.h" #include "webrtc/modules/desktop_capture/screen_capture_frame_queue.h" #include "webrtc/modules/desktop_capture/screen_capturer_helper.h" #include "webrtc/modules/desktop_capture/shared_desktop_frame.h" #include "webrtc/modules/desktop_capture/win/scoped_thread_desktop.h" +#include "webrtc/rtc_base/constructormagic.h" #include "webrtc/system_wrappers/include/atomic32.h" namespace webrtc { diff --git a/webrtc/modules/desktop_capture/win/window_capture_utils.h b/webrtc/modules/desktop_capture/win/window_capture_utils.h index 85bca4c824..c13cad7bda 100644 --- a/webrtc/modules/desktop_capture/win/window_capture_utils.h +++ b/webrtc/modules/desktop_capture/win/window_capture_utils.h @@ -10,8 +10,8 @@ #include -#include "webrtc/base/constructormagic.h" #include "webrtc/modules/desktop_capture/desktop_geometry.h" +#include "webrtc/rtc_base/constructormagic.h" namespace webrtc { diff --git a/webrtc/modules/desktop_capture/window_capturer_null.cc b/webrtc/modules/desktop_capture/window_capturer_null.cc old mode 100755 new mode 100644 index e75621c473..d4ef9b940a --- a/webrtc/modules/desktop_capture/window_capturer_null.cc +++ b/webrtc/modules/desktop_capture/window_capturer_null.cc @@ -10,9 +10,9 @@ #include -#include "webrtc/base/constructormagic.h" #include "webrtc/modules/desktop_capture/desktop_capturer.h" #include "webrtc/modules/desktop_capture/desktop_frame.h" +#include "webrtc/rtc_base/constructormagic.h" namespace webrtc { diff --git a/webrtc/modules/desktop_capture/window_capturer_win.cc b/webrtc/modules/desktop_capture/window_capturer_win.cc index 0ca88cfa55..4fffd6bcc3 100644 --- a/webrtc/modules/desktop_capture/window_capturer_win.cc +++ b/webrtc/modules/desktop_capture/window_capturer_win.cc @@ -12,13 +12,13 @@ #include -#include "webrtc/base/checks.h" -#include "webrtc/base/constructormagic.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/win32.h" #include "webrtc/modules/desktop_capture/desktop_capturer.h" #include "webrtc/modules/desktop_capture/desktop_frame_win.h" #include "webrtc/modules/desktop_capture/win/window_capture_utils.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/constructormagic.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/win32.h" namespace webrtc { diff --git a/webrtc/modules/desktop_capture/window_capturer_x11.cc b/webrtc/modules/desktop_capture/window_capturer_x11.cc index d794e8a718..ffe8a3ab9b 100644 --- a/webrtc/modules/desktop_capture/window_capturer_x11.cc +++ b/webrtc/modules/desktop_capture/window_capturer_x11.cc @@ -17,15 +17,15 @@ #include -#include "webrtc/base/constructormagic.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/scoped_ref_ptr.h" -#include "webrtc/modules/desktop_capture/desktop_capturer.h" #include "webrtc/modules/desktop_capture/desktop_capture_options.h" +#include "webrtc/modules/desktop_capture/desktop_capturer.h" #include "webrtc/modules/desktop_capture/desktop_frame.h" #include "webrtc/modules/desktop_capture/x11/shared_x_display.h" #include "webrtc/modules/desktop_capture/x11/x_error_trap.h" #include "webrtc/modules/desktop_capture/x11/x_server_pixel_buffer.h" +#include "webrtc/rtc_base/constructormagic.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/scoped_ref_ptr.h" namespace webrtc { diff --git a/webrtc/modules/desktop_capture/x11/shared_x_display.cc b/webrtc/modules/desktop_capture/x11/shared_x_display.cc index 691fe56876..853d50fb9a 100644 --- a/webrtc/modules/desktop_capture/x11/shared_x_display.cc +++ b/webrtc/modules/desktop_capture/x11/shared_x_display.cc @@ -14,8 +14,8 @@ #include -#include "webrtc/base/checks.h" -#include "webrtc/base/logging.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/logging.h" namespace webrtc { diff --git a/webrtc/modules/desktop_capture/x11/shared_x_display.h b/webrtc/modules/desktop_capture/x11/shared_x_display.h index 648f67a51f..3dcd2fd214 100644 --- a/webrtc/modules/desktop_capture/x11/shared_x_display.h +++ b/webrtc/modules/desktop_capture/x11/shared_x_display.h @@ -16,8 +16,8 @@ #include -#include "webrtc/base/constructormagic.h" -#include "webrtc/base/scoped_ref_ptr.h" +#include "webrtc/rtc_base/constructormagic.h" +#include "webrtc/rtc_base/scoped_ref_ptr.h" #include "webrtc/system_wrappers/include/atomic32.h" // Including Xlib.h will involve evil defines (Bool, Status, True, False), which diff --git a/webrtc/modules/desktop_capture/x11/x_error_trap.h b/webrtc/modules/desktop_capture/x11/x_error_trap.h index f1f6e11c63..70414a4cc6 100644 --- a/webrtc/modules/desktop_capture/x11/x_error_trap.h +++ b/webrtc/modules/desktop_capture/x11/x_error_trap.h @@ -13,7 +13,7 @@ #include -#include "webrtc/base/constructormagic.h" +#include "webrtc/rtc_base/constructormagic.h" namespace webrtc { diff --git a/webrtc/modules/desktop_capture/x11/x_server_pixel_buffer.cc b/webrtc/modules/desktop_capture/x11/x_server_pixel_buffer.cc index dc95eb6932..26c334eafd 100644 --- a/webrtc/modules/desktop_capture/x11/x_server_pixel_buffer.cc +++ b/webrtc/modules/desktop_capture/x11/x_server_pixel_buffer.cc @@ -14,9 +14,9 @@ #include #include -#include "webrtc/base/logging.h" #include "webrtc/modules/desktop_capture/desktop_frame.h" #include "webrtc/modules/desktop_capture/x11/x_error_trap.h" +#include "webrtc/rtc_base/logging.h" namespace webrtc { diff --git a/webrtc/modules/desktop_capture/x11/x_server_pixel_buffer.h b/webrtc/modules/desktop_capture/x11/x_server_pixel_buffer.h index 51160c57fa..5a4cf2180d 100644 --- a/webrtc/modules/desktop_capture/x11/x_server_pixel_buffer.h +++ b/webrtc/modules/desktop_capture/x11/x_server_pixel_buffer.h @@ -13,8 +13,8 @@ #ifndef WEBRTC_MODULES_DESKTOP_CAPTURE_X11_X_SERVER_PIXEL_BUFFER_H_ #define WEBRTC_MODULES_DESKTOP_CAPTURE_X11_X_SERVER_PIXEL_BUFFER_H_ -#include "webrtc/base/constructormagic.h" #include "webrtc/modules/desktop_capture/desktop_geometry.h" +#include "webrtc/rtc_base/constructormagic.h" #include #include diff --git a/webrtc/modules/include/module_common_types.h b/webrtc/modules/include/module_common_types.h index abf8b94697..36024f6108 100644 --- a/webrtc/modules/include/module_common_types.h +++ b/webrtc/modules/include/module_common_types.h @@ -18,14 +18,14 @@ #include #include "webrtc/api/video/video_rotation.h" -#include "webrtc/base/constructormagic.h" -#include "webrtc/base/deprecation.h" -#include "webrtc/base/optional.h" -#include "webrtc/base/safe_conversions.h" #include "webrtc/common_types.h" #include "webrtc/modules/video_coding/codecs/h264/include/h264_globals.h" #include "webrtc/modules/video_coding/codecs/vp8/include/vp8_globals.h" #include "webrtc/modules/video_coding/codecs/vp9/include/vp9_globals.h" +#include "webrtc/rtc_base/constructormagic.h" +#include "webrtc/rtc_base/deprecation.h" +#include "webrtc/rtc_base/optional.h" +#include "webrtc/rtc_base/safe_conversions.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/media_file/media_file_impl.cc b/webrtc/modules/media_file/media_file_impl.cc index e35626c760..56dc9c8e9a 100644 --- a/webrtc/modules/media_file/media_file_impl.cc +++ b/webrtc/modules/media_file/media_file_impl.cc @@ -10,8 +10,8 @@ #include -#include "webrtc/base/format_macros.h" #include "webrtc/modules/media_file/media_file_impl.h" +#include "webrtc/rtc_base/format_macros.h" #include "webrtc/system_wrappers/include/file_wrapper.h" #include "webrtc/system_wrappers/include/trace.h" diff --git a/webrtc/modules/media_file/media_file_impl.h b/webrtc/modules/media_file/media_file_impl.h index 7d974ef313..664030a0f1 100644 --- a/webrtc/modules/media_file/media_file_impl.h +++ b/webrtc/modules/media_file/media_file_impl.h @@ -11,12 +11,12 @@ #ifndef WEBRTC_MODULES_MEDIA_FILE_MEDIA_FILE_IMPL_H_ #define WEBRTC_MODULES_MEDIA_FILE_MEDIA_FILE_IMPL_H_ -#include "webrtc/base/criticalsection.h" #include "webrtc/common_types.h" #include "webrtc/modules/include/module_common_types.h" #include "webrtc/modules/media_file/media_file.h" #include "webrtc/modules/media_file/media_file_defines.h" #include "webrtc/modules/media_file/media_file_utility.h" +#include "webrtc/rtc_base/criticalsection.h" namespace webrtc { class MediaFileImpl : public MediaFile diff --git a/webrtc/modules/media_file/media_file_utility.cc b/webrtc/modules/media_file/media_file_utility.cc index ae8d06f634..d30581230c 100644 --- a/webrtc/modules/media_file/media_file_utility.cc +++ b/webrtc/modules/media_file/media_file_utility.cc @@ -15,10 +15,10 @@ #include #include -#include "webrtc/base/format_macros.h" #include "webrtc/common_audio/wav_header.h" #include "webrtc/common_types.h" #include "webrtc/modules/include/module_common_types.h" +#include "webrtc/rtc_base/format_macros.h" #include "webrtc/system_wrappers/include/file_wrapper.h" #include "webrtc/system_wrappers/include/trace.h" #include "webrtc/typedefs.h" diff --git a/webrtc/modules/pacing/alr_detector.cc b/webrtc/modules/pacing/alr_detector.cc index 5066e6ff79..33433336fd 100644 --- a/webrtc/modules/pacing/alr_detector.cc +++ b/webrtc/modules/pacing/alr_detector.cc @@ -12,9 +12,9 @@ #include -#include "webrtc/base/checks.h" -#include "webrtc/base/format_macros.h" -#include "webrtc/base/logging.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/format_macros.h" +#include "webrtc/rtc_base/logging.h" #include "webrtc/system_wrappers/include/field_trial.h" namespace { diff --git a/webrtc/modules/pacing/alr_detector.h b/webrtc/modules/pacing/alr_detector.h index 087e444da1..df0b7d2407 100644 --- a/webrtc/modules/pacing/alr_detector.h +++ b/webrtc/modules/pacing/alr_detector.h @@ -11,10 +11,10 @@ #ifndef WEBRTC_MODULES_PACING_ALR_DETECTOR_H_ #define WEBRTC_MODULES_PACING_ALR_DETECTOR_H_ -#include "webrtc/base/optional.h" -#include "webrtc/base/rate_statistics.h" #include "webrtc/common_types.h" #include "webrtc/modules/pacing/paced_sender.h" +#include "webrtc/rtc_base/optional.h" +#include "webrtc/rtc_base/rate_statistics.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/pacing/bitrate_prober.cc b/webrtc/modules/pacing/bitrate_prober.cc index 1f515bfb1a..8f676af678 100644 --- a/webrtc/modules/pacing/bitrate_prober.cc +++ b/webrtc/modules/pacing/bitrate_prober.cc @@ -12,10 +12,10 @@ #include -#include "webrtc/base/checks.h" -#include "webrtc/base/logging.h" #include "webrtc/logging/rtc_event_log/rtc_event_log.h" #include "webrtc/modules/pacing/paced_sender.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/logging.h" namespace webrtc { diff --git a/webrtc/modules/pacing/bitrate_prober.h b/webrtc/modules/pacing/bitrate_prober.h index 510b2bd568..a88898fc03 100644 --- a/webrtc/modules/pacing/bitrate_prober.h +++ b/webrtc/modules/pacing/bitrate_prober.h @@ -13,8 +13,8 @@ #include -#include "webrtc/base/basictypes.h" #include "webrtc/modules/include/module_common_types.h" +#include "webrtc/rtc_base/basictypes.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/pacing/paced_sender.cc b/webrtc/modules/pacing/paced_sender.cc index 913dbfc274..4a66581e78 100644 --- a/webrtc/modules/pacing/paced_sender.cc +++ b/webrtc/modules/pacing/paced_sender.cc @@ -16,12 +16,12 @@ #include #include -#include "webrtc/base/checks.h" -#include "webrtc/base/logging.h" #include "webrtc/modules/include/module_common_types.h" #include "webrtc/modules/pacing/alr_detector.h" #include "webrtc/modules/pacing/bitrate_prober.h" #include "webrtc/modules/utility/include/process_thread.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/logging.h" #include "webrtc/system_wrappers/include/clock.h" #include "webrtc/system_wrappers/include/field_trial.h" diff --git a/webrtc/modules/pacing/paced_sender.h b/webrtc/modules/pacing/paced_sender.h index be1318d42b..a547aab70f 100644 --- a/webrtc/modules/pacing/paced_sender.h +++ b/webrtc/modules/pacing/paced_sender.h @@ -15,11 +15,11 @@ #include #include -#include "webrtc/base/criticalsection.h" -#include "webrtc/base/optional.h" -#include "webrtc/base/thread_annotations.h" #include "webrtc/modules/include/module.h" #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" +#include "webrtc/rtc_base/criticalsection.h" +#include "webrtc/rtc_base/optional.h" +#include "webrtc/rtc_base/thread_annotations.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/pacing/packet_router.cc b/webrtc/modules/pacing/packet_router.cc index d5fd8b98d2..1cee90a441 100644 --- a/webrtc/modules/pacing/packet_router.cc +++ b/webrtc/modules/pacing/packet_router.cc @@ -10,12 +10,12 @@ #include "webrtc/modules/pacing/packet_router.h" -#include "webrtc/base/atomicops.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/timeutils.h" #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp.h" #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h" +#include "webrtc/rtc_base/atomicops.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/timeutils.h" namespace webrtc { diff --git a/webrtc/modules/pacing/packet_router.h b/webrtc/modules/pacing/packet_router.h index 5c90577f2b..12d726a2aa 100644 --- a/webrtc/modules/pacing/packet_router.h +++ b/webrtc/modules/pacing/packet_router.h @@ -14,14 +14,14 @@ #include #include -#include "webrtc/base/constructormagic.h" -#include "webrtc/base/criticalsection.h" -#include "webrtc/base/thread_annotations.h" -#include "webrtc/base/race_checker.h" #include "webrtc/common_types.h" #include "webrtc/modules/pacing/paced_sender.h" #include "webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h" #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" +#include "webrtc/rtc_base/constructormagic.h" +#include "webrtc/rtc_base/criticalsection.h" +#include "webrtc/rtc_base/race_checker.h" +#include "webrtc/rtc_base/thread_annotations.h" namespace webrtc { diff --git a/webrtc/modules/pacing/packet_router_unittest.cc b/webrtc/modules/pacing/packet_router_unittest.cc index 28fea1ddc4..d64d48d519 100644 --- a/webrtc/modules/pacing/packet_router_unittest.cc +++ b/webrtc/modules/pacing/packet_router_unittest.cc @@ -11,12 +11,12 @@ #include #include -#include "webrtc/base/checks.h" -#include "webrtc/base/fakeclock.h" #include "webrtc/modules/pacing/packet_router.h" #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp.h" #include "webrtc/modules/rtp_rtcp/mocks/mock_rtp_rtcp.h" #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/fakeclock.h" #include "webrtc/test/gmock.h" #include "webrtc/test/gtest.h" diff --git a/webrtc/modules/remote_bitrate_estimator/aimd_rate_control.cc b/webrtc/modules/remote_bitrate_estimator/aimd_rate_control.cc index 4b9343c440..d46732c26c 100644 --- a/webrtc/modules/remote_bitrate_estimator/aimd_rate_control.cc +++ b/webrtc/modules/remote_bitrate_estimator/aimd_rate_control.cc @@ -14,8 +14,8 @@ #include #include -#include "webrtc/base/checks.h" -#include "webrtc/base/safe_minmax.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/safe_minmax.h" #include "webrtc/modules/remote_bitrate_estimator/overuse_detector.h" #include "webrtc/modules/remote_bitrate_estimator/include/bwe_defines.h" diff --git a/webrtc/modules/remote_bitrate_estimator/aimd_rate_control.h b/webrtc/modules/remote_bitrate_estimator/aimd_rate_control.h index 6aa2338e00..24cb4d3aa7 100644 --- a/webrtc/modules/remote_bitrate_estimator/aimd_rate_control.h +++ b/webrtc/modules/remote_bitrate_estimator/aimd_rate_control.h @@ -11,8 +11,8 @@ #ifndef WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_AIMD_RATE_CONTROL_H_ #define WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_AIMD_RATE_CONTROL_H_ -#include "webrtc/base/constructormagic.h" #include "webrtc/modules/remote_bitrate_estimator/include/bwe_defines.h" +#include "webrtc/rtc_base/constructormagic.h" namespace webrtc { diff --git a/webrtc/modules/remote_bitrate_estimator/bwe_simulations.cc b/webrtc/modules/remote_bitrate_estimator/bwe_simulations.cc index c8817c1fcb..b3cb98d4e8 100644 --- a/webrtc/modules/remote_bitrate_estimator/bwe_simulations.cc +++ b/webrtc/modules/remote_bitrate_estimator/bwe_simulations.cc @@ -10,15 +10,14 @@ #include -#include "webrtc/base/constructormagic.h" #include "webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h" #include "webrtc/modules/remote_bitrate_estimator/test/bwe_test.h" #include "webrtc/modules/remote_bitrate_estimator/test/packet_receiver.h" #include "webrtc/modules/remote_bitrate_estimator/test/packet_sender.h" +#include "webrtc/rtc_base/constructormagic.h" #include "webrtc/test/gtest.h" #include "webrtc/test/testsupport/fileutils.h" - namespace webrtc { namespace testing { namespace bwe { diff --git a/webrtc/modules/remote_bitrate_estimator/include/bwe_defines.h b/webrtc/modules/remote_bitrate_estimator/include/bwe_defines.h index 7914e8cf2b..470ee37bda 100644 --- a/webrtc/modules/remote_bitrate_estimator/include/bwe_defines.h +++ b/webrtc/modules/remote_bitrate_estimator/include/bwe_defines.h @@ -11,7 +11,7 @@ #ifndef WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_INCLUDE_BWE_DEFINES_H_ #define WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_INCLUDE_BWE_DEFINES_H_ -#include "webrtc/base/optional.h" +#include "webrtc/rtc_base/optional.h" #include "webrtc/typedefs.h" #define BWE_MAX(a, b) ((a) > (b) ? (a) : (b)) diff --git a/webrtc/modules/remote_bitrate_estimator/include/send_time_history.h b/webrtc/modules/remote_bitrate_estimator/include/send_time_history.h index b3bbcfcb68..026670acbf 100644 --- a/webrtc/modules/remote_bitrate_estimator/include/send_time_history.h +++ b/webrtc/modules/remote_bitrate_estimator/include/send_time_history.h @@ -13,9 +13,9 @@ #include -#include "webrtc/base/basictypes.h" -#include "webrtc/base/constructormagic.h" #include "webrtc/modules/include/module_common_types.h" +#include "webrtc/rtc_base/basictypes.h" +#include "webrtc/rtc_base/constructormagic.h" namespace webrtc { class Clock; diff --git a/webrtc/modules/remote_bitrate_estimator/inter_arrival.cc b/webrtc/modules/remote_bitrate_estimator/inter_arrival.cc index 1b2dc43db2..81244f5ddc 100644 --- a/webrtc/modules/remote_bitrate_estimator/inter_arrival.cc +++ b/webrtc/modules/remote_bitrate_estimator/inter_arrival.cc @@ -13,8 +13,8 @@ #include #include -#include "webrtc/base/logging.h" #include "webrtc/modules/include/module_common_types.h" +#include "webrtc/rtc_base/logging.h" namespace webrtc { diff --git a/webrtc/modules/remote_bitrate_estimator/inter_arrival.h b/webrtc/modules/remote_bitrate_estimator/inter_arrival.h index 088b925d2e..00742697f4 100644 --- a/webrtc/modules/remote_bitrate_estimator/inter_arrival.h +++ b/webrtc/modules/remote_bitrate_estimator/inter_arrival.h @@ -13,7 +13,7 @@ #include -#include "webrtc/base/constructormagic.h" +#include "webrtc/rtc_base/constructormagic.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/remote_bitrate_estimator/overuse_detector.cc b/webrtc/modules/remote_bitrate_estimator/overuse_detector.cc index 879cd28afc..b7d5ca39aa 100644 --- a/webrtc/modules/remote_bitrate_estimator/overuse_detector.cc +++ b/webrtc/modules/remote_bitrate_estimator/overuse_detector.cc @@ -17,12 +17,12 @@ #include #include -#include "webrtc/base/checks.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/safe_minmax.h" #include "webrtc/modules/remote_bitrate_estimator/include/bwe_defines.h" #include "webrtc/modules/remote_bitrate_estimator/test/bwe_test_logging.h" #include "webrtc/modules/rtp_rtcp/source/rtp_utility.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/safe_minmax.h" #include "webrtc/system_wrappers/include/field_trial.h" namespace webrtc { diff --git a/webrtc/modules/remote_bitrate_estimator/overuse_detector.h b/webrtc/modules/remote_bitrate_estimator/overuse_detector.h index fc1cc152ec..399bfa4067 100644 --- a/webrtc/modules/remote_bitrate_estimator/overuse_detector.h +++ b/webrtc/modules/remote_bitrate_estimator/overuse_detector.h @@ -12,9 +12,9 @@ #include -#include "webrtc/base/constructormagic.h" #include "webrtc/modules/include/module_common_types.h" #include "webrtc/modules/remote_bitrate_estimator/include/bwe_defines.h" +#include "webrtc/rtc_base/constructormagic.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/remote_bitrate_estimator/overuse_detector_unittest.cc b/webrtc/modules/remote_bitrate_estimator/overuse_detector_unittest.cc index 0178f33ec1..e90a4eee51 100644 --- a/webrtc/modules/remote_bitrate_estimator/overuse_detector_unittest.cc +++ b/webrtc/modules/remote_bitrate_estimator/overuse_detector_unittest.cc @@ -15,12 +15,12 @@ #include #include -#include "webrtc/base/random.h" -#include "webrtc/base/rate_statistics.h" #include "webrtc/common_types.h" #include "webrtc/modules/remote_bitrate_estimator/inter_arrival.h" #include "webrtc/modules/remote_bitrate_estimator/overuse_detector.h" #include "webrtc/modules/remote_bitrate_estimator/overuse_estimator.h" +#include "webrtc/rtc_base/random.h" +#include "webrtc/rtc_base/rate_statistics.h" #include "webrtc/test/field_trial.h" #include "webrtc/test/gtest.h" diff --git a/webrtc/modules/remote_bitrate_estimator/overuse_estimator.cc b/webrtc/modules/remote_bitrate_estimator/overuse_estimator.cc index 0beab30945..27afdd0e11 100644 --- a/webrtc/modules/remote_bitrate_estimator/overuse_estimator.cc +++ b/webrtc/modules/remote_bitrate_estimator/overuse_estimator.cc @@ -17,9 +17,9 @@ #include -#include "webrtc/base/logging.h" #include "webrtc/modules/remote_bitrate_estimator/include/bwe_defines.h" #include "webrtc/modules/remote_bitrate_estimator/test/bwe_test_logging.h" +#include "webrtc/rtc_base/logging.h" namespace webrtc { diff --git a/webrtc/modules/remote_bitrate_estimator/overuse_estimator.h b/webrtc/modules/remote_bitrate_estimator/overuse_estimator.h index 895ed77716..d05ddee944 100644 --- a/webrtc/modules/remote_bitrate_estimator/overuse_estimator.h +++ b/webrtc/modules/remote_bitrate_estimator/overuse_estimator.h @@ -12,9 +12,9 @@ #include -#include "webrtc/base/constructormagic.h" #include "webrtc/common_types.h" #include "webrtc/modules/remote_bitrate_estimator/include/bwe_defines.h" +#include "webrtc/rtc_base/constructormagic.h" namespace webrtc { diff --git a/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time.cc b/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time.cc index 23fbd2aa2c..4f799b3f7d 100644 --- a/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time.cc +++ b/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time.cc @@ -14,12 +14,12 @@ #include -#include "webrtc/base/checks.h" -#include "webrtc/base/constructormagic.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/thread_annotations.h" #include "webrtc/modules/pacing/paced_sender.h" #include "webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/constructormagic.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/thread_annotations.h" #include "webrtc/system_wrappers/include/metrics.h" #include "webrtc/typedefs.h" diff --git a/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time.h b/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time.h index 866c7b8e1b..564b563cc7 100644 --- a/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time.h +++ b/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time.h @@ -16,16 +16,16 @@ #include #include -#include "webrtc/base/checks.h" -#include "webrtc/base/constructormagic.h" -#include "webrtc/base/criticalsection.h" -#include "webrtc/base/rate_statistics.h" -#include "webrtc/base/thread_checker.h" #include "webrtc/modules/remote_bitrate_estimator/aimd_rate_control.h" #include "webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h" #include "webrtc/modules/remote_bitrate_estimator/inter_arrival.h" #include "webrtc/modules/remote_bitrate_estimator/overuse_detector.h" #include "webrtc/modules/remote_bitrate_estimator/overuse_estimator.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/constructormagic.h" +#include "webrtc/rtc_base/criticalsection.h" +#include "webrtc/rtc_base/rate_statistics.h" +#include "webrtc/rtc_base/thread_checker.h" namespace webrtc { diff --git a/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time_unittest.cc b/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time_unittest.cc index 2105e329dd..017cc675fc 100644 --- a/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time_unittest.cc +++ b/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time_unittest.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/base/constructormagic.h" #include "webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time.h" #include "webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_unittest_helper.h" +#include "webrtc/rtc_base/constructormagic.h" namespace webrtc { diff --git a/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream.cc b/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream.cc index 5ac8746b44..efc5430d41 100644 --- a/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream.cc +++ b/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream.cc @@ -12,13 +12,13 @@ #include -#include "webrtc/base/constructormagic.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/thread_annotations.h" #include "webrtc/modules/remote_bitrate_estimator/aimd_rate_control.h" #include "webrtc/modules/remote_bitrate_estimator/inter_arrival.h" #include "webrtc/modules/remote_bitrate_estimator/overuse_detector.h" #include "webrtc/modules/remote_bitrate_estimator/overuse_estimator.h" +#include "webrtc/rtc_base/constructormagic.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/thread_annotations.h" #include "webrtc/system_wrappers/include/clock.h" #include "webrtc/system_wrappers/include/metrics.h" #include "webrtc/typedefs.h" diff --git a/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream.h b/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream.h index 0b78bfc332..baccf52eec 100644 --- a/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream.h +++ b/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream.h @@ -15,11 +15,11 @@ #include #include -#include "webrtc/base/constructormagic.h" -#include "webrtc/base/criticalsection.h" -#include "webrtc/base/rate_statistics.h" #include "webrtc/modules/remote_bitrate_estimator/aimd_rate_control.h" #include "webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h" +#include "webrtc/rtc_base/constructormagic.h" +#include "webrtc/rtc_base/criticalsection.h" +#include "webrtc/rtc_base/rate_statistics.h" namespace webrtc { diff --git a/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream_unittest.cc b/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream_unittest.cc index 42b5acbedf..639a8ceb6c 100644 --- a/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream_unittest.cc +++ b/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream_unittest.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/base/constructormagic.h" #include "webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream.h" #include "webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_unittest_helper.h" +#include "webrtc/rtc_base/constructormagic.h" namespace webrtc { diff --git a/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_unittest_helper.cc b/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_unittest_helper.cc index fef4d8dfb2..4c12eac32f 100644 --- a/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_unittest_helper.cc +++ b/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_unittest_helper.cc @@ -13,7 +13,7 @@ #include #include -#include "webrtc/base/checks.h" +#include "webrtc/rtc_base/checks.h" namespace webrtc { diff --git a/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_unittest_helper.h b/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_unittest_helper.h index 460a3a96b9..27c54d6ccb 100644 --- a/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_unittest_helper.h +++ b/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_unittest_helper.h @@ -17,8 +17,8 @@ #include #include -#include "webrtc/base/constructormagic.h" #include "webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h" +#include "webrtc/rtc_base/constructormagic.h" #include "webrtc/system_wrappers/include/clock.h" #include "webrtc/test/gtest.h" diff --git a/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimators_test.cc b/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimators_test.cc index 37c2d04f0b..97b8bcf7ea 100644 --- a/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimators_test.cc +++ b/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimators_test.cc @@ -16,12 +16,12 @@ #include #include -#include "webrtc/base/constructormagic.h" -#include "webrtc/base/random.h" #include "webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h" #include "webrtc/modules/remote_bitrate_estimator/test/bwe_test.h" #include "webrtc/modules/remote_bitrate_estimator/test/packet_receiver.h" #include "webrtc/modules/remote_bitrate_estimator/test/packet_sender.h" +#include "webrtc/rtc_base/constructormagic.h" +#include "webrtc/rtc_base/random.h" #include "webrtc/test/testsupport/fileutils.h" namespace webrtc { diff --git a/webrtc/modules/remote_bitrate_estimator/remote_estimator_proxy.cc b/webrtc/modules/remote_bitrate_estimator/remote_estimator_proxy.cc index 35bc667b5a..6ddee174b1 100644 --- a/webrtc/modules/remote_bitrate_estimator/remote_estimator_proxy.cc +++ b/webrtc/modules/remote_bitrate_estimator/remote_estimator_proxy.cc @@ -13,12 +13,12 @@ #include #include -#include "webrtc/base/checks.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/safe_minmax.h" #include "webrtc/modules/pacing/packet_router.h" #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp.h" #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/safe_minmax.h" #include "webrtc/system_wrappers/include/clock.h" namespace webrtc { diff --git a/webrtc/modules/remote_bitrate_estimator/remote_estimator_proxy.h b/webrtc/modules/remote_bitrate_estimator/remote_estimator_proxy.h index 83ae078445..52632cf01f 100644 --- a/webrtc/modules/remote_bitrate_estimator/remote_estimator_proxy.h +++ b/webrtc/modules/remote_bitrate_estimator/remote_estimator_proxy.h @@ -14,9 +14,9 @@ #include #include -#include "webrtc/base/criticalsection.h" #include "webrtc/modules/include/module_common_types.h" #include "webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h" +#include "webrtc/rtc_base/criticalsection.h" namespace webrtc { diff --git a/webrtc/modules/remote_bitrate_estimator/send_time_history.cc b/webrtc/modules/remote_bitrate_estimator/send_time_history.cc index de9246c65d..734a920713 100644 --- a/webrtc/modules/remote_bitrate_estimator/send_time_history.cc +++ b/webrtc/modules/remote_bitrate_estimator/send_time_history.cc @@ -10,8 +10,8 @@ #include "webrtc/modules/remote_bitrate_estimator/include/send_time_history.h" -#include "webrtc/base/checks.h" #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" +#include "webrtc/rtc_base/checks.h" #include "webrtc/system_wrappers/include/clock.h" namespace webrtc { diff --git a/webrtc/modules/remote_bitrate_estimator/test/bwe.cc b/webrtc/modules/remote_bitrate_estimator/test/bwe.cc index f211fc7c32..755e59d04b 100644 --- a/webrtc/modules/remote_bitrate_estimator/test/bwe.cc +++ b/webrtc/modules/remote_bitrate_estimator/test/bwe.cc @@ -12,12 +12,12 @@ #include -#include "webrtc/base/constructormagic.h" #include "webrtc/modules/remote_bitrate_estimator/test/estimators/bbr.h" #include "webrtc/modules/remote_bitrate_estimator/test/estimators/nada.h" #include "webrtc/modules/remote_bitrate_estimator/test/estimators/remb.h" #include "webrtc/modules/remote_bitrate_estimator/test/estimators/send_side.h" #include "webrtc/modules/remote_bitrate_estimator/test/estimators/tcp.h" +#include "webrtc/rtc_base/constructormagic.h" namespace webrtc { namespace testing { diff --git a/webrtc/modules/remote_bitrate_estimator/test/bwe.h b/webrtc/modules/remote_bitrate_estimator/test/bwe.h index 5ff1190758..4474ed253a 100644 --- a/webrtc/modules/remote_bitrate_estimator/test/bwe.h +++ b/webrtc/modules/remote_bitrate_estimator/test/bwe.h @@ -16,11 +16,11 @@ #include #include -#include "webrtc/base/constructormagic.h" -#include "webrtc/base/gtest_prod_util.h" -#include "webrtc/modules/remote_bitrate_estimator/test/packet.h" #include "webrtc/modules/bitrate_controller/include/bitrate_controller.h" #include "webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework.h" +#include "webrtc/modules/remote_bitrate_estimator/test/packet.h" +#include "webrtc/rtc_base/constructormagic.h" +#include "webrtc/rtc_base/gtest_prod_util.h" namespace webrtc { namespace testing { diff --git a/webrtc/modules/remote_bitrate_estimator/test/bwe_test.cc b/webrtc/modules/remote_bitrate_estimator/test/bwe_test.cc index 6d0ed5f289..357cfa5c8d 100644 --- a/webrtc/modules/remote_bitrate_estimator/test/bwe_test.cc +++ b/webrtc/modules/remote_bitrate_estimator/test/bwe_test.cc @@ -13,12 +13,12 @@ #include #include -#include "webrtc/base/arraysize.h" #include "webrtc/modules/include/module_common_types.h" #include "webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework.h" #include "webrtc/modules/remote_bitrate_estimator/test/metric_recorder.h" #include "webrtc/modules/remote_bitrate_estimator/test/packet_receiver.h" #include "webrtc/modules/remote_bitrate_estimator/test/packet_sender.h" +#include "webrtc/rtc_base/arraysize.h" #include "webrtc/system_wrappers/include/clock.h" #include "webrtc/system_wrappers/include/field_trial.h" #include "webrtc/test/testsupport/perf_test.h" diff --git a/webrtc/modules/remote_bitrate_estimator/test/bwe_test.h b/webrtc/modules/remote_bitrate_estimator/test/bwe_test.h index 963b60639a..01e439c7af 100644 --- a/webrtc/modules/remote_bitrate_estimator/test/bwe_test.h +++ b/webrtc/modules/remote_bitrate_estimator/test/bwe_test.h @@ -15,10 +15,10 @@ #include #include -#include "webrtc/base/constructormagic.h" #include "webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h" #include "webrtc/modules/remote_bitrate_estimator/test/bwe.h" #include "webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework.h" +#include "webrtc/rtc_base/constructormagic.h" #include "webrtc/test/gtest.h" namespace webrtc { diff --git a/webrtc/modules/remote_bitrate_estimator/test/bwe_test_baselinefile.cc b/webrtc/modules/remote_bitrate_estimator/test/bwe_test_baselinefile.cc index 7ba95f0b76..94a3d5e110 100644 --- a/webrtc/modules/remote_bitrate_estimator/test/bwe_test_baselinefile.cc +++ b/webrtc/modules/remote_bitrate_estimator/test/bwe_test_baselinefile.cc @@ -16,9 +16,9 @@ #include #include -#include "webrtc/base/constructormagic.h" #include "webrtc/modules/remote_bitrate_estimator/test/bwe_test_fileutils.h" #include "webrtc/modules/remote_bitrate_estimator/test/bwe_test_logging.h" +#include "webrtc/rtc_base/constructormagic.h" #include "webrtc/test/testsupport/fileutils.h" namespace webrtc { diff --git a/webrtc/modules/remote_bitrate_estimator/test/bwe_test_fileutils.h b/webrtc/modules/remote_bitrate_estimator/test/bwe_test_fileutils.h index d470324ac3..99bdcf9741 100644 --- a/webrtc/modules/remote_bitrate_estimator/test/bwe_test_fileutils.h +++ b/webrtc/modules/remote_bitrate_estimator/test/bwe_test_fileutils.h @@ -15,8 +15,8 @@ #include -#include "webrtc/base/constructormagic.h" #include "webrtc/modules/include/module_common_types.h" +#include "webrtc/rtc_base/constructormagic.h" namespace webrtc { namespace testing { diff --git a/webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework.cc b/webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework.cc index ad96b076dc..edaeffc5e8 100644 --- a/webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework.cc +++ b/webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework.cc @@ -14,8 +14,8 @@ #include -#include "webrtc/base/constructormagic.h" -#include "webrtc/base/safe_minmax.h" +#include "webrtc/rtc_base/constructormagic.h" +#include "webrtc/rtc_base/safe_minmax.h" namespace webrtc { namespace testing { diff --git a/webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework.h b/webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework.h index adc3b9951d..08b0a72c50 100644 --- a/webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework.h +++ b/webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework.h @@ -24,8 +24,6 @@ #include #include -#include "webrtc/base/constructormagic.h" -#include "webrtc/base/random.h" #include "webrtc/modules/bitrate_controller/include/bitrate_controller.h" #include "webrtc/modules/include/module_common_types.h" #include "webrtc/modules/pacing/paced_sender.h" @@ -33,6 +31,8 @@ #include "webrtc/modules/remote_bitrate_estimator/test/bwe_test_logging.h" #include "webrtc/modules/remote_bitrate_estimator/test/packet.h" #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" +#include "webrtc/rtc_base/constructormagic.h" +#include "webrtc/rtc_base/random.h" #include "webrtc/system_wrappers/include/clock.h" #include "webrtc/typedefs.h" diff --git a/webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework_unittest.cc b/webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework_unittest.cc index bd41a134ca..775756e943 100644 --- a/webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework_unittest.cc +++ b/webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework_unittest.cc @@ -12,9 +12,9 @@ #include -#include "webrtc/base/constructormagic.h" #include "webrtc/modules/remote_bitrate_estimator/test/packet.h" #include "webrtc/modules/remote_bitrate_estimator/test/packet_sender.h" +#include "webrtc/rtc_base/constructormagic.h" #include "webrtc/test/gtest.h" #include "webrtc/test/testsupport/fileutils.h" diff --git a/webrtc/modules/remote_bitrate_estimator/test/bwe_test_logging.cc b/webrtc/modules/remote_bitrate_estimator/test/bwe_test_logging.cc index a8cd84d8c8..729254a9b3 100644 --- a/webrtc/modules/remote_bitrate_estimator/test/bwe_test_logging.cc +++ b/webrtc/modules/remote_bitrate_estimator/test/bwe_test_logging.cc @@ -18,9 +18,9 @@ #include #include -#include "webrtc/base/checks.h" -#include "webrtc/base/format_macros.h" -#include "webrtc/base/platform_thread.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/format_macros.h" +#include "webrtc/rtc_base/platform_thread.h" namespace webrtc { namespace testing { diff --git a/webrtc/modules/remote_bitrate_estimator/test/bwe_test_logging.h b/webrtc/modules/remote_bitrate_estimator/test/bwe_test_logging.h index be9ecdba52..76f2aeed4a 100644 --- a/webrtc/modules/remote_bitrate_estimator/test/bwe_test_logging.h +++ b/webrtc/modules/remote_bitrate_estimator/test/bwe_test_logging.h @@ -128,9 +128,9 @@ #include #include -#include "webrtc/base/constructormagic.h" -#include "webrtc/base/criticalsection.h" #include "webrtc/common_types.h" +#include "webrtc/rtc_base/constructormagic.h" +#include "webrtc/rtc_base/criticalsection.h" #define BWE_TEST_LOGGING_GLOBAL_CONTEXT(name) \ do { \ diff --git a/webrtc/modules/remote_bitrate_estimator/test/bwe_unittest.cc b/webrtc/modules/remote_bitrate_estimator/test/bwe_unittest.cc index f9255cc370..3033726d87 100644 --- a/webrtc/modules/remote_bitrate_estimator/test/bwe_unittest.cc +++ b/webrtc/modules/remote_bitrate_estimator/test/bwe_unittest.cc @@ -12,7 +12,7 @@ #include -#include "webrtc/base/arraysize.h" +#include "webrtc/rtc_base/arraysize.h" #include "webrtc/test/gtest.h" namespace webrtc { diff --git a/webrtc/modules/remote_bitrate_estimator/test/estimators/nada.cc b/webrtc/modules/remote_bitrate_estimator/test/estimators/nada.cc index 39cad74ce4..0c2bf78264 100644 --- a/webrtc/modules/remote_bitrate_estimator/test/estimators/nada.cc +++ b/webrtc/modules/remote_bitrate_estimator/test/estimators/nada.cc @@ -18,10 +18,10 @@ #include #include -#include "webrtc/base/arraysize.h" -#include "webrtc/modules/remote_bitrate_estimator/test/estimators/nada.h" #include "webrtc/modules/remote_bitrate_estimator/test/bwe_test_logging.h" +#include "webrtc/modules/remote_bitrate_estimator/test/estimators/nada.h" #include "webrtc/modules/rtp_rtcp/include/receive_statistics.h" +#include "webrtc/rtc_base/arraysize.h" namespace webrtc { namespace testing { diff --git a/webrtc/modules/remote_bitrate_estimator/test/estimators/nada.h b/webrtc/modules/remote_bitrate_estimator/test/estimators/nada.h index c2c4f59b3c..75f769d0cb 100644 --- a/webrtc/modules/remote_bitrate_estimator/test/estimators/nada.h +++ b/webrtc/modules/remote_bitrate_estimator/test/estimators/nada.h @@ -21,9 +21,9 @@ #include #include -#include "webrtc/base/constructormagic.h" #include "webrtc/modules/include/module_common_types.h" #include "webrtc/modules/remote_bitrate_estimator/test/bwe.h" +#include "webrtc/rtc_base/constructormagic.h" #include "webrtc/voice_engine/channel.h" namespace webrtc { diff --git a/webrtc/modules/remote_bitrate_estimator/test/estimators/nada_unittest.cc b/webrtc/modules/remote_bitrate_estimator/test/estimators/nada_unittest.cc index aca7c99395..d6226ab94b 100644 --- a/webrtc/modules/remote_bitrate_estimator/test/estimators/nada_unittest.cc +++ b/webrtc/modules/remote_bitrate_estimator/test/estimators/nada_unittest.cc @@ -14,11 +14,11 @@ #include #include -#include "webrtc/base/arraysize.h" -#include "webrtc/base/constructormagic.h" #include "webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework.h" #include "webrtc/modules/remote_bitrate_estimator/test/packet.h" #include "webrtc/modules/remote_bitrate_estimator/test/packet_sender.h" +#include "webrtc/rtc_base/arraysize.h" +#include "webrtc/rtc_base/constructormagic.h" #include "webrtc/test/gtest.h" #include "webrtc/test/testsupport/fileutils.h" diff --git a/webrtc/modules/remote_bitrate_estimator/test/estimators/remb.h b/webrtc/modules/remote_bitrate_estimator/test/estimators/remb.h index 73e4a30db3..841f79e419 100644 --- a/webrtc/modules/remote_bitrate_estimator/test/estimators/remb.h +++ b/webrtc/modules/remote_bitrate_estimator/test/estimators/remb.h @@ -15,9 +15,9 @@ #include #include -#include "webrtc/base/constructormagic.h" #include "webrtc/logging/rtc_event_log/mock/mock_rtc_event_log.h" #include "webrtc/modules/remote_bitrate_estimator/test/bwe.h" +#include "webrtc/rtc_base/constructormagic.h" namespace webrtc { diff --git a/webrtc/modules/remote_bitrate_estimator/test/estimators/send_side.cc b/webrtc/modules/remote_bitrate_estimator/test/estimators/send_side.cc index 905659d0ee..6e6ac2949d 100644 --- a/webrtc/modules/remote_bitrate_estimator/test/estimators/send_side.cc +++ b/webrtc/modules/remote_bitrate_estimator/test/estimators/send_side.cc @@ -12,10 +12,10 @@ #include -#include "webrtc/base/logging.h" -#include "webrtc/base/ptr_util.h" #include "webrtc/modules/congestion_controller/delay_based_bwe.h" #include "webrtc/modules/remote_bitrate_estimator/test/bwe_test_logging.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/ptr_util.h" namespace webrtc { namespace testing { diff --git a/webrtc/modules/remote_bitrate_estimator/test/metric_recorder.h b/webrtc/modules/remote_bitrate_estimator/test/metric_recorder.h index 72edd09120..56ea1df3d2 100644 --- a/webrtc/modules/remote_bitrate_estimator/test/metric_recorder.h +++ b/webrtc/modules/remote_bitrate_estimator/test/metric_recorder.h @@ -16,7 +16,7 @@ #include #include -#include "webrtc/base/gtest_prod_util.h" +#include "webrtc/rtc_base/gtest_prod_util.h" namespace webrtc { namespace testing { diff --git a/webrtc/modules/remote_bitrate_estimator/test/packet_receiver.h b/webrtc/modules/remote_bitrate_estimator/test/packet_receiver.h index 7214460ae3..c63e38ffd4 100644 --- a/webrtc/modules/remote_bitrate_estimator/test/packet_receiver.h +++ b/webrtc/modules/remote_bitrate_estimator/test/packet_receiver.h @@ -14,10 +14,10 @@ #include #include -#include "webrtc/base/constructormagic.h" #include "webrtc/modules/remote_bitrate_estimator/test/bwe.h" #include "webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework.h" #include "webrtc/modules/remote_bitrate_estimator/test/metric_recorder.h" +#include "webrtc/rtc_base/constructormagic.h" namespace webrtc { namespace testing { diff --git a/webrtc/modules/remote_bitrate_estimator/test/packet_sender.cc b/webrtc/modules/remote_bitrate_estimator/test/packet_sender.cc index e962c591a7..de4d93def3 100644 --- a/webrtc/modules/remote_bitrate_estimator/test/packet_sender.cc +++ b/webrtc/modules/remote_bitrate_estimator/test/packet_sender.cc @@ -14,10 +14,10 @@ #include #include -#include "webrtc/base/checks.h" #include "webrtc/modules/include/module_common_types.h" #include "webrtc/modules/remote_bitrate_estimator/test/bwe.h" #include "webrtc/modules/remote_bitrate_estimator/test/metric_recorder.h" +#include "webrtc/rtc_base/checks.h" namespace webrtc { namespace testing { diff --git a/webrtc/modules/remote_bitrate_estimator/test/packet_sender.h b/webrtc/modules/remote_bitrate_estimator/test/packet_sender.h index 2bc3d01ae7..0df61b039a 100644 --- a/webrtc/modules/remote_bitrate_estimator/test/packet_sender.h +++ b/webrtc/modules/remote_bitrate_estimator/test/packet_sender.h @@ -17,10 +17,10 @@ #include #include -#include "webrtc/base/constructormagic.h" #include "webrtc/modules/include/module.h" #include "webrtc/modules/remote_bitrate_estimator/test/bwe.h" #include "webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework.h" +#include "webrtc/rtc_base/constructormagic.h" namespace webrtc { namespace testing { diff --git a/webrtc/modules/remote_bitrate_estimator/tools/bwe_rtp_play.cc b/webrtc/modules/remote_bitrate_estimator/tools/bwe_rtp_play.cc index f5dbaef371..fa9a026a95 100644 --- a/webrtc/modules/remote_bitrate_estimator/tools/bwe_rtp_play.cc +++ b/webrtc/modules/remote_bitrate_estimator/tools/bwe_rtp_play.cc @@ -12,11 +12,11 @@ #include -#include "webrtc/base/format_macros.h" #include "webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h" #include "webrtc/modules/remote_bitrate_estimator/tools/bwe_rtp.h" #include "webrtc/modules/rtp_rtcp/include/rtp_header_parser.h" #include "webrtc/modules/rtp_rtcp/include/rtp_payload_registry.h" +#include "webrtc/rtc_base/format_macros.h" #include "webrtc/test/rtp_file_reader.h" class Observer : public webrtc::RemoteBitrateObserver { diff --git a/webrtc/modules/remote_bitrate_estimator/tools/rtp_to_text.cc b/webrtc/modules/remote_bitrate_estimator/tools/rtp_to_text.cc index 2b8c5b056c..7a88236c2d 100644 --- a/webrtc/modules/remote_bitrate_estimator/tools/rtp_to_text.cc +++ b/webrtc/modules/remote_bitrate_estimator/tools/rtp_to_text.cc @@ -13,10 +13,10 @@ #include #include -#include "webrtc/base/format_macros.h" #include "webrtc/modules/remote_bitrate_estimator/tools/bwe_rtp.h" #include "webrtc/modules/rtp_rtcp/include/rtp_header_parser.h" #include "webrtc/modules/rtp_rtcp/include/rtp_payload_registry.h" +#include "webrtc/rtc_base/format_macros.h" #include "webrtc/test/rtp_file_reader.h" int main(int argc, char** argv) { diff --git a/webrtc/modules/rtp_rtcp/include/flexfec_receiver.h b/webrtc/modules/rtp_rtcp/include/flexfec_receiver.h index ca612c6be3..384e3c01de 100644 --- a/webrtc/modules/rtp_rtcp/include/flexfec_receiver.h +++ b/webrtc/modules/rtp_rtcp/include/flexfec_receiver.h @@ -13,11 +13,11 @@ #include -#include "webrtc/base/basictypes.h" -#include "webrtc/base/sequenced_task_checker.h" #include "webrtc/modules/rtp_rtcp/include/ulpfec_receiver.h" #include "webrtc/modules/rtp_rtcp/source/forward_error_correction.h" #include "webrtc/modules/rtp_rtcp/source/rtp_packet_received.h" +#include "webrtc/rtc_base/basictypes.h" +#include "webrtc/rtc_base/sequenced_task_checker.h" #include "webrtc/system_wrappers/include/clock.h" namespace webrtc { diff --git a/webrtc/modules/rtp_rtcp/include/flexfec_sender.h b/webrtc/modules/rtp_rtcp/include/flexfec_sender.h index 0110ff575d..3bcd2eb48c 100644 --- a/webrtc/modules/rtp_rtcp/include/flexfec_sender.h +++ b/webrtc/modules/rtp_rtcp/include/flexfec_sender.h @@ -14,9 +14,6 @@ #include #include -#include "webrtc/base/array_view.h" -#include "webrtc/base/basictypes.h" -#include "webrtc/base/random.h" #include "webrtc/config.h" #include "webrtc/modules/include/module_common_types.h" #include "webrtc/modules/rtp_rtcp/include/flexfec_sender.h" @@ -24,6 +21,9 @@ #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" #include "webrtc/modules/rtp_rtcp/source/rtp_packet_to_send.h" #include "webrtc/modules/rtp_rtcp/source/ulpfec_generator.h" +#include "webrtc/rtc_base/array_view.h" +#include "webrtc/rtc_base/basictypes.h" +#include "webrtc/rtc_base/random.h" #include "webrtc/system_wrappers/include/clock.h" namespace webrtc { diff --git a/webrtc/modules/rtp_rtcp/include/remote_ntp_time_estimator.h b/webrtc/modules/rtp_rtcp/include/remote_ntp_time_estimator.h index 118df4c4cf..e80593bf9f 100644 --- a/webrtc/modules/rtp_rtcp/include/remote_ntp_time_estimator.h +++ b/webrtc/modules/rtp_rtcp/include/remote_ntp_time_estimator.h @@ -13,7 +13,7 @@ #include -#include "webrtc/base/constructormagic.h" +#include "webrtc/rtc_base/constructormagic.h" #include "webrtc/system_wrappers/include/rtp_to_ntp_estimator.h" namespace webrtc { diff --git a/webrtc/modules/rtp_rtcp/include/rtp_cvo.h b/webrtc/modules/rtp_rtcp/include/rtp_cvo.h index 5fa0619947..6ce731200c 100644 --- a/webrtc/modules/rtp_rtcp/include/rtp_cvo.h +++ b/webrtc/modules/rtp_rtcp/include/rtp_cvo.h @@ -11,7 +11,7 @@ #define WEBRTC_MODULES_RTP_RTCP_INCLUDE_RTP_CVO_H_ #include "webrtc/api/video/video_rotation.h" -#include "webrtc/base/checks.h" +#include "webrtc/rtc_base/checks.h" namespace webrtc { diff --git a/webrtc/modules/rtp_rtcp/include/rtp_header_extension_map.h b/webrtc/modules/rtp_rtcp/include/rtp_header_extension_map.h index 437a0d2245..98bc9ecad9 100644 --- a/webrtc/modules/rtp_rtcp/include/rtp_header_extension_map.h +++ b/webrtc/modules/rtp_rtcp/include/rtp_header_extension_map.h @@ -13,11 +13,11 @@ #include -#include "webrtc/base/array_view.h" -#include "webrtc/base/basictypes.h" -#include "webrtc/base/checks.h" #include "webrtc/config.h" #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" +#include "webrtc/rtc_base/array_view.h" +#include "webrtc/rtc_base/basictypes.h" +#include "webrtc/rtc_base/checks.h" namespace webrtc { diff --git a/webrtc/modules/rtp_rtcp/include/rtp_payload_registry.h b/webrtc/modules/rtp_rtcp/include/rtp_payload_registry.h index e54e8c2823..eb552b84e1 100644 --- a/webrtc/modules/rtp_rtcp/include/rtp_payload_registry.h +++ b/webrtc/modules/rtp_rtcp/include/rtp_payload_registry.h @@ -15,8 +15,8 @@ #include #include "webrtc/api/audio_codecs/audio_format.h" -#include "webrtc/base/criticalsection.h" #include "webrtc/modules/rtp_rtcp/source/rtp_utility.h" +#include "webrtc/rtc_base/criticalsection.h" namespace webrtc { diff --git a/webrtc/modules/rtp_rtcp/include/rtp_rtcp.h b/webrtc/modules/rtp_rtcp/include/rtp_rtcp.h index a5d1b0b0d7..693a6f8373 100644 --- a/webrtc/modules/rtp_rtcp/include/rtp_rtcp.h +++ b/webrtc/modules/rtp_rtcp/include/rtp_rtcp.h @@ -16,13 +16,13 @@ #include #include -#include "webrtc/base/constructormagic.h" -#include "webrtc/base/deprecation.h" -#include "webrtc/base/optional.h" #include "webrtc/common_types.h" #include "webrtc/modules/include/module.h" #include "webrtc/modules/rtp_rtcp/include/flexfec_sender.h" #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" +#include "webrtc/rtc_base/constructormagic.h" +#include "webrtc/rtc_base/deprecation.h" +#include "webrtc/rtc_base/optional.h" namespace webrtc { diff --git a/webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h b/webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h index 56f03d5409..3bf93d8877 100644 --- a/webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h +++ b/webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h @@ -15,9 +15,9 @@ #include #include -#include "webrtc/base/deprecation.h" #include "webrtc/common_types.h" #include "webrtc/modules/include/module_common_types.h" +#include "webrtc/rtc_base/deprecation.h" #include "webrtc/system_wrappers/include/clock.h" #include "webrtc/typedefs.h" diff --git a/webrtc/modules/rtp_rtcp/mocks/mock_recovered_packet_receiver.h b/webrtc/modules/rtp_rtcp/mocks/mock_recovered_packet_receiver.h index d79034480e..fb8529fa30 100644 --- a/webrtc/modules/rtp_rtcp/mocks/mock_recovered_packet_receiver.h +++ b/webrtc/modules/rtp_rtcp/mocks/mock_recovered_packet_receiver.h @@ -11,8 +11,8 @@ #ifndef WEBRTC_MODULES_RTP_RTCP_MOCKS_MOCK_RECOVERED_PACKET_RECEIVER_H_ #define WEBRTC_MODULES_RTP_RTCP_MOCKS_MOCK_RECOVERED_PACKET_RECEIVER_H_ -#include "webrtc/base/basictypes.h" #include "webrtc/modules/rtp_rtcp/include/flexfec_receiver.h" +#include "webrtc/rtc_base/basictypes.h" #include "webrtc/test/gmock.h" namespace webrtc { diff --git a/webrtc/modules/rtp_rtcp/mocks/mock_rtp_rtcp.h b/webrtc/modules/rtp_rtcp/mocks/mock_rtp_rtcp.h index d1b9bd485d..8ed5df17b4 100644 --- a/webrtc/modules/rtp_rtcp/mocks/mock_rtp_rtcp.h +++ b/webrtc/modules/rtp_rtcp/mocks/mock_rtp_rtcp.h @@ -15,12 +15,12 @@ #include #include -#include "webrtc/base/checks.h" -#include "webrtc/base/optional.h" #include "webrtc/modules/include/module.h" #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp.h" #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/optional.h" #include "webrtc/test/gmock.h" namespace webrtc { diff --git a/webrtc/modules/rtp_rtcp/source/dtmf_queue.h b/webrtc/modules/rtp_rtcp/source/dtmf_queue.h index af546dc230..9a8c2e7b30 100644 --- a/webrtc/modules/rtp_rtcp/source/dtmf_queue.h +++ b/webrtc/modules/rtp_rtcp/source/dtmf_queue.h @@ -13,7 +13,7 @@ #include -#include "webrtc/base/criticalsection.h" +#include "webrtc/rtc_base/criticalsection.h" namespace webrtc { class DtmfQueue { diff --git a/webrtc/modules/rtp_rtcp/source/fec_test_helper.cc b/webrtc/modules/rtp_rtcp/source/fec_test_helper.cc index 05655facac..45dfbf5ba4 100644 --- a/webrtc/modules/rtp_rtcp/source/fec_test_helper.cc +++ b/webrtc/modules/rtp_rtcp/source/fec_test_helper.cc @@ -13,10 +13,10 @@ #include #include -#include "webrtc/base/checks.h" #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" #include "webrtc/modules/rtp_rtcp/source/byte_io.h" #include "webrtc/modules/rtp_rtcp/source/rtp_utility.h" +#include "webrtc/rtc_base/checks.h" namespace webrtc { namespace test { diff --git a/webrtc/modules/rtp_rtcp/source/fec_test_helper.h b/webrtc/modules/rtp_rtcp/source/fec_test_helper.h index 1bd8261006..fce99dc3a2 100644 --- a/webrtc/modules/rtp_rtcp/source/fec_test_helper.h +++ b/webrtc/modules/rtp_rtcp/source/fec_test_helper.h @@ -13,10 +13,10 @@ #include -#include "webrtc/base/basictypes.h" -#include "webrtc/base/random.h" #include "webrtc/modules/include/module_common_types.h" #include "webrtc/modules/rtp_rtcp/source/forward_error_correction.h" +#include "webrtc/rtc_base/basictypes.h" +#include "webrtc/rtc_base/random.h" namespace webrtc { namespace test { diff --git a/webrtc/modules/rtp_rtcp/source/flexfec_header_reader_writer.cc b/webrtc/modules/rtp_rtcp/source/flexfec_header_reader_writer.cc index 9017ab585b..d1a1b045c7 100644 --- a/webrtc/modules/rtp_rtcp/source/flexfec_header_reader_writer.cc +++ b/webrtc/modules/rtp_rtcp/source/flexfec_header_reader_writer.cc @@ -14,10 +14,10 @@ #include -#include "webrtc/base/checks.h" -#include "webrtc/base/logging.h" #include "webrtc/modules/rtp_rtcp/source/byte_io.h" #include "webrtc/modules/rtp_rtcp/source/forward_error_correction_internal.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/logging.h" namespace webrtc { diff --git a/webrtc/modules/rtp_rtcp/source/flexfec_header_reader_writer.h b/webrtc/modules/rtp_rtcp/source/flexfec_header_reader_writer.h index 13f747720f..720a8b6dd1 100644 --- a/webrtc/modules/rtp_rtcp/source/flexfec_header_reader_writer.h +++ b/webrtc/modules/rtp_rtcp/source/flexfec_header_reader_writer.h @@ -11,8 +11,8 @@ #ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_FLEXFEC_HEADER_READER_WRITER_H_ #define WEBRTC_MODULES_RTP_RTCP_SOURCE_FLEXFEC_HEADER_READER_WRITER_H_ -#include "webrtc/base/basictypes.h" #include "webrtc/modules/rtp_rtcp/source/forward_error_correction.h" +#include "webrtc/rtc_base/basictypes.h" namespace webrtc { diff --git a/webrtc/modules/rtp_rtcp/source/flexfec_header_reader_writer_unittest.cc b/webrtc/modules/rtp_rtcp/source/flexfec_header_reader_writer_unittest.cc index 7546931320..6b7c9c55e0 100644 --- a/webrtc/modules/rtp_rtcp/source/flexfec_header_reader_writer_unittest.cc +++ b/webrtc/modules/rtp_rtcp/source/flexfec_header_reader_writer_unittest.cc @@ -13,14 +13,14 @@ #include #include -#include "webrtc/base/basictypes.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/random.h" -#include "webrtc/base/scoped_ref_ptr.h" #include "webrtc/modules/rtp_rtcp/source/byte_io.h" #include "webrtc/modules/rtp_rtcp/source/flexfec_header_reader_writer.h" #include "webrtc/modules/rtp_rtcp/source/forward_error_correction.h" #include "webrtc/modules/rtp_rtcp/source/forward_error_correction_internal.h" +#include "webrtc/rtc_base/basictypes.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/random.h" +#include "webrtc/rtc_base/scoped_ref_ptr.h" #include "webrtc/test/gmock.h" #include "webrtc/test/gtest.h" diff --git a/webrtc/modules/rtp_rtcp/source/flexfec_receiver.cc b/webrtc/modules/rtp_rtcp/source/flexfec_receiver.cc index 13899d5e5f..454f32798a 100644 --- a/webrtc/modules/rtp_rtcp/source/flexfec_receiver.cc +++ b/webrtc/modules/rtp_rtcp/source/flexfec_receiver.cc @@ -10,8 +10,8 @@ #include "webrtc/modules/rtp_rtcp/include/flexfec_receiver.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/scoped_ref_ptr.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/scoped_ref_ptr.h" namespace webrtc { diff --git a/webrtc/modules/rtp_rtcp/source/flexfec_receiver_unittest.cc b/webrtc/modules/rtp_rtcp/source/flexfec_receiver_unittest.cc index a70d73c688..93c49cb6e9 100644 --- a/webrtc/modules/rtp_rtcp/source/flexfec_receiver_unittest.cc +++ b/webrtc/modules/rtp_rtcp/source/flexfec_receiver_unittest.cc @@ -11,12 +11,12 @@ #include #include -#include "webrtc/base/basictypes.h" #include "webrtc/modules/rtp_rtcp/include/flexfec_receiver.h" #include "webrtc/modules/rtp_rtcp/mocks/mock_recovered_packet_receiver.h" #include "webrtc/modules/rtp_rtcp/source/fec_test_helper.h" #include "webrtc/modules/rtp_rtcp/source/forward_error_correction.h" #include "webrtc/modules/rtp_rtcp/source/rtp_packet_received.h" +#include "webrtc/rtc_base/basictypes.h" #include "webrtc/test/gmock.h" #include "webrtc/test/gtest.h" diff --git a/webrtc/modules/rtp_rtcp/source/flexfec_sender.cc b/webrtc/modules/rtp_rtcp/source/flexfec_sender.cc index 7c69a99655..214304f963 100644 --- a/webrtc/modules/rtp_rtcp/source/flexfec_sender.cc +++ b/webrtc/modules/rtp_rtcp/source/flexfec_sender.cc @@ -12,10 +12,10 @@ #include -#include "webrtc/base/logging.h" #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" #include "webrtc/modules/rtp_rtcp/source/forward_error_correction.h" #include "webrtc/modules/rtp_rtcp/source/rtp_header_extensions.h" +#include "webrtc/rtc_base/logging.h" namespace webrtc { diff --git a/webrtc/modules/rtp_rtcp/source/forward_error_correction.cc b/webrtc/modules/rtp_rtcp/source/forward_error_correction.cc index a2d0e6dc9c..7e524bf95a 100644 --- a/webrtc/modules/rtp_rtcp/source/forward_error_correction.cc +++ b/webrtc/modules/rtp_rtcp/source/forward_error_correction.cc @@ -16,13 +16,13 @@ #include #include -#include "webrtc/base/checks.h" -#include "webrtc/base/logging.h" #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" #include "webrtc/modules/rtp_rtcp/source/byte_io.h" #include "webrtc/modules/rtp_rtcp/source/flexfec_header_reader_writer.h" #include "webrtc/modules/rtp_rtcp/source/forward_error_correction_internal.h" #include "webrtc/modules/rtp_rtcp/source/ulpfec_header_reader_writer.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/logging.h" namespace webrtc { diff --git a/webrtc/modules/rtp_rtcp/source/forward_error_correction.h b/webrtc/modules/rtp_rtcp/source/forward_error_correction.h index e70d7db493..673d15bfbc 100644 --- a/webrtc/modules/rtp_rtcp/source/forward_error_correction.h +++ b/webrtc/modules/rtp_rtcp/source/forward_error_correction.h @@ -17,12 +17,12 @@ #include #include -#include "webrtc/base/basictypes.h" -#include "webrtc/base/constructormagic.h" -#include "webrtc/base/refcount.h" -#include "webrtc/base/scoped_ref_ptr.h" #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" #include "webrtc/modules/rtp_rtcp/source/forward_error_correction_internal.h" +#include "webrtc/rtc_base/basictypes.h" +#include "webrtc/rtc_base/constructormagic.h" +#include "webrtc/rtc_base/refcount.h" +#include "webrtc/rtc_base/scoped_ref_ptr.h" namespace webrtc { diff --git a/webrtc/modules/rtp_rtcp/source/forward_error_correction_internal.cc b/webrtc/modules/rtp_rtcp/source/forward_error_correction_internal.cc index faef7716fd..31fde0aec6 100644 --- a/webrtc/modules/rtp_rtcp/source/forward_error_correction_internal.cc +++ b/webrtc/modules/rtp_rtcp/source/forward_error_correction_internal.cc @@ -15,9 +15,9 @@ #include -#include "webrtc/base/checks.h" #include "webrtc/modules/rtp_rtcp/source/fec_private_tables_bursty.h" #include "webrtc/modules/rtp_rtcp/source/fec_private_tables_random.h" +#include "webrtc/rtc_base/checks.h" namespace { using webrtc::fec_private_tables::kPacketMaskBurstyTbl; diff --git a/webrtc/modules/rtp_rtcp/source/nack_rtx_unittest.cc b/webrtc/modules/rtp_rtcp/source/nack_rtx_unittest.cc index b987f114d2..32c9d5b9e8 100644 --- a/webrtc/modules/rtp_rtcp/source/nack_rtx_unittest.cc +++ b/webrtc/modules/rtp_rtcp/source/nack_rtx_unittest.cc @@ -15,7 +15,6 @@ #include #include "webrtc/api/call/transport.h" -#include "webrtc/base/rate_limiter.h" #include "webrtc/common_types.h" #include "webrtc/modules/rtp_rtcp/include/receive_statistics.h" #include "webrtc/modules/rtp_rtcp/include/rtp_header_parser.h" @@ -23,6 +22,7 @@ #include "webrtc/modules/rtp_rtcp/include/rtp_receiver.h" #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp.h" #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" +#include "webrtc/rtc_base/rate_limiter.h" #include "webrtc/test/gtest.h" namespace webrtc { diff --git a/webrtc/modules/rtp_rtcp/source/packet_loss_stats.cc b/webrtc/modules/rtp_rtcp/source/packet_loss_stats.cc index 1def671f20..12f8bfa1cd 100644 --- a/webrtc/modules/rtp_rtcp/source/packet_loss_stats.cc +++ b/webrtc/modules/rtp_rtcp/source/packet_loss_stats.cc @@ -12,7 +12,7 @@ #include -#include "webrtc/base/checks.h" +#include "webrtc/rtc_base/checks.h" // After this many packets are added, adding additional packets will cause the // oldest packets to be pruned from the buffer. diff --git a/webrtc/modules/rtp_rtcp/source/playout_delay_oracle.cc b/webrtc/modules/rtp_rtcp/source/playout_delay_oracle.cc index f1afc1f45b..a85f7e9053 100644 --- a/webrtc/modules/rtp_rtcp/source/playout_delay_oracle.cc +++ b/webrtc/modules/rtp_rtcp/source/playout_delay_oracle.cc @@ -10,10 +10,10 @@ #include "webrtc/modules/rtp_rtcp/source/playout_delay_oracle.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/logging.h" #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" #include "webrtc/modules/rtp_rtcp/source/rtp_header_extensions.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/logging.h" namespace webrtc { diff --git a/webrtc/modules/rtp_rtcp/source/playout_delay_oracle.h b/webrtc/modules/rtp_rtcp/source/playout_delay_oracle.h index 013d1c1375..26a616509d 100644 --- a/webrtc/modules/rtp_rtcp/source/playout_delay_oracle.h +++ b/webrtc/modules/rtp_rtcp/source/playout_delay_oracle.h @@ -13,10 +13,10 @@ #include -#include "webrtc/base/criticalsection.h" -#include "webrtc/base/thread_annotations.h" #include "webrtc/modules/include/module_common_types.h" #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" +#include "webrtc/rtc_base/criticalsection.h" +#include "webrtc/rtc_base/thread_annotations.h" namespace webrtc { diff --git a/webrtc/modules/rtp_rtcp/source/playout_delay_oracle_unittest.cc b/webrtc/modules/rtp_rtcp/source/playout_delay_oracle_unittest.cc index b4a0189887..e7034b0e09 100644 --- a/webrtc/modules/rtp_rtcp/source/playout_delay_oracle_unittest.cc +++ b/webrtc/modules/rtp_rtcp/source/playout_delay_oracle_unittest.cc @@ -10,7 +10,7 @@ #include "webrtc/modules/rtp_rtcp/source/playout_delay_oracle.h" -#include "webrtc/base/logging.h" +#include "webrtc/rtc_base/logging.h" #include "webrtc/test/gtest.h" namespace webrtc { diff --git a/webrtc/modules/rtp_rtcp/source/receive_statistics_impl.h b/webrtc/modules/rtp_rtcp/source/receive_statistics_impl.h index 913f3b5041..c698862b93 100644 --- a/webrtc/modules/rtp_rtcp/source/receive_statistics_impl.h +++ b/webrtc/modules/rtp_rtcp/source/receive_statistics_impl.h @@ -16,8 +16,8 @@ #include #include -#include "webrtc/base/criticalsection.h" -#include "webrtc/base/rate_statistics.h" +#include "webrtc/rtc_base/criticalsection.h" +#include "webrtc/rtc_base/rate_statistics.h" #include "webrtc/system_wrappers/include/ntp_time.h" namespace webrtc { diff --git a/webrtc/modules/rtp_rtcp/source/remote_ntp_time_estimator.cc b/webrtc/modules/rtp_rtcp/source/remote_ntp_time_estimator.cc index c78a8bc844..b39c5a616f 100644 --- a/webrtc/modules/rtp_rtcp/source/remote_ntp_time_estimator.cc +++ b/webrtc/modules/rtp_rtcp/source/remote_ntp_time_estimator.cc @@ -10,7 +10,7 @@ #include "webrtc/modules/rtp_rtcp/include/remote_ntp_time_estimator.h" -#include "webrtc/base/logging.h" +#include "webrtc/rtc_base/logging.h" #include "webrtc/system_wrappers/include/clock.h" #include "webrtc/system_wrappers/include/timestamp_extrapolator.h" diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet.cc b/webrtc/modules/rtp_rtcp/source/rtcp_packet.cc index a2d99e7143..7d409718bd 100644 --- a/webrtc/modules/rtp_rtcp/source/rtcp_packet.cc +++ b/webrtc/modules/rtp_rtcp/source/rtcp_packet.cc @@ -10,7 +10,7 @@ #include "webrtc/modules/rtp_rtcp/source/rtcp_packet.h" -#include "webrtc/base/checks.h" +#include "webrtc/rtc_base/checks.h" namespace webrtc { namespace rtcp { diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet.h b/webrtc/modules/rtp_rtcp/source/rtcp_packet.h index 86ed11d42a..f99b5b9290 100644 --- a/webrtc/modules/rtp_rtcp/source/rtcp_packet.h +++ b/webrtc/modules/rtp_rtcp/source/rtcp_packet.h @@ -11,8 +11,8 @@ #ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_H_ #define WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_H_ -#include "webrtc/base/basictypes.h" -#include "webrtc/base/buffer.h" +#include "webrtc/rtc_base/basictypes.h" +#include "webrtc/rtc_base/buffer.h" namespace webrtc { namespace rtcp { diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/app.cc b/webrtc/modules/rtp_rtcp/source/rtcp_packet/app.cc index e9d107811f..8d02dfc416 100644 --- a/webrtc/modules/rtp_rtcp/source/rtcp_packet/app.cc +++ b/webrtc/modules/rtp_rtcp/source/rtcp_packet/app.cc @@ -10,10 +10,10 @@ #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/app.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/logging.h" #include "webrtc/modules/rtp_rtcp/source/byte_io.h" #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/common_header.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/logging.h" namespace webrtc { namespace rtcp { diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/app.h b/webrtc/modules/rtp_rtcp/source/rtcp_packet/app.h index 1261e8456f..7368b7cc97 100644 --- a/webrtc/modules/rtp_rtcp/source/rtcp_packet/app.h +++ b/webrtc/modules/rtp_rtcp/source/rtcp_packet/app.h @@ -11,8 +11,8 @@ #ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_APP_H_ #define WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_APP_H_ -#include "webrtc/base/buffer.h" #include "webrtc/modules/rtp_rtcp/source/rtcp_packet.h" +#include "webrtc/rtc_base/buffer.h" namespace webrtc { namespace rtcp { diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/bye.cc b/webrtc/modules/rtp_rtcp/source/rtcp_packet/bye.cc index 965fde282a..d5c204d993 100644 --- a/webrtc/modules/rtp_rtcp/source/rtcp_packet/bye.cc +++ b/webrtc/modules/rtp_rtcp/source/rtcp_packet/bye.cc @@ -12,10 +12,10 @@ #include -#include "webrtc/base/checks.h" -#include "webrtc/base/logging.h" #include "webrtc/modules/rtp_rtcp/source/byte_io.h" #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/common_header.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/logging.h" namespace webrtc { namespace rtcp { diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/common_header.cc b/webrtc/modules/rtp_rtcp/source/rtcp_packet/common_header.cc index 69d78ce4bb..9971208e78 100644 --- a/webrtc/modules/rtp_rtcp/source/rtcp_packet/common_header.cc +++ b/webrtc/modules/rtp_rtcp/source/rtcp_packet/common_header.cc @@ -10,8 +10,8 @@ #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/common_header.h" -#include "webrtc/base/logging.h" #include "webrtc/modules/rtp_rtcp/source/byte_io.h" +#include "webrtc/rtc_base/logging.h" namespace webrtc { namespace rtcp { diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/common_header.h b/webrtc/modules/rtp_rtcp/source/rtcp_packet/common_header.h index b4ce511b5f..a36b1991db 100644 --- a/webrtc/modules/rtp_rtcp/source/rtcp_packet/common_header.h +++ b/webrtc/modules/rtp_rtcp/source/rtcp_packet/common_header.h @@ -10,7 +10,7 @@ #ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_COMMON_HEADER_H_ #define WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_COMMON_HEADER_H_ -#include "webrtc/base/basictypes.h" +#include "webrtc/rtc_base/basictypes.h" namespace webrtc { namespace rtcp { diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/compound_packet.cc b/webrtc/modules/rtp_rtcp/source/rtcp_packet/compound_packet.cc index d5bbee6c91..28437c82ed 100644 --- a/webrtc/modules/rtp_rtcp/source/rtcp_packet/compound_packet.cc +++ b/webrtc/modules/rtp_rtcp/source/rtcp_packet/compound_packet.cc @@ -10,7 +10,7 @@ #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/compound_packet.h" -#include "webrtc/base/checks.h" +#include "webrtc/rtc_base/checks.h" namespace webrtc { namespace rtcp { diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/compound_packet.h b/webrtc/modules/rtp_rtcp/source/rtcp_packet/compound_packet.h index 5bb23dd185..ea32b351b6 100644 --- a/webrtc/modules/rtp_rtcp/source/rtcp_packet/compound_packet.h +++ b/webrtc/modules/rtp_rtcp/source/rtcp_packet/compound_packet.h @@ -14,9 +14,9 @@ #include -#include "webrtc/base/basictypes.h" -#include "webrtc/base/constructormagic.h" #include "webrtc/modules/rtp_rtcp/source/rtcp_packet.h" +#include "webrtc/rtc_base/basictypes.h" +#include "webrtc/rtc_base/constructormagic.h" namespace webrtc { namespace rtcp { diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/dlrr.cc b/webrtc/modules/rtp_rtcp/source/rtcp_packet/dlrr.cc index 80b44d51eb..b7ca58c52a 100644 --- a/webrtc/modules/rtp_rtcp/source/rtcp_packet/dlrr.cc +++ b/webrtc/modules/rtp_rtcp/source/rtcp_packet/dlrr.cc @@ -10,9 +10,9 @@ #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/dlrr.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/logging.h" #include "webrtc/modules/rtp_rtcp/source/byte_io.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/logging.h" namespace webrtc { namespace rtcp { diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/dlrr.h b/webrtc/modules/rtp_rtcp/source/rtcp_packet/dlrr.h index 840ca37b6f..16bc115742 100644 --- a/webrtc/modules/rtp_rtcp/source/rtcp_packet/dlrr.h +++ b/webrtc/modules/rtp_rtcp/source/rtcp_packet/dlrr.h @@ -14,7 +14,7 @@ #include -#include "webrtc/base/basictypes.h" +#include "webrtc/rtc_base/basictypes.h" namespace webrtc { namespace rtcp { diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/extended_jitter_report.cc b/webrtc/modules/rtp_rtcp/source/rtcp_packet/extended_jitter_report.cc index f7798dc3a1..575184fbfd 100644 --- a/webrtc/modules/rtp_rtcp/source/rtcp_packet/extended_jitter_report.cc +++ b/webrtc/modules/rtp_rtcp/source/rtcp_packet/extended_jitter_report.cc @@ -12,10 +12,10 @@ #include -#include "webrtc/base/checks.h" -#include "webrtc/base/logging.h" #include "webrtc/modules/rtp_rtcp/source/byte_io.h" #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/common_header.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/logging.h" namespace webrtc { namespace rtcp { diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/extended_reports.cc b/webrtc/modules/rtp_rtcp/source/rtcp_packet/extended_reports.cc index d559eefd9d..eb84cd79be 100644 --- a/webrtc/modules/rtp_rtcp/source/rtcp_packet/extended_reports.cc +++ b/webrtc/modules/rtp_rtcp/source/rtcp_packet/extended_reports.cc @@ -10,10 +10,10 @@ #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/extended_reports.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/logging.h" #include "webrtc/modules/rtp_rtcp/source/byte_io.h" #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/common_header.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/logging.h" namespace webrtc { namespace rtcp { diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/extended_reports.h b/webrtc/modules/rtp_rtcp/source/rtcp_packet/extended_reports.h index cb34f370c5..aed304f74b 100644 --- a/webrtc/modules/rtp_rtcp/source/rtcp_packet/extended_reports.h +++ b/webrtc/modules/rtp_rtcp/source/rtcp_packet/extended_reports.h @@ -13,12 +13,12 @@ #include -#include "webrtc/base/optional.h" #include "webrtc/modules/rtp_rtcp/source/rtcp_packet.h" #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/dlrr.h" #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/rrtr.h" #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/target_bitrate.h" #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/voip_metric.h" +#include "webrtc/rtc_base/optional.h" namespace webrtc { namespace rtcp { diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/extended_reports_unittest.cc b/webrtc/modules/rtp_rtcp/source/rtcp_packet/extended_reports_unittest.cc index 905462ace9..08ffd49458 100644 --- a/webrtc/modules/rtp_rtcp/source/rtcp_packet/extended_reports_unittest.cc +++ b/webrtc/modules/rtp_rtcp/source/rtcp_packet/extended_reports_unittest.cc @@ -10,7 +10,7 @@ #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/extended_reports.h" -#include "webrtc/base/random.h" +#include "webrtc/rtc_base/random.h" #include "webrtc/test/gmock.h" #include "webrtc/test/gtest.h" #include "webrtc/test/rtcp_packet_parser.h" diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/fir.cc b/webrtc/modules/rtp_rtcp/source/rtcp_packet/fir.cc index 069a13c64a..5beb16fc45 100644 --- a/webrtc/modules/rtp_rtcp/source/rtcp_packet/fir.cc +++ b/webrtc/modules/rtp_rtcp/source/rtcp_packet/fir.cc @@ -10,10 +10,10 @@ #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/fir.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/logging.h" #include "webrtc/modules/rtp_rtcp/source/byte_io.h" #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/common_header.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/logging.h" namespace webrtc { namespace rtcp { diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/fir.h b/webrtc/modules/rtp_rtcp/source/rtcp_packet/fir.h index 8d772d87fa..0f1169793d 100644 --- a/webrtc/modules/rtp_rtcp/source/rtcp_packet/fir.h +++ b/webrtc/modules/rtp_rtcp/source/rtcp_packet/fir.h @@ -13,8 +13,8 @@ #include -#include "webrtc/base/basictypes.h" #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/psfb.h" +#include "webrtc/rtc_base/basictypes.h" namespace webrtc { namespace rtcp { diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/nack.cc b/webrtc/modules/rtp_rtcp/source/rtcp_packet/nack.cc index a51764f04b..478f8dc477 100644 --- a/webrtc/modules/rtp_rtcp/source/rtcp_packet/nack.cc +++ b/webrtc/modules/rtp_rtcp/source/rtcp_packet/nack.cc @@ -12,10 +12,10 @@ #include -#include "webrtc/base/checks.h" -#include "webrtc/base/logging.h" #include "webrtc/modules/rtp_rtcp/source/byte_io.h" #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/common_header.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/logging.h" namespace webrtc { namespace rtcp { diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/nack.h b/webrtc/modules/rtp_rtcp/source/rtcp_packet/nack.h index 2b5acec0ea..44d0f74aa1 100644 --- a/webrtc/modules/rtp_rtcp/source/rtcp_packet/nack.h +++ b/webrtc/modules/rtp_rtcp/source/rtcp_packet/nack.h @@ -13,8 +13,8 @@ #include -#include "webrtc/base/basictypes.h" #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/rtpfb.h" +#include "webrtc/rtc_base/basictypes.h" namespace webrtc { namespace rtcp { diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/pli.cc b/webrtc/modules/rtp_rtcp/source/rtcp_packet/pli.cc index ade6c2a874..3db3394f6d 100644 --- a/webrtc/modules/rtp_rtcp/source/rtcp_packet/pli.cc +++ b/webrtc/modules/rtp_rtcp/source/rtcp_packet/pli.cc @@ -10,9 +10,9 @@ #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/pli.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/logging.h" #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/common_header.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/logging.h" namespace webrtc { namespace rtcp { diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/pli.h b/webrtc/modules/rtp_rtcp/source/rtcp_packet/pli.h index c3682bdcaa..e464891dfd 100644 --- a/webrtc/modules/rtp_rtcp/source/rtcp_packet/pli.h +++ b/webrtc/modules/rtp_rtcp/source/rtcp_packet/pli.h @@ -10,8 +10,8 @@ #ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_PLI_H_ #define WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_PLI_H_ -#include "webrtc/base/basictypes.h" #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/psfb.h" +#include "webrtc/rtc_base/basictypes.h" namespace webrtc { namespace rtcp { diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/psfb.h b/webrtc/modules/rtp_rtcp/source/rtcp_packet/psfb.h index 762dc61138..96ad413516 100644 --- a/webrtc/modules/rtp_rtcp/source/rtcp_packet/psfb.h +++ b/webrtc/modules/rtp_rtcp/source/rtcp_packet/psfb.h @@ -12,8 +12,8 @@ #ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_PSFB_H_ #define WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_PSFB_H_ -#include "webrtc/base/basictypes.h" #include "webrtc/modules/rtp_rtcp/source/rtcp_packet.h" +#include "webrtc/rtc_base/basictypes.h" namespace webrtc { namespace rtcp { diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/rapid_resync_request.cc b/webrtc/modules/rtp_rtcp/source/rtcp_packet/rapid_resync_request.cc index 1ec6826e6b..943c238694 100644 --- a/webrtc/modules/rtp_rtcp/source/rtcp_packet/rapid_resync_request.cc +++ b/webrtc/modules/rtp_rtcp/source/rtcp_packet/rapid_resync_request.cc @@ -10,9 +10,9 @@ #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/rapid_resync_request.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/logging.h" #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/common_header.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/logging.h" namespace webrtc { namespace rtcp { diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/rapid_resync_request.h b/webrtc/modules/rtp_rtcp/source/rtcp_packet/rapid_resync_request.h index ba101a3b09..0a1108390d 100644 --- a/webrtc/modules/rtp_rtcp/source/rtcp_packet/rapid_resync_request.h +++ b/webrtc/modules/rtp_rtcp/source/rtcp_packet/rapid_resync_request.h @@ -11,8 +11,8 @@ #ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_RAPID_RESYNC_REQUEST_H_ #define WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_RAPID_RESYNC_REQUEST_H_ -#include "webrtc/base/basictypes.h" #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/rtpfb.h" +#include "webrtc/rtc_base/basictypes.h" namespace webrtc { namespace rtcp { diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/receiver_report.cc b/webrtc/modules/rtp_rtcp/source/rtcp_packet/receiver_report.cc index 03a9dbd86e..c192807180 100644 --- a/webrtc/modules/rtp_rtcp/source/rtcp_packet/receiver_report.cc +++ b/webrtc/modules/rtp_rtcp/source/rtcp_packet/receiver_report.cc @@ -10,10 +10,10 @@ #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/receiver_report.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/logging.h" #include "webrtc/modules/rtp_rtcp/source/byte_io.h" #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/common_header.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/logging.h" namespace webrtc { namespace rtcp { diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/receiver_report.h b/webrtc/modules/rtp_rtcp/source/rtcp_packet/receiver_report.h index 2b8b190293..85ab8ebd34 100644 --- a/webrtc/modules/rtp_rtcp/source/rtcp_packet/receiver_report.h +++ b/webrtc/modules/rtp_rtcp/source/rtcp_packet/receiver_report.h @@ -13,9 +13,9 @@ #include -#include "webrtc/base/basictypes.h" #include "webrtc/modules/rtp_rtcp/source/rtcp_packet.h" #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/report_block.h" +#include "webrtc/rtc_base/basictypes.h" namespace webrtc { namespace rtcp { diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/remb.cc b/webrtc/modules/rtp_rtcp/source/rtcp_packet/remb.cc index c6f89728ff..8e2eceb72d 100644 --- a/webrtc/modules/rtp_rtcp/source/rtcp_packet/remb.cc +++ b/webrtc/modules/rtp_rtcp/source/rtcp_packet/remb.cc @@ -12,10 +12,10 @@ #include -#include "webrtc/base/checks.h" -#include "webrtc/base/logging.h" #include "webrtc/modules/rtp_rtcp/source/byte_io.h" #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/common_header.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/logging.h" namespace webrtc { namespace rtcp { diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/remb.h b/webrtc/modules/rtp_rtcp/source/rtcp_packet/remb.h index 42c2a96ce1..062effab1a 100644 --- a/webrtc/modules/rtp_rtcp/source/rtcp_packet/remb.h +++ b/webrtc/modules/rtp_rtcp/source/rtcp_packet/remb.h @@ -13,8 +13,8 @@ #include -#include "webrtc/base/basictypes.h" #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/psfb.h" +#include "webrtc/rtc_base/basictypes.h" namespace webrtc { namespace rtcp { diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/report_block.cc b/webrtc/modules/rtp_rtcp/source/rtcp_packet/report_block.cc index e597748027..9589d89579 100644 --- a/webrtc/modules/rtp_rtcp/source/rtcp_packet/report_block.cc +++ b/webrtc/modules/rtp_rtcp/source/rtcp_packet/report_block.cc @@ -10,9 +10,9 @@ #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/report_block.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/logging.h" #include "webrtc/modules/rtp_rtcp/source/byte_io.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/logging.h" namespace webrtc { namespace rtcp { diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/report_block.h b/webrtc/modules/rtp_rtcp/source/rtcp_packet/report_block.h index bdc3cbcd1f..0156cc0151 100644 --- a/webrtc/modules/rtp_rtcp/source/rtcp_packet/report_block.h +++ b/webrtc/modules/rtp_rtcp/source/rtcp_packet/report_block.h @@ -12,7 +12,7 @@ #ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_REPORT_BLOCK_H_ #define WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_REPORT_BLOCK_H_ -#include "webrtc/base/basictypes.h" +#include "webrtc/rtc_base/basictypes.h" namespace webrtc { namespace rtcp { diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/report_block_unittest.cc b/webrtc/modules/rtp_rtcp/source/rtcp_packet/report_block_unittest.cc index b6a0ab7bd8..9d6117a744 100644 --- a/webrtc/modules/rtp_rtcp/source/rtcp_packet/report_block_unittest.cc +++ b/webrtc/modules/rtp_rtcp/source/rtcp_packet/report_block_unittest.cc @@ -12,7 +12,7 @@ #include -#include "webrtc/base/random.h" +#include "webrtc/rtc_base/random.h" #include "webrtc/test/gtest.h" using webrtc::rtcp::ReportBlock; diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/rrtr.cc b/webrtc/modules/rtp_rtcp/source/rtcp_packet/rrtr.cc index db4ae67326..0f81f3a8ba 100644 --- a/webrtc/modules/rtp_rtcp/source/rtcp_packet/rrtr.cc +++ b/webrtc/modules/rtp_rtcp/source/rtcp_packet/rrtr.cc @@ -10,8 +10,8 @@ #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/rrtr.h" -#include "webrtc/base/checks.h" #include "webrtc/modules/rtp_rtcp/source/byte_io.h" +#include "webrtc/rtc_base/checks.h" namespace webrtc { namespace rtcp { diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/rrtr.h b/webrtc/modules/rtp_rtcp/source/rtcp_packet/rrtr.h index f123aaf4f1..b87efe8f77 100644 --- a/webrtc/modules/rtp_rtcp/source/rtcp_packet/rrtr.h +++ b/webrtc/modules/rtp_rtcp/source/rtcp_packet/rrtr.h @@ -12,7 +12,7 @@ #ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_RRTR_H_ #define WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_RRTR_H_ -#include "webrtc/base/basictypes.h" +#include "webrtc/rtc_base/basictypes.h" #include "webrtc/system_wrappers/include/ntp_time.h" namespace webrtc { diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/rtpfb.h b/webrtc/modules/rtp_rtcp/source/rtcp_packet/rtpfb.h index b34e4a02d6..734ed9aaa9 100644 --- a/webrtc/modules/rtp_rtcp/source/rtcp_packet/rtpfb.h +++ b/webrtc/modules/rtp_rtcp/source/rtcp_packet/rtpfb.h @@ -12,8 +12,8 @@ #ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_RTPFB_H_ #define WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_RTPFB_H_ -#include "webrtc/base/basictypes.h" #include "webrtc/modules/rtp_rtcp/source/rtcp_packet.h" +#include "webrtc/rtc_base/basictypes.h" namespace webrtc { namespace rtcp { diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/sdes.cc b/webrtc/modules/rtp_rtcp/source/rtcp_packet/sdes.cc index 2e395d7297..e74746707c 100644 --- a/webrtc/modules/rtp_rtcp/source/rtcp_packet/sdes.cc +++ b/webrtc/modules/rtp_rtcp/source/rtcp_packet/sdes.cc @@ -12,10 +12,10 @@ #include -#include "webrtc/base/checks.h" -#include "webrtc/base/logging.h" #include "webrtc/modules/rtp_rtcp/source/byte_io.h" #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/common_header.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/logging.h" namespace webrtc { namespace rtcp { diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/sdes.h b/webrtc/modules/rtp_rtcp/source/rtcp_packet/sdes.h index 34885dc00d..5ce518e4a2 100644 --- a/webrtc/modules/rtp_rtcp/source/rtcp_packet/sdes.h +++ b/webrtc/modules/rtp_rtcp/source/rtcp_packet/sdes.h @@ -14,8 +14,8 @@ #include #include -#include "webrtc/base/basictypes.h" #include "webrtc/modules/rtp_rtcp/source/rtcp_packet.h" +#include "webrtc/rtc_base/basictypes.h" namespace webrtc { namespace rtcp { diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/sender_report.cc b/webrtc/modules/rtp_rtcp/source/rtcp_packet/sender_report.cc index 3cadd431b3..59c08c3c66 100644 --- a/webrtc/modules/rtp_rtcp/source/rtcp_packet/sender_report.cc +++ b/webrtc/modules/rtp_rtcp/source/rtcp_packet/sender_report.cc @@ -10,10 +10,10 @@ #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/sender_report.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/logging.h" #include "webrtc/modules/rtp_rtcp/source/byte_io.h" #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/common_header.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/logging.h" namespace webrtc { namespace rtcp { diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/target_bitrate.cc b/webrtc/modules/rtp_rtcp/source/rtcp_packet/target_bitrate.cc index 1a00006fe0..7f1fae4395 100644 --- a/webrtc/modules/rtp_rtcp/source/rtcp_packet/target_bitrate.cc +++ b/webrtc/modules/rtp_rtcp/source/rtcp_packet/target_bitrate.cc @@ -10,8 +10,8 @@ #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/target_bitrate.h" -#include "webrtc/base/checks.h" #include "webrtc/modules/rtp_rtcp/source/byte_io.h" +#include "webrtc/rtc_base/checks.h" namespace webrtc { namespace rtcp { diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/target_bitrate.h b/webrtc/modules/rtp_rtcp/source/rtcp_packet/target_bitrate.h index d7c49a9a44..0781a6bcae 100644 --- a/webrtc/modules/rtp_rtcp/source/rtcp_packet/target_bitrate.h +++ b/webrtc/modules/rtp_rtcp/source/rtcp_packet/target_bitrate.h @@ -13,7 +13,7 @@ #include -#include "webrtc/base/basictypes.h" +#include "webrtc/rtc_base/basictypes.h" namespace webrtc { namespace rtcp { diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/target_bitrate_unittest.cc b/webrtc/modules/rtp_rtcp/source/rtcp_packet/target_bitrate_unittest.cc index 2c5098d274..75efe31c78 100644 --- a/webrtc/modules/rtp_rtcp/source/rtcp_packet/target_bitrate_unittest.cc +++ b/webrtc/modules/rtp_rtcp/source/rtcp_packet/target_bitrate_unittest.cc @@ -10,11 +10,11 @@ #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/target_bitrate.h" -#include "webrtc/base/buffer.h" -#include "webrtc/test/gtest.h" -#include "webrtc/test/rtcp_packet_parser.h" #include "webrtc/modules/rtp_rtcp/source/byte_io.h" #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/extended_reports.h" +#include "webrtc/rtc_base/buffer.h" +#include "webrtc/test/gtest.h" +#include "webrtc/test/rtcp_packet_parser.h" namespace webrtc { namespace { diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmb_item.cc b/webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmb_item.cc index b15615267e..97e361a240 100644 --- a/webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmb_item.cc +++ b/webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmb_item.cc @@ -10,9 +10,9 @@ #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmb_item.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/logging.h" #include "webrtc/modules/rtp_rtcp/source/byte_io.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/logging.h" namespace webrtc { namespace rtcp { diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmb_item.h b/webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmb_item.h index c77bb761dd..31071c0730 100644 --- a/webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmb_item.h +++ b/webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmb_item.h @@ -11,7 +11,7 @@ #ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_TMMB_ITEM_H_ #define WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_TMMB_ITEM_H_ -#include "webrtc/base/basictypes.h" +#include "webrtc/rtc_base/basictypes.h" namespace webrtc { namespace rtcp { diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmbn.cc b/webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmbn.cc index d9c3227ddb..3f26983353 100644 --- a/webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmbn.cc +++ b/webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmbn.cc @@ -10,10 +10,10 @@ #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmbn.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/logging.h" #include "webrtc/modules/rtp_rtcp/source/byte_io.h" #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/common_header.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/logging.h" namespace webrtc { namespace rtcp { diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmbn.h b/webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmbn.h index 8b32366e24..3a06e44a1e 100644 --- a/webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmbn.h +++ b/webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmbn.h @@ -13,9 +13,9 @@ #include -#include "webrtc/base/basictypes.h" #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/rtpfb.h" #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmb_item.h" +#include "webrtc/rtc_base/basictypes.h" namespace webrtc { namespace rtcp { diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmbr.cc b/webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmbr.cc index fd0719ea5e..96abf8143e 100644 --- a/webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmbr.cc +++ b/webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmbr.cc @@ -10,10 +10,10 @@ #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmbr.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/logging.h" #include "webrtc/modules/rtp_rtcp/source/byte_io.h" #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/common_header.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/logging.h" namespace webrtc { namespace rtcp { diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmbr.h b/webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmbr.h index 4d1bf11e06..4209ddf96c 100644 --- a/webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmbr.h +++ b/webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmbr.h @@ -13,9 +13,9 @@ #include -#include "webrtc/base/basictypes.h" #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/rtpfb.h" #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmb_item.h" +#include "webrtc/rtc_base/basictypes.h" namespace webrtc { namespace rtcp { diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/transport_feedback.cc b/webrtc/modules/rtp_rtcp/source/rtcp_packet/transport_feedback.cc index 796577cc59..057fe55801 100644 --- a/webrtc/modules/rtp_rtcp/source/rtcp_packet/transport_feedback.cc +++ b/webrtc/modules/rtp_rtcp/source/rtcp_packet/transport_feedback.cc @@ -12,12 +12,12 @@ #include -#include "webrtc/base/checks.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/trace_event.h" #include "webrtc/modules/include/module_common_types.h" #include "webrtc/modules/rtp_rtcp/source/byte_io.h" #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/common_header.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/trace_event.h" namespace webrtc { namespace rtcp { diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/voip_metric.cc b/webrtc/modules/rtp_rtcp/source/rtcp_packet/voip_metric.cc index a79d48e1ca..1b3bbf3fa7 100644 --- a/webrtc/modules/rtp_rtcp/source/rtcp_packet/voip_metric.cc +++ b/webrtc/modules/rtp_rtcp/source/rtcp_packet/voip_metric.cc @@ -10,8 +10,8 @@ #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/voip_metric.h" -#include "webrtc/base/checks.h" #include "webrtc/modules/rtp_rtcp/source/byte_io.h" +#include "webrtc/rtc_base/checks.h" namespace webrtc { namespace rtcp { diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/voip_metric.h b/webrtc/modules/rtp_rtcp/source/rtcp_packet/voip_metric.h index 62c26fef37..7409b4e652 100644 --- a/webrtc/modules/rtp_rtcp/source/rtcp_packet/voip_metric.h +++ b/webrtc/modules/rtp_rtcp/source/rtcp_packet/voip_metric.h @@ -12,8 +12,8 @@ #ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_VOIP_METRIC_H_ #define WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_VOIP_METRIC_H_ -#include "webrtc/base/basictypes.h" #include "webrtc/modules/include/module_common_types.h" +#include "webrtc/rtc_base/basictypes.h" namespace webrtc { namespace rtcp { diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_receiver.cc b/webrtc/modules/rtp_rtcp/source/rtcp_receiver.cc index 4a3235fffe..5172a802bd 100644 --- a/webrtc/modules/rtp_rtcp/source/rtcp_receiver.cc +++ b/webrtc/modules/rtp_rtcp/source/rtcp_receiver.cc @@ -18,9 +18,6 @@ #include #include -#include "webrtc/base/checks.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/trace_event.h" #include "webrtc/common_types.h" #include "webrtc/common_video/include/video_bitrate_allocator.h" #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/bye.h" @@ -41,6 +38,9 @@ #include "webrtc/modules/rtp_rtcp/source/rtp_rtcp_config.h" #include "webrtc/modules/rtp_rtcp/source/time_util.h" #include "webrtc/modules/rtp_rtcp/source/tmmbr_help.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/trace_event.h" #include "webrtc/system_wrappers/include/ntp_time.h" namespace webrtc { diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_receiver.h b/webrtc/modules/rtp_rtcp/source/rtcp_receiver.h index 1c657a2fc4..33b2b30ad6 100644 --- a/webrtc/modules/rtp_rtcp/source/rtcp_receiver.h +++ b/webrtc/modules/rtp_rtcp/source/rtcp_receiver.h @@ -16,11 +16,11 @@ #include #include -#include "webrtc/base/criticalsection.h" -#include "webrtc/base/thread_annotations.h" #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" #include "webrtc/modules/rtp_rtcp/source/rtcp_nack_stats.h" #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/dlrr.h" +#include "webrtc/rtc_base/criticalsection.h" +#include "webrtc/rtc_base/thread_annotations.h" #include "webrtc/system_wrappers/include/ntp_time.h" #include "webrtc/typedefs.h" diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_receiver_unittest.cc b/webrtc/modules/rtp_rtcp/source/rtcp_receiver_unittest.cc index d419caffeb..bc5597f9d4 100644 --- a/webrtc/modules/rtp_rtcp/source/rtcp_receiver_unittest.cc +++ b/webrtc/modules/rtp_rtcp/source/rtcp_receiver_unittest.cc @@ -10,9 +10,6 @@ #include -#include "webrtc/base/arraysize.h" -#include "webrtc/base/array_view.h" -#include "webrtc/base/random.h" #include "webrtc/common_types.h" #include "webrtc/common_video/include/video_bitrate_allocator.h" #include "webrtc/modules/rtp_rtcp/source/byte_io.h" @@ -34,6 +31,9 @@ #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h" #include "webrtc/modules/rtp_rtcp/source/rtcp_receiver.h" #include "webrtc/modules/rtp_rtcp/source/time_util.h" +#include "webrtc/rtc_base/array_view.h" +#include "webrtc/rtc_base/arraysize.h" +#include "webrtc/rtc_base/random.h" #include "webrtc/system_wrappers/include/ntp_time.h" #include "webrtc/test/gmock.h" #include "webrtc/test/gtest.h" diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_sender.cc b/webrtc/modules/rtp_rtcp/source/rtcp_sender.cc index f3ecefcd08..93d7aa3c1f 100644 --- a/webrtc/modules/rtp_rtcp/source/rtcp_sender.cc +++ b/webrtc/modules/rtp_rtcp/source/rtcp_sender.cc @@ -14,10 +14,6 @@ #include -#include "webrtc/base/checks.h" -#include "webrtc/base/constructormagic.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/trace_event.h" #include "webrtc/common_types.h" #include "webrtc/logging/rtc_event_log/rtc_event_log.h" #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/app.h" @@ -37,6 +33,10 @@ #include "webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.h" #include "webrtc/modules/rtp_rtcp/source/time_util.h" #include "webrtc/modules/rtp_rtcp/source/tmmbr_help.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/constructormagic.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/trace_event.h" namespace webrtc { diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_sender.h b/webrtc/modules/rtp_rtcp/source/rtcp_sender.h index ece186425f..9ab763ae40 100644 --- a/webrtc/modules/rtp_rtcp/source/rtcp_sender.h +++ b/webrtc/modules/rtp_rtcp/source/rtcp_sender.h @@ -19,11 +19,6 @@ #include #include "webrtc/api/call/transport.h" -#include "webrtc/base/constructormagic.h" -#include "webrtc/base/criticalsection.h" -#include "webrtc/base/optional.h" -#include "webrtc/base/random.h" -#include "webrtc/base/thread_annotations.h" #include "webrtc/modules/remote_bitrate_estimator/include/bwe_defines.h" #include "webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h" #include "webrtc/modules/rtp_rtcp/include/receive_statistics.h" @@ -33,6 +28,11 @@ #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/dlrr.h" #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/report_block.h" #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmb_item.h" +#include "webrtc/rtc_base/constructormagic.h" +#include "webrtc/rtc_base/criticalsection.h" +#include "webrtc/rtc_base/optional.h" +#include "webrtc/rtc_base/random.h" +#include "webrtc/rtc_base/thread_annotations.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_sender_unittest.cc b/webrtc/modules/rtp_rtcp/source/rtcp_sender_unittest.cc index 2b368284ae..223e06b35d 100644 --- a/webrtc/modules/rtp_rtcp/source/rtcp_sender_unittest.cc +++ b/webrtc/modules/rtp_rtcp/source/rtcp_sender_unittest.cc @@ -10,12 +10,12 @@ #include -#include "webrtc/base/rate_limiter.h" #include "webrtc/common_types.h" #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/bye.h" #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/common_header.h" #include "webrtc/modules/rtp_rtcp/source/rtcp_sender.h" #include "webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.h" +#include "webrtc/rtc_base/rate_limiter.h" #include "webrtc/test/gmock.h" #include "webrtc/test/gtest.h" #include "webrtc/test/mock_transport.h" diff --git a/webrtc/modules/rtp_rtcp/source/rtp_fec_unittest.cc b/webrtc/modules/rtp_rtcp/source/rtp_fec_unittest.cc index 11b6849ef0..99f16699f3 100644 --- a/webrtc/modules/rtp_rtcp/source/rtp_fec_unittest.cc +++ b/webrtc/modules/rtp_rtcp/source/rtp_fec_unittest.cc @@ -12,13 +12,13 @@ #include #include -#include "webrtc/base/basictypes.h" -#include "webrtc/base/random.h" #include "webrtc/modules/rtp_rtcp/source/byte_io.h" #include "webrtc/modules/rtp_rtcp/source/fec_test_helper.h" #include "webrtc/modules/rtp_rtcp/source/flexfec_header_reader_writer.h" #include "webrtc/modules/rtp_rtcp/source/forward_error_correction.h" #include "webrtc/modules/rtp_rtcp/source/ulpfec_header_reader_writer.h" +#include "webrtc/rtc_base/basictypes.h" +#include "webrtc/rtc_base/random.h" #include "webrtc/test/gtest.h" namespace webrtc { diff --git a/webrtc/modules/rtp_rtcp/source/rtp_format.h b/webrtc/modules/rtp_rtcp/source/rtp_format.h index 9fa3df5b94..378f38a29b 100644 --- a/webrtc/modules/rtp_rtcp/source/rtp_format.h +++ b/webrtc/modules/rtp_rtcp/source/rtp_format.h @@ -13,9 +13,9 @@ #include -#include "webrtc/base/constructormagic.h" #include "webrtc/modules/include/module_common_types.h" #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" +#include "webrtc/rtc_base/constructormagic.h" namespace webrtc { class RtpPacketToSend; diff --git a/webrtc/modules/rtp_rtcp/source/rtp_format_h264.cc b/webrtc/modules/rtp_rtcp/source/rtp_format_h264.cc index 68e54f1432..092ac1cc49 100644 --- a/webrtc/modules/rtp_rtcp/source/rtp_format_h264.cc +++ b/webrtc/modules/rtp_rtcp/source/rtp_format_h264.cc @@ -15,15 +15,15 @@ #include #include -#include "webrtc/base/checks.h" -#include "webrtc/base/logging.h" -#include "webrtc/modules/include/module_common_types.h" -#include "webrtc/modules/rtp_rtcp/source/byte_io.h" -#include "webrtc/modules/rtp_rtcp/source/rtp_packet_to_send.h" -#include "webrtc/common_video/h264/sps_vui_rewriter.h" #include "webrtc/common_video/h264/h264_common.h" #include "webrtc/common_video/h264/pps_parser.h" #include "webrtc/common_video/h264/sps_parser.h" +#include "webrtc/common_video/h264/sps_vui_rewriter.h" +#include "webrtc/modules/include/module_common_types.h" +#include "webrtc/modules/rtp_rtcp/source/byte_io.h" +#include "webrtc/modules/rtp_rtcp/source/rtp_packet_to_send.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/logging.h" #include "webrtc/system_wrappers/include/metrics.h" namespace webrtc { diff --git a/webrtc/modules/rtp_rtcp/source/rtp_format_h264.h b/webrtc/modules/rtp_rtcp/source/rtp_format_h264.h index 7047885d8d..3742ec5d36 100644 --- a/webrtc/modules/rtp_rtcp/source/rtp_format_h264.h +++ b/webrtc/modules/rtp_rtcp/source/rtp_format_h264.h @@ -16,9 +16,9 @@ #include #include -#include "webrtc/base/buffer.h" -#include "webrtc/base/constructormagic.h" #include "webrtc/modules/rtp_rtcp/source/rtp_format.h" +#include "webrtc/rtc_base/buffer.h" +#include "webrtc/rtc_base/constructormagic.h" namespace webrtc { diff --git a/webrtc/modules/rtp_rtcp/source/rtp_format_h264_unittest.cc b/webrtc/modules/rtp_rtcp/source/rtp_format_h264_unittest.cc index c45c212d1c..ec486c05a0 100644 --- a/webrtc/modules/rtp_rtcp/source/rtp_format_h264_unittest.cc +++ b/webrtc/modules/rtp_rtcp/source/rtp_format_h264_unittest.cc @@ -11,13 +11,13 @@ #include #include -#include "webrtc/base/array_view.h" #include "webrtc/common_video/h264/h264_common.h" #include "webrtc/modules/include/module_common_types.h" #include "webrtc/modules/rtp_rtcp/mocks/mock_rtp_rtcp.h" #include "webrtc/modules/rtp_rtcp/source/byte_io.h" #include "webrtc/modules/rtp_rtcp/source/rtp_format.h" #include "webrtc/modules/rtp_rtcp/source/rtp_packet_to_send.h" +#include "webrtc/rtc_base/array_view.h" #include "webrtc/test/gmock.h" #include "webrtc/test/gtest.h" diff --git a/webrtc/modules/rtp_rtcp/source/rtp_format_video_generic.cc b/webrtc/modules/rtp_rtcp/source/rtp_format_video_generic.cc index ab3c5ef2c1..696dc2bd35 100644 --- a/webrtc/modules/rtp_rtcp/source/rtp_format_video_generic.cc +++ b/webrtc/modules/rtp_rtcp/source/rtp_format_video_generic.cc @@ -10,10 +10,10 @@ #include -#include "webrtc/base/logging.h" #include "webrtc/modules/include/module_common_types.h" #include "webrtc/modules/rtp_rtcp/source/rtp_format_video_generic.h" #include "webrtc/modules/rtp_rtcp/source/rtp_packet_to_send.h" +#include "webrtc/rtc_base/logging.h" namespace webrtc { diff --git a/webrtc/modules/rtp_rtcp/source/rtp_format_video_generic.h b/webrtc/modules/rtp_rtcp/source/rtp_format_video_generic.h index 25e72809f9..16d92e7a0c 100644 --- a/webrtc/modules/rtp_rtcp/source/rtp_format_video_generic.h +++ b/webrtc/modules/rtp_rtcp/source/rtp_format_video_generic.h @@ -12,9 +12,9 @@ #include -#include "webrtc/base/constructormagic.h" #include "webrtc/common_types.h" #include "webrtc/modules/rtp_rtcp/source/rtp_format.h" +#include "webrtc/rtc_base/constructormagic.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/rtp_rtcp/source/rtp_format_video_generic_unittest.cc b/webrtc/modules/rtp_rtcp/source/rtp_format_video_generic_unittest.cc index 21fa92224d..91ad00138a 100644 --- a/webrtc/modules/rtp_rtcp/source/rtp_format_video_generic_unittest.cc +++ b/webrtc/modules/rtp_rtcp/source/rtp_format_video_generic_unittest.cc @@ -13,12 +13,12 @@ #include #include -#include "webrtc/base/array_view.h" #include "webrtc/modules/include/module_common_types.h" #include "webrtc/modules/rtp_rtcp/mocks/mock_rtp_rtcp.h" #include "webrtc/modules/rtp_rtcp/source/byte_io.h" #include "webrtc/modules/rtp_rtcp/source/rtp_format_video_generic.h" #include "webrtc/modules/rtp_rtcp/source/rtp_packet_to_send.h" +#include "webrtc/rtc_base/array_view.h" #include "webrtc/test/gmock.h" #include "webrtc/test/gtest.h" diff --git a/webrtc/modules/rtp_rtcp/source/rtp_format_vp8.cc b/webrtc/modules/rtp_rtcp/source/rtp_format_vp8.cc index 1139a8d34a..e744ff4b4a 100644 --- a/webrtc/modules/rtp_rtcp/source/rtp_format_vp8.cc +++ b/webrtc/modules/rtp_rtcp/source/rtp_format_vp8.cc @@ -17,8 +17,8 @@ #include #include -#include "webrtc/base/logging.h" #include "webrtc/modules/rtp_rtcp/source/rtp_packet_to_send.h" +#include "webrtc/rtc_base/logging.h" namespace webrtc { namespace { diff --git a/webrtc/modules/rtp_rtcp/source/rtp_format_vp8.h b/webrtc/modules/rtp_rtcp/source/rtp_format_vp8.h index 25a2739dc7..edb3d4d18f 100644 --- a/webrtc/modules/rtp_rtcp/source/rtp_format_vp8.h +++ b/webrtc/modules/rtp_rtcp/source/rtp_format_vp8.h @@ -29,9 +29,9 @@ #include #include -#include "webrtc/base/constructormagic.h" #include "webrtc/modules/include/module_common_types.h" #include "webrtc/modules/rtp_rtcp/source/rtp_format.h" +#include "webrtc/rtc_base/constructormagic.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/rtp_rtcp/source/rtp_format_vp8_test_helper.h b/webrtc/modules/rtp_rtcp/source/rtp_format_vp8_test_helper.h index c71ba71af3..4acccd28a9 100644 --- a/webrtc/modules/rtp_rtcp/source/rtp_format_vp8_test_helper.h +++ b/webrtc/modules/rtp_rtcp/source/rtp_format_vp8_test_helper.h @@ -18,10 +18,10 @@ #ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_FORMAT_VP8_TEST_HELPER_H_ #define WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_FORMAT_VP8_TEST_HELPER_H_ -#include "webrtc/base/constructormagic.h" #include "webrtc/modules/include/module_common_types.h" #include "webrtc/modules/rtp_rtcp/source/rtp_format_vp8.h" #include "webrtc/modules/rtp_rtcp/source/rtp_packet_to_send.h" +#include "webrtc/rtc_base/constructormagic.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/rtp_rtcp/source/rtp_format_vp9.cc b/webrtc/modules/rtp_rtcp/source/rtp_format_vp9.cc index fe911a27b9..6f02010172 100644 --- a/webrtc/modules/rtp_rtcp/source/rtp_format_vp9.cc +++ b/webrtc/modules/rtp_rtcp/source/rtp_format_vp9.cc @@ -15,10 +15,10 @@ #include -#include "webrtc/base/bitbuffer.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/logging.h" #include "webrtc/modules/rtp_rtcp/source/rtp_packet_to_send.h" +#include "webrtc/rtc_base/bitbuffer.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/logging.h" #define RETURN_FALSE_ON_ERROR(x) \ if (!(x)) { \ diff --git a/webrtc/modules/rtp_rtcp/source/rtp_format_vp9.h b/webrtc/modules/rtp_rtcp/source/rtp_format_vp9.h index ad49782aa6..7b0b06c884 100644 --- a/webrtc/modules/rtp_rtcp/source/rtp_format_vp9.h +++ b/webrtc/modules/rtp_rtcp/source/rtp_format_vp9.h @@ -24,9 +24,9 @@ #include #include -#include "webrtc/base/constructormagic.h" #include "webrtc/modules/include/module_common_types.h" #include "webrtc/modules/rtp_rtcp/source/rtp_format.h" +#include "webrtc/rtc_base/constructormagic.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/rtp_rtcp/source/rtp_header_extension_map.cc b/webrtc/modules/rtp_rtcp/source/rtp_header_extension_map.cc index 9b30a5e596..18ee7e0f6c 100644 --- a/webrtc/modules/rtp_rtcp/source/rtp_header_extension_map.cc +++ b/webrtc/modules/rtp_rtcp/source/rtp_header_extension_map.cc @@ -10,11 +10,11 @@ #include "webrtc/modules/rtp_rtcp/include/rtp_header_extension_map.h" -#include "webrtc/base/arraysize.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/logging.h" #include "webrtc/modules/rtp_rtcp/source/rtp_header_extensions.h" #include "webrtc/modules/rtp_rtcp/source/rtp_utility.h" +#include "webrtc/rtc_base/arraysize.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/logging.h" namespace webrtc { namespace { diff --git a/webrtc/modules/rtp_rtcp/source/rtp_header_extensions.cc b/webrtc/modules/rtp_rtcp/source/rtp_header_extensions.cc index c3fc9dc5dc..3a4afef425 100644 --- a/webrtc/modules/rtp_rtcp/source/rtp_header_extensions.cc +++ b/webrtc/modules/rtp_rtcp/source/rtp_header_extensions.cc @@ -10,10 +10,10 @@ #include "webrtc/modules/rtp_rtcp/source/rtp_header_extensions.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/logging.h" #include "webrtc/modules/rtp_rtcp/include/rtp_cvo.h" #include "webrtc/modules/rtp_rtcp/source/byte_io.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/logging.h" namespace webrtc { // Absolute send time in RTP streams. diff --git a/webrtc/modules/rtp_rtcp/source/rtp_header_extensions.h b/webrtc/modules/rtp_rtcp/source/rtp_header_extensions.h index c637a844e6..31d49b2e1a 100644 --- a/webrtc/modules/rtp_rtcp/source/rtp_header_extensions.h +++ b/webrtc/modules/rtp_rtcp/source/rtp_header_extensions.h @@ -16,8 +16,8 @@ #include "webrtc/api/video/video_content_type.h" #include "webrtc/api/video/video_rotation.h" #include "webrtc/api/video/video_timing.h" -#include "webrtc/base/array_view.h" #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" +#include "webrtc/rtc_base/array_view.h" namespace webrtc { diff --git a/webrtc/modules/rtp_rtcp/source/rtp_header_parser.cc b/webrtc/modules/rtp_rtcp/source/rtp_header_parser.cc index 1206d407f6..be940a6066 100644 --- a/webrtc/modules/rtp_rtcp/source/rtp_header_parser.cc +++ b/webrtc/modules/rtp_rtcp/source/rtp_header_parser.cc @@ -9,9 +9,9 @@ */ #include "webrtc/modules/rtp_rtcp/include/rtp_header_parser.h" -#include "webrtc/base/criticalsection.h" #include "webrtc/modules/rtp_rtcp/include/rtp_header_extension_map.h" #include "webrtc/modules/rtp_rtcp/source/rtp_utility.h" +#include "webrtc/rtc_base/criticalsection.h" namespace webrtc { diff --git a/webrtc/modules/rtp_rtcp/source/rtp_packet.cc b/webrtc/modules/rtp_rtcp/source/rtp_packet.cc index 0ccf05e3bf..78fa0d2ed6 100644 --- a/webrtc/modules/rtp_rtcp/source/rtp_packet.cc +++ b/webrtc/modules/rtp_rtcp/source/rtp_packet.cc @@ -13,13 +13,13 @@ #include #include -#include "webrtc/base/checks.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/random.h" #include "webrtc/common_types.h" #include "webrtc/modules/rtp_rtcp/include/rtp_header_extension_map.h" #include "webrtc/modules/rtp_rtcp/source/byte_io.h" #include "webrtc/modules/rtp_rtcp/source/rtp_header_extensions.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/random.h" namespace webrtc { namespace rtp { diff --git a/webrtc/modules/rtp_rtcp/source/rtp_packet.h b/webrtc/modules/rtp_rtcp/source/rtp_packet.h index 648e9f2e4a..47aaf574ff 100644 --- a/webrtc/modules/rtp_rtcp/source/rtp_packet.h +++ b/webrtc/modules/rtp_rtcp/source/rtp_packet.h @@ -12,10 +12,10 @@ #include -#include "webrtc/base/array_view.h" -#include "webrtc/base/basictypes.h" -#include "webrtc/base/copyonwritebuffer.h" #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" +#include "webrtc/rtc_base/array_view.h" +#include "webrtc/rtc_base/basictypes.h" +#include "webrtc/rtc_base/copyonwritebuffer.h" namespace webrtc { struct RTPHeader; diff --git a/webrtc/modules/rtp_rtcp/source/rtp_packet_history.cc b/webrtc/modules/rtp_rtcp/source/rtp_packet_history.cc index 19b98a69f3..0dd80cbbb7 100644 --- a/webrtc/modules/rtp_rtcp/source/rtp_packet_history.cc +++ b/webrtc/modules/rtp_rtcp/source/rtp_packet_history.cc @@ -14,9 +14,9 @@ #include #include -#include "webrtc/base/checks.h" -#include "webrtc/base/logging.h" #include "webrtc/modules/rtp_rtcp/source/rtp_packet_to_send.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/logging.h" #include "webrtc/system_wrappers/include/clock.h" namespace webrtc { diff --git a/webrtc/modules/rtp_rtcp/source/rtp_packet_history.h b/webrtc/modules/rtp_rtcp/source/rtp_packet_history.h index dc2b35a375..bffeb5c938 100644 --- a/webrtc/modules/rtp_rtcp/source/rtp_packet_history.h +++ b/webrtc/modules/rtp_rtcp/source/rtp_packet_history.h @@ -14,10 +14,10 @@ #include #include -#include "webrtc/base/constructormagic.h" -#include "webrtc/base/criticalsection.h" -#include "webrtc/base/thread_annotations.h" #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" +#include "webrtc/rtc_base/constructormagic.h" +#include "webrtc/rtc_base/criticalsection.h" +#include "webrtc/rtc_base/thread_annotations.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/rtp_rtcp/source/rtp_packet_unittest.cc b/webrtc/modules/rtp_rtcp/source/rtp_packet_unittest.cc index 44730fe9dd..10c94f50d8 100644 --- a/webrtc/modules/rtp_rtcp/source/rtp_packet_unittest.cc +++ b/webrtc/modules/rtp_rtcp/source/rtp_packet_unittest.cc @@ -10,9 +10,9 @@ #include "webrtc/modules/rtp_rtcp/source/rtp_packet_received.h" #include "webrtc/modules/rtp_rtcp/source/rtp_packet_to_send.h" -#include "webrtc/base/random.h" #include "webrtc/modules/rtp_rtcp/include/rtp_header_extension_map.h" #include "webrtc/modules/rtp_rtcp/source/rtp_header_extensions.h" +#include "webrtc/rtc_base/random.h" #include "webrtc/test/gmock.h" #include "webrtc/test/gtest.h" diff --git a/webrtc/modules/rtp_rtcp/source/rtp_payload_registry.cc b/webrtc/modules/rtp_rtcp/source/rtp_payload_registry.cc index 234fd7fce5..35616b6122 100644 --- a/webrtc/modules/rtp_rtcp/source/rtp_payload_registry.cc +++ b/webrtc/modules/rtp_rtcp/source/rtp_payload_registry.cc @@ -12,12 +12,12 @@ #include -#include "webrtc/base/checks.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/stringutils.h" #include "webrtc/common_types.h" #include "webrtc/modules/audio_coding/codecs/audio_format_conversion.h" #include "webrtc/modules/rtp_rtcp/source/byte_io.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/stringutils.h" namespace webrtc { diff --git a/webrtc/modules/rtp_rtcp/source/rtp_receiver_audio.cc b/webrtc/modules/rtp_rtcp/source/rtp_receiver_audio.cc index 7b66fd3490..4265ba5654 100644 --- a/webrtc/modules/rtp_rtcp/source/rtp_receiver_audio.cc +++ b/webrtc/modules/rtp_rtcp/source/rtp_receiver_audio.cc @@ -15,8 +15,8 @@ #include // memcpy() #include "webrtc/common_types.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/trace_event.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/trace_event.h" namespace webrtc { RTPReceiverStrategy* RTPReceiverStrategy::CreateAudioStrategy( diff --git a/webrtc/modules/rtp_rtcp/source/rtp_receiver_audio.h b/webrtc/modules/rtp_rtcp/source/rtp_receiver_audio.h index 5fbf738b4b..fd8238aeaf 100644 --- a/webrtc/modules/rtp_rtcp/source/rtp_receiver_audio.h +++ b/webrtc/modules/rtp_rtcp/source/rtp_receiver_audio.h @@ -13,11 +13,11 @@ #include -#include "webrtc/base/onetimeevent.h" #include "webrtc/modules/rtp_rtcp/include/rtp_receiver.h" #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" #include "webrtc/modules/rtp_rtcp/source/rtp_receiver_strategy.h" #include "webrtc/modules/rtp_rtcp/source/rtp_utility.h" +#include "webrtc/rtc_base/onetimeevent.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/rtp_rtcp/source/rtp_receiver_impl.cc b/webrtc/modules/rtp_rtcp/source/rtp_receiver_impl.cc index 01ccd2b260..20f57460a6 100644 --- a/webrtc/modules/rtp_rtcp/source/rtp_receiver_impl.cc +++ b/webrtc/modules/rtp_rtcp/source/rtp_receiver_impl.cc @@ -18,11 +18,11 @@ #include #include -#include "webrtc/base/logging.h" #include "webrtc/common_types.h" #include "webrtc/modules/rtp_rtcp/include/rtp_payload_registry.h" #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" #include "webrtc/modules/rtp_rtcp/source/rtp_receiver_strategy.h" +#include "webrtc/rtc_base/logging.h" namespace webrtc { diff --git a/webrtc/modules/rtp_rtcp/source/rtp_receiver_impl.h b/webrtc/modules/rtp_rtcp/source/rtp_receiver_impl.h index 43965d325c..b64683a17c 100644 --- a/webrtc/modules/rtp_rtcp/source/rtp_receiver_impl.h +++ b/webrtc/modules/rtp_rtcp/source/rtp_receiver_impl.h @@ -16,10 +16,10 @@ #include #include -#include "webrtc/base/criticalsection.h" #include "webrtc/modules/rtp_rtcp/include/rtp_receiver.h" #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" #include "webrtc/modules/rtp_rtcp/source/rtp_receiver_strategy.h" +#include "webrtc/rtc_base/criticalsection.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/rtp_rtcp/source/rtp_receiver_strategy.h b/webrtc/modules/rtp_rtcp/source/rtp_receiver_strategy.h index 490b4c59d5..f909b85aec 100644 --- a/webrtc/modules/rtp_rtcp/source/rtp_receiver_strategy.h +++ b/webrtc/modules/rtp_rtcp/source/rtp_receiver_strategy.h @@ -11,10 +11,10 @@ #ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_RECEIVER_STRATEGY_H_ #define WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_RECEIVER_STRATEGY_H_ -#include "webrtc/base/criticalsection.h" #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp.h" #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" #include "webrtc/modules/rtp_rtcp/source/rtp_utility.h" +#include "webrtc/rtc_base/criticalsection.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/rtp_rtcp/source/rtp_receiver_video.cc b/webrtc/modules/rtp_rtcp/source/rtp_receiver_video.cc index 0edc47824c..845e7ac496 100644 --- a/webrtc/modules/rtp_rtcp/source/rtp_receiver_video.cc +++ b/webrtc/modules/rtp_rtcp/source/rtp_receiver_video.cc @@ -15,14 +15,14 @@ #include -#include "webrtc/base/checks.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/trace_event.h" #include "webrtc/modules/rtp_rtcp/include/rtp_cvo.h" #include "webrtc/modules/rtp_rtcp/include/rtp_payload_registry.h" #include "webrtc/modules/rtp_rtcp/source/rtp_format.h" #include "webrtc/modules/rtp_rtcp/source/rtp_format_video_generic.h" #include "webrtc/modules/rtp_rtcp/source/rtp_utility.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/trace_event.h" namespace webrtc { diff --git a/webrtc/modules/rtp_rtcp/source/rtp_receiver_video.h b/webrtc/modules/rtp_rtcp/source/rtp_receiver_video.h index c27fe45c82..a243484fcf 100644 --- a/webrtc/modules/rtp_rtcp/source/rtp_receiver_video.h +++ b/webrtc/modules/rtp_rtcp/source/rtp_receiver_video.h @@ -11,10 +11,10 @@ #ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_RECEIVER_VIDEO_H_ #define WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_RECEIVER_VIDEO_H_ -#include "webrtc/base/onetimeevent.h" #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" #include "webrtc/modules/rtp_rtcp/source/rtp_receiver_strategy.h" #include "webrtc/modules/rtp_rtcp/source/rtp_utility.h" +#include "webrtc/rtc_base/onetimeevent.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.cc b/webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.cc index 446022bafd..6aaea95796 100644 --- a/webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.cc +++ b/webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.cc @@ -16,10 +16,10 @@ #include #include -#include "webrtc/base/checks.h" -#include "webrtc/base/logging.h" #include "webrtc/common_types.h" #include "webrtc/config.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/logging.h" #ifdef _WIN32 // Disable warning C4355: 'this' : used in base member initializer list. diff --git a/webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.h b/webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.h index edec70a60a..39a40f4470 100644 --- a/webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.h +++ b/webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.h @@ -16,15 +16,15 @@ #include #include -#include "webrtc/base/criticalsection.h" -#include "webrtc/base/gtest_prod_util.h" -#include "webrtc/base/optional.h" #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp.h" #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" #include "webrtc/modules/rtp_rtcp/source/packet_loss_stats.h" #include "webrtc/modules/rtp_rtcp/source/rtcp_receiver.h" #include "webrtc/modules/rtp_rtcp/source/rtcp_sender.h" #include "webrtc/modules/rtp_rtcp/source/rtp_sender.h" +#include "webrtc/rtc_base/criticalsection.h" +#include "webrtc/rtc_base/gtest_prod_util.h" +#include "webrtc/rtc_base/optional.h" namespace webrtc { diff --git a/webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl_unittest.cc b/webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl_unittest.cc index 0c84719295..b417591af1 100644 --- a/webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl_unittest.cc +++ b/webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl_unittest.cc @@ -12,13 +12,13 @@ #include #include -#include "webrtc/base/rate_limiter.h" #include "webrtc/common_types.h" #include "webrtc/modules/rtp_rtcp/include/rtp_header_parser.h" #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" #include "webrtc/modules/rtp_rtcp/source/rtcp_packet.h" #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/nack.h" #include "webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.h" +#include "webrtc/rtc_base/rate_limiter.h" #include "webrtc/test/gmock.h" #include "webrtc/test/gtest.h" #include "webrtc/test/rtcp_packet_parser.h" diff --git a/webrtc/modules/rtp_rtcp/source/rtp_sender.cc b/webrtc/modules/rtp_rtcp/source/rtp_sender.cc index 06c2ea905a..dc7b20e9db 100644 --- a/webrtc/modules/rtp_rtcp/source/rtp_sender.cc +++ b/webrtc/modules/rtp_rtcp/source/rtp_sender.cc @@ -13,13 +13,6 @@ #include #include -#include "webrtc/base/arraysize.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/rate_limiter.h" -#include "webrtc/base/safe_minmax.h" -#include "webrtc/base/timeutils.h" -#include "webrtc/base/trace_event.h" #include "webrtc/logging/rtc_event_log/rtc_event_log.h" #include "webrtc/modules/remote_bitrate_estimator/test/bwe_test_logging.h" #include "webrtc/modules/rtp_rtcp/include/rtp_cvo.h" @@ -30,6 +23,13 @@ #include "webrtc/modules/rtp_rtcp/source/rtp_sender_audio.h" #include "webrtc/modules/rtp_rtcp/source/rtp_sender_video.h" #include "webrtc/modules/rtp_rtcp/source/time_util.h" +#include "webrtc/rtc_base/arraysize.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/rate_limiter.h" +#include "webrtc/rtc_base/safe_minmax.h" +#include "webrtc/rtc_base/timeutils.h" +#include "webrtc/rtc_base/trace_event.h" #include "webrtc/system_wrappers/include/field_trial.h" namespace webrtc { diff --git a/webrtc/modules/rtp_rtcp/source/rtp_sender.h b/webrtc/modules/rtp_rtcp/source/rtp_sender.h index 56739ae4fa..d4aca38c90 100644 --- a/webrtc/modules/rtp_rtcp/source/rtp_sender.h +++ b/webrtc/modules/rtp_rtcp/source/rtp_sender.h @@ -17,14 +17,6 @@ #include #include "webrtc/api/call/transport.h" -#include "webrtc/base/array_view.h" -#include "webrtc/base/constructormagic.h" -#include "webrtc/base/criticalsection.h" -#include "webrtc/base/deprecation.h" -#include "webrtc/base/optional.h" -#include "webrtc/base/random.h" -#include "webrtc/base/rate_statistics.h" -#include "webrtc/base/thread_annotations.h" #include "webrtc/common_types.h" #include "webrtc/modules/rtp_rtcp/include/flexfec_sender.h" #include "webrtc/modules/rtp_rtcp/include/rtp_header_extension_map.h" @@ -33,6 +25,14 @@ #include "webrtc/modules/rtp_rtcp/source/rtp_packet_history.h" #include "webrtc/modules/rtp_rtcp/source/rtp_rtcp_config.h" #include "webrtc/modules/rtp_rtcp/source/rtp_utility.h" +#include "webrtc/rtc_base/array_view.h" +#include "webrtc/rtc_base/constructormagic.h" +#include "webrtc/rtc_base/criticalsection.h" +#include "webrtc/rtc_base/deprecation.h" +#include "webrtc/rtc_base/optional.h" +#include "webrtc/rtc_base/random.h" +#include "webrtc/rtc_base/rate_statistics.h" +#include "webrtc/rtc_base/thread_annotations.h" namespace webrtc { diff --git a/webrtc/modules/rtp_rtcp/source/rtp_sender_audio.cc b/webrtc/modules/rtp_rtcp/source/rtp_sender_audio.cc index 0f32d4e786..04c776ce40 100644 --- a/webrtc/modules/rtp_rtcp/source/rtp_sender_audio.cc +++ b/webrtc/modules/rtp_rtcp/source/rtp_sender_audio.cc @@ -15,13 +15,13 @@ #include #include -#include "webrtc/base/logging.h" -#include "webrtc/base/timeutils.h" -#include "webrtc/base/trace_event.h" #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" #include "webrtc/modules/rtp_rtcp/source/byte_io.h" #include "webrtc/modules/rtp_rtcp/source/rtp_header_extensions.h" #include "webrtc/modules/rtp_rtcp/source/rtp_packet_to_send.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/timeutils.h" +#include "webrtc/rtc_base/trace_event.h" namespace webrtc { diff --git a/webrtc/modules/rtp_rtcp/source/rtp_sender_audio.h b/webrtc/modules/rtp_rtcp/source/rtp_sender_audio.h index cf79120bb9..8529e0d48c 100644 --- a/webrtc/modules/rtp_rtcp/source/rtp_sender_audio.h +++ b/webrtc/modules/rtp_rtcp/source/rtp_sender_audio.h @@ -12,13 +12,13 @@ #define WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_SENDER_AUDIO_H_ #include "webrtc/common_types.h" -#include "webrtc/base/constructormagic.h" -#include "webrtc/base/criticalsection.h" -#include "webrtc/base/onetimeevent.h" #include "webrtc/modules/rtp_rtcp/source/dtmf_queue.h" #include "webrtc/modules/rtp_rtcp/source/rtp_rtcp_config.h" #include "webrtc/modules/rtp_rtcp/source/rtp_sender.h" #include "webrtc/modules/rtp_rtcp/source/rtp_utility.h" +#include "webrtc/rtc_base/constructormagic.h" +#include "webrtc/rtc_base/criticalsection.h" +#include "webrtc/rtc_base/onetimeevent.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/rtp_rtcp/source/rtp_sender_unittest.cc b/webrtc/modules/rtp_rtcp/source/rtp_sender_unittest.cc index f786c5d120..3e6e4529d8 100644 --- a/webrtc/modules/rtp_rtcp/source/rtp_sender_unittest.cc +++ b/webrtc/modules/rtp_rtcp/source/rtp_sender_unittest.cc @@ -11,8 +11,6 @@ #include #include -#include "webrtc/base/buffer.h" -#include "webrtc/base/rate_limiter.h" #include "webrtc/logging/rtc_event_log/mock/mock_rtc_event_log.h" #include "webrtc/modules/rtp_rtcp/include/rtp_cvo.h" #include "webrtc/modules/rtp_rtcp/include/rtp_header_extension_map.h" @@ -26,6 +24,8 @@ #include "webrtc/modules/rtp_rtcp/source/rtp_sender.h" #include "webrtc/modules/rtp_rtcp/source/rtp_sender_video.h" #include "webrtc/modules/rtp_rtcp/source/rtp_utility.h" +#include "webrtc/rtc_base/buffer.h" +#include "webrtc/rtc_base/rate_limiter.h" #include "webrtc/test/field_trial.h" #include "webrtc/test/gmock.h" #include "webrtc/test/gtest.h" diff --git a/webrtc/modules/rtp_rtcp/source/rtp_sender_video.cc b/webrtc/modules/rtp_rtcp/source/rtp_sender_video.cc index 94503dcdf1..d12936c143 100644 --- a/webrtc/modules/rtp_rtcp/source/rtp_sender_video.cc +++ b/webrtc/modules/rtp_rtcp/source/rtp_sender_video.cc @@ -17,10 +17,6 @@ #include #include -#include "webrtc/base/checks.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/ptr_util.h" -#include "webrtc/base/trace_event.h" #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" #include "webrtc/modules/rtp_rtcp/source/byte_io.h" #include "webrtc/modules/rtp_rtcp/source/rtp_format_video_generic.h" @@ -28,6 +24,10 @@ #include "webrtc/modules/rtp_rtcp/source/rtp_format_vp9.h" #include "webrtc/modules/rtp_rtcp/source/rtp_header_extensions.h" #include "webrtc/modules/rtp_rtcp/source/rtp_packet_to_send.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/ptr_util.h" +#include "webrtc/rtc_base/trace_event.h" namespace webrtc { diff --git a/webrtc/modules/rtp_rtcp/source/rtp_sender_video.h b/webrtc/modules/rtp_rtcp/source/rtp_sender_video.h index 933eeb0440..9fb4648b82 100644 --- a/webrtc/modules/rtp_rtcp/source/rtp_sender_video.h +++ b/webrtc/modules/rtp_rtcp/source/rtp_sender_video.h @@ -15,12 +15,6 @@ #include #include -#include "webrtc/base/criticalsection.h" -#include "webrtc/base/onetimeevent.h" -#include "webrtc/base/optional.h" -#include "webrtc/base/rate_statistics.h" -#include "webrtc/base/sequenced_task_checker.h" -#include "webrtc/base/thread_annotations.h" #include "webrtc/common_types.h" #include "webrtc/modules/rtp_rtcp/include/flexfec_sender.h" #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" @@ -29,6 +23,12 @@ #include "webrtc/modules/rtp_rtcp/source/rtp_utility.h" #include "webrtc/modules/rtp_rtcp/source/ulpfec_generator.h" #include "webrtc/modules/rtp_rtcp/source/video_codec_information.h" +#include "webrtc/rtc_base/criticalsection.h" +#include "webrtc/rtc_base/onetimeevent.h" +#include "webrtc/rtc_base/optional.h" +#include "webrtc/rtc_base/rate_statistics.h" +#include "webrtc/rtc_base/sequenced_task_checker.h" +#include "webrtc/rtc_base/thread_annotations.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/rtp_rtcp/source/rtp_utility.cc b/webrtc/modules/rtp_rtcp/source/rtp_utility.cc index f959087c99..8a8be1019a 100644 --- a/webrtc/modules/rtp_rtcp/source/rtp_utility.cc +++ b/webrtc/modules/rtp_rtcp/source/rtp_utility.cc @@ -10,10 +10,10 @@ #include "webrtc/modules/rtp_rtcp/source/rtp_utility.h" -#include "webrtc/base/logging.h" #include "webrtc/modules/rtp_rtcp/include/rtp_cvo.h" #include "webrtc/modules/rtp_rtcp/source/byte_io.h" #include "webrtc/modules/rtp_rtcp/source/rtp_header_extensions.h" +#include "webrtc/rtc_base/logging.h" namespace webrtc { diff --git a/webrtc/modules/rtp_rtcp/source/rtp_utility.h b/webrtc/modules/rtp_rtcp/source/rtp_utility.h index 65339aa88c..81bec5f642 100644 --- a/webrtc/modules/rtp_rtcp/source/rtp_utility.h +++ b/webrtc/modules/rtp_rtcp/source/rtp_utility.h @@ -13,11 +13,11 @@ #include -#include "webrtc/base/deprecation.h" #include "webrtc/modules/rtp_rtcp/include/receive_statistics.h" #include "webrtc/modules/rtp_rtcp/include/rtp_header_extension_map.h" #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" #include "webrtc/modules/rtp_rtcp/source/rtp_rtcp_config.h" +#include "webrtc/rtc_base/deprecation.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/rtp_rtcp/source/tmmbr_help.cc b/webrtc/modules/rtp_rtcp/source/tmmbr_help.cc index 7c99091254..2390d066a0 100644 --- a/webrtc/modules/rtp_rtcp/source/tmmbr_help.cc +++ b/webrtc/modules/rtp_rtcp/source/tmmbr_help.cc @@ -13,7 +13,7 @@ #include #include -#include "webrtc/base/checks.h" +#include "webrtc/rtc_base/checks.h" namespace webrtc { std::vector TMMBRHelp::FindBoundingSet( diff --git a/webrtc/modules/rtp_rtcp/source/ulpfec_generator.cc b/webrtc/modules/rtp_rtcp/source/ulpfec_generator.cc index 4aa5331d6d..fa7505ebbf 100644 --- a/webrtc/modules/rtp_rtcp/source/ulpfec_generator.cc +++ b/webrtc/modules/rtp_rtcp/source/ulpfec_generator.cc @@ -13,11 +13,11 @@ #include #include -#include "webrtc/base/basictypes.h" -#include "webrtc/base/checks.h" #include "webrtc/modules/rtp_rtcp/source/byte_io.h" #include "webrtc/modules/rtp_rtcp/source/forward_error_correction.h" #include "webrtc/modules/rtp_rtcp/source/rtp_utility.h" +#include "webrtc/rtc_base/basictypes.h" +#include "webrtc/rtc_base/checks.h" namespace webrtc { diff --git a/webrtc/modules/rtp_rtcp/source/ulpfec_generator_unittest.cc b/webrtc/modules/rtp_rtcp/source/ulpfec_generator_unittest.cc index 3712a373a5..5d281aac2e 100644 --- a/webrtc/modules/rtp_rtcp/source/ulpfec_generator_unittest.cc +++ b/webrtc/modules/rtp_rtcp/source/ulpfec_generator_unittest.cc @@ -13,11 +13,11 @@ #include #include -#include "webrtc/base/basictypes.h" #include "webrtc/modules/rtp_rtcp/source/byte_io.h" #include "webrtc/modules/rtp_rtcp/source/fec_test_helper.h" #include "webrtc/modules/rtp_rtcp/source/forward_error_correction.h" #include "webrtc/modules/rtp_rtcp/source/ulpfec_generator.h" +#include "webrtc/rtc_base/basictypes.h" #include "webrtc/test/gtest.h" namespace webrtc { diff --git a/webrtc/modules/rtp_rtcp/source/ulpfec_header_reader_writer.cc b/webrtc/modules/rtp_rtcp/source/ulpfec_header_reader_writer.cc index f3cf70f002..3a6000a200 100644 --- a/webrtc/modules/rtp_rtcp/source/ulpfec_header_reader_writer.cc +++ b/webrtc/modules/rtp_rtcp/source/ulpfec_header_reader_writer.cc @@ -12,9 +12,9 @@ #include -#include "webrtc/base/checks.h" #include "webrtc/modules/rtp_rtcp/source/byte_io.h" #include "webrtc/modules/rtp_rtcp/source/forward_error_correction_internal.h" +#include "webrtc/rtc_base/checks.h" namespace webrtc { diff --git a/webrtc/modules/rtp_rtcp/source/ulpfec_header_reader_writer.h b/webrtc/modules/rtp_rtcp/source/ulpfec_header_reader_writer.h index 4e771aac3b..2c1994dc21 100644 --- a/webrtc/modules/rtp_rtcp/source/ulpfec_header_reader_writer.h +++ b/webrtc/modules/rtp_rtcp/source/ulpfec_header_reader_writer.h @@ -11,8 +11,8 @@ #ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_ULPFEC_HEADER_READER_WRITER_H_ #define WEBRTC_MODULES_RTP_RTCP_SOURCE_ULPFEC_HEADER_READER_WRITER_H_ -#include "webrtc/base/basictypes.h" #include "webrtc/modules/rtp_rtcp/source/forward_error_correction.h" +#include "webrtc/rtc_base/basictypes.h" namespace webrtc { diff --git a/webrtc/modules/rtp_rtcp/source/ulpfec_header_reader_writer_unittest.cc b/webrtc/modules/rtp_rtcp/source/ulpfec_header_reader_writer_unittest.cc index 13774de13f..8eebf38c67 100644 --- a/webrtc/modules/rtp_rtcp/source/ulpfec_header_reader_writer_unittest.cc +++ b/webrtc/modules/rtp_rtcp/source/ulpfec_header_reader_writer_unittest.cc @@ -13,14 +13,14 @@ #include #include -#include "webrtc/base/basictypes.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/random.h" -#include "webrtc/base/scoped_ref_ptr.h" #include "webrtc/modules/rtp_rtcp/source/byte_io.h" #include "webrtc/modules/rtp_rtcp/source/forward_error_correction.h" #include "webrtc/modules/rtp_rtcp/source/forward_error_correction_internal.h" #include "webrtc/modules/rtp_rtcp/source/ulpfec_header_reader_writer.h" +#include "webrtc/rtc_base/basictypes.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/random.h" +#include "webrtc/rtc_base/scoped_ref_ptr.h" #include "webrtc/test/gtest.h" namespace webrtc { diff --git a/webrtc/modules/rtp_rtcp/source/ulpfec_receiver_impl.cc b/webrtc/modules/rtp_rtcp/source/ulpfec_receiver_impl.cc index 5bac59c9d7..b4ac30e040 100644 --- a/webrtc/modules/rtp_rtcp/source/ulpfec_receiver_impl.cc +++ b/webrtc/modules/rtp_rtcp/source/ulpfec_receiver_impl.cc @@ -13,10 +13,10 @@ #include #include -#include "webrtc/base/checks.h" -#include "webrtc/base/logging.h" #include "webrtc/modules/rtp_rtcp/source/byte_io.h" #include "webrtc/modules/rtp_rtcp/source/rtp_receiver_video.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/logging.h" #include "webrtc/system_wrappers/include/clock.h" namespace webrtc { diff --git a/webrtc/modules/rtp_rtcp/source/ulpfec_receiver_impl.h b/webrtc/modules/rtp_rtcp/source/ulpfec_receiver_impl.h index 37085726b1..e4f71ffb71 100644 --- a/webrtc/modules/rtp_rtcp/source/ulpfec_receiver_impl.h +++ b/webrtc/modules/rtp_rtcp/source/ulpfec_receiver_impl.h @@ -13,10 +13,10 @@ #include -#include "webrtc/base/criticalsection.h" #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" #include "webrtc/modules/rtp_rtcp/include/ulpfec_receiver.h" #include "webrtc/modules/rtp_rtcp/source/forward_error_correction.h" +#include "webrtc/rtc_base/criticalsection.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/rtp_rtcp/test/testAPI/test_api.cc b/webrtc/modules/rtp_rtcp/test/testAPI/test_api.cc index b8b67c703f..b39c8d72da 100644 --- a/webrtc/modules/rtp_rtcp/test/testAPI/test_api.cc +++ b/webrtc/modules/rtp_rtcp/test/testAPI/test_api.cc @@ -14,8 +14,8 @@ #include #include -#include "webrtc/base/checks.h" -#include "webrtc/base/rate_limiter.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/rate_limiter.h" #include "webrtc/test/null_transport.h" namespace webrtc { diff --git a/webrtc/modules/rtp_rtcp/test/testAPI/test_api_audio.cc b/webrtc/modules/rtp_rtcp/test/testAPI/test_api_audio.cc index 548e4fa584..a9be072feb 100644 --- a/webrtc/modules/rtp_rtcp/test/testAPI/test_api_audio.cc +++ b/webrtc/modules/rtp_rtcp/test/testAPI/test_api_audio.cc @@ -12,12 +12,12 @@ #include #include -#include "webrtc/base/rate_limiter.h" #include "webrtc/common_types.h" #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp.h" #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" #include "webrtc/modules/rtp_rtcp/source/rtp_receiver_audio.h" #include "webrtc/modules/rtp_rtcp/test/testAPI/test_api.h" +#include "webrtc/rtc_base/rate_limiter.h" #include "webrtc/test/gtest.h" namespace webrtc { diff --git a/webrtc/modules/rtp_rtcp/test/testAPI/test_api_rtcp.cc b/webrtc/modules/rtp_rtcp/test/testAPI/test_api_rtcp.cc index fab92316cf..a124f62725 100644 --- a/webrtc/modules/rtp_rtcp/test/testAPI/test_api_rtcp.cc +++ b/webrtc/modules/rtp_rtcp/test/testAPI/test_api_rtcp.cc @@ -12,13 +12,13 @@ #include #include -#include "webrtc/base/rate_limiter.h" #include "webrtc/common_types.h" #include "webrtc/modules/rtp_rtcp/include/receive_statistics.h" #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp.h" #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" #include "webrtc/modules/rtp_rtcp/source/rtp_receiver_audio.h" #include "webrtc/modules/rtp_rtcp/test/testAPI/test_api.h" +#include "webrtc/rtc_base/rate_limiter.h" #include "webrtc/test/gmock.h" #include "webrtc/test/gtest.h" diff --git a/webrtc/modules/rtp_rtcp/test/testAPI/test_api_video.cc b/webrtc/modules/rtp_rtcp/test/testAPI/test_api_video.cc index 447b4b7ac1..e6b075f0f7 100644 --- a/webrtc/modules/rtp_rtcp/test/testAPI/test_api_video.cc +++ b/webrtc/modules/rtp_rtcp/test/testAPI/test_api_video.cc @@ -14,7 +14,6 @@ #include #include -#include "webrtc/base/rate_limiter.h" #include "webrtc/common_types.h" #include "webrtc/modules/rtp_rtcp/include/rtp_payload_registry.h" #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp.h" @@ -22,6 +21,7 @@ #include "webrtc/modules/rtp_rtcp/source/byte_io.h" #include "webrtc/modules/rtp_rtcp/source/rtp_receiver_video.h" #include "webrtc/modules/rtp_rtcp/test/testAPI/test_api.h" +#include "webrtc/rtc_base/rate_limiter.h" #include "webrtc/test/gtest.h" namespace { diff --git a/webrtc/modules/rtp_rtcp/test/testFec/test_fec.cc b/webrtc/modules/rtp_rtcp/test/testFec/test_fec.cc index b23a5f5f9b..c698d676ec 100644 --- a/webrtc/modules/rtp_rtcp/test/testFec/test_fec.cc +++ b/webrtc/modules/rtp_rtcp/test/testFec/test_fec.cc @@ -18,10 +18,10 @@ #include -#include "webrtc/base/random.h" #include "webrtc/modules/rtp_rtcp/source/byte_io.h" #include "webrtc/modules/rtp_rtcp/source/forward_error_correction.h" #include "webrtc/modules/rtp_rtcp/source/forward_error_correction_internal.h" +#include "webrtc/rtc_base/random.h" #include "webrtc/test/gtest.h" #include "webrtc/test/testsupport/fileutils.h" diff --git a/webrtc/modules/utility/include/jvm_android.h b/webrtc/modules/utility/include/jvm_android.h index fcdb1baca7..95e31eea24 100644 --- a/webrtc/modules/utility/include/jvm_android.h +++ b/webrtc/modules/utility/include/jvm_android.h @@ -16,8 +16,8 @@ #include #include -#include "webrtc/base/thread_checker.h" #include "webrtc/modules/utility/include/helpers_android.h" +#include "webrtc/rtc_base/thread_checker.h" namespace webrtc { diff --git a/webrtc/modules/utility/include/mock/mock_process_thread.h b/webrtc/modules/utility/include/mock/mock_process_thread.h index 4d24033ff9..27d1b106d7 100644 --- a/webrtc/modules/utility/include/mock/mock_process_thread.h +++ b/webrtc/modules/utility/include/mock/mock_process_thread.h @@ -13,8 +13,8 @@ #include -#include "webrtc/base/location.h" #include "webrtc/modules/utility/include/process_thread.h" +#include "webrtc/rtc_base/location.h" #include "webrtc/test/gmock.h" namespace webrtc { diff --git a/webrtc/modules/utility/include/process_thread.h b/webrtc/modules/utility/include/process_thread.h index 2132ee453c..6fa4e79bcd 100644 --- a/webrtc/modules/utility/include/process_thread.h +++ b/webrtc/modules/utility/include/process_thread.h @@ -18,7 +18,7 @@ #if defined(WEBRTC_WIN) // Due to a bug in the std::unique_ptr implementation that ships with MSVS, // we need the full definition of QueuedTask, on Windows. -#include "webrtc/base/task_queue.h" +#include "webrtc/rtc_base/task_queue.h" #else namespace rtc { class QueuedTask; diff --git a/webrtc/modules/utility/source/helpers_android.cc b/webrtc/modules/utility/source/helpers_android.cc index aea35f8d5a..59f4a69d9c 100644 --- a/webrtc/modules/utility/source/helpers_android.cc +++ b/webrtc/modules/utility/source/helpers_android.cc @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/base/checks.h" #include "webrtc/modules/utility/include/helpers_android.h" +#include "webrtc/rtc_base/checks.h" #include #include diff --git a/webrtc/modules/utility/source/jvm_android.cc b/webrtc/modules/utility/source/jvm_android.cc index d432a063a4..a7a5efdc8b 100644 --- a/webrtc/modules/utility/source/jvm_android.cc +++ b/webrtc/modules/utility/source/jvm_android.cc @@ -14,7 +14,7 @@ #include "webrtc/modules/utility/include/jvm_android.h" -#include "webrtc/base/checks.h" +#include "webrtc/rtc_base/checks.h" #define TAG "JVM" #define ALOGD(...) __android_log_print(ANDROID_LOG_DEBUG, TAG, __VA_ARGS__) diff --git a/webrtc/modules/utility/source/process_thread_impl.cc b/webrtc/modules/utility/source/process_thread_impl.cc index f59a451bde..2f8be6c210 100644 --- a/webrtc/modules/utility/source/process_thread_impl.cc +++ b/webrtc/modules/utility/source/process_thread_impl.cc @@ -10,11 +10,11 @@ #include "webrtc/modules/utility/source/process_thread_impl.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/task_queue.h" -#include "webrtc/base/timeutils.h" -#include "webrtc/base/trace_event.h" #include "webrtc/modules/include/module.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/task_queue.h" +#include "webrtc/rtc_base/timeutils.h" +#include "webrtc/rtc_base/trace_event.h" namespace webrtc { namespace { diff --git a/webrtc/modules/utility/source/process_thread_impl.h b/webrtc/modules/utility/source/process_thread_impl.h index e07c3d7c8b..4f4c65da8c 100644 --- a/webrtc/modules/utility/source/process_thread_impl.h +++ b/webrtc/modules/utility/source/process_thread_impl.h @@ -15,11 +15,11 @@ #include #include -#include "webrtc/base/criticalsection.h" -#include "webrtc/base/location.h" -#include "webrtc/base/platform_thread.h" -#include "webrtc/base/thread_checker.h" #include "webrtc/modules/utility/include/process_thread.h" +#include "webrtc/rtc_base/criticalsection.h" +#include "webrtc/rtc_base/location.h" +#include "webrtc/rtc_base/platform_thread.h" +#include "webrtc/rtc_base/thread_checker.h" #include "webrtc/system_wrappers/include/event_wrapper.h" #include "webrtc/typedefs.h" diff --git a/webrtc/modules/utility/source/process_thread_impl_unittest.cc b/webrtc/modules/utility/source/process_thread_impl_unittest.cc index 8b0fb968f8..e594de0f87 100644 --- a/webrtc/modules/utility/source/process_thread_impl_unittest.cc +++ b/webrtc/modules/utility/source/process_thread_impl_unittest.cc @@ -11,11 +11,11 @@ #include #include -#include "webrtc/base/location.h" -#include "webrtc/base/task_queue.h" -#include "webrtc/base/timeutils.h" #include "webrtc/modules/include/module.h" #include "webrtc/modules/utility/source/process_thread_impl.h" +#include "webrtc/rtc_base/location.h" +#include "webrtc/rtc_base/task_queue.h" +#include "webrtc/rtc_base/timeutils.h" #include "webrtc/test/gmock.h" #include "webrtc/test/gtest.h" diff --git a/webrtc/modules/video_capture/device_info_impl.cc b/webrtc/modules/video_capture/device_info_impl.cc index 35434c00fd..d9e5879aa3 100644 --- a/webrtc/modules/video_capture/device_info_impl.cc +++ b/webrtc/modules/video_capture/device_info_impl.cc @@ -11,9 +11,9 @@ #include #include -#include "webrtc/base/logging.h" #include "webrtc/modules/video_capture/device_info_impl.h" #include "webrtc/modules/video_capture/video_capture_config.h" +#include "webrtc/rtc_base/logging.h" #ifndef abs #define abs(a) (a>=0?a:-a) diff --git a/webrtc/modules/video_capture/external/video_capture_external.cc b/webrtc/modules/video_capture/external/video_capture_external.cc index 828179a555..e1f4a54f23 100644 --- a/webrtc/modules/video_capture/external/video_capture_external.cc +++ b/webrtc/modules/video_capture/external/video_capture_external.cc @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/base/refcount.h" #include "webrtc/modules/video_capture/video_capture_impl.h" +#include "webrtc/rtc_base/refcount.h" namespace webrtc { diff --git a/webrtc/modules/video_capture/linux/video_capture_linux.cc b/webrtc/modules/video_capture/linux/video_capture_linux.cc index 894f03886a..a2058d2590 100644 --- a/webrtc/modules/video_capture/linux/video_capture_linux.cc +++ b/webrtc/modules/video_capture/linux/video_capture_linux.cc @@ -21,9 +21,9 @@ #include #include -#include "webrtc/base/refcount.h" -#include "webrtc/base/scoped_ref_ptr.h" #include "webrtc/modules/video_capture/linux/video_capture_linux.h" +#include "webrtc/rtc_base/refcount.h" +#include "webrtc/rtc_base/scoped_ref_ptr.h" #include "webrtc/system_wrappers/include/trace.h" namespace webrtc { diff --git a/webrtc/modules/video_capture/linux/video_capture_linux.h b/webrtc/modules/video_capture/linux/video_capture_linux.h index 6a37048053..dc500597ad 100644 --- a/webrtc/modules/video_capture/linux/video_capture_linux.h +++ b/webrtc/modules/video_capture/linux/video_capture_linux.h @@ -13,10 +13,10 @@ #include -#include "webrtc/base/criticalsection.h" -#include "webrtc/base/platform_thread.h" #include "webrtc/common_types.h" #include "webrtc/modules/video_capture/video_capture_impl.h" +#include "webrtc/rtc_base/criticalsection.h" +#include "webrtc/rtc_base/platform_thread.h" namespace webrtc { diff --git a/webrtc/modules/video_capture/objc/video_capture.h b/webrtc/modules/video_capture/objc/video_capture.h index 325d5117c1..910455b407 100644 --- a/webrtc/modules/video_capture/objc/video_capture.h +++ b/webrtc/modules/video_capture/objc/video_capture.h @@ -11,8 +11,8 @@ #ifndef WEBRTC_MODULES_VIDEO_CAPTURE_OBJC_VIDEO_CAPTURE_H_ #define WEBRTC_MODULES_VIDEO_CAPTURE_OBJC_VIDEO_CAPTURE_H_ -#include "webrtc/base/scoped_ref_ptr.h" #include "webrtc/modules/video_capture/video_capture_impl.h" +#include "webrtc/rtc_base/scoped_ref_ptr.h" @class RTCVideoCaptureIosObjC; diff --git a/webrtc/modules/video_capture/test/video_capture_unittest.cc b/webrtc/modules/video_capture/test/video_capture_unittest.cc index 5dbcc35ed7..a80039a599 100644 --- a/webrtc/modules/video_capture/test/video_capture_unittest.cc +++ b/webrtc/modules/video_capture/test/video_capture_unittest.cc @@ -16,13 +16,13 @@ #include "webrtc/api/video/i420_buffer.h" #include "webrtc/api/video/video_frame.h" -#include "webrtc/base/criticalsection.h" -#include "webrtc/base/scoped_ref_ptr.h" -#include "webrtc/base/timeutils.h" #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" #include "webrtc/modules/utility/include/process_thread.h" #include "webrtc/modules/video_capture/video_capture.h" #include "webrtc/modules/video_capture/video_capture_factory.h" +#include "webrtc/rtc_base/criticalsection.h" +#include "webrtc/rtc_base/scoped_ref_ptr.h" +#include "webrtc/rtc_base/timeutils.h" #include "webrtc/system_wrappers/include/sleep.h" #include "webrtc/test/frame_utils.h" #include "webrtc/test/gtest.h" diff --git a/webrtc/modules/video_capture/video_capture_impl.cc b/webrtc/modules/video_capture/video_capture_impl.cc index 5ee10665e7..d827ae6366 100644 --- a/webrtc/modules/video_capture/video_capture_impl.cc +++ b/webrtc/modules/video_capture/video_capture_impl.cc @@ -13,13 +13,13 @@ #include #include "webrtc/api/video/i420_buffer.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/refcount.h" -#include "webrtc/base/timeutils.h" -#include "webrtc/base/trace_event.h" #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" #include "webrtc/modules/include/module_common_types.h" #include "webrtc/modules/video_capture/video_capture_config.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/refcount.h" +#include "webrtc/rtc_base/timeutils.h" +#include "webrtc/rtc_base/trace_event.h" #include "webrtc/system_wrappers/include/clock.h" namespace webrtc { diff --git a/webrtc/modules/video_capture/video_capture_impl.h b/webrtc/modules/video_capture/video_capture_impl.h index 2cdb93eb8e..923397a8e8 100644 --- a/webrtc/modules/video_capture/video_capture_impl.h +++ b/webrtc/modules/video_capture/video_capture_impl.h @@ -16,11 +16,11 @@ */ #include "webrtc/api/video/video_frame.h" -#include "webrtc/base/criticalsection.h" -#include "webrtc/base/scoped_ref_ptr.h" #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" #include "webrtc/modules/video_capture/video_capture.h" #include "webrtc/modules/video_capture/video_capture_config.h" +#include "webrtc/rtc_base/criticalsection.h" +#include "webrtc/rtc_base/scoped_ref_ptr.h" namespace webrtc { diff --git a/webrtc/modules/video_capture/windows/sink_filter_ds.cc b/webrtc/modules/video_capture/windows/sink_filter_ds.cc index 1fca73f33c..173b05f988 100644 --- a/webrtc/modules/video_capture/windows/sink_filter_ds.cc +++ b/webrtc/modules/video_capture/windows/sink_filter_ds.cc @@ -10,9 +10,9 @@ #include "webrtc/modules/video_capture/windows/sink_filter_ds.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/platform_thread.h" #include "webrtc/modules/video_capture/windows/help_functions_ds.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/platform_thread.h" #include "webrtc/system_wrappers/include/trace.h" #include // VIDEOINFOHEADER2 diff --git a/webrtc/modules/video_capture/windows/video_capture_factory_windows.cc b/webrtc/modules/video_capture/windows/video_capture_factory_windows.cc index e7eee39e52..f53ea994f2 100644 --- a/webrtc/modules/video_capture/windows/video_capture_factory_windows.cc +++ b/webrtc/modules/video_capture/windows/video_capture_factory_windows.cc @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/base/refcount.h" -#include "webrtc/base/scoped_ref_ptr.h" #include "webrtc/modules/video_capture/windows/video_capture_ds.h" #include "webrtc/modules/video_capture/windows/video_capture_mf.h" +#include "webrtc/rtc_base/refcount.h" +#include "webrtc/rtc_base/scoped_ref_ptr.h" namespace webrtc { namespace videocapturemodule { diff --git a/webrtc/modules/video_coding/codec_database.cc b/webrtc/modules/video_coding/codec_database.cc index 2f5e7fbc38..c2dc494cb0 100644 --- a/webrtc/modules/video_coding/codec_database.cc +++ b/webrtc/modules/video_coding/codec_database.cc @@ -10,13 +10,13 @@ #include "webrtc/modules/video_coding/codec_database.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/logging.h" #include "webrtc/modules/video_coding/codecs/h264/include/h264.h" #include "webrtc/modules/video_coding/codecs/i420/include/i420.h" #include "webrtc/modules/video_coding/codecs/vp8/include/vp8.h" #include "webrtc/modules/video_coding/codecs/vp9/include/vp9.h" #include "webrtc/modules/video_coding/internal_defines.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/logging.h" namespace { const size_t kDefaultPayloadSize = 1440; diff --git a/webrtc/modules/video_coding/codec_timer.h b/webrtc/modules/video_coding/codec_timer.h index 3fd081b7c8..7736d71f5d 100644 --- a/webrtc/modules/video_coding/codec_timer.h +++ b/webrtc/modules/video_coding/codec_timer.h @@ -13,8 +13,8 @@ #include -#include "webrtc/base/numerics/percentile_filter.h" #include "webrtc/modules/include/module_common_types.h" +#include "webrtc/rtc_base/numerics/percentile_filter.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/codecs/h264/h264.cc b/webrtc/modules/video_coding/codecs/h264/h264.cc index 1e3a5809eb..aa9dbe5ee3 100644 --- a/webrtc/modules/video_coding/codecs/h264/h264.cc +++ b/webrtc/modules/video_coding/codecs/h264/h264.cc @@ -16,8 +16,8 @@ #include "webrtc/modules/video_coding/codecs/h264/h264_encoder_impl.h" #endif -#include "webrtc/base/checks.h" -#include "webrtc/base/logging.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/logging.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.cc b/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.cc index be9ae010ec..a28a841994 100644 --- a/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.cc +++ b/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.cc @@ -21,11 +21,11 @@ extern "C" { } // extern "C" #include "webrtc/api/video/i420_buffer.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/criticalsection.h" -#include "webrtc/base/keep_ref_until_done.h" -#include "webrtc/base/logging.h" #include "webrtc/common_video/include/video_frame_buffer.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/criticalsection.h" +#include "webrtc/rtc_base/keep_ref_until_done.h" +#include "webrtc/rtc_base/logging.h" #include "webrtc/system_wrappers/include/metrics.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/codecs/h264/h264_encoder_impl.cc b/webrtc/modules/video_coding/codecs/h264/h264_encoder_impl.cc index cdbe6f5ecf..e84dffd4c6 100644 --- a/webrtc/modules/video_coding/codecs/h264/h264_encoder_impl.cc +++ b/webrtc/modules/video_coding/codecs/h264/h264_encoder_impl.cc @@ -19,10 +19,10 @@ #include "third_party/openh264/src/codec/api/svc/codec_def.h" #include "third_party/openh264/src/codec/api/svc/codec_ver.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/timeutils.h" #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/timeutils.h" #include "webrtc/system_wrappers/include/metrics.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/codecs/i420/include/i420.h b/webrtc/modules/video_coding/codecs/i420/include/i420.h index 1047ae08b2..6c182d09e2 100644 --- a/webrtc/modules/video_coding/codecs/i420/include/i420.h +++ b/webrtc/modules/video_coding/codecs/i420/include/i420.h @@ -13,8 +13,8 @@ #include -#include "webrtc/base/checks.h" #include "webrtc/modules/video_coding/include/video_codec_interface.h" +#include "webrtc/rtc_base/checks.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/codecs/test/android_test_initializer.cc b/webrtc/modules/video_coding/codecs/test/android_test_initializer.cc index cb2c5c1f5b..df1dd372d9 100644 --- a/webrtc/modules/video_coding/codecs/test/android_test_initializer.cc +++ b/webrtc/modules/video_coding/codecs/test/android_test_initializer.cc @@ -10,8 +10,8 @@ #include -#include "webrtc/base/ignore_wundef.h" #include "webrtc/modules/video_coding/codecs/test/android_test_initializer.h" +#include "webrtc/rtc_base/ignore_wundef.h" #include "webrtc/sdk/android/src/jni/classreferenceholder.h" #include "webrtc/sdk/android/src/jni/jni_helpers.h" @@ -23,7 +23,7 @@ RTC_PUSH_IGNORING_WUNDEF() #include "base/android/jni_android.h" RTC_POP_IGNORING_WUNDEF() -#include "webrtc/base/checks.h" +#include "webrtc/rtc_base/checks.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/codecs/test/packet_manipulator.cc b/webrtc/modules/video_coding/codecs/test/packet_manipulator.cc index 9bde45eeff..37da9dbfa9 100644 --- a/webrtc/modules/video_coding/codecs/test/packet_manipulator.cc +++ b/webrtc/modules/video_coding/codecs/test/packet_manipulator.cc @@ -13,7 +13,7 @@ #include #include -#include "webrtc/base/format_macros.h" +#include "webrtc/rtc_base/format_macros.h" namespace webrtc { namespace test { diff --git a/webrtc/modules/video_coding/codecs/test/packet_manipulator.h b/webrtc/modules/video_coding/codecs/test/packet_manipulator.h index 9b8585cd24..0067fa93cb 100644 --- a/webrtc/modules/video_coding/codecs/test/packet_manipulator.h +++ b/webrtc/modules/video_coding/codecs/test/packet_manipulator.h @@ -13,8 +13,8 @@ #include -#include "webrtc/base/criticalsection.h" #include "webrtc/modules/video_coding/include/video_codec_interface.h" +#include "webrtc/rtc_base/criticalsection.h" #include "webrtc/test/testsupport/packet_reader.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/codecs/test/stats.cc b/webrtc/modules/video_coding/codecs/test/stats.cc index 2d81a9aa63..173cd16fcb 100644 --- a/webrtc/modules/video_coding/codecs/test/stats.cc +++ b/webrtc/modules/video_coding/codecs/test/stats.cc @@ -14,8 +14,8 @@ #include // min_element, max_element -#include "webrtc/base/checks.h" -#include "webrtc/base/format_macros.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/format_macros.h" namespace webrtc { namespace test { diff --git a/webrtc/modules/video_coding/codecs/test/video_codec_test.h b/webrtc/modules/video_coding/codecs/test/video_codec_test.h index 477d66d66a..efdac0caee 100644 --- a/webrtc/modules/video_coding/codecs/test/video_codec_test.h +++ b/webrtc/modules/video_coding/codecs/test/video_codec_test.h @@ -15,12 +15,12 @@ #include "webrtc/api/video_codecs/video_decoder.h" #include "webrtc/api/video_codecs/video_encoder.h" -#include "webrtc/base/criticalsection.h" -#include "webrtc/base/event.h" -#include "webrtc/base/thread_annotations.h" #include "webrtc/modules/video_coding/include/video_codec_interface.h" #include "webrtc/modules/video_coding/utility/vp8_header_parser.h" #include "webrtc/modules/video_coding/utility/vp9_uncompressed_header_parser.h" +#include "webrtc/rtc_base/criticalsection.h" +#include "webrtc/rtc_base/event.h" +#include "webrtc/rtc_base/thread_annotations.h" #include "webrtc/test/gtest.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/codecs/test/videoprocessor.cc b/webrtc/modules/video_coding/codecs/test/videoprocessor.cc index 9b8b72a42d..ef971a85d8 100644 --- a/webrtc/modules/video_coding/codecs/test/videoprocessor.cc +++ b/webrtc/modules/video_coding/codecs/test/videoprocessor.cc @@ -18,12 +18,12 @@ #include #include "webrtc/api/video/i420_buffer.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/timeutils.h" #include "webrtc/common_types.h" -#include "webrtc/modules/video_coding/include/video_codec_initializer.h" #include "webrtc/modules/video_coding/codecs/vp8/simulcast_rate_allocator.h" +#include "webrtc/modules/video_coding/include/video_codec_initializer.h" #include "webrtc/modules/video_coding/utility/default_video_bitrate_allocator.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/timeutils.h" #include "webrtc/system_wrappers/include/cpu_info.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/codecs/test/videoprocessor.h b/webrtc/modules/video_coding/codecs/test/videoprocessor.h index cb15912de8..973eca3499 100644 --- a/webrtc/modules/video_coding/codecs/test/videoprocessor.h +++ b/webrtc/modules/video_coding/codecs/test/videoprocessor.h @@ -16,15 +16,15 @@ #include #include "webrtc/api/video/video_frame.h" -#include "webrtc/base/buffer.h" -#include "webrtc/base/checks.h" #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" -#include "webrtc/modules/video_coding/include/video_codec_interface.h" #include "webrtc/modules/video_coding/codecs/test/packet_manipulator.h" #include "webrtc/modules/video_coding/codecs/test/stats.h" +#include "webrtc/modules/video_coding/include/video_codec_interface.h" #include "webrtc/modules/video_coding/utility/ivf_file_writer.h" #include "webrtc/modules/video_coding/utility/vp8_header_parser.h" #include "webrtc/modules/video_coding/utility/vp9_uncompressed_header_parser.h" +#include "webrtc/rtc_base/buffer.h" +#include "webrtc/rtc_base/checks.h" #include "webrtc/test/testsupport/frame_reader.h" #include "webrtc/test/testsupport/frame_writer.h" diff --git a/webrtc/modules/video_coding/codecs/test/videoprocessor_integrationtest.h b/webrtc/modules/video_coding/codecs/test/videoprocessor_integrationtest.h index 8c19ae5c30..c07c213417 100644 --- a/webrtc/modules/video_coding/codecs/test/videoprocessor_integrationtest.h +++ b/webrtc/modules/video_coding/codecs/test/videoprocessor_integrationtest.h @@ -27,9 +27,6 @@ #include "webrtc/sdk/objc/Framework/Classes/VideoToolbox/encoder.h" #endif -#include "webrtc/base/checks.h" -#include "webrtc/base/file.h" -#include "webrtc/base/logging.h" #include "webrtc/media/engine/webrtcvideodecoderfactory.h" #include "webrtc/media/engine/webrtcvideoencoderfactory.h" #include "webrtc/modules/video_coding/codecs/h264/include/h264.h" @@ -41,6 +38,9 @@ #include "webrtc/modules/video_coding/include/video_codec_interface.h" #include "webrtc/modules/video_coding/include/video_coding.h" #include "webrtc/modules/video_coding/utility/ivf_file_writer.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/file.h" +#include "webrtc/rtc_base/logging.h" #include "webrtc/test/gtest.h" #include "webrtc/test/testsupport/fileutils.h" #include "webrtc/test/testsupport/frame_reader.h" diff --git a/webrtc/modules/video_coding/codecs/tools/video_quality_measurement.cc b/webrtc/modules/video_coding/codecs/tools/video_quality_measurement.cc index d8e139c670..06a8bc10cf 100644 --- a/webrtc/modules/video_coding/codecs/tools/video_quality_measurement.cc +++ b/webrtc/modules/video_coding/codecs/tools/video_quality_measurement.cc @@ -20,13 +20,13 @@ #endif #include "gflags/gflags.h" -#include "webrtc/base/format_macros.h" #include "webrtc/common_types.h" #include "webrtc/modules/video_coding/codecs/test/packet_manipulator.h" #include "webrtc/modules/video_coding/codecs/test/stats.h" #include "webrtc/modules/video_coding/codecs/test/videoprocessor.h" #include "webrtc/modules/video_coding/codecs/vp8/include/vp8.h" #include "webrtc/modules/video_coding/include/video_coding.h" +#include "webrtc/rtc_base/format_macros.h" #include "webrtc/test/testsupport/frame_reader.h" #include "webrtc/test/testsupport/frame_writer.h" #include "webrtc/test/testsupport/metrics/video_metrics.h" diff --git a/webrtc/modules/video_coding/codecs/vp8/default_temporal_layers.cc b/webrtc/modules/video_coding/codecs/vp8/default_temporal_layers.cc index 3573aa8f1c..b161560d42 100644 --- a/webrtc/modules/video_coding/codecs/vp8/default_temporal_layers.cc +++ b/webrtc/modules/video_coding/codecs/vp8/default_temporal_layers.cc @@ -15,10 +15,10 @@ #include #include -#include "webrtc/base/checks.h" #include "webrtc/modules/include/module_common_types.h" -#include "webrtc/modules/video_coding/include/video_codec_interface.h" #include "webrtc/modules/video_coding/codecs/vp8/include/vp8_common_types.h" +#include "webrtc/modules/video_coding/include/video_codec_interface.h" +#include "webrtc/rtc_base/checks.h" #include "vpx/vpx_encoder.h" #include "vpx/vp8cx.h" diff --git a/webrtc/modules/video_coding/codecs/vp8/default_temporal_layers.h b/webrtc/modules/video_coding/codecs/vp8/default_temporal_layers.h index 4681fe9dc8..bf7cbfb85d 100644 --- a/webrtc/modules/video_coding/codecs/vp8/default_temporal_layers.h +++ b/webrtc/modules/video_coding/codecs/vp8/default_temporal_layers.h @@ -16,7 +16,7 @@ #include "webrtc/modules/video_coding/codecs/vp8/temporal_layers.h" -#include "webrtc/base/optional.h" +#include "webrtc/rtc_base/optional.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/codecs/vp8/screenshare_layers.cc b/webrtc/modules/video_coding/codecs/vp8/screenshare_layers.cc index a30679a36c..8a33205d30 100644 --- a/webrtc/modules/video_coding/codecs/vp8/screenshare_layers.cc +++ b/webrtc/modules/video_coding/codecs/vp8/screenshare_layers.cc @@ -13,10 +13,10 @@ #include -#include "webrtc/base/checks.h" -#include "vpx/vpx_encoder.h" #include "vpx/vp8cx.h" +#include "vpx/vpx_encoder.h" #include "webrtc/modules/video_coding/include/video_codec_interface.h" +#include "webrtc/rtc_base/checks.h" #include "webrtc/system_wrappers/include/clock.h" #include "webrtc/system_wrappers/include/metrics.h" diff --git a/webrtc/modules/video_coding/codecs/vp8/screenshare_layers.h b/webrtc/modules/video_coding/codecs/vp8/screenshare_layers.h index 873846e8b2..b1a9f28dc5 100644 --- a/webrtc/modules/video_coding/codecs/vp8/screenshare_layers.h +++ b/webrtc/modules/video_coding/codecs/vp8/screenshare_layers.h @@ -11,10 +11,10 @@ #include -#include "webrtc/base/rate_statistics.h" -#include "webrtc/base/timeutils.h" #include "webrtc/modules/video_coding/codecs/vp8/temporal_layers.h" #include "webrtc/modules/video_coding/utility/frame_dropper.h" +#include "webrtc/rtc_base/rate_statistics.h" +#include "webrtc/rtc_base/timeutils.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/codecs/vp8/simulcast_encoder_adapter.cc b/webrtc/modules/video_coding/codecs/vp8/simulcast_encoder_adapter.cc index beee0be658..dbf8b258ec 100644 --- a/webrtc/modules/video_coding/codecs/vp8/simulcast_encoder_adapter.cc +++ b/webrtc/modules/video_coding/codecs/vp8/simulcast_encoder_adapter.cc @@ -16,9 +16,9 @@ #include "libyuv/scale.h" // NOLINT #include "webrtc/api/video/i420_buffer.h" -#include "webrtc/base/checks.h" #include "webrtc/modules/video_coding/codecs/vp8/screenshare_layers.h" #include "webrtc/modules/video_coding/codecs/vp8/simulcast_rate_allocator.h" +#include "webrtc/rtc_base/checks.h" #include "webrtc/system_wrappers/include/clock.h" namespace { diff --git a/webrtc/modules/video_coding/codecs/vp8/simulcast_encoder_adapter.h b/webrtc/modules/video_coding/codecs/vp8/simulcast_encoder_adapter.h index 744c66a69e..784c274acf 100644 --- a/webrtc/modules/video_coding/codecs/vp8/simulcast_encoder_adapter.h +++ b/webrtc/modules/video_coding/codecs/vp8/simulcast_encoder_adapter.h @@ -18,9 +18,9 @@ #include #include -#include "webrtc/base/atomicops.h" -#include "webrtc/base/sequenced_task_checker.h" #include "webrtc/modules/video_coding/codecs/vp8/include/vp8.h" +#include "webrtc/rtc_base/atomicops.h" +#include "webrtc/rtc_base/sequenced_task_checker.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/codecs/vp8/simulcast_rate_allocator.cc b/webrtc/modules/video_coding/codecs/vp8/simulcast_rate_allocator.cc index 39c43c9b6d..edd5c1377c 100644 --- a/webrtc/modules/video_coding/codecs/vp8/simulcast_rate_allocator.cc +++ b/webrtc/modules/video_coding/codecs/vp8/simulcast_rate_allocator.cc @@ -15,7 +15,7 @@ #include #include -#include "webrtc/base/checks.h" +#include "webrtc/rtc_base/checks.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/codecs/vp8/simulcast_rate_allocator.h b/webrtc/modules/video_coding/codecs/vp8/simulcast_rate_allocator.h index e558290e6b..c6c2fb3fee 100644 --- a/webrtc/modules/video_coding/codecs/vp8/simulcast_rate_allocator.h +++ b/webrtc/modules/video_coding/codecs/vp8/simulcast_rate_allocator.h @@ -17,9 +17,9 @@ #include #include "webrtc/api/video_codecs/video_encoder.h" -#include "webrtc/base/constructormagic.h" #include "webrtc/common_video/include/video_bitrate_allocator.h" #include "webrtc/modules/video_coding/codecs/vp8/temporal_layers.h" +#include "webrtc/rtc_base/constructormagic.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/codecs/vp8/simulcast_unittest.h b/webrtc/modules/video_coding/codecs/vp8/simulcast_unittest.h index 5a8d21913e..69b55e52ca 100644 --- a/webrtc/modules/video_coding/codecs/vp8/simulcast_unittest.h +++ b/webrtc/modules/video_coding/codecs/vp8/simulcast_unittest.h @@ -18,7 +18,6 @@ #include "webrtc/api/video/i420_buffer.h" #include "webrtc/api/video/video_frame.h" -#include "webrtc/base/checks.h" #include "webrtc/common_video/include/video_frame.h" #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" #include "webrtc/modules/video_coding/codecs/vp8/include/vp8.h" @@ -26,6 +25,7 @@ #include "webrtc/modules/video_coding/codecs/vp8/temporal_layers.h" #include "webrtc/modules/video_coding/include/mock/mock_video_codec_interface.h" #include "webrtc/modules/video_coding/include/video_coding_defines.h" +#include "webrtc/rtc_base/checks.h" #include "webrtc/test/gtest.h" using ::testing::_; diff --git a/webrtc/modules/video_coding/codecs/vp8/test/vp8_impl_unittest.cc b/webrtc/modules/video_coding/codecs/vp8/test/vp8_impl_unittest.cc index a3db4fdad6..7e04167370 100644 --- a/webrtc/modules/video_coding/codecs/vp8/test/vp8_impl_unittest.cc +++ b/webrtc/modules/video_coding/codecs/vp8/test/vp8_impl_unittest.cc @@ -13,13 +13,13 @@ #include #include "webrtc/api/video/i420_buffer.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/optional.h" -#include "webrtc/base/timeutils.h" #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" #include "webrtc/modules/video_coding/codecs/test/video_codec_test.h" #include "webrtc/modules/video_coding/codecs/vp8/include/vp8.h" #include "webrtc/modules/video_coding/codecs/vp8/temporal_layers.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/optional.h" +#include "webrtc/rtc_base/timeutils.h" #include "webrtc/test/frame_utils.h" #include "webrtc/test/gtest.h" #include "webrtc/test/testsupport/fileutils.h" diff --git a/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc b/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc index 5038e8edf4..aa334da325 100644 --- a/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc +++ b/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc @@ -20,10 +20,6 @@ #include "libyuv/scale.h" // NOLINT #include "libyuv/convert.h" // NOLINT -#include "webrtc/base/checks.h" -#include "webrtc/base/random.h" -#include "webrtc/base/timeutils.h" -#include "webrtc/base/trace_event.h" #include "webrtc/common_types.h" #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" #include "webrtc/modules/include/module_common_types.h" @@ -32,6 +28,10 @@ #include "webrtc/modules/video_coding/codecs/vp8/simulcast_rate_allocator.h" #include "webrtc/modules/video_coding/codecs/vp8/temporal_layers.h" #include "webrtc/modules/video_coding/include/video_codec_interface.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/random.h" +#include "webrtc/rtc_base/timeutils.h" +#include "webrtc/rtc_base/trace_event.h" #include "webrtc/system_wrappers/include/clock.h" #include "webrtc/system_wrappers/include/field_trial.h" #include "webrtc/system_wrappers/include/metrics.h" diff --git a/webrtc/modules/video_coding/codecs/vp9/screenshare_layers.cc b/webrtc/modules/video_coding/codecs/vp9/screenshare_layers.cc index c7ed78a192..461b357c9a 100644 --- a/webrtc/modules/video_coding/codecs/vp9/screenshare_layers.cc +++ b/webrtc/modules/video_coding/codecs/vp9/screenshare_layers.cc @@ -7,9 +7,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include #include "webrtc/modules/video_coding/codecs/vp9/screenshare_layers.h" -#include "webrtc/base/checks.h" +#include +#include "webrtc/rtc_base/checks.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/codecs/vp9/vp9_frame_buffer_pool.cc b/webrtc/modules/video_coding/codecs/vp9/vp9_frame_buffer_pool.cc index c5d2ed9e61..ff821b94d3 100644 --- a/webrtc/modules/video_coding/codecs/vp9/vp9_frame_buffer_pool.cc +++ b/webrtc/modules/video_coding/codecs/vp9/vp9_frame_buffer_pool.cc @@ -15,8 +15,8 @@ #include "vpx/vpx_decoder.h" #include "vpx/vpx_frame_buffer.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/logging.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/logging.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/codecs/vp9/vp9_frame_buffer_pool.h b/webrtc/modules/video_coding/codecs/vp9/vp9_frame_buffer_pool.h index af91c8c0d2..485dc5fc03 100644 --- a/webrtc/modules/video_coding/codecs/vp9/vp9_frame_buffer_pool.h +++ b/webrtc/modules/video_coding/codecs/vp9/vp9_frame_buffer_pool.h @@ -14,11 +14,11 @@ #include -#include "webrtc/base/basictypes.h" -#include "webrtc/base/buffer.h" -#include "webrtc/base/criticalsection.h" -#include "webrtc/base/refcount.h" -#include "webrtc/base/scoped_ref_ptr.h" +#include "webrtc/rtc_base/basictypes.h" +#include "webrtc/rtc_base/buffer.h" +#include "webrtc/rtc_base/criticalsection.h" +#include "webrtc/rtc_base/refcount.h" +#include "webrtc/rtc_base/scoped_ref_ptr.h" struct vpx_codec_ctx; struct vpx_codec_frame_buffer; diff --git a/webrtc/modules/video_coding/codecs/vp9/vp9_impl.cc b/webrtc/modules/video_coding/codecs/vp9/vp9_impl.cc index 8e4560a720..a8adc87071 100644 --- a/webrtc/modules/video_coding/codecs/vp9/vp9_impl.cc +++ b/webrtc/modules/video_coding/codecs/vp9/vp9_impl.cc @@ -21,15 +21,15 @@ #include "vpx/vp8cx.h" #include "vpx/vp8dx.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/keep_ref_until_done.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/random.h" -#include "webrtc/base/timeutils.h" -#include "webrtc/base/trace_event.h" #include "webrtc/common_video/include/video_frame_buffer.h" #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" #include "webrtc/modules/video_coding/codecs/vp9/screenshare_layers.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/keep_ref_until_done.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/random.h" +#include "webrtc/rtc_base/timeutils.h" +#include "webrtc/rtc_base/trace_event.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/codecs/vp9/vp9_noop.cc b/webrtc/modules/video_coding/codecs/vp9/vp9_noop.cc index cc37e1adbb..7566a50a19 100644 --- a/webrtc/modules/video_coding/codecs/vp9/vp9_noop.cc +++ b/webrtc/modules/video_coding/codecs/vp9/vp9_noop.cc @@ -13,8 +13,8 @@ #error #endif // !defined(RTC_DISABLE_VP9) -#include "webrtc/base/checks.h" #include "webrtc/modules/video_coding/codecs/vp9/include/vp9.h" +#include "webrtc/rtc_base/checks.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/codecs/vp9/vp9_screenshare_layers_unittest.cc b/webrtc/modules/video_coding/codecs/vp9/vp9_screenshare_layers_unittest.cc index eaced9d97b..c8205b283f 100644 --- a/webrtc/modules/video_coding/codecs/vp9/vp9_screenshare_layers_unittest.cc +++ b/webrtc/modules/video_coding/codecs/vp9/vp9_screenshare_layers_unittest.cc @@ -12,9 +12,9 @@ #include #include "vpx/vp8cx.h" -#include "webrtc/base/logging.h" #include "webrtc/modules/video_coding/codecs/vp9/screenshare_layers.h" #include "webrtc/modules/video_coding/codecs/vp9/vp9_impl.h" +#include "webrtc/rtc_base/logging.h" #include "webrtc/system_wrappers/include/clock.h" #include "webrtc/test/gtest.h" diff --git a/webrtc/modules/video_coding/decoding_state.cc b/webrtc/modules/video_coding/decoding_state.cc index 0c45ae3b39..f57250e901 100644 --- a/webrtc/modules/video_coding/decoding_state.cc +++ b/webrtc/modules/video_coding/decoding_state.cc @@ -10,12 +10,12 @@ #include "webrtc/modules/video_coding/decoding_state.h" -#include "webrtc/base/logging.h" #include "webrtc/common_video/h264/h264_common.h" #include "webrtc/modules/include/module_common_types.h" #include "webrtc/modules/video_coding/frame_buffer.h" #include "webrtc/modules/video_coding/jitter_buffer_common.h" #include "webrtc/modules/video_coding/packet.h" +#include "webrtc/rtc_base/logging.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/frame_buffer.cc b/webrtc/modules/video_coding/frame_buffer.cc index 11bf88a766..f67210f976 100644 --- a/webrtc/modules/video_coding/frame_buffer.cc +++ b/webrtc/modules/video_coding/frame_buffer.cc @@ -13,10 +13,10 @@ #include #include -#include "webrtc/base/checks.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/trace_event.h" #include "webrtc/modules/video_coding/packet.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/trace_event.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/frame_buffer2.cc b/webrtc/modules/video_coding/frame_buffer2.cc index 2beffc7f08..5be20a2bd5 100644 --- a/webrtc/modules/video_coding/frame_buffer2.cc +++ b/webrtc/modules/video_coding/frame_buffer2.cc @@ -14,12 +14,12 @@ #include #include -#include "webrtc/base/checks.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/trace_event.h" #include "webrtc/modules/video_coding/include/video_coding_defines.h" #include "webrtc/modules/video_coding/jitter_estimator.h" #include "webrtc/modules/video_coding/timing.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/trace_event.h" #include "webrtc/system_wrappers/include/clock.h" #include "webrtc/system_wrappers/include/metrics.h" diff --git a/webrtc/modules/video_coding/frame_buffer2.h b/webrtc/modules/video_coding/frame_buffer2.h index 25ba0a9189..2d2411f562 100644 --- a/webrtc/modules/video_coding/frame_buffer2.h +++ b/webrtc/modules/video_coding/frame_buffer2.h @@ -16,14 +16,14 @@ #include #include -#include "webrtc/base/constructormagic.h" -#include "webrtc/base/criticalsection.h" -#include "webrtc/base/event.h" -#include "webrtc/base/thread_annotations.h" #include "webrtc/modules/video_coding/frame_object.h" #include "webrtc/modules/video_coding/include/video_coding_defines.h" #include "webrtc/modules/video_coding/inter_frame_delay.h" #include "webrtc/modules/video_coding/sequence_number_util.h" +#include "webrtc/rtc_base/constructormagic.h" +#include "webrtc/rtc_base/criticalsection.h" +#include "webrtc/rtc_base/event.h" +#include "webrtc/rtc_base/thread_annotations.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/frame_buffer2_unittest.cc b/webrtc/modules/video_coding/frame_buffer2_unittest.cc index 9d15302cec..d85f1cf233 100644 --- a/webrtc/modules/video_coding/frame_buffer2_unittest.cc +++ b/webrtc/modules/video_coding/frame_buffer2_unittest.cc @@ -15,12 +15,12 @@ #include #include -#include "webrtc/base/platform_thread.h" -#include "webrtc/base/random.h" #include "webrtc/modules/video_coding/frame_object.h" #include "webrtc/modules/video_coding/jitter_estimator.h" #include "webrtc/modules/video_coding/sequence_number_util.h" #include "webrtc/modules/video_coding/timing.h" +#include "webrtc/rtc_base/platform_thread.h" +#include "webrtc/rtc_base/random.h" #include "webrtc/system_wrappers/include/clock.h" #include "webrtc/test/gmock.h" #include "webrtc/test/gtest.h" diff --git a/webrtc/modules/video_coding/frame_object.cc b/webrtc/modules/video_coding/frame_object.cc index 220fa534d1..4c4537cb45 100644 --- a/webrtc/modules/video_coding/frame_object.cc +++ b/webrtc/modules/video_coding/frame_object.cc @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/base/checks.h" -#include "webrtc/common_video/h264/h264_common.h" #include "webrtc/modules/video_coding/frame_object.h" +#include "webrtc/common_video/h264/h264_common.h" #include "webrtc/modules/video_coding/packet_buffer.h" +#include "webrtc/rtc_base/checks.h" namespace webrtc { namespace video_coding { diff --git a/webrtc/modules/video_coding/frame_object.h b/webrtc/modules/video_coding/frame_object.h index fa0a2c1d3d..fb2cd33f18 100644 --- a/webrtc/modules/video_coding/frame_object.h +++ b/webrtc/modules/video_coding/frame_object.h @@ -11,10 +11,10 @@ #ifndef WEBRTC_MODULES_VIDEO_CODING_FRAME_OBJECT_H_ #define WEBRTC_MODULES_VIDEO_CODING_FRAME_OBJECT_H_ -#include "webrtc/base/optional.h" #include "webrtc/common_types.h" #include "webrtc/modules/include/module_common_types.h" #include "webrtc/modules/video_coding/encoded_frame.h" +#include "webrtc/rtc_base/optional.h" namespace webrtc { namespace video_coding { diff --git a/webrtc/modules/video_coding/generic_decoder.cc b/webrtc/modules/video_coding/generic_decoder.cc index 80b08b5478..1808dc7fd1 100644 --- a/webrtc/modules/video_coding/generic_decoder.cc +++ b/webrtc/modules/video_coding/generic_decoder.cc @@ -12,12 +12,12 @@ #include -#include "webrtc/base/checks.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/timeutils.h" -#include "webrtc/base/trace_event.h" #include "webrtc/modules/video_coding/include/video_coding.h" #include "webrtc/modules/video_coding/internal_defines.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/timeutils.h" +#include "webrtc/rtc_base/trace_event.h" #include "webrtc/system_wrappers/include/clock.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/generic_decoder.h b/webrtc/modules/video_coding/generic_decoder.h index f7196f04c5..fcfea7740e 100644 --- a/webrtc/modules/video_coding/generic_decoder.h +++ b/webrtc/modules/video_coding/generic_decoder.h @@ -13,13 +13,13 @@ #include -#include "webrtc/base/criticalsection.h" -#include "webrtc/base/thread_checker.h" #include "webrtc/modules/include/module_common_types.h" #include "webrtc/modules/video_coding/encoded_frame.h" #include "webrtc/modules/video_coding/include/video_codec_interface.h" #include "webrtc/modules/video_coding/timestamp_map.h" #include "webrtc/modules/video_coding/timing.h" +#include "webrtc/rtc_base/criticalsection.h" +#include "webrtc/rtc_base/thread_checker.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/generic_encoder.cc b/webrtc/modules/video_coding/generic_encoder.cc index 89dafa7728..17e4032144 100644 --- a/webrtc/modules/video_coding/generic_encoder.cc +++ b/webrtc/modules/video_coding/generic_encoder.cc @@ -13,12 +13,12 @@ #include #include "webrtc/api/video/i420_buffer.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/timeutils.h" -#include "webrtc/base/trace_event.h" #include "webrtc/modules/video_coding/encoded_frame.h" #include "webrtc/modules/video_coding/media_optimization.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/timeutils.h" +#include "webrtc/rtc_base/trace_event.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/generic_encoder.h b/webrtc/modules/video_coding/generic_encoder.h index 8b33246eb9..a5c34d7404 100644 --- a/webrtc/modules/video_coding/generic_encoder.h +++ b/webrtc/modules/video_coding/generic_encoder.h @@ -18,8 +18,8 @@ #include "webrtc/modules/video_coding/include/video_codec_interface.h" #include "webrtc/modules/video_coding/include/video_coding_defines.h" -#include "webrtc/base/criticalsection.h" -#include "webrtc/base/race_checker.h" +#include "webrtc/rtc_base/criticalsection.h" +#include "webrtc/rtc_base/race_checker.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/h264_sprop_parameter_sets.cc b/webrtc/modules/video_coding/h264_sprop_parameter_sets.cc index ae298a341f..c5451030b3 100644 --- a/webrtc/modules/video_coding/h264_sprop_parameter_sets.cc +++ b/webrtc/modules/video_coding/h264_sprop_parameter_sets.cc @@ -13,9 +13,9 @@ #include #include -#include "webrtc/base/base64.h" -#include "webrtc/base/basictypes.h" -#include "webrtc/base/logging.h" +#include "webrtc/rtc_base/base64.h" +#include "webrtc/rtc_base/basictypes.h" +#include "webrtc/rtc_base/logging.h" namespace { diff --git a/webrtc/modules/video_coding/h264_sprop_parameter_sets.h b/webrtc/modules/video_coding/h264_sprop_parameter_sets.h index 97ddcc51d1..714a29e2a1 100644 --- a/webrtc/modules/video_coding/h264_sprop_parameter_sets.h +++ b/webrtc/modules/video_coding/h264_sprop_parameter_sets.h @@ -14,7 +14,7 @@ #include #include -#include "webrtc/base/constructormagic.h" +#include "webrtc/rtc_base/constructormagic.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/h264_sps_pps_tracker.cc b/webrtc/modules/video_coding/h264_sps_pps_tracker.cc index 88b440f0b8..40284c7748 100644 --- a/webrtc/modules/video_coding/h264_sps_pps_tracker.cc +++ b/webrtc/modules/video_coding/h264_sps_pps_tracker.cc @@ -13,13 +13,13 @@ #include #include -#include "webrtc/base/checks.h" -#include "webrtc/base/logging.h" #include "webrtc/common_video/h264/h264_common.h" #include "webrtc/common_video/h264/pps_parser.h" #include "webrtc/common_video/h264/sps_parser.h" #include "webrtc/modules/video_coding/frame_object.h" #include "webrtc/modules/video_coding/packet_buffer.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/logging.h" namespace webrtc { namespace video_coding { diff --git a/webrtc/modules/video_coding/jitter_buffer.cc b/webrtc/modules/video_coding/jitter_buffer.cc index c74ebe5815..a5560808dd 100644 --- a/webrtc/modules/video_coding/jitter_buffer.cc +++ b/webrtc/modules/video_coding/jitter_buffer.cc @@ -15,17 +15,17 @@ #include #include -#include "webrtc/base/checks.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/trace_event.h" #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" -#include "webrtc/modules/video_coding/include/video_coding.h" #include "webrtc/modules/video_coding/frame_buffer.h" +#include "webrtc/modules/video_coding/include/video_coding.h" #include "webrtc/modules/video_coding/inter_frame_delay.h" #include "webrtc/modules/video_coding/internal_defines.h" #include "webrtc/modules/video_coding/jitter_buffer_common.h" #include "webrtc/modules/video_coding/jitter_estimator.h" #include "webrtc/modules/video_coding/packet.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/trace_event.h" #include "webrtc/system_wrappers/include/clock.h" #include "webrtc/system_wrappers/include/event_wrapper.h" #include "webrtc/system_wrappers/include/field_trial.h" diff --git a/webrtc/modules/video_coding/jitter_buffer.h b/webrtc/modules/video_coding/jitter_buffer.h index 460b8ae7f9..44794d21bc 100644 --- a/webrtc/modules/video_coding/jitter_buffer.h +++ b/webrtc/modules/video_coding/jitter_buffer.h @@ -17,18 +17,18 @@ #include #include -#include "webrtc/base/constructormagic.h" -#include "webrtc/base/criticalsection.h" -#include "webrtc/base/thread_annotations.h" #include "webrtc/modules/include/module_common_types.h" #include "webrtc/modules/utility/include/process_thread.h" +#include "webrtc/modules/video_coding/decoding_state.h" #include "webrtc/modules/video_coding/include/video_coding.h" #include "webrtc/modules/video_coding/include/video_coding_defines.h" -#include "webrtc/modules/video_coding/decoding_state.h" #include "webrtc/modules/video_coding/inter_frame_delay.h" #include "webrtc/modules/video_coding/jitter_buffer_common.h" #include "webrtc/modules/video_coding/jitter_estimator.h" #include "webrtc/modules/video_coding/nack_module.h" +#include "webrtc/rtc_base/constructormagic.h" +#include "webrtc/rtc_base/criticalsection.h" +#include "webrtc/rtc_base/thread_annotations.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/jitter_buffer_unittest.cc b/webrtc/modules/video_coding/jitter_buffer_unittest.cc index 2a52eb2865..bc5201a3d0 100644 --- a/webrtc/modules/video_coding/jitter_buffer_unittest.cc +++ b/webrtc/modules/video_coding/jitter_buffer_unittest.cc @@ -14,7 +14,6 @@ #include #include -#include "webrtc/base/location.h" #include "webrtc/common_video/h264/h264_common.h" #include "webrtc/modules/video_coding/frame_buffer.h" #include "webrtc/modules/video_coding/jitter_buffer.h" @@ -22,6 +21,7 @@ #include "webrtc/modules/video_coding/packet.h" #include "webrtc/modules/video_coding/test/stream_generator.h" #include "webrtc/modules/video_coding/test/test_util.h" +#include "webrtc/rtc_base/location.h" #include "webrtc/system_wrappers/include/clock.h" #include "webrtc/system_wrappers/include/field_trial.h" #include "webrtc/system_wrappers/include/metrics.h" diff --git a/webrtc/modules/video_coding/jitter_estimator.h b/webrtc/modules/video_coding/jitter_estimator.h index 7ef050f032..c50c34ea50 100644 --- a/webrtc/modules/video_coding/jitter_estimator.h +++ b/webrtc/modules/video_coding/jitter_estimator.h @@ -11,8 +11,8 @@ #ifndef WEBRTC_MODULES_VIDEO_CODING_JITTER_ESTIMATOR_H_ #define WEBRTC_MODULES_VIDEO_CODING_JITTER_ESTIMATOR_H_ -#include "webrtc/base/rollingaccumulator.h" #include "webrtc/modules/video_coding/rtt_filter.h" +#include "webrtc/rtc_base/rollingaccumulator.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/media_opt_util.h b/webrtc/modules/video_coding/media_opt_util.h index ff7e485a21..7b4c4d10bd 100644 --- a/webrtc/modules/video_coding/media_opt_util.h +++ b/webrtc/modules/video_coding/media_opt_util.h @@ -16,8 +16,8 @@ #include -#include "webrtc/base/numerics/exp_filter.h" #include "webrtc/modules/video_coding/internal_defines.h" +#include "webrtc/rtc_base/numerics/exp_filter.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/media_optimization.cc b/webrtc/modules/video_coding/media_optimization.cc index 9c74f4b847..7d7da352f8 100644 --- a/webrtc/modules/video_coding/media_optimization.cc +++ b/webrtc/modules/video_coding/media_optimization.cc @@ -12,8 +12,8 @@ #include -#include "webrtc/base/logging.h" #include "webrtc/modules/video_coding/utility/frame_dropper.h" +#include "webrtc/rtc_base/logging.h" #include "webrtc/system_wrappers/include/clock.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/media_optimization.h b/webrtc/modules/video_coding/media_optimization.h index ffc3209412..2d368c708b 100644 --- a/webrtc/modules/video_coding/media_optimization.h +++ b/webrtc/modules/video_coding/media_optimization.h @@ -14,10 +14,10 @@ #include #include -#include "webrtc/base/criticalsection.h" #include "webrtc/modules/include/module_common_types.h" #include "webrtc/modules/video_coding/include/video_coding.h" #include "webrtc/modules/video_coding/media_opt_util.h" +#include "webrtc/rtc_base/criticalsection.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/nack_module.cc b/webrtc/modules/video_coding/nack_module.cc index 1bd88f0fc1..e3808c29f1 100644 --- a/webrtc/modules/video_coding/nack_module.cc +++ b/webrtc/modules/video_coding/nack_module.cc @@ -13,9 +13,9 @@ #include "webrtc/modules/video_coding/nack_module.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/logging.h" #include "webrtc/modules/utility/include/process_thread.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/logging.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/nack_module.h b/webrtc/modules/video_coding/nack_module.h index 6cdd0477b2..35be4c2b18 100644 --- a/webrtc/modules/video_coding/nack_module.h +++ b/webrtc/modules/video_coding/nack_module.h @@ -15,13 +15,13 @@ #include #include -#include "webrtc/base/criticalsection.h" -#include "webrtc/base/thread_annotations.h" #include "webrtc/modules/include/module.h" +#include "webrtc/modules/video_coding/histogram.h" #include "webrtc/modules/video_coding/include/video_coding_defines.h" #include "webrtc/modules/video_coding/packet.h" -#include "webrtc/modules/video_coding/histogram.h" #include "webrtc/modules/video_coding/sequence_number_util.h" +#include "webrtc/rtc_base/criticalsection.h" +#include "webrtc/rtc_base/thread_annotations.h" #include "webrtc/system_wrappers/include/clock.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/packet_buffer.cc b/webrtc/modules/video_coding/packet_buffer.cc index 1031042581..8b6de047ca 100644 --- a/webrtc/modules/video_coding/packet_buffer.cc +++ b/webrtc/modules/video_coding/packet_buffer.cc @@ -14,11 +14,11 @@ #include #include -#include "webrtc/base/atomicops.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/logging.h" #include "webrtc/common_video/h264/h264_common.h" #include "webrtc/modules/video_coding/frame_object.h" +#include "webrtc/rtc_base/atomicops.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/logging.h" #include "webrtc/system_wrappers/include/clock.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/packet_buffer.h b/webrtc/modules/video_coding/packet_buffer.h index d5011b67c3..e0f058a56c 100644 --- a/webrtc/modules/video_coding/packet_buffer.h +++ b/webrtc/modules/video_coding/packet_buffer.h @@ -15,13 +15,13 @@ #include #include -#include "webrtc/base/criticalsection.h" -#include "webrtc/base/scoped_ref_ptr.h" -#include "webrtc/base/thread_annotations.h" #include "webrtc/modules/include/module_common_types.h" #include "webrtc/modules/video_coding/packet.h" #include "webrtc/modules/video_coding/rtp_frame_reference_finder.h" #include "webrtc/modules/video_coding/sequence_number_util.h" +#include "webrtc/rtc_base/criticalsection.h" +#include "webrtc/rtc_base/scoped_ref_ptr.h" +#include "webrtc/rtc_base/thread_annotations.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/protection_bitrate_calculator.h b/webrtc/modules/video_coding/protection_bitrate_calculator.h index a12dcfc66a..d2c1499231 100644 --- a/webrtc/modules/video_coding/protection_bitrate_calculator.h +++ b/webrtc/modules/video_coding/protection_bitrate_calculator.h @@ -14,10 +14,10 @@ #include #include -#include "webrtc/base/criticalsection.h" #include "webrtc/modules/include/module_common_types.h" #include "webrtc/modules/video_coding/include/video_coding.h" #include "webrtc/modules/video_coding/media_opt_util.h" +#include "webrtc/rtc_base/criticalsection.h" #include "webrtc/system_wrappers/include/clock.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/receiver.cc b/webrtc/modules/video_coding/receiver.cc index af9ddb8f26..0c559e0751 100644 --- a/webrtc/modules/video_coding/receiver.cc +++ b/webrtc/modules/video_coding/receiver.cc @@ -16,11 +16,11 @@ #include #include -#include "webrtc/base/logging.h" -#include "webrtc/base/trace_event.h" #include "webrtc/modules/video_coding/encoded_frame.h" #include "webrtc/modules/video_coding/internal_defines.h" #include "webrtc/modules/video_coding/media_opt_util.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/trace_event.h" #include "webrtc/system_wrappers/include/clock.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/receiver.h b/webrtc/modules/video_coding/receiver.h index 0664d6247f..4ef253fb44 100644 --- a/webrtc/modules/video_coding/receiver.h +++ b/webrtc/modules/video_coding/receiver.h @@ -14,12 +14,12 @@ #include #include -#include "webrtc/base/criticalsection.h" +#include "webrtc/modules/video_coding/include/video_coding.h" +#include "webrtc/modules/video_coding/include/video_coding_defines.h" #include "webrtc/modules/video_coding/jitter_buffer.h" #include "webrtc/modules/video_coding/packet.h" #include "webrtc/modules/video_coding/timing.h" -#include "webrtc/modules/video_coding/include/video_coding.h" -#include "webrtc/modules/video_coding/include/video_coding_defines.h" +#include "webrtc/rtc_base/criticalsection.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/receiver_unittest.cc b/webrtc/modules/video_coding/receiver_unittest.cc index ff5716a9a5..83fdff2896 100644 --- a/webrtc/modules/video_coding/receiver_unittest.cc +++ b/webrtc/modules/video_coding/receiver_unittest.cc @@ -14,13 +14,13 @@ #include #include -#include "webrtc/base/checks.h" #include "webrtc/modules/video_coding/encoded_frame.h" #include "webrtc/modules/video_coding/packet.h" #include "webrtc/modules/video_coding/receiver.h" #include "webrtc/modules/video_coding/test/stream_generator.h" #include "webrtc/modules/video_coding/test/test_util.h" #include "webrtc/modules/video_coding/timing.h" +#include "webrtc/rtc_base/checks.h" #include "webrtc/system_wrappers/include/clock.h" #include "webrtc/test/gtest.h" diff --git a/webrtc/modules/video_coding/rtp_frame_reference_finder.cc b/webrtc/modules/video_coding/rtp_frame_reference_finder.cc index 16f529feea..ebf2f45dd9 100644 --- a/webrtc/modules/video_coding/rtp_frame_reference_finder.cc +++ b/webrtc/modules/video_coding/rtp_frame_reference_finder.cc @@ -13,10 +13,10 @@ #include #include -#include "webrtc/base/checks.h" -#include "webrtc/base/logging.h" #include "webrtc/modules/video_coding/frame_object.h" #include "webrtc/modules/video_coding/packet_buffer.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/logging.h" namespace webrtc { namespace video_coding { diff --git a/webrtc/modules/video_coding/rtp_frame_reference_finder.h b/webrtc/modules/video_coding/rtp_frame_reference_finder.h index 06f449ac39..99688e6657 100644 --- a/webrtc/modules/video_coding/rtp_frame_reference_finder.h +++ b/webrtc/modules/video_coding/rtp_frame_reference_finder.h @@ -18,10 +18,10 @@ #include #include -#include "webrtc/base/criticalsection.h" -#include "webrtc/base/thread_annotations.h" #include "webrtc/modules/include/module_common_types.h" #include "webrtc/modules/video_coding/sequence_number_util.h" +#include "webrtc/rtc_base/criticalsection.h" +#include "webrtc/rtc_base/thread_annotations.h" namespace webrtc { namespace video_coding { diff --git a/webrtc/modules/video_coding/rtp_frame_reference_finder_unittest.cc b/webrtc/modules/video_coding/rtp_frame_reference_finder_unittest.cc index 6ea8e020e2..b4c30a96e3 100644 --- a/webrtc/modules/video_coding/rtp_frame_reference_finder_unittest.cc +++ b/webrtc/modules/video_coding/rtp_frame_reference_finder_unittest.cc @@ -14,10 +14,10 @@ #include #include -#include "webrtc/base/random.h" -#include "webrtc/base/refcount.h" #include "webrtc/modules/video_coding/frame_object.h" #include "webrtc/modules/video_coding/packet_buffer.h" +#include "webrtc/rtc_base/random.h" +#include "webrtc/rtc_base/refcount.h" #include "webrtc/system_wrappers/include/clock.h" #include "webrtc/test/gtest.h" diff --git a/webrtc/modules/video_coding/sequence_number_util.h b/webrtc/modules/video_coding/sequence_number_util.h index 828e68a768..8a139a34dc 100644 --- a/webrtc/modules/video_coding/sequence_number_util.h +++ b/webrtc/modules/video_coding/sequence_number_util.h @@ -14,7 +14,7 @@ #include #include -#include "webrtc/base/mod_ops.h" +#include "webrtc/rtc_base/mod_ops.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/session_info.cc b/webrtc/modules/video_coding/session_info.cc index bb2b983b20..08e0f7b599 100644 --- a/webrtc/modules/video_coding/session_info.cc +++ b/webrtc/modules/video_coding/session_info.cc @@ -10,8 +10,8 @@ #include "webrtc/modules/video_coding/session_info.h" -#include "webrtc/base/logging.h" #include "webrtc/modules/video_coding/packet.h" +#include "webrtc/rtc_base/logging.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/test/stream_generator.h b/webrtc/modules/video_coding/test/stream_generator.h index 5a3813d490..eded9f49ff 100644 --- a/webrtc/modules/video_coding/test/stream_generator.h +++ b/webrtc/modules/video_coding/test/stream_generator.h @@ -12,8 +12,8 @@ #include -#include "webrtc/base/constructormagic.h" #include "webrtc/modules/video_coding/packet.h" +#include "webrtc/rtc_base/constructormagic.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/timing.h b/webrtc/modules/video_coding/timing.h index 82252bf3fe..954a006d31 100644 --- a/webrtc/modules/video_coding/timing.h +++ b/webrtc/modules/video_coding/timing.h @@ -13,9 +13,9 @@ #include -#include "webrtc/base/criticalsection.h" -#include "webrtc/base/thread_annotations.h" #include "webrtc/modules/video_coding/codec_timer.h" +#include "webrtc/rtc_base/criticalsection.h" +#include "webrtc/rtc_base/thread_annotations.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/utility/frame_dropper.cc b/webrtc/modules/video_coding/utility/frame_dropper.cc index 3ffb078922..73d641055f 100644 --- a/webrtc/modules/video_coding/utility/frame_dropper.cc +++ b/webrtc/modules/video_coding/utility/frame_dropper.cc @@ -12,7 +12,7 @@ #include -#include "webrtc/base/logging.h" +#include "webrtc/rtc_base/logging.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/utility/frame_dropper.h b/webrtc/modules/video_coding/utility/frame_dropper.h index 71ff93dadb..bf31f39c56 100644 --- a/webrtc/modules/video_coding/utility/frame_dropper.h +++ b/webrtc/modules/video_coding/utility/frame_dropper.h @@ -13,7 +13,7 @@ #include -#include "webrtc/base/numerics/exp_filter.h" +#include "webrtc/rtc_base/numerics/exp_filter.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/utility/frame_dropper_unittest.cc b/webrtc/modules/video_coding/utility/frame_dropper_unittest.cc index eec3d6065a..c33ed8504a 100644 --- a/webrtc/modules/video_coding/utility/frame_dropper_unittest.cc +++ b/webrtc/modules/video_coding/utility/frame_dropper_unittest.cc @@ -10,7 +10,7 @@ #include "webrtc/modules/video_coding/utility/frame_dropper.h" -#include "webrtc/base/logging.h" +#include "webrtc/rtc_base/logging.h" #include "webrtc/test/gtest.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/utility/ivf_file_writer.cc b/webrtc/modules/video_coding/utility/ivf_file_writer.cc index d01d0231e8..ce3919d7ef 100644 --- a/webrtc/modules/video_coding/utility/ivf_file_writer.cc +++ b/webrtc/modules/video_coding/utility/ivf_file_writer.cc @@ -13,9 +13,9 @@ #include #include -#include "webrtc/base/checks.h" -#include "webrtc/base/logging.h" #include "webrtc/modules/rtp_rtcp/source/byte_io.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/logging.h" // TODO(palmkvist): make logging more informative in the absence of a file name // (or get one) diff --git a/webrtc/modules/video_coding/utility/ivf_file_writer.h b/webrtc/modules/video_coding/utility/ivf_file_writer.h index 374b80700a..07a8581467 100644 --- a/webrtc/modules/video_coding/utility/ivf_file_writer.h +++ b/webrtc/modules/video_coding/utility/ivf_file_writer.h @@ -14,11 +14,11 @@ #include #include -#include "webrtc/base/constructormagic.h" -#include "webrtc/base/file.h" -#include "webrtc/base/timeutils.h" #include "webrtc/common_video/include/video_frame.h" #include "webrtc/modules/include/module_common_types.h" +#include "webrtc/rtc_base/constructormagic.h" +#include "webrtc/rtc_base/file.h" +#include "webrtc/rtc_base/timeutils.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/utility/ivf_file_writer_unittest.cc b/webrtc/modules/video_coding/utility/ivf_file_writer_unittest.cc index cb5c97b870..b7a9b413b4 100644 --- a/webrtc/modules/video_coding/utility/ivf_file_writer_unittest.cc +++ b/webrtc/modules/video_coding/utility/ivf_file_writer_unittest.cc @@ -12,11 +12,11 @@ #include -#include "webrtc/base/helpers.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/thread.h" -#include "webrtc/base/timeutils.h" #include "webrtc/modules/rtp_rtcp/source/byte_io.h" +#include "webrtc/rtc_base/helpers.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/thread.h" +#include "webrtc/rtc_base/timeutils.h" #include "webrtc/test/gtest.h" #include "webrtc/test/testsupport/fileutils.h" diff --git a/webrtc/modules/video_coding/utility/moving_average.h b/webrtc/modules/video_coding/utility/moving_average.h index dd42385038..bc31cd5213 100644 --- a/webrtc/modules/video_coding/utility/moving_average.h +++ b/webrtc/modules/video_coding/utility/moving_average.h @@ -13,7 +13,7 @@ #include -#include "webrtc/base/optional.h" +#include "webrtc/rtc_base/optional.h" namespace webrtc { class MovingAverage { diff --git a/webrtc/modules/video_coding/utility/quality_scaler.cc b/webrtc/modules/video_coding/utility/quality_scaler.cc index 8be4a65bc2..760ebd7b51 100644 --- a/webrtc/modules/video_coding/utility/quality_scaler.cc +++ b/webrtc/modules/video_coding/utility/quality_scaler.cc @@ -15,9 +15,9 @@ #include #include -#include "webrtc/base/checks.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/task_queue.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/task_queue.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/webrtc/modules/video_coding/utility/quality_scaler.h b/webrtc/modules/video_coding/utility/quality_scaler.h index a07b1eabf2..690d1bc059 100644 --- a/webrtc/modules/video_coding/utility/quality_scaler.h +++ b/webrtc/modules/video_coding/utility/quality_scaler.h @@ -13,11 +13,11 @@ #include -#include "webrtc/common_types.h" #include "webrtc/api/video_codecs/video_encoder.h" -#include "webrtc/base/optional.h" -#include "webrtc/base/sequenced_task_checker.h" +#include "webrtc/common_types.h" #include "webrtc/modules/video_coding/utility/moving_average.h" +#include "webrtc/rtc_base/optional.h" +#include "webrtc/rtc_base/sequenced_task_checker.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/utility/quality_scaler_unittest.cc b/webrtc/modules/video_coding/utility/quality_scaler_unittest.cc index 93b5fcd431..37a986c694 100644 --- a/webrtc/modules/video_coding/utility/quality_scaler_unittest.cc +++ b/webrtc/modules/video_coding/utility/quality_scaler_unittest.cc @@ -12,8 +12,8 @@ #include -#include "webrtc/base/event.h" -#include "webrtc/base/task_queue.h" +#include "webrtc/rtc_base/event.h" +#include "webrtc/rtc_base/task_queue.h" #include "webrtc/test/gmock.h" #include "webrtc/test/gtest.h" diff --git a/webrtc/modules/video_coding/utility/vp8_header_parser.cc b/webrtc/modules/video_coding/utility/vp8_header_parser.cc index d88fb6cc21..78ae69c022 100644 --- a/webrtc/modules/video_coding/utility/vp8_header_parser.cc +++ b/webrtc/modules/video_coding/utility/vp8_header_parser.cc @@ -9,7 +9,7 @@ */ #include "webrtc/modules/video_coding/utility/vp8_header_parser.h" -#include "webrtc/base/logging.h" +#include "webrtc/rtc_base/logging.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/utility/vp9_uncompressed_header_parser.cc b/webrtc/modules/video_coding/utility/vp9_uncompressed_header_parser.cc index 40256d5847..301ed34d55 100644 --- a/webrtc/modules/video_coding/utility/vp9_uncompressed_header_parser.cc +++ b/webrtc/modules/video_coding/utility/vp9_uncompressed_header_parser.cc @@ -9,8 +9,8 @@ */ #include "webrtc/modules/video_coding/utility/vp9_uncompressed_header_parser.h" -#include "webrtc/base/bitbuffer.h" -#include "webrtc/base/logging.h" +#include "webrtc/rtc_base/bitbuffer.h" +#include "webrtc/rtc_base/logging.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/video_codec_initializer.cc b/webrtc/modules/video_coding/video_codec_initializer.cc index 7218cd57ca..c759e84a36 100644 --- a/webrtc/modules/video_coding/video_codec_initializer.cc +++ b/webrtc/modules/video_coding/video_codec_initializer.cc @@ -10,8 +10,6 @@ #include "webrtc/modules/video_coding/include/video_codec_initializer.h" -#include "webrtc/base/basictypes.h" -#include "webrtc/base/logging.h" #include "webrtc/common_types.h" #include "webrtc/common_video/include/video_bitrate_allocator.h" #include "webrtc/modules/video_coding/codecs/vp8/screenshare_layers.h" @@ -19,6 +17,8 @@ #include "webrtc/modules/video_coding/codecs/vp8/temporal_layers.h" #include "webrtc/modules/video_coding/include/video_coding_defines.h" #include "webrtc/modules/video_coding/utility/default_video_bitrate_allocator.h" +#include "webrtc/rtc_base/basictypes.h" +#include "webrtc/rtc_base/logging.h" #include "webrtc/system_wrappers/include/clock.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/video_coding_impl.cc b/webrtc/modules/video_coding/video_coding_impl.cc index 8ff5482af4..7240006e71 100644 --- a/webrtc/modules/video_coding/video_coding_impl.cc +++ b/webrtc/modules/video_coding/video_coding_impl.cc @@ -13,8 +13,6 @@ #include #include -#include "webrtc/base/criticalsection.h" -#include "webrtc/base/thread_checker.h" #include "webrtc/common_types.h" #include "webrtc/common_video/include/video_bitrate_allocator.h" #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" @@ -25,6 +23,8 @@ #include "webrtc/modules/video_coding/jitter_buffer.h" #include "webrtc/modules/video_coding/packet.h" #include "webrtc/modules/video_coding/timing.h" +#include "webrtc/rtc_base/criticalsection.h" +#include "webrtc/rtc_base/thread_checker.h" #include "webrtc/system_wrappers/include/clock.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/video_coding_impl.h b/webrtc/modules/video_coding/video_coding_impl.h index 5e547df07a..37d2b2d299 100644 --- a/webrtc/modules/video_coding/video_coding_impl.h +++ b/webrtc/modules/video_coding/video_coding_impl.h @@ -17,10 +17,6 @@ #include #include -#include "webrtc/base/onetimeevent.h" -#include "webrtc/base/sequenced_task_checker.h" -#include "webrtc/base/thread_annotations.h" -#include "webrtc/base/thread_checker.h" #include "webrtc/common_video/include/frame_callback.h" #include "webrtc/modules/video_coding/codec_database.h" #include "webrtc/modules/video_coding/frame_buffer.h" @@ -31,6 +27,10 @@ #include "webrtc/modules/video_coding/qp_parser.h" #include "webrtc/modules/video_coding/receiver.h" #include "webrtc/modules/video_coding/timing.h" +#include "webrtc/rtc_base/onetimeevent.h" +#include "webrtc/rtc_base/sequenced_task_checker.h" +#include "webrtc/rtc_base/thread_annotations.h" +#include "webrtc/rtc_base/thread_checker.h" #include "webrtc/system_wrappers/include/clock.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/video_packet_buffer_unittest.cc b/webrtc/modules/video_coding/video_packet_buffer_unittest.cc index 300a2a6f1c..e2537b8dc2 100644 --- a/webrtc/modules/video_coding/video_packet_buffer_unittest.cc +++ b/webrtc/modules/video_coding/video_packet_buffer_unittest.cc @@ -13,10 +13,10 @@ #include #include -#include "webrtc/base/random.h" #include "webrtc/common_video/h264/h264_common.h" #include "webrtc/modules/video_coding/frame_object.h" #include "webrtc/modules/video_coding/packet_buffer.h" +#include "webrtc/rtc_base/random.h" #include "webrtc/system_wrappers/include/clock.h" #include "webrtc/test/gtest.h" diff --git a/webrtc/modules/video_coding/video_receiver.cc b/webrtc/modules/video_coding/video_receiver.cc index 84f5af521f..3d3e155dc3 100644 --- a/webrtc/modules/video_coding/video_receiver.cc +++ b/webrtc/modules/video_coding/video_receiver.cc @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/base/checks.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/trace_event.h" #include "webrtc/common_types.h" #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" -#include "webrtc/modules/video_coding/include/video_codec_interface.h" #include "webrtc/modules/video_coding/encoded_frame.h" +#include "webrtc/modules/video_coding/include/video_codec_interface.h" #include "webrtc/modules/video_coding/jitter_buffer.h" #include "webrtc/modules/video_coding/packet.h" #include "webrtc/modules/video_coding/video_coding_impl.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/trace_event.h" #include "webrtc/system_wrappers/include/clock.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/video_sender.cc b/webrtc/modules/video_coding/video_sender.cc index 3dabbfca09..5ab607c51c 100644 --- a/webrtc/modules/video_coding/video_sender.cc +++ b/webrtc/modules/video_coding/video_sender.cc @@ -11,17 +11,17 @@ #include // std::max -#include "webrtc/base/checks.h" -#include "webrtc/base/logging.h" #include "webrtc/common_types.h" #include "webrtc/common_video/include/video_bitrate_allocator.h" #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" #include "webrtc/modules/video_coding/codecs/vp8/temporal_layers.h" -#include "webrtc/modules/video_coding/include/video_codec_interface.h" #include "webrtc/modules/video_coding/encoded_frame.h" +#include "webrtc/modules/video_coding/include/video_codec_interface.h" #include "webrtc/modules/video_coding/utility/default_video_bitrate_allocator.h" #include "webrtc/modules/video_coding/utility/quality_scaler.h" #include "webrtc/modules/video_coding/video_coding_impl.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/logging.h" #include "webrtc/system_wrappers/include/clock.h" namespace webrtc { diff --git a/webrtc/modules/video_processing/util/denoiser_filter.cc b/webrtc/modules/video_processing/util/denoiser_filter.cc index 376dec74a3..d088ddab1c 100644 --- a/webrtc/modules/video_processing/util/denoiser_filter.cc +++ b/webrtc/modules/video_processing/util/denoiser_filter.cc @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/base/checks.h" #include "webrtc/modules/video_processing/util/denoiser_filter.h" #include "webrtc/modules/video_processing/util/denoiser_filter_c.h" #include "webrtc/modules/video_processing/util/denoiser_filter_neon.h" #include "webrtc/modules/video_processing/util/denoiser_filter_sse2.h" +#include "webrtc/rtc_base/checks.h" #include "webrtc/system_wrappers/include/cpu_features_wrapper.h" namespace webrtc { diff --git a/webrtc/ortc/ortcfactory.cc b/webrtc/ortc/ortcfactory.cc index 612e55d904..1d968738cd 100644 --- a/webrtc/ortc/ortcfactory.cc +++ b/webrtc/ortc/ortcfactory.cc @@ -20,11 +20,6 @@ #include "webrtc/api/proxy.h" #include "webrtc/api/rtcerror.h" #include "webrtc/api/videosourceproxy.h" -#include "webrtc/base/asyncpacketsocket.h" -#include "webrtc/base/bind.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/helpers.h" -#include "webrtc/base/logging.h" #include "webrtc/logging/rtc_event_log/rtc_event_log.h" #include "webrtc/media/base/mediaconstants.h" #include "webrtc/modules/audio_processing/include/audio_processing.h" @@ -40,6 +35,11 @@ #include "webrtc/pc/localaudiosource.h" #include "webrtc/pc/videocapturertracksource.h" #include "webrtc/pc/videotrack.h" +#include "webrtc/rtc_base/asyncpacketsocket.h" +#include "webrtc/rtc_base/bind.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/helpers.h" +#include "webrtc/rtc_base/logging.h" namespace { diff --git a/webrtc/ortc/ortcfactory.h b/webrtc/ortc/ortcfactory.h index d82d6d0fa9..2ce7be39cc 100644 --- a/webrtc/ortc/ortcfactory.h +++ b/webrtc/ortc/ortcfactory.h @@ -15,11 +15,11 @@ #include #include "webrtc/api/ortc/ortcfactoryinterface.h" -#include "webrtc/base/constructormagic.h" -#include "webrtc/base/scoped_ref_ptr.h" #include "webrtc/media/base/mediaengine.h" #include "webrtc/media/engine/webrtcmediaengine.h" #include "webrtc/pc/channelmanager.h" +#include "webrtc/rtc_base/constructormagic.h" +#include "webrtc/rtc_base/scoped_ref_ptr.h" namespace webrtc { diff --git a/webrtc/ortc/ortcfactory_integrationtest.cc b/webrtc/ortc/ortcfactory_integrationtest.cc index a800025476..ddd0e1a4d8 100644 --- a/webrtc/ortc/ortcfactory_integrationtest.cc +++ b/webrtc/ortc/ortcfactory_integrationtest.cc @@ -12,15 +12,15 @@ #include // For std::pair, std::move. #include "webrtc/api/ortc/ortcfactoryinterface.h" -#include "webrtc/base/criticalsection.h" -#include "webrtc/base/fakenetwork.h" -#include "webrtc/base/gunit.h" -#include "webrtc/base/virtualsocketserver.h" #include "webrtc/ortc/testrtpparameters.h" #include "webrtc/p2p/base/udptransport.h" #include "webrtc/pc/test/fakeaudiocapturemodule.h" #include "webrtc/pc/test/fakeperiodicvideocapturer.h" #include "webrtc/pc/test/fakevideotrackrenderer.h" +#include "webrtc/rtc_base/criticalsection.h" +#include "webrtc/rtc_base/fakenetwork.h" +#include "webrtc/rtc_base/gunit.h" +#include "webrtc/rtc_base/virtualsocketserver.h" namespace { diff --git a/webrtc/ortc/ortcfactory_unittest.cc b/webrtc/ortc/ortcfactory_unittest.cc index da1758b70a..d964383321 100644 --- a/webrtc/ortc/ortcfactory_unittest.cc +++ b/webrtc/ortc/ortcfactory_unittest.cc @@ -10,13 +10,13 @@ #include -#include "webrtc/base/fakenetwork.h" -#include "webrtc/base/gunit.h" -#include "webrtc/base/virtualsocketserver.h" #include "webrtc/media/base/fakemediaengine.h" #include "webrtc/ortc/ortcfactory.h" #include "webrtc/ortc/testrtpparameters.h" #include "webrtc/p2p/base/fakepackettransport.h" +#include "webrtc/rtc_base/fakenetwork.h" +#include "webrtc/rtc_base/gunit.h" +#include "webrtc/rtc_base/virtualsocketserver.h" namespace webrtc { diff --git a/webrtc/ortc/ortcrtpreceiver_unittest.cc b/webrtc/ortc/ortcrtpreceiver_unittest.cc index aa7d81d420..8273be58c6 100644 --- a/webrtc/ortc/ortcrtpreceiver_unittest.cc +++ b/webrtc/ortc/ortcrtpreceiver_unittest.cc @@ -10,12 +10,12 @@ #include -#include "webrtc/base/gunit.h" #include "webrtc/media/base/fakemediaengine.h" #include "webrtc/ortc/ortcfactory.h" #include "webrtc/ortc/testrtpparameters.h" #include "webrtc/p2p/base/fakepackettransport.h" #include "webrtc/pc/test/fakevideotracksource.h" +#include "webrtc/rtc_base/gunit.h" namespace webrtc { diff --git a/webrtc/ortc/ortcrtpreceiveradapter.cc b/webrtc/ortc/ortcrtpreceiveradapter.cc index aefa4d313f..4e8c89b3bf 100644 --- a/webrtc/ortc/ortcrtpreceiveradapter.cc +++ b/webrtc/ortc/ortcrtpreceiveradapter.cc @@ -12,10 +12,10 @@ #include -#include "webrtc/base/checks.h" -#include "webrtc/base/helpers.h" // For "CreateRandomX". #include "webrtc/media/base/mediaconstants.h" #include "webrtc/ortc/rtptransportadapter.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/helpers.h" // For "CreateRandomX". namespace { diff --git a/webrtc/ortc/ortcrtpreceiveradapter.h b/webrtc/ortc/ortcrtpreceiveradapter.h index 8e081e7547..2fb793fb16 100644 --- a/webrtc/ortc/ortcrtpreceiveradapter.h +++ b/webrtc/ortc/ortcrtpreceiveradapter.h @@ -16,11 +16,11 @@ #include "webrtc/api/ortc/ortcrtpreceiverinterface.h" #include "webrtc/api/rtcerror.h" #include "webrtc/api/rtpparameters.h" -#include "webrtc/base/constructormagic.h" -#include "webrtc/base/sigslot.h" -#include "webrtc/base/thread.h" #include "webrtc/ortc/rtptransportcontrolleradapter.h" #include "webrtc/pc/rtpreceiver.h" +#include "webrtc/rtc_base/constructormagic.h" +#include "webrtc/rtc_base/sigslot.h" +#include "webrtc/rtc_base/thread.h" namespace webrtc { diff --git a/webrtc/ortc/ortcrtpsender_unittest.cc b/webrtc/ortc/ortcrtpsender_unittest.cc index 47cb337cb5..ab8d821468 100644 --- a/webrtc/ortc/ortcrtpsender_unittest.cc +++ b/webrtc/ortc/ortcrtpsender_unittest.cc @@ -10,12 +10,12 @@ #include -#include "webrtc/base/gunit.h" #include "webrtc/media/base/fakemediaengine.h" #include "webrtc/ortc/ortcfactory.h" #include "webrtc/ortc/testrtpparameters.h" #include "webrtc/p2p/base/fakepackettransport.h" #include "webrtc/pc/test/fakevideotracksource.h" +#include "webrtc/rtc_base/gunit.h" namespace webrtc { diff --git a/webrtc/ortc/ortcrtpsenderadapter.cc b/webrtc/ortc/ortcrtpsenderadapter.cc index be2b65dac3..0bce591942 100644 --- a/webrtc/ortc/ortcrtpsenderadapter.cc +++ b/webrtc/ortc/ortcrtpsenderadapter.cc @@ -12,9 +12,9 @@ #include -#include "webrtc/base/checks.h" #include "webrtc/media/base/mediaconstants.h" #include "webrtc/ortc/rtptransportadapter.h" +#include "webrtc/rtc_base/checks.h" namespace { diff --git a/webrtc/ortc/ortcrtpsenderadapter.h b/webrtc/ortc/ortcrtpsenderadapter.h index 9b60f15300..92051e7307 100644 --- a/webrtc/ortc/ortcrtpsenderadapter.h +++ b/webrtc/ortc/ortcrtpsenderadapter.h @@ -16,10 +16,10 @@ #include "webrtc/api/ortc/ortcrtpsenderinterface.h" #include "webrtc/api/rtcerror.h" #include "webrtc/api/rtpparameters.h" -#include "webrtc/base/constructormagic.h" -#include "webrtc/base/sigslot.h" #include "webrtc/ortc/rtptransportcontrolleradapter.h" #include "webrtc/pc/rtpsender.h" +#include "webrtc/rtc_base/constructormagic.h" +#include "webrtc/rtc_base/sigslot.h" namespace webrtc { diff --git a/webrtc/ortc/rtpparametersconversion.h b/webrtc/ortc/rtpparametersconversion.h index d2c91299ef..fe183da127 100644 --- a/webrtc/ortc/rtpparametersconversion.h +++ b/webrtc/ortc/rtpparametersconversion.h @@ -16,9 +16,9 @@ #include "webrtc/api/rtcerror.h" #include "webrtc/api/rtpparameters.h" -#include "webrtc/base/optional.h" #include "webrtc/media/base/codec.h" #include "webrtc/pc/mediasession.h" +#include "webrtc/rtc_base/optional.h" namespace webrtc { diff --git a/webrtc/ortc/rtpparametersconversion_unittest.cc b/webrtc/ortc/rtpparametersconversion_unittest.cc index 32684060c5..f6e48a9cbe 100644 --- a/webrtc/ortc/rtpparametersconversion_unittest.cc +++ b/webrtc/ortc/rtpparametersconversion_unittest.cc @@ -10,9 +10,9 @@ #include -#include "webrtc/base/gunit.h" #include "webrtc/ortc/rtpparametersconversion.h" #include "webrtc/ortc/testrtpparameters.h" +#include "webrtc/rtc_base/gunit.h" namespace webrtc { diff --git a/webrtc/ortc/rtptransport_unittest.cc b/webrtc/ortc/rtptransport_unittest.cc index 6d162301be..2fc1b23586 100644 --- a/webrtc/ortc/rtptransport_unittest.cc +++ b/webrtc/ortc/rtptransport_unittest.cc @@ -10,11 +10,11 @@ #include -#include "webrtc/base/gunit.h" #include "webrtc/media/base/fakemediaengine.h" #include "webrtc/ortc/ortcfactory.h" #include "webrtc/ortc/testrtpparameters.h" #include "webrtc/p2p/base/fakepackettransport.h" +#include "webrtc/rtc_base/gunit.h" namespace webrtc { diff --git a/webrtc/ortc/rtptransportadapter.cc b/webrtc/ortc/rtptransportadapter.cc index 3982f2d5f7..1154ff629b 100644 --- a/webrtc/ortc/rtptransportadapter.cc +++ b/webrtc/ortc/rtptransportadapter.cc @@ -16,7 +16,7 @@ #include // For std::move. #include "webrtc/api/proxy.h" -#include "webrtc/base/logging.h" +#include "webrtc/rtc_base/logging.h" namespace webrtc { diff --git a/webrtc/ortc/rtptransportadapter.h b/webrtc/ortc/rtptransportadapter.h index 59a123efae..6fbc162e99 100644 --- a/webrtc/ortc/rtptransportadapter.h +++ b/webrtc/ortc/rtptransportadapter.h @@ -16,11 +16,11 @@ #include "webrtc/api/ortc/srtptransportinterface.h" #include "webrtc/api/rtcerror.h" -#include "webrtc/base/constructormagic.h" -#include "webrtc/base/sigslot.h" #include "webrtc/media/base/streamparams.h" #include "webrtc/ortc/rtptransportcontrolleradapter.h" #include "webrtc/pc/channel.h" +#include "webrtc/rtc_base/constructormagic.h" +#include "webrtc/rtc_base/sigslot.h" namespace webrtc { diff --git a/webrtc/ortc/rtptransportcontroller_unittest.cc b/webrtc/ortc/rtptransportcontroller_unittest.cc index 40e9851d24..56bf8a6adc 100644 --- a/webrtc/ortc/rtptransportcontroller_unittest.cc +++ b/webrtc/ortc/rtptransportcontroller_unittest.cc @@ -10,11 +10,11 @@ #include -#include "webrtc/base/gunit.h" #include "webrtc/media/base/fakemediaengine.h" #include "webrtc/ortc/ortcfactory.h" #include "webrtc/ortc/testrtpparameters.h" #include "webrtc/p2p/base/fakepackettransport.h" +#include "webrtc/rtc_base/gunit.h" namespace webrtc { diff --git a/webrtc/ortc/rtptransportcontrolleradapter.cc b/webrtc/ortc/rtptransportcontrolleradapter.cc index b482e475fd..5e0b621123 100644 --- a/webrtc/ortc/rtptransportcontrolleradapter.cc +++ b/webrtc/ortc/rtptransportcontrolleradapter.cc @@ -17,12 +17,12 @@ #include // For std::move. #include "webrtc/api/proxy.h" -#include "webrtc/base/checks.h" #include "webrtc/media/base/mediaconstants.h" #include "webrtc/ortc/ortcrtpreceiveradapter.h" #include "webrtc/ortc/ortcrtpsenderadapter.h" #include "webrtc/ortc/rtpparametersconversion.h" #include "webrtc/ortc/rtptransportadapter.h" +#include "webrtc/rtc_base/checks.h" namespace webrtc { diff --git a/webrtc/ortc/rtptransportcontrolleradapter.h b/webrtc/ortc/rtptransportcontrolleradapter.h index 8601dfdb07..9728c3968a 100644 --- a/webrtc/ortc/rtptransportcontrolleradapter.h +++ b/webrtc/ortc/rtptransportcontrolleradapter.h @@ -20,13 +20,13 @@ #include "webrtc/api/ortc/ortcrtpsenderinterface.h" #include "webrtc/api/ortc/rtptransportcontrollerinterface.h" #include "webrtc/api/ortc/srtptransportinterface.h" -#include "webrtc/base/constructormagic.h" -#include "webrtc/base/sigslot.h" -#include "webrtc/base/thread.h" #include "webrtc/call/call.h" #include "webrtc/logging/rtc_event_log/rtc_event_log.h" #include "webrtc/media/base/mediachannel.h" // For MediaConfig. #include "webrtc/pc/channelmanager.h" +#include "webrtc/rtc_base/constructormagic.h" +#include "webrtc/rtc_base/sigslot.h" +#include "webrtc/rtc_base/thread.h" namespace webrtc { diff --git a/webrtc/ortc/srtptransport_unittest.cc b/webrtc/ortc/srtptransport_unittest.cc index 1287a0257c..69d8a297e9 100644 --- a/webrtc/ortc/srtptransport_unittest.cc +++ b/webrtc/ortc/srtptransport_unittest.cc @@ -10,11 +10,11 @@ #include -#include "webrtc/base/gunit.h" #include "webrtc/media/base/fakemediaengine.h" #include "webrtc/ortc/ortcfactory.h" #include "webrtc/ortc/testrtpparameters.h" #include "webrtc/p2p/base/fakepackettransport.h" +#include "webrtc/rtc_base/gunit.h" namespace webrtc { diff --git a/webrtc/p2p/base/asyncstuntcpsocket.cc b/webrtc/p2p/base/asyncstuntcpsocket.cc index 3369bc8b48..38dd65bb4c 100644 --- a/webrtc/p2p/base/asyncstuntcpsocket.cc +++ b/webrtc/p2p/base/asyncstuntcpsocket.cc @@ -13,8 +13,8 @@ #include #include "webrtc/p2p/base/stun.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/logging.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/logging.h" namespace cricket { diff --git a/webrtc/p2p/base/asyncstuntcpsocket.h b/webrtc/p2p/base/asyncstuntcpsocket.h index 065b4c259b..b578f3109b 100644 --- a/webrtc/p2p/base/asyncstuntcpsocket.h +++ b/webrtc/p2p/base/asyncstuntcpsocket.h @@ -11,9 +11,9 @@ #ifndef WEBRTC_P2P_BASE_ASYNCSTUNTCPSOCKET_H_ #define WEBRTC_P2P_BASE_ASYNCSTUNTCPSOCKET_H_ -#include "webrtc/base/asynctcpsocket.h" -#include "webrtc/base/constructormagic.h" -#include "webrtc/base/socketfactory.h" +#include "webrtc/rtc_base/asynctcpsocket.h" +#include "webrtc/rtc_base/constructormagic.h" +#include "webrtc/rtc_base/socketfactory.h" namespace cricket { diff --git a/webrtc/p2p/base/asyncstuntcpsocket_unittest.cc b/webrtc/p2p/base/asyncstuntcpsocket_unittest.cc index 61e14117c9..5dd9661056 100644 --- a/webrtc/p2p/base/asyncstuntcpsocket_unittest.cc +++ b/webrtc/p2p/base/asyncstuntcpsocket_unittest.cc @@ -11,9 +11,9 @@ #include #include "webrtc/p2p/base/asyncstuntcpsocket.h" -#include "webrtc/base/asyncsocket.h" -#include "webrtc/base/gunit.h" -#include "webrtc/base/virtualsocketserver.h" +#include "webrtc/rtc_base/asyncsocket.h" +#include "webrtc/rtc_base/gunit.h" +#include "webrtc/rtc_base/virtualsocketserver.h" namespace cricket { diff --git a/webrtc/p2p/base/basicpacketsocketfactory.cc b/webrtc/p2p/base/basicpacketsocketfactory.cc index b78a0541ce..e911f2fe22 100644 --- a/webrtc/p2p/base/basicpacketsocketfactory.cc +++ b/webrtc/p2p/base/basicpacketsocketfactory.cc @@ -14,15 +14,15 @@ #include "webrtc/p2p/base/asyncstuntcpsocket.h" #include "webrtc/p2p/base/stun.h" -#include "webrtc/base/asynctcpsocket.h" -#include "webrtc/base/asyncudpsocket.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/nethelpers.h" -#include "webrtc/base/physicalsocketserver.h" -#include "webrtc/base/socketadapters.h" -#include "webrtc/base/ssladapter.h" -#include "webrtc/base/thread.h" +#include "webrtc/rtc_base/asynctcpsocket.h" +#include "webrtc/rtc_base/asyncudpsocket.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/nethelpers.h" +#include "webrtc/rtc_base/physicalsocketserver.h" +#include "webrtc/rtc_base/socketadapters.h" +#include "webrtc/rtc_base/ssladapter.h" +#include "webrtc/rtc_base/thread.h" namespace rtc { diff --git a/webrtc/p2p/base/candidate.h b/webrtc/p2p/base/candidate.h index 723dbc9f47..474d7fb4d3 100644 --- a/webrtc/p2p/base/candidate.h +++ b/webrtc/p2p/base/candidate.h @@ -21,10 +21,10 @@ #include #include "webrtc/p2p/base/p2pconstants.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/helpers.h" -#include "webrtc/base/network.h" -#include "webrtc/base/socketaddress.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/helpers.h" +#include "webrtc/rtc_base/network.h" +#include "webrtc/rtc_base/socketaddress.h" namespace cricket { diff --git a/webrtc/p2p/base/common.h b/webrtc/p2p/base/common.h index 8a3178c801..5dbe491f09 100644 --- a/webrtc/p2p/base/common.h +++ b/webrtc/p2p/base/common.h @@ -11,7 +11,7 @@ #ifndef WEBRTC_P2P_BASE_COMMON_H_ #define WEBRTC_P2P_BASE_COMMON_H_ -#include "webrtc/base/logging.h" +#include "webrtc/rtc_base/logging.h" // Common log description format for jingle messages #define LOG_J(sev, obj) LOG(sev) << "Jingle:" << obj->ToString() << ": " diff --git a/webrtc/p2p/base/dtlstransportchannel.cc b/webrtc/p2p/base/dtlstransportchannel.cc index f5d658340b..4249ae7e93 100644 --- a/webrtc/p2p/base/dtlstransportchannel.cc +++ b/webrtc/p2p/base/dtlstransportchannel.cc @@ -15,13 +15,13 @@ #include "webrtc/p2p/base/common.h" #include "webrtc/p2p/base/packettransportinternal.h" -#include "webrtc/base/buffer.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/dscp.h" -#include "webrtc/base/messagequeue.h" -#include "webrtc/base/sslstreamadapter.h" -#include "webrtc/base/stream.h" -#include "webrtc/base/thread.h" +#include "webrtc/rtc_base/buffer.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/dscp.h" +#include "webrtc/rtc_base/messagequeue.h" +#include "webrtc/rtc_base/sslstreamadapter.h" +#include "webrtc/rtc_base/stream.h" +#include "webrtc/rtc_base/thread.h" namespace cricket { diff --git a/webrtc/p2p/base/dtlstransportchannel.h b/webrtc/p2p/base/dtlstransportchannel.h index 30a7186b7f..12b94ce032 100644 --- a/webrtc/p2p/base/dtlstransportchannel.h +++ b/webrtc/p2p/base/dtlstransportchannel.h @@ -15,13 +15,13 @@ #include #include -#include "webrtc/base/buffer.h" -#include "webrtc/base/bufferqueue.h" -#include "webrtc/base/constructormagic.h" -#include "webrtc/base/sslstreamadapter.h" -#include "webrtc/base/stream.h" #include "webrtc/p2p/base/dtlstransportinternal.h" #include "webrtc/p2p/base/icetransportinternal.h" +#include "webrtc/rtc_base/buffer.h" +#include "webrtc/rtc_base/bufferqueue.h" +#include "webrtc/rtc_base/constructormagic.h" +#include "webrtc/rtc_base/sslstreamadapter.h" +#include "webrtc/rtc_base/stream.h" namespace rtc { class PacketTransportInternal; diff --git a/webrtc/p2p/base/dtlstransportchannel_unittest.cc b/webrtc/p2p/base/dtlstransportchannel_unittest.cc index 4286d76be3..225d6f7d24 100644 --- a/webrtc/p2p/base/dtlstransportchannel_unittest.cc +++ b/webrtc/p2p/base/dtlstransportchannel_unittest.cc @@ -14,14 +14,14 @@ #include "webrtc/p2p/base/dtlstransportchannel.h" #include "webrtc/p2p/base/fakeicetransport.h" #include "webrtc/p2p/base/packettransportinternal.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/dscp.h" -#include "webrtc/base/gunit.h" -#include "webrtc/base/helpers.h" -#include "webrtc/base/ssladapter.h" -#include "webrtc/base/sslidentity.h" -#include "webrtc/base/sslstreamadapter.h" -#include "webrtc/base/stringutils.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/dscp.h" +#include "webrtc/rtc_base/gunit.h" +#include "webrtc/rtc_base/helpers.h" +#include "webrtc/rtc_base/ssladapter.h" +#include "webrtc/rtc_base/sslidentity.h" +#include "webrtc/rtc_base/sslstreamadapter.h" +#include "webrtc/rtc_base/stringutils.h" #define MAYBE_SKIP_TEST(feature) \ if (!(rtc::SSLStreamAdapter::feature())) { \ diff --git a/webrtc/p2p/base/dtlstransportinternal.h b/webrtc/p2p/base/dtlstransportinternal.h index 448dd49251..b77ae077bb 100644 --- a/webrtc/p2p/base/dtlstransportinternal.h +++ b/webrtc/p2p/base/dtlstransportinternal.h @@ -15,11 +15,11 @@ #include #include -#include "webrtc/base/sslstreamadapter.h" -#include "webrtc/base/stringencode.h" #include "webrtc/p2p/base/icetransportinternal.h" #include "webrtc/p2p/base/jseptransport.h" #include "webrtc/p2p/base/packettransportinternal.h" +#include "webrtc/rtc_base/sslstreamadapter.h" +#include "webrtc/rtc_base/stringencode.h" namespace cricket { diff --git a/webrtc/p2p/base/fakedtlstransport.h b/webrtc/p2p/base/fakedtlstransport.h index 0384f00a40..e78c7fc76c 100644 --- a/webrtc/p2p/base/fakedtlstransport.h +++ b/webrtc/p2p/base/fakedtlstransport.h @@ -15,9 +15,9 @@ #include #include -#include "webrtc/base/fakesslidentity.h" #include "webrtc/p2p/base/dtlstransportinternal.h" #include "webrtc/p2p/base/fakeicetransport.h" +#include "webrtc/rtc_base/fakesslidentity.h" namespace cricket { diff --git a/webrtc/p2p/base/fakeicetransport.h b/webrtc/p2p/base/fakeicetransport.h index 2b0662f856..d9c8485063 100644 --- a/webrtc/p2p/base/fakeicetransport.h +++ b/webrtc/p2p/base/fakeicetransport.h @@ -13,9 +13,9 @@ #include -#include "webrtc/base/asyncinvoker.h" -#include "webrtc/base/copyonwritebuffer.h" #include "webrtc/p2p/base/icetransportinternal.h" +#include "webrtc/rtc_base/asyncinvoker.h" +#include "webrtc/rtc_base/copyonwritebuffer.h" namespace cricket { diff --git a/webrtc/p2p/base/fakepackettransport.h b/webrtc/p2p/base/fakepackettransport.h index 64e0f7d5a8..16af9a42ae 100644 --- a/webrtc/p2p/base/fakepackettransport.h +++ b/webrtc/p2p/base/fakepackettransport.h @@ -14,9 +14,9 @@ #include #include "webrtc/api/ortc/packettransportinterface.h" -#include "webrtc/base/asyncinvoker.h" -#include "webrtc/base/copyonwritebuffer.h" #include "webrtc/p2p/base/packettransportinternal.h" +#include "webrtc/rtc_base/asyncinvoker.h" +#include "webrtc/rtc_base/copyonwritebuffer.h" namespace rtc { diff --git a/webrtc/p2p/base/fakeportallocator.h b/webrtc/p2p/base/fakeportallocator.h index a1dbbf872b..7bf7f969bb 100644 --- a/webrtc/p2p/base/fakeportallocator.h +++ b/webrtc/p2p/base/fakeportallocator.h @@ -15,10 +15,10 @@ #include #include -#include "webrtc/base/nethelpers.h" #include "webrtc/p2p/base/basicpacketsocketfactory.h" #include "webrtc/p2p/base/portallocator.h" #include "webrtc/p2p/base/udpport.h" +#include "webrtc/rtc_base/nethelpers.h" namespace rtc { class SocketFactory; diff --git a/webrtc/p2p/base/faketransportcontroller.h b/webrtc/p2p/base/faketransportcontroller.h index 9a696bca5a..0c784754a6 100644 --- a/webrtc/p2p/base/faketransportcontroller.h +++ b/webrtc/p2p/base/faketransportcontroller.h @@ -15,12 +15,12 @@ #include #include -#include "webrtc/base/bind.h" -#include "webrtc/base/sslfingerprint.h" -#include "webrtc/base/thread.h" #include "webrtc/p2p/base/fakedtlstransport.h" #include "webrtc/p2p/base/fakeicetransport.h" #include "webrtc/p2p/base/transportcontroller.h" +#include "webrtc/rtc_base/bind.h" +#include "webrtc/rtc_base/sslfingerprint.h" +#include "webrtc/rtc_base/thread.h" namespace cricket { diff --git a/webrtc/p2p/base/icetransportinternal.h b/webrtc/p2p/base/icetransportinternal.h index e9b40dc2bb..435a081161 100644 --- a/webrtc/p2p/base/icetransportinternal.h +++ b/webrtc/p2p/base/icetransportinternal.h @@ -13,12 +13,12 @@ #include -#include "webrtc/base/stringencode.h" #include "webrtc/p2p/base/candidate.h" #include "webrtc/p2p/base/candidatepairinterface.h" #include "webrtc/p2p/base/jseptransport.h" #include "webrtc/p2p/base/packettransportinternal.h" #include "webrtc/p2p/base/transportdescription.h" +#include "webrtc/rtc_base/stringencode.h" namespace webrtc { class MetricsObserverInterface; diff --git a/webrtc/p2p/base/jseptransport.cc b/webrtc/p2p/base/jseptransport.cc index 301ae24003..a8f4564423 100644 --- a/webrtc/p2p/base/jseptransport.cc +++ b/webrtc/p2p/base/jseptransport.cc @@ -13,14 +13,14 @@ #include #include // for std::pair -#include "webrtc/base/bind.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/logging.h" #include "webrtc/p2p/base/candidate.h" #include "webrtc/p2p/base/dtlstransportchannel.h" #include "webrtc/p2p/base/p2pconstants.h" #include "webrtc/p2p/base/p2ptransportchannel.h" #include "webrtc/p2p/base/port.h" +#include "webrtc/rtc_base/bind.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/logging.h" namespace cricket { diff --git a/webrtc/p2p/base/jseptransport.h b/webrtc/p2p/base/jseptransport.h index 7b81be06f6..9353cd7d07 100644 --- a/webrtc/p2p/base/jseptransport.h +++ b/webrtc/p2p/base/jseptransport.h @@ -16,16 +16,16 @@ #include #include -#include "webrtc/base/constructormagic.h" -#include "webrtc/base/messagequeue.h" -#include "webrtc/base/optional.h" -#include "webrtc/base/rtccertificate.h" -#include "webrtc/base/sigslot.h" -#include "webrtc/base/sslstreamadapter.h" #include "webrtc/p2p/base/candidate.h" #include "webrtc/p2p/base/p2pconstants.h" #include "webrtc/p2p/base/sessiondescription.h" #include "webrtc/p2p/base/transportinfo.h" +#include "webrtc/rtc_base/constructormagic.h" +#include "webrtc/rtc_base/messagequeue.h" +#include "webrtc/rtc_base/optional.h" +#include "webrtc/rtc_base/rtccertificate.h" +#include "webrtc/rtc_base/sigslot.h" +#include "webrtc/rtc_base/sslstreamadapter.h" namespace cricket { diff --git a/webrtc/p2p/base/jseptransport_unittest.cc b/webrtc/p2p/base/jseptransport_unittest.cc index 23ed4d857d..56b61eca3b 100644 --- a/webrtc/p2p/base/jseptransport_unittest.cc +++ b/webrtc/p2p/base/jseptransport_unittest.cc @@ -10,11 +10,11 @@ #include -#include "webrtc/base/fakesslidentity.h" -#include "webrtc/base/gunit.h" -#include "webrtc/base/network.h" #include "webrtc/p2p/base/fakedtlstransport.h" #include "webrtc/p2p/base/fakeicetransport.h" +#include "webrtc/rtc_base/fakesslidentity.h" +#include "webrtc/rtc_base/gunit.h" +#include "webrtc/rtc_base/network.h" using cricket::JsepTransport; using cricket::TransportChannel; diff --git a/webrtc/p2p/base/mockicetransport.h b/webrtc/p2p/base/mockicetransport.h index 53549abe86..92d0373fc9 100644 --- a/webrtc/p2p/base/mockicetransport.h +++ b/webrtc/p2p/base/mockicetransport.h @@ -15,8 +15,8 @@ #include #include -#include "webrtc/base/gunit.h" #include "webrtc/p2p/base/icetransportinternal.h" +#include "webrtc/rtc_base/gunit.h" #include "webrtc/test/gmock.h" using testing::_; diff --git a/webrtc/p2p/base/p2ptransportchannel.cc b/webrtc/p2p/base/p2ptransportchannel.cc index 8853ccaa2f..78b4c938d4 100644 --- a/webrtc/p2p/base/p2ptransportchannel.cc +++ b/webrtc/p2p/base/p2ptransportchannel.cc @@ -15,15 +15,15 @@ #include #include "webrtc/api/umametrics.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/crc32.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/stringencode.h" #include "webrtc/p2p/base/candidate.h" #include "webrtc/p2p/base/candidatepairinterface.h" #include "webrtc/p2p/base/common.h" #include "webrtc/p2p/base/relayport.h" // For RELAY_PORT_TYPE. #include "webrtc/p2p/base/stunport.h" // For STUN_PORT_TYPE. +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/crc32.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/stringencode.h" #include "webrtc/system_wrappers/include/field_trial.h" namespace { diff --git a/webrtc/p2p/base/p2ptransportchannel.h b/webrtc/p2p/base/p2ptransportchannel.h index a535edd532..beca558eae 100644 --- a/webrtc/p2p/base/p2ptransportchannel.h +++ b/webrtc/p2p/base/p2ptransportchannel.h @@ -26,14 +26,14 @@ #include #include -#include "webrtc/base/asyncpacketsocket.h" -#include "webrtc/base/constructormagic.h" -#include "webrtc/base/sigslot.h" #include "webrtc/p2p/base/candidate.h" #include "webrtc/p2p/base/candidatepairinterface.h" #include "webrtc/p2p/base/icetransportinternal.h" #include "webrtc/p2p/base/portallocator.h" #include "webrtc/p2p/base/portinterface.h" +#include "webrtc/rtc_base/asyncpacketsocket.h" +#include "webrtc/rtc_base/constructormagic.h" +#include "webrtc/rtc_base/sigslot.h" namespace cricket { diff --git a/webrtc/p2p/base/p2ptransportchannel_unittest.cc b/webrtc/p2p/base/p2ptransportchannel_unittest.cc index b829a593b0..7b3fa6aafe 100644 --- a/webrtc/p2p/base/p2ptransportchannel_unittest.cc +++ b/webrtc/p2p/base/p2ptransportchannel_unittest.cc @@ -12,22 +12,6 @@ #include #include "webrtc/api/fakemetricsobserver.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/dscp.h" -#include "webrtc/base/fakeclock.h" -#include "webrtc/base/fakenetwork.h" -#include "webrtc/base/firewallsocketserver.h" -#include "webrtc/base/gunit.h" -#include "webrtc/base/helpers.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/natserver.h" -#include "webrtc/base/natsocketfactory.h" -#include "webrtc/base/proxyserver.h" -#include "webrtc/base/ptr_util.h" -#include "webrtc/base/socketaddress.h" -#include "webrtc/base/ssladapter.h" -#include "webrtc/base/thread.h" -#include "webrtc/base/virtualsocketserver.h" #include "webrtc/p2p/base/fakeportallocator.h" #include "webrtc/p2p/base/icetransportinternal.h" #include "webrtc/p2p/base/p2ptransportchannel.h" @@ -36,6 +20,22 @@ #include "webrtc/p2p/base/teststunserver.h" #include "webrtc/p2p/base/testturnserver.h" #include "webrtc/p2p/client/basicportallocator.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/dscp.h" +#include "webrtc/rtc_base/fakeclock.h" +#include "webrtc/rtc_base/fakenetwork.h" +#include "webrtc/rtc_base/firewallsocketserver.h" +#include "webrtc/rtc_base/gunit.h" +#include "webrtc/rtc_base/helpers.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/natserver.h" +#include "webrtc/rtc_base/natsocketfactory.h" +#include "webrtc/rtc_base/proxyserver.h" +#include "webrtc/rtc_base/ptr_util.h" +#include "webrtc/rtc_base/socketaddress.h" +#include "webrtc/rtc_base/ssladapter.h" +#include "webrtc/rtc_base/thread.h" +#include "webrtc/rtc_base/virtualsocketserver.h" namespace { diff --git a/webrtc/p2p/base/packetlossestimator.cc b/webrtc/p2p/base/packetlossestimator.cc index 7dcd5b9f4e..7990119c1a 100644 --- a/webrtc/p2p/base/packetlossestimator.cc +++ b/webrtc/p2p/base/packetlossestimator.cc @@ -12,7 +12,7 @@ #include "webrtc/p2p/base/packetlossestimator.h" -#include "webrtc/base/checks.h" +#include "webrtc/rtc_base/checks.h" namespace cricket { diff --git a/webrtc/p2p/base/packetlossestimator_unittest.cc b/webrtc/p2p/base/packetlossestimator_unittest.cc index 44cfdbf169..642dcc2e0a 100644 --- a/webrtc/p2p/base/packetlossestimator_unittest.cc +++ b/webrtc/p2p/base/packetlossestimator_unittest.cc @@ -10,8 +10,8 @@ #include -#include "webrtc/base/gunit.h" #include "webrtc/p2p/base/packetlossestimator.h" +#include "webrtc/rtc_base/gunit.h" using cricket::PacketLossEstimator; diff --git a/webrtc/p2p/base/packetsocketfactory.h b/webrtc/p2p/base/packetsocketfactory.h index c3b2417526..60f0ae0580 100644 --- a/webrtc/p2p/base/packetsocketfactory.h +++ b/webrtc/p2p/base/packetsocketfactory.h @@ -11,8 +11,8 @@ #ifndef WEBRTC_P2P_BASE_PACKETSOCKETFACTORY_H_ #define WEBRTC_P2P_BASE_PACKETSOCKETFACTORY_H_ -#include "webrtc/base/constructormagic.h" -#include "webrtc/base/proxyinfo.h" +#include "webrtc/rtc_base/constructormagic.h" +#include "webrtc/rtc_base/proxyinfo.h" namespace rtc { diff --git a/webrtc/p2p/base/packettransportinternal.h b/webrtc/p2p/base/packettransportinternal.h index 8e32f72480..3dc27d58fd 100644 --- a/webrtc/p2p/base/packettransportinternal.h +++ b/webrtc/p2p/base/packettransportinternal.h @@ -16,9 +16,9 @@ // This is included for PacketOptions. #include "webrtc/api/ortc/packettransportinterface.h" -#include "webrtc/base/asyncpacketsocket.h" -#include "webrtc/base/sigslot.h" -#include "webrtc/base/socket.h" +#include "webrtc/rtc_base/asyncpacketsocket.h" +#include "webrtc/rtc_base/sigslot.h" +#include "webrtc/rtc_base/socket.h" namespace cricket { class TransportChannel; diff --git a/webrtc/p2p/base/port.cc b/webrtc/p2p/base/port.cc index 3a3d9ead8b..a1016332de 100644 --- a/webrtc/p2p/base/port.cc +++ b/webrtc/p2p/base/port.cc @@ -13,19 +13,19 @@ #include #include -#include "webrtc/base/base64.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/crc32.h" -#include "webrtc/base/helpers.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/messagedigest.h" -#include "webrtc/base/network.h" -#include "webrtc/base/ptr_util.h" -#include "webrtc/base/safe_minmax.h" -#include "webrtc/base/stringencode.h" -#include "webrtc/base/stringutils.h" #include "webrtc/p2p/base/common.h" #include "webrtc/p2p/base/portallocator.h" +#include "webrtc/rtc_base/base64.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/crc32.h" +#include "webrtc/rtc_base/helpers.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/messagedigest.h" +#include "webrtc/rtc_base/network.h" +#include "webrtc/rtc_base/ptr_util.h" +#include "webrtc/rtc_base/safe_minmax.h" +#include "webrtc/rtc_base/stringencode.h" +#include "webrtc/rtc_base/stringutils.h" namespace { diff --git a/webrtc/p2p/base/port.h b/webrtc/p2p/base/port.h index fd6d18290b..5764738508 100644 --- a/webrtc/p2p/base/port.h +++ b/webrtc/p2p/base/port.h @@ -17,15 +17,6 @@ #include #include -#include "webrtc/base/asyncpacketsocket.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/network.h" -#include "webrtc/base/optional.h" -#include "webrtc/base/proxyinfo.h" -#include "webrtc/base/ratetracker.h" -#include "webrtc/base/sigslot.h" -#include "webrtc/base/socketaddress.h" -#include "webrtc/base/thread.h" #include "webrtc/p2p/base/candidate.h" #include "webrtc/p2p/base/candidatepairinterface.h" #include "webrtc/p2p/base/jseptransport.h" @@ -34,6 +25,15 @@ #include "webrtc/p2p/base/portinterface.h" #include "webrtc/p2p/base/stun.h" #include "webrtc/p2p/base/stunrequest.h" +#include "webrtc/rtc_base/asyncpacketsocket.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/network.h" +#include "webrtc/rtc_base/optional.h" +#include "webrtc/rtc_base/proxyinfo.h" +#include "webrtc/rtc_base/ratetracker.h" +#include "webrtc/rtc_base/sigslot.h" +#include "webrtc/rtc_base/socketaddress.h" +#include "webrtc/rtc_base/thread.h" namespace cricket { diff --git a/webrtc/p2p/base/port_unittest.cc b/webrtc/p2p/base/port_unittest.cc index a95bc2b065..eb547605c9 100644 --- a/webrtc/p2p/base/port_unittest.cc +++ b/webrtc/p2p/base/port_unittest.cc @@ -10,20 +10,6 @@ #include -#include "webrtc/base/arraysize.h" -#include "webrtc/base/buffer.h" -#include "webrtc/base/crc32.h" -#include "webrtc/base/gunit.h" -#include "webrtc/base/helpers.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/natserver.h" -#include "webrtc/base/natsocketfactory.h" -#include "webrtc/base/ptr_util.h" -#include "webrtc/base/socketaddress.h" -#include "webrtc/base/ssladapter.h" -#include "webrtc/base/stringutils.h" -#include "webrtc/base/thread.h" -#include "webrtc/base/virtualsocketserver.h" #include "webrtc/p2p/base/basicpacketsocketfactory.h" #include "webrtc/p2p/base/jseptransport.h" #include "webrtc/p2p/base/relayport.h" @@ -33,6 +19,20 @@ #include "webrtc/p2p/base/teststunserver.h" #include "webrtc/p2p/base/testturnserver.h" #include "webrtc/p2p/base/turnport.h" +#include "webrtc/rtc_base/arraysize.h" +#include "webrtc/rtc_base/buffer.h" +#include "webrtc/rtc_base/crc32.h" +#include "webrtc/rtc_base/gunit.h" +#include "webrtc/rtc_base/helpers.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/natserver.h" +#include "webrtc/rtc_base/natsocketfactory.h" +#include "webrtc/rtc_base/ptr_util.h" +#include "webrtc/rtc_base/socketaddress.h" +#include "webrtc/rtc_base/ssladapter.h" +#include "webrtc/rtc_base/stringutils.h" +#include "webrtc/rtc_base/thread.h" +#include "webrtc/rtc_base/virtualsocketserver.h" using rtc::AsyncPacketSocket; using rtc::Buffer; diff --git a/webrtc/p2p/base/portallocator.cc b/webrtc/p2p/base/portallocator.cc index a587aa8970..dd776e7584 100644 --- a/webrtc/p2p/base/portallocator.cc +++ b/webrtc/p2p/base/portallocator.cc @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/base/checks.h" #include "webrtc/p2p/base/portallocator.h" +#include "webrtc/rtc_base/checks.h" namespace cricket { diff --git a/webrtc/p2p/base/portallocator.h b/webrtc/p2p/base/portallocator.h index dfbed3dd78..74b67afd9c 100644 --- a/webrtc/p2p/base/portallocator.h +++ b/webrtc/p2p/base/portallocator.h @@ -18,10 +18,10 @@ #include "webrtc/p2p/base/port.h" #include "webrtc/p2p/base/portinterface.h" -#include "webrtc/base/helpers.h" -#include "webrtc/base/proxyinfo.h" -#include "webrtc/base/sigslot.h" -#include "webrtc/base/thread.h" +#include "webrtc/rtc_base/helpers.h" +#include "webrtc/rtc_base/proxyinfo.h" +#include "webrtc/rtc_base/sigslot.h" +#include "webrtc/rtc_base/thread.h" namespace webrtc { class MetricsObserverInterface; diff --git a/webrtc/p2p/base/portallocator_unittest.cc b/webrtc/p2p/base/portallocator_unittest.cc index 3794214d95..4845f7cc93 100644 --- a/webrtc/p2p/base/portallocator_unittest.cc +++ b/webrtc/p2p/base/portallocator_unittest.cc @@ -10,11 +10,11 @@ #include -#include "webrtc/base/gunit.h" -#include "webrtc/base/thread.h" -#include "webrtc/base/virtualsocketserver.h" #include "webrtc/p2p/base/fakeportallocator.h" #include "webrtc/p2p/base/portallocator.h" +#include "webrtc/rtc_base/gunit.h" +#include "webrtc/rtc_base/thread.h" +#include "webrtc/rtc_base/virtualsocketserver.h" static const char kContentName[] = "test content"; // Based on ICE_UFRAG_LENGTH diff --git a/webrtc/p2p/base/portinterface.h b/webrtc/p2p/base/portinterface.h index 4a6e9007ed..7cb8429509 100644 --- a/webrtc/p2p/base/portinterface.h +++ b/webrtc/p2p/base/portinterface.h @@ -13,9 +13,9 @@ #include -#include "webrtc/base/asyncpacketsocket.h" -#include "webrtc/base/socketaddress.h" #include "webrtc/p2p/base/jseptransport.h" +#include "webrtc/rtc_base/asyncpacketsocket.h" +#include "webrtc/rtc_base/socketaddress.h" namespace rtc { class Network; diff --git a/webrtc/p2p/base/pseudotcp.cc b/webrtc/p2p/base/pseudotcp.cc index d93f49e394..55935e3809 100644 --- a/webrtc/p2p/base/pseudotcp.cc +++ b/webrtc/p2p/base/pseudotcp.cc @@ -17,16 +17,16 @@ #include #include -#include "webrtc/base/arraysize.h" -#include "webrtc/base/basictypes.h" -#include "webrtc/base/bytebuffer.h" -#include "webrtc/base/byteorder.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/safe_minmax.h" -#include "webrtc/base/socket.h" -#include "webrtc/base/stringutils.h" -#include "webrtc/base/timeutils.h" +#include "webrtc/rtc_base/arraysize.h" +#include "webrtc/rtc_base/basictypes.h" +#include "webrtc/rtc_base/bytebuffer.h" +#include "webrtc/rtc_base/byteorder.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/safe_minmax.h" +#include "webrtc/rtc_base/socket.h" +#include "webrtc/rtc_base/stringutils.h" +#include "webrtc/rtc_base/timeutils.h" // The following logging is for detailed (packet-level) analysis only. #define _DBG_NONE 0 diff --git a/webrtc/p2p/base/pseudotcp.h b/webrtc/p2p/base/pseudotcp.h index 6d402daa6f..134bc00578 100644 --- a/webrtc/p2p/base/pseudotcp.h +++ b/webrtc/p2p/base/pseudotcp.h @@ -13,8 +13,8 @@ #include -#include "webrtc/base/basictypes.h" -#include "webrtc/base/stream.h" +#include "webrtc/rtc_base/basictypes.h" +#include "webrtc/rtc_base/stream.h" namespace cricket { diff --git a/webrtc/p2p/base/pseudotcp_unittest.cc b/webrtc/p2p/base/pseudotcp_unittest.cc index 8fb5b38b4d..157f456573 100644 --- a/webrtc/p2p/base/pseudotcp_unittest.cc +++ b/webrtc/p2p/base/pseudotcp_unittest.cc @@ -12,12 +12,12 @@ #include #include "webrtc/p2p/base/pseudotcp.h" -#include "webrtc/base/gunit.h" -#include "webrtc/base/helpers.h" -#include "webrtc/base/messagehandler.h" -#include "webrtc/base/stream.h" -#include "webrtc/base/thread.h" -#include "webrtc/base/timeutils.h" +#include "webrtc/rtc_base/gunit.h" +#include "webrtc/rtc_base/helpers.h" +#include "webrtc/rtc_base/messagehandler.h" +#include "webrtc/rtc_base/stream.h" +#include "webrtc/rtc_base/thread.h" +#include "webrtc/rtc_base/timeutils.h" using cricket::PseudoTcp; diff --git a/webrtc/p2p/base/relayport.cc b/webrtc/p2p/base/relayport.cc index e353511f80..efb967098b 100644 --- a/webrtc/p2p/base/relayport.cc +++ b/webrtc/p2p/base/relayport.cc @@ -10,10 +10,10 @@ #include #include "webrtc/p2p/base/relayport.h" -#include "webrtc/base/asyncpacketsocket.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/helpers.h" -#include "webrtc/base/logging.h" +#include "webrtc/rtc_base/asyncpacketsocket.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/helpers.h" +#include "webrtc/rtc_base/logging.h" namespace cricket { diff --git a/webrtc/p2p/base/relayport_unittest.cc b/webrtc/p2p/base/relayport_unittest.cc index 6b91baf234..e1bed76f6f 100644 --- a/webrtc/p2p/base/relayport_unittest.cc +++ b/webrtc/p2p/base/relayport_unittest.cc @@ -13,14 +13,14 @@ #include "webrtc/p2p/base/basicpacketsocketfactory.h" #include "webrtc/p2p/base/relayport.h" #include "webrtc/p2p/base/relayserver.h" -#include "webrtc/base/gunit.h" -#include "webrtc/base/helpers.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/socketadapters.h" -#include "webrtc/base/socketaddress.h" -#include "webrtc/base/ssladapter.h" -#include "webrtc/base/thread.h" -#include "webrtc/base/virtualsocketserver.h" +#include "webrtc/rtc_base/gunit.h" +#include "webrtc/rtc_base/helpers.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/socketadapters.h" +#include "webrtc/rtc_base/socketaddress.h" +#include "webrtc/rtc_base/ssladapter.h" +#include "webrtc/rtc_base/thread.h" +#include "webrtc/rtc_base/virtualsocketserver.h" using rtc::SocketAddress; diff --git a/webrtc/p2p/base/relayserver.cc b/webrtc/p2p/base/relayserver.cc index d080d90a77..3a97d4e664 100644 --- a/webrtc/p2p/base/relayserver.cc +++ b/webrtc/p2p/base/relayserver.cc @@ -16,11 +16,11 @@ #include -#include "webrtc/base/asynctcpsocket.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/helpers.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/socketadapters.h" +#include "webrtc/rtc_base/asynctcpsocket.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/helpers.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/socketadapters.h" namespace cricket { diff --git a/webrtc/p2p/base/relayserver.h b/webrtc/p2p/base/relayserver.h index c60e2710b5..579b01417f 100644 --- a/webrtc/p2p/base/relayserver.h +++ b/webrtc/p2p/base/relayserver.h @@ -17,10 +17,10 @@ #include "webrtc/p2p/base/port.h" #include "webrtc/p2p/base/stun.h" -#include "webrtc/base/asyncudpsocket.h" -#include "webrtc/base/socketaddresspair.h" -#include "webrtc/base/thread.h" -#include "webrtc/base/timeutils.h" +#include "webrtc/rtc_base/asyncudpsocket.h" +#include "webrtc/rtc_base/socketaddresspair.h" +#include "webrtc/rtc_base/thread.h" +#include "webrtc/rtc_base/timeutils.h" namespace cricket { diff --git a/webrtc/p2p/base/relayserver_unittest.cc b/webrtc/p2p/base/relayserver_unittest.cc index f27f438533..7c1b29e0ac 100644 --- a/webrtc/p2p/base/relayserver_unittest.cc +++ b/webrtc/p2p/base/relayserver_unittest.cc @@ -11,16 +11,16 @@ #include #include -#include "webrtc/base/gunit.h" -#include "webrtc/base/helpers.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/ptr_util.h" -#include "webrtc/base/socketaddress.h" -#include "webrtc/base/ssladapter.h" -#include "webrtc/base/testclient.h" -#include "webrtc/base/thread.h" -#include "webrtc/base/virtualsocketserver.h" #include "webrtc/p2p/base/relayserver.h" +#include "webrtc/rtc_base/gunit.h" +#include "webrtc/rtc_base/helpers.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/ptr_util.h" +#include "webrtc/rtc_base/socketaddress.h" +#include "webrtc/rtc_base/ssladapter.h" +#include "webrtc/rtc_base/testclient.h" +#include "webrtc/rtc_base/thread.h" +#include "webrtc/rtc_base/virtualsocketserver.h" using rtc::SocketAddress; using namespace cricket; diff --git a/webrtc/p2p/base/sessiondescription.h b/webrtc/p2p/base/sessiondescription.h index 5a750efff6..df9348d581 100644 --- a/webrtc/p2p/base/sessiondescription.h +++ b/webrtc/p2p/base/sessiondescription.h @@ -14,8 +14,8 @@ #include #include -#include "webrtc/base/constructormagic.h" #include "webrtc/p2p/base/transportinfo.h" +#include "webrtc/rtc_base/constructormagic.h" namespace cricket { diff --git a/webrtc/p2p/base/stun.cc b/webrtc/p2p/base/stun.cc index 8217c029c3..56b4ee1965 100644 --- a/webrtc/p2p/base/stun.cc +++ b/webrtc/p2p/base/stun.cc @@ -14,13 +14,13 @@ #include -#include "webrtc/base/byteorder.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/crc32.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/messagedigest.h" -#include "webrtc/base/ptr_util.h" -#include "webrtc/base/stringencode.h" +#include "webrtc/rtc_base/byteorder.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/crc32.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/messagedigest.h" +#include "webrtc/rtc_base/ptr_util.h" +#include "webrtc/rtc_base/stringencode.h" using rtc::ByteBufferReader; using rtc::ByteBufferWriter; diff --git a/webrtc/p2p/base/stun.h b/webrtc/p2p/base/stun.h index 4ea45050ca..4a44dcbc2f 100644 --- a/webrtc/p2p/base/stun.h +++ b/webrtc/p2p/base/stun.h @@ -17,9 +17,9 @@ #include #include -#include "webrtc/base/basictypes.h" -#include "webrtc/base/bytebuffer.h" -#include "webrtc/base/socketaddress.h" +#include "webrtc/rtc_base/basictypes.h" +#include "webrtc/rtc_base/bytebuffer.h" +#include "webrtc/rtc_base/socketaddress.h" namespace cricket { diff --git a/webrtc/p2p/base/stun_unittest.cc b/webrtc/p2p/base/stun_unittest.cc index 15d4648f27..ef387a1b33 100644 --- a/webrtc/p2p/base/stun_unittest.cc +++ b/webrtc/p2p/base/stun_unittest.cc @@ -10,14 +10,14 @@ #include -#include "webrtc/base/arraysize.h" -#include "webrtc/base/bytebuffer.h" -#include "webrtc/base/gunit.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/messagedigest.h" -#include "webrtc/base/ptr_util.h" -#include "webrtc/base/socketaddress.h" #include "webrtc/p2p/base/stun.h" +#include "webrtc/rtc_base/arraysize.h" +#include "webrtc/rtc_base/bytebuffer.h" +#include "webrtc/rtc_base/gunit.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/messagedigest.h" +#include "webrtc/rtc_base/ptr_util.h" +#include "webrtc/rtc_base/socketaddress.h" namespace cricket { diff --git a/webrtc/p2p/base/stunport.cc b/webrtc/p2p/base/stunport.cc index 5801ba7dd6..fa7a63c46b 100644 --- a/webrtc/p2p/base/stunport.cc +++ b/webrtc/p2p/base/stunport.cc @@ -13,11 +13,11 @@ #include "webrtc/p2p/base/common.h" #include "webrtc/p2p/base/portallocator.h" #include "webrtc/p2p/base/stun.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/helpers.h" -#include "webrtc/base/ipaddress.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/nethelpers.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/helpers.h" +#include "webrtc/rtc_base/ipaddress.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/nethelpers.h" namespace cricket { diff --git a/webrtc/p2p/base/stunport.h b/webrtc/p2p/base/stunport.h index 1bbe25f0e8..de5127c671 100644 --- a/webrtc/p2p/base/stunport.h +++ b/webrtc/p2p/base/stunport.h @@ -16,7 +16,7 @@ #include "webrtc/p2p/base/port.h" #include "webrtc/p2p/base/stunrequest.h" -#include "webrtc/base/asyncpacketsocket.h" +#include "webrtc/rtc_base/asyncpacketsocket.h" // TODO(mallinath) - Rename stunport.cc|h to udpport.cc|h. namespace rtc { diff --git a/webrtc/p2p/base/stunport_unittest.cc b/webrtc/p2p/base/stunport_unittest.cc index bf44ffc725..25f5a74fcf 100644 --- a/webrtc/p2p/base/stunport_unittest.cc +++ b/webrtc/p2p/base/stunport_unittest.cc @@ -13,11 +13,11 @@ #include "webrtc/p2p/base/basicpacketsocketfactory.h" #include "webrtc/p2p/base/stunport.h" #include "webrtc/p2p/base/teststunserver.h" -#include "webrtc/base/gunit.h" -#include "webrtc/base/helpers.h" -#include "webrtc/base/socketaddress.h" -#include "webrtc/base/ssladapter.h" -#include "webrtc/base/virtualsocketserver.h" +#include "webrtc/rtc_base/gunit.h" +#include "webrtc/rtc_base/helpers.h" +#include "webrtc/rtc_base/socketaddress.h" +#include "webrtc/rtc_base/ssladapter.h" +#include "webrtc/rtc_base/virtualsocketserver.h" using cricket::ServerAddresses; using rtc::SocketAddress; diff --git a/webrtc/p2p/base/stunrequest.cc b/webrtc/p2p/base/stunrequest.cc index d3336fa8d7..cace17f299 100644 --- a/webrtc/p2p/base/stunrequest.cc +++ b/webrtc/p2p/base/stunrequest.cc @@ -13,11 +13,11 @@ #include #include -#include "webrtc/base/checks.h" -#include "webrtc/base/helpers.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/ptr_util.h" -#include "webrtc/base/stringencode.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/helpers.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/ptr_util.h" +#include "webrtc/rtc_base/stringencode.h" namespace cricket { diff --git a/webrtc/p2p/base/stunrequest.h b/webrtc/p2p/base/stunrequest.h index 99dff14aee..a1c6930688 100644 --- a/webrtc/p2p/base/stunrequest.h +++ b/webrtc/p2p/base/stunrequest.h @@ -14,8 +14,8 @@ #include #include #include "webrtc/p2p/base/stun.h" -#include "webrtc/base/sigslot.h" -#include "webrtc/base/thread.h" +#include "webrtc/rtc_base/sigslot.h" +#include "webrtc/rtc_base/thread.h" namespace cricket { diff --git a/webrtc/p2p/base/stunrequest_unittest.cc b/webrtc/p2p/base/stunrequest_unittest.cc index 9b8ccac1ed..a4f603bced 100644 --- a/webrtc/p2p/base/stunrequest_unittest.cc +++ b/webrtc/p2p/base/stunrequest_unittest.cc @@ -9,12 +9,12 @@ */ #include "webrtc/p2p/base/stunrequest.h" -#include "webrtc/base/fakeclock.h" -#include "webrtc/base/gunit.h" -#include "webrtc/base/helpers.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/ssladapter.h" -#include "webrtc/base/timeutils.h" +#include "webrtc/rtc_base/fakeclock.h" +#include "webrtc/rtc_base/gunit.h" +#include "webrtc/rtc_base/helpers.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/ssladapter.h" +#include "webrtc/rtc_base/timeutils.h" using namespace cricket; diff --git a/webrtc/p2p/base/stunserver.cc b/webrtc/p2p/base/stunserver.cc index 532add792f..3a3a0abf46 100644 --- a/webrtc/p2p/base/stunserver.cc +++ b/webrtc/p2p/base/stunserver.cc @@ -10,8 +10,8 @@ #include "webrtc/p2p/base/stunserver.h" -#include "webrtc/base/bytebuffer.h" -#include "webrtc/base/logging.h" +#include "webrtc/rtc_base/bytebuffer.h" +#include "webrtc/rtc_base/logging.h" namespace cricket { diff --git a/webrtc/p2p/base/stunserver.h b/webrtc/p2p/base/stunserver.h index c9ae86a860..92707b0954 100644 --- a/webrtc/p2p/base/stunserver.h +++ b/webrtc/p2p/base/stunserver.h @@ -14,7 +14,7 @@ #include #include "webrtc/p2p/base/stun.h" -#include "webrtc/base/asyncudpsocket.h" +#include "webrtc/rtc_base/asyncudpsocket.h" namespace cricket { diff --git a/webrtc/p2p/base/stunserver_unittest.cc b/webrtc/p2p/base/stunserver_unittest.cc index 1e8f8b4a14..66cb59f1b4 100644 --- a/webrtc/p2p/base/stunserver_unittest.cc +++ b/webrtc/p2p/base/stunserver_unittest.cc @@ -11,13 +11,13 @@ #include #include -#include "webrtc/base/gunit.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/ptr_util.h" -#include "webrtc/base/testclient.h" -#include "webrtc/base/thread.h" -#include "webrtc/base/virtualsocketserver.h" #include "webrtc/p2p/base/stunserver.h" +#include "webrtc/rtc_base/gunit.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/ptr_util.h" +#include "webrtc/rtc_base/testclient.h" +#include "webrtc/rtc_base/thread.h" +#include "webrtc/rtc_base/virtualsocketserver.h" using namespace cricket; diff --git a/webrtc/p2p/base/tcpport.cc b/webrtc/p2p/base/tcpport.cc index 4fd527e513..86670cd366 100644 --- a/webrtc/p2p/base/tcpport.cc +++ b/webrtc/p2p/base/tcpport.cc @@ -67,8 +67,8 @@ #include "webrtc/p2p/base/tcpport.h" #include "webrtc/p2p/base/common.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/logging.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/logging.h" namespace cricket { diff --git a/webrtc/p2p/base/tcpport.h b/webrtc/p2p/base/tcpport.h index ce91e44905..0974fa78cd 100644 --- a/webrtc/p2p/base/tcpport.h +++ b/webrtc/p2p/base/tcpport.h @@ -16,7 +16,7 @@ #include #include "webrtc/p2p/base/port.h" -#include "webrtc/base/asyncpacketsocket.h" +#include "webrtc/rtc_base/asyncpacketsocket.h" namespace cricket { diff --git a/webrtc/p2p/base/tcpport_unittest.cc b/webrtc/p2p/base/tcpport_unittest.cc index cc3f9adbd8..0f7bd1f79d 100644 --- a/webrtc/p2p/base/tcpport_unittest.cc +++ b/webrtc/p2p/base/tcpport_unittest.cc @@ -10,11 +10,11 @@ #include -#include "webrtc/base/gunit.h" -#include "webrtc/base/thread.h" -#include "webrtc/base/virtualsocketserver.h" #include "webrtc/p2p/base/basicpacketsocketfactory.h" #include "webrtc/p2p/base/tcpport.h" +#include "webrtc/rtc_base/gunit.h" +#include "webrtc/rtc_base/thread.h" +#include "webrtc/rtc_base/virtualsocketserver.h" using rtc::SocketAddress; using cricket::Connection; diff --git a/webrtc/p2p/base/testrelayserver.h b/webrtc/p2p/base/testrelayserver.h index 7bc0beead2..27bc4c15ae 100644 --- a/webrtc/p2p/base/testrelayserver.h +++ b/webrtc/p2p/base/testrelayserver.h @@ -14,10 +14,10 @@ #include #include "webrtc/p2p/base/relayserver.h" -#include "webrtc/base/asynctcpsocket.h" -#include "webrtc/base/sigslot.h" -#include "webrtc/base/socketadapters.h" -#include "webrtc/base/thread.h" +#include "webrtc/rtc_base/asynctcpsocket.h" +#include "webrtc/rtc_base/sigslot.h" +#include "webrtc/rtc_base/socketadapters.h" +#include "webrtc/rtc_base/thread.h" namespace cricket { diff --git a/webrtc/p2p/base/teststunserver.h b/webrtc/p2p/base/teststunserver.h index 1911a0b739..1a9e670810 100644 --- a/webrtc/p2p/base/teststunserver.h +++ b/webrtc/p2p/base/teststunserver.h @@ -12,8 +12,8 @@ #define WEBRTC_P2P_BASE_TESTSTUNSERVER_H_ #include "webrtc/p2p/base/stunserver.h" -#include "webrtc/base/socketaddress.h" -#include "webrtc/base/thread.h" +#include "webrtc/rtc_base/socketaddress.h" +#include "webrtc/rtc_base/thread.h" namespace cricket { diff --git a/webrtc/p2p/base/testturnserver.h b/webrtc/p2p/base/testturnserver.h index 9cd8203762..5091e8e415 100644 --- a/webrtc/p2p/base/testturnserver.h +++ b/webrtc/p2p/base/testturnserver.h @@ -17,8 +17,8 @@ #include "webrtc/p2p/base/basicpacketsocketfactory.h" #include "webrtc/p2p/base/stun.h" #include "webrtc/p2p/base/turnserver.h" -#include "webrtc/base/asyncudpsocket.h" -#include "webrtc/base/thread.h" +#include "webrtc/rtc_base/asyncudpsocket.h" +#include "webrtc/rtc_base/thread.h" namespace cricket { diff --git a/webrtc/p2p/base/transportchannelimpl.h b/webrtc/p2p/base/transportchannelimpl.h index f72cb2d1b0..cf6e3629f6 100644 --- a/webrtc/p2p/base/transportchannelimpl.h +++ b/webrtc/p2p/base/transportchannelimpl.h @@ -13,9 +13,9 @@ #include -#include "webrtc/base/constructormagic.h" #include "webrtc/p2p/base/icetransportinternal.h" #include "webrtc/p2p/base/transportchannel.h" +#include "webrtc/rtc_base/constructormagic.h" namespace webrtc { class MetricsObserverInterface; diff --git a/webrtc/p2p/base/transportcontroller.cc b/webrtc/p2p/base/transportcontroller.cc index db2d8d9e34..8f6674e712 100644 --- a/webrtc/p2p/base/transportcontroller.cc +++ b/webrtc/p2p/base/transportcontroller.cc @@ -13,10 +13,10 @@ #include #include -#include "webrtc/base/bind.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/thread.h" #include "webrtc/p2p/base/port.h" +#include "webrtc/rtc_base/bind.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/thread.h" namespace { diff --git a/webrtc/p2p/base/transportcontroller.h b/webrtc/p2p/base/transportcontroller.h index 7cc59e8dfa..f16e8938fd 100644 --- a/webrtc/p2p/base/transportcontroller.h +++ b/webrtc/p2p/base/transportcontroller.h @@ -16,15 +16,15 @@ #include #include -#include "webrtc/base/asyncinvoker.h" -#include "webrtc/base/constructormagic.h" -#include "webrtc/base/refcountedobject.h" -#include "webrtc/base/sigslot.h" -#include "webrtc/base/sslstreamadapter.h" #include "webrtc/p2p/base/candidate.h" #include "webrtc/p2p/base/dtlstransportchannel.h" #include "webrtc/p2p/base/jseptransport.h" #include "webrtc/p2p/base/p2ptransportchannel.h" +#include "webrtc/rtc_base/asyncinvoker.h" +#include "webrtc/rtc_base/constructormagic.h" +#include "webrtc/rtc_base/refcountedobject.h" +#include "webrtc/rtc_base/sigslot.h" +#include "webrtc/rtc_base/sslstreamadapter.h" namespace rtc { class Thread; diff --git a/webrtc/p2p/base/transportcontroller_unittest.cc b/webrtc/p2p/base/transportcontroller_unittest.cc index 239bb2a235..8a2d298673 100644 --- a/webrtc/p2p/base/transportcontroller_unittest.cc +++ b/webrtc/p2p/base/transportcontroller_unittest.cc @@ -11,17 +11,17 @@ #include #include -#include "webrtc/base/fakesslidentity.h" -#include "webrtc/base/gunit.h" -#include "webrtc/base/helpers.h" -#include "webrtc/base/sslidentity.h" -#include "webrtc/base/thread.h" #include "webrtc/p2p/base/dtlstransportchannel.h" #include "webrtc/p2p/base/fakeportallocator.h" #include "webrtc/p2p/base/faketransportcontroller.h" #include "webrtc/p2p/base/p2ptransportchannel.h" #include "webrtc/p2p/base/portallocator.h" #include "webrtc/p2p/base/transportcontroller.h" +#include "webrtc/rtc_base/fakesslidentity.h" +#include "webrtc/rtc_base/gunit.h" +#include "webrtc/rtc_base/helpers.h" +#include "webrtc/rtc_base/sslidentity.h" +#include "webrtc/rtc_base/thread.h" static const int kTimeout = 100; static const char kIceUfrag1[] = "TESTICEUFRAG0001"; diff --git a/webrtc/p2p/base/transportdescription.cc b/webrtc/p2p/base/transportdescription.cc index 4d61edd5c6..7c0f1f51dc 100644 --- a/webrtc/p2p/base/transportdescription.cc +++ b/webrtc/p2p/base/transportdescription.cc @@ -10,9 +10,9 @@ #include "webrtc/p2p/base/transportdescription.h" -#include "webrtc/base/arraysize.h" -#include "webrtc/base/stringutils.h" #include "webrtc/p2p/base/p2pconstants.h" +#include "webrtc/rtc_base/arraysize.h" +#include "webrtc/rtc_base/stringutils.h" namespace cricket { diff --git a/webrtc/p2p/base/transportdescription.h b/webrtc/p2p/base/transportdescription.h index 22d054d3b1..670213197a 100644 --- a/webrtc/p2p/base/transportdescription.h +++ b/webrtc/p2p/base/transportdescription.h @@ -17,7 +17,7 @@ #include #include "webrtc/p2p/base/p2pconstants.h" -#include "webrtc/base/sslfingerprint.h" +#include "webrtc/rtc_base/sslfingerprint.h" namespace cricket { diff --git a/webrtc/p2p/base/transportdescriptionfactory.cc b/webrtc/p2p/base/transportdescriptionfactory.cc index 856ad46126..1c75b32292 100644 --- a/webrtc/p2p/base/transportdescriptionfactory.cc +++ b/webrtc/p2p/base/transportdescriptionfactory.cc @@ -13,10 +13,10 @@ #include #include "webrtc/p2p/base/transportdescription.h" -#include "webrtc/base/helpers.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/messagedigest.h" -#include "webrtc/base/sslfingerprint.h" +#include "webrtc/rtc_base/helpers.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/messagedigest.h" +#include "webrtc/rtc_base/sslfingerprint.h" namespace cricket { diff --git a/webrtc/p2p/base/transportdescriptionfactory.h b/webrtc/p2p/base/transportdescriptionfactory.h index ac04f048c6..b9b3c5b2d7 100644 --- a/webrtc/p2p/base/transportdescriptionfactory.h +++ b/webrtc/p2p/base/transportdescriptionfactory.h @@ -11,8 +11,8 @@ #ifndef WEBRTC_P2P_BASE_TRANSPORTDESCRIPTIONFACTORY_H_ #define WEBRTC_P2P_BASE_TRANSPORTDESCRIPTIONFACTORY_H_ -#include "webrtc/base/rtccertificate.h" #include "webrtc/p2p/base/transportdescription.h" +#include "webrtc/rtc_base/rtccertificate.h" namespace rtc { class SSLIdentity; diff --git a/webrtc/p2p/base/transportdescriptionfactory_unittest.cc b/webrtc/p2p/base/transportdescriptionfactory_unittest.cc index 83bc072ae4..f8f48bc1dc 100644 --- a/webrtc/p2p/base/transportdescriptionfactory_unittest.cc +++ b/webrtc/p2p/base/transportdescriptionfactory_unittest.cc @@ -15,9 +15,9 @@ #include "webrtc/p2p/base/p2pconstants.h" #include "webrtc/p2p/base/transportdescription.h" #include "webrtc/p2p/base/transportdescriptionfactory.h" -#include "webrtc/base/fakesslidentity.h" -#include "webrtc/base/gunit.h" -#include "webrtc/base/ssladapter.h" +#include "webrtc/rtc_base/fakesslidentity.h" +#include "webrtc/rtc_base/gunit.h" +#include "webrtc/rtc_base/ssladapter.h" using cricket::TransportDescriptionFactory; using cricket::TransportDescription; diff --git a/webrtc/p2p/base/transportinfo.h b/webrtc/p2p/base/transportinfo.h index 504eb23b2a..c38bf2a300 100644 --- a/webrtc/p2p/base/transportinfo.h +++ b/webrtc/p2p/base/transportinfo.h @@ -17,7 +17,7 @@ #include "webrtc/p2p/base/candidate.h" #include "webrtc/p2p/base/p2pconstants.h" #include "webrtc/p2p/base/transportdescription.h" -#include "webrtc/base/helpers.h" +#include "webrtc/rtc_base/helpers.h" namespace cricket { diff --git a/webrtc/p2p/base/turnport.cc b/webrtc/p2p/base/turnport.cc index e3caeb59d3..94f54dc0a2 100644 --- a/webrtc/p2p/base/turnport.cc +++ b/webrtc/p2p/base/turnport.cc @@ -12,16 +12,16 @@ #include -#include "webrtc/base/asyncpacketsocket.h" -#include "webrtc/base/byteorder.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/nethelpers.h" -#include "webrtc/base/ptr_util.h" -#include "webrtc/base/socketaddress.h" -#include "webrtc/base/stringencode.h" #include "webrtc/p2p/base/common.h" #include "webrtc/p2p/base/stun.h" +#include "webrtc/rtc_base/asyncpacketsocket.h" +#include "webrtc/rtc_base/byteorder.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/nethelpers.h" +#include "webrtc/rtc_base/ptr_util.h" +#include "webrtc/rtc_base/socketaddress.h" +#include "webrtc/rtc_base/stringencode.h" namespace cricket { diff --git a/webrtc/p2p/base/turnport.h b/webrtc/p2p/base/turnport.h index e5f384fa57..4e4d4b1774 100644 --- a/webrtc/p2p/base/turnport.h +++ b/webrtc/p2p/base/turnport.h @@ -16,10 +16,10 @@ #include #include -#include "webrtc/base/asyncinvoker.h" -#include "webrtc/base/asyncpacketsocket.h" #include "webrtc/p2p/base/port.h" #include "webrtc/p2p/client/basicportallocator.h" +#include "webrtc/rtc_base/asyncinvoker.h" +#include "webrtc/rtc_base/asyncpacketsocket.h" namespace rtc { class AsyncResolver; diff --git a/webrtc/p2p/base/turnport_unittest.cc b/webrtc/p2p/base/turnport_unittest.cc index 35f0afb557..73426cc505 100644 --- a/webrtc/p2p/base/turnport_unittest.cc +++ b/webrtc/p2p/base/turnport_unittest.cc @@ -20,20 +20,20 @@ #include "webrtc/p2p/base/testturnserver.h" #include "webrtc/p2p/base/turnport.h" #include "webrtc/p2p/base/udpport.h" -#include "webrtc/base/asynctcpsocket.h" -#include "webrtc/base/buffer.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/dscp.h" -#include "webrtc/base/fakeclock.h" -#include "webrtc/base/firewallsocketserver.h" -#include "webrtc/base/gunit.h" -#include "webrtc/base/helpers.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/socketadapters.h" -#include "webrtc/base/socketaddress.h" -#include "webrtc/base/ssladapter.h" -#include "webrtc/base/thread.h" -#include "webrtc/base/virtualsocketserver.h" +#include "webrtc/rtc_base/asynctcpsocket.h" +#include "webrtc/rtc_base/buffer.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/dscp.h" +#include "webrtc/rtc_base/fakeclock.h" +#include "webrtc/rtc_base/firewallsocketserver.h" +#include "webrtc/rtc_base/gunit.h" +#include "webrtc/rtc_base/helpers.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/socketadapters.h" +#include "webrtc/rtc_base/socketaddress.h" +#include "webrtc/rtc_base/ssladapter.h" +#include "webrtc/rtc_base/thread.h" +#include "webrtc/rtc_base/virtualsocketserver.h" using rtc::SocketAddress; diff --git a/webrtc/p2p/base/turnserver.cc b/webrtc/p2p/base/turnserver.cc index 368bea19fd..afc5f1d7c2 100644 --- a/webrtc/p2p/base/turnserver.cc +++ b/webrtc/p2p/base/turnserver.cc @@ -12,20 +12,20 @@ #include // for std::tie -#include "webrtc/base/bind.h" -#include "webrtc/base/bytebuffer.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/helpers.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/messagedigest.h" -#include "webrtc/base/ptr_util.h" -#include "webrtc/base/socketadapters.h" -#include "webrtc/base/stringencode.h" -#include "webrtc/base/thread.h" #include "webrtc/p2p/base/asyncstuntcpsocket.h" #include "webrtc/p2p/base/common.h" #include "webrtc/p2p/base/packetsocketfactory.h" #include "webrtc/p2p/base/stun.h" +#include "webrtc/rtc_base/bind.h" +#include "webrtc/rtc_base/bytebuffer.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/helpers.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/messagedigest.h" +#include "webrtc/rtc_base/ptr_util.h" +#include "webrtc/rtc_base/socketadapters.h" +#include "webrtc/rtc_base/stringencode.h" +#include "webrtc/rtc_base/thread.h" namespace cricket { diff --git a/webrtc/p2p/base/turnserver.h b/webrtc/p2p/base/turnserver.h index 608e0434e4..0a59f270a5 100644 --- a/webrtc/p2p/base/turnserver.h +++ b/webrtc/p2p/base/turnserver.h @@ -19,11 +19,11 @@ #include #include "webrtc/p2p/base/portinterface.h" -#include "webrtc/base/asyncinvoker.h" -#include "webrtc/base/asyncpacketsocket.h" -#include "webrtc/base/messagequeue.h" -#include "webrtc/base/sigslot.h" -#include "webrtc/base/socketaddress.h" +#include "webrtc/rtc_base/asyncinvoker.h" +#include "webrtc/rtc_base/asyncpacketsocket.h" +#include "webrtc/rtc_base/messagequeue.h" +#include "webrtc/rtc_base/sigslot.h" +#include "webrtc/rtc_base/socketaddress.h" namespace rtc { class ByteBufferWriter; diff --git a/webrtc/p2p/base/turnserver_unittest.cc b/webrtc/p2p/base/turnserver_unittest.cc index 970da4759a..cac0a5c541 100644 --- a/webrtc/p2p/base/turnserver_unittest.cc +++ b/webrtc/p2p/base/turnserver_unittest.cc @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/base/gunit.h" -#include "webrtc/base/virtualsocketserver.h" -#include "webrtc/p2p/base/basicpacketsocketfactory.h" #include "webrtc/p2p/base/turnserver.h" +#include "webrtc/p2p/base/basicpacketsocketfactory.h" +#include "webrtc/rtc_base/gunit.h" +#include "webrtc/rtc_base/virtualsocketserver.h" // NOTE: This is a work in progress. Currently this file only has tests for // TurnServerConnection, a primitive class used by TurnServer. diff --git a/webrtc/p2p/base/udptransport.cc b/webrtc/p2p/base/udptransport.cc index 976d5bb6ae..3df47add4e 100644 --- a/webrtc/p2p/base/udptransport.cc +++ b/webrtc/p2p/base/udptransport.cc @@ -13,12 +13,12 @@ #include #include // For std::move. -#include "webrtc/base/asyncudpsocket.h" -#include "webrtc/base/asyncpacketsocket.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/socketaddress.h" -#include "webrtc/base/thread.h" -#include "webrtc/base/thread_checker.h" +#include "webrtc/rtc_base/asyncpacketsocket.h" +#include "webrtc/rtc_base/asyncudpsocket.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/socketaddress.h" +#include "webrtc/rtc_base/thread.h" +#include "webrtc/rtc_base/thread_checker.h" namespace cricket { diff --git a/webrtc/p2p/base/udptransport.h b/webrtc/p2p/base/udptransport.h index 1cf8e424db..c3c9513bb9 100644 --- a/webrtc/p2p/base/udptransport.h +++ b/webrtc/p2p/base/udptransport.h @@ -15,10 +15,10 @@ #include #include "webrtc/api/ortc/udptransportinterface.h" -#include "webrtc/base/asyncpacketsocket.h" // For PacketOptions. -#include "webrtc/base/optional.h" -#include "webrtc/base/thread_checker.h" #include "webrtc/p2p/base/packettransportinternal.h" +#include "webrtc/rtc_base/asyncpacketsocket.h" // For PacketOptions. +#include "webrtc/rtc_base/optional.h" +#include "webrtc/rtc_base/thread_checker.h" namespace rtc { class AsyncPacketSocket; diff --git a/webrtc/p2p/base/udptransport_unittest.cc b/webrtc/p2p/base/udptransport_unittest.cc index f9db024afe..27455e4f8c 100644 --- a/webrtc/p2p/base/udptransport_unittest.cc +++ b/webrtc/p2p/base/udptransport_unittest.cc @@ -14,16 +14,16 @@ #include #include -#include "webrtc/base/gunit.h" -#include "webrtc/base/thread.h" -#include "webrtc/base/asyncpacketsocket.h" -#include "webrtc/base/ipaddress.h" -#include "webrtc/base/socketaddress.h" -#include "webrtc/base/socketserver.h" -#include "webrtc/base/virtualsocketserver.h" #include "webrtc/p2p/base/basicpacketsocketfactory.h" #include "webrtc/p2p/base/packettransportinternal.h" #include "webrtc/p2p/base/udptransport.h" +#include "webrtc/rtc_base/asyncpacketsocket.h" +#include "webrtc/rtc_base/gunit.h" +#include "webrtc/rtc_base/ipaddress.h" +#include "webrtc/rtc_base/socketaddress.h" +#include "webrtc/rtc_base/socketserver.h" +#include "webrtc/rtc_base/thread.h" +#include "webrtc/rtc_base/virtualsocketserver.h" namespace cricket { diff --git a/webrtc/p2p/client/basicportallocator.cc b/webrtc/p2p/client/basicportallocator.cc index 2e5bc0d06c..5ddc475493 100644 --- a/webrtc/p2p/client/basicportallocator.cc +++ b/webrtc/p2p/client/basicportallocator.cc @@ -23,9 +23,9 @@ #include "webrtc/p2p/base/tcpport.h" #include "webrtc/p2p/base/turnport.h" #include "webrtc/p2p/base/udpport.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/helpers.h" -#include "webrtc/base/logging.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/helpers.h" +#include "webrtc/rtc_base/logging.h" using rtc::CreateRandomId; diff --git a/webrtc/p2p/client/basicportallocator.h b/webrtc/p2p/client/basicportallocator.h index cd178f965e..7cdf0baa7d 100644 --- a/webrtc/p2p/client/basicportallocator.h +++ b/webrtc/p2p/client/basicportallocator.h @@ -16,10 +16,10 @@ #include #include "webrtc/p2p/base/portallocator.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/messagequeue.h" -#include "webrtc/base/network.h" -#include "webrtc/base/thread.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/messagequeue.h" +#include "webrtc/rtc_base/network.h" +#include "webrtc/rtc_base/thread.h" namespace cricket { diff --git a/webrtc/p2p/client/basicportallocator_unittest.cc b/webrtc/p2p/client/basicportallocator_unittest.cc index bf288c9e68..99e53cf619 100644 --- a/webrtc/p2p/client/basicportallocator_unittest.cc +++ b/webrtc/p2p/client/basicportallocator_unittest.cc @@ -11,21 +11,6 @@ #include #include -#include "webrtc/base/fakeclock.h" -#include "webrtc/base/fakenetwork.h" -#include "webrtc/base/firewallsocketserver.h" -#include "webrtc/base/gunit.h" -#include "webrtc/base/helpers.h" -#include "webrtc/base/ipaddress.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/natserver.h" -#include "webrtc/base/natsocketfactory.h" -#include "webrtc/base/nethelpers.h" -#include "webrtc/base/network.h" -#include "webrtc/base/socketaddress.h" -#include "webrtc/base/ssladapter.h" -#include "webrtc/base/thread.h" -#include "webrtc/base/virtualsocketserver.h" #include "webrtc/p2p/base/basicpacketsocketfactory.h" #include "webrtc/p2p/base/p2pconstants.h" #include "webrtc/p2p/base/p2ptransportchannel.h" @@ -33,6 +18,21 @@ #include "webrtc/p2p/base/teststunserver.h" #include "webrtc/p2p/base/testturnserver.h" #include "webrtc/p2p/client/basicportallocator.h" +#include "webrtc/rtc_base/fakeclock.h" +#include "webrtc/rtc_base/fakenetwork.h" +#include "webrtc/rtc_base/firewallsocketserver.h" +#include "webrtc/rtc_base/gunit.h" +#include "webrtc/rtc_base/helpers.h" +#include "webrtc/rtc_base/ipaddress.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/natserver.h" +#include "webrtc/rtc_base/natsocketfactory.h" +#include "webrtc/rtc_base/nethelpers.h" +#include "webrtc/rtc_base/network.h" +#include "webrtc/rtc_base/socketaddress.h" +#include "webrtc/rtc_base/ssladapter.h" +#include "webrtc/rtc_base/thread.h" +#include "webrtc/rtc_base/virtualsocketserver.h" using rtc::IPAddress; using rtc::SocketAddress; diff --git a/webrtc/p2p/client/socketmonitor.cc b/webrtc/p2p/client/socketmonitor.cc index 098a05df28..4e26e427e1 100644 --- a/webrtc/p2p/client/socketmonitor.cc +++ b/webrtc/p2p/client/socketmonitor.cc @@ -10,7 +10,7 @@ #include "webrtc/p2p/client/socketmonitor.h" -#include "webrtc/base/checks.h" +#include "webrtc/rtc_base/checks.h" namespace cricket { diff --git a/webrtc/p2p/client/socketmonitor.h b/webrtc/p2p/client/socketmonitor.h index b13be74735..4cb1899570 100644 --- a/webrtc/p2p/client/socketmonitor.h +++ b/webrtc/p2p/client/socketmonitor.h @@ -13,10 +13,10 @@ #include -#include "webrtc/base/criticalsection.h" -#include "webrtc/base/sigslot.h" -#include "webrtc/base/thread.h" #include "webrtc/p2p/base/jseptransport.h" // for ConnectionInfos +#include "webrtc/rtc_base/criticalsection.h" +#include "webrtc/rtc_base/sigslot.h" +#include "webrtc/rtc_base/thread.h" // TODO(pthatcher): Move these to connectionmonitor.h and // connectionmonitor.cc, or just move them into channel.cc diff --git a/webrtc/p2p/quic/quicconnectionhelper.h b/webrtc/p2p/quic/quicconnectionhelper.h index 3588ad4226..07894f0d25 100644 --- a/webrtc/p2p/quic/quicconnectionhelper.h +++ b/webrtc/p2p/quic/quicconnectionhelper.h @@ -16,7 +16,7 @@ #include "net/quic/quic_clock.h" #include "net/quic/quic_connection.h" #include "net/quic/quic_simple_buffer_allocator.h" -#include "webrtc/base/thread.h" +#include "webrtc/rtc_base/thread.h" namespace cricket { diff --git a/webrtc/p2p/quic/quicconnectionhelper_unittest.cc b/webrtc/p2p/quic/quicconnectionhelper_unittest.cc index 5f16b52c62..910caca8b9 100644 --- a/webrtc/p2p/quic/quicconnectionhelper_unittest.cc +++ b/webrtc/p2p/quic/quicconnectionhelper_unittest.cc @@ -13,7 +13,7 @@ #include "webrtc/p2p/quic/quicconnectionhelper.h" #include "net/quic/quic_time.h" -#include "webrtc/base/gunit.h" +#include "webrtc/rtc_base/gunit.h" using cricket::QuicAlarm; using cricket::QuicConnectionHelper; diff --git a/webrtc/p2p/quic/quicsession.cc b/webrtc/p2p/quic/quicsession.cc index 65ed135754..c7860ef060 100644 --- a/webrtc/p2p/quic/quicsession.cc +++ b/webrtc/p2p/quic/quicsession.cc @@ -13,10 +13,10 @@ #include #include -#include "webrtc/base/checks.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/messagehandler.h" -#include "webrtc/base/messagequeue.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/messagehandler.h" +#include "webrtc/rtc_base/messagequeue.h" namespace cricket { diff --git a/webrtc/p2p/quic/quicsession.h b/webrtc/p2p/quic/quicsession.h index f8b27e055e..99195a8d8f 100644 --- a/webrtc/p2p/quic/quicsession.h +++ b/webrtc/p2p/quic/quicsession.h @@ -18,10 +18,10 @@ #include "net/quic/quic_crypto_server_stream.h" #include "net/quic/quic_crypto_stream.h" #include "net/quic/quic_session.h" -#include "webrtc/base/constructormagic.h" -#include "webrtc/base/sigslot.h" -#include "webrtc/base/sslidentity.h" #include "webrtc/p2p/quic/reliablequicstream.h" +#include "webrtc/rtc_base/constructormagic.h" +#include "webrtc/rtc_base/sigslot.h" +#include "webrtc/rtc_base/sslidentity.h" namespace cricket { diff --git a/webrtc/p2p/quic/quicsession_unittest.cc b/webrtc/p2p/quic/quicsession_unittest.cc index 549e018452..1e906fe24d 100644 --- a/webrtc/p2p/quic/quicsession_unittest.cc +++ b/webrtc/p2p/quic/quicsession_unittest.cc @@ -16,17 +16,17 @@ #include "net/base/ip_endpoint.h" #include "net/quic/crypto/crypto_server_config_protobuf.h" -#include "net/quic/crypto/quic_random.h" #include "net/quic/crypto/proof_source.h" #include "net/quic/crypto/proof_verifier.h" #include "net/quic/crypto/quic_crypto_client_config.h" #include "net/quic/crypto/quic_crypto_server_config.h" +#include "net/quic/crypto/quic_random.h" #include "net/quic/quic_crypto_client_stream.h" #include "net/quic/quic_crypto_server_stream.h" -#include "webrtc/base/gunit.h" #include "webrtc/p2p/base/faketransportcontroller.h" #include "webrtc/p2p/quic/quicconnectionhelper.h" #include "webrtc/p2p/quic/reliablequicstream.h" +#include "webrtc/rtc_base/gunit.h" using net::IPAddress; using net::IPEndPoint; diff --git a/webrtc/p2p/quic/quictransport.cc b/webrtc/p2p/quic/quictransport.cc index aaa11ebfcb..8240f589fc 100644 --- a/webrtc/p2p/quic/quictransport.cc +++ b/webrtc/p2p/quic/quictransport.cc @@ -10,8 +10,8 @@ #include "webrtc/p2p/quic/quictransport.h" -#include "webrtc/base/checks.h" #include "webrtc/p2p/base/p2ptransportchannel.h" +#include "webrtc/rtc_base/checks.h" namespace cricket { diff --git a/webrtc/p2p/quic/quictransport_unittest.cc b/webrtc/p2p/quic/quictransport_unittest.cc index 1fd48f7ec4..3328556fc7 100644 --- a/webrtc/p2p/quic/quictransport_unittest.cc +++ b/webrtc/p2p/quic/quictransport_unittest.cc @@ -14,9 +14,9 @@ #include #include -#include "webrtc/base/gunit.h" -#include "webrtc/base/rtccertificate.h" -#include "webrtc/base/sslidentity.h" +#include "webrtc/rtc_base/gunit.h" +#include "webrtc/rtc_base/rtccertificate.h" +#include "webrtc/rtc_base/sslidentity.h" using cricket::TransportChannelImpl; using cricket::QuicTransport; diff --git a/webrtc/p2p/quic/quictransportchannel.cc b/webrtc/p2p/quic/quictransportchannel.cc index 7241f1a0dc..f875ab607e 100644 --- a/webrtc/p2p/quic/quictransportchannel.cc +++ b/webrtc/p2p/quic/quictransportchannel.cc @@ -21,12 +21,12 @@ #include "net/quic/quic_crypto_server_stream.h" #include "net/quic/quic_packet_writer.h" #include "net/quic/quic_protocol.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/helpers.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/socket.h" -#include "webrtc/base/thread.h" #include "webrtc/p2p/base/common.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/helpers.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/socket.h" +#include "webrtc/rtc_base/thread.h" namespace { diff --git a/webrtc/p2p/quic/quictransportchannel.h b/webrtc/p2p/quic/quictransportchannel.h index 0e5af88e13..4c34675f20 100644 --- a/webrtc/p2p/quic/quictransportchannel.h +++ b/webrtc/p2p/quic/quictransportchannel.h @@ -17,11 +17,11 @@ #include "net/quic/quic_crypto_client_stream.h" #include "net/quic/quic_packet_writer.h" -#include "webrtc/base/constructormagic.h" -#include "webrtc/base/optional.h" #include "webrtc/p2p/base/transportchannelimpl.h" #include "webrtc/p2p/quic/quicconnectionhelper.h" #include "webrtc/p2p/quic/quicsession.h" +#include "webrtc/rtc_base/constructormagic.h" +#include "webrtc/rtc_base/optional.h" namespace cricket { diff --git a/webrtc/p2p/quic/quictransportchannel_unittest.cc b/webrtc/p2p/quic/quictransportchannel_unittest.cc index 7337da9421..9ed21f177f 100644 --- a/webrtc/p2p/quic/quictransportchannel_unittest.cc +++ b/webrtc/p2p/quic/quictransportchannel_unittest.cc @@ -15,9 +15,9 @@ #include #include -#include "webrtc/base/gunit.h" -#include "webrtc/base/sslidentity.h" #include "webrtc/p2p/base/faketransportcontroller.h" +#include "webrtc/rtc_base/gunit.h" +#include "webrtc/rtc_base/sslidentity.h" using cricket::ConnectionRole; using cricket::IceRole; diff --git a/webrtc/p2p/quic/reliablequicstream.cc b/webrtc/p2p/quic/reliablequicstream.cc index 5b65f1e7c7..23c2df2455 100644 --- a/webrtc/p2p/quic/reliablequicstream.cc +++ b/webrtc/p2p/quic/reliablequicstream.cc @@ -13,7 +13,7 @@ #include #include "net/quic/quic_session.h" -#include "webrtc/base/checks.h" +#include "webrtc/rtc_base/checks.h" namespace cricket { diff --git a/webrtc/p2p/quic/reliablequicstream.h b/webrtc/p2p/quic/reliablequicstream.h index 9493a3fcc1..a2d0b57444 100644 --- a/webrtc/p2p/quic/reliablequicstream.h +++ b/webrtc/p2p/quic/reliablequicstream.h @@ -12,9 +12,9 @@ #define WEBRTC_P2P_QUIC_RELIABLEQUICSTREAM_H_ #include "net/quic/reliable_quic_stream.h" -#include "webrtc/base/constructormagic.h" -#include "webrtc/base/sigslot.h" -#include "webrtc/base/stream.h" +#include "webrtc/rtc_base/constructormagic.h" +#include "webrtc/rtc_base/sigslot.h" +#include "webrtc/rtc_base/stream.h" namespace cricket { diff --git a/webrtc/p2p/quic/reliablequicstream_unittest.cc b/webrtc/p2p/quic/reliablequicstream_unittest.cc index ff517afb58..4357bcd74a 100644 --- a/webrtc/p2p/quic/reliablequicstream_unittest.cc +++ b/webrtc/p2p/quic/reliablequicstream_unittest.cc @@ -17,11 +17,11 @@ #include "net/quic/quic_connection.h" #include "net/quic/quic_protocol.h" #include "net/quic/quic_session.h" -#include "webrtc/base/buffer.h" -#include "webrtc/base/gunit.h" -#include "webrtc/base/sigslot.h" -#include "webrtc/base/stream.h" #include "webrtc/p2p/quic/quicconnectionhelper.h" +#include "webrtc/rtc_base/buffer.h" +#include "webrtc/rtc_base/gunit.h" +#include "webrtc/rtc_base/sigslot.h" +#include "webrtc/rtc_base/stream.h" using cricket::QuicConnectionHelper; using cricket::ReliableQuicStream; diff --git a/webrtc/p2p/stunprober/stunprober.cc b/webrtc/p2p/stunprober/stunprober.cc index 2ec77323da..54c8b1ccda 100644 --- a/webrtc/p2p/stunprober/stunprober.cc +++ b/webrtc/p2p/stunprober/stunprober.cc @@ -13,18 +13,18 @@ #include #include -#include "webrtc/base/asyncpacketsocket.h" -#include "webrtc/base/asyncresolverinterface.h" -#include "webrtc/base/bind.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/constructormagic.h" -#include "webrtc/base/helpers.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/timeutils.h" -#include "webrtc/base/thread.h" #include "webrtc/p2p/base/packetsocketfactory.h" #include "webrtc/p2p/base/stun.h" #include "webrtc/p2p/stunprober/stunprober.h" +#include "webrtc/rtc_base/asyncpacketsocket.h" +#include "webrtc/rtc_base/asyncresolverinterface.h" +#include "webrtc/rtc_base/bind.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/constructormagic.h" +#include "webrtc/rtc_base/helpers.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/thread.h" +#include "webrtc/rtc_base/timeutils.h" namespace stunprober { diff --git a/webrtc/p2p/stunprober/stunprober.h b/webrtc/p2p/stunprober/stunprober.h index c7cc33c02f..b32c8b2dcd 100644 --- a/webrtc/p2p/stunprober/stunprober.h +++ b/webrtc/p2p/stunprober/stunprober.h @@ -15,16 +15,16 @@ #include #include -#include "webrtc/base/asyncinvoker.h" -#include "webrtc/base/basictypes.h" -#include "webrtc/base/bytebuffer.h" -#include "webrtc/base/callback.h" -#include "webrtc/base/constructormagic.h" -#include "webrtc/base/ipaddress.h" -#include "webrtc/base/network.h" -#include "webrtc/base/socketaddress.h" -#include "webrtc/base/thread.h" -#include "webrtc/base/thread_checker.h" +#include "webrtc/rtc_base/asyncinvoker.h" +#include "webrtc/rtc_base/basictypes.h" +#include "webrtc/rtc_base/bytebuffer.h" +#include "webrtc/rtc_base/callback.h" +#include "webrtc/rtc_base/constructormagic.h" +#include "webrtc/rtc_base/ipaddress.h" +#include "webrtc/rtc_base/network.h" +#include "webrtc/rtc_base/socketaddress.h" +#include "webrtc/rtc_base/thread.h" +#include "webrtc/rtc_base/thread_checker.h" #include "webrtc/typedefs.h" namespace rtc { diff --git a/webrtc/p2p/stunprober/stunprober_unittest.cc b/webrtc/p2p/stunprober/stunprober_unittest.cc index 519831b7a9..2252e617aa 100644 --- a/webrtc/p2p/stunprober/stunprober_unittest.cc +++ b/webrtc/p2p/stunprober/stunprober_unittest.cc @@ -12,15 +12,15 @@ #include -#include "webrtc/base/asyncresolverinterface.h" -#include "webrtc/base/bind.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/gunit.h" -#include "webrtc/base/ssladapter.h" -#include "webrtc/base/virtualsocketserver.h" #include "webrtc/p2p/base/basicpacketsocketfactory.h" #include "webrtc/p2p/base/teststunserver.h" #include "webrtc/p2p/stunprober/stunprober.h" +#include "webrtc/rtc_base/asyncresolverinterface.h" +#include "webrtc/rtc_base/bind.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/gunit.h" +#include "webrtc/rtc_base/ssladapter.h" +#include "webrtc/rtc_base/virtualsocketserver.h" using stunprober::StunProber; using stunprober::AsyncCallback; diff --git a/webrtc/pc/audiomonitor.h b/webrtc/pc/audiomonitor.h index 885c60f08b..86e8ba2796 100644 --- a/webrtc/pc/audiomonitor.h +++ b/webrtc/pc/audiomonitor.h @@ -14,9 +14,9 @@ #include #include -#include "webrtc/base/sigslot.h" -#include "webrtc/base/thread.h" #include "webrtc/p2p/base/port.h" +#include "webrtc/rtc_base/sigslot.h" +#include "webrtc/rtc_base/thread.h" namespace cricket { diff --git a/webrtc/pc/audiotrack.cc b/webrtc/pc/audiotrack.cc index 951acbf93e..02607da676 100644 --- a/webrtc/pc/audiotrack.cc +++ b/webrtc/pc/audiotrack.cc @@ -10,7 +10,7 @@ #include "webrtc/pc/audiotrack.h" -#include "webrtc/base/checks.h" +#include "webrtc/rtc_base/checks.h" using rtc::scoped_refptr; diff --git a/webrtc/pc/audiotrack.h b/webrtc/pc/audiotrack.h index 33f4b1fcd7..8dde2efc2f 100644 --- a/webrtc/pc/audiotrack.h +++ b/webrtc/pc/audiotrack.h @@ -15,10 +15,10 @@ #include "webrtc/api/mediastreaminterface.h" #include "webrtc/api/notifier.h" -#include "webrtc/base/constructormagic.h" -#include "webrtc/base/scoped_ref_ptr.h" -#include "webrtc/base/thread_checker.h" #include "webrtc/pc/mediastreamtrack.h" +#include "webrtc/rtc_base/constructormagic.h" +#include "webrtc/rtc_base/scoped_ref_ptr.h" +#include "webrtc/rtc_base/thread_checker.h" namespace webrtc { diff --git a/webrtc/pc/bundlefilter.cc b/webrtc/pc/bundlefilter.cc index 1f19a0a9ca..3b7dcd69e9 100644 --- a/webrtc/pc/bundlefilter.cc +++ b/webrtc/pc/bundlefilter.cc @@ -10,8 +10,8 @@ #include "webrtc/pc/bundlefilter.h" -#include "webrtc/base/logging.h" #include "webrtc/media/base/rtputils.h" +#include "webrtc/rtc_base/logging.h" namespace cricket { diff --git a/webrtc/pc/bundlefilter.h b/webrtc/pc/bundlefilter.h index 44a45da528..b4ad824b9c 100644 --- a/webrtc/pc/bundlefilter.h +++ b/webrtc/pc/bundlefilter.h @@ -16,8 +16,8 @@ #include #include -#include "webrtc/base/basictypes.h" #include "webrtc/media/base/streamparams.h" +#include "webrtc/rtc_base/basictypes.h" namespace cricket { diff --git a/webrtc/pc/bundlefilter_unittest.cc b/webrtc/pc/bundlefilter_unittest.cc index 179f0cf900..f0f56a550b 100644 --- a/webrtc/pc/bundlefilter_unittest.cc +++ b/webrtc/pc/bundlefilter_unittest.cc @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/base/gunit.h" #include "webrtc/pc/bundlefilter.h" +#include "webrtc/rtc_base/gunit.h" using cricket::StreamParams; diff --git a/webrtc/pc/channel.cc b/webrtc/pc/channel.cc index e612aaece6..d07126b9b1 100644 --- a/webrtc/pc/channel.cc +++ b/webrtc/pc/channel.cc @@ -15,16 +15,16 @@ #include "webrtc/pc/channel.h" #include "webrtc/api/call/audio_sink.h" -#include "webrtc/base/bind.h" -#include "webrtc/base/byteorder.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/copyonwritebuffer.h" -#include "webrtc/base/dscp.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/networkroute.h" -#include "webrtc/base/trace_event.h" #include "webrtc/media/base/mediaconstants.h" #include "webrtc/media/base/rtputils.h" +#include "webrtc/rtc_base/bind.h" +#include "webrtc/rtc_base/byteorder.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/copyonwritebuffer.h" +#include "webrtc/rtc_base/dscp.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/networkroute.h" +#include "webrtc/rtc_base/trace_event.h" // Adding 'nogncheck' to disable the gn include headers check to support modular // WebRTC build targets. #include "webrtc/media/engine/webrtcvoiceengine.h" // nogncheck diff --git a/webrtc/pc/channel.h b/webrtc/pc/channel.h index f8cc286279..8b3be2c14e 100644 --- a/webrtc/pc/channel.h +++ b/webrtc/pc/channel.h @@ -20,12 +20,6 @@ #include "webrtc/api/call/audio_sink.h" #include "webrtc/api/rtpreceiverinterface.h" -#include "webrtc/base/asyncinvoker.h" -#include "webrtc/base/asyncudpsocket.h" -#include "webrtc/base/criticalsection.h" -#include "webrtc/base/network.h" -#include "webrtc/base/sigslot.h" -#include "webrtc/base/window.h" #include "webrtc/media/base/mediachannel.h" #include "webrtc/media/base/mediaengine.h" #include "webrtc/media/base/streamparams.h" @@ -41,6 +35,12 @@ #include "webrtc/pc/rtcpmuxfilter.h" #include "webrtc/pc/rtptransport.h" #include "webrtc/pc/srtpfilter.h" +#include "webrtc/rtc_base/asyncinvoker.h" +#include "webrtc/rtc_base/asyncudpsocket.h" +#include "webrtc/rtc_base/criticalsection.h" +#include "webrtc/rtc_base/network.h" +#include "webrtc/rtc_base/sigslot.h" +#include "webrtc/rtc_base/window.h" namespace webrtc { class AudioSinkInterface; diff --git a/webrtc/pc/channel_unittest.cc b/webrtc/pc/channel_unittest.cc index 7fe1472e25..fa9d3da520 100644 --- a/webrtc/pc/channel_unittest.cc +++ b/webrtc/pc/channel_unittest.cc @@ -10,13 +10,6 @@ #include -#include "webrtc/base/array_view.h" -#include "webrtc/base/buffer.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/fakeclock.h" -#include "webrtc/base/gunit.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/sslstreamadapter.h" #include "webrtc/media/base/fakemediaengine.h" #include "webrtc/media/base/fakertp.h" #include "webrtc/media/base/mediachannel.h" @@ -25,6 +18,13 @@ #include "webrtc/p2p/base/fakedtlstransport.h" #include "webrtc/p2p/base/fakepackettransport.h" #include "webrtc/pc/channel.h" +#include "webrtc/rtc_base/array_view.h" +#include "webrtc/rtc_base/buffer.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/fakeclock.h" +#include "webrtc/rtc_base/gunit.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/sslstreamadapter.h" using cricket::CA_OFFER; using cricket::CA_PRANSWER; diff --git a/webrtc/pc/channelmanager.cc b/webrtc/pc/channelmanager.cc index 68ac281747..368cf450b3 100644 --- a/webrtc/pc/channelmanager.cc +++ b/webrtc/pc/channelmanager.cc @@ -12,15 +12,15 @@ #include -#include "webrtc/base/bind.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/stringencode.h" -#include "webrtc/base/stringutils.h" -#include "webrtc/base/trace_event.h" #include "webrtc/media/base/device.h" #include "webrtc/media/base/rtpdataengine.h" #include "webrtc/pc/srtpfilter.h" +#include "webrtc/rtc_base/bind.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/stringencode.h" +#include "webrtc/rtc_base/stringutils.h" +#include "webrtc/rtc_base/trace_event.h" namespace cricket { diff --git a/webrtc/pc/channelmanager.h b/webrtc/pc/channelmanager.h index 94e98d9e51..e8c0165056 100644 --- a/webrtc/pc/channelmanager.h +++ b/webrtc/pc/channelmanager.h @@ -15,10 +15,10 @@ #include #include -#include "webrtc/base/fileutils.h" -#include "webrtc/base/thread.h" #include "webrtc/media/base/mediaengine.h" #include "webrtc/pc/voicechannel.h" +#include "webrtc/rtc_base/fileutils.h" +#include "webrtc/rtc_base/thread.h" namespace cricket { diff --git a/webrtc/pc/channelmanager_unittest.cc b/webrtc/pc/channelmanager_unittest.cc index 1919aae23c..c03056c637 100644 --- a/webrtc/pc/channelmanager_unittest.cc +++ b/webrtc/pc/channelmanager_unittest.cc @@ -10,9 +10,6 @@ #include -#include "webrtc/base/gunit.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/thread.h" #include "webrtc/logging/rtc_event_log/rtc_event_log.h" #include "webrtc/media/base/fakemediaengine.h" #include "webrtc/media/base/fakevideocapturer.h" @@ -20,6 +17,9 @@ #include "webrtc/media/engine/fakewebrtccall.h" #include "webrtc/p2p/base/faketransportcontroller.h" #include "webrtc/pc/channelmanager.h" +#include "webrtc/rtc_base/gunit.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/thread.h" namespace { const bool kDefaultSrtpRequired = true; diff --git a/webrtc/pc/createpeerconnectionfactory.cc b/webrtc/pc/createpeerconnectionfactory.cc index 6861d822ae..11aa1213a2 100644 --- a/webrtc/pc/createpeerconnectionfactory.cc +++ b/webrtc/pc/createpeerconnectionfactory.cc @@ -11,13 +11,13 @@ #include "webrtc/api/audio_codecs/builtin_audio_decoder_factory.h" #include "webrtc/api/audio_codecs/builtin_audio_encoder_factory.h" #include "webrtc/api/peerconnectioninterface.h" -#include "webrtc/base/bind.h" -#include "webrtc/base/scoped_ref_ptr.h" -#include "webrtc/base/thread.h" #include "webrtc/call/callfactoryinterface.h" #include "webrtc/logging/rtc_event_log/rtc_event_log_factory_interface.h" #include "webrtc/media/engine/webrtcmediaengine.h" #include "webrtc/modules/audio_processing/include/audio_processing.h" +#include "webrtc/rtc_base/bind.h" +#include "webrtc/rtc_base/scoped_ref_ptr.h" +#include "webrtc/rtc_base/thread.h" namespace webrtc { diff --git a/webrtc/pc/currentspeakermonitor.cc b/webrtc/pc/currentspeakermonitor.cc index ce0d579486..d52e79d7af 100644 --- a/webrtc/pc/currentspeakermonitor.cc +++ b/webrtc/pc/currentspeakermonitor.cc @@ -12,9 +12,9 @@ #include -#include "webrtc/base/logging.h" #include "webrtc/media/base/streamparams.h" #include "webrtc/pc/audiomonitor.h" +#include "webrtc/rtc_base/logging.h" namespace cricket { diff --git a/webrtc/pc/currentspeakermonitor.h b/webrtc/pc/currentspeakermonitor.h index 14ed8762a8..001035f57e 100644 --- a/webrtc/pc/currentspeakermonitor.h +++ b/webrtc/pc/currentspeakermonitor.h @@ -18,7 +18,7 @@ #include -#include "webrtc/base/sigslot.h" +#include "webrtc/rtc_base/sigslot.h" namespace cricket { diff --git a/webrtc/pc/currentspeakermonitor_unittest.cc b/webrtc/pc/currentspeakermonitor_unittest.cc index a71f72ed8b..547b5a298f 100644 --- a/webrtc/pc/currentspeakermonitor_unittest.cc +++ b/webrtc/pc/currentspeakermonitor_unittest.cc @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/base/gunit.h" -#include "webrtc/base/thread.h" -#include "webrtc/pc/audiomonitor.h" #include "webrtc/pc/currentspeakermonitor.h" +#include "webrtc/pc/audiomonitor.h" +#include "webrtc/rtc_base/gunit.h" +#include "webrtc/rtc_base/thread.h" namespace cricket { diff --git a/webrtc/pc/datachannel.cc b/webrtc/pc/datachannel.cc index 5606a64c6e..ce0aa14d4e 100644 --- a/webrtc/pc/datachannel.cc +++ b/webrtc/pc/datachannel.cc @@ -13,11 +13,11 @@ #include #include -#include "webrtc/base/checks.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/refcount.h" #include "webrtc/media/sctp/sctptransportinternal.h" #include "webrtc/pc/sctputils.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/refcount.h" namespace webrtc { diff --git a/webrtc/pc/datachannel.h b/webrtc/pc/datachannel.h index 2619a852fb..13f5b881fa 100644 --- a/webrtc/pc/datachannel.h +++ b/webrtc/pc/datachannel.h @@ -17,11 +17,11 @@ #include "webrtc/api/datachannelinterface.h" #include "webrtc/api/proxy.h" -#include "webrtc/base/messagehandler.h" -#include "webrtc/base/scoped_ref_ptr.h" -#include "webrtc/base/sigslot.h" #include "webrtc/media/base/mediachannel.h" #include "webrtc/pc/channel.h" +#include "webrtc/rtc_base/messagehandler.h" +#include "webrtc/rtc_base/scoped_ref_ptr.h" +#include "webrtc/rtc_base/sigslot.h" namespace webrtc { diff --git a/webrtc/pc/datachannel_unittest.cc b/webrtc/pc/datachannel_unittest.cc index 13ab63cdfa..8776dce87e 100644 --- a/webrtc/pc/datachannel_unittest.cc +++ b/webrtc/pc/datachannel_unittest.cc @@ -10,10 +10,10 @@ #include -#include "webrtc/base/gunit.h" #include "webrtc/pc/datachannel.h" #include "webrtc/pc/sctputils.h" #include "webrtc/pc/test/fakedatachannelprovider.h" +#include "webrtc/rtc_base/gunit.h" using webrtc::DataChannel; using webrtc::SctpSidAllocator; diff --git a/webrtc/pc/dtmfsender.cc b/webrtc/pc/dtmfsender.cc index a08a53ce0e..3a95c2ad34 100644 --- a/webrtc/pc/dtmfsender.cc +++ b/webrtc/pc/dtmfsender.cc @@ -14,9 +14,9 @@ #include -#include "webrtc/base/checks.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/thread.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/thread.h" namespace webrtc { diff --git a/webrtc/pc/dtmfsender.h b/webrtc/pc/dtmfsender.h index 5eab055185..28156f3055 100644 --- a/webrtc/pc/dtmfsender.h +++ b/webrtc/pc/dtmfsender.h @@ -16,9 +16,9 @@ #include "webrtc/api/dtmfsenderinterface.h" #include "webrtc/api/mediastreaminterface.h" #include "webrtc/api/proxy.h" -#include "webrtc/base/constructormagic.h" -#include "webrtc/base/messagehandler.h" -#include "webrtc/base/refcount.h" +#include "webrtc/rtc_base/constructormagic.h" +#include "webrtc/rtc_base/messagehandler.h" +#include "webrtc/rtc_base/refcount.h" // DtmfSender is the native implementation of the RTCDTMFSender defined by // the WebRTC W3C Editor's Draft. diff --git a/webrtc/pc/dtmfsender_unittest.cc b/webrtc/pc/dtmfsender_unittest.cc index 8401976a04..400444ee2c 100644 --- a/webrtc/pc/dtmfsender_unittest.cc +++ b/webrtc/pc/dtmfsender_unittest.cc @@ -15,11 +15,11 @@ #include #include -#include "webrtc/base/fakeclock.h" -#include "webrtc/base/gunit.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/timeutils.h" #include "webrtc/pc/audiotrack.h" +#include "webrtc/rtc_base/fakeclock.h" +#include "webrtc/rtc_base/gunit.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/timeutils.h" using webrtc::AudioTrackInterface; using webrtc::AudioTrack; diff --git a/webrtc/pc/externalhmac.cc b/webrtc/pc/externalhmac.cc index 94e39d30b7..34cab08bef 100644 --- a/webrtc/pc/externalhmac.cc +++ b/webrtc/pc/externalhmac.cc @@ -12,7 +12,7 @@ #include // For malloc/free. -#include "webrtc/base/logging.h" +#include "webrtc/rtc_base/logging.h" #include "third_party/libsrtp/crypto/include/crypto_kernel.h" #include "third_party/libsrtp/include/srtp.h" diff --git a/webrtc/pc/iceserverparsing.cc b/webrtc/pc/iceserverparsing.cc index 7db39634a4..d9f4885c2b 100644 --- a/webrtc/pc/iceserverparsing.cc +++ b/webrtc/pc/iceserverparsing.cc @@ -13,7 +13,7 @@ #include // For std::isdigit. #include -#include "webrtc/base/arraysize.h" +#include "webrtc/rtc_base/arraysize.h" namespace webrtc { diff --git a/webrtc/pc/iceserverparsing_unittest.cc b/webrtc/pc/iceserverparsing_unittest.cc index 46e010a0f3..d4339638fb 100644 --- a/webrtc/pc/iceserverparsing_unittest.cc +++ b/webrtc/pc/iceserverparsing_unittest.cc @@ -11,8 +11,8 @@ #include #include -#include "webrtc/base/gunit.h" #include "webrtc/pc/iceserverparsing.h" +#include "webrtc/rtc_base/gunit.h" namespace webrtc { diff --git a/webrtc/pc/jsepicecandidate.cc b/webrtc/pc/jsepicecandidate.cc index 51faa0739f..dbe05e40d7 100644 --- a/webrtc/pc/jsepicecandidate.cc +++ b/webrtc/pc/jsepicecandidate.cc @@ -12,8 +12,8 @@ #include -#include "webrtc/base/stringencode.h" #include "webrtc/pc/webrtcsdp.h" +#include "webrtc/rtc_base/stringencode.h" namespace webrtc { diff --git a/webrtc/pc/jsepsessiondescription.cc b/webrtc/pc/jsepsessiondescription.cc index ab34528441..2e972ea3b4 100644 --- a/webrtc/pc/jsepsessiondescription.cc +++ b/webrtc/pc/jsepsessiondescription.cc @@ -12,10 +12,10 @@ #include -#include "webrtc/base/arraysize.h" -#include "webrtc/base/stringencode.h" #include "webrtc/pc/mediasession.h" #include "webrtc/pc/webrtcsdp.h" +#include "webrtc/rtc_base/arraysize.h" +#include "webrtc/rtc_base/stringencode.h" using cricket::SessionDescription; diff --git a/webrtc/pc/jsepsessiondescription_unittest.cc b/webrtc/pc/jsepsessiondescription_unittest.cc index c406ad8249..4d8218a9c6 100644 --- a/webrtc/pc/jsepsessiondescription_unittest.cc +++ b/webrtc/pc/jsepsessiondescription_unittest.cc @@ -13,14 +13,14 @@ #include "webrtc/api/jsepicecandidate.h" #include "webrtc/api/jsepsessiondescription.h" -#include "webrtc/base/gunit.h" -#include "webrtc/base/helpers.h" -#include "webrtc/base/ssladapter.h" -#include "webrtc/base/stringencode.h" #include "webrtc/p2p/base/candidate.h" #include "webrtc/p2p/base/p2pconstants.h" #include "webrtc/p2p/base/sessiondescription.h" #include "webrtc/pc/mediasession.h" +#include "webrtc/rtc_base/gunit.h" +#include "webrtc/rtc_base/helpers.h" +#include "webrtc/rtc_base/ssladapter.h" +#include "webrtc/rtc_base/stringencode.h" using webrtc::IceCandidateCollection; using webrtc::IceCandidateInterface; diff --git a/webrtc/pc/localaudiosource_unittest.cc b/webrtc/pc/localaudiosource_unittest.cc index eb42213a9f..9b26095f49 100644 --- a/webrtc/pc/localaudiosource_unittest.cc +++ b/webrtc/pc/localaudiosource_unittest.cc @@ -14,9 +14,9 @@ #include #include "webrtc/api/test/fakeconstraints.h" -#include "webrtc/base/gunit.h" #include "webrtc/media/base/fakemediaengine.h" #include "webrtc/media/base/fakevideorenderer.h" +#include "webrtc/rtc_base/gunit.h" using webrtc::LocalAudioSource; using webrtc::MediaConstraintsInterface; diff --git a/webrtc/pc/mediaconstraintsinterface_unittest.cc b/webrtc/pc/mediaconstraintsinterface_unittest.cc index dcf4bb7fde..81b5fb47a0 100644 --- a/webrtc/pc/mediaconstraintsinterface_unittest.cc +++ b/webrtc/pc/mediaconstraintsinterface_unittest.cc @@ -11,7 +11,7 @@ #include "webrtc/api/mediaconstraintsinterface.h" #include "webrtc/api/test/fakeconstraints.h" -#include "webrtc/base/gunit.h" +#include "webrtc/rtc_base/gunit.h" namespace webrtc { diff --git a/webrtc/pc/mediamonitor.cc b/webrtc/pc/mediamonitor.cc index 010f00ef16..22e16dc840 100644 --- a/webrtc/pc/mediamonitor.cc +++ b/webrtc/pc/mediamonitor.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/base/checks.h" -#include "webrtc/pc/channelmanager.h" #include "webrtc/pc/mediamonitor.h" +#include "webrtc/pc/channelmanager.h" +#include "webrtc/rtc_base/checks.h" namespace cricket { diff --git a/webrtc/pc/mediamonitor.h b/webrtc/pc/mediamonitor.h index d294cf13e7..5f2a1e23b9 100644 --- a/webrtc/pc/mediamonitor.h +++ b/webrtc/pc/mediamonitor.h @@ -13,11 +13,11 @@ #ifndef WEBRTC_PC_MEDIAMONITOR_H_ #define WEBRTC_PC_MEDIAMONITOR_H_ -#include "webrtc/base/criticalsection.h" -#include "webrtc/base/sigslot.h" -#include "webrtc/base/thread.h" -#include "webrtc/base/thread_annotations.h" #include "webrtc/media/base/mediachannel.h" +#include "webrtc/rtc_base/criticalsection.h" +#include "webrtc/rtc_base/sigslot.h" +#include "webrtc/rtc_base/thread.h" +#include "webrtc/rtc_base/thread_annotations.h" namespace cricket { diff --git a/webrtc/pc/mediasession.cc b/webrtc/pc/mediasession.cc index f6190c2e8f..de8f72c926 100644 --- a/webrtc/pc/mediasession.cc +++ b/webrtc/pc/mediasession.cc @@ -18,12 +18,6 @@ #include #include -#include "webrtc/base/base64.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/helpers.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/optional.h" -#include "webrtc/base/stringutils.h" #include "webrtc/common_types.h" #include "webrtc/media/base/cryptoparams.h" #include "webrtc/media/base/h264_profile_level_id.h" @@ -31,6 +25,12 @@ #include "webrtc/p2p/base/p2pconstants.h" #include "webrtc/pc/channelmanager.h" #include "webrtc/pc/srtpfilter.h" +#include "webrtc/rtc_base/base64.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/helpers.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/optional.h" +#include "webrtc/rtc_base/stringutils.h" namespace { const char kInline[] = "inline:"; diff --git a/webrtc/pc/mediasession_unittest.cc b/webrtc/pc/mediasession_unittest.cc index 670ace2057..ae8d13940b 100644 --- a/webrtc/pc/mediasession_unittest.cc +++ b/webrtc/pc/mediasession_unittest.cc @@ -12,11 +12,6 @@ #include #include -#include "webrtc/base/checks.h" -#include "webrtc/base/fakesslidentity.h" -#include "webrtc/base/gunit.h" -#include "webrtc/base/messagedigest.h" -#include "webrtc/base/ssladapter.h" #include "webrtc/media/base/codec.h" #include "webrtc/media/base/testutils.h" #include "webrtc/p2p/base/p2pconstants.h" @@ -24,6 +19,11 @@ #include "webrtc/p2p/base/transportinfo.h" #include "webrtc/pc/mediasession.h" #include "webrtc/pc/srtpfilter.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/fakesslidentity.h" +#include "webrtc/rtc_base/gunit.h" +#include "webrtc/rtc_base/messagedigest.h" +#include "webrtc/rtc_base/ssladapter.h" #define ASSERT_CRYPTO(cd, s, cs) \ ASSERT_EQ(s, cd->cryptos().size()); \ diff --git a/webrtc/pc/mediastream.cc b/webrtc/pc/mediastream.cc index 18307923ac..c13d80d9b6 100644 --- a/webrtc/pc/mediastream.cc +++ b/webrtc/pc/mediastream.cc @@ -9,8 +9,8 @@ */ #include "webrtc/pc/mediastream.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/logging.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/logging.h" namespace webrtc { diff --git a/webrtc/pc/mediastream_unittest.cc b/webrtc/pc/mediastream_unittest.cc index e2e3985507..01a547bbc5 100644 --- a/webrtc/pc/mediastream_unittest.cc +++ b/webrtc/pc/mediastream_unittest.cc @@ -10,14 +10,14 @@ #include -#include "webrtc/base/gunit.h" -#include "webrtc/base/refcount.h" -#include "webrtc/test/gmock.h" -#include "webrtc/test/gtest.h" #include "webrtc/pc/audiotrack.h" #include "webrtc/pc/mediastream.h" #include "webrtc/pc/test/fakevideotracksource.h" #include "webrtc/pc/videotrack.h" +#include "webrtc/rtc_base/gunit.h" +#include "webrtc/rtc_base/refcount.h" +#include "webrtc/test/gmock.h" +#include "webrtc/test/gtest.h" static const char kStreamLabel1[] = "local_stream_1"; static const char kVideoTrackId[] = "dummy_video_cam_1"; diff --git a/webrtc/pc/mediastreamobserver.h b/webrtc/pc/mediastreamobserver.h index 5d9012be60..d80c732f3b 100644 --- a/webrtc/pc/mediastreamobserver.h +++ b/webrtc/pc/mediastreamobserver.h @@ -12,8 +12,8 @@ #define WEBRTC_PC_MEDIASTREAMOBSERVER_H_ #include "webrtc/api/mediastreaminterface.h" -#include "webrtc/base/scoped_ref_ptr.h" -#include "webrtc/base/sigslot.h" +#include "webrtc/rtc_base/scoped_ref_ptr.h" +#include "webrtc/rtc_base/sigslot.h" namespace webrtc { diff --git a/webrtc/pc/peerconnection.cc b/webrtc/pc/peerconnection.cc index 12891df16b..a947c301a1 100644 --- a/webrtc/pc/peerconnection.cc +++ b/webrtc/pc/peerconnection.cc @@ -19,12 +19,6 @@ #include "webrtc/api/mediaconstraintsinterface.h" #include "webrtc/api/mediastreamproxy.h" #include "webrtc/api/mediastreamtrackproxy.h" -#include "webrtc/base/bind.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/stringencode.h" -#include "webrtc/base/stringutils.h" -#include "webrtc/base/trace_event.h" #include "webrtc/call/call.h" #include "webrtc/logging/rtc_event_log/rtc_event_log.h" #include "webrtc/media/sctp/sctptransport.h" @@ -39,6 +33,12 @@ #include "webrtc/pc/streamcollection.h" #include "webrtc/pc/videocapturertracksource.h" #include "webrtc/pc/videotrack.h" +#include "webrtc/rtc_base/bind.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/stringencode.h" +#include "webrtc/rtc_base/stringutils.h" +#include "webrtc/rtc_base/trace_event.h" #include "webrtc/system_wrappers/include/clock.h" #include "webrtc/system_wrappers/include/field_trial.h" diff --git a/webrtc/pc/peerconnection_integrationtest.cc b/webrtc/pc/peerconnection_integrationtest.cc index 12b99b4902..d20e2f965b 100644 --- a/webrtc/pc/peerconnection_integrationtest.cc +++ b/webrtc/pc/peerconnection_integrationtest.cc @@ -26,14 +26,6 @@ #include "webrtc/api/mediastreaminterface.h" #include "webrtc/api/peerconnectioninterface.h" #include "webrtc/api/test/fakeconstraints.h" -#include "webrtc/base/asyncinvoker.h" -#include "webrtc/base/fakenetwork.h" -#include "webrtc/base/gunit.h" -#include "webrtc/base/helpers.h" -#include "webrtc/base/ssladapter.h" -#include "webrtc/base/sslstreamadapter.h" -#include "webrtc/base/thread.h" -#include "webrtc/base/virtualsocketserver.h" #include "webrtc/media/engine/fakewebrtcvideoengine.h" #include "webrtc/p2p/base/p2pconstants.h" #include "webrtc/p2p/base/portinterface.h" @@ -50,6 +42,14 @@ #include "webrtc/pc/test/fakertccertificategenerator.h" #include "webrtc/pc/test/fakevideotrackrenderer.h" #include "webrtc/pc/test/mockpeerconnectionobservers.h" +#include "webrtc/rtc_base/asyncinvoker.h" +#include "webrtc/rtc_base/fakenetwork.h" +#include "webrtc/rtc_base/gunit.h" +#include "webrtc/rtc_base/helpers.h" +#include "webrtc/rtc_base/ssladapter.h" +#include "webrtc/rtc_base/sslstreamadapter.h" +#include "webrtc/rtc_base/thread.h" +#include "webrtc/rtc_base/virtualsocketserver.h" using cricket::ContentInfo; using cricket::FakeWebRtcVideoDecoder; diff --git a/webrtc/pc/peerconnectionendtoend_unittest.cc b/webrtc/pc/peerconnectionendtoend_unittest.cc index a735ea7c15..c83235229d 100644 --- a/webrtc/pc/peerconnectionendtoend_unittest.cc +++ b/webrtc/pc/peerconnectionendtoend_unittest.cc @@ -12,14 +12,14 @@ #include "webrtc/api/audio_codecs/builtin_audio_decoder_factory.h" #include "webrtc/api/audio_codecs/builtin_audio_encoder_factory.h" -#include "webrtc/base/gunit.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/ptr_util.h" -#include "webrtc/base/ssladapter.h" -#include "webrtc/base/sslstreamadapter.h" -#include "webrtc/base/stringencode.h" -#include "webrtc/base/stringutils.h" -#include "webrtc/base/thread.h" +#include "webrtc/rtc_base/gunit.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/ptr_util.h" +#include "webrtc/rtc_base/ssladapter.h" +#include "webrtc/rtc_base/sslstreamadapter.h" +#include "webrtc/rtc_base/stringencode.h" +#include "webrtc/rtc_base/stringutils.h" +#include "webrtc/rtc_base/thread.h" #ifdef WEBRTC_ANDROID #include "webrtc/pc/test/androidtestinitializer.h" #endif diff --git a/webrtc/pc/peerconnectionfactory.cc b/webrtc/pc/peerconnectionfactory.cc index 4bf118f9af..15e36f094a 100644 --- a/webrtc/pc/peerconnectionfactory.cc +++ b/webrtc/pc/peerconnectionfactory.cc @@ -18,9 +18,9 @@ #include "webrtc/api/peerconnectionfactoryproxy.h" #include "webrtc/api/peerconnectionproxy.h" #include "webrtc/api/videosourceproxy.h" -#include "webrtc/base/bind.h" -#include "webrtc/base/checks.h" #include "webrtc/logging/rtc_event_log/rtc_event_log.h" +#include "webrtc/rtc_base/bind.h" +#include "webrtc/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 diff --git a/webrtc/pc/peerconnectionfactory.h b/webrtc/pc/peerconnectionfactory.h index c93594db62..ebd3016934 100644 --- a/webrtc/pc/peerconnectionfactory.h +++ b/webrtc/pc/peerconnectionfactory.h @@ -16,10 +16,10 @@ #include "webrtc/api/mediastreaminterface.h" #include "webrtc/api/peerconnectioninterface.h" -#include "webrtc/base/scoped_ref_ptr.h" -#include "webrtc/base/thread.h" -#include "webrtc/base/rtccertificategenerator.h" #include "webrtc/pc/channelmanager.h" +#include "webrtc/rtc_base/rtccertificategenerator.h" +#include "webrtc/rtc_base/scoped_ref_ptr.h" +#include "webrtc/rtc_base/thread.h" namespace rtc { class BasicNetworkManager; diff --git a/webrtc/pc/peerconnectionfactory_unittest.cc b/webrtc/pc/peerconnectionfactory_unittest.cc index 10aacc0194..cbabc259bd 100644 --- a/webrtc/pc/peerconnectionfactory_unittest.cc +++ b/webrtc/pc/peerconnectionfactory_unittest.cc @@ -13,13 +13,13 @@ #include #include "webrtc/api/mediastreaminterface.h" -#include "webrtc/base/gunit.h" -#include "webrtc/base/thread.h" #include "webrtc/media/base/fakevideocapturer.h" #include "webrtc/media/engine/webrtccommon.h" #include "webrtc/media/engine/webrtcvoe.h" #include "webrtc/p2p/base/fakeportallocator.h" #include "webrtc/pc/peerconnectionfactory.h" +#include "webrtc/rtc_base/gunit.h" +#include "webrtc/rtc_base/thread.h" #ifdef WEBRTC_ANDROID #include "webrtc/pc/test/androidtestinitializer.h" #endif diff --git a/webrtc/pc/peerconnectioninterface_unittest.cc b/webrtc/pc/peerconnectioninterface_unittest.cc index c36460f73b..c10324a94b 100644 --- a/webrtc/pc/peerconnectioninterface_unittest.cc +++ b/webrtc/pc/peerconnectioninterface_unittest.cc @@ -21,12 +21,6 @@ #include "webrtc/api/rtpreceiverinterface.h" #include "webrtc/api/rtpsenderinterface.h" #include "webrtc/api/test/fakeconstraints.h" -#include "webrtc/base/gunit.h" -#include "webrtc/base/ssladapter.h" -#include "webrtc/base/sslstreamadapter.h" -#include "webrtc/base/stringutils.h" -#include "webrtc/base/thread.h" -#include "webrtc/base/virtualsocketserver.h" #include "webrtc/media/base/fakevideocapturer.h" #include "webrtc/media/engine/webrtcmediaengine.h" #include "webrtc/media/sctp/sctptransportinternal.h" @@ -43,6 +37,12 @@ #include "webrtc/pc/test/testsdpstrings.h" #include "webrtc/pc/videocapturertracksource.h" #include "webrtc/pc/videotrack.h" +#include "webrtc/rtc_base/gunit.h" +#include "webrtc/rtc_base/ssladapter.h" +#include "webrtc/rtc_base/sslstreamadapter.h" +#include "webrtc/rtc_base/stringutils.h" +#include "webrtc/rtc_base/thread.h" +#include "webrtc/rtc_base/virtualsocketserver.h" #include "webrtc/test/gmock.h" #ifdef WEBRTC_ANDROID diff --git a/webrtc/pc/proxy_unittest.cc b/webrtc/pc/proxy_unittest.cc index d7acdc193d..0d97c4174f 100644 --- a/webrtc/pc/proxy_unittest.cc +++ b/webrtc/pc/proxy_unittest.cc @@ -13,9 +13,9 @@ #include #include -#include "webrtc/base/gunit.h" -#include "webrtc/base/refcount.h" -#include "webrtc/base/thread.h" +#include "webrtc/rtc_base/gunit.h" +#include "webrtc/rtc_base/refcount.h" +#include "webrtc/rtc_base/thread.h" #include "webrtc/test/gmock.h" using ::testing::_; diff --git a/webrtc/pc/quicdatachannel.cc b/webrtc/pc/quicdatachannel.cc index 8907ce767f..ab8675dd57 100644 --- a/webrtc/pc/quicdatachannel.cc +++ b/webrtc/pc/quicdatachannel.cc @@ -10,12 +10,12 @@ #include "webrtc/pc/quicdatachannel.h" -#include "webrtc/base/bind.h" -#include "webrtc/base/bytebuffer.h" -#include "webrtc/base/copyonwritebuffer.h" -#include "webrtc/base/logging.h" #include "webrtc/p2p/quic/quictransportchannel.h" #include "webrtc/p2p/quic/reliablequicstream.h" +#include "webrtc/rtc_base/bind.h" +#include "webrtc/rtc_base/bytebuffer.h" +#include "webrtc/rtc_base/copyonwritebuffer.h" +#include "webrtc/rtc_base/logging.h" namespace webrtc { diff --git a/webrtc/pc/quicdatachannel.h b/webrtc/pc/quicdatachannel.h index 2f6288b7de..f580c4b7b4 100644 --- a/webrtc/pc/quicdatachannel.h +++ b/webrtc/pc/quicdatachannel.h @@ -16,9 +16,9 @@ #include #include "webrtc/api/datachannelinterface.h" -#include "webrtc/base/asyncinvoker.h" -#include "webrtc/base/sigslot.h" -#include "webrtc/base/thread.h" +#include "webrtc/rtc_base/asyncinvoker.h" +#include "webrtc/rtc_base/sigslot.h" +#include "webrtc/rtc_base/thread.h" namespace cricket { class QuicTransportChannel; diff --git a/webrtc/pc/quicdatachannel_unittest.cc b/webrtc/pc/quicdatachannel_unittest.cc index 649c36feb9..173d6dff4c 100644 --- a/webrtc/pc/quicdatachannel_unittest.cc +++ b/webrtc/pc/quicdatachannel_unittest.cc @@ -16,12 +16,12 @@ #include #include -#include "webrtc/base/bind.h" -#include "webrtc/base/gunit.h" -#include "webrtc/base/scoped_ref_ptr.h" #include "webrtc/p2p/base/faketransportcontroller.h" #include "webrtc/p2p/quic/quictransportchannel.h" #include "webrtc/p2p/quic/reliablequicstream.h" +#include "webrtc/rtc_base/bind.h" +#include "webrtc/rtc_base/gunit.h" +#include "webrtc/rtc_base/scoped_ref_ptr.h" using cricket::FakeTransportChannel; using cricket::QuicTransportChannel; diff --git a/webrtc/pc/quicdatatransport.cc b/webrtc/pc/quicdatatransport.cc index 8b0a93f085..142085e72b 100644 --- a/webrtc/pc/quicdatatransport.cc +++ b/webrtc/pc/quicdatatransport.cc @@ -10,10 +10,10 @@ #include "webrtc/pc/quicdatatransport.h" -#include "webrtc/base/bind.h" -#include "webrtc/base/logging.h" #include "webrtc/p2p/quic/quictransportchannel.h" #include "webrtc/p2p/quic/reliablequicstream.h" +#include "webrtc/rtc_base/bind.h" +#include "webrtc/rtc_base/logging.h" namespace webrtc { diff --git a/webrtc/pc/quicdatatransport.h b/webrtc/pc/quicdatatransport.h index 6b35a104f1..946e6b03b8 100644 --- a/webrtc/pc/quicdatatransport.h +++ b/webrtc/pc/quicdatatransport.h @@ -15,11 +15,11 @@ #include #include "webrtc/api/datachannelinterface.h" -#include "webrtc/base/scoped_ref_ptr.h" -#include "webrtc/base/sigslot.h" -#include "webrtc/base/thread.h" #include "webrtc/p2p/base/transportcontroller.h" #include "webrtc/pc/quicdatachannel.h" +#include "webrtc/rtc_base/scoped_ref_ptr.h" +#include "webrtc/rtc_base/sigslot.h" +#include "webrtc/rtc_base/thread.h" namespace cricket { class QuicTransportChannel; diff --git a/webrtc/pc/quicdatatransport_unittest.cc b/webrtc/pc/quicdatatransport_unittest.cc index af28159aea..8d6c189488 100644 --- a/webrtc/pc/quicdatatransport_unittest.cc +++ b/webrtc/pc/quicdatatransport_unittest.cc @@ -16,12 +16,12 @@ #include #include -#include "webrtc/base/bytebuffer.h" -#include "webrtc/base/gunit.h" #include "webrtc/p2p/base/faketransportcontroller.h" #include "webrtc/p2p/quic/quictransportchannel.h" #include "webrtc/p2p/quic/reliablequicstream.h" #include "webrtc/pc/quicdatachannel.h" +#include "webrtc/rtc_base/bytebuffer.h" +#include "webrtc/rtc_base/gunit.h" using webrtc::DataBuffer; using webrtc::DataChannelInit; diff --git a/webrtc/pc/remoteaudiosource.cc b/webrtc/pc/remoteaudiosource.cc index b2568191bd..8d1a5d0fd4 100644 --- a/webrtc/pc/remoteaudiosource.cc +++ b/webrtc/pc/remoteaudiosource.cc @@ -15,10 +15,10 @@ #include #include -#include "webrtc/base/checks.h" -#include "webrtc/base/constructormagic.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/thread.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/constructormagic.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/thread.h" namespace webrtc { diff --git a/webrtc/pc/remoteaudiosource.h b/webrtc/pc/remoteaudiosource.h index b84a016aad..14c16a79cc 100644 --- a/webrtc/pc/remoteaudiosource.h +++ b/webrtc/pc/remoteaudiosource.h @@ -16,8 +16,8 @@ #include "webrtc/api/call/audio_sink.h" #include "webrtc/api/notifier.h" -#include "webrtc/base/criticalsection.h" #include "webrtc/pc/channel.h" +#include "webrtc/rtc_base/criticalsection.h" namespace rtc { struct Message; diff --git a/webrtc/pc/rtcpmuxfilter.cc b/webrtc/pc/rtcpmuxfilter.cc index f3ae4680b9..67293b3309 100644 --- a/webrtc/pc/rtcpmuxfilter.cc +++ b/webrtc/pc/rtcpmuxfilter.cc @@ -10,7 +10,7 @@ #include "webrtc/pc/rtcpmuxfilter.h" -#include "webrtc/base/logging.h" +#include "webrtc/rtc_base/logging.h" namespace cricket { diff --git a/webrtc/pc/rtcpmuxfilter_unittest.cc b/webrtc/pc/rtcpmuxfilter_unittest.cc index 807103a145..bd2fea1766 100644 --- a/webrtc/pc/rtcpmuxfilter_unittest.cc +++ b/webrtc/pc/rtcpmuxfilter_unittest.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/base/gunit.h" -#include "webrtc/media/base/testutils.h" #include "webrtc/pc/rtcpmuxfilter.h" +#include "webrtc/media/base/testutils.h" +#include "webrtc/rtc_base/gunit.h" TEST(RtcpMuxFilterTest, IsActiveSender) { cricket::RtcpMuxFilter filter; diff --git a/webrtc/pc/rtcstats_integrationtest.cc b/webrtc/pc/rtcstats_integrationtest.cc index 3337c4ee8b..3d1e7d66ea 100644 --- a/webrtc/pc/rtcstats_integrationtest.cc +++ b/webrtc/pc/rtcstats_integrationtest.cc @@ -17,13 +17,13 @@ #include "webrtc/api/peerconnectioninterface.h" #include "webrtc/api/stats/rtcstats_objects.h" #include "webrtc/api/stats/rtcstatsreport.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/gunit.h" -#include "webrtc/base/refcountedobject.h" -#include "webrtc/base/scoped_ref_ptr.h" -#include "webrtc/base/virtualsocketserver.h" #include "webrtc/pc/test/peerconnectiontestwrapper.h" #include "webrtc/pc/test/rtcstatsobtainer.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/gunit.h" +#include "webrtc/rtc_base/refcountedobject.h" +#include "webrtc/rtc_base/scoped_ref_ptr.h" +#include "webrtc/rtc_base/virtualsocketserver.h" namespace webrtc { diff --git a/webrtc/pc/rtcstatscollector.cc b/webrtc/pc/rtcstatscollector.cc index ca995327d5..f5b8c8a936 100644 --- a/webrtc/pc/rtcstatscollector.cc +++ b/webrtc/pc/rtcstatscollector.cc @@ -17,14 +17,14 @@ #include "webrtc/api/mediastreaminterface.h" #include "webrtc/api/peerconnectioninterface.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/timeutils.h" #include "webrtc/media/base/mediachannel.h" #include "webrtc/p2p/base/candidate.h" #include "webrtc/p2p/base/p2pconstants.h" #include "webrtc/p2p/base/port.h" #include "webrtc/pc/peerconnection.h" #include "webrtc/pc/webrtcsession.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/timeutils.h" namespace webrtc { diff --git a/webrtc/pc/rtcstatscollector.h b/webrtc/pc/rtcstatscollector.h index 9dce0fe79e..980edd6078 100644 --- a/webrtc/pc/rtcstatscollector.h +++ b/webrtc/pc/rtcstatscollector.h @@ -19,17 +19,17 @@ #include "webrtc/api/stats/rtcstats_objects.h" #include "webrtc/api/stats/rtcstatscollectorcallback.h" #include "webrtc/api/stats/rtcstatsreport.h" -#include "webrtc/base/asyncinvoker.h" -#include "webrtc/base/optional.h" -#include "webrtc/base/refcount.h" -#include "webrtc/base/scoped_ref_ptr.h" -#include "webrtc/base/sigslot.h" -#include "webrtc/base/sslidentity.h" -#include "webrtc/base/timeutils.h" #include "webrtc/call/call.h" #include "webrtc/media/base/mediachannel.h" #include "webrtc/pc/datachannel.h" #include "webrtc/pc/trackmediainfomap.h" +#include "webrtc/rtc_base/asyncinvoker.h" +#include "webrtc/rtc_base/optional.h" +#include "webrtc/rtc_base/refcount.h" +#include "webrtc/rtc_base/scoped_ref_ptr.h" +#include "webrtc/rtc_base/sigslot.h" +#include "webrtc/rtc_base/sslidentity.h" +#include "webrtc/rtc_base/timeutils.h" namespace cricket { class Candidate; diff --git a/webrtc/pc/rtcstatscollector_unittest.cc b/webrtc/pc/rtcstatscollector_unittest.cc index 7b78632126..43c94efe62 100644 --- a/webrtc/pc/rtcstatscollector_unittest.cc +++ b/webrtc/pc/rtcstatscollector_unittest.cc @@ -22,15 +22,6 @@ #include "webrtc/api/stats/rtcstatsreport.h" #include "webrtc/api/test/mock_rtpreceiver.h" #include "webrtc/api/test/mock_rtpsender.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/fakeclock.h" -#include "webrtc/base/fakesslidentity.h" -#include "webrtc/base/gunit.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/socketaddress.h" -#include "webrtc/base/thread_checker.h" -#include "webrtc/base/timedelta.h" -#include "webrtc/base/timeutils.h" #include "webrtc/logging/rtc_event_log/rtc_event_log.h" #include "webrtc/media/base/fakemediaengine.h" #include "webrtc/media/base/test/mock_mediachannel.h" @@ -42,6 +33,15 @@ #include "webrtc/pc/test/mock_peerconnection.h" #include "webrtc/pc/test/mock_webrtcsession.h" #include "webrtc/pc/test/rtcstatsobtainer.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/fakeclock.h" +#include "webrtc/rtc_base/fakesslidentity.h" +#include "webrtc/rtc_base/gunit.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/socketaddress.h" +#include "webrtc/rtc_base/thread_checker.h" +#include "webrtc/rtc_base/timedelta.h" +#include "webrtc/rtc_base/timeutils.h" using testing::_; using testing::Invoke; diff --git a/webrtc/pc/rtpreceiver.cc b/webrtc/pc/rtpreceiver.cc index 96974ee9f7..f3eef5a9a9 100644 --- a/webrtc/pc/rtpreceiver.cc +++ b/webrtc/pc/rtpreceiver.cc @@ -12,9 +12,9 @@ #include "webrtc/api/mediastreamtrackproxy.h" #include "webrtc/api/videosourceproxy.h" -#include "webrtc/base/trace_event.h" #include "webrtc/pc/audiotrack.h" #include "webrtc/pc/videotrack.h" +#include "webrtc/rtc_base/trace_event.h" namespace webrtc { diff --git a/webrtc/pc/rtpreceiver.h b/webrtc/pc/rtpreceiver.h index b0ea247de2..9809b734ab 100644 --- a/webrtc/pc/rtpreceiver.h +++ b/webrtc/pc/rtpreceiver.h @@ -21,12 +21,12 @@ #include "webrtc/api/mediastreaminterface.h" #include "webrtc/api/rtpreceiverinterface.h" -#include "webrtc/base/basictypes.h" -#include "webrtc/base/sigslot.h" #include "webrtc/media/base/videobroadcaster.h" #include "webrtc/pc/channel.h" #include "webrtc/pc/remoteaudiosource.h" #include "webrtc/pc/videotracksource.h" +#include "webrtc/rtc_base/basictypes.h" +#include "webrtc/rtc_base/sigslot.h" namespace webrtc { diff --git a/webrtc/pc/rtpsender.cc b/webrtc/pc/rtpsender.cc index 5cf13d060d..a16a28c193 100644 --- a/webrtc/pc/rtpsender.cc +++ b/webrtc/pc/rtpsender.cc @@ -11,10 +11,10 @@ #include "webrtc/pc/rtpsender.h" #include "webrtc/api/mediastreaminterface.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/helpers.h" -#include "webrtc/base/trace_event.h" #include "webrtc/pc/localaudiosource.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/helpers.h" +#include "webrtc/rtc_base/trace_event.h" namespace webrtc { diff --git a/webrtc/pc/rtpsender.h b/webrtc/pc/rtpsender.h index 57ec71edf3..24edb4b6f6 100644 --- a/webrtc/pc/rtpsender.h +++ b/webrtc/pc/rtpsender.h @@ -20,8 +20,8 @@ #include "webrtc/api/mediastreaminterface.h" #include "webrtc/api/rtpsenderinterface.h" -#include "webrtc/base/basictypes.h" -#include "webrtc/base/criticalsection.h" +#include "webrtc/rtc_base/basictypes.h" +#include "webrtc/rtc_base/criticalsection.h" // Adding 'nogncheck' to disable the gn include headers check to support modular // WebRTC build targets. #include "webrtc/media/base/audiosource.h" // nogncheck diff --git a/webrtc/pc/rtpsenderreceiver_unittest.cc b/webrtc/pc/rtpsenderreceiver_unittest.cc index 994cf3d59e..bf413e411d 100644 --- a/webrtc/pc/rtpsenderreceiver_unittest.cc +++ b/webrtc/pc/rtpsenderreceiver_unittest.cc @@ -12,8 +12,6 @@ #include #include -#include "webrtc/base/gunit.h" -#include "webrtc/base/sigslot.h" #include "webrtc/logging/rtc_event_log/rtc_event_log.h" #include "webrtc/media/base/fakemediaengine.h" #include "webrtc/media/base/mediachannel.h" @@ -30,6 +28,8 @@ #include "webrtc/pc/test/fakevideotracksource.h" #include "webrtc/pc/videotrack.h" #include "webrtc/pc/videotracksource.h" +#include "webrtc/rtc_base/gunit.h" +#include "webrtc/rtc_base/sigslot.h" #include "webrtc/test/gmock.h" #include "webrtc/test/gtest.h" diff --git a/webrtc/pc/rtptransport.cc b/webrtc/pc/rtptransport.cc index 2981675bac..6b0141fc8e 100644 --- a/webrtc/pc/rtptransport.cc +++ b/webrtc/pc/rtptransport.cc @@ -10,11 +10,11 @@ #include "webrtc/pc/rtptransport.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/copyonwritebuffer.h" -#include "webrtc/base/trace_event.h" #include "webrtc/media/base/rtputils.h" #include "webrtc/p2p/base/packettransportinterface.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/copyonwritebuffer.h" +#include "webrtc/rtc_base/trace_event.h" namespace webrtc { diff --git a/webrtc/pc/rtptransport.h b/webrtc/pc/rtptransport.h index 1224b4432b..87f29bac2a 100644 --- a/webrtc/pc/rtptransport.h +++ b/webrtc/pc/rtptransport.h @@ -12,8 +12,8 @@ #define WEBRTC_PC_RTPTRANSPORT_H_ #include "webrtc/api/ortc/rtptransportinterface.h" -#include "webrtc/base/sigslot.h" #include "webrtc/pc/bundlefilter.h" +#include "webrtc/rtc_base/sigslot.h" namespace rtc { diff --git a/webrtc/pc/rtptransport_unittest.cc b/webrtc/pc/rtptransport_unittest.cc index df84d471a7..4b75a05c80 100644 --- a/webrtc/pc/rtptransport_unittest.cc +++ b/webrtc/pc/rtptransport_unittest.cc @@ -10,9 +10,9 @@ #include -#include "webrtc/base/gunit.h" #include "webrtc/p2p/base/fakepackettransport.h" #include "webrtc/pc/rtptransport.h" +#include "webrtc/rtc_base/gunit.h" namespace webrtc { diff --git a/webrtc/pc/sctputils.cc b/webrtc/pc/sctputils.cc index 1c2f76f496..48f380b5b6 100644 --- a/webrtc/pc/sctputils.cc +++ b/webrtc/pc/sctputils.cc @@ -10,9 +10,9 @@ #include "webrtc/pc/sctputils.h" -#include "webrtc/base/bytebuffer.h" -#include "webrtc/base/copyonwritebuffer.h" -#include "webrtc/base/logging.h" +#include "webrtc/rtc_base/bytebuffer.h" +#include "webrtc/rtc_base/copyonwritebuffer.h" +#include "webrtc/rtc_base/logging.h" namespace webrtc { diff --git a/webrtc/pc/sctputils_unittest.cc b/webrtc/pc/sctputils_unittest.cc index dc56e94d31..5ef3fcb04f 100644 --- a/webrtc/pc/sctputils_unittest.cc +++ b/webrtc/pc/sctputils_unittest.cc @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/base/bytebuffer.h" -#include "webrtc/base/copyonwritebuffer.h" -#include "webrtc/base/gunit.h" #include "webrtc/pc/sctputils.h" +#include "webrtc/rtc_base/bytebuffer.h" +#include "webrtc/rtc_base/copyonwritebuffer.h" +#include "webrtc/rtc_base/gunit.h" class SctpUtilsTest : public testing::Test { public: diff --git a/webrtc/pc/srtpfilter.cc b/webrtc/pc/srtpfilter.cc index 62606e0025..a7634757d6 100644 --- a/webrtc/pc/srtpfilter.cc +++ b/webrtc/pc/srtpfilter.cc @@ -16,16 +16,16 @@ #include "third_party/libsrtp/include/srtp.h" #include "third_party/libsrtp/include/srtp_priv.h" -#include "webrtc/base/base64.h" -#include "webrtc/base/buffer.h" -#include "webrtc/base/byteorder.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/sslstreamadapter.h" -#include "webrtc/base/stringencode.h" -#include "webrtc/base/timeutils.h" #include "webrtc/media/base/rtputils.h" #include "webrtc/pc/externalhmac.h" +#include "webrtc/rtc_base/base64.h" +#include "webrtc/rtc_base/buffer.h" +#include "webrtc/rtc_base/byteorder.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/sslstreamadapter.h" +#include "webrtc/rtc_base/stringencode.h" +#include "webrtc/rtc_base/timeutils.h" namespace cricket { diff --git a/webrtc/pc/srtpfilter.h b/webrtc/pc/srtpfilter.h index 6051e52660..97ae26b00d 100644 --- a/webrtc/pc/srtpfilter.h +++ b/webrtc/pc/srtpfilter.h @@ -17,13 +17,13 @@ #include #include -#include "webrtc/base/basictypes.h" -#include "webrtc/base/constructormagic.h" -#include "webrtc/base/criticalsection.h" -#include "webrtc/base/sslstreamadapter.h" -#include "webrtc/base/thread_checker.h" #include "webrtc/media/base/cryptoparams.h" #include "webrtc/p2p/base/sessiondescription.h" +#include "webrtc/rtc_base/basictypes.h" +#include "webrtc/rtc_base/constructormagic.h" +#include "webrtc/rtc_base/criticalsection.h" +#include "webrtc/rtc_base/sslstreamadapter.h" +#include "webrtc/rtc_base/thread_checker.h" // Forward declaration to avoid pulling in libsrtp headers here struct srtp_event_data_t; diff --git a/webrtc/pc/srtpfilter_unittest.cc b/webrtc/pc/srtpfilter_unittest.cc index 4d1540e2fd..a200de2e0c 100644 --- a/webrtc/pc/srtpfilter_unittest.cc +++ b/webrtc/pc/srtpfilter_unittest.cc @@ -13,14 +13,14 @@ #include "webrtc/pc/srtpfilter.h" #include "third_party/libsrtp/include/srtp.h" -#include "webrtc/base/buffer.h" -#include "webrtc/base/byteorder.h" -#include "webrtc/base/constructormagic.h" -#include "webrtc/base/gunit.h" -#include "webrtc/base/thread.h" #include "webrtc/media/base/cryptoparams.h" #include "webrtc/media/base/fakertp.h" #include "webrtc/p2p/base/sessiondescription.h" +#include "webrtc/rtc_base/buffer.h" +#include "webrtc/rtc_base/byteorder.h" +#include "webrtc/rtc_base/constructormagic.h" +#include "webrtc/rtc_base/gunit.h" +#include "webrtc/rtc_base/thread.h" using rtc::CS_AES_CM_128_HMAC_SHA1_80; using rtc::CS_AES_CM_128_HMAC_SHA1_32; diff --git a/webrtc/pc/statscollector.cc b/webrtc/pc/statscollector.cc index 27cb6c3083..8da5b88589 100644 --- a/webrtc/pc/statscollector.cc +++ b/webrtc/pc/statscollector.cc @@ -14,10 +14,10 @@ #include #include -#include "webrtc/base/base64.h" -#include "webrtc/base/checks.h" #include "webrtc/pc/channel.h" #include "webrtc/pc/peerconnection.h" +#include "webrtc/rtc_base/base64.h" +#include "webrtc/rtc_base/checks.h" namespace webrtc { namespace { diff --git a/webrtc/pc/statscollector_unittest.cc b/webrtc/pc/statscollector_unittest.cc index 165457c9c8..9b62b81d33 100644 --- a/webrtc/pc/statscollector_unittest.cc +++ b/webrtc/pc/statscollector_unittest.cc @@ -16,11 +16,6 @@ #include "webrtc/pc/statscollector.h" #include "webrtc/api/mediastreaminterface.h" -#include "webrtc/base/base64.h" -#include "webrtc/base/fakesslidentity.h" -#include "webrtc/base/gunit.h" -#include "webrtc/base/network.h" -#include "webrtc/base/stringencode.h" #include "webrtc/logging/rtc_event_log/rtc_event_log.h" #include "webrtc/media/base/fakemediaengine.h" #include "webrtc/media/base/test/mock_mediachannel.h" @@ -34,6 +29,11 @@ #include "webrtc/pc/test/mock_peerconnection.h" #include "webrtc/pc/test/mock_webrtcsession.h" #include "webrtc/pc/videotrack.h" +#include "webrtc/rtc_base/base64.h" +#include "webrtc/rtc_base/fakesslidentity.h" +#include "webrtc/rtc_base/gunit.h" +#include "webrtc/rtc_base/network.h" +#include "webrtc/rtc_base/stringencode.h" #include "webrtc/test/gmock.h" #include "webrtc/test/gtest.h" diff --git a/webrtc/pc/test/androidtestinitializer.cc b/webrtc/pc/test/androidtestinitializer.cc index f070104177..d1b0dab4b0 100644 --- a/webrtc/pc/test/androidtestinitializer.cc +++ b/webrtc/pc/test/androidtestinitializer.cc @@ -12,7 +12,7 @@ #include -#include "webrtc/base/ignore_wundef.h" +#include "webrtc/rtc_base/ignore_wundef.h" // Note: this dependency is dangerous since it reaches into Chromium's base. // There's a risk of e.g. macro clashes. This file may only be used in tests. @@ -22,9 +22,9 @@ RTC_PUSH_IGNORING_WUNDEF() #include "base/android/jni_android.h" RTC_POP_IGNORING_WUNDEF() -#include "webrtc/base/checks.h" -#include "webrtc/base/ssladapter.h" #include "webrtc/modules/utility/include/jvm_android.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/ssladapter.h" namespace webrtc { diff --git a/webrtc/pc/test/fakeaudiocapturemodule.cc b/webrtc/pc/test/fakeaudiocapturemodule.cc index 5c91ddf025..4bc6e4faec 100644 --- a/webrtc/pc/test/fakeaudiocapturemodule.cc +++ b/webrtc/pc/test/fakeaudiocapturemodule.cc @@ -10,10 +10,10 @@ #include "webrtc/pc/test/fakeaudiocapturemodule.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/refcount.h" -#include "webrtc/base/thread.h" -#include "webrtc/base/timeutils.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/refcount.h" +#include "webrtc/rtc_base/thread.h" +#include "webrtc/rtc_base/timeutils.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/webrtc/pc/test/fakeaudiocapturemodule.h b/webrtc/pc/test/fakeaudiocapturemodule.h index 72735b6fa7..f01b3e8e5b 100644 --- a/webrtc/pc/test/fakeaudiocapturemodule.h +++ b/webrtc/pc/test/fakeaudiocapturemodule.h @@ -22,12 +22,12 @@ #include -#include "webrtc/base/basictypes.h" -#include "webrtc/base/criticalsection.h" -#include "webrtc/base/messagehandler.h" -#include "webrtc/base/scoped_ref_ptr.h" #include "webrtc/common_types.h" #include "webrtc/modules/audio_device/include/audio_device.h" +#include "webrtc/rtc_base/basictypes.h" +#include "webrtc/rtc_base/criticalsection.h" +#include "webrtc/rtc_base/messagehandler.h" +#include "webrtc/rtc_base/scoped_ref_ptr.h" namespace rtc { class Thread; diff --git a/webrtc/pc/test/fakeaudiocapturemodule_unittest.cc b/webrtc/pc/test/fakeaudiocapturemodule_unittest.cc index aa40af79d0..62885c2cdb 100644 --- a/webrtc/pc/test/fakeaudiocapturemodule_unittest.cc +++ b/webrtc/pc/test/fakeaudiocapturemodule_unittest.cc @@ -12,10 +12,10 @@ #include -#include "webrtc/base/criticalsection.h" -#include "webrtc/base/gunit.h" -#include "webrtc/base/scoped_ref_ptr.h" -#include "webrtc/base/thread.h" +#include "webrtc/rtc_base/criticalsection.h" +#include "webrtc/rtc_base/gunit.h" +#include "webrtc/rtc_base/scoped_ref_ptr.h" +#include "webrtc/rtc_base/thread.h" using std::min; diff --git a/webrtc/pc/test/fakedatachannelprovider.h b/webrtc/pc/test/fakedatachannelprovider.h index 114f3de7e6..89bb987fe0 100644 --- a/webrtc/pc/test/fakedatachannelprovider.h +++ b/webrtc/pc/test/fakedatachannelprovider.h @@ -11,8 +11,8 @@ #ifndef WEBRTC_PC_TEST_FAKEDATACHANNELPROVIDER_H_ #define WEBRTC_PC_TEST_FAKEDATACHANNELPROVIDER_H_ -#include "webrtc/base/checks.h" #include "webrtc/pc/datachannel.h" +#include "webrtc/rtc_base/checks.h" class FakeDataChannelProvider : public webrtc::DataChannelProviderInterface { public: diff --git a/webrtc/pc/test/fakeperiodicvideocapturer.h b/webrtc/pc/test/fakeperiodicvideocapturer.h index 551df8b0e5..02b4e4b3e5 100644 --- a/webrtc/pc/test/fakeperiodicvideocapturer.h +++ b/webrtc/pc/test/fakeperiodicvideocapturer.h @@ -16,8 +16,8 @@ #include -#include "webrtc/base/thread.h" #include "webrtc/media/base/fakevideocapturer.h" +#include "webrtc/rtc_base/thread.h" namespace webrtc { diff --git a/webrtc/pc/test/fakertccertificategenerator.h b/webrtc/pc/test/fakertccertificategenerator.h index ce36834817..39b9107448 100644 --- a/webrtc/pc/test/fakertccertificategenerator.h +++ b/webrtc/pc/test/fakertccertificategenerator.h @@ -16,8 +16,8 @@ #include #include "webrtc/api/peerconnectioninterface.h" -#include "webrtc/base/rtccertificate.h" -#include "webrtc/base/rtccertificategenerator.h" +#include "webrtc/rtc_base/rtccertificate.h" +#include "webrtc/rtc_base/rtccertificategenerator.h" // RSA with mod size 1024, pub exp 0x10001. static const rtc::RTCCertificatePEM kRsaPems[] = { diff --git a/webrtc/pc/test/mock_peerconnection.h b/webrtc/pc/test/mock_peerconnection.h index 1256067237..e743cd85c8 100644 --- a/webrtc/pc/test/mock_peerconnection.h +++ b/webrtc/pc/test/mock_peerconnection.h @@ -13,10 +13,10 @@ #include -#include "webrtc/base/thread.h" #include "webrtc/call/call.h" #include "webrtc/logging/rtc_event_log/rtc_event_log.h" #include "webrtc/pc/peerconnection.h" +#include "webrtc/rtc_base/thread.h" #include "webrtc/test/gmock.h" namespace webrtc { diff --git a/webrtc/pc/test/mockpeerconnectionobservers.h b/webrtc/pc/test/mockpeerconnectionobservers.h index fb4c00419a..5367eeb62a 100644 --- a/webrtc/pc/test/mockpeerconnectionobservers.h +++ b/webrtc/pc/test/mockpeerconnectionobservers.h @@ -17,7 +17,7 @@ #include #include "webrtc/api/datachannelinterface.h" -#include "webrtc/base/checks.h" +#include "webrtc/rtc_base/checks.h" namespace webrtc { diff --git a/webrtc/pc/test/peerconnectiontestwrapper.cc b/webrtc/pc/test/peerconnectiontestwrapper.cc index f1bf21d53f..0cd28040ed 100644 --- a/webrtc/pc/test/peerconnectiontestwrapper.cc +++ b/webrtc/pc/test/peerconnectiontestwrapper.cc @@ -10,12 +10,12 @@ #include -#include "webrtc/base/gunit.h" #include "webrtc/p2p/base/fakeportallocator.h" #include "webrtc/pc/test/fakeperiodicvideocapturer.h" #include "webrtc/pc/test/fakertccertificategenerator.h" #include "webrtc/pc/test/mockpeerconnectionobservers.h" #include "webrtc/pc/test/peerconnectiontestwrapper.h" +#include "webrtc/rtc_base/gunit.h" static const char kStreamLabelBase[] = "stream_label"; static const char kVideoTrackLabelBase[] = "video_track"; diff --git a/webrtc/pc/test/peerconnectiontestwrapper.h b/webrtc/pc/test/peerconnectiontestwrapper.h index 124e63d847..c0d1ea3402 100644 --- a/webrtc/pc/test/peerconnectiontestwrapper.h +++ b/webrtc/pc/test/peerconnectiontestwrapper.h @@ -15,9 +15,9 @@ #include "webrtc/api/peerconnectioninterface.h" #include "webrtc/api/test/fakeconstraints.h" -#include "webrtc/base/sigslot.h" #include "webrtc/pc/test/fakeaudiocapturemodule.h" #include "webrtc/pc/test/fakevideotrackrenderer.h" +#include "webrtc/rtc_base/sigslot.h" class PeerConnectionTestWrapper : public webrtc::PeerConnectionObserver, diff --git a/webrtc/pc/test/rtcstatsobtainer.h b/webrtc/pc/test/rtcstatsobtainer.h index d0d4b61359..62e995e3b0 100644 --- a/webrtc/pc/test/rtcstatsobtainer.h +++ b/webrtc/pc/test/rtcstatsobtainer.h @@ -12,7 +12,7 @@ #define WEBRTC_PC_TEST_RTCSTATSOBTAINER_H_ #include "webrtc/api/stats/rtcstatsreport.h" -#include "webrtc/base/gunit.h" +#include "webrtc/rtc_base/gunit.h" namespace webrtc { diff --git a/webrtc/pc/trackmediainfomap.h b/webrtc/pc/trackmediainfomap.h index ceab741bad..174d331415 100644 --- a/webrtc/pc/trackmediainfomap.h +++ b/webrtc/pc/trackmediainfomap.h @@ -18,8 +18,8 @@ #include "webrtc/api/mediastreaminterface.h" #include "webrtc/api/rtpreceiverinterface.h" #include "webrtc/api/rtpsenderinterface.h" -#include "webrtc/base/refcount.h" #include "webrtc/media/base/mediachannel.h" +#include "webrtc/rtc_base/refcount.h" namespace webrtc { diff --git a/webrtc/pc/trackmediainfomap_unittest.cc b/webrtc/pc/trackmediainfomap_unittest.cc index 07436800f8..b380cc4184 100644 --- a/webrtc/pc/trackmediainfomap_unittest.cc +++ b/webrtc/pc/trackmediainfomap_unittest.cc @@ -19,11 +19,11 @@ #include "webrtc/api/rtpsenderinterface.h" #include "webrtc/api/test/mock_rtpreceiver.h" #include "webrtc/api/test/mock_rtpsender.h" -#include "webrtc/base/refcount.h" #include "webrtc/media/base/mediachannel.h" #include "webrtc/pc/audiotrack.h" #include "webrtc/pc/test/fakevideotracksource.h" #include "webrtc/pc/videotrack.h" +#include "webrtc/rtc_base/refcount.h" #include "webrtc/test/gtest.h" namespace webrtc { diff --git a/webrtc/pc/videocapturertracksource.cc b/webrtc/pc/videocapturertracksource.cc index 216362b188..4cddf7f535 100644 --- a/webrtc/pc/videocapturertracksource.cc +++ b/webrtc/pc/videocapturertracksource.cc @@ -15,8 +15,8 @@ #include #include "webrtc/api/mediaconstraintsinterface.h" -#include "webrtc/base/arraysize.h" -#include "webrtc/base/checks.h" +#include "webrtc/rtc_base/arraysize.h" +#include "webrtc/rtc_base/checks.h" using cricket::CaptureState; using webrtc::MediaConstraintsInterface; diff --git a/webrtc/pc/videocapturertracksource.h b/webrtc/pc/videocapturertracksource.h index 2477340cdf..0e6eb27a25 100644 --- a/webrtc/pc/videocapturertracksource.h +++ b/webrtc/pc/videocapturertracksource.h @@ -14,11 +14,11 @@ #include #include "webrtc/api/mediastreaminterface.h" -#include "webrtc/base/asyncinvoker.h" -#include "webrtc/base/sigslot.h" #include "webrtc/media/base/videocapturer.h" #include "webrtc/media/base/videocommon.h" #include "webrtc/pc/videotracksource.h" +#include "webrtc/rtc_base/asyncinvoker.h" +#include "webrtc/rtc_base/sigslot.h" // VideoCapturerTrackSource implements VideoTrackSourceInterface. It owns a // cricket::VideoCapturer and make sure the camera is started at a resolution diff --git a/webrtc/pc/videocapturertracksource_unittest.cc b/webrtc/pc/videocapturertracksource_unittest.cc index 3fe726a49a..b6e50ae4ff 100644 --- a/webrtc/pc/videocapturertracksource_unittest.cc +++ b/webrtc/pc/videocapturertracksource_unittest.cc @@ -13,11 +13,11 @@ #include #include "webrtc/api/test/fakeconstraints.h" -#include "webrtc/base/gunit.h" #include "webrtc/media/base/fakemediaengine.h" #include "webrtc/media/base/fakevideocapturer.h" #include "webrtc/media/base/fakevideorenderer.h" #include "webrtc/pc/videocapturertracksource.h" +#include "webrtc/rtc_base/gunit.h" using webrtc::FakeConstraints; using webrtc::VideoCapturerTrackSource; diff --git a/webrtc/pc/videotrack.h b/webrtc/pc/videotrack.h index 7e75e14d07..f251797155 100644 --- a/webrtc/pc/videotrack.h +++ b/webrtc/pc/videotrack.h @@ -14,10 +14,10 @@ #include #include -#include "webrtc/base/scoped_ref_ptr.h" -#include "webrtc/base/thread_checker.h" #include "webrtc/media/base/videosourcebase.h" #include "webrtc/pc/mediastreamtrack.h" +#include "webrtc/rtc_base/scoped_ref_ptr.h" +#include "webrtc/rtc_base/thread_checker.h" namespace webrtc { diff --git a/webrtc/pc/videotrack_unittest.cc b/webrtc/pc/videotrack_unittest.cc index 6f4330fb33..d033efe632 100644 --- a/webrtc/pc/videotrack_unittest.cc +++ b/webrtc/pc/videotrack_unittest.cc @@ -11,12 +11,12 @@ #include #include -#include "webrtc/base/gunit.h" -#include "webrtc/media/base/fakevideocapturer.h" #include "webrtc/media/base/fakemediaengine.h" +#include "webrtc/media/base/fakevideocapturer.h" #include "webrtc/pc/test/fakevideotrackrenderer.h" #include "webrtc/pc/videocapturertracksource.h" #include "webrtc/pc/videotrack.h" +#include "webrtc/rtc_base/gunit.h" using webrtc::FakeVideoTrackRenderer; using webrtc::MediaSourceInterface; diff --git a/webrtc/pc/videotracksource.h b/webrtc/pc/videotracksource.h index 259b1c305a..41252d8a07 100644 --- a/webrtc/pc/videotracksource.h +++ b/webrtc/pc/videotracksource.h @@ -13,9 +13,9 @@ #include "webrtc/api/mediastreaminterface.h" #include "webrtc/api/notifier.h" -#include "webrtc/base/thread_checker.h" #include "webrtc/media/base/mediachannel.h" #include "webrtc/media/base/videosinkinterface.h" +#include "webrtc/rtc_base/thread_checker.h" // VideoTrackSource implements VideoTrackSourceInterface. namespace webrtc { diff --git a/webrtc/pc/webrtcsdp.cc b/webrtc/pc/webrtcsdp.cc index 8b08c27080..d9ed4255aa 100644 --- a/webrtc/pc/webrtcsdp.cc +++ b/webrtc/pc/webrtcsdp.cc @@ -22,11 +22,11 @@ #include "webrtc/api/jsepicecandidate.h" #include "webrtc/api/jsepsessiondescription.h" -#include "webrtc/base/arraysize.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/messagedigest.h" -#include "webrtc/base/stringutils.h" +#include "webrtc/rtc_base/arraysize.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/messagedigest.h" +#include "webrtc/rtc_base/stringutils.h" // for RtpExtension #include "webrtc/config.h" #include "webrtc/media/base/codec.h" diff --git a/webrtc/pc/webrtcsdp_unittest.cc b/webrtc/pc/webrtcsdp_unittest.cc index af6f2c91e6..20b2b4e15d 100644 --- a/webrtc/pc/webrtcsdp_unittest.cc +++ b/webrtc/pc/webrtcsdp_unittest.cc @@ -14,18 +14,18 @@ #include #include "webrtc/api/jsepsessiondescription.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/gunit.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/messagedigest.h" -#include "webrtc/base/sslfingerprint.h" -#include "webrtc/base/stringencode.h" -#include "webrtc/base/stringutils.h" #include "webrtc/media/base/mediaconstants.h" #include "webrtc/media/engine/webrtcvideoengine.h" #include "webrtc/modules/video_coding/codecs/h264/include/h264.h" #include "webrtc/p2p/base/p2pconstants.h" #include "webrtc/pc/mediasession.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/gunit.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/messagedigest.h" +#include "webrtc/rtc_base/sslfingerprint.h" +#include "webrtc/rtc_base/stringencode.h" +#include "webrtc/rtc_base/stringutils.h" #ifdef WEBRTC_ANDROID #include "webrtc/pc/test/androidtestinitializer.h" #endif diff --git a/webrtc/pc/webrtcsession.cc b/webrtc/pc/webrtcsession.cc index e0eb72dce0..4f177337a0 100644 --- a/webrtc/pc/webrtcsession.cc +++ b/webrtc/pc/webrtcsession.cc @@ -21,13 +21,6 @@ #include "webrtc/api/jsepicecandidate.h" #include "webrtc/api/jsepsessiondescription.h" #include "webrtc/api/peerconnectioninterface.h" -#include "webrtc/base/basictypes.h" -#include "webrtc/base/bind.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/helpers.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/stringencode.h" -#include "webrtc/base/stringutils.h" #include "webrtc/call/call.h" #include "webrtc/media/base/mediaconstants.h" #include "webrtc/media/base/videocapturer.h" @@ -38,6 +31,13 @@ #include "webrtc/pc/mediasession.h" #include "webrtc/pc/sctputils.h" #include "webrtc/pc/webrtcsessiondescriptionfactory.h" +#include "webrtc/rtc_base/basictypes.h" +#include "webrtc/rtc_base/bind.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/helpers.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/stringencode.h" +#include "webrtc/rtc_base/stringutils.h" #ifdef HAVE_QUIC #include "webrtc/p2p/quic/quictransportchannel.h" diff --git a/webrtc/pc/webrtcsession.h b/webrtc/pc/webrtcsession.h index cb5b69a152..9b62c97db6 100644 --- a/webrtc/pc/webrtcsession.h +++ b/webrtc/pc/webrtcsession.h @@ -18,16 +18,16 @@ #include "webrtc/api/peerconnectioninterface.h" #include "webrtc/api/statstypes.h" -#include "webrtc/base/constructormagic.h" -#include "webrtc/base/optional.h" -#include "webrtc/base/sigslot.h" -#include "webrtc/base/sslidentity.h" -#include "webrtc/base/thread.h" #include "webrtc/call/call.h" #include "webrtc/p2p/base/candidate.h" #include "webrtc/p2p/base/transportcontroller.h" #include "webrtc/pc/datachannel.h" #include "webrtc/pc/mediasession.h" +#include "webrtc/rtc_base/constructormagic.h" +#include "webrtc/rtc_base/optional.h" +#include "webrtc/rtc_base/sigslot.h" +#include "webrtc/rtc_base/sslidentity.h" +#include "webrtc/rtc_base/thread.h" #ifdef HAVE_QUIC #include "webrtc/pc/quicdatatransport.h" diff --git a/webrtc/pc/webrtcsession_unittest.cc b/webrtc/pc/webrtcsession_unittest.cc index 40b979dc9d..f6d334e3e4 100644 --- a/webrtc/pc/webrtcsession_unittest.cc +++ b/webrtc/pc/webrtcsession_unittest.cc @@ -15,18 +15,6 @@ #include "webrtc/api/fakemetricsobserver.h" #include "webrtc/api/jsepicecandidate.h" #include "webrtc/api/jsepsessiondescription.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/fakenetwork.h" -#include "webrtc/base/firewallsocketserver.h" -#include "webrtc/base/gunit.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/network.h" -#include "webrtc/base/ssladapter.h" -#include "webrtc/base/sslidentity.h" -#include "webrtc/base/sslstreamadapter.h" -#include "webrtc/base/stringutils.h" -#include "webrtc/base/thread.h" -#include "webrtc/base/virtualsocketserver.h" #include "webrtc/logging/rtc_event_log/rtc_event_log.h" #include "webrtc/media/base/fakemediaengine.h" #include "webrtc/media/base/fakevideorenderer.h" @@ -47,6 +35,18 @@ #include "webrtc/pc/videotrack.h" #include "webrtc/pc/webrtcsession.h" #include "webrtc/pc/webrtcsessiondescriptionfactory.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/fakenetwork.h" +#include "webrtc/rtc_base/firewallsocketserver.h" +#include "webrtc/rtc_base/gunit.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/network.h" +#include "webrtc/rtc_base/ssladapter.h" +#include "webrtc/rtc_base/sslidentity.h" +#include "webrtc/rtc_base/sslstreamadapter.h" +#include "webrtc/rtc_base/stringutils.h" +#include "webrtc/rtc_base/thread.h" +#include "webrtc/rtc_base/virtualsocketserver.h" using cricket::FakeVoiceMediaChannel; using cricket::TransportInfo; diff --git a/webrtc/pc/webrtcsessiondescriptionfactory.cc b/webrtc/pc/webrtcsessiondescriptionfactory.cc index dc460ac14c..8eccd65767 100644 --- a/webrtc/pc/webrtcsessiondescriptionfactory.cc +++ b/webrtc/pc/webrtcsessiondescriptionfactory.cc @@ -15,9 +15,9 @@ #include "webrtc/api/jsep.h" #include "webrtc/api/jsepsessiondescription.h" #include "webrtc/api/mediaconstraintsinterface.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/sslidentity.h" #include "webrtc/pc/webrtcsession.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/sslidentity.h" using cricket::MediaSessionOptions; diff --git a/webrtc/pc/webrtcsessiondescriptionfactory.h b/webrtc/pc/webrtcsessiondescriptionfactory.h index d742164999..04a4fd8b03 100644 --- a/webrtc/pc/webrtcsessiondescriptionfactory.h +++ b/webrtc/pc/webrtcsessiondescriptionfactory.h @@ -14,12 +14,12 @@ #include #include "webrtc/api/peerconnectioninterface.h" -#include "webrtc/base/constructormagic.h" -#include "webrtc/base/messagehandler.h" -#include "webrtc/base/rtccertificate.h" -#include "webrtc/base/rtccertificategenerator.h" #include "webrtc/p2p/base/transportdescriptionfactory.h" #include "webrtc/pc/mediasession.h" +#include "webrtc/rtc_base/constructormagic.h" +#include "webrtc/rtc_base/messagehandler.h" +#include "webrtc/rtc_base/rtccertificate.h" +#include "webrtc/rtc_base/rtccertificategenerator.h" namespace cricket { class ChannelManager; diff --git a/webrtc/rtc_tools/agc/activity_metric.cc b/webrtc/rtc_tools/agc/activity_metric.cc index 8ea193913c..2cca66b006 100644 --- a/webrtc/rtc_tools/agc/activity_metric.cc +++ b/webrtc/rtc_tools/agc/activity_metric.cc @@ -16,8 +16,6 @@ #include #include -#include "webrtc/base/flags.h" -#include "webrtc/base/safe_minmax.h" #include "webrtc/modules/audio_processing/agc/agc.h" #include "webrtc/modules/audio_processing/agc/loudness_histogram.h" #include "webrtc/modules/audio_processing/agc/utility.h" @@ -26,6 +24,8 @@ #include "webrtc/modules/audio_processing/vad/standalone_vad.h" #include "webrtc/modules/audio_processing/vad/vad_audio_proc.h" #include "webrtc/modules/include/module_common_types.h" +#include "webrtc/rtc_base/flags.h" +#include "webrtc/rtc_base/safe_minmax.h" #include "webrtc/test/gtest.h" static const int kAgcAnalWindowSamples = 100; diff --git a/webrtc/rtc_tools/event_log_visualizer/analyzer.cc b/webrtc/rtc_tools/event_log_visualizer/analyzer.cc index a9fdce6059..78993f4f7c 100644 --- a/webrtc/rtc_tools/event_log_visualizer/analyzer.cc +++ b/webrtc/rtc_tools/event_log_visualizer/analyzer.cc @@ -17,11 +17,6 @@ #include #include -#include "webrtc/base/checks.h" -#include "webrtc/base/format_macros.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/ptr_util.h" -#include "webrtc/base/rate_statistics.h" #include "webrtc/call/audio_receive_stream.h" #include "webrtc/call/audio_send_stream.h" #include "webrtc/call/call.h" @@ -43,6 +38,11 @@ #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h" #include "webrtc/modules/rtp_rtcp/source/rtp_header_extensions.h" #include "webrtc/modules/rtp_rtcp/source/rtp_utility.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/format_macros.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/ptr_util.h" +#include "webrtc/rtc_base/rate_statistics.h" #include "webrtc/video_receive_stream.h" #include "webrtc/video_send_stream.h" diff --git a/webrtc/rtc_tools/event_log_visualizer/analyzer.h b/webrtc/rtc_tools/event_log_visualizer/analyzer.h index cdc81f1f4c..0c3fa46ea5 100644 --- a/webrtc/rtc_tools/event_log_visualizer/analyzer.h +++ b/webrtc/rtc_tools/event_log_visualizer/analyzer.h @@ -18,11 +18,11 @@ #include #include -#include "webrtc/base/function_view.h" #include "webrtc/logging/rtc_event_log/rtc_event_log_parser.h" #include "webrtc/modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor.h" #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" #include "webrtc/modules/rtp_rtcp/source/rtcp_packet.h" +#include "webrtc/rtc_base/function_view.h" #include "webrtc/rtc_tools/event_log_visualizer/plot_base.h" namespace webrtc { diff --git a/webrtc/rtc_tools/event_log_visualizer/main.cc b/webrtc/rtc_tools/event_log_visualizer/main.cc index 6ceeeec4e9..6e78c890b2 100644 --- a/webrtc/rtc_tools/event_log_visualizer/main.cc +++ b/webrtc/rtc_tools/event_log_visualizer/main.cc @@ -10,8 +10,8 @@ #include -#include "webrtc/base/flags.h" #include "webrtc/logging/rtc_event_log/rtc_event_log_parser.h" +#include "webrtc/rtc_base/flags.h" #include "webrtc/rtc_tools/event_log_visualizer/analyzer.h" #include "webrtc/rtc_tools/event_log_visualizer/plot_base.h" #include "webrtc/rtc_tools/event_log_visualizer/plot_python.h" diff --git a/webrtc/rtc_tools/event_log_visualizer/plot_base.cc b/webrtc/rtc_tools/event_log_visualizer/plot_base.cc index f1924b6f44..8bf3533a8f 100644 --- a/webrtc/rtc_tools/event_log_visualizer/plot_base.cc +++ b/webrtc/rtc_tools/event_log_visualizer/plot_base.cc @@ -12,7 +12,7 @@ #include -#include "webrtc/base/checks.h" +#include "webrtc/rtc_base/checks.h" namespace webrtc { namespace plotting { diff --git a/webrtc/rtc_tools/event_log_visualizer/plot_protobuf.h b/webrtc/rtc_tools/event_log_visualizer/plot_protobuf.h index cd9fd91b65..e4670db131 100644 --- a/webrtc/rtc_tools/event_log_visualizer/plot_protobuf.h +++ b/webrtc/rtc_tools/event_log_visualizer/plot_protobuf.h @@ -10,7 +10,7 @@ #ifndef WEBRTC_RTC_TOOLS_EVENT_LOG_VISUALIZER_PLOT_PROTOBUF_H_ #define WEBRTC_RTC_TOOLS_EVENT_LOG_VISUALIZER_PLOT_PROTOBUF_H_ -#include "webrtc/base/ignore_wundef.h" +#include "webrtc/rtc_base/ignore_wundef.h" RTC_PUSH_IGNORING_WUNDEF() #include "webrtc/rtc_tools/event_log_visualizer/chart.pb.h" RTC_POP_IGNORING_WUNDEF() diff --git a/webrtc/rtc_tools/network_tester/config_reader.h b/webrtc/rtc_tools/network_tester/config_reader.h index 7d399f3106..8cc1f8d53f 100644 --- a/webrtc/rtc_tools/network_tester/config_reader.h +++ b/webrtc/rtc_tools/network_tester/config_reader.h @@ -14,10 +14,10 @@ #include #include -#include "webrtc/base/constructormagic.h" -#include "webrtc/base/optional.h" +#include "webrtc/rtc_base/constructormagic.h" +#include "webrtc/rtc_base/optional.h" -#include "webrtc/base/ignore_wundef.h" +#include "webrtc/rtc_base/ignore_wundef.h" #ifdef WEBRTC_NETWORK_TESTER_PROTO RTC_PUSH_IGNORING_WUNDEF() diff --git a/webrtc/rtc_tools/network_tester/network_tester_unittest.cc b/webrtc/rtc_tools/network_tester/network_tester_unittest.cc index 6c86a01318..d3958be32b 100644 --- a/webrtc/rtc_tools/network_tester/network_tester_unittest.cc +++ b/webrtc/rtc_tools/network_tester/network_tester_unittest.cc @@ -13,7 +13,7 @@ #include "webrtc/rtc_tools/network_tester/test_controller.h" -#include "webrtc/base/gunit.h" +#include "webrtc/rtc_base/gunit.h" #include "webrtc/test/gtest.h" #include "webrtc/test/testsupport/fileutils.h" diff --git a/webrtc/rtc_tools/network_tester/packet_logger.cc b/webrtc/rtc_tools/network_tester/packet_logger.cc index 5a32bea54f..ad93e71008 100644 --- a/webrtc/rtc_tools/network_tester/packet_logger.cc +++ b/webrtc/rtc_tools/network_tester/packet_logger.cc @@ -9,8 +9,8 @@ */ #include "webrtc/rtc_tools/network_tester/packet_logger.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/protobuf_utils.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/protobuf_utils.h" namespace webrtc { diff --git a/webrtc/rtc_tools/network_tester/packet_logger.h b/webrtc/rtc_tools/network_tester/packet_logger.h index 8f8f767724..33ee96042b 100644 --- a/webrtc/rtc_tools/network_tester/packet_logger.h +++ b/webrtc/rtc_tools/network_tester/packet_logger.h @@ -14,8 +14,8 @@ #include #include -#include "webrtc/base/constructormagic.h" -#include "webrtc/base/ignore_wundef.h" +#include "webrtc/rtc_base/constructormagic.h" +#include "webrtc/rtc_base/ignore_wundef.h" #ifdef WEBRTC_NETWORK_TESTER_PROTO RTC_PUSH_IGNORING_WUNDEF() diff --git a/webrtc/rtc_tools/network_tester/packet_sender.cc b/webrtc/rtc_tools/network_tester/packet_sender.cc index ca5b8e9df2..6568ba0297 100644 --- a/webrtc/rtc_tools/network_tester/packet_sender.cc +++ b/webrtc/rtc_tools/network_tester/packet_sender.cc @@ -14,7 +14,7 @@ #include #include -#include "webrtc/base/timeutils.h" +#include "webrtc/rtc_base/timeutils.h" #include "webrtc/rtc_tools/network_tester/config_reader.h" #include "webrtc/rtc_tools/network_tester/test_controller.h" diff --git a/webrtc/rtc_tools/network_tester/packet_sender.h b/webrtc/rtc_tools/network_tester/packet_sender.h index 8c4e988ac8..67fb0d7ae9 100644 --- a/webrtc/rtc_tools/network_tester/packet_sender.h +++ b/webrtc/rtc_tools/network_tester/packet_sender.h @@ -14,10 +14,10 @@ #include #include -#include "webrtc/base/constructormagic.h" -#include "webrtc/base/ignore_wundef.h" -#include "webrtc/base/sequenced_task_checker.h" -#include "webrtc/base/task_queue.h" +#include "webrtc/rtc_base/constructormagic.h" +#include "webrtc/rtc_base/ignore_wundef.h" +#include "webrtc/rtc_base/sequenced_task_checker.h" +#include "webrtc/rtc_base/task_queue.h" #ifdef WEBRTC_NETWORK_TESTER_PROTO RTC_PUSH_IGNORING_WUNDEF() diff --git a/webrtc/rtc_tools/network_tester/test_controller.h b/webrtc/rtc_tools/network_tester/test_controller.h index 16087404b1..f38758d9df 100644 --- a/webrtc/rtc_tools/network_tester/test_controller.h +++ b/webrtc/rtc_tools/network_tester/test_controller.h @@ -17,10 +17,10 @@ #include #include -#include "webrtc/base/constructormagic.h" -#include "webrtc/base/ignore_wundef.h" #include "webrtc/p2p/base/basicpacketsocketfactory.h" #include "webrtc/p2p/base/udptransport.h" +#include "webrtc/rtc_base/constructormagic.h" +#include "webrtc/rtc_base/ignore_wundef.h" #include "webrtc/rtc_tools/network_tester/packet_logger.h" #include "webrtc/rtc_tools/network_tester/packet_sender.h" diff --git a/webrtc/rtc_tools/simple_command_line_parser.h b/webrtc/rtc_tools/simple_command_line_parser.h index 960038bd9c..b8c9037d3f 100644 --- a/webrtc/rtc_tools/simple_command_line_parser.h +++ b/webrtc/rtc_tools/simple_command_line_parser.h @@ -15,8 +15,8 @@ #include #include -#include "webrtc/base/constructormagic.h" -#include "webrtc/base/gtest_prod_util.h" +#include "webrtc/rtc_base/constructormagic.h" +#include "webrtc/rtc_base/gtest_prod_util.h" // This is a very basic command line parsing class. We pass the command line // arguments and their number and the class forms a vector out of these. Than we diff --git a/webrtc/sdk/android/src/jni/androidmediacodeccommon.h b/webrtc/sdk/android/src/jni/androidmediacodeccommon.h index 9f8e960336..fc85f7e9c5 100644 --- a/webrtc/sdk/android/src/jni/androidmediacodeccommon.h +++ b/webrtc/sdk/android/src/jni/androidmediacodeccommon.h @@ -14,11 +14,10 @@ #include #include -#include "webrtc/base/thread.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/thread.h" #include "webrtc/sdk/android/src/jni/classreferenceholder.h" #include "webrtc/sdk/android/src/jni/jni_helpers.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/thread.h" namespace webrtc_jni { diff --git a/webrtc/sdk/android/src/jni/androidmediadecoder_jni.cc b/webrtc/sdk/android/src/jni/androidmediadecoder_jni.cc index e1e5b08349..cae9b8f4a4 100644 --- a/webrtc/sdk/android/src/jni/androidmediadecoder_jni.cc +++ b/webrtc/sdk/android/src/jni/androidmediadecoder_jni.cc @@ -20,16 +20,16 @@ #include "third_party/libyuv/include/libyuv/convert.h" #include "third_party/libyuv/include/libyuv/convert_from.h" #include "third_party/libyuv/include/libyuv/video_common.h" -#include "webrtc/base/bind.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/scoped_ref_ptr.h" -#include "webrtc/base/thread.h" -#include "webrtc/base/timeutils.h" #include "webrtc/common_video/h264/h264_bitstream_parser.h" #include "webrtc/common_video/include/i420_buffer_pool.h" #include "webrtc/modules/video_coding/include/video_codec_interface.h" #include "webrtc/modules/video_coding/utility/vp8_header_parser.h" +#include "webrtc/rtc_base/bind.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/scoped_ref_ptr.h" +#include "webrtc/rtc_base/thread.h" +#include "webrtc/rtc_base/timeutils.h" #include "webrtc/sdk/android/src/jni/androidmediacodeccommon.h" #include "webrtc/sdk/android/src/jni/classreferenceholder.h" #include "webrtc/sdk/android/src/jni/native_handle_impl.h" diff --git a/webrtc/sdk/android/src/jni/androidmediaencoder_jni.cc b/webrtc/sdk/android/src/jni/androidmediaencoder_jni.cc index fe69de4589..e5826e154f 100644 --- a/webrtc/sdk/android/src/jni/androidmediaencoder_jni.cc +++ b/webrtc/sdk/android/src/jni/androidmediaencoder_jni.cc @@ -22,15 +22,6 @@ #include "third_party/libyuv/include/libyuv/convert_from.h" #include "third_party/libyuv/include/libyuv/video_common.h" #include "webrtc/api/video_codecs/video_encoder.h" -#include "webrtc/base/bind.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/random.h" -#include "webrtc/base/sequenced_task_checker.h" -#include "webrtc/base/task_queue.h" -#include "webrtc/base/thread.h" -#include "webrtc/base/timeutils.h" -#include "webrtc/base/weak_ptr.h" #include "webrtc/common_types.h" #include "webrtc/common_video/h264/h264_bitstream_parser.h" #include "webrtc/common_video/h264/h264_common.h" @@ -40,6 +31,15 @@ #include "webrtc/modules/video_coding/utility/quality_scaler.h" #include "webrtc/modules/video_coding/utility/vp8_header_parser.h" #include "webrtc/modules/video_coding/utility/vp9_uncompressed_header_parser.h" +#include "webrtc/rtc_base/bind.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/random.h" +#include "webrtc/rtc_base/sequenced_task_checker.h" +#include "webrtc/rtc_base/task_queue.h" +#include "webrtc/rtc_base/thread.h" +#include "webrtc/rtc_base/timeutils.h" +#include "webrtc/rtc_base/weak_ptr.h" #include "webrtc/sdk/android/src/jni/androidmediacodeccommon.h" #include "webrtc/sdk/android/src/jni/classreferenceholder.h" #include "webrtc/sdk/android/src/jni/native_handle_impl.h" diff --git a/webrtc/sdk/android/src/jni/androidnetworkmonitor_jni.cc b/webrtc/sdk/android/src/jni/androidnetworkmonitor_jni.cc index 4047f79dba..19f9b303ff 100644 --- a/webrtc/sdk/android/src/jni/androidnetworkmonitor_jni.cc +++ b/webrtc/sdk/android/src/jni/androidnetworkmonitor_jni.cc @@ -14,11 +14,11 @@ // This was added in Lollipop to dlfcn.h #define RTLD_NOLOAD 4 +#include "webrtc/rtc_base/bind.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/ipaddress.h" #include "webrtc/sdk/android/src/jni/classreferenceholder.h" #include "webrtc/sdk/android/src/jni/jni_helpers.h" -#include "webrtc/base/bind.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/ipaddress.h" namespace webrtc_jni { diff --git a/webrtc/sdk/android/src/jni/androidnetworkmonitor_jni.h b/webrtc/sdk/android/src/jni/androidnetworkmonitor_jni.h index 0676e0ace3..f6f22a7a82 100644 --- a/webrtc/sdk/android/src/jni/androidnetworkmonitor_jni.h +++ b/webrtc/sdk/android/src/jni/androidnetworkmonitor_jni.h @@ -11,14 +11,14 @@ #ifndef WEBRTC_SDK_ANDROID_SRC_JNI_ANDROIDNETWORKMONITOR_JNI_H_ #define WEBRTC_SDK_ANDROID_SRC_JNI_ANDROIDNETWORKMONITOR_JNI_H_ -#include "webrtc/base/networkmonitor.h" +#include "webrtc/rtc_base/networkmonitor.h" #include #include +#include "webrtc/rtc_base/thread_checker.h" #include "webrtc/sdk/android/src/jni/jni_helpers.h" -#include "webrtc/base/thread_checker.h" namespace webrtc_jni { diff --git a/webrtc/sdk/android/src/jni/androidvideotracksource.cc b/webrtc/sdk/android/src/jni/androidvideotracksource.cc index c1431bd9ac..770962de6b 100644 --- a/webrtc/sdk/android/src/jni/androidvideotracksource.cc +++ b/webrtc/sdk/android/src/jni/androidvideotracksource.cc @@ -12,7 +12,7 @@ #include -#include "webrtc/base/logging.h" +#include "webrtc/rtc_base/logging.h" namespace { // MediaCodec wants resolution to be divisible by 2. diff --git a/webrtc/sdk/android/src/jni/androidvideotracksource.h b/webrtc/sdk/android/src/jni/androidvideotracksource.h index dd4fe97f8e..54741e0cc0 100644 --- a/webrtc/sdk/android/src/jni/androidvideotracksource.h +++ b/webrtc/sdk/android/src/jni/androidvideotracksource.h @@ -11,15 +11,15 @@ #ifndef WEBRTC_API_ANDROID_JNI_ANDROIDVIDEOTRACKSOURCE_H_ #define WEBRTC_API_ANDROID_JNI_ANDROIDVIDEOTRACKSOURCE_H_ -#include "webrtc/sdk/android/src/jni/native_handle_impl.h" -#include "webrtc/sdk/android/src/jni/surfacetexturehelper_jni.h" -#include "webrtc/base/asyncinvoker.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/thread_checker.h" -#include "webrtc/base/timestampaligner.h" #include "webrtc/common_video/include/i420_buffer_pool.h" #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" #include "webrtc/media/base/adaptedvideotracksource.h" +#include "webrtc/rtc_base/asyncinvoker.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/thread_checker.h" +#include "webrtc/rtc_base/timestampaligner.h" +#include "webrtc/sdk/android/src/jni/native_handle_impl.h" +#include "webrtc/sdk/android/src/jni/surfacetexturehelper_jni.h" namespace webrtc { diff --git a/webrtc/sdk/android/src/jni/androidvideotracksource_jni.cc b/webrtc/sdk/android/src/jni/androidvideotracksource_jni.cc index 519a16d5f5..62f5f82574 100644 --- a/webrtc/sdk/android/src/jni/androidvideotracksource_jni.cc +++ b/webrtc/sdk/android/src/jni/androidvideotracksource_jni.cc @@ -10,7 +10,7 @@ #include "webrtc/api/video/video_rotation.h" #include "webrtc/api/videosourceproxy.h" -#include "webrtc/base/logging.h" +#include "webrtc/rtc_base/logging.h" #include "webrtc/sdk/android/src/jni/androidvideotracksource.h" #include "webrtc/sdk/android/src/jni/classreferenceholder.h" diff --git a/webrtc/sdk/android/src/jni/audio_jni.h b/webrtc/sdk/android/src/jni/audio_jni.h index 3a0b0bd700..762d9b8f9b 100644 --- a/webrtc/sdk/android/src/jni/audio_jni.h +++ b/webrtc/sdk/android/src/jni/audio_jni.h @@ -15,7 +15,7 @@ // We don't want this target depend on audio related targets #include "webrtc/api/audio_codecs/audio_decoder_factory.h" // nogncheck #include "webrtc/api/audio_codecs/audio_encoder_factory.h" // nogncheck -#include "webrtc/base/scoped_ref_ptr.h" +#include "webrtc/rtc_base/scoped_ref_ptr.h" namespace webrtc_jni { diff --git a/webrtc/sdk/android/src/jni/filevideocapturer_jni.cc b/webrtc/sdk/android/src/jni/filevideocapturer_jni.cc index 9271a7991b..69d62bcbbc 100644 --- a/webrtc/sdk/android/src/jni/filevideocapturer_jni.cc +++ b/webrtc/sdk/android/src/jni/filevideocapturer_jni.cc @@ -11,8 +11,8 @@ #include #include "third_party/libyuv/include/libyuv/convert_from.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/logging.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/logging.h" namespace webrtc_jni { diff --git a/webrtc/sdk/android/src/jni/jni_helpers.h b/webrtc/sdk/android/src/jni/jni_helpers.h index bed56838d5..19b7741fb5 100644 --- a/webrtc/sdk/android/src/jni/jni_helpers.h +++ b/webrtc/sdk/android/src/jni/jni_helpers.h @@ -17,9 +17,9 @@ #include #include -#include "webrtc/base/constructormagic.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/thread_checker.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/constructormagic.h" +#include "webrtc/rtc_base/thread_checker.h" // Abort the process if |jni| has a Java exception pending. // This macros uses the comma operator to execute ExceptionDescribe diff --git a/webrtc/sdk/android/src/jni/jni_onload.cc b/webrtc/sdk/android/src/jni/jni_onload.cc index a57d0783c8..ce71920331 100644 --- a/webrtc/sdk/android/src/jni/jni_onload.cc +++ b/webrtc/sdk/android/src/jni/jni_onload.cc @@ -12,9 +12,9 @@ #undef JNIEXPORT #define JNIEXPORT __attribute__((visibility("default"))) +#include "webrtc/rtc_base/ssladapter.h" #include "webrtc/sdk/android/src/jni/classreferenceholder.h" #include "webrtc/sdk/android/src/jni/jni_helpers.h" -#include "webrtc/base/ssladapter.h" namespace webrtc_jni { diff --git a/webrtc/sdk/android/src/jni/media_jni.h b/webrtc/sdk/android/src/jni/media_jni.h index d0e6410e08..3b26661544 100644 --- a/webrtc/sdk/android/src/jni/media_jni.h +++ b/webrtc/sdk/android/src/jni/media_jni.h @@ -11,7 +11,7 @@ #ifndef WEBRTC_SDK_ANDROID_SRC_JNI_MEDIA_JNI_H_ #define WEBRTC_SDK_ANDROID_SRC_JNI_MEDIA_JNI_H_ -#include "webrtc/base/scoped_ref_ptr.h" +#include "webrtc/rtc_base/scoped_ref_ptr.h" namespace webrtc { class AudioDeviceModule; diff --git a/webrtc/sdk/android/src/jni/native_handle_impl.cc b/webrtc/sdk/android/src/jni/native_handle_impl.cc index ae4de0b3bc..e2f3c9cd63 100644 --- a/webrtc/sdk/android/src/jni/native_handle_impl.cc +++ b/webrtc/sdk/android/src/jni/native_handle_impl.cc @@ -12,13 +12,13 @@ #include -#include "webrtc/base/bind.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/keep_ref_until_done.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/scoped_ref_ptr.h" -#include "webrtc/base/timeutils.h" #include "webrtc/common_video/include/video_frame_buffer.h" +#include "webrtc/rtc_base/bind.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/keep_ref_until_done.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/scoped_ref_ptr.h" +#include "webrtc/rtc_base/timeutils.h" #include "webrtc/sdk/android/src/jni/classreferenceholder.h" #include "webrtc/sdk/android/src/jni/jni_helpers.h" #include "webrtc/system_wrappers/include/aligned_malloc.h" diff --git a/webrtc/sdk/android/src/jni/native_handle_impl.h b/webrtc/sdk/android/src/jni/native_handle_impl.h index ea83f62627..f70ae3b97c 100644 --- a/webrtc/sdk/android/src/jni/native_handle_impl.h +++ b/webrtc/sdk/android/src/jni/native_handle_impl.h @@ -16,7 +16,7 @@ #include "webrtc/api/video/video_frame.h" #include "webrtc/api/video/video_frame_buffer.h" #include "webrtc/api/video/video_rotation.h" -#include "webrtc/base/callback.h" +#include "webrtc/rtc_base/callback.h" #include "webrtc/sdk/android/src/jni/jni_helpers.h" namespace webrtc_jni { diff --git a/webrtc/sdk/android/src/jni/ownedfactoryandthreads.cc b/webrtc/sdk/android/src/jni/ownedfactoryandthreads.cc index 7171852dec..a3aa45c4be 100644 --- a/webrtc/sdk/android/src/jni/ownedfactoryandthreads.cc +++ b/webrtc/sdk/android/src/jni/ownedfactoryandthreads.cc @@ -10,7 +10,7 @@ #include "webrtc/sdk/android/src/jni/ownedfactoryandthreads.h" -#include "webrtc/base/logging.h" +#include "webrtc/rtc_base/logging.h" #include "webrtc/sdk/android/src/jni/classreferenceholder.h" #include "webrtc/sdk/android/src/jni/jni_helpers.h" diff --git a/webrtc/sdk/android/src/jni/ownedfactoryandthreads.h b/webrtc/sdk/android/src/jni/ownedfactoryandthreads.h index 920cb939a0..eb57316469 100644 --- a/webrtc/sdk/android/src/jni/ownedfactoryandthreads.h +++ b/webrtc/sdk/android/src/jni/ownedfactoryandthreads.h @@ -16,7 +16,7 @@ #include #include "webrtc/api/peerconnectioninterface.h" -#include "webrtc/base/thread.h" +#include "webrtc/rtc_base/thread.h" using cricket::WebRtcVideoDecoderFactory; using cricket::WebRtcVideoEncoderFactory; diff --git a/webrtc/sdk/android/src/jni/peerconnection_jni.cc b/webrtc/sdk/android/src/jni/peerconnection_jni.cc index 4fcfb6ebdf..43efd111e8 100644 --- a/webrtc/sdk/android/src/jni/peerconnection_jni.cc +++ b/webrtc/sdk/android/src/jni/peerconnection_jni.cc @@ -48,20 +48,20 @@ #include "webrtc/api/rtpreceiverinterface.h" #include "webrtc/api/rtpsenderinterface.h" #include "webrtc/api/videosourceproxy.h" -#include "webrtc/base/bind.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/event_tracer.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/logsinks.h" -#include "webrtc/base/messagequeue.h" -#include "webrtc/base/networkmonitor.h" -#include "webrtc/base/rtccertificategenerator.h" -#include "webrtc/base/ssladapter.h" -#include "webrtc/base/stringutils.h" #include "webrtc/media/base/mediaengine.h" #include "webrtc/media/base/videocapturer.h" #include "webrtc/modules/utility/include/jvm_android.h" #include "webrtc/pc/webrtcsdp.h" +#include "webrtc/rtc_base/bind.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/event_tracer.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/logsinks.h" +#include "webrtc/rtc_base/messagequeue.h" +#include "webrtc/rtc_base/networkmonitor.h" +#include "webrtc/rtc_base/rtccertificategenerator.h" +#include "webrtc/rtc_base/ssladapter.h" +#include "webrtc/rtc_base/stringutils.h" #include "webrtc/sdk/android/src/jni/androidnetworkmonitor_jni.h" // Adding 'nogncheck' to disable the gn include headers check. // We don't want to always depend on audio and video related targets. @@ -1130,8 +1130,8 @@ JOW(jlong, PeerConnectionFactory_nativeCreatePeerConnectionFactory) // talk/ assumes pretty widely that the current Thread is ThreadManager'd, but // ThreadManager only WrapCurrentThread()s the thread where it is first // created. Since the semantics around when auto-wrapping happens in - // webrtc/base/ are convoluted, we simply wrap here to avoid having to think - // about ramifications of auto-wrapping there. + // webrtc/rtc_base/ are convoluted, we simply wrap here to avoid having to + // think about ramifications of auto-wrapping there. rtc::ThreadManager::Instance()->WrapCurrentThread(); webrtc::Trace::CreateTrace(); diff --git a/webrtc/sdk/android/src/jni/surfacetexturehelper_jni.cc b/webrtc/sdk/android/src/jni/surfacetexturehelper_jni.cc index 81e7ac4b9e..2576f1d33e 100644 --- a/webrtc/sdk/android/src/jni/surfacetexturehelper_jni.cc +++ b/webrtc/sdk/android/src/jni/surfacetexturehelper_jni.cc @@ -11,10 +11,10 @@ #include "webrtc/sdk/android/src/jni/surfacetexturehelper_jni.h" +#include "webrtc/rtc_base/bind.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/logging.h" #include "webrtc/sdk/android/src/jni/classreferenceholder.h" -#include "webrtc/base/bind.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/logging.h" namespace webrtc_jni { diff --git a/webrtc/sdk/android/src/jni/surfacetexturehelper_jni.h b/webrtc/sdk/android/src/jni/surfacetexturehelper_jni.h index 07d65c0143..084aa33884 100644 --- a/webrtc/sdk/android/src/jni/surfacetexturehelper_jni.h +++ b/webrtc/sdk/android/src/jni/surfacetexturehelper_jni.h @@ -13,11 +13,11 @@ #include +#include "webrtc/api/video/video_frame_buffer.h" +#include "webrtc/rtc_base/refcount.h" +#include "webrtc/rtc_base/scoped_ref_ptr.h" #include "webrtc/sdk/android/src/jni/jni_helpers.h" #include "webrtc/sdk/android/src/jni/native_handle_impl.h" -#include "webrtc/api/video/video_frame_buffer.h" -#include "webrtc/base/refcount.h" -#include "webrtc/base/scoped_ref_ptr.h" namespace webrtc_jni { diff --git a/webrtc/sdk/android/src/jni/video_jni.cc b/webrtc/sdk/android/src/jni/video_jni.cc index 616b2e0e55..fc6f30cbcf 100644 --- a/webrtc/sdk/android/src/jni/video_jni.cc +++ b/webrtc/sdk/android/src/jni/video_jni.cc @@ -11,9 +11,9 @@ #include #include "webrtc/api/videosourceproxy.h" -#include "webrtc/base/logging.h" #include "webrtc/media/engine/webrtcvideodecoderfactory.h" #include "webrtc/media/engine/webrtcvideoencoderfactory.h" +#include "webrtc/rtc_base/logging.h" #include "webrtc/sdk/android/src/jni/androidmediadecoder_jni.h" #include "webrtc/sdk/android/src/jni/androidmediaencoder_jni.h" #include "webrtc/sdk/android/src/jni/androidvideotracksource.h" diff --git a/webrtc/sdk/android/src/jni/video_jni.h b/webrtc/sdk/android/src/jni/video_jni.h index c13f33fc71..09a193f62c 100644 --- a/webrtc/sdk/android/src/jni/video_jni.h +++ b/webrtc/sdk/android/src/jni/video_jni.h @@ -13,7 +13,7 @@ #include -#include "webrtc/base/scoped_ref_ptr.h" +#include "webrtc/rtc_base/scoped_ref_ptr.h" namespace cricket { class WebRtcVideoEncoderFactory; diff --git a/webrtc/sdk/android/src/jni/videodecoderfactorywrapper.cc b/webrtc/sdk/android/src/jni/videodecoderfactorywrapper.cc index 1584fd71d0..678dc3d485 100644 --- a/webrtc/sdk/android/src/jni/videodecoderfactorywrapper.cc +++ b/webrtc/sdk/android/src/jni/videodecoderfactorywrapper.cc @@ -11,8 +11,8 @@ #include "webrtc/sdk/android/src/jni/videodecoderfactorywrapper.h" #include "webrtc/api/video_codecs/video_decoder.h" -#include "webrtc/base/logging.h" #include "webrtc/common_types.h" +#include "webrtc/rtc_base/logging.h" #include "webrtc/sdk/android/src/jni/videodecoderwrapper.h" namespace webrtc_jni { diff --git a/webrtc/sdk/android/src/jni/videodecoderwrapper.cc b/webrtc/sdk/android/src/jni/videodecoderwrapper.cc index e78f39534d..b822170f1f 100644 --- a/webrtc/sdk/android/src/jni/videodecoderwrapper.cc +++ b/webrtc/sdk/android/src/jni/videodecoderwrapper.cc @@ -11,8 +11,8 @@ #include "webrtc/sdk/android/src/jni/videodecoderwrapper.h" #include "webrtc/api/video/video_frame.h" -#include "webrtc/base/logging.h" #include "webrtc/modules/video_coding/include/video_codec_interface.h" +#include "webrtc/rtc_base/logging.h" #include "webrtc/sdk/android/src/jni/classreferenceholder.h" namespace webrtc_jni { diff --git a/webrtc/sdk/android/src/jni/videofilerenderer_jni.cc b/webrtc/sdk/android/src/jni/videofilerenderer_jni.cc index 83a089c216..42c59916d1 100644 --- a/webrtc/sdk/android/src/jni/videofilerenderer_jni.cc +++ b/webrtc/sdk/android/src/jni/videofilerenderer_jni.cc @@ -11,8 +11,8 @@ #include #include "third_party/libyuv/include/libyuv/scale.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/logging.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/logging.h" namespace webrtc_jni { diff --git a/webrtc/sdk/android/src/jni/videotrack_jni.cc b/webrtc/sdk/android/src/jni/videotrack_jni.cc index e35fda14da..96ab928500 100644 --- a/webrtc/sdk/android/src/jni/videotrack_jni.cc +++ b/webrtc/sdk/android/src/jni/videotrack_jni.cc @@ -11,7 +11,7 @@ #include #include "webrtc/api/mediastreaminterface.h" -#include "webrtc/base/logging.h" +#include "webrtc/rtc_base/logging.h" namespace webrtc_jni { diff --git a/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCDataChannel+Private.h b/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCDataChannel+Private.h index 82e132fa2e..5017c2f1d6 100644 --- a/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCDataChannel+Private.h +++ b/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCDataChannel+Private.h @@ -11,7 +11,7 @@ #import "WebRTC/RTCDataChannel.h" #include "webrtc/api/datachannelinterface.h" -#include "webrtc/base/scoped_ref_ptr.h" +#include "webrtc/rtc_base/scoped_ref_ptr.h" NS_ASSUME_NONNULL_BEGIN diff --git a/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCPeerConnectionFactory+Private.h b/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCPeerConnectionFactory+Private.h index ed1807783b..1c53e643fa 100644 --- a/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCPeerConnectionFactory+Private.h +++ b/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCPeerConnectionFactory+Private.h @@ -11,7 +11,7 @@ #import "WebRTC/RTCPeerConnectionFactory.h" #include "webrtc/api/peerconnectioninterface.h" -#include "webrtc/base/scoped_ref_ptr.h" +#include "webrtc/rtc_base/scoped_ref_ptr.h" NS_ASSUME_NONNULL_BEGIN diff --git a/webrtc/sdk/objc/Framework/Classes/Video/corevideo_frame_buffer.cc b/webrtc/sdk/objc/Framework/Classes/Video/corevideo_frame_buffer.cc index b0a17ffe32..daebb2c530 100644 --- a/webrtc/sdk/objc/Framework/Classes/Video/corevideo_frame_buffer.cc +++ b/webrtc/sdk/objc/Framework/Classes/Video/corevideo_frame_buffer.cc @@ -12,9 +12,9 @@ #include "libyuv/convert.h" #include "webrtc/api/video/i420_buffer.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/logging.h" #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/logging.h" namespace webrtc { diff --git a/webrtc/sdk/objc/Framework/Classes/Video/objcvideotracksource.h b/webrtc/sdk/objc/Framework/Classes/Video/objcvideotracksource.h index 133c8c6021..b28c00194f 100644 --- a/webrtc/sdk/objc/Framework/Classes/Video/objcvideotracksource.h +++ b/webrtc/sdk/objc/Framework/Classes/Video/objcvideotracksource.h @@ -12,8 +12,8 @@ #define WEBRTC_SDK_OBJC_FRAMEWORK_CLASSES_VIDEO_OBJCVIDEOTRACKSOURCE_H_ #include "WebRTC/RTCMacros.h" -#include "webrtc/base/timestampaligner.h" #include "webrtc/media/base/adaptedvideotracksource.h" +#include "webrtc/rtc_base/timestampaligner.h" RTC_FWD_DECL_OBJC_CLASS(RTCVideoFrame); diff --git a/webrtc/sdk/objc/Framework/Classes/VideoToolbox/encoder.h b/webrtc/sdk/objc/Framework/Classes/VideoToolbox/encoder.h index 92cd6b7d01..c9a45551a9 100644 --- a/webrtc/sdk/objc/Framework/Classes/VideoToolbox/encoder.h +++ b/webrtc/sdk/objc/Framework/Classes/VideoToolbox/encoder.h @@ -13,12 +13,12 @@ #define WEBRTC_SDK_OBJC_FRAMEWORK_CLASSES_VIDEOTOOLBOX_ENCODER_H_ #include "webrtc/api/video/video_rotation.h" -#include "webrtc/base/criticalsection.h" #include "webrtc/common_video/h264/h264_bitstream_parser.h" #include "webrtc/common_video/include/bitrate_adjuster.h" #include "webrtc/media/base/codec.h" #include "webrtc/modules/video_coding/codecs/h264/include/h264.h" #include "webrtc/modules/video_coding/utility/quality_scaler.h" +#include "webrtc/rtc_base/criticalsection.h" #include #include diff --git a/webrtc/sdk/objc/Framework/Classes/VideoToolbox/nalu_rewriter.cc b/webrtc/sdk/objc/Framework/Classes/VideoToolbox/nalu_rewriter.cc index 81f51d8fcb..47afe9561e 100644 --- a/webrtc/sdk/objc/Framework/Classes/VideoToolbox/nalu_rewriter.cc +++ b/webrtc/sdk/objc/Framework/Classes/VideoToolbox/nalu_rewriter.cc @@ -15,8 +15,8 @@ #include #include -#include "webrtc/base/checks.h" -#include "webrtc/base/logging.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/logging.h" namespace webrtc { diff --git a/webrtc/sdk/objc/Framework/Classes/VideoToolbox/nalu_rewriter.h b/webrtc/sdk/objc/Framework/Classes/VideoToolbox/nalu_rewriter.h index 530fbe2400..4685f08757 100644 --- a/webrtc/sdk/objc/Framework/Classes/VideoToolbox/nalu_rewriter.h +++ b/webrtc/sdk/objc/Framework/Classes/VideoToolbox/nalu_rewriter.h @@ -17,9 +17,9 @@ #include #include -#include "webrtc/base/buffer.h" #include "webrtc/common_video/h264/h264_common.h" #include "webrtc/modules/include/module_common_types.h" +#include "webrtc/rtc_base/buffer.h" using webrtc::H264::NaluIndex; diff --git a/webrtc/sdk/objc/Framework/Classes/VideoToolbox/nalu_rewriter_unittest.cc b/webrtc/sdk/objc/Framework/Classes/VideoToolbox/nalu_rewriter_unittest.cc index ba3a3d1d42..0a680fc2b1 100644 --- a/webrtc/sdk/objc/Framework/Classes/VideoToolbox/nalu_rewriter_unittest.cc +++ b/webrtc/sdk/objc/Framework/Classes/VideoToolbox/nalu_rewriter_unittest.cc @@ -11,7 +11,7 @@ #include -#include "webrtc/base/arraysize.h" +#include "webrtc/rtc_base/arraysize.h" #include "webrtc/sdk/objc/Framework/Classes/VideoToolbox/nalu_rewriter.h" #include "webrtc/test/gtest.h" diff --git a/webrtc/sdk/objc/Framework/Headers/WebRTC/RTCSSLAdapter.h b/webrtc/sdk/objc/Framework/Headers/WebRTC/RTCSSLAdapter.h index 1341a5c003..c862d29792 100644 --- a/webrtc/sdk/objc/Framework/Headers/WebRTC/RTCSSLAdapter.h +++ b/webrtc/sdk/objc/Framework/Headers/WebRTC/RTCSSLAdapter.h @@ -14,7 +14,7 @@ /** * Initialize and clean up the SSL library. Failure is fatal. These call the - * corresponding functions in webrtc/base/ssladapter.h. + * corresponding functions in webrtc/rtc_base/ssladapter.h. */ RTC_EXTERN BOOL RTCInitializeSSL(); RTC_EXTERN BOOL RTCCleanupSSL(); diff --git a/webrtc/stats/rtcstats.cc b/webrtc/stats/rtcstats.cc index 1968dd030e..5d0a937e6f 100644 --- a/webrtc/stats/rtcstats.cc +++ b/webrtc/stats/rtcstats.cc @@ -12,7 +12,7 @@ #include -#include "webrtc/base/stringencode.h" +#include "webrtc/rtc_base/stringencode.h" namespace webrtc { diff --git a/webrtc/stats/rtcstats_unittest.cc b/webrtc/stats/rtcstats_unittest.cc index 6fe8dd9046..925a6239b7 100644 --- a/webrtc/stats/rtcstats_unittest.cc +++ b/webrtc/stats/rtcstats_unittest.cc @@ -12,8 +12,8 @@ #include -#include "webrtc/base/checks.h" -#include "webrtc/base/gunit.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/gunit.h" #include "webrtc/stats/test/rtcteststats.h" namespace webrtc { diff --git a/webrtc/stats/rtcstatsreport_unittest.cc b/webrtc/stats/rtcstatsreport_unittest.cc index 442adbe163..25ac3a2d17 100644 --- a/webrtc/stats/rtcstatsreport_unittest.cc +++ b/webrtc/stats/rtcstatsreport_unittest.cc @@ -11,8 +11,8 @@ #include "webrtc/api/stats/rtcstatsreport.h" #include "webrtc/api/stats/rtcstats.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/gunit.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/gunit.h" namespace webrtc { diff --git a/webrtc/system_wrappers/include/aligned_array.h b/webrtc/system_wrappers/include/aligned_array.h index 71fefea72f..7cc1c021e9 100644 --- a/webrtc/system_wrappers/include/aligned_array.h +++ b/webrtc/system_wrappers/include/aligned_array.h @@ -11,7 +11,7 @@ #ifndef WEBRTC_SYSTEM_WRAPPERS_INCLUDE_ALIGNED_ARRAY_ #define WEBRTC_SYSTEM_WRAPPERS_INCLUDE_ALIGNED_ARRAY_ -#include "webrtc/base/checks.h" +#include "webrtc/rtc_base/checks.h" #include "webrtc/system_wrappers/include/aligned_malloc.h" namespace webrtc { diff --git a/webrtc/system_wrappers/include/atomic32.h b/webrtc/system_wrappers/include/atomic32.h index 78e649d8b6..ef3d57649c 100644 --- a/webrtc/system_wrappers/include/atomic32.h +++ b/webrtc/system_wrappers/include/atomic32.h @@ -17,8 +17,8 @@ #include -#include "webrtc/base/constructormagic.h" #include "webrtc/common_types.h" +#include "webrtc/rtc_base/constructormagic.h" namespace webrtc { diff --git a/webrtc/system_wrappers/include/file_wrapper.h b/webrtc/system_wrappers/include/file_wrapper.h index a1d899c783..4fe5899c87 100644 --- a/webrtc/system_wrappers/include/file_wrapper.h +++ b/webrtc/system_wrappers/include/file_wrapper.h @@ -14,8 +14,8 @@ #include #include -#include "webrtc/base/criticalsection.h" #include "webrtc/common_types.h" +#include "webrtc/rtc_base/criticalsection.h" #include "webrtc/typedefs.h" // Implementation of an InStream and OutStream that can read (exclusive) or diff --git a/webrtc/system_wrappers/include/metrics.h b/webrtc/system_wrappers/include/metrics.h index ca220210a2..f22cf8f166 100644 --- a/webrtc/system_wrappers/include/metrics.h +++ b/webrtc/system_wrappers/include/metrics.h @@ -13,9 +13,9 @@ #include -#include "webrtc/base/atomicops.h" -#include "webrtc/base/checks.h" #include "webrtc/common_types.h" +#include "webrtc/rtc_base/atomicops.h" +#include "webrtc/rtc_base/checks.h" // Macros for allowing WebRTC clients (e.g. Chrome) to gather and aggregate // statistics. diff --git a/webrtc/system_wrappers/include/rw_lock_wrapper.h b/webrtc/system_wrappers/include/rw_lock_wrapper.h index 751b6a1df5..855ecffc71 100644 --- a/webrtc/system_wrappers/include/rw_lock_wrapper.h +++ b/webrtc/system_wrappers/include/rw_lock_wrapper.h @@ -11,7 +11,7 @@ #ifndef WEBRTC_SYSTEM_WRAPPERS_INCLUDE_RW_LOCK_WRAPPER_H_ #define WEBRTC_SYSTEM_WRAPPERS_INCLUDE_RW_LOCK_WRAPPER_H_ -#include "webrtc/base/thread_annotations.h" +#include "webrtc/rtc_base/thread_annotations.h" // Note, Windows pre-Vista version of RW locks are not supported natively. For // these OSs regular critical sections have been used to approximate RW lock diff --git a/webrtc/system_wrappers/include/static_instance.h b/webrtc/system_wrappers/include/static_instance.h index ad87fe6829..f85a9121c4 100644 --- a/webrtc/system_wrappers/include/static_instance.h +++ b/webrtc/system_wrappers/include/static_instance.h @@ -13,7 +13,7 @@ #include -#include "webrtc/base/criticalsection.h" +#include "webrtc/rtc_base/criticalsection.h" #ifdef _WIN32 #include "webrtc/system_wrappers/include/fix_interlocked_exchange_pointer_win.h" #endif diff --git a/webrtc/system_wrappers/source/clock.cc b/webrtc/system_wrappers/source/clock.cc index f65adfcbb1..f4533fb168 100644 --- a/webrtc/system_wrappers/source/clock.cc +++ b/webrtc/system_wrappers/source/clock.cc @@ -12,15 +12,15 @@ #if defined(_WIN32) // Windows needs to be included before mmsystem.h -#include "webrtc/base/win32.h" +#include "webrtc/rtc_base/win32.h" #include #elif ((defined WEBRTC_LINUX) || (defined WEBRTC_MAC)) #include #include #endif -#include "webrtc/base/criticalsection.h" -#include "webrtc/base/timeutils.h" +#include "webrtc/rtc_base/criticalsection.h" +#include "webrtc/rtc_base/timeutils.h" #include "webrtc/system_wrappers/include/rw_lock_wrapper.h" namespace webrtc { diff --git a/webrtc/system_wrappers/source/cpu_info.cc b/webrtc/system_wrappers/source/cpu_info.cc index 4a61c7a6f3..f151ceaae7 100644 --- a/webrtc/system_wrappers/source/cpu_info.cc +++ b/webrtc/system_wrappers/source/cpu_info.cc @@ -23,7 +23,7 @@ #include #endif -#include "webrtc/base/logging.h" +#include "webrtc/rtc_base/logging.h" namespace internal { static int DetectNumberOfCores() { diff --git a/webrtc/system_wrappers/source/event.cc b/webrtc/system_wrappers/source/event.cc index 05f918ffc2..2f08a1ad99 100644 --- a/webrtc/system_wrappers/source/event.cc +++ b/webrtc/system_wrappers/source/event.cc @@ -22,7 +22,7 @@ #include "webrtc/system_wrappers/source/event_timer_posix.h" #endif -#include "webrtc/base/event.h" +#include "webrtc/rtc_base/event.h" namespace webrtc { diff --git a/webrtc/system_wrappers/source/event_timer_posix.cc b/webrtc/system_wrappers/source/event_timer_posix.cc index b46b83857f..dead7c9b80 100644 --- a/webrtc/system_wrappers/source/event_timer_posix.cc +++ b/webrtc/system_wrappers/source/event_timer_posix.cc @@ -18,7 +18,7 @@ #include #include -#include "webrtc/base/checks.h" +#include "webrtc/rtc_base/checks.h" namespace webrtc { diff --git a/webrtc/system_wrappers/source/event_timer_posix.h b/webrtc/system_wrappers/source/event_timer_posix.h index 599eb55ee1..1b01e4b142 100644 --- a/webrtc/system_wrappers/source/event_timer_posix.h +++ b/webrtc/system_wrappers/source/event_timer_posix.h @@ -18,7 +18,7 @@ #include #include -#include "webrtc/base/platform_thread.h" +#include "webrtc/rtc_base/platform_thread.h" namespace webrtc { diff --git a/webrtc/system_wrappers/source/event_timer_posix_unittest.cc b/webrtc/system_wrappers/source/event_timer_posix_unittest.cc index f5b3de40b8..5feac80a35 100644 --- a/webrtc/system_wrappers/source/event_timer_posix_unittest.cc +++ b/webrtc/system_wrappers/source/event_timer_posix_unittest.cc @@ -10,8 +10,8 @@ #include "webrtc/system_wrappers/source/event_timer_posix.h" -#include "webrtc/base/criticalsection.h" -#include "webrtc/base/event.h" +#include "webrtc/rtc_base/criticalsection.h" +#include "webrtc/rtc_base/event.h" #include "webrtc/test/gtest.h" namespace webrtc { diff --git a/webrtc/system_wrappers/source/file_impl.cc b/webrtc/system_wrappers/source/file_impl.cc index 8e1ba24f8d..f62e7124f7 100644 --- a/webrtc/system_wrappers/source/file_impl.cc +++ b/webrtc/system_wrappers/source/file_impl.cc @@ -17,7 +17,7 @@ #include #endif -#include "webrtc/base/checks.h" +#include "webrtc/rtc_base/checks.h" namespace webrtc { namespace { diff --git a/webrtc/system_wrappers/source/logcat_trace_context.cc b/webrtc/system_wrappers/source/logcat_trace_context.cc index 3771be59d9..7ad1b1dedd 100644 --- a/webrtc/system_wrappers/source/logcat_trace_context.cc +++ b/webrtc/system_wrappers/source/logcat_trace_context.cc @@ -13,7 +13,7 @@ #include #include -#include "webrtc/base/logging.h" +#include "webrtc/rtc_base/logging.h" namespace webrtc { diff --git a/webrtc/system_wrappers/source/metrics_default.cc b/webrtc/system_wrappers/source/metrics_default.cc index 6ca90dafdc..f9a6f6aaf9 100644 --- a/webrtc/system_wrappers/source/metrics_default.cc +++ b/webrtc/system_wrappers/source/metrics_default.cc @@ -11,8 +11,8 @@ #include -#include "webrtc/base/criticalsection.h" -#include "webrtc/base/thread_annotations.h" +#include "webrtc/rtc_base/criticalsection.h" +#include "webrtc/rtc_base/thread_annotations.h" #include "webrtc/system_wrappers/include/metrics.h" // Default implementation of histogram methods for WebRTC clients that do not diff --git a/webrtc/system_wrappers/source/rtp_to_ntp_estimator.cc b/webrtc/system_wrappers/source/rtp_to_ntp_estimator.cc index baa218d4ae..d65bf98207 100644 --- a/webrtc/system_wrappers/source/rtp_to_ntp_estimator.cc +++ b/webrtc/system_wrappers/source/rtp_to_ntp_estimator.cc @@ -10,7 +10,7 @@ #include "webrtc/system_wrappers/include/rtp_to_ntp_estimator.h" -#include "webrtc/base/logging.h" +#include "webrtc/rtc_base/logging.h" #include "webrtc/system_wrappers/include/clock.h" namespace webrtc { diff --git a/webrtc/system_wrappers/source/trace_impl.cc b/webrtc/system_wrappers/source/trace_impl.cc index 30a8816b75..513327e0aa 100644 --- a/webrtc/system_wrappers/source/trace_impl.cc +++ b/webrtc/system_wrappers/source/trace_impl.cc @@ -15,8 +15,8 @@ #include #include -#include "webrtc/base/atomicops.h" -#include "webrtc/base/platform_thread.h" +#include "webrtc/rtc_base/atomicops.h" +#include "webrtc/rtc_base/platform_thread.h" #ifdef _WIN32 #include "webrtc/system_wrappers/source/trace_win.h" #else diff --git a/webrtc/system_wrappers/source/trace_impl.h b/webrtc/system_wrappers/source/trace_impl.h index 045b3cd5f5..90e4a3af3b 100644 --- a/webrtc/system_wrappers/source/trace_impl.h +++ b/webrtc/system_wrappers/source/trace_impl.h @@ -13,11 +13,11 @@ #include -#include "webrtc/base/criticalsection.h" +#include "webrtc/rtc_base/criticalsection.h" +#include "webrtc/rtc_base/platform_thread.h" #include "webrtc/system_wrappers/include/event_wrapper.h" #include "webrtc/system_wrappers/include/file_wrapper.h" #include "webrtc/system_wrappers/include/static_instance.h" -#include "webrtc/base/platform_thread.h" #include "webrtc/system_wrappers/include/trace.h" namespace webrtc { diff --git a/webrtc/system_wrappers/source/trace_posix.h b/webrtc/system_wrappers/source/trace_posix.h index 9da71039c9..4387895bc2 100644 --- a/webrtc/system_wrappers/source/trace_posix.h +++ b/webrtc/system_wrappers/source/trace_posix.h @@ -11,7 +11,7 @@ #ifndef WEBRTC_SYSTEM_WRAPPERS_SOURCE_TRACE_POSIX_H_ #define WEBRTC_SYSTEM_WRAPPERS_SOURCE_TRACE_POSIX_H_ -#include "webrtc/base/criticalsection.h" +#include "webrtc/rtc_base/criticalsection.h" #include "webrtc/system_wrappers/source/trace_impl.h" namespace webrtc { diff --git a/webrtc/test/call_test.cc b/webrtc/test/call_test.cc index 638e70483a..fc3fc689f2 100644 --- a/webrtc/test/call_test.cc +++ b/webrtc/test/call_test.cc @@ -14,9 +14,9 @@ #include "webrtc/api/audio_codecs/builtin_audio_decoder_factory.h" #include "webrtc/api/audio_codecs/builtin_audio_encoder_factory.h" -#include "webrtc/base/checks.h" #include "webrtc/config.h" #include "webrtc/modules/audio_mixer/audio_mixer_impl.h" +#include "webrtc/rtc_base/checks.h" #include "webrtc/test/testsupport/fileutils.h" #include "webrtc/voice_engine/include/voe_base.h" diff --git a/webrtc/test/configurable_frame_size_encoder.cc b/webrtc/test/configurable_frame_size_encoder.cc index 0cb90a67ee..c81833f683 100644 --- a/webrtc/test/configurable_frame_size_encoder.cc +++ b/webrtc/test/configurable_frame_size_encoder.cc @@ -12,9 +12,9 @@ #include -#include "webrtc/base/checks.h" #include "webrtc/common_video/include/video_frame.h" #include "webrtc/modules/video_coding/include/video_codec_interface.h" +#include "webrtc/rtc_base/checks.h" #include "webrtc/test/gtest.h" namespace webrtc { diff --git a/webrtc/test/direct_transport.h b/webrtc/test/direct_transport.h index a865c83150..8a10b5c05a 100644 --- a/webrtc/test/direct_transport.h +++ b/webrtc/test/direct_transport.h @@ -15,10 +15,10 @@ #include #include "webrtc/api/call/transport.h" -#include "webrtc/base/criticalsection.h" -#include "webrtc/base/event.h" -#include "webrtc/base/platform_thread.h" #include "webrtc/call/call.h" +#include "webrtc/rtc_base/criticalsection.h" +#include "webrtc/rtc_base/event.h" +#include "webrtc/rtc_base/platform_thread.h" #include "webrtc/test/fake_network_pipe.h" namespace webrtc { diff --git a/webrtc/test/drifting_clock.cc b/webrtc/test/drifting_clock.cc index b11077641d..c1539fd46f 100644 --- a/webrtc/test/drifting_clock.cc +++ b/webrtc/test/drifting_clock.cc @@ -9,7 +9,7 @@ */ #include "webrtc/test/drifting_clock.h" -#include "webrtc/base/checks.h" +#include "webrtc/rtc_base/checks.h" namespace webrtc { namespace test { diff --git a/webrtc/test/fake_audio_device.cc b/webrtc/test/fake_audio_device.cc index 91d5978b3f..97299e1bdb 100644 --- a/webrtc/test/fake_audio_device.cc +++ b/webrtc/test/fake_audio_device.cc @@ -13,9 +13,9 @@ #include #include -#include "webrtc/base/checks.h" -#include "webrtc/base/random.h" #include "webrtc/common_audio/wav_file.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/random.h" #include "webrtc/system_wrappers/include/event_wrapper.h" namespace webrtc { diff --git a/webrtc/test/fake_audio_device.h b/webrtc/test/fake_audio_device.h index f6017443d7..8b15cd7e3d 100644 --- a/webrtc/test/fake_audio_device.h +++ b/webrtc/test/fake_audio_device.h @@ -14,12 +14,12 @@ #include #include -#include "webrtc/base/array_view.h" -#include "webrtc/base/buffer.h" -#include "webrtc/base/criticalsection.h" -#include "webrtc/base/event.h" -#include "webrtc/base/platform_thread.h" #include "webrtc/modules/audio_device/include/fake_audio_device.h" +#include "webrtc/rtc_base/array_view.h" +#include "webrtc/rtc_base/buffer.h" +#include "webrtc/rtc_base/criticalsection.h" +#include "webrtc/rtc_base/event.h" +#include "webrtc/rtc_base/platform_thread.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/test/fake_decoder.cc b/webrtc/test/fake_decoder.cc index 25f80779e2..f2823b5e3a 100644 --- a/webrtc/test/fake_decoder.cc +++ b/webrtc/test/fake_decoder.cc @@ -11,7 +11,7 @@ #include "webrtc/test/fake_decoder.h" #include "webrtc/api/video/i420_buffer.h" -#include "webrtc/base/timeutils.h" +#include "webrtc/rtc_base/timeutils.h" #include "webrtc/test/gtest.h" namespace webrtc { diff --git a/webrtc/test/fake_encoder.cc b/webrtc/test/fake_encoder.cc index 922ff56120..7c0870ec47 100644 --- a/webrtc/test/fake_encoder.cc +++ b/webrtc/test/fake_encoder.cc @@ -15,9 +15,9 @@ #include #include -#include "webrtc/base/checks.h" #include "webrtc/common_types.h" #include "webrtc/modules/video_coding/include/video_codec_interface.h" +#include "webrtc/rtc_base/checks.h" #include "webrtc/system_wrappers/include/sleep.h" #include "webrtc/test/gtest.h" diff --git a/webrtc/test/fake_encoder.h b/webrtc/test/fake_encoder.h index 4487c52e1e..220af90b14 100644 --- a/webrtc/test/fake_encoder.h +++ b/webrtc/test/fake_encoder.h @@ -15,10 +15,10 @@ #include #include "webrtc/api/video_codecs/video_encoder.h" -#include "webrtc/base/criticalsection.h" -#include "webrtc/base/sequenced_task_checker.h" -#include "webrtc/base/task_queue.h" #include "webrtc/common_types.h" +#include "webrtc/rtc_base/criticalsection.h" +#include "webrtc/rtc_base/sequenced_task_checker.h" +#include "webrtc/rtc_base/task_queue.h" #include "webrtc/system_wrappers/include/clock.h" namespace webrtc { diff --git a/webrtc/test/fake_network_pipe.cc b/webrtc/test/fake_network_pipe.cc index a614cc316f..bb9d6b1322 100644 --- a/webrtc/test/fake_network_pipe.cc +++ b/webrtc/test/fake_network_pipe.cc @@ -17,9 +17,9 @@ #include #include -#include "webrtc/base/logging.h" #include "webrtc/call/call.h" #include "webrtc/modules/rtp_rtcp/include/rtp_header_parser.h" +#include "webrtc/rtc_base/logging.h" #include "webrtc/system_wrappers/include/clock.h" namespace webrtc { diff --git a/webrtc/test/fake_network_pipe.h b/webrtc/test/fake_network_pipe.h index f3cd11dcc0..039cc84de8 100644 --- a/webrtc/test/fake_network_pipe.h +++ b/webrtc/test/fake_network_pipe.h @@ -17,10 +17,10 @@ #include #include -#include "webrtc/base/constructormagic.h" -#include "webrtc/base/criticalsection.h" -#include "webrtc/base/random.h" #include "webrtc/common_types.h" +#include "webrtc/rtc_base/constructormagic.h" +#include "webrtc/rtc_base/criticalsection.h" +#include "webrtc/rtc_base/random.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/test/fake_texture_frame.h b/webrtc/test/fake_texture_frame.h index bcda06dfc0..ce5963ea53 100644 --- a/webrtc/test/fake_texture_frame.h +++ b/webrtc/test/fake_texture_frame.h @@ -12,8 +12,8 @@ #include "webrtc/api/video/i420_buffer.h" #include "webrtc/api/video/video_frame.h" -#include "webrtc/base/checks.h" #include "webrtc/common_video/include/video_frame_buffer.h" +#include "webrtc/rtc_base/checks.h" namespace webrtc { namespace test { diff --git a/webrtc/test/frame_generator.cc b/webrtc/test/frame_generator.cc index 148488ae42..52ae14fe64 100644 --- a/webrtc/test/frame_generator.cc +++ b/webrtc/test/frame_generator.cc @@ -16,11 +16,11 @@ #include #include "webrtc/api/video/i420_buffer.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/keep_ref_until_done.h" -#include "webrtc/base/random.h" #include "webrtc/common_video/include/video_frame_buffer.h" #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/keep_ref_until_done.h" +#include "webrtc/rtc_base/random.h" #include "webrtc/system_wrappers/include/clock.h" #include "webrtc/test/frame_utils.h" diff --git a/webrtc/test/frame_generator.h b/webrtc/test/frame_generator.h index 95b0798bf6..6b0137df24 100644 --- a/webrtc/test/frame_generator.h +++ b/webrtc/test/frame_generator.h @@ -15,8 +15,8 @@ #include #include "webrtc/api/video/video_frame.h" -#include "webrtc/base/criticalsection.h" #include "webrtc/media/base/videosourceinterface.h" +#include "webrtc/rtc_base/criticalsection.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/test/frame_generator_capturer.cc b/webrtc/test/frame_generator_capturer.cc index af54f3171d..73cc5aed72 100644 --- a/webrtc/test/frame_generator_capturer.cc +++ b/webrtc/test/frame_generator_capturer.cc @@ -13,11 +13,11 @@ #include #include -#include "webrtc/base/criticalsection.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/platform_thread.h" -#include "webrtc/base/task_queue.h" -#include "webrtc/base/timeutils.h" +#include "webrtc/rtc_base/criticalsection.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/platform_thread.h" +#include "webrtc/rtc_base/task_queue.h" +#include "webrtc/rtc_base/timeutils.h" #include "webrtc/system_wrappers/include/clock.h" #include "webrtc/test/frame_generator.h" #include "webrtc/video_send_stream.h" diff --git a/webrtc/test/frame_generator_capturer.h b/webrtc/test/frame_generator_capturer.h index 36a79f9755..f62afbac2d 100644 --- a/webrtc/test/frame_generator_capturer.h +++ b/webrtc/test/frame_generator_capturer.h @@ -14,8 +14,8 @@ #include #include "webrtc/api/video/video_frame.h" -#include "webrtc/base/criticalsection.h" -#include "webrtc/base/task_queue.h" +#include "webrtc/rtc_base/criticalsection.h" +#include "webrtc/rtc_base/task_queue.h" #include "webrtc/test/video_capturer.h" #include "webrtc/typedefs.h" diff --git a/webrtc/test/frame_utils.h b/webrtc/test/frame_utils.h index 8600f431e5..4953db4478 100644 --- a/webrtc/test/frame_utils.h +++ b/webrtc/test/frame_utils.h @@ -12,7 +12,7 @@ #include -#include "webrtc/base/scoped_ref_ptr.h" +#include "webrtc/rtc_base/scoped_ref_ptr.h" namespace webrtc { class I420Buffer; diff --git a/webrtc/test/fuzzers/audio_decoder_fuzzer.cc b/webrtc/test/fuzzers/audio_decoder_fuzzer.cc index adc0fc7427..ff4478dca9 100644 --- a/webrtc/test/fuzzers/audio_decoder_fuzzer.cc +++ b/webrtc/test/fuzzers/audio_decoder_fuzzer.cc @@ -13,9 +13,9 @@ #include #include "webrtc/api/audio_codecs/audio_decoder.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/optional.h" #include "webrtc/modules/rtp_rtcp/source/byte_io.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/optional.h" namespace webrtc { namespace { diff --git a/webrtc/test/fuzzers/audio_processing_fuzzer.cc b/webrtc/test/fuzzers/audio_processing_fuzzer.cc index 389ab1c1b5..e31c05739a 100644 --- a/webrtc/test/fuzzers/audio_processing_fuzzer.cc +++ b/webrtc/test/fuzzers/audio_processing_fuzzer.cc @@ -14,9 +14,9 @@ #include #include -#include "webrtc/base/checks.h" #include "webrtc/modules/audio_processing/include/audio_processing.h" #include "webrtc/modules/include/module_common_types.h" +#include "webrtc/rtc_base/checks.h" namespace webrtc { namespace { diff --git a/webrtc/test/fuzzers/audio_processing_fuzzer_configs.cc b/webrtc/test/fuzzers/audio_processing_fuzzer_configs.cc index 9878da98b3..f9814ec306 100644 --- a/webrtc/test/fuzzers/audio_processing_fuzzer_configs.cc +++ b/webrtc/test/fuzzers/audio_processing_fuzzer_configs.cc @@ -11,7 +11,7 @@ #include "webrtc/modules/audio_processing/include/audio_processing.h" #include "webrtc/test/fuzzers/audio_processing_fuzzer.h" -#include "webrtc/base/optional.h" +#include "webrtc/rtc_base/optional.h" namespace webrtc { diff --git a/webrtc/test/fuzzers/flexfec_header_reader_fuzzer.cc b/webrtc/test/fuzzers/flexfec_header_reader_fuzzer.cc index a498fd0b4c..f253ca976a 100644 --- a/webrtc/test/fuzzers/flexfec_header_reader_fuzzer.cc +++ b/webrtc/test/fuzzers/flexfec_header_reader_fuzzer.cc @@ -10,10 +10,10 @@ #include -#include "webrtc/base/scoped_ref_ptr.h" #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" #include "webrtc/modules/rtp_rtcp/source/flexfec_header_reader_writer.h" #include "webrtc/modules/rtp_rtcp/source/forward_error_correction.h" +#include "webrtc/rtc_base/scoped_ref_ptr.h" namespace webrtc { diff --git a/webrtc/test/fuzzers/flexfec_receiver_fuzzer.cc b/webrtc/test/fuzzers/flexfec_receiver_fuzzer.cc index d38b8a2007..b0da8033f1 100644 --- a/webrtc/test/fuzzers/flexfec_receiver_fuzzer.cc +++ b/webrtc/test/fuzzers/flexfec_receiver_fuzzer.cc @@ -10,11 +10,11 @@ #include -#include "webrtc/base/basictypes.h" -#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" #include "webrtc/modules/rtp_rtcp/include/flexfec_receiver.h" +#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" #include "webrtc/modules/rtp_rtcp/source/byte_io.h" #include "webrtc/modules/rtp_rtcp/source/rtp_packet_received.h" +#include "webrtc/rtc_base/basictypes.h" namespace webrtc { diff --git a/webrtc/test/fuzzers/neteq_rtp_fuzzer.cc b/webrtc/test/fuzzers/neteq_rtp_fuzzer.cc index a5a1cdecc4..1a2bfc4678 100644 --- a/webrtc/test/fuzzers/neteq_rtp_fuzzer.cc +++ b/webrtc/test/fuzzers/neteq_rtp_fuzzer.cc @@ -12,12 +12,12 @@ #include #include -#include "webrtc/base/array_view.h" #include "webrtc/modules/audio_coding/codecs/pcm16b/audio_encoder_pcm16b.h" #include "webrtc/modules/audio_coding/neteq/tools/audio_checksum.h" #include "webrtc/modules/audio_coding/neteq/tools/encode_neteq_input.h" #include "webrtc/modules/audio_coding/neteq/tools/neteq_test.h" #include "webrtc/modules/rtp_rtcp/source/byte_io.h" +#include "webrtc/rtc_base/array_view.h" namespace webrtc { namespace test { diff --git a/webrtc/test/fuzzers/pseudotcp_parser_fuzzer.cc b/webrtc/test/fuzzers/pseudotcp_parser_fuzzer.cc index 5e4165e5d2..ac5331b13e 100644 --- a/webrtc/test/fuzzers/pseudotcp_parser_fuzzer.cc +++ b/webrtc/test/fuzzers/pseudotcp_parser_fuzzer.cc @@ -11,8 +11,8 @@ #include #include -#include "webrtc/base/thread.h" #include "webrtc/p2p/base/pseudotcp.h" +#include "webrtc/rtc_base/thread.h" namespace webrtc { class FakeIPseudoTcpNotify : public cricket::IPseudoTcpNotify { diff --git a/webrtc/test/fuzzers/residual_echo_detector_fuzzer.cc b/webrtc/test/fuzzers/residual_echo_detector_fuzzer.cc index ad870afc41..8250c15d86 100644 --- a/webrtc/test/fuzzers/residual_echo_detector_fuzzer.cc +++ b/webrtc/test/fuzzers/residual_echo_detector_fuzzer.cc @@ -15,8 +15,8 @@ #include #include -#include "webrtc/base/checks.h" #include "webrtc/modules/audio_processing/residual_echo_detector.h" +#include "webrtc/rtc_base/checks.h" namespace webrtc { diff --git a/webrtc/test/fuzzers/rtcp_receiver_fuzzer.cc b/webrtc/test/fuzzers/rtcp_receiver_fuzzer.cc index b8ab9b9e54..9d93f838b6 100644 --- a/webrtc/test/fuzzers/rtcp_receiver_fuzzer.cc +++ b/webrtc/test/fuzzers/rtcp_receiver_fuzzer.cc @@ -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. */ -#include "webrtc/base/checks.h" #include "webrtc/modules/rtp_rtcp/source/rtcp_receiver.h" +#include "webrtc/rtc_base/checks.h" #include "webrtc/system_wrappers/include/clock.h" namespace webrtc { diff --git a/webrtc/test/fuzzers/transport_feedback_packet_loss_tracker_fuzzer.cc b/webrtc/test/fuzzers/transport_feedback_packet_loss_tracker_fuzzer.cc index cf19573d9a..2e532d1191 100644 --- a/webrtc/test/fuzzers/transport_feedback_packet_loss_tracker_fuzzer.cc +++ b/webrtc/test/fuzzers/transport_feedback_packet_loss_tracker_fuzzer.cc @@ -10,10 +10,10 @@ #include -#include "webrtc/base/array_view.h" #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" #include "webrtc/modules/rtp_rtcp/source/byte_io.h" #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h" +#include "webrtc/rtc_base/array_view.h" #include "webrtc/voice_engine/transport_feedback_packet_loss_tracker.h" namespace webrtc { diff --git a/webrtc/test/fuzzers/ulpfec_generator_fuzzer.cc b/webrtc/test/fuzzers/ulpfec_generator_fuzzer.cc index ce9e30acca..01729efddc 100644 --- a/webrtc/test/fuzzers/ulpfec_generator_fuzzer.cc +++ b/webrtc/test/fuzzers/ulpfec_generator_fuzzer.cc @@ -10,10 +10,10 @@ #include -#include "webrtc/base/checks.h" #include "webrtc/modules/rtp_rtcp/source/byte_io.h" #include "webrtc/modules/rtp_rtcp/source/fec_test_helper.h" #include "webrtc/modules/rtp_rtcp/source/ulpfec_generator.h" +#include "webrtc/rtc_base/checks.h" namespace webrtc { diff --git a/webrtc/test/fuzzers/ulpfec_header_reader_fuzzer.cc b/webrtc/test/fuzzers/ulpfec_header_reader_fuzzer.cc index bcfd9c4e81..e69f463203 100644 --- a/webrtc/test/fuzzers/ulpfec_header_reader_fuzzer.cc +++ b/webrtc/test/fuzzers/ulpfec_header_reader_fuzzer.cc @@ -10,10 +10,10 @@ #include -#include "webrtc/base/scoped_ref_ptr.h" #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" #include "webrtc/modules/rtp_rtcp/source/forward_error_correction.h" #include "webrtc/modules/rtp_rtcp/source/ulpfec_header_reader_writer.h" +#include "webrtc/rtc_base/scoped_ref_ptr.h" namespace webrtc { diff --git a/webrtc/test/fuzzers/webrtc_fuzzer_main.cc b/webrtc/test/fuzzers/webrtc_fuzzer_main.cc index 50a513c094..a5d5ed1db7 100644 --- a/webrtc/test/fuzzers/webrtc_fuzzer_main.cc +++ b/webrtc/test/fuzzers/webrtc_fuzzer_main.cc @@ -12,7 +12,7 @@ // It's intended to set sane defaults, such as removing logging for further // fuzzing efficiency. -#include "webrtc/base/logging.h" +#include "webrtc/rtc_base/logging.h" namespace { bool g_initialized = false; diff --git a/webrtc/test/gl/gl_renderer.cc b/webrtc/test/gl/gl_renderer.cc index 5f52923752..c55f347af2 100644 --- a/webrtc/test/gl/gl_renderer.cc +++ b/webrtc/test/gl/gl_renderer.cc @@ -12,8 +12,8 @@ #include -#include "webrtc/base/checks.h" #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" +#include "webrtc/rtc_base/checks.h" namespace webrtc { namespace test { diff --git a/webrtc/test/gmock.h b/webrtc/test/gmock.h index bc12fb91d1..8e321a036b 100644 --- a/webrtc/test/gmock.h +++ b/webrtc/test/gmock.h @@ -11,7 +11,7 @@ #ifndef WEBRTC_TEST_GMOCK_H_ #define WEBRTC_TEST_GMOCK_H_ -#include "webrtc/base/ignore_wundef.h" +#include "webrtc/rtc_base/ignore_wundef.h" RTC_PUSH_IGNORING_WUNDEF() #include "testing/gmock/include/gmock/gmock.h" diff --git a/webrtc/test/gtest.h b/webrtc/test/gtest.h index 2d222cc22c..886e7b8b63 100644 --- a/webrtc/test/gtest.h +++ b/webrtc/test/gtest.h @@ -11,7 +11,7 @@ #ifndef WEBRTC_TEST_GTEST_H_ #define WEBRTC_TEST_GTEST_H_ -#include "webrtc/base/ignore_wundef.h" +#include "webrtc/rtc_base/ignore_wundef.h" RTC_PUSH_IGNORING_WUNDEF() #include "testing/gtest/include/gtest/gtest.h" diff --git a/webrtc/test/layer_filtering_transport.cc b/webrtc/test/layer_filtering_transport.cc index 06fc71f3f4..00fe5f9e07 100644 --- a/webrtc/test/layer_filtering_transport.cc +++ b/webrtc/test/layer_filtering_transport.cc @@ -10,11 +10,11 @@ #include -#include "webrtc/base/checks.h" #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" #include "webrtc/modules/rtp_rtcp/source/byte_io.h" #include "webrtc/modules/rtp_rtcp/source/rtp_format.h" #include "webrtc/modules/rtp_rtcp/source/rtp_utility.h" +#include "webrtc/rtc_base/checks.h" #include "webrtc/test/layer_filtering_transport.h" namespace webrtc { diff --git a/webrtc/test/mac/video_renderer_mac.h b/webrtc/test/mac/video_renderer_mac.h index 702f5ae267..2d5516398d 100644 --- a/webrtc/test/mac/video_renderer_mac.h +++ b/webrtc/test/mac/video_renderer_mac.h @@ -11,7 +11,7 @@ #ifndef WEBRTC_TEST_MAC_VIDEO_RENDERER_MAC_H_ #define WEBRTC_TEST_MAC_VIDEO_RENDERER_MAC_H_ -#include "webrtc/base/constructormagic.h" +#include "webrtc/rtc_base/constructormagic.h" #include "webrtc/test/gl/gl_renderer.h" @class CocoaWindow; diff --git a/webrtc/test/mock_audio_decoder_factory.h b/webrtc/test/mock_audio_decoder_factory.h index 24eb44eb67..ae7cc42bce 100644 --- a/webrtc/test/mock_audio_decoder_factory.h +++ b/webrtc/test/mock_audio_decoder_factory.h @@ -16,7 +16,7 @@ #include "webrtc/api/audio_codecs/audio_decoder_factory.h" #include "webrtc/api/audio_codecs/builtin_audio_decoder_factory.h" -#include "webrtc/base/scoped_ref_ptr.h" +#include "webrtc/rtc_base/scoped_ref_ptr.h" #include "webrtc/test/gmock.h" namespace webrtc { diff --git a/webrtc/test/mock_audio_encoder.h b/webrtc/test/mock_audio_encoder.h index 1c6a5f0e56..90e2b9ded8 100644 --- a/webrtc/test/mock_audio_encoder.h +++ b/webrtc/test/mock_audio_encoder.h @@ -14,7 +14,7 @@ #include #include "webrtc/api/audio_codecs/audio_encoder.h" -#include "webrtc/base/array_view.h" +#include "webrtc/rtc_base/array_view.h" #include "webrtc/test/gmock.h" namespace webrtc { diff --git a/webrtc/test/mock_audio_encoder_factory.h b/webrtc/test/mock_audio_encoder_factory.h index 41494a2696..c095197498 100644 --- a/webrtc/test/mock_audio_encoder_factory.h +++ b/webrtc/test/mock_audio_encoder_factory.h @@ -15,7 +15,7 @@ #include #include "webrtc/api/audio_codecs/audio_encoder_factory.h" -#include "webrtc/base/scoped_ref_ptr.h" +#include "webrtc/rtc_base/scoped_ref_ptr.h" #include "webrtc/test/gmock.h" namespace webrtc { diff --git a/webrtc/test/rtcp_packet_parser.cc b/webrtc/test/rtcp_packet_parser.cc index 728cb63f50..ad90ce6072 100644 --- a/webrtc/test/rtcp_packet_parser.cc +++ b/webrtc/test/rtcp_packet_parser.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/base/checks.h" -#include "webrtc/base/logging.h" #include "webrtc/test/rtcp_packet_parser.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/logging.h" namespace webrtc { namespace test { diff --git a/webrtc/test/rtcp_packet_parser.h b/webrtc/test/rtcp_packet_parser.h index 5dc4e841f8..4bc5477c4b 100644 --- a/webrtc/test/rtcp_packet_parser.h +++ b/webrtc/test/rtcp_packet_parser.h @@ -12,8 +12,6 @@ #ifndef WEBRTC_TEST_RTCP_PACKET_PARSER_H_ #define WEBRTC_TEST_RTCP_PACKET_PARSER_H_ -#include "webrtc/base/array_view.h" -#include "webrtc/base/checks.h" #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/app.h" #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/bye.h" #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/common_header.h" @@ -30,6 +28,8 @@ #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmbn.h" #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmbr.h" #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h" +#include "webrtc/rtc_base/array_view.h" +#include "webrtc/rtc_base/checks.h" namespace webrtc { namespace test { diff --git a/webrtc/test/rtp_file_reader.cc b/webrtc/test/rtp_file_reader.cc index c4fd42dd05..36ad33a608 100644 --- a/webrtc/test/rtp_file_reader.cc +++ b/webrtc/test/rtp_file_reader.cc @@ -16,11 +16,11 @@ #include #include -#include "webrtc/base/checks.h" -#include "webrtc/base/constructormagic.h" -#include "webrtc/base/format_macros.h" -#include "webrtc/base/logging.h" #include "webrtc/modules/rtp_rtcp/source/rtp_utility.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/constructormagic.h" +#include "webrtc/rtc_base/format_macros.h" +#include "webrtc/rtc_base/logging.h" namespace webrtc { namespace test { diff --git a/webrtc/test/rtp_file_writer.cc b/webrtc/test/rtp_file_writer.cc index d9e0586468..596c234429 100644 --- a/webrtc/test/rtp_file_writer.cc +++ b/webrtc/test/rtp_file_writer.cc @@ -14,8 +14,8 @@ #include -#include "webrtc/base/checks.h" -#include "webrtc/base/constructormagic.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/constructormagic.h" namespace webrtc { namespace test { diff --git a/webrtc/test/rtp_rtcp_observer.h b/webrtc/test/rtp_rtcp_observer.h index bb00782510..54db770729 100644 --- a/webrtc/test/rtp_rtcp_observer.h +++ b/webrtc/test/rtp_rtcp_observer.h @@ -14,9 +14,9 @@ #include #include -#include "webrtc/base/criticalsection.h" -#include "webrtc/base/event.h" #include "webrtc/modules/rtp_rtcp/include/rtp_header_parser.h" +#include "webrtc/rtc_base/criticalsection.h" +#include "webrtc/rtc_base/event.h" #include "webrtc/system_wrappers/include/field_trial.h" #include "webrtc/test/constants.h" #include "webrtc/test/direct_transport.h" diff --git a/webrtc/test/test_main.cc b/webrtc/test/test_main.cc index ac8261e92a..2d7dbe2225 100644 --- a/webrtc/test/test_main.cc +++ b/webrtc/test/test_main.cc @@ -9,7 +9,7 @@ */ #include "gflags/gflags.h" -#include "webrtc/base/logging.h" +#include "webrtc/rtc_base/logging.h" #include "webrtc/system_wrappers/include/metrics_default.h" #include "webrtc/test/field_trial.h" #include "webrtc/test/gmock.h" diff --git a/webrtc/test/testsupport/fileutils.cc b/webrtc/test/testsupport/fileutils.cc index a96b1eaf02..deb9cf0494 100644 --- a/webrtc/test/testsupport/fileutils.cc +++ b/webrtc/test/testsupport/fileutils.cc @@ -21,7 +21,7 @@ #include "Shlwapi.h" #include "WinDef.h" -#include "webrtc/base/win32.h" +#include "webrtc/rtc_base/win32.h" #define GET_CURRENT_DIR _getcwd #else #include @@ -42,7 +42,7 @@ #include #include -#include "webrtc/base/checks.h" +#include "webrtc/rtc_base/checks.h" #include "webrtc/typedefs.h" // For architecture defines namespace webrtc { diff --git a/webrtc/test/testsupport/fileutils.h b/webrtc/test/testsupport/fileutils.h index 434287d6d9..570d7b4d20 100644 --- a/webrtc/test/testsupport/fileutils.h +++ b/webrtc/test/testsupport/fileutils.h @@ -16,7 +16,7 @@ #include #include -#include "webrtc/base/optional.h" +#include "webrtc/rtc_base/optional.h" namespace webrtc { namespace test { diff --git a/webrtc/test/testsupport/fileutils_unittest.cc b/webrtc/test/testsupport/fileutils_unittest.cc index 560300f640..bdabb8470a 100644 --- a/webrtc/test/testsupport/fileutils_unittest.cc +++ b/webrtc/test/testsupport/fileutils_unittest.cc @@ -17,9 +17,9 @@ #include #include -#include "webrtc/base/checks.h" -#include "webrtc/base/optional.h" -#include "webrtc/base/pathutils.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/optional.h" +#include "webrtc/rtc_base/pathutils.h" #include "webrtc/test/gtest.h" #ifdef WIN32 diff --git a/webrtc/test/testsupport/frame_reader.h b/webrtc/test/testsupport/frame_reader.h index 94dd78bbda..a8fe73f75d 100644 --- a/webrtc/test/testsupport/frame_reader.h +++ b/webrtc/test/testsupport/frame_reader.h @@ -15,7 +15,7 @@ #include -#include "webrtc/base/scoped_ref_ptr.h" +#include "webrtc/rtc_base/scoped_ref_ptr.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/test/testsupport/isolated_output.cc b/webrtc/test/testsupport/isolated_output.cc index 26e9f5577d..5324900efc 100644 --- a/webrtc/test/testsupport/isolated_output.cc +++ b/webrtc/test/testsupport/isolated_output.cc @@ -13,9 +13,9 @@ #include #include "gflags/gflags.h" -#include "webrtc/base/file.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/pathutils.h" +#include "webrtc/rtc_base/file.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/pathutils.h" #include "webrtc/test/testsupport/fileutils.h" DEFINE_string(isolated_out_dir, webrtc::test::OutputPath(), diff --git a/webrtc/test/testsupport/isolated_output_unittest.cc b/webrtc/test/testsupport/isolated_output_unittest.cc index 0918554b8b..bb75ebfe14 100644 --- a/webrtc/test/testsupport/isolated_output_unittest.cc +++ b/webrtc/test/testsupport/isolated_output_unittest.cc @@ -15,9 +15,9 @@ #include #include "gflags/gflags.h" -#include "webrtc/base/file.h" -#include "webrtc/base/pathutils.h" -#include "webrtc/base/platform_file.h" +#include "webrtc/rtc_base/file.h" +#include "webrtc/rtc_base/pathutils.h" +#include "webrtc/rtc_base/platform_file.h" #include "webrtc/test/gtest.h" DECLARE_string(isolated_out_dir); diff --git a/webrtc/test/testsupport/y4m_frame_writer.cc b/webrtc/test/testsupport/y4m_frame_writer.cc index 28fb4b06db..e33898243f 100644 --- a/webrtc/test/testsupport/y4m_frame_writer.cc +++ b/webrtc/test/testsupport/y4m_frame_writer.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/base/checks.h" +#include "webrtc/rtc_base/checks.h" #include "webrtc/test/testsupport/frame_writer.h" namespace webrtc { diff --git a/webrtc/test/testsupport/yuv_frame_writer.cc b/webrtc/test/testsupport/yuv_frame_writer.cc index 3c0076152e..84fba7ef00 100644 --- a/webrtc/test/testsupport/yuv_frame_writer.cc +++ b/webrtc/test/testsupport/yuv_frame_writer.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/base/checks.h" +#include "webrtc/rtc_base/checks.h" #include "webrtc/test/testsupport/frame_writer.h" namespace webrtc { diff --git a/webrtc/test/vcm_capturer.cc b/webrtc/test/vcm_capturer.cc index 6418641ad9..85cf0cdf01 100644 --- a/webrtc/test/vcm_capturer.cc +++ b/webrtc/test/vcm_capturer.cc @@ -10,8 +10,8 @@ #include "webrtc/test/vcm_capturer.h" -#include "webrtc/base/logging.h" #include "webrtc/modules/video_capture/video_capture_factory.h" +#include "webrtc/rtc_base/logging.h" #include "webrtc/video_send_stream.h" namespace webrtc { namespace test { diff --git a/webrtc/test/vcm_capturer.h b/webrtc/test/vcm_capturer.h index 08e8444008..fdb594b10e 100644 --- a/webrtc/test/vcm_capturer.h +++ b/webrtc/test/vcm_capturer.h @@ -12,11 +12,11 @@ #include -#include "webrtc/base/criticalsection.h" -#include "webrtc/base/scoped_ref_ptr.h" #include "webrtc/common_types.h" #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" #include "webrtc/modules/video_capture/video_capture.h" +#include "webrtc/rtc_base/criticalsection.h" +#include "webrtc/rtc_base/scoped_ref_ptr.h" #include "webrtc/test/video_capturer.h" namespace webrtc { diff --git a/webrtc/test/video_capturer.cc b/webrtc/test/video_capturer.cc index d0b5c37bec..cb75fa28ce 100644 --- a/webrtc/test/video_capturer.cc +++ b/webrtc/test/video_capturer.cc @@ -10,8 +10,8 @@ #include "webrtc/test/video_capturer.h" -#include "webrtc/base/basictypes.h" -#include "webrtc/base/constructormagic.h" +#include "webrtc/rtc_base/basictypes.h" +#include "webrtc/rtc_base/constructormagic.h" namespace webrtc { namespace test { diff --git a/webrtc/test/video_capturer.h b/webrtc/test/video_capturer.h index 667d89c89c..2535370f8e 100644 --- a/webrtc/test/video_capturer.h +++ b/webrtc/test/video_capturer.h @@ -16,10 +16,10 @@ #include "webrtc/api/video/i420_buffer.h" #include "webrtc/api/video/video_frame.h" -#include "webrtc/base/criticalsection.h" -#include "webrtc/base/optional.h" #include "webrtc/media/base/videoadapter.h" #include "webrtc/media/base/videosourceinterface.h" +#include "webrtc/rtc_base/criticalsection.h" +#include "webrtc/rtc_base/optional.h" namespace cricket { class VideoAdapter; diff --git a/webrtc/test/win/d3d_renderer.cc b/webrtc/test/win/d3d_renderer.cc index 01b032583c..e73bad6d5f 100644 --- a/webrtc/test/win/d3d_renderer.cc +++ b/webrtc/test/win/d3d_renderer.cc @@ -9,8 +9,8 @@ */ #include "webrtc/test/win/d3d_renderer.h" -#include "webrtc/base/checks.h" #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" +#include "webrtc/rtc_base/checks.h" namespace webrtc { namespace test { diff --git a/webrtc/test/win/d3d_renderer.h b/webrtc/test/win/d3d_renderer.h index 575d9c7f5d..c3e9f7d074 100644 --- a/webrtc/test/win/d3d_renderer.h +++ b/webrtc/test/win/d3d_renderer.h @@ -14,7 +14,7 @@ #include #pragma comment(lib, "d3d9.lib") // located in DirectX SDK -#include "webrtc/base/scoped_ref_ptr.h" +#include "webrtc/rtc_base/scoped_ref_ptr.h" #include "webrtc/test/video_renderer.h" #include "webrtc/typedefs.h" diff --git a/webrtc/video/call_stats.cc b/webrtc/video/call_stats.cc index f772037b0d..9864d4e51b 100644 --- a/webrtc/video/call_stats.cc +++ b/webrtc/video/call_stats.cc @@ -12,9 +12,9 @@ #include -#include "webrtc/base/checks.h" -#include "webrtc/base/constructormagic.h" #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/constructormagic.h" #include "webrtc/system_wrappers/include/metrics.h" namespace webrtc { diff --git a/webrtc/video/call_stats.h b/webrtc/video/call_stats.h index 9a5967e648..a9b42804aa 100644 --- a/webrtc/video/call_stats.h +++ b/webrtc/video/call_stats.h @@ -14,9 +14,9 @@ #include #include -#include "webrtc/base/constructormagic.h" -#include "webrtc/base/criticalsection.h" #include "webrtc/modules/include/module.h" +#include "webrtc/rtc_base/constructormagic.h" +#include "webrtc/rtc_base/criticalsection.h" #include "webrtc/system_wrappers/include/clock.h" namespace webrtc { diff --git a/webrtc/video/encoder_rtcp_feedback.cc b/webrtc/video/encoder_rtcp_feedback.cc index b6f3fc9203..11d46ff5e9 100644 --- a/webrtc/video/encoder_rtcp_feedback.cc +++ b/webrtc/video/encoder_rtcp_feedback.cc @@ -10,7 +10,7 @@ #include "webrtc/video/encoder_rtcp_feedback.h" -#include "webrtc/base/checks.h" +#include "webrtc/rtc_base/checks.h" #include "webrtc/video/vie_encoder.h" static const int kMinKeyFrameRequestIntervalMs = 300; diff --git a/webrtc/video/encoder_rtcp_feedback.h b/webrtc/video/encoder_rtcp_feedback.h index 06548d64a9..e7a825c6a4 100644 --- a/webrtc/video/encoder_rtcp_feedback.h +++ b/webrtc/video/encoder_rtcp_feedback.h @@ -12,8 +12,8 @@ #include -#include "webrtc/base/criticalsection.h" #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" +#include "webrtc/rtc_base/criticalsection.h" #include "webrtc/system_wrappers/include/clock.h" #include "webrtc/typedefs.h" diff --git a/webrtc/video/end_to_end_tests.cc b/webrtc/video/end_to_end_tests.cc index b76a57db26..45019871b1 100644 --- a/webrtc/video/end_to_end_tests.cc +++ b/webrtc/video/end_to_end_tests.cc @@ -16,12 +16,6 @@ #include #include "webrtc/api/video_codecs/video_encoder.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/event.h" -#include "webrtc/base/file.h" -#include "webrtc/base/optional.h" -#include "webrtc/base/random.h" -#include "webrtc/base/rate_limiter.h" #include "webrtc/call/call.h" #include "webrtc/common_video/include/frame_callback.h" #include "webrtc/logging/rtc_event_log/rtc_event_log.h" @@ -41,6 +35,12 @@ #include "webrtc/modules/video_coding/codecs/vp8/simulcast_encoder_adapter.h" #include "webrtc/modules/video_coding/codecs/vp9/include/vp9.h" #include "webrtc/modules/video_coding/include/video_coding_defines.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/event.h" +#include "webrtc/rtc_base/file.h" +#include "webrtc/rtc_base/optional.h" +#include "webrtc/rtc_base/random.h" +#include "webrtc/rtc_base/rate_limiter.h" #include "webrtc/system_wrappers/include/metrics.h" #include "webrtc/system_wrappers/include/metrics_default.h" #include "webrtc/system_wrappers/include/sleep.h" diff --git a/webrtc/video/overuse_frame_detector.cc b/webrtc/video/overuse_frame_detector.cc index 9711ddb039..1d8bc0b450 100644 --- a/webrtc/video/overuse_frame_detector.cc +++ b/webrtc/video/overuse_frame_detector.cc @@ -20,11 +20,11 @@ #include #include "webrtc/api/video/video_frame.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/numerics/exp_filter.h" -#include "webrtc/base/timeutils.h" #include "webrtc/common_video/include/frame_callback.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/numerics/exp_filter.h" +#include "webrtc/rtc_base/timeutils.h" #include "webrtc/system_wrappers/include/field_trial.h" #if defined(WEBRTC_MAC) && !defined(WEBRTC_IOS) diff --git a/webrtc/video/overuse_frame_detector.h b/webrtc/video/overuse_frame_detector.h index 29efa1609d..8bf1a78aed 100644 --- a/webrtc/video/overuse_frame_detector.h +++ b/webrtc/video/overuse_frame_detector.h @@ -14,13 +14,13 @@ #include #include -#include "webrtc/base/constructormagic.h" -#include "webrtc/base/numerics/exp_filter.h" -#include "webrtc/base/optional.h" -#include "webrtc/base/sequenced_task_checker.h" -#include "webrtc/base/task_queue.h" -#include "webrtc/base/thread_annotations.h" #include "webrtc/modules/video_coding/utility/quality_scaler.h" +#include "webrtc/rtc_base/constructormagic.h" +#include "webrtc/rtc_base/numerics/exp_filter.h" +#include "webrtc/rtc_base/optional.h" +#include "webrtc/rtc_base/sequenced_task_checker.h" +#include "webrtc/rtc_base/task_queue.h" +#include "webrtc/rtc_base/thread_annotations.h" namespace webrtc { diff --git a/webrtc/video/overuse_frame_detector_unittest.cc b/webrtc/video/overuse_frame_detector_unittest.cc index ae3b687acc..e52efcbacf 100644 --- a/webrtc/video/overuse_frame_detector_unittest.cc +++ b/webrtc/video/overuse_frame_detector_unittest.cc @@ -11,13 +11,13 @@ #include #include "webrtc/api/video/i420_buffer.h" -#include "webrtc/base/event.h" -#include "webrtc/base/fakeclock.h" #include "webrtc/common_video/include/video_frame.h" +#include "webrtc/modules/video_coding/utility/quality_scaler.h" +#include "webrtc/rtc_base/event.h" +#include "webrtc/rtc_base/fakeclock.h" #include "webrtc/test/gmock.h" #include "webrtc/test/gtest.h" #include "webrtc/video/overuse_frame_detector.h" -#include "webrtc/modules/video_coding/utility/quality_scaler.h" namespace webrtc { diff --git a/webrtc/video/payload_router.cc b/webrtc/video/payload_router.cc index 58fcfd668f..7957451c2b 100644 --- a/webrtc/video/payload_router.cc +++ b/webrtc/video/payload_router.cc @@ -10,10 +10,10 @@ #include "webrtc/video/payload_router.h" -#include "webrtc/base/checks.h" #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp.h" #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" #include "webrtc/modules/video_coding/include/video_codec_interface.h" +#include "webrtc/rtc_base/checks.h" namespace webrtc { diff --git a/webrtc/video/payload_router.h b/webrtc/video/payload_router.h index bcf1d9b977..177bc07f3f 100644 --- a/webrtc/video/payload_router.h +++ b/webrtc/video/payload_router.h @@ -14,11 +14,11 @@ #include #include "webrtc/api/video_codecs/video_encoder.h" -#include "webrtc/base/constructormagic.h" -#include "webrtc/base/criticalsection.h" -#include "webrtc/base/thread_annotations.h" #include "webrtc/common_types.h" #include "webrtc/config.h" +#include "webrtc/rtc_base/constructormagic.h" +#include "webrtc/rtc_base/criticalsection.h" +#include "webrtc/rtc_base/thread_annotations.h" #include "webrtc/system_wrappers/include/atomic32.h" namespace webrtc { diff --git a/webrtc/video/quality_threshold.cc b/webrtc/video/quality_threshold.cc index c1d3b101eb..370fe6b133 100644 --- a/webrtc/video/quality_threshold.cc +++ b/webrtc/video/quality_threshold.cc @@ -10,8 +10,8 @@ #include "webrtc/video/quality_threshold.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/logging.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/logging.h" namespace webrtc { diff --git a/webrtc/video/quality_threshold.h b/webrtc/video/quality_threshold.h index 95e11d2016..ee13f8b810 100644 --- a/webrtc/video/quality_threshold.h +++ b/webrtc/video/quality_threshold.h @@ -13,7 +13,7 @@ #include -#include "webrtc/base/optional.h" +#include "webrtc/rtc_base/optional.h" namespace webrtc { diff --git a/webrtc/video/receive_statistics_proxy.cc b/webrtc/video/receive_statistics_proxy.cc index 62d0b1c292..cf65a75b4a 100644 --- a/webrtc/video/receive_statistics_proxy.cc +++ b/webrtc/video/receive_statistics_proxy.cc @@ -14,10 +14,10 @@ #include #include -#include "webrtc/base/checks.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/trace_event.h" #include "webrtc/modules/video_coding/include/video_codec_interface.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/trace_event.h" #include "webrtc/system_wrappers/include/clock.h" #include "webrtc/system_wrappers/include/field_trial.h" #include "webrtc/system_wrappers/include/metrics.h" diff --git a/webrtc/video/receive_statistics_proxy.h b/webrtc/video/receive_statistics_proxy.h index 1cfeca6513..8aff1a254c 100644 --- a/webrtc/video/receive_statistics_proxy.h +++ b/webrtc/video/receive_statistics_proxy.h @@ -14,13 +14,13 @@ #include #include -#include "webrtc/base/criticalsection.h" -#include "webrtc/base/rate_statistics.h" -#include "webrtc/base/ratetracker.h" -#include "webrtc/base/thread_annotations.h" #include "webrtc/common_types.h" #include "webrtc/common_video/include/frame_callback.h" #include "webrtc/modules/video_coding/include/video_coding_defines.h" +#include "webrtc/rtc_base/criticalsection.h" +#include "webrtc/rtc_base/rate_statistics.h" +#include "webrtc/rtc_base/ratetracker.h" +#include "webrtc/rtc_base/thread_annotations.h" #include "webrtc/video/quality_threshold.h" #include "webrtc/video/report_block_stats.h" #include "webrtc/video/stats_counter.h" diff --git a/webrtc/video/replay.cc b/webrtc/video/replay.cc index 25c71c42ef..915f5880f9 100644 --- a/webrtc/video/replay.cc +++ b/webrtc/video/replay.cc @@ -16,11 +16,11 @@ #include "gflags/gflags.h" #include "webrtc/api/video_codecs/video_decoder.h" -#include "webrtc/base/checks.h" #include "webrtc/call/call.h" #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" #include "webrtc/logging/rtc_event_log/rtc_event_log.h" #include "webrtc/modules/rtp_rtcp/include/rtp_header_parser.h" +#include "webrtc/rtc_base/checks.h" #include "webrtc/system_wrappers/include/clock.h" #include "webrtc/system_wrappers/include/sleep.h" #include "webrtc/test/encoder_settings.h" diff --git a/webrtc/video/rtp_streams_synchronizer.cc b/webrtc/video/rtp_streams_synchronizer.cc index 1edb9b8e4f..ad7cf42b68 100644 --- a/webrtc/video/rtp_streams_synchronizer.cc +++ b/webrtc/video/rtp_streams_synchronizer.cc @@ -10,12 +10,12 @@ #include "webrtc/video/rtp_streams_synchronizer.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/timeutils.h" -#include "webrtc/base/trace_event.h" #include "webrtc/call/syncable.h" #include "webrtc/modules/video_coding/video_coding_impl.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/timeutils.h" +#include "webrtc/rtc_base/trace_event.h" namespace webrtc { namespace { diff --git a/webrtc/video/rtp_streams_synchronizer.h b/webrtc/video/rtp_streams_synchronizer.h index afa15015d4..dfc0ddb115 100644 --- a/webrtc/video/rtp_streams_synchronizer.h +++ b/webrtc/video/rtp_streams_synchronizer.h @@ -16,9 +16,9 @@ #include -#include "webrtc/base/criticalsection.h" -#include "webrtc/base/thread_checker.h" #include "webrtc/modules/include/module.h" +#include "webrtc/rtc_base/criticalsection.h" +#include "webrtc/rtc_base/thread_checker.h" #include "webrtc/video/stream_synchronization.h" namespace webrtc { diff --git a/webrtc/video/rtp_video_stream_receiver.cc b/webrtc/video/rtp_video_stream_receiver.cc index 6b8ea0f45d..4204670c7e 100644 --- a/webrtc/video/rtp_video_stream_receiver.cc +++ b/webrtc/video/rtp_video_stream_receiver.cc @@ -13,9 +13,6 @@ #include #include -#include "webrtc/base/checks.h" -#include "webrtc/base/location.h" -#include "webrtc/base/logging.h" #include "webrtc/common_types.h" #include "webrtc/config.h" #include "webrtc/media/base/mediaconstants.h" @@ -34,6 +31,9 @@ #include "webrtc/modules/video_coding/h264_sps_pps_tracker.h" #include "webrtc/modules/video_coding/packet_buffer.h" #include "webrtc/modules/video_coding/video_coding_impl.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/location.h" +#include "webrtc/rtc_base/logging.h" #include "webrtc/system_wrappers/include/field_trial.h" #include "webrtc/system_wrappers/include/metrics.h" #include "webrtc/system_wrappers/include/timestamp_extrapolator.h" diff --git a/webrtc/video/rtp_video_stream_receiver.h b/webrtc/video/rtp_video_stream_receiver.h index 924f1be86c..afcc696da1 100644 --- a/webrtc/video/rtp_video_stream_receiver.h +++ b/webrtc/video/rtp_video_stream_receiver.h @@ -17,8 +17,6 @@ #include #include -#include "webrtc/base/constructormagic.h" -#include "webrtc/base/criticalsection.h" #include "webrtc/call/rtp_packet_sink_interface.h" #include "webrtc/modules/include/module_common_types.h" #include "webrtc/modules/rtp_rtcp/include/receive_statistics.h" @@ -31,6 +29,8 @@ #include "webrtc/modules/video_coding/packet_buffer.h" #include "webrtc/modules/video_coding/rtp_frame_reference_finder.h" #include "webrtc/modules/video_coding/sequence_number_util.h" +#include "webrtc/rtc_base/constructormagic.h" +#include "webrtc/rtc_base/criticalsection.h" #include "webrtc/typedefs.h" #include "webrtc/video_receive_stream.h" diff --git a/webrtc/video/rtp_video_stream_receiver_unittest.cc b/webrtc/video/rtp_video_stream_receiver_unittest.cc index 8f42fbdfbd..3e94e53294 100644 --- a/webrtc/video/rtp_video_stream_receiver_unittest.cc +++ b/webrtc/video/rtp_video_stream_receiver_unittest.cc @@ -11,17 +11,17 @@ #include "webrtc/test/gtest.h" #include "webrtc/test/gmock.h" -#include "webrtc/base/bytebuffer.h" -#include "webrtc/base/logging.h" #include "webrtc/common_video/h264/h264_common.h" #include "webrtc/media/base/mediaconstants.h" #include "webrtc/modules/pacing/packet_router.h" -#include "webrtc/modules/video_coding/include/video_coding_defines.h" +#include "webrtc/modules/utility/include/process_thread.h" #include "webrtc/modules/video_coding/frame_object.h" +#include "webrtc/modules/video_coding/include/video_coding_defines.h" #include "webrtc/modules/video_coding/packet.h" #include "webrtc/modules/video_coding/rtp_frame_reference_finder.h" #include "webrtc/modules/video_coding/timing.h" -#include "webrtc/modules/utility/include/process_thread.h" +#include "webrtc/rtc_base/bytebuffer.h" +#include "webrtc/rtc_base/logging.h" #include "webrtc/system_wrappers/include/clock.h" #include "webrtc/system_wrappers/include/field_trial_default.h" #include "webrtc/test/field_trial.h" diff --git a/webrtc/video/screenshare_loopback.cc b/webrtc/video/screenshare_loopback.cc index 4212f35a67..01dee91de5 100644 --- a/webrtc/video/screenshare_loopback.cc +++ b/webrtc/video/screenshare_loopback.cc @@ -10,8 +10,8 @@ #include -#include "webrtc/base/flags.h" -#include "webrtc/base/stringencode.h" +#include "webrtc/rtc_base/flags.h" +#include "webrtc/rtc_base/stringencode.h" #include "webrtc/test/field_trial.h" #include "webrtc/test/gtest.h" #include "webrtc/test/run_test.h" diff --git a/webrtc/video/send_delay_stats.cc b/webrtc/video/send_delay_stats.cc index 1c3fd2a600..b7c6658ad3 100644 --- a/webrtc/video/send_delay_stats.cc +++ b/webrtc/video/send_delay_stats.cc @@ -12,7 +12,7 @@ #include -#include "webrtc/base/logging.h" +#include "webrtc/rtc_base/logging.h" #include "webrtc/system_wrappers/include/metrics.h" namespace webrtc { diff --git a/webrtc/video/send_delay_stats.h b/webrtc/video/send_delay_stats.h index 8cac12343d..658cf2b176 100644 --- a/webrtc/video/send_delay_stats.h +++ b/webrtc/video/send_delay_stats.h @@ -15,10 +15,10 @@ #include #include -#include "webrtc/base/criticalsection.h" -#include "webrtc/base/thread_annotations.h" #include "webrtc/common_types.h" #include "webrtc/modules/include/module_common_types.h" +#include "webrtc/rtc_base/criticalsection.h" +#include "webrtc/rtc_base/thread_annotations.h" #include "webrtc/system_wrappers/include/clock.h" #include "webrtc/video/stats_counter.h" #include "webrtc/video_send_stream.h" diff --git a/webrtc/video/send_statistics_proxy.cc b/webrtc/video/send_statistics_proxy.cc index cea9ce73d4..898bedcfa5 100644 --- a/webrtc/video/send_statistics_proxy.cc +++ b/webrtc/video/send_statistics_proxy.cc @@ -15,11 +15,11 @@ #include #include -#include "webrtc/base/checks.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/trace_event.h" #include "webrtc/common_types.h" #include "webrtc/modules/video_coding/include/video_codec_interface.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/trace_event.h" #include "webrtc/system_wrappers/include/metrics.h" namespace webrtc { diff --git a/webrtc/video/send_statistics_proxy.h b/webrtc/video/send_statistics_proxy.h index 763a7a8f87..5017598f0a 100644 --- a/webrtc/video/send_statistics_proxy.h +++ b/webrtc/video/send_statistics_proxy.h @@ -16,13 +16,13 @@ #include #include -#include "webrtc/base/criticalsection.h" -#include "webrtc/base/numerics/exp_filter.h" -#include "webrtc/base/ratetracker.h" -#include "webrtc/base/thread_annotations.h" #include "webrtc/common_types.h" #include "webrtc/modules/video_coding/include/video_codec_interface.h" #include "webrtc/modules/video_coding/include/video_coding_defines.h" +#include "webrtc/rtc_base/criticalsection.h" +#include "webrtc/rtc_base/numerics/exp_filter.h" +#include "webrtc/rtc_base/ratetracker.h" +#include "webrtc/rtc_base/thread_annotations.h" #include "webrtc/system_wrappers/include/clock.h" #include "webrtc/video/overuse_frame_detector.h" #include "webrtc/video/report_block_stats.h" diff --git a/webrtc/video/stats_counter.cc b/webrtc/video/stats_counter.cc index da7a70690b..adc0129c7c 100644 --- a/webrtc/video/stats_counter.cc +++ b/webrtc/video/stats_counter.cc @@ -14,7 +14,7 @@ #include #include -#include "webrtc/base/checks.h" +#include "webrtc/rtc_base/checks.h" #include "webrtc/system_wrappers/include/clock.h" namespace webrtc { diff --git a/webrtc/video/stats_counter.h b/webrtc/video/stats_counter.h index 4fa676cfdf..4beb5bf56a 100644 --- a/webrtc/video/stats_counter.h +++ b/webrtc/video/stats_counter.h @@ -14,7 +14,7 @@ #include #include -#include "webrtc/base/constructormagic.h" +#include "webrtc/rtc_base/constructormagic.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/video/stream_synchronization.cc b/webrtc/video/stream_synchronization.cc index 32a2d722f5..fc9ab32aa2 100644 --- a/webrtc/video/stream_synchronization.cc +++ b/webrtc/video/stream_synchronization.cc @@ -16,7 +16,7 @@ #include -#include "webrtc/base/logging.h" +#include "webrtc/rtc_base/logging.h" namespace webrtc { diff --git a/webrtc/video/transport_adapter.cc b/webrtc/video/transport_adapter.cc index 6f4e028a7a..4f4dd98f3d 100644 --- a/webrtc/video/transport_adapter.cc +++ b/webrtc/video/transport_adapter.cc @@ -10,7 +10,7 @@ #include "webrtc/video/transport_adapter.h" -#include "webrtc/base/checks.h" +#include "webrtc/rtc_base/checks.h" namespace webrtc { namespace internal { diff --git a/webrtc/video/video_loopback.cc b/webrtc/video/video_loopback.cc index dc8de56ade..aa11005d47 100644 --- a/webrtc/video/video_loopback.cc +++ b/webrtc/video/video_loopback.cc @@ -10,7 +10,7 @@ #include -#include "webrtc/base/flags.h" +#include "webrtc/rtc_base/flags.h" #include "webrtc/test/field_trial.h" #include "webrtc/test/gtest.h" #include "webrtc/test/run_test.h" diff --git a/webrtc/video/video_quality_test.cc b/webrtc/video/video_quality_test.cc index 1ae2e16a88..264c7a56bf 100644 --- a/webrtc/video/video_quality_test.cc +++ b/webrtc/video/video_quality_test.cc @@ -18,14 +18,6 @@ #include #include -#include "webrtc/base/checks.h" -#include "webrtc/base/cpu_time.h" -#include "webrtc/base/event.h" -#include "webrtc/base/format_macros.h" -#include "webrtc/base/memory_usage.h" -#include "webrtc/base/optional.h" -#include "webrtc/base/platform_file.h" -#include "webrtc/base/timeutils.h" #include "webrtc/call/call.h" #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" #include "webrtc/logging/rtc_event_log/rtc_event_log.h" @@ -38,6 +30,14 @@ #include "webrtc/modules/video_coding/codecs/vp8/include/vp8.h" #include "webrtc/modules/video_coding/codecs/vp8/include/vp8_common_types.h" #include "webrtc/modules/video_coding/codecs/vp9/include/vp9.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/cpu_time.h" +#include "webrtc/rtc_base/event.h" +#include "webrtc/rtc_base/format_macros.h" +#include "webrtc/rtc_base/memory_usage.h" +#include "webrtc/rtc_base/optional.h" +#include "webrtc/rtc_base/platform_file.h" +#include "webrtc/rtc_base/timeutils.h" #include "webrtc/system_wrappers/include/cpu_info.h" #include "webrtc/system_wrappers/include/field_trial.h" #include "webrtc/test/gtest.h" diff --git a/webrtc/video/video_receive_stream.cc b/webrtc/video/video_receive_stream.cc index f21cf720a6..a18d4375a1 100644 --- a/webrtc/video/video_receive_stream.cc +++ b/webrtc/video/video_receive_stream.cc @@ -16,11 +16,6 @@ #include #include -#include "webrtc/base/checks.h" -#include "webrtc/base/location.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/optional.h" -#include "webrtc/base/trace_event.h" #include "webrtc/call/rtp_stream_receiver_controller_interface.h" #include "webrtc/common_types.h" #include "webrtc/common_video/h264/profile_level_id.h" @@ -33,6 +28,11 @@ #include "webrtc/modules/video_coding/jitter_estimator.h" #include "webrtc/modules/video_coding/timing.h" #include "webrtc/modules/video_coding/utility/ivf_file_writer.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/location.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/optional.h" +#include "webrtc/rtc_base/trace_event.h" #include "webrtc/system_wrappers/include/clock.h" #include "webrtc/system_wrappers/include/field_trial.h" #include "webrtc/video/call_stats.h" diff --git a/webrtc/video/video_receive_stream.h b/webrtc/video/video_receive_stream.h index 6e2b20a95d..c86d6b80ee 100644 --- a/webrtc/video/video_receive_stream.h +++ b/webrtc/video/video_receive_stream.h @@ -14,7 +14,6 @@ #include #include -#include "webrtc/base/thread_checker.h" #include "webrtc/call/rtp_packet_sink_interface.h" #include "webrtc/call/syncable.h" #include "webrtc/common_video/include/incoming_video_stream.h" @@ -22,6 +21,7 @@ #include "webrtc/modules/rtp_rtcp/include/flexfec_receiver.h" #include "webrtc/modules/video_coding/frame_buffer2.h" #include "webrtc/modules/video_coding/video_coding_impl.h" +#include "webrtc/rtc_base/thread_checker.h" #include "webrtc/system_wrappers/include/clock.h" #include "webrtc/video/receive_statistics_proxy.h" #include "webrtc/video/rtp_streams_synchronizer.h" diff --git a/webrtc/video/video_receive_stream_unittest.cc b/webrtc/video/video_receive_stream_unittest.cc index a1b644e666..bce4fd3d7b 100644 --- a/webrtc/video/video_receive_stream_unittest.cc +++ b/webrtc/video/video_receive_stream_unittest.cc @@ -14,17 +14,17 @@ #include "webrtc/test/gmock.h" #include "webrtc/api/video_codecs/video_decoder.h" -#include "webrtc/base/criticalsection.h" -#include "webrtc/base/event.h" #include "webrtc/call/rtp_stream_receiver_controller.h" #include "webrtc/media/base/fakevideorenderer.h" #include "webrtc/modules/pacing/packet_router.h" #include "webrtc/modules/rtp_rtcp/source/rtp_packet_to_send.h" #include "webrtc/modules/utility/include/process_thread.h" -#include "webrtc/video/call_stats.h" -#include "webrtc/video/video_receive_stream.h" +#include "webrtc/rtc_base/criticalsection.h" +#include "webrtc/rtc_base/event.h" #include "webrtc/system_wrappers/include/clock.h" #include "webrtc/test/field_trial.h" +#include "webrtc/video/call_stats.h" +#include "webrtc/video/video_receive_stream.h" namespace webrtc { namespace { diff --git a/webrtc/video/video_send_stream.cc b/webrtc/video/video_send_stream.cc index fba3315a3b..3565f9ca70 100644 --- a/webrtc/video/video_send_stream.cc +++ b/webrtc/video/video_send_stream.cc @@ -16,12 +16,6 @@ #include #include -#include "webrtc/base/checks.h" -#include "webrtc/base/file.h" -#include "webrtc/base/location.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/trace_event.h" -#include "webrtc/base/weak_ptr.h" #include "webrtc/call/rtp_transport_controller_send_interface.h" #include "webrtc/common_types.h" #include "webrtc/common_video/include/video_bitrate_allocator.h" @@ -33,6 +27,12 @@ #include "webrtc/modules/rtp_rtcp/source/rtp_sender.h" #include "webrtc/modules/utility/include/process_thread.h" #include "webrtc/modules/video_coding/utility/ivf_file_writer.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/file.h" +#include "webrtc/rtc_base/location.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/trace_event.h" +#include "webrtc/rtc_base/weak_ptr.h" #include "webrtc/system_wrappers/include/field_trial.h" #include "webrtc/video/call_stats.h" #include "webrtc/video/payload_router.h" diff --git a/webrtc/video/video_send_stream.h b/webrtc/video/video_send_stream.h index dcdc71c2d4..2f1fec0357 100644 --- a/webrtc/video/video_send_stream.h +++ b/webrtc/video/video_send_stream.h @@ -16,11 +16,11 @@ #include #include "webrtc/call/bitrate_allocator.h" -#include "webrtc/base/criticalsection.h" -#include "webrtc/base/event.h" -#include "webrtc/base/task_queue.h" #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" #include "webrtc/modules/video_coding/protection_bitrate_calculator.h" +#include "webrtc/rtc_base/criticalsection.h" +#include "webrtc/rtc_base/event.h" +#include "webrtc/rtc_base/task_queue.h" #include "webrtc/video/encoder_rtcp_feedback.h" #include "webrtc/video/send_delay_stats.h" #include "webrtc/video/send_statistics_proxy.h" diff --git a/webrtc/video/video_send_stream_tests.cc b/webrtc/video/video_send_stream_tests.cc index 7fa12e1c50..3206c40587 100644 --- a/webrtc/video/video_send_stream_tests.cc +++ b/webrtc/video/video_send_stream_tests.cc @@ -11,14 +11,6 @@ #include #include -#include "webrtc/base/bind.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/criticalsection.h" -#include "webrtc/base/event.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/platform_thread.h" -#include "webrtc/base/rate_limiter.h" -#include "webrtc/base/timeutils.h" #include "webrtc/call/call.h" #include "webrtc/common_video/include/frame_callback.h" #include "webrtc/common_video/include/video_frame.h" @@ -28,6 +20,14 @@ #include "webrtc/modules/rtp_rtcp/source/rtp_format_vp9.h" #include "webrtc/modules/video_coding/codecs/vp8/include/vp8.h" #include "webrtc/modules/video_coding/codecs/vp9/include/vp9.h" +#include "webrtc/rtc_base/bind.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/criticalsection.h" +#include "webrtc/rtc_base/event.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/platform_thread.h" +#include "webrtc/rtc_base/rate_limiter.h" +#include "webrtc/rtc_base/timeutils.h" #include "webrtc/system_wrappers/include/sleep.h" #include "webrtc/test/call_test.h" #include "webrtc/test/configurable_frame_size_encoder.h" diff --git a/webrtc/video/video_stream_decoder.cc b/webrtc/video/video_stream_decoder.cc index 126d6e5e57..915eccf5bd 100644 --- a/webrtc/video/video_stream_decoder.cc +++ b/webrtc/video/video_stream_decoder.cc @@ -14,10 +14,10 @@ #include #include -#include "webrtc/base/checks.h" -#include "webrtc/base/logging.h" #include "webrtc/common_video/include/frame_callback.h" #include "webrtc/modules/video_coding/video_coding_impl.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/logging.h" #include "webrtc/system_wrappers/include/metrics.h" #include "webrtc/video/call_stats.h" #include "webrtc/video/payload_router.h" diff --git a/webrtc/video/video_stream_decoder.h b/webrtc/video/video_stream_decoder.h index 3903fb559c..d5103eedd4 100644 --- a/webrtc/video/video_stream_decoder.h +++ b/webrtc/video/video_stream_decoder.h @@ -16,12 +16,12 @@ #include #include -#include "webrtc/base/criticalsection.h" -#include "webrtc/base/platform_thread.h" -#include "webrtc/base/scoped_ref_ptr.h" #include "webrtc/media/base/videosinkinterface.h" #include "webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h" #include "webrtc/modules/video_coding/include/video_coding_defines.h" +#include "webrtc/rtc_base/criticalsection.h" +#include "webrtc/rtc_base/platform_thread.h" +#include "webrtc/rtc_base/scoped_ref_ptr.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/video/vie_encoder.cc b/webrtc/video/vie_encoder.cc index 4522300c9c..c49b76b5fa 100644 --- a/webrtc/video/vie_encoder.cc +++ b/webrtc/video/vie_encoder.cc @@ -16,12 +16,6 @@ #include #include "webrtc/api/video/i420_buffer.h" -#include "webrtc/base/arraysize.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/location.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/timeutils.h" -#include "webrtc/base/trace_event.h" #include "webrtc/common_video/include/video_bitrate_allocator.h" #include "webrtc/common_video/include/video_frame.h" #include "webrtc/modules/pacing/paced_sender.h" @@ -29,6 +23,12 @@ #include "webrtc/modules/video_coding/include/video_codec_initializer.h" #include "webrtc/modules/video_coding/include/video_coding.h" #include "webrtc/modules/video_coding/include/video_coding_defines.h" +#include "webrtc/rtc_base/arraysize.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/location.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/timeutils.h" +#include "webrtc/rtc_base/trace_event.h" #include "webrtc/video/overuse_frame_detector.h" #include "webrtc/video/send_statistics_proxy.h" diff --git a/webrtc/video/vie_encoder.h b/webrtc/video/vie_encoder.h index 91c6ca4f01..6e9234f383 100644 --- a/webrtc/video/vie_encoder.h +++ b/webrtc/video/vie_encoder.h @@ -18,10 +18,6 @@ #include "webrtc/api/video/video_rotation.h" #include "webrtc/api/video_codecs/video_encoder.h" -#include "webrtc/base/criticalsection.h" -#include "webrtc/base/event.h" -#include "webrtc/base/sequenced_task_checker.h" -#include "webrtc/base/task_queue.h" #include "webrtc/call/call.h" #include "webrtc/common_types.h" #include "webrtc/common_video/include/video_bitrate_allocator.h" @@ -29,6 +25,10 @@ #include "webrtc/modules/video_coding/include/video_coding_defines.h" #include "webrtc/modules/video_coding/utility/quality_scaler.h" #include "webrtc/modules/video_coding/video_coding_impl.h" +#include "webrtc/rtc_base/criticalsection.h" +#include "webrtc/rtc_base/event.h" +#include "webrtc/rtc_base/sequenced_task_checker.h" +#include "webrtc/rtc_base/task_queue.h" #include "webrtc/system_wrappers/include/atomic32.h" #include "webrtc/typedefs.h" #include "webrtc/video/overuse_frame_detector.h" diff --git a/webrtc/video/vie_encoder_unittest.cc b/webrtc/video/vie_encoder_unittest.cc index 3a9e95e465..09ac4c95ea 100644 --- a/webrtc/video/vie_encoder_unittest.cc +++ b/webrtc/video/vie_encoder_unittest.cc @@ -13,11 +13,11 @@ #include #include "webrtc/api/video/i420_buffer.h" -#include "webrtc/base/fakeclock.h" -#include "webrtc/base/logging.h" #include "webrtc/media/base/videoadapter.h" #include "webrtc/modules/video_coding/codecs/vp8/temporal_layers.h" #include "webrtc/modules/video_coding/utility/default_video_bitrate_allocator.h" +#include "webrtc/rtc_base/fakeclock.h" +#include "webrtc/rtc_base/logging.h" #include "webrtc/system_wrappers/include/metrics_default.h" #include "webrtc/system_wrappers/include/sleep.h" #include "webrtc/test/encoder_settings.h" diff --git a/webrtc/video_receive_stream.h b/webrtc/video_receive_stream.h index 66dd78b241..a2de503f29 100644 --- a/webrtc/video_receive_stream.h +++ b/webrtc/video_receive_stream.h @@ -17,11 +17,11 @@ #include #include "webrtc/api/call/transport.h" -#include "webrtc/base/platform_file.h" #include "webrtc/common_types.h" #include "webrtc/common_video/include/frame_callback.h" #include "webrtc/config.h" #include "webrtc/media/base/videosinkinterface.h" +#include "webrtc/rtc_base/platform_file.h" namespace webrtc { diff --git a/webrtc/video_send_stream.h b/webrtc/video_send_stream.h index 53be83f2aa..2b3ee78c20 100644 --- a/webrtc/video_send_stream.h +++ b/webrtc/video_send_stream.h @@ -18,12 +18,12 @@ #include #include "webrtc/api/call/transport.h" -#include "webrtc/base/platform_file.h" #include "webrtc/common_types.h" #include "webrtc/common_video/include/frame_callback.h" #include "webrtc/config.h" #include "webrtc/media/base/videosinkinterface.h" #include "webrtc/media/base/videosourceinterface.h" +#include "webrtc/rtc_base/platform_file.h" namespace webrtc { diff --git a/webrtc/voice_engine/audio_level.h b/webrtc/voice_engine/audio_level.h index 50409501e7..3bcb0d9b45 100644 --- a/webrtc/voice_engine/audio_level.h +++ b/webrtc/voice_engine/audio_level.h @@ -11,7 +11,7 @@ #ifndef WEBRTC_VOICE_ENGINE_AUDIO_LEVEL_H_ #define WEBRTC_VOICE_ENGINE_AUDIO_LEVEL_H_ -#include "webrtc/base/criticalsection.h" +#include "webrtc/rtc_base/criticalsection.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/voice_engine/channel.cc b/webrtc/voice_engine/channel.cc index 16122709c3..45b6db065b 100644 --- a/webrtc/voice_engine/channel.cc +++ b/webrtc/voice_engine/channel.cc @@ -14,16 +14,6 @@ #include #include "webrtc/audio/utility/audio_frame_operations.h" -#include "webrtc/base/array_view.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/criticalsection.h" -#include "webrtc/base/format_macros.h" -#include "webrtc/base/location.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/rate_limiter.h" -#include "webrtc/base/task_queue.h" -#include "webrtc/base/thread_checker.h" -#include "webrtc/base/timeutils.h" #include "webrtc/call/rtp_transport_controller_send_interface.h" #include "webrtc/config.h" #include "webrtc/logging/rtc_event_log/rtc_event_log.h" @@ -38,6 +28,16 @@ #include "webrtc/modules/rtp_rtcp/source/rtp_packet_received.h" #include "webrtc/modules/rtp_rtcp/source/rtp_receiver_strategy.h" #include "webrtc/modules/utility/include/process_thread.h" +#include "webrtc/rtc_base/array_view.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/criticalsection.h" +#include "webrtc/rtc_base/format_macros.h" +#include "webrtc/rtc_base/location.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/rate_limiter.h" +#include "webrtc/rtc_base/task_queue.h" +#include "webrtc/rtc_base/thread_checker.h" +#include "webrtc/rtc_base/timeutils.h" #include "webrtc/system_wrappers/include/field_trial.h" #include "webrtc/system_wrappers/include/trace.h" #include "webrtc/voice_engine/include/voe_rtp_rtcp.h" diff --git a/webrtc/voice_engine/channel.h b/webrtc/voice_engine/channel.h index 101de4060b..492083e0a8 100644 --- a/webrtc/voice_engine/channel.h +++ b/webrtc/voice_engine/channel.h @@ -16,10 +16,6 @@ #include "webrtc/api/audio/audio_mixer.h" #include "webrtc/api/audio_codecs/audio_encoder.h" #include "webrtc/api/call/audio_sink.h" -#include "webrtc/base/criticalsection.h" -#include "webrtc/base/event.h" -#include "webrtc/base/optional.h" -#include "webrtc/base/thread_checker.h" #include "webrtc/common_audio/resampler/include/push_resampler.h" #include "webrtc/common_types.h" #include "webrtc/modules/audio_coding/acm2/codec_manager.h" @@ -31,6 +27,10 @@ #include "webrtc/modules/rtp_rtcp/include/rtp_header_parser.h" #include "webrtc/modules/rtp_rtcp/include/rtp_receiver.h" #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp.h" +#include "webrtc/rtc_base/criticalsection.h" +#include "webrtc/rtc_base/event.h" +#include "webrtc/rtc_base/optional.h" +#include "webrtc/rtc_base/thread_checker.h" #include "webrtc/voice_engine/audio_level.h" #include "webrtc/voice_engine/file_player.h" #include "webrtc/voice_engine/file_recorder.h" diff --git a/webrtc/voice_engine/channel_manager.cc b/webrtc/voice_engine/channel_manager.cc index 58aef6f7ee..ff7a802a46 100644 --- a/webrtc/voice_engine/channel_manager.cc +++ b/webrtc/voice_engine/channel_manager.cc @@ -10,7 +10,7 @@ #include "webrtc/voice_engine/channel_manager.h" -#include "webrtc/base/timeutils.h" +#include "webrtc/rtc_base/timeutils.h" #include "webrtc/voice_engine/channel.h" namespace webrtc { diff --git a/webrtc/voice_engine/channel_manager.h b/webrtc/voice_engine/channel_manager.h index 65cf9942d1..11a44cffca 100644 --- a/webrtc/voice_engine/channel_manager.h +++ b/webrtc/voice_engine/channel_manager.h @@ -14,10 +14,10 @@ #include #include -#include "webrtc/base/constructormagic.h" -#include "webrtc/base/criticalsection.h" -#include "webrtc/base/random.h" -#include "webrtc/base/scoped_ref_ptr.h" +#include "webrtc/rtc_base/constructormagic.h" +#include "webrtc/rtc_base/criticalsection.h" +#include "webrtc/rtc_base/random.h" +#include "webrtc/rtc_base/scoped_ref_ptr.h" #include "webrtc/system_wrappers/include/atomic32.h" #include "webrtc/typedefs.h" #include "webrtc/voice_engine/include/voe_base.h" diff --git a/webrtc/voice_engine/channel_proxy.cc b/webrtc/voice_engine/channel_proxy.cc index 4a0b3cc4b1..4c6dd383ec 100644 --- a/webrtc/voice_engine/channel_proxy.cc +++ b/webrtc/voice_engine/channel_proxy.cc @@ -13,10 +13,10 @@ #include #include "webrtc/api/call/audio_sink.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/safe_minmax.h" #include "webrtc/call/rtp_transport_controller_send_interface.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/safe_minmax.h" #include "webrtc/voice_engine/channel.h" namespace webrtc { diff --git a/webrtc/voice_engine/channel_proxy.h b/webrtc/voice_engine/channel_proxy.h index f5417f254a..eb4bd701a9 100644 --- a/webrtc/voice_engine/channel_proxy.h +++ b/webrtc/voice_engine/channel_proxy.h @@ -14,10 +14,10 @@ #include "webrtc/api/audio/audio_mixer.h" #include "webrtc/api/audio_codecs/audio_encoder.h" #include "webrtc/api/rtpreceiverinterface.h" -#include "webrtc/base/constructormagic.h" -#include "webrtc/base/race_checker.h" -#include "webrtc/base/thread_checker.h" #include "webrtc/call/rtp_packet_sink_interface.h" +#include "webrtc/rtc_base/constructormagic.h" +#include "webrtc/rtc_base/race_checker.h" +#include "webrtc/rtc_base/thread_checker.h" #include "webrtc/voice_engine/channel_manager.h" #include "webrtc/voice_engine/include/voe_rtp_rtcp.h" diff --git a/webrtc/voice_engine/file_player.cc b/webrtc/voice_engine/file_player.cc index d2eadaeba4..6d9aaae6b8 100644 --- a/webrtc/voice_engine/file_player.cc +++ b/webrtc/voice_engine/file_player.cc @@ -10,11 +10,11 @@ #include "webrtc/voice_engine/file_player.h" -#include "webrtc/base/logging.h" #include "webrtc/common_audio/resampler/include/resampler.h" #include "webrtc/common_types.h" #include "webrtc/modules/media_file/media_file.h" #include "webrtc/modules/media_file/media_file_defines.h" +#include "webrtc/rtc_base/logging.h" #include "webrtc/typedefs.h" #include "webrtc/voice_engine/coder.h" diff --git a/webrtc/voice_engine/file_player_unittests.cc b/webrtc/voice_engine/file_player_unittests.cc index d41f4044b4..38ee987c12 100644 --- a/webrtc/voice_engine/file_player_unittests.cc +++ b/webrtc/voice_engine/file_player_unittests.cc @@ -18,8 +18,8 @@ #include #include "gflags/gflags.h" -#include "webrtc/base/md5digest.h" -#include "webrtc/base/stringencode.h" +#include "webrtc/rtc_base/md5digest.h" +#include "webrtc/rtc_base/stringencode.h" #include "webrtc/test/gtest.h" #include "webrtc/test/testsupport/fileutils.h" diff --git a/webrtc/voice_engine/file_recorder.cc b/webrtc/voice_engine/file_recorder.cc index eed3c0799a..1d35be9be4 100644 --- a/webrtc/voice_engine/file_recorder.cc +++ b/webrtc/voice_engine/file_recorder.cc @@ -13,13 +13,13 @@ #include #include "webrtc/audio/utility/audio_frame_operations.h" -#include "webrtc/base/logging.h" -#include "webrtc/base/platform_thread.h" #include "webrtc/common_audio/resampler/include/resampler.h" #include "webrtc/common_types.h" #include "webrtc/modules/include/module_common_types.h" #include "webrtc/modules/media_file/media_file.h" #include "webrtc/modules/media_file/media_file_defines.h" +#include "webrtc/rtc_base/logging.h" +#include "webrtc/rtc_base/platform_thread.h" #include "webrtc/system_wrappers/include/event_wrapper.h" #include "webrtc/typedefs.h" #include "webrtc/voice_engine/coder.h" diff --git a/webrtc/voice_engine/include/voe_base.h b/webrtc/voice_engine/include/voe_base.h index 05fe4550c4..b32d8df211 100644 --- a/webrtc/voice_engine/include/voe_base.h +++ b/webrtc/voice_engine/include/voe_base.h @@ -35,9 +35,9 @@ #define WEBRTC_VOICE_ENGINE_VOE_BASE_H #include "webrtc/api/audio_codecs/audio_decoder_factory.h" -#include "webrtc/base/scoped_ref_ptr.h" #include "webrtc/common_types.h" #include "webrtc/modules/audio_coding/include/audio_coding_module.h" +#include "webrtc/rtc_base/scoped_ref_ptr.h" namespace webrtc { diff --git a/webrtc/voice_engine/output_mixer.cc b/webrtc/voice_engine/output_mixer.cc index 170689afa1..c497cc1e16 100644 --- a/webrtc/voice_engine/output_mixer.cc +++ b/webrtc/voice_engine/output_mixer.cc @@ -10,8 +10,8 @@ #include "webrtc/voice_engine/output_mixer.h" -#include "webrtc/base/format_macros.h" #include "webrtc/modules/audio_processing/include/audio_processing.h" +#include "webrtc/rtc_base/format_macros.h" #include "webrtc/system_wrappers/include/file_wrapper.h" #include "webrtc/system_wrappers/include/trace.h" #include "webrtc/voice_engine/statistics.h" diff --git a/webrtc/voice_engine/output_mixer.h b/webrtc/voice_engine/output_mixer.h index 79c5e097ea..fe0cb308f1 100644 --- a/webrtc/voice_engine/output_mixer.h +++ b/webrtc/voice_engine/output_mixer.h @@ -13,11 +13,11 @@ #include -#include "webrtc/base/criticalsection.h" #include "webrtc/common_audio/resampler/include/push_resampler.h" #include "webrtc/common_types.h" #include "webrtc/modules/audio_conference_mixer/include/audio_conference_mixer.h" #include "webrtc/modules/audio_conference_mixer/include/audio_conference_mixer_defines.h" +#include "webrtc/rtc_base/criticalsection.h" #include "webrtc/voice_engine/file_recorder.h" namespace webrtc { diff --git a/webrtc/voice_engine/shared_data.h b/webrtc/voice_engine/shared_data.h index 951a85189d..971d7d7139 100644 --- a/webrtc/voice_engine/shared_data.h +++ b/webrtc/voice_engine/shared_data.h @@ -13,14 +13,14 @@ #include -#include "webrtc/base/criticalsection.h" -#include "webrtc/base/scoped_ref_ptr.h" -#include "webrtc/base/task_queue.h" -#include "webrtc/base/thread_annotations.h" -#include "webrtc/base/thread_checker.h" #include "webrtc/modules/audio_device/include/audio_device.h" #include "webrtc/modules/audio_processing/include/audio_processing.h" #include "webrtc/modules/utility/include/process_thread.h" +#include "webrtc/rtc_base/criticalsection.h" +#include "webrtc/rtc_base/scoped_ref_ptr.h" +#include "webrtc/rtc_base/task_queue.h" +#include "webrtc/rtc_base/thread_annotations.h" +#include "webrtc/rtc_base/thread_checker.h" #include "webrtc/voice_engine/channel_manager.h" #include "webrtc/voice_engine/statistics.h" #include "webrtc/voice_engine/voice_engine_defines.h" diff --git a/webrtc/voice_engine/statistics.h b/webrtc/voice_engine/statistics.h index 785fe14ed7..e0aa248ad6 100644 --- a/webrtc/voice_engine/statistics.h +++ b/webrtc/voice_engine/statistics.h @@ -11,8 +11,8 @@ #ifndef WEBRTC_VOICE_ENGINE_STATISTICS_H #define WEBRTC_VOICE_ENGINE_STATISTICS_H -#include "webrtc/base/criticalsection.h" #include "webrtc/common_types.h" +#include "webrtc/rtc_base/criticalsection.h" #include "webrtc/typedefs.h" #include "webrtc/voice_engine/include/voe_errors.h" #include "webrtc/voice_engine/voice_engine_defines.h" diff --git a/webrtc/voice_engine/test/auto_test/fakes/conference_transport.cc b/webrtc/voice_engine/test/auto_test/fakes/conference_transport.cc index f7510c7972..305b236b6d 100644 --- a/webrtc/voice_engine/test/auto_test/fakes/conference_transport.cc +++ b/webrtc/voice_engine/test/auto_test/fakes/conference_transport.cc @@ -12,8 +12,8 @@ #include -#include "webrtc/base/byteorder.h" -#include "webrtc/base/timeutils.h" +#include "webrtc/rtc_base/byteorder.h" +#include "webrtc/rtc_base/timeutils.h" #include "webrtc/system_wrappers/include/sleep.h" #include "webrtc/voice_engine/channel_proxy.h" #include "webrtc/voice_engine/voice_engine_impl.h" diff --git a/webrtc/voice_engine/test/auto_test/fakes/conference_transport.h b/webrtc/voice_engine/test/auto_test/fakes/conference_transport.h index 19fb15f619..22711bd5fb 100644 --- a/webrtc/voice_engine/test/auto_test/fakes/conference_transport.h +++ b/webrtc/voice_engine/test/auto_test/fakes/conference_transport.h @@ -16,11 +16,11 @@ #include #include -#include "webrtc/base/basictypes.h" -#include "webrtc/base/criticalsection.h" -#include "webrtc/base/platform_thread.h" #include "webrtc/common_types.h" #include "webrtc/modules/rtp_rtcp/include/rtp_header_parser.h" +#include "webrtc/rtc_base/basictypes.h" +#include "webrtc/rtc_base/criticalsection.h" +#include "webrtc/rtc_base/platform_thread.h" #include "webrtc/system_wrappers/include/event_wrapper.h" #include "webrtc/test/gtest.h" #include "webrtc/voice_engine/include/voe_base.h" diff --git a/webrtc/voice_engine/test/auto_test/fakes/loudest_filter.cc b/webrtc/voice_engine/test/auto_test/fakes/loudest_filter.cc index 4ee73860bf..ec1d66734a 100644 --- a/webrtc/voice_engine/test/auto_test/fakes/loudest_filter.cc +++ b/webrtc/voice_engine/test/auto_test/fakes/loudest_filter.cc @@ -10,7 +10,7 @@ #include "webrtc/voice_engine/test/auto_test/fakes/loudest_filter.h" -#include "webrtc/base/checks.h" +#include "webrtc/rtc_base/checks.h" namespace webrtc { namespace voetest { diff --git a/webrtc/voice_engine/test/auto_test/fakes/loudest_filter.h b/webrtc/voice_engine/test/auto_test/fakes/loudest_filter.h index 525e8eef1a..dd5a426fe1 100644 --- a/webrtc/voice_engine/test/auto_test/fakes/loudest_filter.h +++ b/webrtc/voice_engine/test/auto_test/fakes/loudest_filter.h @@ -12,8 +12,8 @@ #define WEBRTC_VOICE_ENGINE_TEST_AUTO_TEST_FAKES_LOUDEST_FILTER_H_ #include -#include "webrtc/base/timeutils.h" #include "webrtc/common_types.h" +#include "webrtc/rtc_base/timeutils.h" namespace webrtc { namespace voetest { diff --git a/webrtc/voice_engine/test/auto_test/fixtures/after_initialization_fixture.h b/webrtc/voice_engine/test/auto_test/fixtures/after_initialization_fixture.h index 66086695d2..1404fa5b23 100644 --- a/webrtc/voice_engine/test/auto_test/fixtures/after_initialization_fixture.h +++ b/webrtc/voice_engine/test/auto_test/fixtures/after_initialization_fixture.h @@ -14,10 +14,10 @@ #include #include -#include "webrtc/base/criticalsection.h" -#include "webrtc/base/platform_thread.h" #include "webrtc/common_types.h" #include "webrtc/modules/rtp_rtcp/source/byte_io.h" +#include "webrtc/rtc_base/criticalsection.h" +#include "webrtc/rtc_base/platform_thread.h" #include "webrtc/system_wrappers/include/atomic32.h" #include "webrtc/system_wrappers/include/event_wrapper.h" #include "webrtc/system_wrappers/include/sleep.h" diff --git a/webrtc/voice_engine/test/auto_test/standard/rtp_rtcp_test.cc b/webrtc/voice_engine/test/auto_test/standard/rtp_rtcp_test.cc index 0cb999029c..9af0eeca0b 100644 --- a/webrtc/voice_engine/test/auto_test/standard/rtp_rtcp_test.cc +++ b/webrtc/voice_engine/test/auto_test/standard/rtp_rtcp_test.cc @@ -10,7 +10,7 @@ #include -#include "webrtc/base/criticalsection.h" +#include "webrtc/rtc_base/criticalsection.h" #include "webrtc/system_wrappers/include/atomic32.h" #include "webrtc/system_wrappers/include/event_wrapper.h" #include "webrtc/test/testsupport/fileutils.h" diff --git a/webrtc/voice_engine/test/auto_test/voe_conference_test.cc b/webrtc/voice_engine/test/auto_test/voe_conference_test.cc index ffffb486be..9e466afdaa 100644 --- a/webrtc/voice_engine/test/auto_test/voe_conference_test.cc +++ b/webrtc/voice_engine/test/auto_test/voe_conference_test.cc @@ -10,8 +10,8 @@ #include -#include "webrtc/base/format_macros.h" -#include "webrtc/base/timeutils.h" +#include "webrtc/rtc_base/format_macros.h" +#include "webrtc/rtc_base/timeutils.h" #include "webrtc/system_wrappers/include/sleep.h" #include "webrtc/test/gtest.h" #include "webrtc/test/testsupport/fileutils.h" diff --git a/webrtc/voice_engine/transmit_mixer.cc b/webrtc/voice_engine/transmit_mixer.cc index 6796f8457c..ab0b6c782a 100644 --- a/webrtc/voice_engine/transmit_mixer.cc +++ b/webrtc/voice_engine/transmit_mixer.cc @@ -13,9 +13,9 @@ #include #include "webrtc/audio/utility/audio_frame_operations.h" -#include "webrtc/base/format_macros.h" -#include "webrtc/base/location.h" -#include "webrtc/base/logging.h" +#include "webrtc/rtc_base/format_macros.h" +#include "webrtc/rtc_base/location.h" +#include "webrtc/rtc_base/logging.h" #include "webrtc/system_wrappers/include/event_wrapper.h" #include "webrtc/system_wrappers/include/trace.h" #include "webrtc/voice_engine/channel.h" diff --git a/webrtc/voice_engine/transmit_mixer.h b/webrtc/voice_engine/transmit_mixer.h index a045cf8322..47f67f9040 100644 --- a/webrtc/voice_engine/transmit_mixer.h +++ b/webrtc/voice_engine/transmit_mixer.h @@ -13,11 +13,11 @@ #include -#include "webrtc/base/criticalsection.h" #include "webrtc/common_audio/resampler/include/push_resampler.h" #include "webrtc/common_types.h" #include "webrtc/modules/audio_processing/typing_detection.h" #include "webrtc/modules/include/module_common_types.h" +#include "webrtc/rtc_base/criticalsection.h" #include "webrtc/voice_engine/audio_level.h" #include "webrtc/voice_engine/file_player.h" #include "webrtc/voice_engine/file_recorder.h" diff --git a/webrtc/voice_engine/transport_feedback_packet_loss_tracker.cc b/webrtc/voice_engine/transport_feedback_packet_loss_tracker.cc index 07af861944..86ca61eed7 100644 --- a/webrtc/voice_engine/transport_feedback_packet_loss_tracker.cc +++ b/webrtc/voice_engine/transport_feedback_packet_loss_tracker.cc @@ -13,10 +13,10 @@ #include #include -#include "webrtc/base/checks.h" -#include "webrtc/base/mod_ops.h" #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/mod_ops.h" namespace { constexpr uint16_t kSeqNumHalf = 0x8000u; diff --git a/webrtc/voice_engine/transport_feedback_packet_loss_tracker.h b/webrtc/voice_engine/transport_feedback_packet_loss_tracker.h index ea82f74ca5..987ba25832 100644 --- a/webrtc/voice_engine/transport_feedback_packet_loss_tracker.h +++ b/webrtc/voice_engine/transport_feedback_packet_loss_tracker.h @@ -13,8 +13,8 @@ #include -#include "webrtc/base/optional.h" #include "webrtc/modules/include/module_common_types.h" +#include "webrtc/rtc_base/optional.h" namespace webrtc { diff --git a/webrtc/voice_engine/transport_feedback_packet_loss_tracker_unittest.cc b/webrtc/voice_engine/transport_feedback_packet_loss_tracker_unittest.cc index f019203667..b3fa25bf4f 100644 --- a/webrtc/voice_engine/transport_feedback_packet_loss_tracker_unittest.cc +++ b/webrtc/voice_engine/transport_feedback_packet_loss_tracker_unittest.cc @@ -13,9 +13,9 @@ #include #include -#include "webrtc/base/checks.h" #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h" +#include "webrtc/rtc_base/checks.h" #include "webrtc/test/gmock.h" #include "webrtc/test/gtest.h" #include "webrtc/voice_engine/transport_feedback_packet_loss_tracker.h" diff --git a/webrtc/voice_engine/utility.cc b/webrtc/voice_engine/utility.cc index f877c43b15..4b4397a3bf 100644 --- a/webrtc/voice_engine/utility.cc +++ b/webrtc/voice_engine/utility.cc @@ -11,12 +11,12 @@ #include "webrtc/voice_engine/utility.h" #include "webrtc/audio/utility/audio_frame_operations.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/logging.h" #include "webrtc/common_audio/resampler/include/push_resampler.h" #include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" #include "webrtc/common_types.h" #include "webrtc/modules/include/module_common_types.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/logging.h" #include "webrtc/voice_engine/voice_engine_defines.h" namespace webrtc { diff --git a/webrtc/voice_engine/utility_unittest.cc b/webrtc/voice_engine/utility_unittest.cc index 992cb71ec7..fc4f399d66 100644 --- a/webrtc/voice_engine/utility_unittest.cc +++ b/webrtc/voice_engine/utility_unittest.cc @@ -10,13 +10,13 @@ #include -#include "webrtc/base/format_macros.h" #include "webrtc/common_audio/resampler/include/push_resampler.h" #include "webrtc/modules/include/module_common_types.h" +#include "webrtc/rtc_base/arraysize.h" +#include "webrtc/rtc_base/format_macros.h" #include "webrtc/test/gtest.h" #include "webrtc/voice_engine/utility.h" #include "webrtc/voice_engine/voice_engine_defines.h" -#include "webrtc/base/arraysize.h" namespace webrtc { namespace voe { diff --git a/webrtc/voice_engine/voe_base_impl.cc b/webrtc/voice_engine/voe_base_impl.cc index 196c6a555f..9b82ec9592 100644 --- a/webrtc/voice_engine/voe_base_impl.cc +++ b/webrtc/voice_engine/voe_base_impl.cc @@ -11,13 +11,13 @@ #include "webrtc/voice_engine/voe_base_impl.h" #include "webrtc/api/audio_codecs/builtin_audio_decoder_factory.h" -#include "webrtc/base/format_macros.h" -#include "webrtc/base/location.h" -#include "webrtc/base/logging.h" #include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" #include "webrtc/modules/audio_coding/include/audio_coding_module.h" #include "webrtc/modules/audio_device/audio_device_impl.h" #include "webrtc/modules/audio_processing/include/audio_processing.h" +#include "webrtc/rtc_base/format_macros.h" +#include "webrtc/rtc_base/location.h" +#include "webrtc/rtc_base/logging.h" #include "webrtc/system_wrappers/include/file_wrapper.h" #include "webrtc/voice_engine/channel.h" #include "webrtc/voice_engine/include/voe_errors.h" diff --git a/webrtc/voice_engine/voe_base_impl.h b/webrtc/voice_engine/voe_base_impl.h index 6d7a086926..0324abdb53 100644 --- a/webrtc/voice_engine/voe_base_impl.h +++ b/webrtc/voice_engine/voe_base_impl.h @@ -13,8 +13,8 @@ #include "webrtc/voice_engine/include/voe_base.h" -#include "webrtc/base/criticalsection.h" #include "webrtc/modules/include/module_common_types.h" +#include "webrtc/rtc_base/criticalsection.h" #include "webrtc/voice_engine/shared_data.h" namespace webrtc { diff --git a/webrtc/voice_engine/voe_codec_impl.cc b/webrtc/voice_engine/voe_codec_impl.cc index 2022024536..cdd2403e8c 100644 --- a/webrtc/voice_engine/voe_codec_impl.cc +++ b/webrtc/voice_engine/voe_codec_impl.cc @@ -10,8 +10,8 @@ #include "webrtc/voice_engine/voe_codec_impl.h" -#include "webrtc/base/format_macros.h" #include "webrtc/modules/audio_coding/include/audio_coding_module.h" +#include "webrtc/rtc_base/format_macros.h" #include "webrtc/system_wrappers/include/trace.h" #include "webrtc/voice_engine/channel.h" #include "webrtc/voice_engine/include/voe_errors.h" diff --git a/webrtc/voice_engine/voe_network_impl.cc b/webrtc/voice_engine/voe_network_impl.cc index 4dc1a5f9ab..26ad417668 100644 --- a/webrtc/voice_engine/voe_network_impl.cc +++ b/webrtc/voice_engine/voe_network_impl.cc @@ -10,9 +10,9 @@ #include "webrtc/voice_engine/voe_network_impl.h" -#include "webrtc/base/checks.h" -#include "webrtc/base/format_macros.h" -#include "webrtc/base/logging.h" +#include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/format_macros.h" +#include "webrtc/rtc_base/logging.h" #include "webrtc/voice_engine/channel.h" #include "webrtc/voice_engine/include/voe_errors.h" #include "webrtc/voice_engine/voice_engine_impl.h" diff --git a/webrtc/voice_engine/voice_engine_impl.cc b/webrtc/voice_engine/voice_engine_impl.cc index ab2dc65e5b..d2d0fdd8f4 100644 --- a/webrtc/voice_engine/voice_engine_impl.cc +++ b/webrtc/voice_engine/voice_engine_impl.cc @@ -14,8 +14,8 @@ #include "webrtc/modules/audio_device/android/audio_track_jni.h" #endif -#include "webrtc/base/checks.h" #include "webrtc/modules/audio_coding/include/audio_coding_module.h" +#include "webrtc/rtc_base/checks.h" #include "webrtc/system_wrappers/include/trace.h" #include "webrtc/voice_engine/channel_proxy.h" #include "webrtc/voice_engine/voice_engine_impl.h"