From 988cc0870bb49c855b4547f929462eeb38186d12 Mon Sep 17 00:00:00 2001 From: Yves Gerey Date: Tue, 23 Oct 2018 12:03:01 +0200 Subject: [PATCH] [Cleanup] Add missing #include. Remove useless ones. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This CL is the result of running include-what-you-use tool on part of the code base (audio target and dependencies) plus manual fixes. bug: webrtc:8311 Change-Id: I277d281ce943c3ecc1bd45fd8d83055931743604 Reviewed-on: https://webrtc-review.googlesource.com/c/106280 Commit-Queue: Yves Gerey Reviewed-by: Mirko Bonadei Reviewed-by: Patrik Höglund Cr-Commit-Position: refs/heads/master@{#25311} --- api/audio/BUILD.gn | 1 + api/audio/echo_canceller3_config.cc | 2 +- api/audio_codecs/audio_codec_pair_id.cc | 1 + api/audio_codecs/audio_decoder.h | 2 ++ api/audio_codecs/audio_format.h | 1 + api/audio_options.h | 1 + api/call/transport.cc | 2 ++ api/candidate.cc | 1 + api/crypto/cryptooptions.h | 1 - api/datachannelinterface.h | 2 ++ api/jsepicecandidate.cc | 3 ++ api/jsepicecandidate.h | 1 + api/media_transport_interface.cc | 3 ++ api/media_transport_interface.h | 1 + api/mediaconstraintsinterface.cc | 2 ++ api/mediaconstraintsinterface.h | 2 ++ api/rtp_headers.h | 2 +- api/rtpparameters.cc | 1 + api/rtpparameters.h | 1 + api/rtptransceiverinterface.cc | 2 ++ api/rtptransceiverinterface.h | 3 ++ api/units/data_rate.h | 6 ++-- api/units/time_delta.h | 1 + api/units/timestamp.h | 2 ++ api/video/BUILD.gn | 3 ++ api/video/encoded_image.cc | 5 ---- api/video/encoded_image.h | 4 +++ api/video/i420_buffer.h | 2 ++ api/video/video_bitrate_allocation.cc | 2 ++ api/video/video_bitrate_allocation.h | 2 ++ api/video/video_frame.h | 1 + api/video_codecs/video_codec.cc | 5 +--- api/video_codecs/video_codec.h | 3 ++ api/video_codecs/video_encoder.cc | 4 +++ api/video_codecs/video_encoder_config.cc | 1 - api/video_codecs/video_encoder_config.h | 2 ++ audio/audio_receive_stream.cc | 9 ++++-- audio/audio_receive_stream.h | 1 - audio/audio_send_stream.cc | 11 +++++++- audio/audio_transport_impl.cc | 2 +- audio/channel_receive.cc | 1 + audio/channel_receive_proxy.cc | 1 - audio/channel_send_proxy.cc | 3 -- audio/null_audio_poller.cc | 8 ++++-- audio/null_audio_poller.h | 3 ++ audio/remix_resample.cc | 3 -- .../transport_feedback_packet_loss_tracker.cc | 2 +- audio/utility/audio_frame_operations.cc | 1 + audio/utility/audio_frame_operations.h | 1 + call/BUILD.gn | 1 + call/audio_send_stream.cc | 3 ++ call/call_config.cc | 2 ++ call/flexfec_receive_stream.cc | 2 ++ call/flexfec_receive_stream.h | 2 -- call/rtp_config.cc | 3 ++ call/rtp_config.h | 2 ++ call/video_send_stream.cc | 3 ++ call/video_send_stream.h | 6 ++-- common_audio/audio_converter.h | 1 + common_audio/channel_buffer.cc | 3 ++ common_audio/fir_filter_c.cc | 3 -- common_audio/fir_filter_factory.cc | 2 +- common_audio/fir_filter_sse.h | 1 + common_audio/include/audio_util.h | 1 + common_audio/real_fourier.h | 1 + common_audio/real_fourier_ooura.h | 1 + common_audio/resampler/push_resampler.cc | 2 +- common_audio/resampler/push_sinc_resampler.h | 2 ++ common_audio/resampler/resampler.cc | 1 + common_audio/resampler/sinc_resampler.cc | 4 +-- common_audio/resampler/sinc_resampler.h | 1 + common_audio/resampler/sinc_resampler_sse.cc | 6 ++-- common_audio/smoothing_filter.cc | 1 + common_audio/smoothing_filter.h | 3 +- common_audio/vad/vad.cc | 1 + common_audio/wav_file.cc | 3 +- common_audio/wav_header.cc | 2 -- common_types.h | 8 ++---- common_video/bitrate_adjuster.cc | 1 - common_video/h264/h264_bitstream_parser.cc | 7 ++--- common_video/h264/h264_bitstream_parser.h | 4 --- common_video/h264/h264_common.cc | 2 ++ common_video/h264/h264_common.h | 3 +- common_video/h264/pps_parser.cc | 4 +-- common_video/h264/sps_parser.cc | 3 +- common_video/h264/sps_vui_rewriter.cc | 9 +++--- common_video/h264/sps_vui_rewriter.h | 7 ++--- common_video/i420_buffer_pool.cc | 2 ++ common_video/include/bitrate_adjuster.h | 5 +++- common_video/include/i420_buffer_pool.h | 3 +- common_video/include/incoming_video_stream.h | 3 ++ common_video/include/video_frame_buffer.h | 3 +- common_video/incoming_video_stream.cc | 4 ++- common_video/libyuv/include/webrtc_libyuv.h | 5 +++- common_video/video_render_frames.cc | 2 ++ common_video/video_render_frames.h | 2 +- .../events/rtc_event_audio_playout.h | 1 + .../events/rtc_event_bwe_update_delay_based.h | 1 + .../events/rtc_event_bwe_update_loss_based.h | 1 + .../events/rtc_event_probe_cluster_created.h | 1 + .../events/rtc_event_probe_result_failure.h | 1 + .../events/rtc_event_probe_result_success.h | 1 + .../events/rtc_event_rtcp_packet_incoming.h | 1 + .../events/rtc_event_rtcp_packet_outgoing.h | 1 + logging/rtc_event_log/rtc_event_log.h | 1 + logging/rtc_event_log/rtc_stream_config.h | 2 +- media/sctp/sctptransport.h | 2 +- media/sctp/sctptransportinternal.h | 2 +- modules/audio_coding/BUILD.gn | 14 ++++++++++ .../audio_coding/acm2/acm_codec_database.cc | 3 +- modules/audio_coding/acm2/acm_receiver.cc | 11 ++++---- modules/audio_coding/acm2/acm_receiver.h | 9 ++++-- modules/audio_coding/acm2/acm_resampler.cc | 1 - modules/audio_coding/acm2/acm_resampler.h | 3 ++ .../audio_coding/acm2/audio_coding_module.cc | 7 +++++ modules/audio_coding/acm2/codec_manager.cc | 10 +++++-- modules/audio_coding/acm2/codec_manager.h | 3 -- .../audio_network_adaptor_impl.cc | 7 ++++- .../audio_network_adaptor_impl.h | 8 ++++-- .../bitrate_controller.h | 4 +++ .../channel_controller.h | 4 +++ .../debug_dump_writer.cc | 2 ++ .../audio_network_adaptor/dtx_controller.h | 2 ++ .../audio_network_adaptor/event_log_writer.cc | 6 +++- .../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 | 3 -- .../fec_controller_rplr_based.h | 4 +-- .../frame_length_controller.cc | 2 +- .../frame_length_controller.h | 3 ++ .../include/audio_network_adaptor_config.h | 2 ++ .../codecs/audio_format_conversion.cc | 4 +-- .../codecs/cng/audio_encoder_cng.cc | 6 ++-- .../codecs/cng/audio_encoder_cng.h | 8 ++++-- modules/audio_coding/codecs/cng/webrtc_cng.cc | 1 + modules/audio_coding/codecs/cng/webrtc_cng.h | 1 + .../codecs/g711/audio_decoder_pcm.cc | 2 ++ .../codecs/g711/audio_decoder_pcm.h | 5 ++++ .../codecs/g711/audio_encoder_pcm.cc | 5 ++-- .../codecs/g722/audio_decoder_g722.cc | 1 + .../codecs/g722/audio_encoder_g722.cc | 5 ++-- .../codecs/ilbc/audio_decoder_ilbc.cc | 1 + .../codecs/ilbc/audio_decoder_ilbc.h | 5 ++++ .../codecs/ilbc/audio_encoder_ilbc.cc | 5 ++-- .../codecs/legacy_encoded_audio_frame.cc | 2 ++ .../codecs/legacy_encoded_audio_frame.h | 4 +++ .../codecs/opus/audio_decoder_opus.cc | 3 ++ .../codecs/opus/audio_decoder_opus.h | 5 ++++ .../codecs/opus/audio_encoder_opus.cc | 1 + .../codecs/pcm16b/audio_decoder_pcm16b.cc | 2 ++ .../codecs/pcm16b/audio_decoder_pcm16b.h | 5 ++++ .../codecs/pcm16b/audio_encoder_pcm16b.cc | 5 +--- .../codecs/pcm16b/pcm16b_common.cc | 3 ++ .../codecs/pcm16b/pcm16b_common.h | 2 +- .../codecs/red/audio_encoder_copy_red.cc | 2 +- .../codecs/red/audio_encoder_copy_red.h | 5 +++- modules/audio_coding/neteq/accelerate.cc | 5 +++- modules/audio_coding/neteq/accelerate.h | 6 ++-- .../audio_coding/neteq/audio_multi_vector.h | 4 +-- modules/audio_coding/neteq/audio_vector.h | 3 +- modules/audio_coding/neteq/background_noise.h | 3 +- .../audio_coding/neteq/buffer_level_filter.cc | 3 +- modules/audio_coding/neteq/comfort_noise.cc | 9 +++++- modules/audio_coding/neteq/comfort_noise.h | 4 ++- .../audio_coding/neteq/cross_correlation.h | 3 +- modules/audio_coding/neteq/decision_logic.cc | 7 +++-- modules/audio_coding/neteq/decision_logic.h | 1 - .../audio_coding/neteq/decoder_database.cc | 7 ++++- modules/audio_coding/neteq/delay_manager.cc | 11 ++++---- .../audio_coding/neteq/delay_peak_detector.cc | 3 +- .../audio_coding/neteq/delay_peak_detector.h | 4 +-- modules/audio_coding/neteq/dsp_helper.h | 4 ++- modules/audio_coding/neteq/dtmf_buffer.h | 3 +- .../audio_coding/neteq/dtmf_tone_generator.cc | 1 + .../audio_coding/neteq/dtmf_tone_generator.h | 3 ++ modules/audio_coding/neteq/expand.cc | 1 + modules/audio_coding/neteq/expand.h | 3 +- .../audio_coding/neteq/expand_uma_logger.h | 1 + modules/audio_coding/neteq/nack_tracker.cc | 6 ++-- modules/audio_coding/neteq/nack_tracker.h | 5 ++-- modules/audio_coding/neteq/neteq.cc | 2 -- modules/audio_coding/neteq/neteq_impl.cc | 8 ++++-- modules/audio_coding/neteq/neteq_impl.h | 4 +-- modules/audio_coding/neteq/normal.h | 5 ++-- modules/audio_coding/neteq/packet.h | 2 ++ modules/audio_coding/neteq/packet_buffer.cc | 7 ++++- modules/audio_coding/neteq/packet_buffer.h | 2 +- modules/audio_coding/neteq/post_decode_vad.h | 6 ++-- .../audio_coding/neteq/preemptive_expand.cc | 6 ++-- .../audio_coding/neteq/preemptive_expand.h | 6 ++-- .../neteq/red_payload_splitter.cc | 7 ++++- .../audio_coding/neteq/red_payload_splitter.h | 1 - modules/audio_coding/neteq/rtcp.cc | 8 ++++-- modules/audio_coding/neteq/rtcp.h | 5 ++-- modules/audio_coding/neteq/sync_buffer.h | 5 ++++ modules/audio_coding/neteq/tick_timer.h | 1 + .../audio_coding/neteq/timestamp_scaler.cc | 1 + modules/audio_device/audio_device_buffer.cc | 11 +++----- modules/audio_device/audio_device_buffer.h | 4 ++- .../audio_device_data_observer.cc | 2 ++ modules/audio_device/audio_device_generic.h | 3 ++ modules/audio_device/audio_device_impl.cc | 8 ++++-- modules/audio_device/audio_device_impl.h | 3 +- .../audio_device/dummy/audio_device_dummy.h | 5 +++- .../audio_device/dummy/file_audio_device.cc | 4 +++ .../dummy/file_audio_device_factory.cc | 2 +- .../dummy/file_audio_device_factory.h | 2 +- modules/audio_device/fine_audio_buffer.cc | 3 ++ .../include/audio_device_data_observer.h | 3 ++ .../audio_device/include/test_audio_device.cc | 4 +++ .../audio_device/include/test_audio_device.h | 6 +++- .../linux/audio_device_pulse_linux.cc | 4 ++- .../linux/audio_device_pulse_linux.h | 7 +++++ .../linux/audio_mixer_manager_pulse_linux.cc | 4 +++ .../linux/audio_mixer_manager_pulse_linux.h | 6 ++-- modules/audio_processing/aec/aec_core.cc | 2 +- modules/audio_processing/aec/aec_resampler.cc | 1 - modules/audio_processing/aec/aec_resampler.h | 2 ++ .../aec3/adaptive_fir_filter.cc | 1 - .../aec3/adaptive_fir_filter.h | 2 +- modules/audio_processing/aec3/aec3_common.cc | 3 +- modules/audio_processing/aec3/aec3_fft.cc | 1 + modules/audio_processing/aec3/aec3_fft.h | 1 + modules/audio_processing/aec3/aec_state.cc | 2 +- modules/audio_processing/aec3/aec_state.h | 5 ++-- .../aec3/block_delay_buffer.h | 1 + modules/audio_processing/aec3/block_framer.cc | 1 + .../audio_processing/aec3/block_processor.cc | 4 +++ .../audio_processing/aec3/block_processor.h | 3 ++ .../audio_processing/aec3/block_processor2.cc | 13 ++++++++- .../aec3/block_processor_metrics.cc | 1 + .../aec3/cascaded_biquad_filter.cc | 2 ++ .../aec3/cascaded_biquad_filter.h | 1 + .../aec3/comfort_noise_generator.cc | 4 ++- .../aec3/comfort_noise_generator.h | 1 + modules/audio_processing/aec3/decimator.cc | 4 +++ .../aec3/downsampled_render_buffer.cc | 2 ++ .../aec3/downsampled_render_buffer.h | 2 +- .../audio_processing/aec3/echo_audibility.cc | 3 +- .../audio_processing/aec3/echo_audibility.h | 8 +----- .../audio_processing/aec3/echo_canceller3.cc | 5 +++- .../audio_processing/aec3/echo_canceller3.h | 8 ++++++ .../aec3/echo_path_delay_estimator.cc | 3 +- .../aec3/echo_path_delay_estimator.h | 7 +++-- modules/audio_processing/aec3/echo_remover.cc | 9 ++++-- .../aec3/echo_remover_metrics.cc | 2 ++ .../aec3/echo_remover_metrics.h | 3 ++ .../audio_processing/aec3/erl_estimator.cc | 2 ++ modules/audio_processing/aec3/erl_estimator.h | 1 + .../audio_processing/aec3/erle_estimator.cc | 1 + .../audio_processing/aec3/erle_estimator.h | 1 + modules/audio_processing/aec3/fft_buffer.h | 1 + .../audio_processing/aec3/filter_analyzer.cc | 1 + .../audio_processing/aec3/filter_analyzer.h | 6 ++-- .../audio_processing/aec3/frame_blocker.cc | 3 +- .../aec3/fullband_erle_estimator.cc | 1 + .../aec3/main_filter_update_gain.cc | 5 ++++ .../aec3/main_filter_update_gain.h | 12 ++++---- .../audio_processing/aec3/matched_filter.cc | 6 +++- .../audio_processing/aec3/matched_filter.h | 10 +++---- .../aec3/matched_filter_lag_aggregator.cc | 4 +++ .../audio_processing/aec3/matrix_buffer.cc | 2 +- modules/audio_processing/aec3/matrix_buffer.h | 1 + .../audio_processing/aec3/moving_average.cc | 2 ++ .../audio_processing/aec3/moving_average.h | 1 + modules/audio_processing/aec3/render_buffer.h | 5 +++- .../aec3/render_delay_buffer.cc | 8 ++++-- .../aec3/render_delay_buffer.h | 5 ---- .../aec3/render_delay_buffer2.cc | 14 +++++++--- .../aec3/render_delay_controller.cc | 5 ++-- .../aec3/render_delay_controller2.cc | 15 +++++----- .../aec3/render_delay_controller_metrics.cc | 1 + .../aec3/render_delay_controller_metrics.h | 2 ++ .../aec3/render_signal_analyzer.cc | 3 ++ .../aec3/render_signal_analyzer.h | 4 ++- .../aec3/residual_echo_estimator.cc | 4 ++- .../aec3/residual_echo_estimator.h | 6 ++-- .../aec3/reverb_decay_estimator.cc | 2 ++ .../aec3/reverb_decay_estimator.h | 4 +-- .../aec3/reverb_frequency_response.cc | 4 +-- .../aec3/reverb_frequency_response.h | 3 +- modules/audio_processing/aec3/reverb_model.cc | 4 +-- modules/audio_processing/aec3/reverb_model.h | 2 ++ .../aec3/reverb_model_estimator.h | 2 ++ .../aec3/reverb_model_fallback.h | 1 + .../aec3/shadow_filter_update_gain.h | 6 ++-- .../audio_processing/aec3/skew_estimator.cc | 1 - .../audio_processing/aec3/skew_estimator.h | 1 + .../aec3/stationarity_estimator.h | 7 +++-- .../aec3/subband_erle_estimator.cc | 1 + .../aec3/subband_erle_estimator.h | 1 + modules/audio_processing/aec3/subtractor.cc | 4 +-- modules/audio_processing/aec3/subtractor.h | 9 ++++-- .../aec3/subtractor_output_analyzer.cc | 4 +-- .../aec3/subtractor_output_analyzer.h | 1 - .../aec3/suppression_filter.cc | 5 ++-- .../aec3/suppression_filter.h | 2 ++ .../audio_processing/aec3/suppression_gain.cc | 3 +- .../audio_processing/aec3/suppression_gain.h | 5 ++++ .../aec3/suppression_gain_limiter.cc | 1 + .../audio_processing/aec3/vector_buffer.cc | 2 +- modules/audio_processing/aec3/vector_buffer.h | 1 + modules/audio_processing/aecm/aecm_core.cc | 5 ++-- .../aecm/echo_control_mobile.cc | 2 ++ modules/audio_processing/agc/agc.cc | 2 -- modules/audio_processing/agc/agc.h | 1 - .../agc/agc_manager_direct.cc | 1 + .../agc/loudness_histogram.cc | 2 +- .../audio_processing/agc/loudness_histogram.h | 3 +- modules/audio_processing/agc2/BUILD.gn | 1 + modules/audio_processing/agc2/adaptive_agc.cc | 4 +-- modules/audio_processing/agc2/adaptive_agc.h | 2 -- .../agc2/adaptive_digital_gain_applier.cc | 1 + .../agc2/adaptive_mode_level_estimator.cc | 1 + .../agc2/adaptive_mode_level_estimator.h | 3 ++ .../agc2/adaptive_mode_level_estimator_agc.cc | 4 +++ .../agc2/adaptive_mode_level_estimator_agc.h | 4 ++- modules/audio_processing/agc2/agc2_common.cc | 1 + modules/audio_processing/agc2/agc2_common.h | 2 -- .../audio_processing/agc2/biquad_filter.cc | 2 ++ modules/audio_processing/agc2/biquad_filter.h | 2 ++ .../agc2/fixed_digital_level_estimator.cc | 1 + .../agc2/fixed_gain_controller.cc | 4 --- modules/audio_processing/agc2/gain_applier.cc | 1 + modules/audio_processing/agc2/gain_applier.h | 2 ++ .../agc2/interpolated_gain_curve.cc | 4 ++- .../agc2/noise_level_estimator.cc | 6 ++-- .../agc2/noise_spectrum_estimator.cc | 1 + .../agc2/rnn_vad/features_extraction.cc | 2 ++ .../agc2/rnn_vad/features_extraction.h | 2 +- .../audio_processing/agc2/rnn_vad/fft_util.cc | 1 + .../agc2/rnn_vad/lp_residual.h | 2 ++ .../agc2/rnn_vad/pitch_search.cc | 5 ++++ .../agc2/rnn_vad/pitch_search_internal.cc | 4 ++- .../agc2/rnn_vad/pitch_search_internal.h | 1 + modules/audio_processing/agc2/rnn_vad/rnn.h | 2 ++ .../agc2/rnn_vad/spectral_features.h | 1 + .../rnn_vad/spectral_features_internal.cc | 1 + .../agc2/rnn_vad/spectral_features_internal.h | 1 + .../agc2/saturation_protector.cc | 1 + .../agc2/signal_classifier.cc | 2 +- .../audio_processing/agc2/vad_with_level.cc | 4 ++- .../audio_processing/agc2/vad_with_level.h | 1 - modules/audio_processing/audio_buffer.cc | 6 ++-- modules/audio_processing/audio_buffer.h | 7 +++-- .../audio_processing/audio_processing_impl.cc | 13 +++++---- .../echo_cancellation_impl.cc | 2 ++ .../audio_processing/echo_cancellation_impl.h | 4 +++ .../echo_control_mobile_impl.cc | 4 ++- .../echo_control_mobile_impl.h | 7 +++-- .../echo_detector/circular_buffer.h | 1 + .../gain_control_for_experimental_agc.cc | 1 - modules/audio_processing/gain_control_impl.cc | 4 +++ modules/audio_processing/gain_control_impl.h | 8 ++++-- modules/audio_processing/include/aec_dump.h | 5 ++-- .../include/audio_processing.cc | 2 -- .../include/audio_processing_statistics.h | 2 ++ .../audio_processing/level_estimator_impl.cc | 4 +++ .../logging/apm_data_dumper.cc | 3 -- .../logging/apm_data_dumper.h | 6 +--- modules/audio_processing/low_cut_filter.cc | 5 ++++ .../noise_suppression_impl.cc | 3 ++ .../residual_echo_detector.cc | 2 ++ modules/audio_processing/rms_level.h | 3 ++ .../transient/moving_moments.cc | 2 +- .../transient/transient_detector.cc | 2 +- .../transient/transient_detector.h | 1 + .../transient/transient_suppressor.h | 4 +-- .../audio_processing/transient/wpd_tree.cc | 2 -- modules/audio_processing/transient/wpd_tree.h | 1 + modules/audio_processing/utility/ooura_fft.cc | 2 -- .../utility/ooura_fft_sse2.cc | 4 +-- modules/audio_processing/vad/gmm.cc | 1 - .../audio_processing/vad/pitch_based_vad.cc | 1 - .../audio_processing/vad/pitch_based_vad.h | 1 - .../audio_processing/vad/pole_zero_filter.cc | 1 - .../audio_processing/vad/standalone_vad.cc | 2 +- modules/audio_processing/vad/standalone_vad.h | 5 ++-- modules/audio_processing/vad/vad_audio_proc.h | 5 ++-- .../vad/voice_activity_detector.h | 2 ++ .../audio_processing/voice_detection_impl.cc | 2 ++ .../audio_processing/voice_detection_impl.h | 3 ++ modules/bitrate_controller/BUILD.gn | 5 ++++ .../include/bitrate_controller.h | 6 ++-- .../send_side_bandwidth_estimation.cc | 2 +- .../send_side_bandwidth_estimation.h | 7 +++-- .../congestion_controller/goog_cc/BUILD.gn | 3 ++ .../goog_cc/acknowledged_bitrate_estimator.cc | 3 ++ .../goog_cc/alr_detector.cc | 7 ++--- .../goog_cc/alr_detector.h | 5 ++-- .../goog_cc/alr_detector_unittest.cc | 1 + .../goog_cc/bitrate_estimator.cc | 2 +- .../goog_cc/bitrate_estimator.h | 2 +- .../goog_cc/delay_based_bwe.cc | 8 ++---- .../goog_cc/delay_based_bwe.h | 8 ++++-- .../goog_cc/median_slope_estimator.cc | 4 +-- .../goog_cc/trendline_estimator.h | 2 +- modules/include/module_common_types.cc | 1 + modules/pacing/bitrate_prober.cc | 1 + modules/pacing/bitrate_prober.h | 3 +- modules/pacing/interval_budget.h | 3 +- modules/pacing/paced_sender.cc | 7 +---- modules/pacing/paced_sender.h | 9 ++++-- modules/pacing/packet_router.cc | 2 ++ modules/pacing/packet_router.h | 5 ++-- modules/pacing/round_robin_packet_queue.cc | 2 ++ modules/pacing/round_robin_packet_queue.h | 4 +++ modules/remote_bitrate_estimator/BUILD.gn | 1 + .../aimd_rate_control.cc | 3 -- .../aimd_rate_control.h | 4 ++- .../include/bwe_defines.h | 2 ++ .../remote_bitrate_estimator/inter_arrival.cc | 3 +- .../overuse_detector.cc | 3 -- .../overuse_detector.h | 3 +- .../overuse_estimator.cc | 2 -- .../overuse_estimator.h | 1 + .../remote_bitrate_estimator_single_stream.cc | 6 ++++ .../remote_bitrate_estimator_single_stream.h | 6 ++++ modules/rtp_rtcp/BUILD.gn | 9 ++++++ modules/rtp_rtcp/include/flexfec_receiver.h | 6 +++- modules/rtp_rtcp/include/flexfec_sender.h | 3 +- .../include/remote_ntp_time_estimator.h | 2 +- .../include/rtp_header_extension_map.h | 1 + modules/rtp_rtcp/include/rtp_rtcp_defines.cc | 7 +++++ modules/rtp_rtcp/source/dtmf_queue.cc | 4 +++ modules/rtp_rtcp/source/dtmf_queue.h | 1 + .../source/flexfec_header_reader_writer.cc | 3 +- .../source/flexfec_header_reader_writer.h | 3 ++ modules/rtp_rtcp/source/flexfec_receiver.cc | 3 ++ modules/rtp_rtcp/source/flexfec_sender.cc | 4 +++ .../source/forward_error_correction.cc | 3 +- .../source/forward_error_correction.h | 5 ++-- .../forward_error_correction_internal.cc | 1 + .../forward_error_correction_internal.h | 4 ++- modules/rtp_rtcp/source/packet_loss_stats.cc | 2 ++ .../rtp_rtcp/source/playout_delay_oracle.cc | 1 - .../rtp_rtcp/source/playout_delay_oracle.h | 4 ++- .../source/remote_ntp_time_estimator.cc | 3 +- modules/rtp_rtcp/source/rtcp_nack_stats.cc | 2 +- modules/rtp_rtcp/source/rtcp_packet.h | 4 +++ modules/rtp_rtcp/source/rtcp_packet/app.cc | 3 ++ modules/rtp_rtcp/source/rtcp_packet/app.h | 3 ++ modules/rtp_rtcp/source/rtcp_packet/bye.cc | 2 ++ .../rtcp_packet/extended_jitter_report.cc | 1 + .../source/rtcp_packet/extended_reports.cc | 2 ++ modules/rtp_rtcp/source/rtcp_packet/nack.cc | 1 + modules/rtp_rtcp/source/rtcp_packet/psfb.h | 3 ++ .../source/rtcp_packet/receiver_report.h | 2 ++ modules/rtp_rtcp/source/rtcp_packet/remb.cc | 1 + modules/rtp_rtcp/source/rtcp_packet/rrtr.h | 3 ++ modules/rtp_rtcp/source/rtcp_packet/rtpfb.h | 3 ++ modules/rtp_rtcp/source/rtcp_packet/sdes.cc | 1 + modules/rtp_rtcp/source/rtcp_packet/tmmbn.cc | 1 - modules/rtp_rtcp/source/rtcp_packet/tmmbr.cc | 1 - .../source/rtcp_packet/transport_feedback.cc | 3 +- modules/rtp_rtcp/source/rtp_format.cc | 6 ++-- modules/rtp_rtcp/source/rtp_format.h | 6 ++-- modules/rtp_rtcp/source/rtp_format_h264.cc | 6 ++++ modules/rtp_rtcp/source/rtp_format_h264.h | 7 ++++- .../source/rtp_format_video_generic.cc | 6 ++-- .../source/rtp_format_video_generic.h | 5 ++++ modules/rtp_rtcp/source/rtp_format_vp8.cc | 6 ++-- modules/rtp_rtcp/source/rtp_format_vp8.h | 6 ++-- modules/rtp_rtcp/source/rtp_format_vp9.cc | 4 +-- modules/rtp_rtcp/source/rtp_format_vp9.h | 4 ++- .../source/rtp_generic_frame_descriptor.cc | 2 ++ .../rtp_rtcp/source/rtp_header_extensions.cc | 5 +++- .../rtp_rtcp/source/rtp_header_extensions.h | 4 +++ modules/rtp_rtcp/source/rtp_header_parser.cc | 3 ++ modules/rtp_rtcp/source/rtp_packet.cc | 2 +- .../rtp_rtcp/source/rtp_packet_received.cc | 2 ++ modules/rtp_rtcp/source/rtp_packet_received.h | 4 ++- modules/rtp_rtcp/source/rtp_packet_to_send.cc | 2 ++ modules/rtp_rtcp/source/rtp_packet_to_send.h | 3 ++ modules/rtp_rtcp/source/rtp_rtcp_impl.cc | 6 ++-- modules/rtp_rtcp/source/rtp_rtcp_impl.h | 15 ++++++++-- modules/rtp_rtcp/source/rtp_sender_audio.cc | 5 ++-- modules/rtp_rtcp/source/rtp_sender_audio.h | 6 +++- modules/rtp_rtcp/source/rtp_utility.cc | 10 +++++++ modules/rtp_rtcp/source/rtp_utility.h | 7 ++--- modules/rtp_rtcp/source/rtp_video_header.h | 3 ++ modules/rtp_rtcp/source/time_util.cc | 1 + modules/rtp_rtcp/source/tmmbr_help.cc | 1 + modules/rtp_rtcp/source/tmmbr_help.h | 2 ++ modules/rtp_rtcp/source/ulpfec_generator.cc | 3 ++ modules/rtp_rtcp/source/ulpfec_generator.h | 3 ++ .../source/ulpfec_header_reader_writer.cc | 3 +- .../source/ulpfec_header_reader_writer.h | 3 ++ .../rtp_rtcp/source/ulpfec_receiver_impl.cc | 3 +- .../rtp_rtcp/source/ulpfec_receiver_impl.h | 3 ++ modules/utility/source/process_thread_impl.cc | 2 ++ modules/utility/source/process_thread_impl.h | 3 ++ p2p/base/dtlstransport.cc | 1 + p2p/base/dtlstransport_unittest.cc | 1 + p2p/base/fakedtlstransport.h | 1 + rtc_base/BUILD.gn | 2 ++ rtc_base/asynctcpsocket.h | 13 +++++---- rtc_base/asyncudpsocket.h | 4 +++ rtc_base/bitrateallocationstrategy.cc | 2 ++ rtc_base/bitrateallocationstrategy.h | 2 ++ rtc_base/bufferqueue.cc | 2 ++ rtc_base/bufferqueue.h | 2 ++ rtc_base/bytebuffer.h | 2 ++ rtc_base/copyonwritebuffer.cc | 2 ++ rtc_base/copyonwritebuffer.h | 4 +++ rtc_base/criticalsection.cc | 2 ++ rtc_base/event_tracer.cc | 7 ++++- rtc_base/experiments/alr_experiment.cc | 3 +- rtc_base/experiments/alr_experiment.h | 2 ++ rtc_base/experiments/field_trial_units.cc | 1 + rtc_base/fakesslidentity.h | 1 + rtc_base/file.h | 2 +- rtc_base/file_posix.cc | 9 +++--- rtc_base/filerotatingstream.cc | 2 +- rtc_base/filerotatingstream.h | 1 + rtc_base/fileutils.h | 3 -- rtc_base/helpers.h | 2 ++ rtc_base/ipaddress.cc | 7 ----- rtc_base/logging.cc | 6 +++- rtc_base/logsinks.cc | 2 ++ rtc_base/logsinks.h | 1 + rtc_base/messagedigest.cc | 4 +-- rtc_base/messagedigest.h | 1 + rtc_base/messagequeue.cc | 5 ++-- rtc_base/nethelpers.h | 5 ++-- rtc_base/network/sent_packet.h | 3 +- rtc_base/networkmonitor.cc | 3 ++ rtc_base/nullsocketserver.h | 2 ++ rtc_base/numerics/sample_counter.h | 2 ++ rtc_base/openssladapter.cc | 15 +++++----- rtc_base/openssladapter.h | 28 +++++++++---------- rtc_base/opensslcertificate.cc | 15 ++-------- rtc_base/opensslcertificate.h | 14 +++++----- rtc_base/openssldigest.cc | 2 +- rtc_base/openssldigest.h | 3 +- rtc_base/opensslidentity.cc | 5 ++-- rtc_base/opensslidentity.h | 16 +++++------ rtc_base/opensslstreamadapter.cc | 1 + rtc_base/opensslstreamadapter.h | 7 ++++- rtc_base/opensslutility.cc | 14 ++-------- rtc_base/platform_file.cc | 2 +- rtc_base/platform_thread.cc | 12 ++++---- rtc_base/platform_thread.h | 3 ++ rtc_base/race_checker.h | 2 +- rtc_base/random.h | 1 + rtc_base/rate_limiter.cc | 4 +++ rtc_base/rate_limiter.h | 4 ++- rtc_base/rate_statistics.h | 2 ++ rtc_base/rtccertificate.cc | 2 ++ rtc_base/rtccertificate.h | 7 +++-- rtc_base/rtccertificategenerator.cc | 5 ++++ rtc_base/rtccertificategenerator.h | 2 ++ rtc_base/sequenced_task_checker_impl.cc | 1 + rtc_base/signalthread.cc | 4 +++ rtc_base/signalthread.h | 14 +++++----- rtc_base/socketadapters.cc | 5 ++++ rtc_base/socketaddresspair.h | 2 ++ rtc_base/socketstream.cc | 1 + rtc_base/ssladapter.h | 1 + rtc_base/sslcertificate.cc | 12 ++++---- rtc_base/sslcertificate.h | 2 ++ rtc_base/sslfingerprint.cc | 5 ++++ rtc_base/sslfingerprint.h | 6 ++-- rtc_base/sslidentity.cc | 17 +++++------ rtc_base/sslidentity.h | 6 ++-- rtc_base/stream.cc | 13 +++------ rtc_base/string_to_number.cc | 1 + rtc_base/string_to_number.h | 1 + rtc_base/stringencode.cc | 2 ++ rtc_base/stringencode.h | 3 ++ rtc_base/strings/audio_format_to_string.cc | 2 ++ rtc_base/strings/string_builder.cc | 8 +++--- rtc_base/stringutils.cc | 2 -- rtc_base/stringutils.h | 2 ++ rtc_base/synchronization/rw_lock_posix.cc | 2 ++ rtc_base/system/file_wrapper.cc | 3 -- rtc_base/system/file_wrapper.h | 1 - rtc_base/task_queue_libevent.cc | 20 ++++++------- rtc_base/thread.cc | 5 +++- rtc_base/thread.h | 6 ++++ rtc_base/timestampaligner.cc | 1 + rtc_base/timeutils.cc | 4 +-- rtc_base/timeutils.h | 8 ++---- rtc_base/unixfilesystem.cc | 16 ++--------- rtc_base/unixfilesystem.h | 3 +- rtc_base/zero_memory.h | 1 + sdk/android/BUILD.gn | 1 + .../jni/audio_device/audio_device_module.cc | 1 + .../jni/audio_device/audio_device_module.h | 5 +++- system_wrappers/include/clock.h | 1 + .../include/rtp_to_ntp_estimator.h | 2 ++ system_wrappers/source/clock.cc | 3 +- system_wrappers/source/event.cc | 3 -- system_wrappers/source/field_trial.cc | 1 + .../source/rtp_to_ntp_estimator.cc | 3 +- 596 files changed, 1467 insertions(+), 694 deletions(-) diff --git a/api/audio/BUILD.gn b/api/audio/BUILD.gn index 1ab6812c67..b66be76343 100644 --- a/api/audio/BUILD.gn +++ b/api/audio/BUILD.gn @@ -40,6 +40,7 @@ rtc_source_set("aec3_config") { "echo_canceller3_config.h", ] deps = [ + "../../rtc_base:checks", "../../rtc_base:rtc_base_approved", "../../rtc_base:safe_minmax", "../../rtc_base/system:rtc_export", diff --git a/api/audio/echo_canceller3_config.cc b/api/audio/echo_canceller3_config.cc index f040790682..29d0b9a01a 100644 --- a/api/audio/echo_canceller3_config.cc +++ b/api/audio/echo_canceller3_config.cc @@ -12,7 +12,7 @@ #include #include -#include "rtc_base/logging.h" +#include "rtc_base/checks.h" #include "rtc_base/numerics/safe_minmax.h" namespace webrtc { diff --git a/api/audio_codecs/audio_codec_pair_id.cc b/api/audio_codecs/audio_codec_pair_id.cc index ac84107eda..6cb51ed6b7 100644 --- a/api/audio_codecs/audio_codec_pair_id.cc +++ b/api/audio_codecs/audio_codec_pair_id.cc @@ -11,6 +11,7 @@ #include "api/audio_codecs/audio_codec_pair_id.h" #include +#include #include "rtc_base/checks.h" diff --git a/api/audio_codecs/audio_decoder.h b/api/audio_codecs/audio_decoder.h index b01a66a064..889e2c62d0 100644 --- a/api/audio_codecs/audio_decoder.h +++ b/api/audio_codecs/audio_decoder.h @@ -11,6 +11,8 @@ #ifndef API_AUDIO_CODECS_AUDIO_DECODER_H_ #define API_AUDIO_CODECS_AUDIO_DECODER_H_ +#include +#include #include #include diff --git a/api/audio_codecs/audio_format.h b/api/audio_codecs/audio_format.h index 6638ea3556..b8b042178b 100644 --- a/api/audio_codecs/audio_format.h +++ b/api/audio_codecs/audio_format.h @@ -11,6 +11,7 @@ #ifndef API_AUDIO_CODECS_AUDIO_FORMAT_H_ #define API_AUDIO_CODECS_AUDIO_FORMAT_H_ +#include #include #include diff --git a/api/audio_options.h b/api/audio_options.h index 414fc7014d..8ae83191d7 100644 --- a/api/audio_options.h +++ b/api/audio_options.h @@ -11,6 +11,7 @@ #ifndef API_AUDIO_OPTIONS_H_ #define API_AUDIO_OPTIONS_H_ +#include #include #include "absl/types/optional.h" diff --git a/api/call/transport.cc b/api/call/transport.cc index 0a9dd5bcc7..bcadc762de 100644 --- a/api/call/transport.cc +++ b/api/call/transport.cc @@ -10,6 +10,8 @@ #include "api/call/transport.h" +#include + namespace webrtc { PacketOptions::PacketOptions() = default; diff --git a/api/candidate.cc b/api/candidate.cc index 10751ae628..275b17366c 100644 --- a/api/candidate.cc +++ b/api/candidate.cc @@ -11,6 +11,7 @@ #include "api/candidate.h" #include "rtc_base/helpers.h" +#include "rtc_base/ipaddress.h" #include "rtc_base/strings/string_builder.h" namespace cricket { diff --git a/api/crypto/cryptooptions.h b/api/crypto/cryptooptions.h index bd4a1c4ad1..e730ab2089 100644 --- a/api/crypto/cryptooptions.h +++ b/api/crypto/cryptooptions.h @@ -12,7 +12,6 @@ #define API_CRYPTO_CRYPTOOPTIONS_H_ #include -#include "absl/types/optional.h" namespace webrtc { diff --git a/api/datachannelinterface.h b/api/datachannelinterface.h index a0d2b3b51a..7cb5582233 100644 --- a/api/datachannelinterface.h +++ b/api/datachannelinterface.h @@ -14,6 +14,8 @@ #ifndef API_DATACHANNELINTERFACE_H_ #define API_DATACHANNELINTERFACE_H_ +#include +#include #include #include "rtc_base/checks.h" diff --git a/api/jsepicecandidate.cc b/api/jsepicecandidate.cc index b9ba2fea29..ed2f7927f2 100644 --- a/api/jsepicecandidate.cc +++ b/api/jsepicecandidate.cc @@ -10,6 +10,9 @@ #include "api/jsepicecandidate.h" +#include +#include + namespace webrtc { std::string JsepIceCandidate::sdp_mid() const { diff --git a/api/jsepicecandidate.h b/api/jsepicecandidate.h index a57f8618fe..9cc7443f3f 100644 --- a/api/jsepicecandidate.h +++ b/api/jsepicecandidate.h @@ -14,6 +14,7 @@ #ifndef API_JSEPICECANDIDATE_H_ #define API_JSEPICECANDIDATE_H_ +#include #include #include diff --git a/api/media_transport_interface.cc b/api/media_transport_interface.cc index fc97b0b503..e4fbede278 100644 --- a/api/media_transport_interface.cc +++ b/api/media_transport_interface.cc @@ -17,6 +17,9 @@ #include "api/media_transport_interface.h" +#include +#include + namespace webrtc { MediaTransportEncodedAudioFrame::~MediaTransportEncodedAudioFrame() {} diff --git a/api/media_transport_interface.h b/api/media_transport_interface.h index 33fa2adf6c..2a623a3e7f 100644 --- a/api/media_transport_interface.h +++ b/api/media_transport_interface.h @@ -21,6 +21,7 @@ #include #include +#include "api/array_view.h" #include "api/rtcerror.h" #include "api/video/encoded_image.h" #include "common_types.h" // NOLINT(build/include) diff --git a/api/mediaconstraintsinterface.cc b/api/mediaconstraintsinterface.cc index 55677869be..b66ba0503a 100644 --- a/api/mediaconstraintsinterface.cc +++ b/api/mediaconstraintsinterface.cc @@ -10,7 +10,9 @@ #include "api/mediaconstraintsinterface.h" +#include "absl/types/optional.h" #include "api/peerconnectioninterface.h" +#include "media/base/mediaconfig.h" #include "rtc_base/stringencode.h" namespace { diff --git a/api/mediaconstraintsinterface.h b/api/mediaconstraintsinterface.h index 560fa4a49e..c9a6e1b188 100644 --- a/api/mediaconstraintsinterface.h +++ b/api/mediaconstraintsinterface.h @@ -21,9 +21,11 @@ #ifndef API_MEDIACONSTRAINTSINTERFACE_H_ #define API_MEDIACONSTRAINTSINTERFACE_H_ +#include #include #include +#include "api/audio_options.h" #include "api/peerconnectioninterface.h" namespace webrtc { diff --git a/api/rtp_headers.h b/api/rtp_headers.h index 799058dd1c..eff6223686 100644 --- a/api/rtp_headers.h +++ b/api/rtp_headers.h @@ -12,6 +12,7 @@ #define API_RTP_HEADERS_H_ #include +#include #include #include "api/array_view.h" @@ -19,7 +20,6 @@ #include "api/video/video_frame_marking.h" #include "api/video/video_rotation.h" #include "api/video/video_timing.h" - #include "common_types.h" // NOLINT(build/include) namespace webrtc { diff --git a/api/rtpparameters.cc b/api/rtpparameters.cc index e9f4d5d477..063d106a00 100644 --- a/api/rtpparameters.cc +++ b/api/rtpparameters.cc @@ -12,6 +12,7 @@ #include #include +#include "api/array_view.h" #include "rtc_base/strings/string_builder.h" namespace webrtc { diff --git a/api/rtpparameters.h b/api/rtpparameters.h index 4d99acf80d..badda07459 100644 --- a/api/rtpparameters.h +++ b/api/rtpparameters.h @@ -11,6 +11,7 @@ #ifndef API_RTPPARAMETERS_H_ #define API_RTPPARAMETERS_H_ +#include #include #include #include diff --git a/api/rtptransceiverinterface.cc b/api/rtptransceiverinterface.cc index d833339fa6..e62b014c65 100644 --- a/api/rtptransceiverinterface.cc +++ b/api/rtptransceiverinterface.cc @@ -10,6 +10,8 @@ #include "api/rtptransceiverinterface.h" +#include "rtc_base/checks.h" + namespace webrtc { RtpTransceiverInit::RtpTransceiverInit() = default; diff --git a/api/rtptransceiverinterface.h b/api/rtptransceiverinterface.h index 301a3809f8..c01fdafb83 100644 --- a/api/rtptransceiverinterface.h +++ b/api/rtptransceiverinterface.h @@ -16,9 +16,12 @@ #include "absl/types/optional.h" #include "api/array_view.h" +#include "api/mediatypes.h" +#include "api/rtpparameters.h" #include "api/rtpreceiverinterface.h" #include "api/rtpsenderinterface.h" #include "rtc_base/refcount.h" +#include "rtc_base/scoped_ref_ptr.h" namespace webrtc { diff --git a/api/units/data_rate.h b/api/units/data_rate.h index 4bb988b658..28efcd3ee8 100644 --- a/api/units/data_rate.h +++ b/api/units/data_rate.h @@ -20,12 +20,12 @@ #include #include #include - -#include "rtc_base/checks.h" -#include "rtc_base/numerics/safe_conversions.h" +#include #include "api/units/data_size.h" #include "api/units/time_delta.h" +#include "rtc_base/checks.h" +#include "rtc_base/numerics/safe_conversions.h" namespace webrtc { namespace data_rate_impl { diff --git a/api/units/time_delta.h b/api/units/time_delta.h index ec364172aa..74b5385128 100644 --- a/api/units/time_delta.h +++ b/api/units/time_delta.h @@ -20,6 +20,7 @@ #include #include #include +#include #include "rtc_base/checks.h" #include "rtc_base/numerics/safe_conversions.h" diff --git a/api/units/timestamp.h b/api/units/timestamp.h index 0298f5da97..80f1839250 100644 --- a/api/units/timestamp.h +++ b/api/units/timestamp.h @@ -15,9 +15,11 @@ #include // no-presubmit-check TODO(webrtc:8982) #endif // UNIT_TEST +#include #include #include #include +#include #include "api/units/time_delta.h" #include "rtc_base/checks.h" diff --git a/api/video/BUILD.gn b/api/video/BUILD.gn index be69580884..3f2c9e621d 100644 --- a/api/video/BUILD.gn +++ b/api/video/BUILD.gn @@ -75,6 +75,9 @@ rtc_source_set("encoded_image") { deps = [ ":video_frame", "../..:webrtc_common", + + # TODO(bugs.webrtc.org/8311) Cleanup when kMaxSpatialLayers is moved to proper include. + "../../api/video:video_bitrate_allocation", "../../rtc_base:checks", "../../rtc_base:rtc_base_approved", "../../rtc_base/system:rtc_export", diff --git a/api/video/encoded_image.cc b/api/video/encoded_image.cc index 5658dfc802..e7c6fadee7 100644 --- a/api/video/encoded_image.cc +++ b/api/video/encoded_image.cc @@ -12,11 +12,6 @@ #include -#include // swap - -#include "rtc_base/bind.h" -#include "rtc_base/checks.h" - namespace webrtc { // FFmpeg's decoder, used by H264DecoderImpl, requires up to 8 bytes padding due diff --git a/api/video/encoded_image.h b/api/video/encoded_image.h index bda9121ed7..5c4a82d5fe 100644 --- a/api/video/encoded_image.h +++ b/api/video/encoded_image.h @@ -11,11 +11,15 @@ #ifndef API_VIDEO_ENCODED_IMAGE_H_ #define API_VIDEO_ENCODED_IMAGE_H_ +#include + #include "absl/types/optional.h" +#include "api/video/video_bitrate_allocation.h" #include "api/video/video_content_type.h" #include "api/video/video_rotation.h" #include "api/video/video_timing.h" #include "common_types.h" // NOLINT(build/include) +#include "rtc_base/checks.h" #include "rtc_base/system/rtc_export.h" namespace webrtc { diff --git a/api/video/i420_buffer.h b/api/video/i420_buffer.h index 282b2426ca..8683b25316 100644 --- a/api/video/i420_buffer.h +++ b/api/video/i420_buffer.h @@ -11,11 +11,13 @@ #ifndef API_VIDEO_I420_BUFFER_H_ #define API_VIDEO_I420_BUFFER_H_ +#include #include #include "api/video/video_frame_buffer.h" #include "api/video/video_rotation.h" #include "rtc_base/memory/aligned_malloc.h" +#include "rtc_base/scoped_ref_ptr.h" namespace webrtc { diff --git a/api/video/video_bitrate_allocation.cc b/api/video/video_bitrate_allocation.cc index 892253685b..1b3569047e 100644 --- a/api/video/video_bitrate_allocation.cc +++ b/api/video/video_bitrate_allocation.cc @@ -10,6 +10,8 @@ #include "api/video/video_bitrate_allocation.h" +#include + #include "rtc_base/checks.h" #include "rtc_base/numerics/safe_conversions.h" #include "rtc_base/strings/string_builder.h" diff --git a/api/video/video_bitrate_allocation.h b/api/video/video_bitrate_allocation.h index 9e2501d85a..d1771b44a4 100644 --- a/api/video/video_bitrate_allocation.h +++ b/api/video/video_bitrate_allocation.h @@ -11,6 +11,8 @@ #ifndef API_VIDEO_VIDEO_BITRATE_ALLOCATION_H_ #define API_VIDEO_VIDEO_BITRATE_ALLOCATION_H_ +#include +#include #include #include #include diff --git a/api/video/video_frame.h b/api/video/video_frame.h index b62ef53330..83b45b2a31 100644 --- a/api/video/video_frame.h +++ b/api/video/video_frame.h @@ -17,6 +17,7 @@ #include "api/video/color_space.h" #include "api/video/video_frame_buffer.h" #include "api/video/video_rotation.h" +#include "rtc_base/scoped_ref_ptr.h" #include "rtc_base/system/rtc_export.h" namespace webrtc { diff --git a/api/video_codecs/video_codec.cc b/api/video_codecs/video_codec.cc index 60cfab08f3..ea8dfa74d5 100644 --- a/api/video_codecs/video_codec.cc +++ b/api/video_codecs/video_codec.cc @@ -11,14 +11,11 @@ #include "api/video_codecs/video_codec.h" #include -#include -#include #include -#include #include "absl/strings/match.h" #include "rtc_base/checks.h" -#include "rtc_base/strings/string_builder.h" +#include "rtc_base/stringutils.h" namespace webrtc { diff --git a/api/video_codecs/video_codec.h b/api/video_codecs/video_codec.h index cbbb6495d0..95a1d845e1 100644 --- a/api/video_codecs/video_codec.h +++ b/api/video_codecs/video_codec.h @@ -11,8 +11,11 @@ #ifndef API_VIDEO_CODECS_VIDEO_CODEC_H_ #define API_VIDEO_CODECS_VIDEO_CODEC_H_ +#include +#include #include +#include "api/video/video_bitrate_allocation.h" #include "common_types.h" // NOLINT(build/include) #include "rtc_base/system/rtc_export.h" diff --git a/api/video_codecs/video_encoder.cc b/api/video_codecs/video_encoder.cc index 008780e38c..33d35deb68 100644 --- a/api/video_codecs/video_encoder.cc +++ b/api/video_codecs/video_encoder.cc @@ -10,6 +10,10 @@ #include "api/video_codecs/video_encoder.h" +#include + +#include "rtc_base/checks.h" + namespace webrtc { // TODO(mflodman): Add default complexity for VP9 and VP9. diff --git a/api/video_codecs/video_encoder_config.cc b/api/video_codecs/video_encoder_config.cc index 74977eaea3..66ff7c94eb 100644 --- a/api/video_codecs/video_encoder_config.cc +++ b/api/video_codecs/video_encoder_config.cc @@ -9,7 +9,6 @@ */ #include "api/video_codecs/video_encoder_config.h" -#include #include #include "rtc_base/checks.h" diff --git a/api/video_codecs/video_encoder_config.h b/api/video_codecs/video_encoder_config.h index e10f08190c..c9b764613c 100644 --- a/api/video_codecs/video_encoder_config.h +++ b/api/video_codecs/video_encoder_config.h @@ -11,12 +11,14 @@ #ifndef API_VIDEO_CODECS_VIDEO_ENCODER_CONFIG_H_ #define API_VIDEO_CODECS_VIDEO_ENCODER_CONFIG_H_ +#include #include #include #include "absl/types/optional.h" #include "api/video_codecs/sdp_video_format.h" #include "api/video_codecs/video_codec.h" +#include "common_types.h" // NOLINT(build/include) #include "rtc_base/refcount.h" #include "rtc_base/scoped_ref_ptr.h" diff --git a/audio/audio_receive_stream.cc b/audio/audio_receive_stream.cc index bf06cd258a..082b6a0cba 100644 --- a/audio/audio_receive_stream.cc +++ b/audio/audio_receive_stream.cc @@ -13,14 +13,19 @@ #include #include +#include "absl/memory/memory.h" +#include "api/array_view.h" +#include "api/audio_codecs/audio_format.h" #include "api/call/audio_sink.h" +#include "api/rtpparameters.h" #include "audio/audio_send_stream.h" #include "audio/audio_state.h" +#include "audio/channel_receive.h" #include "audio/channel_receive_proxy.h" #include "audio/conversion.h" +#include "call/rtp_config.h" #include "call/rtp_stream_receiver_controller_interface.h" -#include "modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h" -#include "modules/rtp_rtcp/include/rtp_rtcp.h" +#include "common_types.h" // NOLINT(build/include) #include "rtc_base/checks.h" #include "rtc_base/logging.h" #include "rtc_base/strings/string_builder.h" diff --git a/audio/audio_receive_stream.h b/audio/audio_receive_stream.h index e982b04d54..dde0da4918 100644 --- a/audio/audio_receive_stream.h +++ b/audio/audio_receive_stream.h @@ -18,7 +18,6 @@ #include "api/rtp_headers.h" #include "audio/audio_state.h" #include "call/audio_receive_stream.h" -#include "call/rtp_packet_sink_interface.h" #include "call/syncable.h" #include "rtc_base/constructormagic.h" #include "rtc_base/thread_checker.h" diff --git a/audio/audio_send_stream.cc b/audio/audio_send_stream.cc index f60f9208ae..052cd73ec9 100644 --- a/audio/audio_send_stream.cc +++ b/audio/audio_send_stream.cc @@ -15,12 +15,21 @@ #include #include "absl/memory/memory.h" - +#include "api/audio_codecs/audio_encoder.h" +#include "api/audio_codecs/audio_encoder_factory.h" +#include "api/audio_codecs/audio_format.h" +#include "api/call/transport.h" +#include "api/crypto/frameencryptorinterface.h" #include "audio/audio_state.h" +#include "audio/channel_send.h" #include "audio/channel_send_proxy.h" #include "audio/conversion.h" +#include "call/rtp_config.h" #include "call/rtp_transport_controller_send_interface.h" +#include "common_audio/vad/include/vad.h" +#include "common_types.h" // NOLINT(build/include) #include "modules/audio_coding/codecs/cng/audio_encoder_cng.h" +#include "modules/audio_processing/include/audio_processing.h" #include "rtc_base/checks.h" #include "rtc_base/event.h" #include "rtc_base/function_view.h" diff --git a/audio/audio_transport_impl.cc b/audio/audio_transport_impl.cc index 94ef6cb68a..539456e2f4 100644 --- a/audio/audio_transport_impl.cc +++ b/audio/audio_transport_impl.cc @@ -17,7 +17,7 @@ #include "audio/remix_resample.h" #include "audio/utility/audio_frame_operations.h" #include "call/audio_send_stream.h" -#include "rtc_base/logging.h" +#include "rtc_base/checks.h" namespace webrtc { diff --git a/audio/channel_receive.cc b/audio/channel_receive.cc index 238499909d..859a3bae83 100644 --- a/audio/channel_receive.cc +++ b/audio/channel_receive.cc @@ -26,6 +26,7 @@ #include "modules/audio_device/include/audio_device.h" #include "modules/pacing/packet_router.h" #include "modules/rtp_rtcp/include/receive_statistics.h" +#include "modules/rtp_rtcp/source/rtp_header_extensions.h" #include "modules/rtp_rtcp/source/rtp_packet_received.h" #include "modules/utility/include/process_thread.h" #include "rtc_base/checks.h" diff --git a/audio/channel_receive_proxy.cc b/audio/channel_receive_proxy.cc index b1c1c45832..1dee640698 100644 --- a/audio/channel_receive_proxy.cc +++ b/audio/channel_receive_proxy.cc @@ -14,7 +14,6 @@ #include "api/call/audio_sink.h" #include "audio/channel_send_proxy.h" -#include "call/rtp_transport_controller_send_interface.h" #include "rtc_base/checks.h" #include "rtc_base/logging.h" #include "rtc_base/numerics/safe_minmax.h" diff --git a/audio/channel_send_proxy.cc b/audio/channel_send_proxy.cc index 8091bdc671..661e1e4f71 100644 --- a/audio/channel_send_proxy.cc +++ b/audio/channel_send_proxy.cc @@ -12,11 +12,8 @@ #include -#include "api/call/audio_sink.h" #include "call/rtp_transport_controller_send_interface.h" #include "rtc_base/checks.h" -#include "rtc_base/logging.h" -#include "rtc_base/numerics/safe_minmax.h" namespace webrtc { namespace voe { diff --git a/audio/null_audio_poller.cc b/audio/null_audio_poller.cc index bd5317ba39..d2b1199ed6 100644 --- a/audio/null_audio_poller.cc +++ b/audio/null_audio_poller.cc @@ -9,9 +9,13 @@ */ #include "audio/null_audio_poller.h" -#include "rtc_base/logging.h" + +#include + +#include "rtc_base/checks.h" +#include "rtc_base/location.h" #include "rtc_base/thread.h" -#include "rtc_base/timeutils.h" // for TimeMillis +#include "rtc_base/timeutils.h" namespace webrtc { namespace internal { diff --git a/audio/null_audio_poller.h b/audio/null_audio_poller.h index afb6edbaf1..f91eb7d6c0 100644 --- a/audio/null_audio_poller.h +++ b/audio/null_audio_poller.h @@ -11,8 +11,11 @@ #ifndef AUDIO_NULL_AUDIO_POLLER_H_ #define AUDIO_NULL_AUDIO_POLLER_H_ +#include + #include "modules/audio_device/include/audio_device_defines.h" #include "rtc_base/messagehandler.h" +#include "rtc_base/messagequeue.h" #include "rtc_base/thread_checker.h" namespace webrtc { diff --git a/audio/remix_resample.cc b/audio/remix_resample.cc index eda70c7c37..cc59e2a823 100644 --- a/audio/remix_resample.cc +++ b/audio/remix_resample.cc @@ -13,10 +13,7 @@ #include "api/audio/audio_frame.h" #include "audio/utility/audio_frame_operations.h" #include "common_audio/resampler/include/push_resampler.h" -#include "common_audio/signal_processing/include/signal_processing_library.h" -#include "common_types.h" // NOLINT(build/include) #include "rtc_base/checks.h" -#include "rtc_base/logging.h" namespace webrtc { namespace voe { diff --git a/audio/transport_feedback_packet_loss_tracker.cc b/audio/transport_feedback_packet_loss_tracker.cc index c7acd766c4..f41439b494 100644 --- a/audio/transport_feedback_packet_loss_tracker.cc +++ b/audio/transport_feedback_packet_loss_tracker.cc @@ -10,11 +10,11 @@ #include "audio/transport_feedback_packet_loss_tracker.h" +#include #include #include #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" -#include "modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h" #include "rtc_base/checks.h" #include "rtc_base/numerics/mod_ops.h" diff --git a/audio/utility/audio_frame_operations.cc b/audio/utility/audio_frame_operations.cc index fb1f3b0771..1a8232b02b 100644 --- a/audio/utility/audio_frame_operations.cc +++ b/audio/utility/audio_frame_operations.cc @@ -12,6 +12,7 @@ #include #include +#include #include "rtc_base/checks.h" #include "rtc_base/numerics/safe_conversions.h" diff --git a/audio/utility/audio_frame_operations.h b/audio/utility/audio_frame_operations.h index 599352356f..c1445b6910 100644 --- a/audio/utility/audio_frame_operations.h +++ b/audio/utility/audio_frame_operations.h @@ -12,6 +12,7 @@ #define AUDIO_UTILITY_AUDIO_FRAME_OPERATIONS_H_ #include +#include #include "api/audio/audio_frame.h" diff --git a/call/BUILD.gn b/call/BUILD.gn index 66990946bb..3e01381e19 100644 --- a/call/BUILD.gn +++ b/call/BUILD.gn @@ -41,6 +41,7 @@ rtc_source_set("call_interfaces") { "../modules/audio_processing:audio_processing", "../modules/audio_processing:audio_processing_statistics", "../rtc_base:audio_format_to_string", + "../rtc_base:checks", "../rtc_base:rtc_base", "../rtc_base:rtc_base_approved", "../rtc_base/network:sent_packet", diff --git a/call/audio_send_stream.cc b/call/audio_send_stream.cc index e2cf20cf84..d0ef4215a9 100644 --- a/call/audio_send_stream.cc +++ b/call/audio_send_stream.cc @@ -9,6 +9,9 @@ */ #include "call/audio_send_stream.h" + +#include + #include "rtc_base/stringencode.h" #include "rtc_base/strings/audio_format_to_string.h" #include "rtc_base/strings/string_builder.h" diff --git a/call/call_config.cc b/call/call_config.cc index d3425aa579..b149c889ea 100644 --- a/call/call_config.cc +++ b/call/call_config.cc @@ -10,6 +10,8 @@ #include "call/call_config.h" +#include "rtc_base/checks.h" + namespace webrtc { CallConfig::CallConfig(RtcEventLog* event_log) : event_log(event_log) { diff --git a/call/flexfec_receive_stream.cc b/call/flexfec_receive_stream.cc index ab138368ba..ab6dde37b4 100644 --- a/call/flexfec_receive_stream.cc +++ b/call/flexfec_receive_stream.cc @@ -10,6 +10,8 @@ #include "call/flexfec_receive_stream.h" +#include "rtc_base/checks.h" + namespace webrtc { FlexfecReceiveStream::Config::Config(Transport* rtcp_send_transport) diff --git a/call/flexfec_receive_stream.h b/call/flexfec_receive_stream.h index ccc301430e..949ad742aa 100644 --- a/call/flexfec_receive_stream.h +++ b/call/flexfec_receive_stream.h @@ -12,7 +12,6 @@ #define CALL_FLEXFEC_RECEIVE_STREAM_H_ #include - #include #include @@ -20,7 +19,6 @@ #include "api/rtp_headers.h" #include "api/rtpparameters.h" #include "call/rtp_packet_sink_interface.h" -#include "common_types.h" // NOLINT(build/include) namespace webrtc { diff --git a/call/rtp_config.cc b/call/rtp_config.cc index 1445c2552e..c4f9d41009 100644 --- a/call/rtp_config.cc +++ b/call/rtp_config.cc @@ -10,6 +10,9 @@ #include "call/rtp_config.h" +#include + +#include "api/array_view.h" #include "rtc_base/strings/string_builder.h" namespace webrtc { diff --git a/call/rtp_config.h b/call/rtp_config.h index 8f8d03a3a8..0acddc3ee2 100644 --- a/call/rtp_config.h +++ b/call/rtp_config.h @@ -11,6 +11,8 @@ #ifndef CALL_RTP_CONFIG_H_ #define CALL_RTP_CONFIG_H_ +#include +#include #include #include diff --git a/call/video_send_stream.cc b/call/video_send_stream.cc index eba951806f..08bede5ded 100644 --- a/call/video_send_stream.cc +++ b/call/video_send_stream.cc @@ -9,6 +9,9 @@ */ #include "call/video_send_stream.h" + +#include + #include "api/crypto/frameencryptorinterface.h" #include "rtc_base/strings/string_builder.h" diff --git a/call/video_send_stream.h b/call/video_send_stream.h index fa7ffcd2bd..162622e5f5 100644 --- a/call/video_send_stream.h +++ b/call/video_send_stream.h @@ -11,19 +11,21 @@ #ifndef CALL_VIDEO_SEND_STREAM_H_ #define CALL_VIDEO_SEND_STREAM_H_ +#include #include #include -#include #include +#include "absl/types/optional.h" #include "api/call/transport.h" #include "api/crypto/cryptooptions.h" +#include "api/rtpparameters.h" +#include "api/video/video_content_type.h" #include "api/video/video_frame.h" #include "api/video/video_sink_interface.h" #include "api/video/video_source_interface.h" #include "api/video/video_stream_encoder_settings.h" #include "api/video_codecs/video_encoder_config.h" -#include "api/video_codecs/video_encoder_factory.h" #include "call/rtp_config.h" #include "common_types.h" // NOLINT(build/include) #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" diff --git a/common_audio/audio_converter.h b/common_audio/audio_converter.h index 769d724e2f..24a5e72cee 100644 --- a/common_audio/audio_converter.h +++ b/common_audio/audio_converter.h @@ -11,6 +11,7 @@ #ifndef COMMON_AUDIO_AUDIO_CONVERTER_H_ #define COMMON_AUDIO_AUDIO_CONVERTER_H_ +#include #include #include "rtc_base/constructormagic.h" diff --git a/common_audio/channel_buffer.cc b/common_audio/channel_buffer.cc index 38d231e09d..b9b8c25e37 100644 --- a/common_audio/channel_buffer.cc +++ b/common_audio/channel_buffer.cc @@ -10,6 +10,9 @@ #include "common_audio/channel_buffer.h" +#include + +#include "common_audio/include/audio_util.h" #include "rtc_base/checks.h" namespace webrtc { diff --git a/common_audio/fir_filter_c.cc b/common_audio/fir_filter_c.cc index 3418434672..b6ec27ad26 100644 --- a/common_audio/fir_filter_c.cc +++ b/common_audio/fir_filter_c.cc @@ -11,11 +11,8 @@ #include "common_audio/fir_filter_c.h" #include - #include -#include "common_audio/fir_filter_neon.h" -#include "common_audio/fir_filter_sse.h" #include "rtc_base/checks.h" namespace webrtc { diff --git a/common_audio/fir_filter_factory.cc b/common_audio/fir_filter_factory.cc index 3243b27ef9..19528e312e 100644 --- a/common_audio/fir_filter_factory.cc +++ b/common_audio/fir_filter_factory.cc @@ -13,12 +13,12 @@ #include "common_audio/fir_filter_c.h" #include "rtc_base/checks.h" #include "rtc_base/system/arch.h" -#include "system_wrappers/include/cpu_features_wrapper.h" #if defined(WEBRTC_HAS_NEON) #include "common_audio/fir_filter_neon.h" #elif defined(WEBRTC_ARCH_X86_FAMILY) #include "common_audio/fir_filter_sse.h" +#include "system_wrappers/include/cpu_features_wrapper.h" // kSSE2, WebRtc_G... #endif namespace webrtc { diff --git a/common_audio/fir_filter_sse.h b/common_audio/fir_filter_sse.h index 7707f933d9..b768a37aa1 100644 --- a/common_audio/fir_filter_sse.h +++ b/common_audio/fir_filter_sse.h @@ -11,6 +11,7 @@ #ifndef COMMON_AUDIO_FIR_FILTER_SSE_H_ #define COMMON_AUDIO_FIR_FILTER_SSE_H_ +#include #include #include "common_audio/fir_filter.h" diff --git a/common_audio/include/audio_util.h b/common_audio/include/audio_util.h index de242a49be..bca5718044 100644 --- a/common_audio/include/audio_util.h +++ b/common_audio/include/audio_util.h @@ -11,6 +11,7 @@ #ifndef COMMON_AUDIO_INCLUDE_AUDIO_UTIL_H_ #define COMMON_AUDIO_INCLUDE_AUDIO_UTIL_H_ +#include #include #include #include diff --git a/common_audio/real_fourier.h b/common_audio/real_fourier.h index a3e4dd16a8..4d0d8bf38e 100644 --- a/common_audio/real_fourier.h +++ b/common_audio/real_fourier.h @@ -11,6 +11,7 @@ #ifndef COMMON_AUDIO_REAL_FOURIER_H_ #define COMMON_AUDIO_REAL_FOURIER_H_ +#include #include #include diff --git a/common_audio/real_fourier_ooura.h b/common_audio/real_fourier_ooura.h index bb8eef96df..b36c84f10b 100644 --- a/common_audio/real_fourier_ooura.h +++ b/common_audio/real_fourier_ooura.h @@ -11,6 +11,7 @@ #ifndef COMMON_AUDIO_REAL_FOURIER_OOURA_H_ #define COMMON_AUDIO_REAL_FOURIER_OOURA_H_ +#include #include #include diff --git a/common_audio/resampler/push_resampler.cc b/common_audio/resampler/push_resampler.cc index 318d97b72c..9b89867e5a 100644 --- a/common_audio/resampler/push_resampler.cc +++ b/common_audio/resampler/push_resampler.cc @@ -10,12 +10,12 @@ #include "common_audio/resampler/include/push_resampler.h" +#include #include #include "absl/container/inlined_vector.h" #include "absl/memory/memory.h" #include "common_audio/include/audio_util.h" -#include "common_audio/resampler/include/resampler.h" #include "common_audio/resampler/push_sinc_resampler.h" #include "rtc_base/checks.h" diff --git a/common_audio/resampler/push_sinc_resampler.h b/common_audio/resampler/push_sinc_resampler.h index 1ffe73f79b..db9cdc1fd4 100644 --- a/common_audio/resampler/push_sinc_resampler.h +++ b/common_audio/resampler/push_sinc_resampler.h @@ -11,6 +11,8 @@ #ifndef COMMON_AUDIO_RESAMPLER_PUSH_SINC_RESAMPLER_H_ #define COMMON_AUDIO_RESAMPLER_PUSH_SINC_RESAMPLER_H_ +#include +#include #include #include "common_audio/resampler/sinc_resampler.h" diff --git a/common_audio/resampler/resampler.cc b/common_audio/resampler/resampler.cc index aa3a4bac2a..e4d2aa2b61 100644 --- a/common_audio/resampler/resampler.cc +++ b/common_audio/resampler/resampler.cc @@ -12,6 +12,7 @@ * A wrapper for resampling a numerous amount of sampling combinations. */ +#include #include #include diff --git a/common_audio/resampler/sinc_resampler.cc b/common_audio/resampler/sinc_resampler.cc index 5aa2061ab7..4601514030 100644 --- a/common_audio/resampler/sinc_resampler.cc +++ b/common_audio/resampler/sinc_resampler.cc @@ -88,13 +88,13 @@ #include "common_audio/resampler/sinc_resampler.h" #include +#include #include - #include #include "rtc_base/checks.h" #include "rtc_base/system/arch.h" -#include "system_wrappers/include/cpu_features_wrapper.h" +#include "system_wrappers/include/cpu_features_wrapper.h" // kSSE2, WebRtc_G... namespace webrtc { diff --git a/common_audio/resampler/sinc_resampler.h b/common_audio/resampler/sinc_resampler.h index 8a833ce88c..0be4318e33 100644 --- a/common_audio/resampler/sinc_resampler.h +++ b/common_audio/resampler/sinc_resampler.h @@ -14,6 +14,7 @@ #ifndef COMMON_AUDIO_RESAMPLER_SINC_RESAMPLER_H_ #define COMMON_AUDIO_RESAMPLER_SINC_RESAMPLER_H_ +#include #include #include "rtc_base/constructormagic.h" diff --git a/common_audio/resampler/sinc_resampler_sse.cc b/common_audio/resampler/sinc_resampler_sse.cc index 3906a79752..f6a24d0a0e 100644 --- a/common_audio/resampler/sinc_resampler_sse.cc +++ b/common_audio/resampler/sinc_resampler_sse.cc @@ -11,10 +11,12 @@ // Modified from the Chromium original: // src/media/base/simd/sinc_resampler_sse.cc -#include "common_audio/resampler/sinc_resampler.h" - +#include +#include #include +#include "common_audio/resampler/sinc_resampler.h" + namespace webrtc { float SincResampler::Convolve_SSE(const float* input_ptr, diff --git a/common_audio/smoothing_filter.cc b/common_audio/smoothing_filter.cc index d426bda250..0d5aaa4854 100644 --- a/common_audio/smoothing_filter.cc +++ b/common_audio/smoothing_filter.cc @@ -12,6 +12,7 @@ #include +#include "rtc_base/checks.h" #include "rtc_base/timeutils.h" namespace webrtc { diff --git a/common_audio/smoothing_filter.h b/common_audio/smoothing_filter.h index cff746953a..c467d85426 100644 --- a/common_audio/smoothing_filter.h +++ b/common_audio/smoothing_filter.h @@ -11,9 +11,10 @@ #ifndef COMMON_AUDIO_SMOOTHING_FILTER_H_ #define COMMON_AUDIO_SMOOTHING_FILTER_H_ +#include + #include "absl/types/optional.h" #include "rtc_base/constructormagic.h" -#include "system_wrappers/include/clock.h" namespace webrtc { diff --git a/common_audio/vad/vad.cc b/common_audio/vad/vad.cc index 1cb332a61d..987ed526c0 100644 --- a/common_audio/vad/vad.cc +++ b/common_audio/vad/vad.cc @@ -12,6 +12,7 @@ #include +#include "common_audio/vad/include/webrtc_vad.h" #include "rtc_base/checks.h" namespace webrtc { diff --git a/common_audio/wav_file.cc b/common_audio/wav_file.cc index 008891f9cf..fe27c4131e 100644 --- a/common_audio/wav_file.cc +++ b/common_audio/wav_file.cc @@ -10,15 +10,14 @@ #include "common_audio/wav_file.h" +#include #include #include -#include #include "common_audio/include/audio_util.h" #include "common_audio/wav_header.h" #include "rtc_base/checks.h" #include "rtc_base/logging.h" -#include "rtc_base/numerics/safe_conversions.h" #include "rtc_base/system/arch.h" namespace webrtc { diff --git a/common_audio/wav_header.cc b/common_audio/wav_header.cc index 8fc5fef508..8df6d5c9e2 100644 --- a/common_audio/wav_header.cc +++ b/common_audio/wav_header.cc @@ -14,12 +14,10 @@ #include "common_audio/wav_header.h" -#include #include #include #include -#include "common_audio/include/audio_util.h" #include "rtc_base/checks.h" #include "rtc_base/system/arch.h" diff --git a/common_types.h b/common_types.h index 30a2b3a93e..0c62bbc828 100644 --- a/common_types.h +++ b/common_types.h @@ -11,12 +11,10 @@ #ifndef COMMON_TYPES_H_ #define COMMON_TYPES_H_ -#include -#include -#include -#include +#include // For size_t +#include + #include "absl/strings/match.h" -#include "api/array_view.h" // TODO(sprang): Remove this include when all usage includes it directly. #include "api/video/video_bitrate_allocation.h" #include "rtc_base/checks.h" diff --git a/common_video/bitrate_adjuster.cc b/common_video/bitrate_adjuster.cc index 163c4b1981..ac21f2bd20 100644 --- a/common_video/bitrate_adjuster.cc +++ b/common_video/bitrate_adjuster.cc @@ -13,7 +13,6 @@ #include #include -#include "rtc_base/checks.h" #include "rtc_base/logging.h" #include "rtc_base/timeutils.h" diff --git a/common_video/h264/h264_bitstream_parser.cc b/common_video/h264/h264_bitstream_parser.cc index 2e63b9d4a1..f3d2f8a6bf 100644 --- a/common_video/h264/h264_bitstream_parser.cc +++ b/common_video/h264/h264_bitstream_parser.cc @@ -9,13 +9,12 @@ */ #include "common_video/h264/h264_bitstream_parser.h" -#include +#include +#include #include -#include "rtc_base/bitbuffer.h" -#include "rtc_base/checks.h" - #include "common_video/h264/h264_common.h" +#include "rtc_base/bitbuffer.h" #include "rtc_base/logging.h" namespace { diff --git a/common_video/h264/h264_bitstream_parser.h b/common_video/h264/h264_bitstream_parser.h index b3fac7bb21..962c9c16ad 100644 --- a/common_video/h264/h264_bitstream_parser.h +++ b/common_video/h264/h264_bitstream_parser.h @@ -17,10 +17,6 @@ #include "common_video/h264/pps_parser.h" #include "common_video/h264/sps_parser.h" -namespace rtc { -class BitBufferWriter; -} - namespace webrtc { // Stateful H264 bitstream parser (due to SPS/PPS). Used to parse out QP values diff --git a/common_video/h264/h264_common.cc b/common_video/h264/h264_common.cc index 60ed94d403..5e58ba62e9 100644 --- a/common_video/h264/h264_common.cc +++ b/common_video/h264/h264_common.cc @@ -10,6 +10,8 @@ #include "common_video/h264/h264_common.h" +#include + namespace webrtc { namespace H264 { diff --git a/common_video/h264/h264_common.h b/common_video/h264/h264_common.h index a58a9f55a5..027833b7cd 100644 --- a/common_video/h264/h264_common.h +++ b/common_video/h264/h264_common.h @@ -11,7 +11,8 @@ #ifndef COMMON_VIDEO_H264_H264_COMMON_H_ #define COMMON_VIDEO_H264_H264_COMMON_H_ -#include +#include +#include #include #include "rtc_base/buffer.h" diff --git a/common_video/h264/pps_parser.cc b/common_video/h264/pps_parser.cc index 5bc29f3592..464f6081e3 100644 --- a/common_video/h264/pps_parser.cc +++ b/common_video/h264/pps_parser.cc @@ -10,12 +10,12 @@ #include "common_video/h264/pps_parser.h" -#include +#include #include #include "common_video/h264/h264_common.h" #include "rtc_base/bitbuffer.h" -#include "rtc_base/logging.h" +#include "rtc_base/checks.h" #define RETURN_EMPTY_ON_FAIL(x) \ if (!(x)) { \ diff --git a/common_video/h264/sps_parser.cc b/common_video/h264/sps_parser.cc index b6799a3be4..c6f6d47466 100644 --- a/common_video/h264/sps_parser.cc +++ b/common_video/h264/sps_parser.cc @@ -10,12 +10,11 @@ #include "common_video/h264/sps_parser.h" -#include +#include #include #include "common_video/h264/h264_common.h" #include "rtc_base/bitbuffer.h" -#include "rtc_base/logging.h" namespace { typedef absl::optional OptionalSps; diff --git a/common_video/h264/sps_vui_rewriter.cc b/common_video/h264/sps_vui_rewriter.cc index 749b62e6d2..3eab11f188 100644 --- a/common_video/h264/sps_vui_rewriter.cc +++ b/common_video/h264/sps_vui_rewriter.cc @@ -11,18 +11,17 @@ #include "common_video/h264/sps_vui_rewriter.h" -#include -#include +#include +#include #include +#include "common_video/h264/h264_common.h" +#include "common_video/h264/sps_parser.h" #include "rtc_base/bitbuffer.h" #include "rtc_base/checks.h" #include "rtc_base/logging.h" #include "rtc_base/numerics/safe_minmax.h" -#include "common_video/h264/h264_common.h" -#include "common_video/h264/sps_parser.h" - namespace webrtc { // The maximum expected growth from adding a VUI to the SPS. It's actually diff --git a/common_video/h264/sps_vui_rewriter.h b/common_video/h264/sps_vui_rewriter.h index 233051d2d6..20d1dd0cdb 100644 --- a/common_video/h264/sps_vui_rewriter.h +++ b/common_video/h264/sps_vui_rewriter.h @@ -12,14 +12,13 @@ #ifndef COMMON_VIDEO_H264_SPS_VUI_REWRITER_H_ #define COMMON_VIDEO_H264_SPS_VUI_REWRITER_H_ +#include +#include + #include "absl/types/optional.h" #include "common_video/h264/sps_parser.h" #include "rtc_base/buffer.h" -namespace rtc { -class BitBuffer; -} - namespace webrtc { // A class that can parse an SPS block of a NAL unit and if necessary diff --git a/common_video/i420_buffer_pool.cc b/common_video/i420_buffer_pool.cc index c403eeb4fc..2e6cdc83b5 100644 --- a/common_video/i420_buffer_pool.cc +++ b/common_video/i420_buffer_pool.cc @@ -10,6 +10,8 @@ #include "common_video/include/i420_buffer_pool.h" +#include + #include "rtc_base/checks.h" namespace webrtc { diff --git a/common_video/include/bitrate_adjuster.h b/common_video/include/bitrate_adjuster.h index ee312e4f9a..bc2c6bb849 100644 --- a/common_video/include/bitrate_adjuster.h +++ b/common_video/include/bitrate_adjuster.h @@ -11,10 +11,13 @@ #ifndef COMMON_VIDEO_INCLUDE_BITRATE_ADJUSTER_H_ #define COMMON_VIDEO_INCLUDE_BITRATE_ADJUSTER_H_ -#include +#include +#include +#include "absl/types/optional.h" #include "rtc_base/criticalsection.h" #include "rtc_base/rate_statistics.h" +#include "rtc_base/thread_annotations.h" namespace webrtc { diff --git a/common_video/include/i420_buffer_pool.h b/common_video/include/i420_buffer_pool.h index 79f7eec23a..2dcee195fa 100644 --- a/common_video/include/i420_buffer_pool.h +++ b/common_video/include/i420_buffer_pool.h @@ -11,12 +11,13 @@ #ifndef COMMON_VIDEO_INCLUDE_I420_BUFFER_POOL_H_ #define COMMON_VIDEO_INCLUDE_I420_BUFFER_POOL_H_ -#include +#include #include #include "api/video/i420_buffer.h" #include "rtc_base/race_checker.h" #include "rtc_base/refcountedobject.h" +#include "rtc_base/scoped_ref_ptr.h" namespace webrtc { diff --git a/common_video/include/incoming_video_stream.h b/common_video/include/incoming_video_stream.h index b32653ba23..fe8d10e216 100644 --- a/common_video/include/incoming_video_stream.h +++ b/common_video/include/incoming_video_stream.h @@ -11,6 +11,9 @@ #ifndef COMMON_VIDEO_INCLUDE_INCOMING_VIDEO_STREAM_H_ #define COMMON_VIDEO_INCLUDE_INCOMING_VIDEO_STREAM_H_ +#include + +#include "api/video/video_frame.h" #include "api/video/video_sink_interface.h" #include "common_video/video_render_frames.h" #include "rtc_base/race_checker.h" diff --git a/common_video/include/video_frame_buffer.h b/common_video/include/video_frame_buffer.h index 11bb812531..4542fa23c2 100644 --- a/common_video/include/video_frame_buffer.h +++ b/common_video/include/video_frame_buffer.h @@ -11,10 +11,11 @@ #ifndef COMMON_VIDEO_INCLUDE_VIDEO_FRAME_BUFFER_H_ #define COMMON_VIDEO_INCLUDE_VIDEO_FRAME_BUFFER_H_ -#include +#include #include "api/video/video_frame_buffer.h" #include "rtc_base/callback.h" +#include "rtc_base/refcountedobject.h" #include "rtc_base/scoped_ref_ptr.h" namespace webrtc { diff --git a/common_video/incoming_video_stream.cc b/common_video/incoming_video_stream.cc index efca514556..c8b12e747f 100644 --- a/common_video/incoming_video_stream.cc +++ b/common_video/incoming_video_stream.cc @@ -11,9 +11,11 @@ #include "common_video/include/incoming_video_stream.h" #include +#include +#include "absl/types/optional.h" #include "common_video/video_render_frames.h" -#include "rtc_base/timeutils.h" +#include "rtc_base/checks.h" #include "rtc_base/trace_event.h" namespace webrtc { diff --git a/common_video/libyuv/include/webrtc_libyuv.h b/common_video/libyuv/include/webrtc_libyuv.h index 4cbfec2018..d3248340d8 100644 --- a/common_video/libyuv/include/webrtc_libyuv.h +++ b/common_video/libyuv/include/webrtc_libyuv.h @@ -15,11 +15,14 @@ #ifndef COMMON_VIDEO_LIBYUV_INCLUDE_WEBRTC_LIBYUV_H_ #define COMMON_VIDEO_LIBYUV_INCLUDE_WEBRTC_LIBYUV_H_ +#include #include #include #include "api/video/video_frame.h" -#include "common_types.h" // NOLINT(build/include) // VideoTypes. +#include "api/video/video_frame_buffer.h" +#include "common_types.h" // NOLINT(build/include) +#include "rtc_base/scoped_ref_ptr.h" namespace webrtc { diff --git a/common_video/video_render_frames.cc b/common_video/video_render_frames.cc index 5a0b0b0071..8152625f5b 100644 --- a/common_video/video_render_frames.cc +++ b/common_video/video_render_frames.cc @@ -10,8 +10,10 @@ #include "common_video/video_render_frames.h" +#include #include +#include "rtc_base/checks.h" #include "rtc_base/logging.h" #include "rtc_base/timeutils.h" #include "system_wrappers/include/metrics.h" diff --git a/common_video/video_render_frames.h b/common_video/video_render_frames.h index 2226577dc3..2c4bdd9177 100644 --- a/common_video/video_render_frames.h +++ b/common_video/video_render_frames.h @@ -11,8 +11,8 @@ #ifndef COMMON_VIDEO_VIDEO_RENDER_FRAMES_H_ #define COMMON_VIDEO_VIDEO_RENDER_FRAMES_H_ +#include #include - #include #include "absl/types/optional.h" diff --git a/logging/rtc_event_log/events/rtc_event_audio_playout.h b/logging/rtc_event_log/events/rtc_event_audio_playout.h index 3080f5b9f0..c6bcb66ff5 100644 --- a/logging/rtc_event_log/events/rtc_event_audio_playout.h +++ b/logging/rtc_event_log/events/rtc_event_audio_playout.h @@ -11,6 +11,7 @@ #ifndef LOGGING_RTC_EVENT_LOG_EVENTS_RTC_EVENT_AUDIO_PLAYOUT_H_ #define LOGGING_RTC_EVENT_LOG_EVENTS_RTC_EVENT_AUDIO_PLAYOUT_H_ +#include #include #include "logging/rtc_event_log/events/rtc_event.h" diff --git a/logging/rtc_event_log/events/rtc_event_bwe_update_delay_based.h b/logging/rtc_event_log/events/rtc_event_bwe_update_delay_based.h index 3f47dc7f97..0fb5c023a6 100644 --- a/logging/rtc_event_log/events/rtc_event_bwe_update_delay_based.h +++ b/logging/rtc_event_log/events/rtc_event_bwe_update_delay_based.h @@ -11,6 +11,7 @@ #ifndef LOGGING_RTC_EVENT_LOG_EVENTS_RTC_EVENT_BWE_UPDATE_DELAY_BASED_H_ #define LOGGING_RTC_EVENT_LOG_EVENTS_RTC_EVENT_BWE_UPDATE_DELAY_BASED_H_ +#include #include #include "logging/rtc_event_log/events/rtc_event.h" diff --git a/logging/rtc_event_log/events/rtc_event_bwe_update_loss_based.h b/logging/rtc_event_log/events/rtc_event_bwe_update_loss_based.h index 2d4ffda1b1..58bc2f1056 100644 --- a/logging/rtc_event_log/events/rtc_event_bwe_update_loss_based.h +++ b/logging/rtc_event_log/events/rtc_event_bwe_update_loss_based.h @@ -11,6 +11,7 @@ #ifndef LOGGING_RTC_EVENT_LOG_EVENTS_RTC_EVENT_BWE_UPDATE_LOSS_BASED_H_ #define LOGGING_RTC_EVENT_LOG_EVENTS_RTC_EVENT_BWE_UPDATE_LOSS_BASED_H_ +#include #include #include "logging/rtc_event_log/events/rtc_event.h" diff --git a/logging/rtc_event_log/events/rtc_event_probe_cluster_created.h b/logging/rtc_event_log/events/rtc_event_probe_cluster_created.h index 3e8c21f5c9..426668698b 100644 --- a/logging/rtc_event_log/events/rtc_event_probe_cluster_created.h +++ b/logging/rtc_event_log/events/rtc_event_probe_cluster_created.h @@ -11,6 +11,7 @@ #ifndef LOGGING_RTC_EVENT_LOG_EVENTS_RTC_EVENT_PROBE_CLUSTER_CREATED_H_ #define LOGGING_RTC_EVENT_LOG_EVENTS_RTC_EVENT_PROBE_CLUSTER_CREATED_H_ +#include #include #include "logging/rtc_event_log/events/rtc_event.h" diff --git a/logging/rtc_event_log/events/rtc_event_probe_result_failure.h b/logging/rtc_event_log/events/rtc_event_probe_result_failure.h index 181c694037..bf0aceb62a 100644 --- a/logging/rtc_event_log/events/rtc_event_probe_result_failure.h +++ b/logging/rtc_event_log/events/rtc_event_probe_result_failure.h @@ -11,6 +11,7 @@ #ifndef LOGGING_RTC_EVENT_LOG_EVENTS_RTC_EVENT_PROBE_RESULT_FAILURE_H_ #define LOGGING_RTC_EVENT_LOG_EVENTS_RTC_EVENT_PROBE_RESULT_FAILURE_H_ +#include #include #include "logging/rtc_event_log/events/rtc_event.h" diff --git a/logging/rtc_event_log/events/rtc_event_probe_result_success.h b/logging/rtc_event_log/events/rtc_event_probe_result_success.h index 15ff1833bf..10b1969407 100644 --- a/logging/rtc_event_log/events/rtc_event_probe_result_success.h +++ b/logging/rtc_event_log/events/rtc_event_probe_result_success.h @@ -11,6 +11,7 @@ #ifndef LOGGING_RTC_EVENT_LOG_EVENTS_RTC_EVENT_PROBE_RESULT_SUCCESS_H_ #define LOGGING_RTC_EVENT_LOG_EVENTS_RTC_EVENT_PROBE_RESULT_SUCCESS_H_ +#include #include #include "logging/rtc_event_log/events/rtc_event.h" diff --git a/logging/rtc_event_log/events/rtc_event_rtcp_packet_incoming.h b/logging/rtc_event_log/events/rtc_event_rtcp_packet_incoming.h index 6d904953a4..47b70c7488 100644 --- a/logging/rtc_event_log/events/rtc_event_rtcp_packet_incoming.h +++ b/logging/rtc_event_log/events/rtc_event_rtcp_packet_incoming.h @@ -11,6 +11,7 @@ #ifndef LOGGING_RTC_EVENT_LOG_EVENTS_RTC_EVENT_RTCP_PACKET_INCOMING_H_ #define LOGGING_RTC_EVENT_LOG_EVENTS_RTC_EVENT_RTCP_PACKET_INCOMING_H_ +#include #include #include "api/array_view.h" diff --git a/logging/rtc_event_log/events/rtc_event_rtcp_packet_outgoing.h b/logging/rtc_event_log/events/rtc_event_rtcp_packet_outgoing.h index 3aa9e7199a..d1a54e1c98 100644 --- a/logging/rtc_event_log/events/rtc_event_rtcp_packet_outgoing.h +++ b/logging/rtc_event_log/events/rtc_event_rtcp_packet_outgoing.h @@ -11,6 +11,7 @@ #ifndef LOGGING_RTC_EVENT_LOG_EVENTS_RTC_EVENT_RTCP_PACKET_OUTGOING_H_ #define LOGGING_RTC_EVENT_LOG_EVENTS_RTC_EVENT_RTCP_PACKET_OUTGOING_H_ +#include #include #include "api/array_view.h" diff --git a/logging/rtc_event_log/rtc_event_log.h b/logging/rtc_event_log/rtc_event_log.h index 3a6bc4a0fc..e09d184837 100644 --- a/logging/rtc_event_log/rtc_event_log.h +++ b/logging/rtc_event_log/rtc_event_log.h @@ -11,6 +11,7 @@ #ifndef LOGGING_RTC_EVENT_LOG_RTC_EVENT_LOG_H_ #define LOGGING_RTC_EVENT_LOG_RTC_EVENT_LOG_H_ +#include #include #include "api/rtceventlogoutput.h" diff --git a/logging/rtc_event_log/rtc_stream_config.h b/logging/rtc_event_log/rtc_stream_config.h index d95c8359ec..a9da4814e6 100644 --- a/logging/rtc_event_log/rtc_stream_config.h +++ b/logging/rtc_event_log/rtc_stream_config.h @@ -11,12 +11,12 @@ #ifndef LOGGING_RTC_EVENT_LOG_RTC_STREAM_CONFIG_H_ #define LOGGING_RTC_EVENT_LOG_RTC_STREAM_CONFIG_H_ +#include #include #include #include "api/rtp_headers.h" #include "api/rtpparameters.h" -#include "common_types.h" // NOLINT(build/include) namespace webrtc { namespace rtclog { diff --git a/media/sctp/sctptransport.h b/media/sctp/sctptransport.h index a401d8b795..bd302bb9b1 100644 --- a/media/sctp/sctptransport.h +++ b/media/sctp/sctptransport.h @@ -14,7 +14,7 @@ #include #include -#include // for unique_ptr. +#include #include #include #include diff --git a/media/sctp/sctptransportinternal.h b/media/sctp/sctptransportinternal.h index 0380a870b4..4c3b542a52 100644 --- a/media/sctp/sctptransportinternal.h +++ b/media/sctp/sctptransportinternal.h @@ -14,7 +14,7 @@ // TODO(deadbeef): Move SCTP code out of media/, and make it not depend on // anything in media/. -#include // for unique_ptr +#include #include #include diff --git a/modules/audio_coding/BUILD.gn b/modules/audio_coding/BUILD.gn index 01a0e939d5..f36e4f0c20 100644 --- a/modules/audio_coding/BUILD.gn +++ b/modules/audio_coding/BUILD.gn @@ -128,6 +128,7 @@ rtc_static_library("audio_coding") { "../../system_wrappers:metrics", "../../api/audio:audio_frame_api", "..:module_api", + "..:module_api_public", "../../common_audio:common_audio_c", "../../rtc_base:deprecation", "../../rtc_base:checks", @@ -135,6 +136,7 @@ rtc_static_library("audio_coding") { "../../api/audio_codecs:audio_codecs_api", ":audio_coding_module_typedefs", ":neteq", + ":neteq_decoder_enum", ":rent_a_codec", "../../rtc_base:audio_format_to_string", "../../rtc_base:rtc_base_approved", @@ -153,7 +155,9 @@ rtc_static_library("legacy_encoded_audio_frame") { deps = [ "../../api:array_view", "../../api/audio_codecs:audio_codecs_api", + "../../rtc_base:checks", "../../rtc_base:rtc_base_approved", + "//third_party/abseil-cpp/absl/types:optional", ] } @@ -172,7 +176,9 @@ rtc_static_library("cng") { "../../api/audio_codecs:audio_codecs_api", "../../common_audio", "../../common_audio:common_audio_c", + "../../rtc_base:checks", "../../rtc_base:rtc_base_approved", + "//third_party/abseil-cpp/absl/types:optional", ] } @@ -184,10 +190,12 @@ rtc_static_library("red") { ] deps = [ + "../../api:array_view", "../../api/audio_codecs:audio_codecs_api", "../../common_audio", "../../rtc_base:checks", "../../rtc_base:rtc_base_approved", + "//third_party/abseil-cpp/absl/types:optional", ] } @@ -204,6 +212,7 @@ rtc_static_library("g711") { deps = [ ":legacy_encoded_audio_frame", "../..:webrtc_common", + "../../api:array_view", "../../api/audio_codecs:audio_codecs_api", "../../rtc_base:checks", "../../rtc_base:rtc_base_approved", @@ -238,6 +247,7 @@ rtc_static_library("g722") { deps = [ ":legacy_encoded_audio_frame", "../..:webrtc_common", + "../../api:array_view", "../../api/audio_codecs:audio_codecs_api", "../../api/audio_codecs/g722:audio_encoder_g722_config", "../../rtc_base:checks", @@ -273,6 +283,7 @@ rtc_static_library("ilbc") { deps = [ ":legacy_encoded_audio_frame", "../..:webrtc_common", + "../../api:array_view", "../../api/audio_codecs:audio_codecs_api", "../../api/audio_codecs/ilbc:audio_encoder_ilbc_config", "../../common_audio", @@ -789,6 +800,7 @@ rtc_static_library("pcm16b") { ":g711", ":legacy_encoded_audio_frame", "../..:webrtc_common", + "../../api:array_view", "../../api/audio_codecs:audio_codecs_api", "../../rtc_base:checks", "../../rtc_base:rtc_base_approved", @@ -823,6 +835,7 @@ rtc_static_library("webrtc_opus") { deps = [ ":audio_network_adaptor", "../..:webrtc_common", + "../../api:array_view", "../../api/audio_codecs:audio_codecs_api", "../../api/audio_codecs/opus:audio_encoder_opus_config", "../../common_audio", @@ -1056,6 +1069,7 @@ rtc_static_library("neteq") { ":cng", ":neteq_decoder_enum", "..:module_api", + "..:module_api_public", "../..:webrtc_common", "../../api:array_view", "../../api:libjingle_peerconnection_api", diff --git a/modules/audio_coding/acm2/acm_codec_database.cc b/modules/audio_coding/acm2/acm_codec_database.cc index e109cc7e02..879082cef0 100644 --- a/modules/audio_coding/acm2/acm_codec_database.cc +++ b/modules/audio_coding/acm2/acm_codec_database.cc @@ -18,7 +18,8 @@ #include "modules/audio_coding/acm2/acm_codec_database.h" #include "absl/strings/match.h" -#include "rtc_base/checks.h" +#include "api/array_view.h" +#include "modules/audio_coding/acm2/rent_a_codec.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/modules/audio_coding/acm2/acm_receiver.cc b/modules/audio_coding/acm2/acm_receiver.cc index 93fa27cb8a..3411d909a4 100644 --- a/modules/audio_coding/acm2/acm_receiver.cc +++ b/modules/audio_coding/acm2/acm_receiver.cc @@ -10,21 +10,22 @@ #include "modules/audio_coding/acm2/acm_receiver.h" -#include // malloc - -#include // sort +#include +#include +#include #include #include "absl/strings/match.h" +#include "api/audio/audio_frame.h" #include "api/audio_codecs/audio_decoder.h" -#include "common_audio/signal_processing/include/signal_processing_library.h" +#include "common_types.h" #include "modules/audio_coding/acm2/acm_resampler.h" #include "modules/audio_coding/acm2/call_statistics.h" #include "modules/audio_coding/acm2/rent_a_codec.h" #include "modules/audio_coding/neteq/include/neteq.h" +#include "modules/audio_coding/neteq/neteq_decoder_enum.h" #include "modules/include/module_common_types.h" #include "rtc_base/checks.h" -#include "rtc_base/format_macros.h" #include "rtc_base/logging.h" #include "rtc_base/numerics/safe_conversions.h" #include "rtc_base/strings/audio_format_to_string.h" diff --git a/modules/audio_coding/acm2/acm_receiver.h b/modules/audio_coding/acm2/acm_receiver.h index a2ae723dee..8e7d83978c 100644 --- a/modules/audio_coding/acm2/acm_receiver.h +++ b/modules/audio_coding/acm2/acm_receiver.h @@ -11,6 +11,7 @@ #ifndef MODULES_AUDIO_CODING_ACM2_ACM_RECEIVER_H_ #define MODULES_AUDIO_CODING_ACM2_ACM_RECEIVER_H_ +#include #include #include #include @@ -18,19 +19,21 @@ #include "absl/types/optional.h" #include "api/array_view.h" -#include "api/audio/audio_frame.h" -#include "common_audio/vad/include/webrtc_vad.h" +#include "api/audio_codecs/audio_decoder.h" +#include "api/audio_codecs/audio_format.h" #include "modules/audio_coding/acm2/acm_resampler.h" #include "modules/audio_coding/acm2/call_statistics.h" #include "modules/audio_coding/include/audio_coding_module.h" -#include "modules/audio_coding/neteq/include/neteq.h" #include "rtc_base/criticalsection.h" #include "rtc_base/thread_annotations.h" namespace webrtc { +class Clock; struct CodecInst; class NetEq; +struct RTPHeader; +struct WebRtcRTPHeader; namespace acm2 { diff --git a/modules/audio_coding/acm2/acm_resampler.cc b/modules/audio_coding/acm2/acm_resampler.cc index c0b2064453..ca3583e32c 100644 --- a/modules/audio_coding/acm2/acm_resampler.cc +++ b/modules/audio_coding/acm2/acm_resampler.cc @@ -13,7 +13,6 @@ #include #include -#include "common_audio/resampler/include/resampler.h" #include "rtc_base/logging.h" namespace webrtc { diff --git a/modules/audio_coding/acm2/acm_resampler.h b/modules/audio_coding/acm2/acm_resampler.h index 904ea524f8..96ba93a762 100644 --- a/modules/audio_coding/acm2/acm_resampler.h +++ b/modules/audio_coding/acm2/acm_resampler.h @@ -11,6 +11,9 @@ #ifndef MODULES_AUDIO_CODING_ACM2_ACM_RESAMPLER_H_ #define MODULES_AUDIO_CODING_ACM2_ACM_RESAMPLER_H_ +#include +#include + #include "common_audio/resampler/include/push_resampler.h" namespace webrtc { diff --git a/modules/audio_coding/acm2/audio_coding_module.cc b/modules/audio_coding/acm2/audio_coding_module.cc index d6752038da..334c0e0b38 100644 --- a/modules/audio_coding/acm2/audio_coding_module.cc +++ b/modules/audio_coding/acm2/audio_coding_module.cc @@ -10,17 +10,24 @@ #include "modules/audio_coding/include/audio_coding_module.h" +#include #include +#include #include "absl/strings/match.h" +#include "api/array_view.h" #include "modules/audio_coding/acm2/acm_receiver.h" #include "modules/audio_coding/acm2/acm_resampler.h" #include "modules/audio_coding/acm2/codec_manager.h" #include "modules/audio_coding/acm2/rent_a_codec.h" #include "modules/include/module_common_types.h" +#include "modules/include/module_common_types_public.h" +#include "rtc_base/buffer.h" #include "rtc_base/checks.h" +#include "rtc_base/criticalsection.h" #include "rtc_base/logging.h" #include "rtc_base/numerics/safe_conversions.h" +#include "rtc_base/thread_annotations.h" #include "system_wrappers/include/metrics.h" namespace webrtc { diff --git a/modules/audio_coding/acm2/codec_manager.cc b/modules/audio_coding/acm2/codec_manager.cc index 5094e21f07..eda6555062 100644 --- a/modules/audio_coding/acm2/codec_manager.cc +++ b/modules/audio_coding/acm2/codec_manager.cc @@ -10,10 +10,16 @@ #include "modules/audio_coding/acm2/codec_manager.h" +#include +#include +#include +#include + #include "absl/strings/match.h" -#include "rtc_base/checks.h" -//#include "rtc_base/format_macros.h" +#include "api/array_view.h" +#include "api/audio_codecs/audio_encoder.h" #include "modules/audio_coding/acm2/rent_a_codec.h" +#include "rtc_base/checks.h" #include "rtc_base/logging.h" namespace webrtc { diff --git a/modules/audio_coding/acm2/codec_manager.h b/modules/audio_coding/acm2/codec_manager.h index ffbad96708..22dbf4e72b 100644 --- a/modules/audio_coding/acm2/codec_manager.h +++ b/modules/audio_coding/acm2/codec_manager.h @@ -11,8 +11,6 @@ #ifndef MODULES_AUDIO_CODING_ACM2_CODEC_MANAGER_H_ #define MODULES_AUDIO_CODING_ACM2_CODEC_MANAGER_H_ -#include - #include "absl/types/optional.h" #include "common_types.h" // NOLINT(build/include) #include "modules/audio_coding/acm2/rent_a_codec.h" @@ -23,7 +21,6 @@ namespace webrtc { -class AudioDecoder; class AudioEncoder; namespace acm2 { diff --git a/modules/audio_coding/audio_network_adaptor/audio_network_adaptor_impl.cc b/modules/audio_coding/audio_network_adaptor/audio_network_adaptor_impl.cc index c4832a36de..85084c873d 100644 --- a/modules/audio_coding/audio_network_adaptor/audio_network_adaptor_impl.cc +++ b/modules/audio_coding/audio_network_adaptor/audio_network_adaptor_impl.cc @@ -10,9 +10,14 @@ #include "modules/audio_coding/audio_network_adaptor/audio_network_adaptor_impl.h" +#include #include +#include -#include "rtc_base/logging.h" +#include "modules/audio_coding/audio_network_adaptor/controller_manager.h" +#include "modules/audio_coding/audio_network_adaptor/debug_dump_writer.h" +#include "modules/audio_coding/audio_network_adaptor/event_log_writer.h" +#include "rtc_base/checks.h" #include "rtc_base/timeutils.h" #include "system_wrappers/include/field_trial.h" diff --git a/modules/audio_coding/audio_network_adaptor/audio_network_adaptor_impl.h b/modules/audio_coding/audio_network_adaptor/audio_network_adaptor_impl.h index e208ed2607..d3ecce0cae 100644 --- a/modules/audio_coding/audio_network_adaptor/audio_network_adaptor_impl.h +++ b/modules/audio_coding/audio_network_adaptor/audio_network_adaptor_impl.h @@ -11,17 +11,21 @@ #ifndef MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_AUDIO_NETWORK_ADAPTOR_IMPL_H_ #define MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_AUDIO_NETWORK_ADAPTOR_IMPL_H_ +#include #include +#include "absl/types/optional.h" +#include "api/audio_codecs/audio_encoder.h" #include "modules/audio_coding/audio_network_adaptor/controller.h" -#include "modules/audio_coding/audio_network_adaptor/controller_manager.h" #include "modules/audio_coding/audio_network_adaptor/debug_dump_writer.h" -#include "modules/audio_coding/audio_network_adaptor/event_log_writer.h" #include "modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor.h" +#include "modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor_config.h" #include "rtc_base/constructormagic.h" namespace webrtc { +class ControllerManager; +class EventLogWriter; class RtcEventLog; class AudioNetworkAdaptorImpl final : public AudioNetworkAdaptor { diff --git a/modules/audio_coding/audio_network_adaptor/bitrate_controller.h b/modules/audio_coding/audio_network_adaptor/bitrate_controller.h index 282f599b6d..6b6330b030 100644 --- a/modules/audio_coding/audio_network_adaptor/bitrate_controller.h +++ b/modules/audio_coding/audio_network_adaptor/bitrate_controller.h @@ -11,7 +11,11 @@ #ifndef MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_BITRATE_CONTROLLER_H_ #define MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_BITRATE_CONTROLLER_H_ +#include + +#include "absl/types/optional.h" #include "modules/audio_coding/audio_network_adaptor/controller.h" +#include "modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor_config.h" #include "rtc_base/constructormagic.h" namespace webrtc { diff --git a/modules/audio_coding/audio_network_adaptor/channel_controller.h b/modules/audio_coding/audio_network_adaptor/channel_controller.h index 23cbef663b..0d775b1c77 100644 --- a/modules/audio_coding/audio_network_adaptor/channel_controller.h +++ b/modules/audio_coding/audio_network_adaptor/channel_controller.h @@ -11,7 +11,11 @@ #ifndef MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_CHANNEL_CONTROLLER_H_ #define MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_CHANNEL_CONTROLLER_H_ +#include + +#include "absl/types/optional.h" #include "modules/audio_coding/audio_network_adaptor/controller.h" +#include "modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor_config.h" #include "rtc_base/constructormagic.h" namespace webrtc { diff --git a/modules/audio_coding/audio_network_adaptor/debug_dump_writer.cc b/modules/audio_coding/audio_network_adaptor/debug_dump_writer.cc index 818362ed0d..8e04e8eafc 100644 --- a/modules/audio_coding/audio_network_adaptor/debug_dump_writer.cc +++ b/modules/audio_coding/audio_network_adaptor/debug_dump_writer.cc @@ -10,10 +10,12 @@ #include "modules/audio_coding/audio_network_adaptor/debug_dump_writer.h" +#include "absl/types/optional.h" #include "rtc_base/checks.h" #include "rtc_base/ignore_wundef.h" #include "rtc_base/numerics/safe_conversions.h" #include "rtc_base/protobuf_utils.h" +#include "rtc_base/system/file_wrapper.h" #if WEBRTC_ENABLE_PROTOBUF RTC_PUSH_IGNORING_WUNDEF() diff --git a/modules/audio_coding/audio_network_adaptor/dtx_controller.h b/modules/audio_coding/audio_network_adaptor/dtx_controller.h index fb40db28b2..d3334eca9e 100644 --- a/modules/audio_coding/audio_network_adaptor/dtx_controller.h +++ b/modules/audio_coding/audio_network_adaptor/dtx_controller.h @@ -11,7 +11,9 @@ #ifndef MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_DTX_CONTROLLER_H_ #define MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_DTX_CONTROLLER_H_ +#include "absl/types/optional.h" #include "modules/audio_coding/audio_network_adaptor/controller.h" +#include "modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor_config.h" #include "rtc_base/constructormagic.h" namespace webrtc { diff --git a/modules/audio_coding/audio_network_adaptor/event_log_writer.cc b/modules/audio_coding/audio_network_adaptor/event_log_writer.cc index 4a92343d96..7925b89127 100644 --- a/modules/audio_coding/audio_network_adaptor/event_log_writer.cc +++ b/modules/audio_coding/audio_network_adaptor/event_log_writer.cc @@ -9,13 +9,17 @@ */ #include - #include +#include +#include #include "absl/memory/memory.h" +#include "absl/types/optional.h" +#include "logging/rtc_event_log/events/rtc_event.h" #include "logging/rtc_event_log/events/rtc_event_audio_network_adaptation.h" #include "logging/rtc_event_log/rtc_event_log.h" #include "modules/audio_coding/audio_network_adaptor/event_log_writer.h" +#include "rtc_base/checks.h" namespace webrtc { diff --git a/modules/audio_coding/audio_network_adaptor/event_log_writer.h b/modules/audio_coding/audio_network_adaptor/event_log_writer.h index fca8e53b66..72b5245e11 100644 --- a/modules/audio_coding/audio_network_adaptor/event_log_writer.h +++ b/modules/audio_coding/audio_network_adaptor/event_log_writer.h @@ -11,7 +11,7 @@ #ifndef MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_EVENT_LOG_WRITER_H_ #define MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_EVENT_LOG_WRITER_H_ -#include "modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor.h" +#include "modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor_config.h" #include "rtc_base/constructormagic.h" namespace webrtc { diff --git a/modules/audio_coding/audio_network_adaptor/fec_controller_plr_based.cc b/modules/audio_coding/audio_network_adaptor/fec_controller_plr_based.cc index 7ab72c9437..936e22429a 100644 --- a/modules/audio_coding/audio_network_adaptor/fec_controller_plr_based.cc +++ b/modules/audio_coding/audio_network_adaptor/fec_controller_plr_based.cc @@ -10,7 +10,7 @@ #include "modules/audio_coding/audio_network_adaptor/fec_controller_plr_based.h" -#include +#include #include #include "rtc_base/checks.h" diff --git a/modules/audio_coding/audio_network_adaptor/fec_controller_plr_based.h b/modules/audio_coding/audio_network_adaptor/fec_controller_plr_based.h index b66883ef55..b7d3d56173 100644 --- a/modules/audio_coding/audio_network_adaptor/fec_controller_plr_based.h +++ b/modules/audio_coding/audio_network_adaptor/fec_controller_plr_based.h @@ -13,8 +13,10 @@ #include +#include "absl/types/optional.h" #include "common_audio/smoothing_filter.h" #include "modules/audio_coding/audio_network_adaptor/controller.h" +#include "modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor_config.h" #include "modules/audio_coding/audio_network_adaptor/util/threshold_curve.h" #include "rtc_base/constructormagic.h" diff --git a/modules/audio_coding/audio_network_adaptor/fec_controller_rplr_based.cc b/modules/audio_coding/audio_network_adaptor/fec_controller_rplr_based.cc index c8cfd31607..6c30b8f2c0 100644 --- a/modules/audio_coding/audio_network_adaptor/fec_controller_rplr_based.cc +++ b/modules/audio_coding/audio_network_adaptor/fec_controller_rplr_based.cc @@ -10,9 +10,6 @@ #include "modules/audio_coding/audio_network_adaptor/fec_controller_rplr_based.h" -#include -#include - #include "rtc_base/checks.h" namespace webrtc { diff --git a/modules/audio_coding/audio_network_adaptor/fec_controller_rplr_based.h b/modules/audio_coding/audio_network_adaptor/fec_controller_rplr_based.h index 9a3c37c3d1..421cb70abd 100644 --- a/modules/audio_coding/audio_network_adaptor/fec_controller_rplr_based.h +++ b/modules/audio_coding/audio_network_adaptor/fec_controller_rplr_based.h @@ -11,9 +11,9 @@ #ifndef MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_FEC_CONTROLLER_RPLR_BASED_H_ #define MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_FEC_CONTROLLER_RPLR_BASED_H_ -#include - +#include "absl/types/optional.h" #include "modules/audio_coding/audio_network_adaptor/controller.h" +#include "modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor_config.h" #include "modules/audio_coding/audio_network_adaptor/util/threshold_curve.h" #include "rtc_base/constructormagic.h" diff --git a/modules/audio_coding/audio_network_adaptor/frame_length_controller.cc b/modules/audio_coding/audio_network_adaptor/frame_length_controller.cc index 40e97cb371..b123c7c70e 100644 --- a/modules/audio_coding/audio_network_adaptor/frame_length_controller.cc +++ b/modules/audio_coding/audio_network_adaptor/frame_length_controller.cc @@ -11,10 +11,10 @@ #include "modules/audio_coding/audio_network_adaptor/frame_length_controller.h" #include +#include #include #include "rtc_base/checks.h" -#include "rtc_base/logging.h" namespace webrtc { diff --git a/modules/audio_coding/audio_network_adaptor/frame_length_controller.h b/modules/audio_coding/audio_network_adaptor/frame_length_controller.h index f084fd0382..f0a5aaba9a 100644 --- a/modules/audio_coding/audio_network_adaptor/frame_length_controller.h +++ b/modules/audio_coding/audio_network_adaptor/frame_length_controller.h @@ -11,10 +11,13 @@ #ifndef MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_FRAME_LENGTH_CONTROLLER_H_ #define MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_FRAME_LENGTH_CONTROLLER_H_ +#include #include #include +#include "absl/types/optional.h" #include "modules/audio_coding/audio_network_adaptor/controller.h" +#include "modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor_config.h" #include "rtc_base/constructormagic.h" namespace webrtc { diff --git a/modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor_config.h b/modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor_config.h index 257a79af18..94e8ed961e 100644 --- a/modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor_config.h +++ b/modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor_config.h @@ -11,6 +11,8 @@ #ifndef MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_INCLUDE_AUDIO_NETWORK_ADAPTOR_CONFIG_H_ #define MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_INCLUDE_AUDIO_NETWORK_ADAPTOR_CONFIG_H_ +#include + #include "absl/types/optional.h" namespace webrtc { diff --git a/modules/audio_coding/codecs/audio_format_conversion.cc b/modules/audio_coding/codecs/audio_format_conversion.cc index bf99f8a823..f068301adf 100644 --- a/modules/audio_coding/codecs/audio_format_conversion.cc +++ b/modules/audio_coding/codecs/audio_format_conversion.cc @@ -11,12 +11,12 @@ #include "modules/audio_coding/codecs/audio_format_conversion.h" #include +#include +#include #include "absl/strings/match.h" -#include "absl/types/optional.h" #include "api/array_view.h" #include "rtc_base/checks.h" -#include "rtc_base/numerics/safe_conversions.h" #include "rtc_base/sanitizer.h" namespace webrtc { diff --git a/modules/audio_coding/codecs/cng/audio_encoder_cng.cc b/modules/audio_coding/codecs/cng/audio_encoder_cng.cc index 4cda3401fa..cb89216e4e 100644 --- a/modules/audio_coding/codecs/cng/audio_encoder_cng.cc +++ b/modules/audio_coding/codecs/cng/audio_encoder_cng.cc @@ -10,11 +10,13 @@ #include "modules/audio_coding/codecs/cng/audio_encoder_cng.h" -#include -#include +#include #include #include +#include "modules/audio_coding/codecs/cng/webrtc_cng.h" +#include "rtc_base/checks.h" + namespace webrtc { namespace { diff --git a/modules/audio_coding/codecs/cng/audio_encoder_cng.h b/modules/audio_coding/codecs/cng/audio_encoder_cng.h index e4c6507765..67bea7c5a8 100644 --- a/modules/audio_coding/codecs/cng/audio_encoder_cng.h +++ b/modules/audio_coding/codecs/cng/audio_encoder_cng.h @@ -11,17 +11,21 @@ #ifndef MODULES_AUDIO_CODING_CODECS_CNG_AUDIO_ENCODER_CNG_H_ #define MODULES_AUDIO_CODING_CODECS_CNG_AUDIO_ENCODER_CNG_H_ +#include +#include #include #include +#include "absl/types/optional.h" +#include "api/array_view.h" #include "api/audio_codecs/audio_encoder.h" #include "common_audio/vad/include/vad.h" -#include "modules/audio_coding/codecs/cng/webrtc_cng.h" +#include "rtc_base/buffer.h" #include "rtc_base/constructormagic.h" namespace webrtc { -class Vad; +class ComfortNoiseEncoder; class AudioEncoderCng final : public AudioEncoder { public: diff --git a/modules/audio_coding/codecs/cng/webrtc_cng.cc b/modules/audio_coding/codecs/cng/webrtc_cng.cc index a07b093b3c..f18fb28e98 100644 --- a/modules/audio_coding/codecs/cng/webrtc_cng.cc +++ b/modules/audio_coding/codecs/cng/webrtc_cng.cc @@ -13,6 +13,7 @@ #include #include "common_audio/signal_processing/include/signal_processing_library.h" +#include "rtc_base/checks.h" #include "rtc_base/numerics/safe_conversions.h" namespace webrtc { diff --git a/modules/audio_coding/codecs/cng/webrtc_cng.h b/modules/audio_coding/codecs/cng/webrtc_cng.h index 3f8fadcd71..6ff75298af 100644 --- a/modules/audio_coding/codecs/cng/webrtc_cng.h +++ b/modules/audio_coding/codecs/cng/webrtc_cng.h @@ -11,6 +11,7 @@ #ifndef MODULES_AUDIO_CODING_CODECS_CNG_WEBRTC_CNG_H_ #define MODULES_AUDIO_CODING_CODECS_CNG_WEBRTC_CNG_H_ +#include #include #include "api/array_view.h" diff --git a/modules/audio_coding/codecs/g711/audio_decoder_pcm.cc b/modules/audio_coding/codecs/g711/audio_decoder_pcm.cc index 25f495f39d..d580a0509b 100644 --- a/modules/audio_coding/codecs/g711/audio_decoder_pcm.cc +++ b/modules/audio_coding/codecs/g711/audio_decoder_pcm.cc @@ -10,6 +10,8 @@ #include "modules/audio_coding/codecs/g711/audio_decoder_pcm.h" +#include + #include "modules/audio_coding/codecs/g711/g711_interface.h" #include "modules/audio_coding/codecs/legacy_encoded_audio_frame.h" diff --git a/modules/audio_coding/codecs/g711/audio_decoder_pcm.h b/modules/audio_coding/codecs/g711/audio_decoder_pcm.h index 29e4fa6593..9a01b8aff4 100644 --- a/modules/audio_coding/codecs/g711/audio_decoder_pcm.h +++ b/modules/audio_coding/codecs/g711/audio_decoder_pcm.h @@ -11,7 +11,12 @@ #ifndef MODULES_AUDIO_CODING_CODECS_G711_AUDIO_DECODER_PCM_H_ #define MODULES_AUDIO_CODING_CODECS_G711_AUDIO_DECODER_PCM_H_ +#include +#include +#include + #include "api/audio_codecs/audio_decoder.h" +#include "rtc_base/buffer.h" #include "rtc_base/checks.h" #include "rtc_base/constructormagic.h" diff --git a/modules/audio_coding/codecs/g711/audio_encoder_pcm.cc b/modules/audio_coding/codecs/g711/audio_encoder_pcm.cc index c14287ed48..dce16358ef 100644 --- a/modules/audio_coding/codecs/g711/audio_encoder_pcm.cc +++ b/modules/audio_coding/codecs/g711/audio_encoder_pcm.cc @@ -10,10 +10,9 @@ #include "modules/audio_coding/codecs/g711/audio_encoder_pcm.h" -#include -#include +#include -#include "common_types.h" // NOLINT(build/include) +#include "common_types.h" #include "modules/audio_coding/codecs/g711/g711_interface.h" #include "rtc_base/checks.h" diff --git a/modules/audio_coding/codecs/g722/audio_decoder_g722.cc b/modules/audio_coding/codecs/g722/audio_decoder_g722.cc index ea4a721b12..4de55a0bb5 100644 --- a/modules/audio_coding/codecs/g722/audio_decoder_g722.cc +++ b/modules/audio_coding/codecs/g722/audio_decoder_g722.cc @@ -11,6 +11,7 @@ #include "modules/audio_coding/codecs/g722/audio_decoder_g722.h" #include +#include #include "modules/audio_coding/codecs/g722/g722_interface.h" #include "modules/audio_coding/codecs/legacy_encoded_audio_frame.h" diff --git a/modules/audio_coding/codecs/g722/audio_encoder_g722.cc b/modules/audio_coding/codecs/g722/audio_encoder_g722.cc index cb96c3c17e..e63d590309 100644 --- a/modules/audio_coding/codecs/g722/audio_encoder_g722.cc +++ b/modules/audio_coding/codecs/g722/audio_encoder_g722.cc @@ -10,10 +10,9 @@ #include "modules/audio_coding/codecs/g722/audio_encoder_g722.h" -#include +#include -#include -#include "common_types.h" // NOLINT(build/include) +#include "common_types.h" #include "modules/audio_coding/codecs/g722/g722_interface.h" #include "rtc_base/checks.h" #include "rtc_base/numerics/safe_conversions.h" diff --git a/modules/audio_coding/codecs/ilbc/audio_decoder_ilbc.cc b/modules/audio_coding/codecs/ilbc/audio_decoder_ilbc.cc index 9e58ce03ca..57b5abbe23 100644 --- a/modules/audio_coding/codecs/ilbc/audio_decoder_ilbc.cc +++ b/modules/audio_coding/codecs/ilbc/audio_decoder_ilbc.cc @@ -10,6 +10,7 @@ #include "modules/audio_coding/codecs/ilbc/audio_decoder_ilbc.h" +#include #include #include "modules/audio_coding/codecs/ilbc/ilbc.h" diff --git a/modules/audio_coding/codecs/ilbc/audio_decoder_ilbc.h b/modules/audio_coding/codecs/ilbc/audio_decoder_ilbc.h index edb65d09c6..fcb2074dc9 100644 --- a/modules/audio_coding/codecs/ilbc/audio_decoder_ilbc.h +++ b/modules/audio_coding/codecs/ilbc/audio_decoder_ilbc.h @@ -11,7 +11,12 @@ #ifndef MODULES_AUDIO_CODING_CODECS_ILBC_AUDIO_DECODER_ILBC_H_ #define MODULES_AUDIO_CODING_CODECS_ILBC_AUDIO_DECODER_ILBC_H_ +#include +#include +#include + #include "api/audio_codecs/audio_decoder.h" +#include "rtc_base/buffer.h" #include "rtc_base/constructormagic.h" typedef struct iLBC_decinst_t_ IlbcDecoderInstance; diff --git a/modules/audio_coding/codecs/ilbc/audio_encoder_ilbc.cc b/modules/audio_coding/codecs/ilbc/audio_encoder_ilbc.cc index 84695e3763..8801fd5559 100644 --- a/modules/audio_coding/codecs/ilbc/audio_encoder_ilbc.cc +++ b/modules/audio_coding/codecs/ilbc/audio_encoder_ilbc.cc @@ -11,8 +11,9 @@ #include "modules/audio_coding/codecs/ilbc/audio_encoder_ilbc.h" #include -#include -#include "common_types.h" // NOLINT(build/include) +#include + +#include "common_types.h" #include "modules/audio_coding/codecs/ilbc/ilbc.h" #include "rtc_base/checks.h" #include "rtc_base/numerics/safe_conversions.h" diff --git a/modules/audio_coding/codecs/legacy_encoded_audio_frame.cc b/modules/audio_coding/codecs/legacy_encoded_audio_frame.cc index 0bf3b19a3b..d9efc211da 100644 --- a/modules/audio_coding/codecs/legacy_encoded_audio_frame.cc +++ b/modules/audio_coding/codecs/legacy_encoded_audio_frame.cc @@ -14,6 +14,8 @@ #include #include +#include "rtc_base/checks.h" + namespace webrtc { LegacyEncodedAudioFrame::LegacyEncodedAudioFrame(AudioDecoder* decoder, diff --git a/modules/audio_coding/codecs/legacy_encoded_audio_frame.h b/modules/audio_coding/codecs/legacy_encoded_audio_frame.h index 05d4fe489c..41b08f7898 100644 --- a/modules/audio_coding/codecs/legacy_encoded_audio_frame.h +++ b/modules/audio_coding/codecs/legacy_encoded_audio_frame.h @@ -11,10 +11,14 @@ #ifndef MODULES_AUDIO_CODING_CODECS_LEGACY_ENCODED_AUDIO_FRAME_H_ #define MODULES_AUDIO_CODING_CODECS_LEGACY_ENCODED_AUDIO_FRAME_H_ +#include +#include #include +#include "absl/types/optional.h" #include "api/array_view.h" #include "api/audio_codecs/audio_decoder.h" +#include "rtc_base/buffer.h" namespace webrtc { diff --git a/modules/audio_coding/codecs/opus/audio_decoder_opus.cc b/modules/audio_coding/codecs/opus/audio_decoder_opus.cc index 302b714031..357cb1a20d 100644 --- a/modules/audio_coding/codecs/opus/audio_decoder_opus.cc +++ b/modules/audio_coding/codecs/opus/audio_decoder_opus.cc @@ -10,8 +10,11 @@ #include "modules/audio_coding/codecs/opus/audio_decoder_opus.h" +#include #include +#include "absl/types/optional.h" +#include "api/array_view.h" #include "rtc_base/checks.h" namespace webrtc { diff --git a/modules/audio_coding/codecs/opus/audio_decoder_opus.h b/modules/audio_coding/codecs/opus/audio_decoder_opus.h index 70aa40bdc4..8043425243 100644 --- a/modules/audio_coding/codecs/opus/audio_decoder_opus.h +++ b/modules/audio_coding/codecs/opus/audio_decoder_opus.h @@ -11,8 +11,13 @@ #ifndef MODULES_AUDIO_CODING_CODECS_OPUS_AUDIO_DECODER_OPUS_H_ #define MODULES_AUDIO_CODING_CODECS_OPUS_AUDIO_DECODER_OPUS_H_ +#include +#include +#include + #include "api/audio_codecs/audio_decoder.h" #include "modules/audio_coding/codecs/opus/opus_interface.h" +#include "rtc_base/buffer.h" #include "rtc_base/constructormagic.h" namespace webrtc { diff --git a/modules/audio_coding/codecs/opus/audio_encoder_opus.cc b/modules/audio_coding/codecs/opus/audio_encoder_opus.cc index f1aaf70b38..adc66565d2 100644 --- a/modules/audio_coding/codecs/opus/audio_encoder_opus.cc +++ b/modules/audio_coding/codecs/opus/audio_encoder_opus.cc @@ -16,6 +16,7 @@ #include "absl/memory/memory.h" #include "absl/strings/match.h" +#include "common_types.h" #include "modules/audio_coding/audio_network_adaptor/audio_network_adaptor_impl.h" #include "modules/audio_coding/audio_network_adaptor/controller_manager.h" #include "modules/audio_coding/codecs/opus/opus_interface.h" diff --git a/modules/audio_coding/codecs/pcm16b/audio_decoder_pcm16b.cc b/modules/audio_coding/codecs/pcm16b/audio_decoder_pcm16b.cc index b07624dffc..1dd2ff289e 100644 --- a/modules/audio_coding/codecs/pcm16b/audio_decoder_pcm16b.cc +++ b/modules/audio_coding/codecs/pcm16b/audio_decoder_pcm16b.cc @@ -10,6 +10,8 @@ #include "modules/audio_coding/codecs/pcm16b/audio_decoder_pcm16b.h" +#include + #include "modules/audio_coding/codecs/legacy_encoded_audio_frame.h" #include "modules/audio_coding/codecs/pcm16b/pcm16b.h" #include "rtc_base/checks.h" diff --git a/modules/audio_coding/codecs/pcm16b/audio_decoder_pcm16b.h b/modules/audio_coding/codecs/pcm16b/audio_decoder_pcm16b.h index 7d234224e3..9b478d806f 100644 --- a/modules/audio_coding/codecs/pcm16b/audio_decoder_pcm16b.h +++ b/modules/audio_coding/codecs/pcm16b/audio_decoder_pcm16b.h @@ -11,7 +11,12 @@ #ifndef MODULES_AUDIO_CODING_CODECS_PCM16B_AUDIO_DECODER_PCM16B_H_ #define MODULES_AUDIO_CODING_CODECS_PCM16B_AUDIO_DECODER_PCM16B_H_ +#include +#include +#include + #include "api/audio_codecs/audio_decoder.h" +#include "rtc_base/buffer.h" #include "rtc_base/constructormagic.h" namespace webrtc { diff --git a/modules/audio_coding/codecs/pcm16b/audio_encoder_pcm16b.cc b/modules/audio_coding/codecs/pcm16b/audio_encoder_pcm16b.cc index 831daedc63..106ab16794 100644 --- a/modules/audio_coding/codecs/pcm16b/audio_encoder_pcm16b.cc +++ b/modules/audio_coding/codecs/pcm16b/audio_encoder_pcm16b.cc @@ -10,12 +10,9 @@ #include "modules/audio_coding/codecs/pcm16b/audio_encoder_pcm16b.h" -#include - -#include "common_types.h" // NOLINT(build/include) +#include "common_types.h" #include "modules/audio_coding/codecs/pcm16b/pcm16b.h" #include "rtc_base/checks.h" -#include "rtc_base/numerics/safe_conversions.h" namespace webrtc { diff --git a/modules/audio_coding/codecs/pcm16b/pcm16b_common.cc b/modules/audio_coding/codecs/pcm16b/pcm16b_common.cc index 6d0fc2d015..8f8bba527b 100644 --- a/modules/audio_coding/codecs/pcm16b/pcm16b_common.cc +++ b/modules/audio_coding/codecs/pcm16b/pcm16b_common.cc @@ -10,6 +10,9 @@ #include "modules/audio_coding/codecs/pcm16b/pcm16b_common.h" +#include +#include + namespace webrtc { void Pcm16BAppendSupportedCodecSpecs(std::vector* specs) { diff --git a/modules/audio_coding/codecs/pcm16b/pcm16b_common.h b/modules/audio_coding/codecs/pcm16b/pcm16b_common.h index 980a996408..3fae717ff3 100644 --- a/modules/audio_coding/codecs/pcm16b/pcm16b_common.h +++ b/modules/audio_coding/codecs/pcm16b/pcm16b_common.h @@ -13,7 +13,7 @@ #include -#include "api/audio_codecs/audio_decoder_factory.h" +#include "api/audio_codecs/audio_format.h" namespace webrtc { void Pcm16BAppendSupportedCodecSpecs(std::vector* specs); diff --git a/modules/audio_coding/codecs/red/audio_encoder_copy_red.cc b/modules/audio_coding/codecs/red/audio_encoder_copy_red.cc index 2601f26e44..124e811981 100644 --- a/modules/audio_coding/codecs/red/audio_encoder_copy_red.cc +++ b/modules/audio_coding/codecs/red/audio_encoder_copy_red.cc @@ -11,8 +11,8 @@ #include "modules/audio_coding/codecs/red/audio_encoder_copy_red.h" #include - #include +#include #include "rtc_base/checks.h" diff --git a/modules/audio_coding/codecs/red/audio_encoder_copy_red.h b/modules/audio_coding/codecs/red/audio_encoder_copy_red.h index 492ee3afb4..5a68876b89 100644 --- a/modules/audio_coding/codecs/red/audio_encoder_copy_red.h +++ b/modules/audio_coding/codecs/red/audio_encoder_copy_red.h @@ -11,9 +11,12 @@ #ifndef MODULES_AUDIO_CODING_CODECS_RED_AUDIO_ENCODER_COPY_RED_H_ #define MODULES_AUDIO_CODING_CODECS_RED_AUDIO_ENCODER_COPY_RED_H_ +#include +#include #include -#include +#include "absl/types/optional.h" +#include "api/array_view.h" #include "api/audio_codecs/audio_encoder.h" #include "rtc_base/buffer.h" #include "rtc_base/constructormagic.h" diff --git a/modules/audio_coding/neteq/accelerate.cc b/modules/audio_coding/neteq/accelerate.cc index 18350b0a78..6161a8f91b 100644 --- a/modules/audio_coding/neteq/accelerate.cc +++ b/modules/audio_coding/neteq/accelerate.cc @@ -10,7 +10,10 @@ #include "modules/audio_coding/neteq/accelerate.h" -#include "common_audio/signal_processing/include/signal_processing_library.h" +#include + +#include "api/array_view.h" +#include "modules/audio_coding/neteq/audio_multi_vector.h" namespace webrtc { diff --git a/modules/audio_coding/neteq/accelerate.h b/modules/audio_coding/neteq/accelerate.h index 560956895b..1a3af42b2e 100644 --- a/modules/audio_coding/neteq/accelerate.h +++ b/modules/audio_coding/neteq/accelerate.h @@ -11,13 +11,15 @@ #ifndef MODULES_AUDIO_CODING_NETEQ_ACCELERATE_H_ #define MODULES_AUDIO_CODING_NETEQ_ACCELERATE_H_ -#include "modules/audio_coding/neteq/audio_multi_vector.h" +#include +#include + #include "modules/audio_coding/neteq/time_stretch.h" #include "rtc_base/constructormagic.h" namespace webrtc { -// Forward declarations. +class AudioMultiVector; class BackgroundNoise; // This class implements the Accelerate operation. Most of the work is done diff --git a/modules/audio_coding/neteq/audio_multi_vector.h b/modules/audio_coding/neteq/audio_multi_vector.h index 86f82820ca..a2dd3c3cb1 100644 --- a/modules/audio_coding/neteq/audio_multi_vector.h +++ b/modules/audio_coding/neteq/audio_multi_vector.h @@ -11,8 +11,8 @@ #ifndef MODULES_AUDIO_CODING_NETEQ_AUDIO_MULTI_VECTOR_H_ #define MODULES_AUDIO_CODING_NETEQ_AUDIO_MULTI_VECTOR_H_ -#include // Access to size_t. - +#include +#include #include #include "api/array_view.h" diff --git a/modules/audio_coding/neteq/audio_vector.h b/modules/audio_coding/neteq/audio_vector.h index 825a3bceac..d0db332db6 100644 --- a/modules/audio_coding/neteq/audio_vector.h +++ b/modules/audio_coding/neteq/audio_vector.h @@ -11,7 +11,8 @@ #ifndef MODULES_AUDIO_CODING_NETEQ_AUDIO_VECTOR_H_ #define MODULES_AUDIO_CODING_NETEQ_AUDIO_VECTOR_H_ -#include // Access to size_t. +#include +#include #include #include "rtc_base/checks.h" diff --git a/modules/audio_coding/neteq/background_noise.h b/modules/audio_coding/neteq/background_noise.h index 58eecaa705..84d7eb9d74 100644 --- a/modules/audio_coding/neteq/background_noise.h +++ b/modules/audio_coding/neteq/background_noise.h @@ -14,13 +14,12 @@ #include // size_t #include -#include "modules/audio_coding/neteq/audio_multi_vector.h" -#include "modules/audio_coding/neteq/include/neteq.h" #include "rtc_base/constructormagic.h" namespace webrtc { // Forward declarations. +class AudioMultiVector; class PostDecodeVad; // This class handles estimation of background noise parameters. diff --git a/modules/audio_coding/neteq/buffer_level_filter.cc b/modules/audio_coding/neteq/buffer_level_filter.cc index 6e8da0a01b..2f96618536 100644 --- a/modules/audio_coding/neteq/buffer_level_filter.cc +++ b/modules/audio_coding/neteq/buffer_level_filter.cc @@ -10,7 +10,8 @@ #include "modules/audio_coding/neteq/buffer_level_filter.h" -#include // Provide access to std::max. +#include +#include #include "rtc_base/numerics/safe_conversions.h" diff --git a/modules/audio_coding/neteq/comfort_noise.cc b/modules/audio_coding/neteq/comfort_noise.cc index b341acd5a5..cb2b74dbf2 100644 --- a/modules/audio_coding/neteq/comfort_noise.cc +++ b/modules/audio_coding/neteq/comfort_noise.cc @@ -11,11 +11,18 @@ #include "modules/audio_coding/neteq/comfort_noise.h" #include +#include +#include -#include "api/audio_codecs/audio_decoder.h" +#include "api/array_view.h" +#include "modules/audio_coding/codecs/cng/webrtc_cng.h" +#include "modules/audio_coding/neteq/audio_multi_vector.h" +#include "modules/audio_coding/neteq/audio_vector.h" #include "modules/audio_coding/neteq/decoder_database.h" #include "modules/audio_coding/neteq/dsp_helper.h" #include "modules/audio_coding/neteq/sync_buffer.h" +#include "rtc_base/buffer.h" +#include "rtc_base/checks.h" #include "rtc_base/logging.h" namespace webrtc { diff --git a/modules/audio_coding/neteq/comfort_noise.h b/modules/audio_coding/neteq/comfort_noise.h index 5169124040..3a9bfde7aa 100644 --- a/modules/audio_coding/neteq/comfort_noise.h +++ b/modules/audio_coding/neteq/comfort_noise.h @@ -11,12 +11,14 @@ #ifndef MODULES_AUDIO_CODING_NETEQ_COMFORT_NOISE_H_ #define MODULES_AUDIO_CODING_NETEQ_COMFORT_NOISE_H_ -#include "modules/audio_coding/neteq/audio_multi_vector.h" +#include + #include "rtc_base/constructormagic.h" namespace webrtc { // Forward declarations. +class AudioMultiVector; class DecoderDatabase; class SyncBuffer; struct Packet; diff --git a/modules/audio_coding/neteq/cross_correlation.h b/modules/audio_coding/neteq/cross_correlation.h index a747772cfc..9ce8be83ae 100644 --- a/modules/audio_coding/neteq/cross_correlation.h +++ b/modules/audio_coding/neteq/cross_correlation.h @@ -11,7 +11,8 @@ #ifndef MODULES_AUDIO_CODING_NETEQ_CROSS_CORRELATION_H_ #define MODULES_AUDIO_CODING_NETEQ_CROSS_CORRELATION_H_ -#include "common_types.h" // NOLINT(build/include) +#include +#include namespace webrtc { diff --git a/modules/audio_coding/neteq/decision_logic.cc b/modules/audio_coding/neteq/decision_logic.cc index 349fdab9f1..83c2b3b90c 100644 --- a/modules/audio_coding/neteq/decision_logic.cc +++ b/modules/audio_coding/neteq/decision_logic.cc @@ -11,8 +11,8 @@ #include "modules/audio_coding/neteq/decision_logic.h" #include -#include -#include +#include +#include #include "modules/audio_coding/neteq/buffer_level_filter.h" #include "modules/audio_coding/neteq/decoder_database.h" @@ -20,8 +20,9 @@ #include "modules/audio_coding/neteq/expand.h" #include "modules/audio_coding/neteq/packet_buffer.h" #include "modules/audio_coding/neteq/sync_buffer.h" -#include "modules/include/module_common_types.h" +#include "rtc_base/checks.h" #include "rtc_base/logging.h" +#include "rtc_base/numerics/safe_conversions.h" #include "system_wrappers/include/field_trial.h" namespace { diff --git a/modules/audio_coding/neteq/decision_logic.h b/modules/audio_coding/neteq/decision_logic.h index 39761da070..2a533594b3 100644 --- a/modules/audio_coding/neteq/decision_logic.h +++ b/modules/audio_coding/neteq/decision_logic.h @@ -12,7 +12,6 @@ #define MODULES_AUDIO_CODING_NETEQ_DECISION_LOGIC_H_ #include "modules/audio_coding/neteq/defines.h" -#include "modules/audio_coding/neteq/include/neteq.h" #include "modules/audio_coding/neteq/tick_timer.h" #include "rtc_base/constructormagic.h" diff --git a/modules/audio_coding/neteq/decoder_database.cc b/modules/audio_coding/neteq/decoder_database.cc index bd5d7197a9..0890beb934 100644 --- a/modules/audio_coding/neteq/decoder_database.cc +++ b/modules/audio_coding/neteq/decoder_database.cc @@ -10,10 +10,15 @@ #include "modules/audio_coding/neteq/decoder_database.h" -#include // pair +#include +#include +#include +#include +#include #include "absl/strings/match.h" #include "api/audio_codecs/audio_decoder.h" +#include "common_types.h" #include "rtc_base/checks.h" #include "rtc_base/logging.h" #include "rtc_base/strings/audio_format_to_string.h" diff --git a/modules/audio_coding/neteq/delay_manager.cc b/modules/audio_coding/neteq/delay_manager.cc index e5eb592efa..628812a251 100644 --- a/modules/audio_coding/neteq/delay_manager.cc +++ b/modules/audio_coding/neteq/delay_manager.cc @@ -11,14 +11,15 @@ #include "modules/audio_coding/neteq/delay_manager.h" #include -#include - -#include // max, min +#include +#include +#include #include +#include -#include "common_audio/signal_processing/include/signal_processing_library.h" #include "modules/audio_coding/neteq/delay_peak_detector.h" -#include "modules/include/module_common_types.h" +#include "modules/include/module_common_types_public.h" +#include "rtc_base/checks.h" #include "rtc_base/logging.h" #include "rtc_base/numerics/safe_conversions.h" #include "system_wrappers/include/field_trial.h" diff --git a/modules/audio_coding/neteq/delay_peak_detector.cc b/modules/audio_coding/neteq/delay_peak_detector.cc index eb9f6d530d..893ce3e8fd 100644 --- a/modules/audio_coding/neteq/delay_peak_detector.cc +++ b/modules/audio_coding/neteq/delay_peak_detector.cc @@ -10,10 +10,9 @@ #include "modules/audio_coding/neteq/delay_peak_detector.h" -#include // max +#include #include "rtc_base/checks.h" -#include "rtc_base/numerics/safe_conversions.h" #include "system_wrappers/include/field_trial.h" namespace webrtc { diff --git a/modules/audio_coding/neteq/delay_peak_detector.h b/modules/audio_coding/neteq/delay_peak_detector.h index 9defca5ad0..272d50ed50 100644 --- a/modules/audio_coding/neteq/delay_peak_detector.h +++ b/modules/audio_coding/neteq/delay_peak_detector.h @@ -11,8 +11,8 @@ #ifndef MODULES_AUDIO_CODING_NETEQ_DELAY_PEAK_DETECTOR_H_ #define MODULES_AUDIO_CODING_NETEQ_DELAY_PEAK_DETECTOR_H_ -#include // size_t - +#include +#include #include #include diff --git a/modules/audio_coding/neteq/dsp_helper.h b/modules/audio_coding/neteq/dsp_helper.h index efa2f9ce06..83794612c5 100644 --- a/modules/audio_coding/neteq/dsp_helper.h +++ b/modules/audio_coding/neteq/dsp_helper.h @@ -11,9 +11,11 @@ #ifndef MODULES_AUDIO_CODING_NETEQ_DSP_HELPER_H_ #define MODULES_AUDIO_CODING_NETEQ_DSP_HELPER_H_ -#include // Access to size_t. +#include +#include #include "modules/audio_coding/neteq/audio_multi_vector.h" +#include "modules/audio_coding/neteq/audio_vector.h" #include "rtc_base/constructormagic.h" namespace webrtc { diff --git a/modules/audio_coding/neteq/dtmf_buffer.h b/modules/audio_coding/neteq/dtmf_buffer.h index 6de512772f..24b14ece41 100644 --- a/modules/audio_coding/neteq/dtmf_buffer.h +++ b/modules/audio_coding/neteq/dtmf_buffer.h @@ -11,8 +11,9 @@ #ifndef MODULES_AUDIO_CODING_NETEQ_DTMF_BUFFER_H_ #define MODULES_AUDIO_CODING_NETEQ_DTMF_BUFFER_H_ +#include +#include #include -#include // size_t #include "rtc_base/constructormagic.h" diff --git a/modules/audio_coding/neteq/dtmf_tone_generator.cc b/modules/audio_coding/neteq/dtmf_tone_generator.cc index 6fdb95aaca..6c412e364d 100644 --- a/modules/audio_coding/neteq/dtmf_tone_generator.cc +++ b/modules/audio_coding/neteq/dtmf_tone_generator.cc @@ -30,6 +30,7 @@ #include "modules/audio_coding/neteq/dtmf_tone_generator.h" +#include "modules/audio_coding/neteq/audio_vector.h" #include "rtc_base/arraysize.h" #include "rtc_base/checks.h" diff --git a/modules/audio_coding/neteq/dtmf_tone_generator.h b/modules/audio_coding/neteq/dtmf_tone_generator.h index a773ff353d..22e166ef0c 100644 --- a/modules/audio_coding/neteq/dtmf_tone_generator.h +++ b/modules/audio_coding/neteq/dtmf_tone_generator.h @@ -11,6 +11,9 @@ #ifndef MODULES_AUDIO_CODING_NETEQ_DTMF_TONE_GENERATOR_H_ #define MODULES_AUDIO_CODING_NETEQ_DTMF_TONE_GENERATOR_H_ +#include +#include + #include "modules/audio_coding/neteq/audio_multi_vector.h" #include "rtc_base/constructormagic.h" diff --git a/modules/audio_coding/neteq/expand.cc b/modules/audio_coding/neteq/expand.cc index 5f671ada6b..97ce529770 100644 --- a/modules/audio_coding/neteq/expand.cc +++ b/modules/audio_coding/neteq/expand.cc @@ -17,6 +17,7 @@ #include // numeric_limits #include "common_audio/signal_processing/include/signal_processing_library.h" +#include "modules/audio_coding/neteq/audio_multi_vector.h" #include "modules/audio_coding/neteq/background_noise.h" #include "modules/audio_coding/neteq/cross_correlation.h" #include "modules/audio_coding/neteq/dsp_helper.h" diff --git a/modules/audio_coding/neteq/expand.h b/modules/audio_coding/neteq/expand.h index 4cfe7b9d8c..30c34a2c30 100644 --- a/modules/audio_coding/neteq/expand.h +++ b/modules/audio_coding/neteq/expand.h @@ -14,12 +14,13 @@ #include #include -#include "modules/audio_coding/neteq/audio_multi_vector.h" +#include "modules/audio_coding/neteq/audio_vector.h" #include "rtc_base/constructormagic.h" namespace webrtc { // Forward declarations. +class AudioMultiVector; class BackgroundNoise; class RandomVector; class StatisticsCalculator; diff --git a/modules/audio_coding/neteq/expand_uma_logger.h b/modules/audio_coding/neteq/expand_uma_logger.h index 00907d4e5a..bd079c6ab7 100644 --- a/modules/audio_coding/neteq/expand_uma_logger.h +++ b/modules/audio_coding/neteq/expand_uma_logger.h @@ -10,6 +10,7 @@ #ifndef MODULES_AUDIO_CODING_NETEQ_EXPAND_UMA_LOGGER_H_ #define MODULES_AUDIO_CODING_NETEQ_EXPAND_UMA_LOGGER_H_ +#include #include #include diff --git a/modules/audio_coding/neteq/nack_tracker.cc b/modules/audio_coding/neteq/nack_tracker.cc index c62cdf88e4..e3ecfeaed2 100644 --- a/modules/audio_coding/neteq/nack_tracker.cc +++ b/modules/audio_coding/neteq/nack_tracker.cc @@ -10,9 +10,9 @@ #include "modules/audio_coding/neteq/nack_tracker.h" -#include // For assert. - -#include // For std::max. +#include +#include +#include #include "rtc_base/checks.h" diff --git a/modules/audio_coding/neteq/nack_tracker.h b/modules/audio_coding/neteq/nack_tracker.h index 1936a944cc..d7c6b08422 100644 --- a/modules/audio_coding/neteq/nack_tracker.h +++ b/modules/audio_coding/neteq/nack_tracker.h @@ -11,11 +11,12 @@ #ifndef MODULES_AUDIO_CODING_NETEQ_NACK_TRACKER_H_ #define MODULES_AUDIO_CODING_NETEQ_NACK_TRACKER_H_ +#include +#include #include #include -#include "modules/audio_coding/include/audio_coding_module_typedefs.h" -#include "modules/include/module_common_types.h" +#include "modules/include/module_common_types_public.h" #include "rtc_base/gtest_prod_util.h" // diff --git a/modules/audio_coding/neteq/neteq.cc b/modules/audio_coding/neteq/neteq.cc index cf1c6aa665..0e6147e232 100644 --- a/modules/audio_coding/neteq/neteq.cc +++ b/modules/audio_coding/neteq/neteq.cc @@ -10,8 +10,6 @@ #include "modules/audio_coding/neteq/include/neteq.h" -#include - #include "modules/audio_coding/neteq/neteq_impl.h" #include "rtc_base/strings/string_builder.h" diff --git a/modules/audio_coding/neteq/neteq_impl.cc b/modules/audio_coding/neteq/neteq_impl.cc index f428be1c3b..6a2cbae066 100644 --- a/modules/audio_coding/neteq/neteq_impl.cc +++ b/modules/audio_coding/neteq/neteq_impl.cc @@ -11,13 +11,16 @@ #include "modules/audio_coding/neteq/neteq_impl.h" #include - #include +#include +#include +#include #include #include #include "api/audio_codecs/audio_decoder.h" #include "common_audio/signal_processing/include/signal_processing_library.h" +#include "modules/audio_coding/codecs/cng/webrtc_cng.h" #include "modules/audio_coding/neteq/accelerate.h" #include "modules/audio_coding/neteq/background_noise.h" #include "modules/audio_coding/neteq/buffer_level_filter.h" @@ -40,15 +43,14 @@ #include "modules/audio_coding/neteq/red_payload_splitter.h" #include "modules/audio_coding/neteq/sync_buffer.h" #include "modules/audio_coding/neteq/tick_timer.h" +#include "modules/audio_coding/neteq/time_stretch.h" #include "modules/audio_coding/neteq/timestamp_scaler.h" #include "rtc_base/checks.h" #include "rtc_base/logging.h" #include "rtc_base/numerics/safe_conversions.h" #include "rtc_base/sanitizer.h" #include "rtc_base/strings/audio_format_to_string.h" -#include "rtc_base/system/fallthrough.h" #include "rtc_base/trace_event.h" -#include "system_wrappers/include/field_trial.h" namespace webrtc { diff --git a/modules/audio_coding/neteq/neteq_impl.h b/modules/audio_coding/neteq/neteq_impl.h index 8ef97ce0af..36990fb670 100644 --- a/modules/audio_coding/neteq/neteq_impl.h +++ b/modules/audio_coding/neteq/neteq_impl.h @@ -17,10 +17,10 @@ #include "absl/types/optional.h" #include "api/audio/audio_frame.h" #include "modules/audio_coding/neteq/audio_multi_vector.h" -#include "modules/audio_coding/neteq/defines.h" +#include "modules/audio_coding/neteq/defines.h" // Modes, Operations #include "modules/audio_coding/neteq/expand_uma_logger.h" #include "modules/audio_coding/neteq/include/neteq.h" -#include "modules/audio_coding/neteq/packet.h" // Declare PacketList. +#include "modules/audio_coding/neteq/packet.h" #include "modules/audio_coding/neteq/random_vector.h" #include "modules/audio_coding/neteq/rtcp.h" #include "modules/audio_coding/neteq/statistics_calculator.h" diff --git a/modules/audio_coding/neteq/normal.h b/modules/audio_coding/neteq/normal.h index b13f16e50d..80451b5007 100644 --- a/modules/audio_coding/neteq/normal.h +++ b/modules/audio_coding/neteq/normal.h @@ -11,11 +11,9 @@ #ifndef MODULES_AUDIO_CODING_NETEQ_NORMAL_H_ #define MODULES_AUDIO_CODING_NETEQ_NORMAL_H_ +#include #include // Access to size_t. -#include - -#include "modules/audio_coding/neteq/audio_multi_vector.h" #include "modules/audio_coding/neteq/defines.h" #include "rtc_base/checks.h" #include "rtc_base/constructormagic.h" @@ -24,6 +22,7 @@ namespace webrtc { // Forward declarations. +class AudioMultiVector; class BackgroundNoise; class DecoderDatabase; class Expand; diff --git a/modules/audio_coding/neteq/packet.h b/modules/audio_coding/neteq/packet.h index 45c56e1b68..358d8fa1ab 100644 --- a/modules/audio_coding/neteq/packet.h +++ b/modules/audio_coding/neteq/packet.h @@ -11,12 +11,14 @@ #ifndef MODULES_AUDIO_CODING_NETEQ_PACKET_H_ #define MODULES_AUDIO_CODING_NETEQ_PACKET_H_ +#include #include #include #include "api/audio_codecs/audio_decoder.h" #include "modules/audio_coding/neteq/tick_timer.h" #include "rtc_base/buffer.h" +#include "rtc_base/checks.h" namespace webrtc { diff --git a/modules/audio_coding/neteq/packet_buffer.cc b/modules/audio_coding/neteq/packet_buffer.cc index eba4d3e68b..7b70dee019 100644 --- a/modules/audio_coding/neteq/packet_buffer.cc +++ b/modules/audio_coding/neteq/packet_buffer.cc @@ -14,12 +14,17 @@ #include "modules/audio_coding/neteq/packet_buffer.h" -#include // find_if() +#include +#include +#include +#include +#include #include "api/audio_codecs/audio_decoder.h" #include "modules/audio_coding/neteq/decoder_database.h" #include "modules/audio_coding/neteq/statistics_calculator.h" #include "modules/audio_coding/neteq/tick_timer.h" +#include "rtc_base/checks.h" #include "rtc_base/logging.h" namespace webrtc { diff --git a/modules/audio_coding/neteq/packet_buffer.h b/modules/audio_coding/neteq/packet_buffer.h index 7e34c1e9fc..269b957578 100644 --- a/modules/audio_coding/neteq/packet_buffer.h +++ b/modules/audio_coding/neteq/packet_buffer.h @@ -14,7 +14,7 @@ #include "absl/types/optional.h" #include "modules/audio_coding/neteq/decoder_database.h" #include "modules/audio_coding/neteq/packet.h" -#include "modules/include/module_common_types.h" +#include "modules/include/module_common_types_public.h" // IsNewerTimestamp #include "rtc_base/constructormagic.h" namespace webrtc { diff --git a/modules/audio_coding/neteq/post_decode_vad.h b/modules/audio_coding/neteq/post_decode_vad.h index ad4f0823bb..27d69a6eeb 100644 --- a/modules/audio_coding/neteq/post_decode_vad.h +++ b/modules/audio_coding/neteq/post_decode_vad.h @@ -11,13 +11,11 @@ #ifndef MODULES_AUDIO_CODING_NETEQ_POST_DECODE_VAD_H_ #define MODULES_AUDIO_CODING_NETEQ_POST_DECODE_VAD_H_ -#include // size_t +#include +#include #include "api/audio_codecs/audio_decoder.h" #include "common_audio/vad/include/webrtc_vad.h" -#include "common_types.h" // NOLINT(build/include) // NULL -#include "modules/audio_coding/neteq/defines.h" -#include "modules/audio_coding/neteq/packet.h" #include "rtc_base/constructormagic.h" namespace webrtc { diff --git a/modules/audio_coding/neteq/preemptive_expand.cc b/modules/audio_coding/neteq/preemptive_expand.cc index 6159a9cb15..cad8d6a50f 100644 --- a/modules/audio_coding/neteq/preemptive_expand.cc +++ b/modules/audio_coding/neteq/preemptive_expand.cc @@ -10,9 +10,11 @@ #include "modules/audio_coding/neteq/preemptive_expand.h" -#include // min, max +#include -#include "common_audio/signal_processing/include/signal_processing_library.h" +#include "api/array_view.h" +#include "modules/audio_coding/neteq/audio_multi_vector.h" +#include "modules/audio_coding/neteq/time_stretch.h" namespace webrtc { diff --git a/modules/audio_coding/neteq/preemptive_expand.h b/modules/audio_coding/neteq/preemptive_expand.h index ace648f15c..0f7b3bc8ac 100644 --- a/modules/audio_coding/neteq/preemptive_expand.h +++ b/modules/audio_coding/neteq/preemptive_expand.h @@ -11,13 +11,15 @@ #ifndef MODULES_AUDIO_CODING_NETEQ_PREEMPTIVE_EXPAND_H_ #define MODULES_AUDIO_CODING_NETEQ_PREEMPTIVE_EXPAND_H_ -#include "modules/audio_coding/neteq/audio_multi_vector.h" +#include +#include + #include "modules/audio_coding/neteq/time_stretch.h" #include "rtc_base/constructormagic.h" namespace webrtc { -// Forward declarations. +class AudioMultiVector; class BackgroundNoise; // This class implements the PreemptiveExpand operation. Most of the work is diff --git a/modules/audio_coding/neteq/red_payload_splitter.cc b/modules/audio_coding/neteq/red_payload_splitter.cc index f5435e8eab..2dfe8386ff 100644 --- a/modules/audio_coding/neteq/red_payload_splitter.cc +++ b/modules/audio_coding/neteq/red_payload_splitter.cc @@ -11,10 +11,15 @@ #include "modules/audio_coding/neteq/red_payload_splitter.h" #include +#include +#include +#include +#include #include #include "modules/audio_coding/neteq/decoder_database.h" -#include "rtc_base/checks.h" +#include "modules/audio_coding/neteq/packet.h" +#include "rtc_base/buffer.h" #include "rtc_base/logging.h" #include "rtc_base/numerics/safe_conversions.h" diff --git a/modules/audio_coding/neteq/red_payload_splitter.h b/modules/audio_coding/neteq/red_payload_splitter.h index 5e239ddc70..55063e7417 100644 --- a/modules/audio_coding/neteq/red_payload_splitter.h +++ b/modules/audio_coding/neteq/red_payload_splitter.h @@ -16,7 +16,6 @@ namespace webrtc { -// Forward declarations. class DecoderDatabase; // This class handles splitting of RED payloads into smaller parts. diff --git a/modules/audio_coding/neteq/rtcp.cc b/modules/audio_coding/neteq/rtcp.cc index 551eb5f75b..65193370dc 100644 --- a/modules/audio_coding/neteq/rtcp.cc +++ b/modules/audio_coding/neteq/rtcp.cc @@ -10,10 +10,12 @@ #include "modules/audio_coding/neteq/rtcp.h" -#include -#include - #include +#include + +#include "api/rtp_headers.h" +#include "common_types.h" +#include "rtc_base/checks.h" namespace webrtc { diff --git a/modules/audio_coding/neteq/rtcp.h b/modules/audio_coding/neteq/rtcp.h index b1de7eb7f4..60c2673103 100644 --- a/modules/audio_coding/neteq/rtcp.h +++ b/modules/audio_coding/neteq/rtcp.h @@ -11,12 +11,13 @@ #ifndef MODULES_AUDIO_CODING_NETEQ_RTCP_H_ #define MODULES_AUDIO_CODING_NETEQ_RTCP_H_ -#include "modules/audio_coding/neteq/include/neteq.h" +#include + #include "rtc_base/constructormagic.h" namespace webrtc { -// Forward declaration. +struct RtcpStatistics; struct RTPHeader; class Rtcp { diff --git a/modules/audio_coding/neteq/sync_buffer.h b/modules/audio_coding/neteq/sync_buffer.h index 72e320c61f..d645e9163e 100644 --- a/modules/audio_coding/neteq/sync_buffer.h +++ b/modules/audio_coding/neteq/sync_buffer.h @@ -11,8 +11,13 @@ #ifndef MODULES_AUDIO_CODING_NETEQ_SYNC_BUFFER_H_ #define MODULES_AUDIO_CODING_NETEQ_SYNC_BUFFER_H_ +#include +#include +#include + #include "api/audio/audio_frame.h" #include "modules/audio_coding/neteq/audio_multi_vector.h" +#include "modules/audio_coding/neteq/audio_vector.h" #include "rtc_base/buffer.h" #include "rtc_base/constructormagic.h" diff --git a/modules/audio_coding/neteq/tick_timer.h b/modules/audio_coding/neteq/tick_timer.h index 520099e346..02f083e02e 100644 --- a/modules/audio_coding/neteq/tick_timer.h +++ b/modules/audio_coding/neteq/tick_timer.h @@ -11,6 +11,7 @@ #ifndef MODULES_AUDIO_CODING_NETEQ_TICK_TIMER_H_ #define MODULES_AUDIO_CODING_NETEQ_TICK_TIMER_H_ +#include #include #include "rtc_base/checks.h" diff --git a/modules/audio_coding/neteq/timestamp_scaler.cc b/modules/audio_coding/neteq/timestamp_scaler.cc index 07d945edce..b0461bb92d 100644 --- a/modules/audio_coding/neteq/timestamp_scaler.cc +++ b/modules/audio_coding/neteq/timestamp_scaler.cc @@ -10,6 +10,7 @@ #include "modules/audio_coding/neteq/timestamp_scaler.h" +#include "api/audio_codecs/audio_format.h" #include "modules/audio_coding/neteq/decoder_database.h" #include "rtc_base/checks.h" diff --git a/modules/audio_device/audio_device_buffer.cc b/modules/audio_device/audio_device_buffer.cc index 5c45780426..8f920cfff8 100644 --- a/modules/audio_device/audio_device_buffer.cc +++ b/modules/audio_device/audio_device_buffer.cc @@ -8,19 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include +#include #include - -#include "modules/audio_device/audio_device_buffer.h" +#include +#include #include "common_audio/signal_processing/include/signal_processing_library.h" -#include "modules/audio_device/audio_device_config.h" -#include "rtc_base/arraysize.h" +#include "modules/audio_device/audio_device_buffer.h" #include "rtc_base/bind.h" #include "rtc_base/checks.h" -#include "rtc_base/format_macros.h" #include "rtc_base/logging.h" -#include "rtc_base/numerics/safe_conversions.h" #include "rtc_base/timeutils.h" #include "system_wrappers/include/metrics.h" diff --git a/modules/audio_device/audio_device_buffer.h b/modules/audio_device/audio_device_buffer.h index 7f0cf83baf..bbe2969d43 100644 --- a/modules/audio_device/audio_device_buffer.h +++ b/modules/audio_device/audio_device_buffer.h @@ -11,9 +11,11 @@ #ifndef MODULES_AUDIO_DEVICE_AUDIO_DEVICE_BUFFER_H_ #define MODULES_AUDIO_DEVICE_AUDIO_DEVICE_BUFFER_H_ +#include +#include #include -#include "modules/audio_device/include/audio_device.h" +#include "modules/audio_device/include/audio_device_defines.h" #include "rtc_base/buffer.h" #include "rtc_base/criticalsection.h" #include "rtc_base/task_queue.h" diff --git a/modules/audio_device/audio_device_data_observer.cc b/modules/audio_device/audio_device_data_observer.cc index 723d1c8bbd..994c2efdf3 100644 --- a/modules/audio_device/audio_device_data_observer.cc +++ b/modules/audio_device/audio_device_data_observer.cc @@ -9,6 +9,8 @@ */ #include "modules/audio_device/include/audio_device_data_observer.h" + +#include "modules/audio_device/include/audio_device_defines.h" #include "rtc_base/checks.h" #include "rtc_base/refcountedobject.h" diff --git a/modules/audio_device/audio_device_generic.h b/modules/audio_device/audio_device_generic.h index be9c072c41..7d3c83e119 100644 --- a/modules/audio_device/audio_device_generic.h +++ b/modules/audio_device/audio_device_generic.h @@ -11,8 +11,11 @@ #ifndef AUDIO_DEVICE_AUDIO_DEVICE_GENERIC_H_ #define AUDIO_DEVICE_AUDIO_DEVICE_GENERIC_H_ +#include + #include "modules/audio_device/audio_device_buffer.h" #include "modules/audio_device/include/audio_device.h" +#include "modules/audio_device/include/audio_device_defines.h" namespace webrtc { diff --git a/modules/audio_device/audio_device_impl.cc b/modules/audio_device/audio_device_impl.cc index 91d6208fe1..31d5b5ecfc 100644 --- a/modules/audio_device/audio_device_impl.cc +++ b/modules/audio_device/audio_device_impl.cc @@ -10,12 +10,14 @@ #include "modules/audio_device/audio_device_impl.h" -#include "modules/audio_device/audio_device_config.h" +#include + +#include "modules/audio_device/audio_device_config.h" // IWYU pragma: keep #include "modules/audio_device/audio_device_generic.h" #include "rtc_base/checks.h" #include "rtc_base/logging.h" -#include "rtc_base/refcount.h" #include "rtc_base/refcountedobject.h" +#include "rtc_base/scoped_ref_ptr.h" #include "system_wrappers/include/metrics.h" #if defined(_WIN32) @@ -47,10 +49,10 @@ #include "modules/audio_device/mac/audio_device_mac.h" #endif #if defined(WEBRTC_DUMMY_FILE_DEVICES) +#include "modules/audio_device/dummy/file_audio_device.h" #include "modules/audio_device/dummy/file_audio_device_factory.h" #endif #include "modules/audio_device/dummy/audio_device_dummy.h" -#include "modules/audio_device/dummy/file_audio_device.h" #define CHECKinitialized_() \ { \ diff --git a/modules/audio_device/audio_device_impl.h b/modules/audio_device/audio_device_impl.h index 481cdf32e0..afe53b3240 100644 --- a/modules/audio_device/audio_device_impl.h +++ b/modules/audio_device/audio_device_impl.h @@ -13,12 +13,11 @@ #if defined(WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE) +#include #include #include "modules/audio_device/audio_device_buffer.h" #include "modules/audio_device/include/audio_device.h" -#include "rtc_base/checks.h" -#include "rtc_base/criticalsection.h" namespace webrtc { diff --git a/modules/audio_device/dummy/audio_device_dummy.h b/modules/audio_device/dummy/audio_device_dummy.h index d709f77691..2a2541098e 100644 --- a/modules/audio_device/dummy/audio_device_dummy.h +++ b/modules/audio_device/dummy/audio_device_dummy.h @@ -11,9 +11,12 @@ #ifndef AUDIO_DEVICE_AUDIO_DEVICE_DUMMY_H_ #define AUDIO_DEVICE_AUDIO_DEVICE_DUMMY_H_ -#include +#include +#include "modules/audio_device/audio_device_buffer.h" #include "modules/audio_device/audio_device_generic.h" +#include "modules/audio_device/include/audio_device.h" +#include "modules/audio_device/include/audio_device_defines.h" namespace webrtc { diff --git a/modules/audio_device/dummy/file_audio_device.cc b/modules/audio_device/dummy/file_audio_device.cc index b9aeaa1506..2848eeae35 100644 --- a/modules/audio_device/dummy/file_audio_device.cc +++ b/modules/audio_device/dummy/file_audio_device.cc @@ -9,9 +9,13 @@ */ #include "modules/audio_device/dummy/file_audio_device.h" + +#include + #include "rtc_base/checks.h" #include "rtc_base/logging.h" #include "rtc_base/platform_thread.h" +#include "rtc_base/timeutils.h" #include "system_wrappers/include/sleep.h" namespace webrtc { diff --git a/modules/audio_device/dummy/file_audio_device_factory.cc b/modules/audio_device/dummy/file_audio_device_factory.cc index 6b38d8bc05..027b13bf5c 100644 --- a/modules/audio_device/dummy/file_audio_device_factory.cc +++ b/modules/audio_device/dummy/file_audio_device_factory.cc @@ -10,8 +10,8 @@ #include "modules/audio_device/dummy/file_audio_device_factory.h" +#include #include -#include #include "modules/audio_device/dummy/file_audio_device.h" #include "rtc_base/logging.h" diff --git a/modules/audio_device/dummy/file_audio_device_factory.h b/modules/audio_device/dummy/file_audio_device_factory.h index 9cd5b3d625..72f4ab2b38 100644 --- a/modules/audio_device/dummy/file_audio_device_factory.h +++ b/modules/audio_device/dummy/file_audio_device_factory.h @@ -11,7 +11,7 @@ #ifndef AUDIO_DEVICE_FILE_AUDIO_DEVICE_FACTORY_H_ #define AUDIO_DEVICE_FILE_AUDIO_DEVICE_FACTORY_H_ -#include "common_types.h" // NOLINT(build/include) +#include namespace webrtc { diff --git a/modules/audio_device/fine_audio_buffer.cc b/modules/audio_device/fine_audio_buffer.cc index 4af344aef3..b4f3c371ac 100644 --- a/modules/audio_device/fine_audio_buffer.cc +++ b/modules/audio_device/fine_audio_buffer.cc @@ -10,6 +10,9 @@ #include "modules/audio_device/fine_audio_buffer.h" +#include +#include + #include "modules/audio_device/audio_device_buffer.h" #include "rtc_base/checks.h" #include "rtc_base/logging.h" diff --git a/modules/audio_device/include/audio_device_data_observer.h b/modules/audio_device/include/audio_device_data_observer.h index 3a4ee99518..959cfa4662 100644 --- a/modules/audio_device/include/audio_device_data_observer.h +++ b/modules/audio_device/include/audio_device_data_observer.h @@ -11,6 +11,9 @@ #ifndef MODULES_AUDIO_DEVICE_INCLUDE_AUDIO_DEVICE_DATA_OBSERVER_H_ #define MODULES_AUDIO_DEVICE_INCLUDE_AUDIO_DEVICE_DATA_OBSERVER_H_ +#include +#include + #include "modules/audio_device/include/audio_device.h" #include "rtc_base/scoped_ref_ptr.h" diff --git a/modules/audio_device/include/test_audio_device.cc b/modules/audio_device/include/test_audio_device.cc index 7d55c47529..ea59247b78 100644 --- a/modules/audio_device/include/test_audio_device.cc +++ b/modules/audio_device/include/test_audio_device.cc @@ -8,8 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ #include +#include +#include #include #include +#include #include #include @@ -28,6 +31,7 @@ #include "rtc_base/random.h" #include "rtc_base/refcountedobject.h" #include "rtc_base/thread.h" +#include "rtc_base/thread_annotations.h" #include "rtc_base/timeutils.h" namespace webrtc { diff --git a/modules/audio_device/include/test_audio_device.h b/modules/audio_device/include/test_audio_device.h index 7d034dce8c..93f0b13601 100644 --- a/modules/audio_device/include/test_audio_device.h +++ b/modules/audio_device/include/test_audio_device.h @@ -10,14 +10,18 @@ #ifndef MODULES_AUDIO_DEVICE_INCLUDE_TEST_AUDIO_DEVICE_H_ #define MODULES_AUDIO_DEVICE_INCLUDE_TEST_AUDIO_DEVICE_H_ +#include +#include #include #include -#include +#include "api/array_view.h" #include "modules/audio_device/include/audio_device.h" +#include "modules/audio_device/include/audio_device_defines.h" #include "rtc_base/buffer.h" #include "rtc_base/event.h" #include "rtc_base/platform_file.h" +#include "rtc_base/scoped_ref_ptr.h" namespace webrtc { diff --git a/modules/audio_device/linux/audio_device_pulse_linux.cc b/modules/audio_device/linux/audio_device_pulse_linux.cc index 2157af328c..feff883495 100644 --- a/modules/audio_device/linux/audio_device_pulse_linux.cc +++ b/modules/audio_device/linux/audio_device_pulse_linux.cc @@ -8,8 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "modules/audio_device/audio_device_config.h" +#include + #include "modules/audio_device/linux/audio_device_pulse_linux.h" +#include "modules/audio_device/linux/latebindingsymboltable_linux.h" #include "rtc_base/checks.h" #include "rtc_base/logging.h" #include "system_wrappers/include/event_wrapper.h" diff --git a/modules/audio_device/linux/audio_device_pulse_linux.h b/modules/audio_device/linux/audio_device_pulse_linux.h index 1655b18117..263ed75add 100644 --- a/modules/audio_device/linux/audio_device_pulse_linux.h +++ b/modules/audio_device/linux/audio_device_pulse_linux.h @@ -13,10 +13,15 @@ #include +#include "modules/audio_device/audio_device_buffer.h" #include "modules/audio_device/audio_device_generic.h" +#include "modules/audio_device/include/audio_device.h" +#include "modules/audio_device/include/audio_device_defines.h" #include "modules/audio_device/linux/audio_mixer_manager_pulse_linux.h" +#include "modules/audio_device/linux/pulseaudiosymboltable_linux.h" #include "rtc_base/criticalsection.h" #include "rtc_base/platform_thread.h" +#include "rtc_base/thread_annotations.h" #include "rtc_base/thread_checker.h" #if defined(WEBRTC_USE_X11) @@ -24,6 +29,8 @@ #endif #include +#include +#include // We define this flag if it's missing from our headers, because we want to be // able to compile against old headers but still use PA_STREAM_ADJUST_LATENCY diff --git a/modules/audio_device/linux/audio_mixer_manager_pulse_linux.cc b/modules/audio_device/linux/audio_mixer_manager_pulse_linux.cc index 5ba923bb91..22e10407de 100644 --- a/modules/audio_device/linux/audio_mixer_manager_pulse_linux.cc +++ b/modules/audio_device/linux/audio_mixer_manager_pulse_linux.cc @@ -8,8 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ +#include + #include "modules/audio_device/linux/audio_device_pulse_linux.h" #include "modules/audio_device/linux/audio_mixer_manager_pulse_linux.h" +#include "modules/audio_device/linux/latebindingsymboltable_linux.h" +#include "modules/audio_device/linux/pulseaudiosymboltable_linux.h" #include "rtc_base/checks.h" #include "rtc_base/logging.h" diff --git a/modules/audio_device/linux/audio_mixer_manager_pulse_linux.h b/modules/audio_device/linux/audio_mixer_manager_pulse_linux.h index c5460b6237..679d1b4b7c 100644 --- a/modules/audio_device/linux/audio_mixer_manager_pulse_linux.h +++ b/modules/audio_device/linux/audio_mixer_manager_pulse_linux.h @@ -11,13 +11,11 @@ #ifndef AUDIO_DEVICE_AUDIO_MIXER_MANAGER_PULSE_LINUX_H_ #define AUDIO_DEVICE_AUDIO_MIXER_MANAGER_PULSE_LINUX_H_ -#include "modules/audio_device/include/audio_device.h" -#include "modules/audio_device/linux/pulseaudiosymboltable_linux.h" -#include "rtc_base/thread_checker.h" - #include #include +#include "rtc_base/thread_checker.h" + #ifndef UINT32_MAX #define UINT32_MAX ((uint32_t)-1) #endif diff --git a/modules/audio_processing/aec/aec_core.cc b/modules/audio_processing/aec/aec_core.cc index 5a8cf8f58b..62b8ad0f7c 100644 --- a/modules/audio_processing/aec/aec_core.cc +++ b/modules/audio_processing/aec/aec_core.cc @@ -21,6 +21,7 @@ #include #include "rtc_base/checks.h" + extern "C" { #include "common_audio/ring_buffer.h" } @@ -29,7 +30,6 @@ extern "C" { #include "modules/audio_processing/aec/aec_core_optimized_methods.h" #include "modules/audio_processing/logging/apm_data_dumper.h" #include "modules/audio_processing/utility/delay_estimator_wrapper.h" -#include "rtc_base/checks.h" #include "rtc_base/system/arch.h" #include "system_wrappers/include/cpu_features_wrapper.h" #include "system_wrappers/include/metrics.h" diff --git a/modules/audio_processing/aec/aec_resampler.cc b/modules/audio_processing/aec/aec_resampler.cc index 2851c0b6dd..210c2bebe0 100644 --- a/modules/audio_processing/aec/aec_resampler.cc +++ b/modules/audio_processing/aec/aec_resampler.cc @@ -14,7 +14,6 @@ #include "modules/audio_processing/aec/aec_resampler.h" -#include #include #include diff --git a/modules/audio_processing/aec/aec_resampler.h b/modules/audio_processing/aec/aec_resampler.h index 130f7ec7c7..a112c434d0 100644 --- a/modules/audio_processing/aec/aec_resampler.h +++ b/modules/audio_processing/aec/aec_resampler.h @@ -11,6 +11,8 @@ #ifndef MODULES_AUDIO_PROCESSING_AEC_AEC_RESAMPLER_H_ #define MODULES_AUDIO_PROCESSING_AEC_AEC_RESAMPLER_H_ +#include + #include "modules/audio_processing/aec/aec_core.h" namespace webrtc { diff --git a/modules/audio_processing/aec3/adaptive_fir_filter.cc b/modules/audio_processing/aec3/adaptive_fir_filter.cc index abe68f8900..3ab1ebcc4b 100644 --- a/modules/audio_processing/aec3/adaptive_fir_filter.cc +++ b/modules/audio_processing/aec3/adaptive_fir_filter.cc @@ -24,7 +24,6 @@ #include "modules/audio_processing/aec3/fft_data.h" #include "rtc_base/checks.h" -#include "rtc_base/logging.h" #include "system_wrappers/include/field_trial.h" namespace webrtc { diff --git a/modules/audio_processing/aec3/adaptive_fir_filter.h b/modules/audio_processing/aec3/adaptive_fir_filter.h index f9d3f1a908..7c832a6cd2 100644 --- a/modules/audio_processing/aec3/adaptive_fir_filter.h +++ b/modules/audio_processing/aec3/adaptive_fir_filter.h @@ -11,8 +11,8 @@ #ifndef MODULES_AUDIO_PROCESSING_AEC3_ADAPTIVE_FIR_FILTER_H_ #define MODULES_AUDIO_PROCESSING_AEC3_ADAPTIVE_FIR_FILTER_H_ +#include #include -#include #include #include "api/array_view.h" diff --git a/modules/audio_processing/aec3/aec3_common.cc b/modules/audio_processing/aec3/aec3_common.cc index c374a3517d..aeb848a570 100644 --- a/modules/audio_processing/aec3/aec3_common.cc +++ b/modules/audio_processing/aec3/aec3_common.cc @@ -10,10 +10,11 @@ #include "modules/audio_processing/aec3/aec3_common.h" -#include "system_wrappers/include/cpu_features_wrapper.h" +#include #include "rtc_base/checks.h" #include "rtc_base/system/arch.h" +#include "system_wrappers/include/cpu_features_wrapper.h" namespace webrtc { diff --git a/modules/audio_processing/aec3/aec3_fft.cc b/modules/audio_processing/aec3/aec3_fft.cc index e29434d300..1832101855 100644 --- a/modules/audio_processing/aec3/aec3_fft.cc +++ b/modules/audio_processing/aec3/aec3_fft.cc @@ -12,6 +12,7 @@ #include #include +#include #include "rtc_base/checks.h" diff --git a/modules/audio_processing/aec3/aec3_fft.h b/modules/audio_processing/aec3/aec3_fft.h index b70022255d..6cd649af8f 100644 --- a/modules/audio_processing/aec3/aec3_fft.h +++ b/modules/audio_processing/aec3/aec3_fft.h @@ -17,6 +17,7 @@ #include "modules/audio_processing/aec3/aec3_common.h" #include "modules/audio_processing/aec3/fft_data.h" #include "modules/audio_processing/utility/ooura_fft.h" +#include "rtc_base/checks.h" #include "rtc_base/constructormagic.h" namespace webrtc { diff --git a/modules/audio_processing/aec3/aec_state.cc b/modules/audio_processing/aec3/aec_state.cc index f44c744660..0eeb7ebca0 100644 --- a/modules/audio_processing/aec3/aec_state.cc +++ b/modules/audio_processing/aec3/aec_state.cc @@ -11,7 +11,7 @@ #include "modules/audio_processing/aec3/aec_state.h" #include - +#include #include #include diff --git a/modules/audio_processing/aec3/aec_state.h b/modules/audio_processing/aec3/aec_state.h index 74aa3ab621..c9d9cf3f3a 100644 --- a/modules/audio_processing/aec3/aec_state.h +++ b/modules/audio_processing/aec3/aec_state.h @@ -11,9 +11,8 @@ #ifndef MODULES_AUDIO_PROCESSING_AEC3_AEC_STATE_H_ #define MODULES_AUDIO_PROCESSING_AEC3_AEC_STATE_H_ -#include - -#include +#include +#include #include #include diff --git a/modules/audio_processing/aec3/block_delay_buffer.h b/modules/audio_processing/aec3/block_delay_buffer.h index 6e5fd5c09d..624e9139a3 100644 --- a/modules/audio_processing/aec3/block_delay_buffer.h +++ b/modules/audio_processing/aec3/block_delay_buffer.h @@ -11,6 +11,7 @@ #ifndef MODULES_AUDIO_PROCESSING_AEC3_BLOCK_DELAY_BUFFER_H_ #define MODULES_AUDIO_PROCESSING_AEC3_BLOCK_DELAY_BUFFER_H_ +#include #include #include "modules/audio_processing/audio_buffer.h" diff --git a/modules/audio_processing/aec3/block_framer.cc b/modules/audio_processing/aec3/block_framer.cc index 3160624515..ca7667c24f 100644 --- a/modules/audio_processing/aec3/block_framer.cc +++ b/modules/audio_processing/aec3/block_framer.cc @@ -12,6 +12,7 @@ #include +#include "modules/audio_processing/aec3/aec3_common.h" #include "rtc_base/checks.h" namespace webrtc { diff --git a/modules/audio_processing/aec3/block_processor.cc b/modules/audio_processing/aec3/block_processor.cc index 0465c4e5ab..4f57902e7d 100644 --- a/modules/audio_processing/aec3/block_processor.cc +++ b/modules/audio_processing/aec3/block_processor.cc @@ -9,12 +9,16 @@ */ #include "modules/audio_processing/aec3/block_processor.h" +#include + #include "absl/types/optional.h" #include "modules/audio_processing/aec3/aec3_common.h" #include "modules/audio_processing/aec3/block_processor_metrics.h" +#include "modules/audio_processing/aec3/delay_estimate.h" #include "modules/audio_processing/aec3/echo_path_variability.h" #include "modules/audio_processing/logging/apm_data_dumper.h" #include "rtc_base/atomicops.h" +#include "rtc_base/checks.h" #include "rtc_base/constructormagic.h" #include "rtc_base/logging.h" diff --git a/modules/audio_processing/aec3/block_processor.h b/modules/audio_processing/aec3/block_processor.h index 8793a03802..5f7ec7c17c 100644 --- a/modules/audio_processing/aec3/block_processor.h +++ b/modules/audio_processing/aec3/block_processor.h @@ -11,9 +11,12 @@ #ifndef MODULES_AUDIO_PROCESSING_AEC3_BLOCK_PROCESSOR_H_ #define MODULES_AUDIO_PROCESSING_AEC3_BLOCK_PROCESSOR_H_ +#include #include #include +#include "api/audio/echo_canceller3_config.h" +#include "api/audio/echo_control.h" #include "modules/audio_processing/aec3/echo_remover.h" #include "modules/audio_processing/aec3/render_delay_buffer.h" #include "modules/audio_processing/aec3/render_delay_controller.h" diff --git a/modules/audio_processing/aec3/block_processor2.cc b/modules/audio_processing/aec3/block_processor2.cc index 1d80519740..5fa5abe7e9 100644 --- a/modules/audio_processing/aec3/block_processor2.cc +++ b/modules/audio_processing/aec3/block_processor2.cc @@ -7,14 +7,25 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#include "modules/audio_processing/aec3/block_processor.h" +#include +#include +#include +#include #include "absl/types/optional.h" +#include "api/audio/echo_canceller3_config.h" +#include "api/audio/echo_control.h" #include "modules/audio_processing/aec3/aec3_common.h" +#include "modules/audio_processing/aec3/block_processor.h" #include "modules/audio_processing/aec3/block_processor_metrics.h" +#include "modules/audio_processing/aec3/delay_estimate.h" #include "modules/audio_processing/aec3/echo_path_variability.h" +#include "modules/audio_processing/aec3/echo_remover.h" +#include "modules/audio_processing/aec3/render_delay_buffer.h" +#include "modules/audio_processing/aec3/render_delay_controller.h" #include "modules/audio_processing/logging/apm_data_dumper.h" #include "rtc_base/atomicops.h" +#include "rtc_base/checks.h" #include "rtc_base/logging.h" namespace webrtc { diff --git a/modules/audio_processing/aec3/block_processor_metrics.cc b/modules/audio_processing/aec3/block_processor_metrics.cc index c8bdda7389..deac1fcd22 100644 --- a/modules/audio_processing/aec3/block_processor_metrics.cc +++ b/modules/audio_processing/aec3/block_processor_metrics.cc @@ -11,6 +11,7 @@ #include "modules/audio_processing/aec3/block_processor_metrics.h" #include "modules/audio_processing/aec3/aec3_common.h" +#include "rtc_base/checks.h" #include "system_wrappers/include/metrics.h" namespace webrtc { diff --git a/modules/audio_processing/aec3/cascaded_biquad_filter.cc b/modules/audio_processing/aec3/cascaded_biquad_filter.cc index 333d2267a4..5dfd7c54e2 100644 --- a/modules/audio_processing/aec3/cascaded_biquad_filter.cc +++ b/modules/audio_processing/aec3/cascaded_biquad_filter.cc @@ -9,6 +9,8 @@ */ #include "modules/audio_processing/aec3/cascaded_biquad_filter.h" +#include + #include "rtc_base/checks.h" namespace webrtc { diff --git a/modules/audio_processing/aec3/cascaded_biquad_filter.h b/modules/audio_processing/aec3/cascaded_biquad_filter.h index 1e09fa6e5a..2a3b6d65c5 100644 --- a/modules/audio_processing/aec3/cascaded_biquad_filter.h +++ b/modules/audio_processing/aec3/cascaded_biquad_filter.h @@ -11,6 +11,7 @@ #ifndef MODULES_AUDIO_PROCESSING_AEC3_CASCADED_BIQUAD_FILTER_H_ #define MODULES_AUDIO_PROCESSING_AEC3_CASCADED_BIQUAD_FILTER_H_ +#include #include #include diff --git a/modules/audio_processing/aec3/comfort_noise_generator.cc b/modules/audio_processing/aec3/comfort_noise_generator.cc index 55faf4b529..f55d9d4fda 100644 --- a/modules/audio_processing/aec3/comfort_noise_generator.cc +++ b/modules/audio_processing/aec3/comfort_noise_generator.cc @@ -16,13 +16,15 @@ #if defined(WEBRTC_ARCH_X86_FAMILY) #include #endif -#include #include #include +#include +#include #include #include #include "common_audio/signal_processing/include/signal_processing_library.h" +#include "rtc_base/checks.h" namespace webrtc { diff --git a/modules/audio_processing/aec3/comfort_noise_generator.h b/modules/audio_processing/aec3/comfort_noise_generator.h index 6a479896ec..3be386bab1 100644 --- a/modules/audio_processing/aec3/comfort_noise_generator.h +++ b/modules/audio_processing/aec3/comfort_noise_generator.h @@ -11,6 +11,7 @@ #ifndef MODULES_AUDIO_PROCESSING_AEC3_COMFORT_NOISE_GENERATOR_H_ #define MODULES_AUDIO_PROCESSING_AEC3_COMFORT_NOISE_GENERATOR_H_ +#include #include #include diff --git a/modules/audio_processing/aec3/decimator.cc b/modules/audio_processing/aec3/decimator.cc index d9faa62dc4..bd03237ca0 100644 --- a/modules/audio_processing/aec3/decimator.cc +++ b/modules/audio_processing/aec3/decimator.cc @@ -9,6 +9,10 @@ */ #include "modules/audio_processing/aec3/decimator.h" +#include +#include + +#include "modules/audio_processing/aec3/aec3_common.h" #include "rtc_base/checks.h" namespace webrtc { diff --git a/modules/audio_processing/aec3/downsampled_render_buffer.cc b/modules/audio_processing/aec3/downsampled_render_buffer.cc index df0af6e0d8..c105911aa8 100644 --- a/modules/audio_processing/aec3/downsampled_render_buffer.cc +++ b/modules/audio_processing/aec3/downsampled_render_buffer.cc @@ -10,6 +10,8 @@ #include "modules/audio_processing/aec3/downsampled_render_buffer.h" +#include + namespace webrtc { DownsampledRenderBuffer::DownsampledRenderBuffer(size_t downsampled_buffer_size) diff --git a/modules/audio_processing/aec3/downsampled_render_buffer.h b/modules/audio_processing/aec3/downsampled_render_buffer.h index 943949666a..c91ea3b836 100644 --- a/modules/audio_processing/aec3/downsampled_render_buffer.h +++ b/modules/audio_processing/aec3/downsampled_render_buffer.h @@ -11,9 +11,9 @@ #ifndef MODULES_AUDIO_PROCESSING_AEC3_DOWNSAMPLED_RENDER_BUFFER_H_ #define MODULES_AUDIO_PROCESSING_AEC3_DOWNSAMPLED_RENDER_BUFFER_H_ +#include #include -#include "modules/audio_processing/aec3/aec3_common.h" #include "rtc_base/checks.h" namespace webrtc { diff --git a/modules/audio_processing/aec3/echo_audibility.cc b/modules/audio_processing/aec3/echo_audibility.cc index 75d261a15e..e857a7e45a 100644 --- a/modules/audio_processing/aec3/echo_audibility.cc +++ b/modules/audio_processing/aec3/echo_audibility.cc @@ -12,9 +12,10 @@ #include #include +#include +#include #include "api/array_view.h" -#include "modules/audio_processing/aec3/aec3_common.h" #include "modules/audio_processing/aec3/matrix_buffer.h" #include "modules/audio_processing/aec3/stationarity_estimator.h" #include "modules/audio_processing/aec3/vector_buffer.h" diff --git a/modules/audio_processing/aec3/echo_audibility.h b/modules/audio_processing/aec3/echo_audibility.h index 6bda50449b..b903ca0cf1 100644 --- a/modules/audio_processing/aec3/echo_audibility.h +++ b/modules/audio_processing/aec3/echo_audibility.h @@ -11,11 +11,7 @@ #ifndef MODULES_AUDIO_PROCESSING_AEC3_ECHO_AUDIBILITY_H_ #define MODULES_AUDIO_PROCESSING_AEC3_ECHO_AUDIBILITY_H_ -#include -#include -#include -#include -#include +#include #include "absl/types/optional.h" #include "api/array_view.h" @@ -27,8 +23,6 @@ namespace webrtc { -class ApmDataDumper; - class EchoAudibility { public: explicit EchoAudibility(bool use_render_stationarity_at_init); diff --git a/modules/audio_processing/aec3/echo_canceller3.cc b/modules/audio_processing/aec3/echo_canceller3.cc index 6a4456adf2..1b089f841d 100644 --- a/modules/audio_processing/aec3/echo_canceller3.cc +++ b/modules/audio_processing/aec3/echo_canceller3.cc @@ -9,9 +9,12 @@ */ #include "modules/audio_processing/aec3/echo_canceller3.h" +#include +#include + +#include "modules/audio_processing/aec3/aec3_common.h" #include "modules/audio_processing/logging/apm_data_dumper.h" #include "rtc_base/atomicops.h" -#include "rtc_base/logging.h" #include "system_wrappers/include/field_trial.h" namespace webrtc { diff --git a/modules/audio_processing/aec3/echo_canceller3.h b/modules/audio_processing/aec3/echo_canceller3.h index f5520ba3ac..0d07702c84 100644 --- a/modules/audio_processing/aec3/echo_canceller3.h +++ b/modules/audio_processing/aec3/echo_canceller3.h @@ -11,7 +11,13 @@ #ifndef MODULES_AUDIO_PROCESSING_AEC3_ECHO_CANCELLER3_H_ #define MODULES_AUDIO_PROCESSING_AEC3_ECHO_CANCELLER3_H_ +#include +#include +#include + +#include "api/array_view.h" #include "api/audio/echo_canceller3_config.h" +#include "api/audio/echo_control.h" #include "modules/audio_processing/aec3/block_delay_buffer.h" #include "modules/audio_processing/aec3/block_framer.h" #include "modules/audio_processing/aec3/block_processor.h" @@ -19,9 +25,11 @@ #include "modules/audio_processing/aec3/frame_blocker.h" #include "modules/audio_processing/audio_buffer.h" #include "modules/audio_processing/logging/apm_data_dumper.h" +#include "rtc_base/checks.h" #include "rtc_base/constructormagic.h" #include "rtc_base/race_checker.h" #include "rtc_base/swap_queue.h" +#include "rtc_base/thread_annotations.h" namespace webrtc { diff --git a/modules/audio_processing/aec3/echo_path_delay_estimator.cc b/modules/audio_processing/aec3/echo_path_delay_estimator.cc index 022030eadd..3a25deb101 100644 --- a/modules/audio_processing/aec3/echo_path_delay_estimator.cc +++ b/modules/audio_processing/aec3/echo_path_delay_estimator.cc @@ -9,14 +9,13 @@ */ #include "modules/audio_processing/aec3/echo_path_delay_estimator.h" -#include #include #include "api/audio/echo_canceller3_config.h" #include "modules/audio_processing/aec3/aec3_common.h" +#include "modules/audio_processing/aec3/downsampled_render_buffer.h" #include "modules/audio_processing/logging/apm_data_dumper.h" #include "rtc_base/checks.h" -#include "system_wrappers/include/field_trial.h" namespace webrtc { diff --git a/modules/audio_processing/aec3/echo_path_delay_estimator.h b/modules/audio_processing/aec3/echo_path_delay_estimator.h index cea9abcb51..b1c42473f5 100644 --- a/modules/audio_processing/aec3/echo_path_delay_estimator.h +++ b/modules/audio_processing/aec3/echo_path_delay_estimator.h @@ -11,13 +11,12 @@ #ifndef MODULES_AUDIO_PROCESSING_AEC3_ECHO_PATH_DELAY_ESTIMATOR_H_ #define MODULES_AUDIO_PROCESSING_AEC3_ECHO_PATH_DELAY_ESTIMATOR_H_ -#include +#include #include "absl/types/optional.h" -#include "api/audio/echo_canceller3_config.h" +#include "api/array_view.h" #include "modules/audio_processing/aec3/decimator.h" #include "modules/audio_processing/aec3/delay_estimate.h" -#include "modules/audio_processing/aec3/downsampled_render_buffer.h" #include "modules/audio_processing/aec3/matched_filter.h" #include "modules/audio_processing/aec3/matched_filter_lag_aggregator.h" #include "rtc_base/constructormagic.h" @@ -25,6 +24,8 @@ namespace webrtc { class ApmDataDumper; +struct DownsampledRenderBuffer; +struct EchoCanceller3Config; // Estimates the delay of the echo path. class EchoPathDelayEstimator { diff --git a/modules/audio_processing/aec3/echo_remover.cc b/modules/audio_processing/aec3/echo_remover.cc index acdaf3104b..5b3740f6bb 100644 --- a/modules/audio_processing/aec3/echo_remover.cc +++ b/modules/audio_processing/aec3/echo_remover.cc @@ -10,26 +10,29 @@ #include "modules/audio_processing/aec3/echo_remover.h" #include +#include #include +#include #include -#include -#include #include "api/array_view.h" #include "modules/audio_processing/aec3/aec3_common.h" +#include "modules/audio_processing/aec3/aec3_fft.h" #include "modules/audio_processing/aec3/aec_state.h" #include "modules/audio_processing/aec3/comfort_noise_generator.h" #include "modules/audio_processing/aec3/echo_path_variability.h" #include "modules/audio_processing/aec3/echo_remover_metrics.h" #include "modules/audio_processing/aec3/fft_data.h" #include "modules/audio_processing/aec3/render_buffer.h" -#include "modules/audio_processing/aec3/render_delay_buffer.h" +#include "modules/audio_processing/aec3/render_signal_analyzer.h" #include "modules/audio_processing/aec3/residual_echo_estimator.h" #include "modules/audio_processing/aec3/subtractor.h" +#include "modules/audio_processing/aec3/subtractor_output.h" #include "modules/audio_processing/aec3/suppression_filter.h" #include "modules/audio_processing/aec3/suppression_gain.h" #include "modules/audio_processing/logging/apm_data_dumper.h" #include "rtc_base/atomicops.h" +#include "rtc_base/checks.h" #include "rtc_base/constructormagic.h" #include "rtc_base/logging.h" #include "system_wrappers/include/field_trial.h" diff --git a/modules/audio_processing/aec3/echo_remover_metrics.cc b/modules/audio_processing/aec3/echo_remover_metrics.cc index a04026b4f5..da7a224e86 100644 --- a/modules/audio_processing/aec3/echo_remover_metrics.cc +++ b/modules/audio_processing/aec3/echo_remover_metrics.cc @@ -11,9 +11,11 @@ #include "modules/audio_processing/aec3/echo_remover_metrics.h" #include +#include #include #include +#include "rtc_base/checks.h" #include "rtc_base/numerics/safe_minmax.h" #include "system_wrappers/include/metrics.h" diff --git a/modules/audio_processing/aec3/echo_remover_metrics.h b/modules/audio_processing/aec3/echo_remover_metrics.h index 17b803a1cf..0707a5f031 100644 --- a/modules/audio_processing/aec3/echo_remover_metrics.h +++ b/modules/audio_processing/aec3/echo_remover_metrics.h @@ -11,6 +11,9 @@ #ifndef MODULES_AUDIO_PROCESSING_AEC3_ECHO_REMOVER_METRICS_H_ #define MODULES_AUDIO_PROCESSING_AEC3_ECHO_REMOVER_METRICS_H_ +#include + +#include "modules/audio_processing/aec3/aec3_common.h" #include "modules/audio_processing/aec3/aec_state.h" #include "rtc_base/constructormagic.h" diff --git a/modules/audio_processing/aec3/erl_estimator.cc b/modules/audio_processing/aec3/erl_estimator.cc index 2da9cd8883..85b1e022da 100644 --- a/modules/audio_processing/aec3/erl_estimator.cc +++ b/modules/audio_processing/aec3/erl_estimator.cc @@ -13,6 +13,8 @@ #include #include +#include "rtc_base/checks.h" + namespace webrtc { namespace { diff --git a/modules/audio_processing/aec3/erl_estimator.h b/modules/audio_processing/aec3/erl_estimator.h index dacd546a6d..29718c3783 100644 --- a/modules/audio_processing/aec3/erl_estimator.h +++ b/modules/audio_processing/aec3/erl_estimator.h @@ -11,6 +11,7 @@ #ifndef MODULES_AUDIO_PROCESSING_AEC3_ERL_ESTIMATOR_H_ #define MODULES_AUDIO_PROCESSING_AEC3_ERL_ESTIMATOR_H_ +#include #include #include "api/array_view.h" diff --git a/modules/audio_processing/aec3/erle_estimator.cc b/modules/audio_processing/aec3/erle_estimator.cc index ace596b2f4..539a59b84e 100644 --- a/modules/audio_processing/aec3/erle_estimator.cc +++ b/modules/audio_processing/aec3/erle_estimator.cc @@ -13,6 +13,7 @@ #include "api/array_view.h" #include "modules/audio_processing/aec3/aec3_common.h" #include "modules/audio_processing/logging/apm_data_dumper.h" +#include "rtc_base/checks.h" namespace webrtc { diff --git a/modules/audio_processing/aec3/erle_estimator.h b/modules/audio_processing/aec3/erle_estimator.h index b36a78f866..2d2c3ae44b 100644 --- a/modules/audio_processing/aec3/erle_estimator.h +++ b/modules/audio_processing/aec3/erle_estimator.h @@ -11,6 +11,7 @@ #ifndef MODULES_AUDIO_PROCESSING_AEC3_ERLE_ESTIMATOR_H_ #define MODULES_AUDIO_PROCESSING_AEC3_ERLE_ESTIMATOR_H_ +#include #include #include diff --git a/modules/audio_processing/aec3/fft_buffer.h b/modules/audio_processing/aec3/fft_buffer.h index 47ede41825..9f81a910a8 100644 --- a/modules/audio_processing/aec3/fft_buffer.h +++ b/modules/audio_processing/aec3/fft_buffer.h @@ -11,6 +11,7 @@ #ifndef MODULES_AUDIO_PROCESSING_AEC3_FFT_BUFFER_H_ #define MODULES_AUDIO_PROCESSING_AEC3_FFT_BUFFER_H_ +#include #include #include "modules/audio_processing/aec3/fft_data.h" diff --git a/modules/audio_processing/aec3/filter_analyzer.cc b/modules/audio_processing/aec3/filter_analyzer.cc index 790cb1e8b5..5b890d7474 100644 --- a/modules/audio_processing/aec3/filter_analyzer.cc +++ b/modules/audio_processing/aec3/filter_analyzer.cc @@ -16,6 +16,7 @@ #include #include "modules/audio_processing/aec3/aec3_common.h" +#include "modules/audio_processing/aec3/render_buffer.h" #include "modules/audio_processing/logging/apm_data_dumper.h" #include "rtc_base/atomicops.h" #include "rtc_base/checks.h" diff --git a/modules/audio_processing/aec3/filter_analyzer.h b/modules/audio_processing/aec3/filter_analyzer.h index 47e9533666..99a0e25973 100644 --- a/modules/audio_processing/aec3/filter_analyzer.h +++ b/modules/audio_processing/aec3/filter_analyzer.h @@ -11,20 +11,20 @@ #ifndef MODULES_AUDIO_PROCESSING_AEC3_FILTER_ANALYZER_H_ #define MODULES_AUDIO_PROCESSING_AEC3_FILTER_ANALYZER_H_ +#include #include +#include #include -#include "absl/types/optional.h" #include "api/array_view.h" #include "api/audio/echo_canceller3_config.h" #include "modules/audio_processing/aec3/aec3_common.h" -#include "modules/audio_processing/aec3/cascaded_biquad_filter.h" -#include "modules/audio_processing/aec3/render_buffer.h" #include "rtc_base/constructormagic.h" namespace webrtc { class ApmDataDumper; +class RenderBuffer; // Class for analyzing the properties of an adaptive filter. class FilterAnalyzer { diff --git a/modules/audio_processing/aec3/frame_blocker.cc b/modules/audio_processing/aec3/frame_blocker.cc index 0a0c0e2fae..ca122e5ebb 100644 --- a/modules/audio_processing/aec3/frame_blocker.cc +++ b/modules/audio_processing/aec3/frame_blocker.cc @@ -10,8 +10,7 @@ #include "modules/audio_processing/aec3/frame_blocker.h" -#include - +#include "modules/audio_processing/aec3/aec3_common.h" #include "rtc_base/checks.h" namespace webrtc { diff --git a/modules/audio_processing/aec3/fullband_erle_estimator.cc b/modules/audio_processing/aec3/fullband_erle_estimator.cc index db9be7c104..dc745090d6 100644 --- a/modules/audio_processing/aec3/fullband_erle_estimator.cc +++ b/modules/audio_processing/aec3/fullband_erle_estimator.cc @@ -18,6 +18,7 @@ #include "api/array_view.h" #include "modules/audio_processing/aec3/aec3_common.h" #include "modules/audio_processing/logging/apm_data_dumper.h" +#include "rtc_base/checks.h" #include "rtc_base/numerics/safe_minmax.h" namespace webrtc { diff --git a/modules/audio_processing/aec3/main_filter_update_gain.cc b/modules/audio_processing/aec3/main_filter_update_gain.cc index ec5347e634..ef87d142db 100644 --- a/modules/audio_processing/aec3/main_filter_update_gain.cc +++ b/modules/audio_processing/aec3/main_filter_update_gain.cc @@ -13,7 +13,12 @@ #include #include +#include "modules/audio_processing/aec3/adaptive_fir_filter.h" #include "modules/audio_processing/aec3/aec3_common.h" +#include "modules/audio_processing/aec3/echo_path_variability.h" +#include "modules/audio_processing/aec3/fft_data.h" +#include "modules/audio_processing/aec3/render_signal_analyzer.h" +#include "modules/audio_processing/aec3/subtractor_output.h" #include "modules/audio_processing/logging/apm_data_dumper.h" #include "rtc_base/atomicops.h" #include "rtc_base/checks.h" diff --git a/modules/audio_processing/aec3/main_filter_update_gain.h b/modules/audio_processing/aec3/main_filter_update_gain.h index 525b52279c..892ff689a4 100644 --- a/modules/audio_processing/aec3/main_filter_update_gain.h +++ b/modules/audio_processing/aec3/main_filter_update_gain.h @@ -11,20 +11,22 @@ #ifndef MODULES_AUDIO_PROCESSING_AEC3_MAIN_FILTER_UPDATE_GAIN_H_ #define MODULES_AUDIO_PROCESSING_AEC3_MAIN_FILTER_UPDATE_GAIN_H_ +#include +#include #include -#include #include "api/audio/echo_canceller3_config.h" -#include "modules/audio_processing/aec3/adaptive_fir_filter.h" #include "modules/audio_processing/aec3/aec3_common.h" -#include "modules/audio_processing/aec3/echo_path_variability.h" -#include "modules/audio_processing/aec3/render_signal_analyzer.h" -#include "modules/audio_processing/aec3/subtractor_output.h" #include "rtc_base/constructormagic.h" namespace webrtc { +class AdaptiveFirFilter; class ApmDataDumper; +struct EchoPathVariability; +struct FftData; +class RenderSignalAnalyzer; +struct SubtractorOutput; // Provides functionality for computing the adaptive gain for the main filter. class MainFilterUpdateGain { diff --git a/modules/audio_processing/aec3/matched_filter.cc b/modules/audio_processing/aec3/matched_filter.cc index 6744bd5812..757219d52c 100644 --- a/modules/audio_processing/aec3/matched_filter.cc +++ b/modules/audio_processing/aec3/matched_filter.cc @@ -19,10 +19,14 @@ #include #endif #include +#include +#include +#include #include -#include "api/audio/echo_canceller3_config.h" +#include "modules/audio_processing/aec3/downsampled_render_buffer.h" #include "modules/audio_processing/logging/apm_data_dumper.h" +#include "rtc_base/checks.h" #include "rtc_base/logging.h" namespace webrtc { diff --git a/modules/audio_processing/aec3/matched_filter.h b/modules/audio_processing/aec3/matched_filter.h index 2ef48286d7..2a65339a4c 100644 --- a/modules/audio_processing/aec3/matched_filter.h +++ b/modules/audio_processing/aec3/matched_filter.h @@ -11,18 +11,19 @@ #ifndef MODULES_AUDIO_PROCESSING_AEC3_MATCHED_FILTER_H_ #define MODULES_AUDIO_PROCESSING_AEC3_MATCHED_FILTER_H_ -#include -#include +#include #include -#include "absl/types/optional.h" #include "api/array_view.h" #include "modules/audio_processing/aec3/aec3_common.h" -#include "modules/audio_processing/aec3/downsampled_render_buffer.h" #include "rtc_base/constructormagic.h" #include "rtc_base/system/arch.h" namespace webrtc { + +class ApmDataDumper; +struct DownsampledRenderBuffer; + namespace aec3 { #if defined(WEBRTC_HAS_NEON) @@ -65,7 +66,6 @@ void MatchedFilterCore(size_t x_start_index, } // namespace aec3 -class ApmDataDumper; // Produces recursively updated cross-correlation estimates for several signal // shifts where the intra-shift spacing is uniform. diff --git a/modules/audio_processing/aec3/matched_filter_lag_aggregator.cc b/modules/audio_processing/aec3/matched_filter_lag_aggregator.cc index 7a03e60d8b..5ca62683d1 100644 --- a/modules/audio_processing/aec3/matched_filter_lag_aggregator.cc +++ b/modules/audio_processing/aec3/matched_filter_lag_aggregator.cc @@ -9,7 +9,11 @@ */ #include "modules/audio_processing/aec3/matched_filter_lag_aggregator.h" +#include +#include + #include "modules/audio_processing/logging/apm_data_dumper.h" +#include "rtc_base/checks.h" namespace webrtc { diff --git a/modules/audio_processing/aec3/matrix_buffer.cc b/modules/audio_processing/aec3/matrix_buffer.cc index f95e7f4690..bd6daea95c 100644 --- a/modules/audio_processing/aec3/matrix_buffer.cc +++ b/modules/audio_processing/aec3/matrix_buffer.cc @@ -10,7 +10,7 @@ #include "modules/audio_processing/aec3/matrix_buffer.h" -#include "modules/audio_processing/aec3/aec3_common.h" +#include namespace webrtc { diff --git a/modules/audio_processing/aec3/matrix_buffer.h b/modules/audio_processing/aec3/matrix_buffer.h index 64aac0a4f6..cae3759f92 100644 --- a/modules/audio_processing/aec3/matrix_buffer.h +++ b/modules/audio_processing/aec3/matrix_buffer.h @@ -11,6 +11,7 @@ #ifndef MODULES_AUDIO_PROCESSING_AEC3_MATRIX_BUFFER_H_ #define MODULES_AUDIO_PROCESSING_AEC3_MATRIX_BUFFER_H_ +#include #include #include "rtc_base/checks.h" diff --git a/modules/audio_processing/aec3/moving_average.cc b/modules/audio_processing/aec3/moving_average.cc index e9d64e6b32..7a81ee89ea 100644 --- a/modules/audio_processing/aec3/moving_average.cc +++ b/modules/audio_processing/aec3/moving_average.cc @@ -14,6 +14,8 @@ #include #include +#include "rtc_base/checks.h" + namespace webrtc { namespace aec3 { diff --git a/modules/audio_processing/aec3/moving_average.h b/modules/audio_processing/aec3/moving_average.h index 94497d782c..0f855beffb 100644 --- a/modules/audio_processing/aec3/moving_average.h +++ b/modules/audio_processing/aec3/moving_average.h @@ -11,6 +11,7 @@ #ifndef MODULES_AUDIO_PROCESSING_AEC3_MOVING_AVERAGE_H_ #define MODULES_AUDIO_PROCESSING_AEC3_MOVING_AVERAGE_H_ +#include #include #include "api/array_view.h" diff --git a/modules/audio_processing/aec3/render_buffer.h b/modules/audio_processing/aec3/render_buffer.h index dd67268efd..4c7c60cf85 100644 --- a/modules/audio_processing/aec3/render_buffer.h +++ b/modules/audio_processing/aec3/render_buffer.h @@ -11,14 +11,17 @@ #ifndef MODULES_AUDIO_PROCESSING_AEC3_RENDER_BUFFER_H_ #define MODULES_AUDIO_PROCESSING_AEC3_RENDER_BUFFER_H_ +#include #include -#include +#include #include "api/array_view.h" +#include "modules/audio_processing/aec3/aec3_common.h" #include "modules/audio_processing/aec3/fft_buffer.h" #include "modules/audio_processing/aec3/fft_data.h" #include "modules/audio_processing/aec3/matrix_buffer.h" #include "modules/audio_processing/aec3/vector_buffer.h" +#include "rtc_base/checks.h" #include "rtc_base/constructormagic.h" namespace webrtc { diff --git a/modules/audio_processing/aec3/render_delay_buffer.cc b/modules/audio_processing/aec3/render_delay_buffer.cc index 3c5c3ac3e4..1ec27790a8 100644 --- a/modules/audio_processing/aec3/render_delay_buffer.cc +++ b/modules/audio_processing/aec3/render_delay_buffer.cc @@ -10,17 +10,21 @@ #include "modules/audio_processing/aec3/render_delay_buffer.h" -#include +#include #include +#include #include +#include "absl/types/optional.h" +#include "api/array_view.h" #include "modules/audio_processing/aec3/aec3_common.h" #include "modules/audio_processing/aec3/aec3_fft.h" -#include "modules/audio_processing/aec3/block_processor.h" #include "modules/audio_processing/aec3/decimator.h" #include "modules/audio_processing/aec3/fft_buffer.h" #include "modules/audio_processing/aec3/fft_data.h" #include "modules/audio_processing/aec3/matrix_buffer.h" +#include "modules/audio_processing/aec3/vector_buffer.h" +#include "modules/audio_processing/logging/apm_data_dumper.h" #include "rtc_base/atomicops.h" #include "rtc_base/checks.h" #include "rtc_base/constructormagic.h" diff --git a/modules/audio_processing/aec3/render_delay_buffer.h b/modules/audio_processing/aec3/render_delay_buffer.h index 8c5667e081..bd242f743f 100644 --- a/modules/audio_processing/aec3/render_delay_buffer.h +++ b/modules/audio_processing/aec3/render_delay_buffer.h @@ -12,15 +12,10 @@ #define MODULES_AUDIO_PROCESSING_AEC3_RENDER_DELAY_BUFFER_H_ #include -#include #include -#include "absl/types/optional.h" -#include "api/array_view.h" #include "api/audio/echo_canceller3_config.h" -#include "modules/audio_processing/aec3/aec3_common.h" #include "modules/audio_processing/aec3/downsampled_render_buffer.h" -#include "modules/audio_processing/aec3/fft_data.h" #include "modules/audio_processing/aec3/render_buffer.h" namespace webrtc { diff --git a/modules/audio_processing/aec3/render_delay_buffer2.cc b/modules/audio_processing/aec3/render_delay_buffer2.cc index 3326afabe3..6992c5b898 100644 --- a/modules/audio_processing/aec3/render_delay_buffer2.cc +++ b/modules/audio_processing/aec3/render_delay_buffer2.cc @@ -8,23 +8,29 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "modules/audio_processing/aec3/render_delay_buffer.h" - #include #include +#include #include +#include +#include "absl/types/optional.h" +#include "api/array_view.h" +#include "api/audio/echo_canceller3_config.h" #include "modules/audio_processing/aec3/aec3_common.h" #include "modules/audio_processing/aec3/aec3_fft.h" -#include "modules/audio_processing/aec3/block_processor.h" #include "modules/audio_processing/aec3/decimator.h" +#include "modules/audio_processing/aec3/downsampled_render_buffer.h" #include "modules/audio_processing/aec3/fft_buffer.h" #include "modules/audio_processing/aec3/fft_data.h" #include "modules/audio_processing/aec3/matrix_buffer.h" +#include "modules/audio_processing/aec3/render_buffer.h" +#include "modules/audio_processing/aec3/render_delay_buffer.h" +#include "modules/audio_processing/aec3/vector_buffer.h" +#include "modules/audio_processing/logging/apm_data_dumper.h" #include "rtc_base/atomicops.h" #include "rtc_base/checks.h" #include "rtc_base/logging.h" -#include "system_wrappers/include/field_trial.h" namespace webrtc { namespace { diff --git a/modules/audio_processing/aec3/render_delay_controller.cc b/modules/audio_processing/aec3/render_delay_controller.cc index f336c392b4..e81d9d3ecd 100644 --- a/modules/audio_processing/aec3/render_delay_controller.cc +++ b/modules/audio_processing/aec3/render_delay_controller.cc @@ -9,10 +9,9 @@ */ #include "modules/audio_processing/aec3/render_delay_controller.h" +#include #include #include -#include -#include #include #include "api/audio/echo_canceller3_config.h" @@ -20,7 +19,9 @@ #include "modules/audio_processing/aec3/echo_path_delay_estimator.h" #include "modules/audio_processing/aec3/render_delay_controller_metrics.h" #include "modules/audio_processing/aec3/skew_estimator.h" +#include "modules/audio_processing/logging/apm_data_dumper.h" #include "rtc_base/atomicops.h" +#include "rtc_base/checks.h" #include "rtc_base/constructormagic.h" #include "rtc_base/logging.h" #include "system_wrappers/include/field_trial.h" diff --git a/modules/audio_processing/aec3/render_delay_controller2.cc b/modules/audio_processing/aec3/render_delay_controller2.cc index f1d1f4de88..64f14cb64c 100644 --- a/modules/audio_processing/aec3/render_delay_controller2.cc +++ b/modules/audio_processing/aec3/render_delay_controller2.cc @@ -7,22 +7,23 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#include "modules/audio_processing/aec3/render_delay_controller.h" - +#include #include #include -#include -#include -#include +#include "absl/types/optional.h" +#include "api/array_view.h" #include "api/audio/echo_canceller3_config.h" #include "modules/audio_processing/aec3/aec3_common.h" +#include "modules/audio_processing/aec3/delay_estimate.h" +#include "modules/audio_processing/aec3/downsampled_render_buffer.h" #include "modules/audio_processing/aec3/echo_path_delay_estimator.h" +#include "modules/audio_processing/aec3/render_delay_controller.h" #include "modules/audio_processing/aec3/render_delay_controller_metrics.h" +#include "modules/audio_processing/logging/apm_data_dumper.h" #include "rtc_base/atomicops.h" +#include "rtc_base/checks.h" #include "rtc_base/constructormagic.h" -#include "rtc_base/logging.h" -#include "system_wrappers/include/field_trial.h" namespace webrtc { diff --git a/modules/audio_processing/aec3/render_delay_controller_metrics.cc b/modules/audio_processing/aec3/render_delay_controller_metrics.cc index 09db339683..c51d4688a7 100644 --- a/modules/audio_processing/aec3/render_delay_controller_metrics.cc +++ b/modules/audio_processing/aec3/render_delay_controller_metrics.cc @@ -13,6 +13,7 @@ #include #include "modules/audio_processing/aec3/aec3_common.h" +#include "rtc_base/checks.h" #include "system_wrappers/include/metrics.h" namespace webrtc { diff --git a/modules/audio_processing/aec3/render_delay_controller_metrics.h b/modules/audio_processing/aec3/render_delay_controller_metrics.h index 1cfe899b48..50e60bbd9c 100644 --- a/modules/audio_processing/aec3/render_delay_controller_metrics.h +++ b/modules/audio_processing/aec3/render_delay_controller_metrics.h @@ -11,6 +11,8 @@ #ifndef MODULES_AUDIO_PROCESSING_AEC3_RENDER_DELAY_CONTROLLER_METRICS_H_ #define MODULES_AUDIO_PROCESSING_AEC3_RENDER_DELAY_CONTROLLER_METRICS_H_ +#include + #include "absl/types/optional.h" #include "rtc_base/constructormagic.h" diff --git a/modules/audio_processing/aec3/render_signal_analyzer.cc b/modules/audio_processing/aec3/render_signal_analyzer.cc index 50c34ce43f..33b04bf70c 100644 --- a/modules/audio_processing/aec3/render_signal_analyzer.cc +++ b/modules/audio_processing/aec3/render_signal_analyzer.cc @@ -12,7 +12,10 @@ #include #include +#include +#include +#include "api/array_view.h" #include "rtc_base/checks.h" namespace webrtc { diff --git a/modules/audio_processing/aec3/render_signal_analyzer.h b/modules/audio_processing/aec3/render_signal_analyzer.h index c603c92144..8a44232cf9 100644 --- a/modules/audio_processing/aec3/render_signal_analyzer.h +++ b/modules/audio_processing/aec3/render_signal_analyzer.h @@ -11,13 +11,15 @@ #ifndef MODULES_AUDIO_PROCESSING_AEC3_RENDER_SIGNAL_ANALYZER_H_ #define MODULES_AUDIO_PROCESSING_AEC3_RENDER_SIGNAL_ANALYZER_H_ +#include #include -#include +#include #include "absl/types/optional.h" #include "api/audio/echo_canceller3_config.h" #include "modules/audio_processing/aec3/aec3_common.h" #include "modules/audio_processing/aec3/render_buffer.h" +#include "rtc_base/checks.h" #include "rtc_base/constructormagic.h" namespace webrtc { diff --git a/modules/audio_processing/aec3/residual_echo_estimator.cc b/modules/audio_processing/aec3/residual_echo_estimator.cc index 7b063c174f..627dd900c4 100644 --- a/modules/audio_processing/aec3/residual_echo_estimator.cc +++ b/modules/audio_processing/aec3/residual_echo_estimator.cc @@ -11,9 +11,11 @@ #include "modules/audio_processing/aec3/residual_echo_estimator.h" -#include +#include +#include #include +#include "api/array_view.h" #include "modules/audio_processing/aec3/reverb_model.h" #include "modules/audio_processing/aec3/reverb_model_fallback.h" #include "rtc_base/checks.h" diff --git a/modules/audio_processing/aec3/residual_echo_estimator.h b/modules/audio_processing/aec3/residual_echo_estimator.h index e69dfb05b3..52885a58d8 100644 --- a/modules/audio_processing/aec3/residual_echo_estimator.h +++ b/modules/audio_processing/aec3/residual_echo_estimator.h @@ -11,18 +11,18 @@ #ifndef MODULES_AUDIO_PROCESSING_AEC3_RESIDUAL_ECHO_ESTIMATOR_H_ #define MODULES_AUDIO_PROCESSING_AEC3_RESIDUAL_ECHO_ESTIMATOR_H_ -#include #include #include -#include -#include "api/array_view.h" +#include "absl/types/optional.h" #include "api/audio/echo_canceller3_config.h" #include "modules/audio_processing/aec3/aec3_common.h" #include "modules/audio_processing/aec3/aec_state.h" #include "modules/audio_processing/aec3/render_buffer.h" #include "modules/audio_processing/aec3/reverb_model.h" #include "modules/audio_processing/aec3/reverb_model_fallback.h" +#include "modules/audio_processing/aec3/vector_buffer.h" +#include "rtc_base/checks.h" #include "rtc_base/constructormagic.h" namespace webrtc { diff --git a/modules/audio_processing/aec3/reverb_decay_estimator.cc b/modules/audio_processing/aec3/reverb_decay_estimator.cc index f80afa2dfc..95fd13af59 100644 --- a/modules/audio_processing/aec3/reverb_decay_estimator.cc +++ b/modules/audio_processing/aec3/reverb_decay_estimator.cc @@ -10,11 +10,13 @@ #include "modules/audio_processing/aec3/reverb_decay_estimator.h" +#include #include #include #include #include "api/array_view.h" +#include "api/audio/echo_canceller3_config.h" #include "modules/audio_processing/logging/apm_data_dumper.h" #include "rtc_base/checks.h" #include "system_wrappers/include/field_trial.h" diff --git a/modules/audio_processing/aec3/reverb_decay_estimator.h b/modules/audio_processing/aec3/reverb_decay_estimator.h index 67a84ab8fc..4c8d0c6434 100644 --- a/modules/audio_processing/aec3/reverb_decay_estimator.h +++ b/modules/audio_processing/aec3/reverb_decay_estimator.h @@ -16,12 +16,12 @@ #include "absl/types/optional.h" #include "api/array_view.h" -#include "api/audio/echo_canceller3_config.h" -#include "modules/audio_processing/aec3/aec3_common.h" +#include "modules/audio_processing/aec3/aec3_common.h" // kMaxAdaptiveFilter... namespace webrtc { class ApmDataDumper; +struct EchoCanceller3Config; // Class for estimating the decay of the late reverb. class ReverbDecayEstimator { diff --git a/modules/audio_processing/aec3/reverb_frequency_response.cc b/modules/audio_processing/aec3/reverb_frequency_response.cc index 0d82515ec4..d2103d442e 100644 --- a/modules/audio_processing/aec3/reverb_frequency_response.cc +++ b/modules/audio_processing/aec3/reverb_frequency_response.cc @@ -10,14 +10,12 @@ #include "modules/audio_processing/aec3/reverb_frequency_response.h" +#include #include #include -#include -#include #include #include "api/array_view.h" -#include "api/audio/echo_canceller3_config.h" #include "modules/audio_processing/aec3/aec3_common.h" #include "rtc_base/checks.h" #include "system_wrappers/include/field_trial.h" diff --git a/modules/audio_processing/aec3/reverb_frequency_response.h b/modules/audio_processing/aec3/reverb_frequency_response.h index 23485e009f..eb63b8e52e 100644 --- a/modules/audio_processing/aec3/reverb_frequency_response.h +++ b/modules/audio_processing/aec3/reverb_frequency_response.h @@ -11,13 +11,12 @@ #ifndef MODULES_AUDIO_PROCESSING_AEC3_REVERB_FREQUENCY_RESPONSE_H_ #define MODULES_AUDIO_PROCESSING_AEC3_REVERB_FREQUENCY_RESPONSE_H_ -#include +#include #include #include "absl/types/optional.h" #include "api/array_view.h" #include "modules/audio_processing/aec3/aec3_common.h" -#include "modules/audio_processing/logging/apm_data_dumper.h" namespace webrtc { diff --git a/modules/audio_processing/aec3/reverb_model.cc b/modules/audio_processing/aec3/reverb_model.cc index 0ca248fc75..f0a24c0249 100644 --- a/modules/audio_processing/aec3/reverb_model.cc +++ b/modules/audio_processing/aec3/reverb_model.cc @@ -10,13 +10,11 @@ #include "modules/audio_processing/aec3/reverb_model.h" -#include - +#include #include #include #include "api/array_view.h" -#include "modules/audio_processing/aec3/aec3_common.h" namespace webrtc { diff --git a/modules/audio_processing/aec3/reverb_model.h b/modules/audio_processing/aec3/reverb_model.h index 4e7126808c..56e2266e56 100644 --- a/modules/audio_processing/aec3/reverb_model.h +++ b/modules/audio_processing/aec3/reverb_model.h @@ -11,6 +11,8 @@ #ifndef MODULES_AUDIO_PROCESSING_AEC3_REVERB_MODEL_H_ #define MODULES_AUDIO_PROCESSING_AEC3_REVERB_MODEL_H_ +#include + #include "api/array_view.h" #include "modules/audio_processing/aec3/aec3_common.h" diff --git a/modules/audio_processing/aec3/reverb_model_estimator.h b/modules/audio_processing/aec3/reverb_model_estimator.h index b6a3591e09..1112f93a71 100644 --- a/modules/audio_processing/aec3/reverb_model_estimator.h +++ b/modules/audio_processing/aec3/reverb_model_estimator.h @@ -11,11 +11,13 @@ #ifndef MODULES_AUDIO_PROCESSING_AEC3_REVERB_MODEL_ESTIMATOR_H_ #define MODULES_AUDIO_PROCESSING_AEC3_REVERB_MODEL_ESTIMATOR_H_ +#include #include #include "absl/types/optional.h" #include "api/array_view.h" #include "api/audio/echo_canceller3_config.h" +#include "modules/audio_processing/aec3/aec3_common.h" // kFftLengthBy2Plus1 #include "modules/audio_processing/aec3/reverb_decay_estimator.h" #include "modules/audio_processing/aec3/reverb_frequency_response.h" diff --git a/modules/audio_processing/aec3/reverb_model_fallback.h b/modules/audio_processing/aec3/reverb_model_fallback.h index 1b2a953ea6..1bd2b594e0 100644 --- a/modules/audio_processing/aec3/reverb_model_fallback.h +++ b/modules/audio_processing/aec3/reverb_model_fallback.h @@ -11,6 +11,7 @@ #ifndef MODULES_AUDIO_PROCESSING_AEC3_REVERB_MODEL_FALLBACK_H_ #define MODULES_AUDIO_PROCESSING_AEC3_REVERB_MODEL_FALLBACK_H_ +#include #include #include diff --git a/modules/audio_processing/aec3/shadow_filter_update_gain.h b/modules/audio_processing/aec3/shadow_filter_update_gain.h index a92bc3b8b7..05e632fa78 100644 --- a/modules/audio_processing/aec3/shadow_filter_update_gain.h +++ b/modules/audio_processing/aec3/shadow_filter_update_gain.h @@ -11,11 +11,13 @@ #ifndef MODULES_AUDIO_PROCESSING_AEC3_SHADOW_FILTER_UPDATE_GAIN_H_ #define MODULES_AUDIO_PROCESSING_AEC3_SHADOW_FILTER_UPDATE_GAIN_H_ +#include +#include + #include "api/audio/echo_canceller3_config.h" #include "modules/audio_processing/aec3/aec3_common.h" -#include "modules/audio_processing/aec3/render_buffer.h" +#include "modules/audio_processing/aec3/fft_data.h" #include "modules/audio_processing/aec3/render_signal_analyzer.h" -#include "rtc_base/constructormagic.h" namespace webrtc { diff --git a/modules/audio_processing/aec3/skew_estimator.cc b/modules/audio_processing/aec3/skew_estimator.cc index 310e4e9dd1..a2099fcd01 100644 --- a/modules/audio_processing/aec3/skew_estimator.cc +++ b/modules/audio_processing/aec3/skew_estimator.cc @@ -10,7 +10,6 @@ #include "modules/audio_processing/aec3/skew_estimator.h" #include -#include namespace webrtc { diff --git a/modules/audio_processing/aec3/skew_estimator.h b/modules/audio_processing/aec3/skew_estimator.h index ff2526025a..b0946d833e 100644 --- a/modules/audio_processing/aec3/skew_estimator.h +++ b/modules/audio_processing/aec3/skew_estimator.h @@ -11,6 +11,7 @@ #ifndef MODULES_AUDIO_PROCESSING_AEC3_SKEW_ESTIMATOR_H_ #define MODULES_AUDIO_PROCESSING_AEC3_SKEW_ESTIMATOR_H_ +#include #include #include "absl/types/optional.h" diff --git a/modules/audio_processing/aec3/stationarity_estimator.h b/modules/audio_processing/aec3/stationarity_estimator.h index cf8359a110..704859a1fe 100644 --- a/modules/audio_processing/aec3/stationarity_estimator.h +++ b/modules/audio_processing/aec3/stationarity_estimator.h @@ -11,18 +11,19 @@ #ifndef MODULES_AUDIO_PROCESSING_AEC3_STATIONARITY_ESTIMATOR_H_ #define MODULES_AUDIO_PROCESSING_AEC3_STATIONARITY_ESTIMATOR_H_ +#include #include #include -#include #include "api/array_view.h" -#include "modules/audio_processing/aec3/aec3_common.h" +#include "modules/audio_processing/aec3/aec3_common.h" // kFftLengthBy2Plus1... #include "modules/audio_processing/aec3/reverb_model.h" -#include "modules/audio_processing/aec3/vector_buffer.h" +#include "rtc_base/checks.h" namespace webrtc { class ApmDataDumper; +struct VectorBuffer; class StationarityEstimator { public: diff --git a/modules/audio_processing/aec3/subband_erle_estimator.cc b/modules/audio_processing/aec3/subband_erle_estimator.cc index d8cb7a7631..2cb5accabd 100644 --- a/modules/audio_processing/aec3/subband_erle_estimator.cc +++ b/modules/audio_processing/aec3/subband_erle_estimator.cc @@ -17,6 +17,7 @@ #include "api/array_view.h" #include "modules/audio_processing/aec3/aec3_common.h" #include "modules/audio_processing/logging/apm_data_dumper.h" +#include "rtc_base/checks.h" #include "rtc_base/numerics/safe_minmax.h" #include "system_wrappers/include/field_trial.h" diff --git a/modules/audio_processing/aec3/subband_erle_estimator.h b/modules/audio_processing/aec3/subband_erle_estimator.h index aa5e5ccb24..7693b6a931 100644 --- a/modules/audio_processing/aec3/subband_erle_estimator.h +++ b/modules/audio_processing/aec3/subband_erle_estimator.h @@ -11,6 +11,7 @@ #ifndef MODULES_AUDIO_PROCESSING_AEC3_SUBBAND_ERLE_ESTIMATOR_H_ #define MODULES_AUDIO_PROCESSING_AEC3_SUBBAND_ERLE_ESTIMATOR_H_ +#include #include #include diff --git a/modules/audio_processing/aec3/subtractor.cc b/modules/audio_processing/aec3/subtractor.cc index 9856a74025..90069c7a74 100644 --- a/modules/audio_processing/aec3/subtractor.cc +++ b/modules/audio_processing/aec3/subtractor.cc @@ -11,12 +11,12 @@ #include "modules/audio_processing/aec3/subtractor.h" #include -#include +#include #include "api/array_view.h" +#include "modules/audio_processing/aec3/fft_data.h" #include "modules/audio_processing/logging/apm_data_dumper.h" #include "rtc_base/checks.h" -#include "rtc_base/logging.h" #include "rtc_base/numerics/safe_minmax.h" #include "system_wrappers/include/field_trial.h" diff --git a/modules/audio_processing/aec3/subtractor.h b/modules/audio_processing/aec3/subtractor.h index c92a971f11..bec014deec 100644 --- a/modules/audio_processing/aec3/subtractor.h +++ b/modules/audio_processing/aec3/subtractor.h @@ -11,11 +11,13 @@ #ifndef MODULES_AUDIO_PROCESSING_AEC3_SUBTRACTOR_H_ #define MODULES_AUDIO_PROCESSING_AEC3_SUBTRACTOR_H_ -#include +#include +#include #include #include -#include "math.h" +#include "api/array_view.h" +#include "api/audio/echo_canceller3_config.h" #include "modules/audio_processing/aec3/adaptive_fir_filter.h" #include "modules/audio_processing/aec3/aec3_common.h" #include "modules/audio_processing/aec3/aec3_fft.h" @@ -23,10 +25,11 @@ #include "modules/audio_processing/aec3/echo_path_variability.h" #include "modules/audio_processing/aec3/main_filter_update_gain.h" #include "modules/audio_processing/aec3/render_buffer.h" +#include "modules/audio_processing/aec3/render_signal_analyzer.h" #include "modules/audio_processing/aec3/shadow_filter_update_gain.h" #include "modules/audio_processing/aec3/subtractor_output.h" #include "modules/audio_processing/logging/apm_data_dumper.h" -#include "modules/audio_processing/utility/ooura_fft.h" +#include "rtc_base/checks.h" #include "rtc_base/constructormagic.h" namespace webrtc { diff --git a/modules/audio_processing/aec3/subtractor_output_analyzer.cc b/modules/audio_processing/aec3/subtractor_output_analyzer.cc index 3cacb45630..9374b8099f 100644 --- a/modules/audio_processing/aec3/subtractor_output_analyzer.cc +++ b/modules/audio_processing/aec3/subtractor_output_analyzer.cc @@ -10,9 +10,9 @@ #include "modules/audio_processing/aec3/subtractor_output_analyzer.h" -#include -#include +#include +#include "modules/audio_processing/aec3/aec3_common.h" #include "system_wrappers/include/field_trial.h" namespace webrtc { diff --git a/modules/audio_processing/aec3/subtractor_output_analyzer.h b/modules/audio_processing/aec3/subtractor_output_analyzer.h index b59a68e5e6..0e23ad5dfa 100644 --- a/modules/audio_processing/aec3/subtractor_output_analyzer.h +++ b/modules/audio_processing/aec3/subtractor_output_analyzer.h @@ -11,7 +11,6 @@ #ifndef MODULES_AUDIO_PROCESSING_AEC3_SUBTRACTOR_OUTPUT_ANALYZER_H_ #define MODULES_AUDIO_PROCESSING_AEC3_SUBTRACTOR_OUTPUT_ANALYZER_H_ -#include "api/array_view.h" #include "modules/audio_processing/aec3/subtractor_output.h" namespace webrtc { diff --git a/modules/audio_processing/aec3/suppression_filter.cc b/modules/audio_processing/aec3/suppression_filter.cc index 87e3008dc7..4af9327dcc 100644 --- a/modules/audio_processing/aec3/suppression_filter.cc +++ b/modules/audio_processing/aec3/suppression_filter.cc @@ -10,13 +10,12 @@ #include "modules/audio_processing/aec3/suppression_filter.h" -#include #include #include #include -#include +#include -#include "modules/audio_processing/utility/ooura_fft.h" +#include "rtc_base/checks.h" #include "rtc_base/numerics/safe_minmax.h" namespace webrtc { diff --git a/modules/audio_processing/aec3/suppression_filter.h b/modules/audio_processing/aec3/suppression_filter.h index 237408d7f9..df03156f08 100644 --- a/modules/audio_processing/aec3/suppression_filter.h +++ b/modules/audio_processing/aec3/suppression_filter.h @@ -16,6 +16,8 @@ #include "modules/audio_processing/aec3/aec3_common.h" #include "modules/audio_processing/aec3/aec3_fft.h" +#include "modules/audio_processing/aec3/fft_data.h" +#include "modules/audio_processing/utility/ooura_fft.h" #include "rtc_base/constructormagic.h" namespace webrtc { diff --git a/modules/audio_processing/aec3/suppression_gain.cc b/modules/audio_processing/aec3/suppression_gain.cc index 4c1119bc5c..f3ea57ab8a 100644 --- a/modules/audio_processing/aec3/suppression_gain.cc +++ b/modules/audio_processing/aec3/suppression_gain.cc @@ -11,8 +11,8 @@ #include "modules/audio_processing/aec3/suppression_gain.h" #include +#include #include -#include #include #include "modules/audio_processing/aec3/moving_average.h" @@ -20,7 +20,6 @@ #include "modules/audio_processing/logging/apm_data_dumper.h" #include "rtc_base/atomicops.h" #include "rtc_base/checks.h" -#include "system_wrappers/include/field_trial.h" namespace webrtc { namespace { diff --git a/modules/audio_processing/aec3/suppression_gain.h b/modules/audio_processing/aec3/suppression_gain.h index 58f6a99052..1d55647693 100644 --- a/modules/audio_processing/aec3/suppression_gain.h +++ b/modules/audio_processing/aec3/suppression_gain.h @@ -12,13 +12,18 @@ #define MODULES_AUDIO_PROCESSING_AEC3_SUPPRESSION_GAIN_H_ #include +#include #include +#include "absl/types/optional.h" +#include "api/array_view.h" #include "api/audio/echo_canceller3_config.h" #include "modules/audio_processing/aec3/aec3_common.h" #include "modules/audio_processing/aec3/aec_state.h" +#include "modules/audio_processing/aec3/fft_data.h" #include "modules/audio_processing/aec3/moving_average.h" #include "modules/audio_processing/aec3/render_signal_analyzer.h" +#include "modules/audio_processing/logging/apm_data_dumper.h" #include "rtc_base/constructormagic.h" namespace webrtc { diff --git a/modules/audio_processing/aec3/suppression_gain_limiter.cc b/modules/audio_processing/aec3/suppression_gain_limiter.cc index e3d7a660bf..6625a779c2 100644 --- a/modules/audio_processing/aec3/suppression_gain_limiter.cc +++ b/modules/audio_processing/aec3/suppression_gain_limiter.cc @@ -14,6 +14,7 @@ #include #include "modules/audio_processing/aec3/aec3_common.h" +#include "rtc_base/checks.h" namespace webrtc { namespace { diff --git a/modules/audio_processing/aec3/vector_buffer.cc b/modules/audio_processing/aec3/vector_buffer.cc index f491168d9a..0682885c0c 100644 --- a/modules/audio_processing/aec3/vector_buffer.cc +++ b/modules/audio_processing/aec3/vector_buffer.cc @@ -10,7 +10,7 @@ #include "modules/audio_processing/aec3/vector_buffer.h" -#include "modules/audio_processing/aec3/aec3_common.h" +#include namespace webrtc { diff --git a/modules/audio_processing/aec3/vector_buffer.h b/modules/audio_processing/aec3/vector_buffer.h index c7d4f68b27..4c0257ccea 100644 --- a/modules/audio_processing/aec3/vector_buffer.h +++ b/modules/audio_processing/aec3/vector_buffer.h @@ -11,6 +11,7 @@ #ifndef MODULES_AUDIO_PROCESSING_AEC3_VECTOR_BUFFER_H_ #define MODULES_AUDIO_PROCESSING_AEC3_VECTOR_BUFFER_H_ +#include #include #include "rtc_base/checks.h" diff --git a/modules/audio_processing/aecm/aecm_core.cc b/modules/audio_processing/aecm/aecm_core.cc index 0e56b50c5e..67b70bfb36 100644 --- a/modules/audio_processing/aecm/aecm_core.cc +++ b/modules/audio_processing/aecm/aecm_core.cc @@ -12,16 +12,15 @@ #include #include +#include extern "C" { #include "common_audio/ring_buffer.h" #include "common_audio/signal_processing/include/real_fft.h" } +#include "common_audio/signal_processing/include/signal_processing_library.h" #include "modules/audio_processing/aecm/echo_control_mobile.h" #include "modules/audio_processing/utility/delay_estimator_wrapper.h" -extern "C" { -#include "system_wrappers/include/cpu_features_wrapper.h" -} #include "rtc_base/checks.h" #include "rtc_base/numerics/safe_conversions.h" diff --git a/modules/audio_processing/aecm/echo_control_mobile.cc b/modules/audio_processing/aecm/echo_control_mobile.cc index c947563b28..257dfbf56e 100644 --- a/modules/audio_processing/aecm/echo_control_mobile.cc +++ b/modules/audio_processing/aecm/echo_control_mobile.cc @@ -14,10 +14,12 @@ #include #endif #include +#include extern "C" { #include "common_audio/ring_buffer.h" #include "common_audio/signal_processing/include/signal_processing_library.h" +#include "modules/audio_processing/aecm/aecm_defines.h" } #include "modules/audio_processing/aecm/aecm_core.h" diff --git a/modules/audio_processing/agc/agc.cc b/modules/audio_processing/agc/agc.cc index 12c8cfb7fb..c24db0dd52 100644 --- a/modules/audio_processing/agc/agc.cc +++ b/modules/audio_processing/agc/agc.cc @@ -12,8 +12,6 @@ #include #include - -#include #include #include "modules/audio_processing/agc/loudness_histogram.h" diff --git a/modules/audio_processing/agc/agc.h b/modules/audio_processing/agc/agc.h index 5d34c212f3..abd68d5e31 100644 --- a/modules/audio_processing/agc/agc.h +++ b/modules/audio_processing/agc/agc.h @@ -17,7 +17,6 @@ namespace webrtc { -class AudioFrame; class LoudnessHistogram; class Agc { diff --git a/modules/audio_processing/agc/agc_manager_direct.cc b/modules/audio_processing/agc/agc_manager_direct.cc index dc6d45121c..5c4deeccbf 100644 --- a/modules/audio_processing/agc/agc_manager_direct.cc +++ b/modules/audio_processing/agc/agc_manager_direct.cc @@ -10,6 +10,7 @@ #include "modules/audio_processing/agc/agc_manager_direct.h" +#include #include #ifdef WEBRTC_AGC_DEBUG_DUMP diff --git a/modules/audio_processing/agc/loudness_histogram.cc b/modules/audio_processing/agc/loudness_histogram.cc index 0ed5850e72..cd57b82bcc 100644 --- a/modules/audio_processing/agc/loudness_histogram.cc +++ b/modules/audio_processing/agc/loudness_histogram.cc @@ -10,8 +10,8 @@ #include "modules/audio_processing/agc/loudness_histogram.h" +#include #include -#include #include "rtc_base/checks.h" diff --git a/modules/audio_processing/agc/loudness_histogram.h b/modules/audio_processing/agc/loudness_histogram.h index d8ad751176..b210be96e3 100644 --- a/modules/audio_processing/agc/loudness_histogram.h +++ b/modules/audio_processing/agc/loudness_histogram.h @@ -11,8 +11,7 @@ #ifndef MODULES_AUDIO_PROCESSING_AGC_LOUDNESS_HISTOGRAM_H_ #define MODULES_AUDIO_PROCESSING_AGC_LOUDNESS_HISTOGRAM_H_ -#include - +#include #include namespace webrtc { diff --git a/modules/audio_processing/agc2/BUILD.gn b/modules/audio_processing/agc2/BUILD.gn index 1865fde3e9..ea7fe0e9ce 100644 --- a/modules/audio_processing/agc2/BUILD.gn +++ b/modules/audio_processing/agc2/BUILD.gn @@ -128,6 +128,7 @@ rtc_source_set("gain_applier") { deps = [ ":common", "..:audio_frame_view", + "../../../api:array_view", "../../../rtc_base:safe_minmax", ] } diff --git a/modules/audio_processing/agc2/adaptive_agc.cc b/modules/audio_processing/agc2/adaptive_agc.cc index c7346c6042..0ab7998f05 100644 --- a/modules/audio_processing/agc2/adaptive_agc.cc +++ b/modules/audio_processing/agc2/adaptive_agc.cc @@ -10,12 +10,10 @@ #include "modules/audio_processing/agc2/adaptive_agc.h" -#include -#include - #include "common_audio/include/audio_util.h" #include "modules/audio_processing/agc2/vad_with_level.h" #include "modules/audio_processing/logging/apm_data_dumper.h" +#include "rtc_base/checks.h" namespace webrtc { diff --git a/modules/audio_processing/agc2/adaptive_agc.h b/modules/audio_processing/agc2/adaptive_agc.h index 792b2bc916..7bfd3c04ae 100644 --- a/modules/audio_processing/agc2/adaptive_agc.h +++ b/modules/audio_processing/agc2/adaptive_agc.h @@ -11,8 +11,6 @@ #ifndef MODULES_AUDIO_PROCESSING_AGC2_ADAPTIVE_AGC_H_ #define MODULES_AUDIO_PROCESSING_AGC2_ADAPTIVE_AGC_H_ -#include - #include "modules/audio_processing/agc2/adaptive_digital_gain_applier.h" #include "modules/audio_processing/agc2/adaptive_mode_level_estimator.h" #include "modules/audio_processing/agc2/noise_level_estimator.h" diff --git a/modules/audio_processing/agc2/adaptive_digital_gain_applier.cc b/modules/audio_processing/agc2/adaptive_digital_gain_applier.cc index d4560caf1a..6ece83b239 100644 --- a/modules/audio_processing/agc2/adaptive_digital_gain_applier.cc +++ b/modules/audio_processing/agc2/adaptive_digital_gain_applier.cc @@ -15,6 +15,7 @@ #include "common_audio/include/audio_util.h" #include "modules/audio_processing/agc2/agc2_common.h" #include "modules/audio_processing/logging/apm_data_dumper.h" +#include "rtc_base/checks.h" #include "rtc_base/numerics/safe_minmax.h" #include "system_wrappers/include/metrics.h" diff --git a/modules/audio_processing/agc2/adaptive_mode_level_estimator.cc b/modules/audio_processing/agc2/adaptive_mode_level_estimator.cc index b670f4b469..c8df913811 100644 --- a/modules/audio_processing/agc2/adaptive_mode_level_estimator.cc +++ b/modules/audio_processing/agc2/adaptive_mode_level_estimator.cc @@ -12,6 +12,7 @@ #include "modules/audio_processing/agc2/agc2_common.h" #include "modules/audio_processing/logging/apm_data_dumper.h" +#include "rtc_base/checks.h" #include "rtc_base/numerics/safe_minmax.h" namespace webrtc { diff --git a/modules/audio_processing/agc2/adaptive_mode_level_estimator.h b/modules/audio_processing/agc2/adaptive_mode_level_estimator.h index 4d4180c480..b315420626 100644 --- a/modules/audio_processing/agc2/adaptive_mode_level_estimator.h +++ b/modules/audio_processing/agc2/adaptive_mode_level_estimator.h @@ -11,6 +11,9 @@ #ifndef MODULES_AUDIO_PROCESSING_AGC2_ADAPTIVE_MODE_LEVEL_ESTIMATOR_H_ #define MODULES_AUDIO_PROCESSING_AGC2_ADAPTIVE_MODE_LEVEL_ESTIMATOR_H_ +#include + +#include "modules/audio_processing/agc2/agc2_common.h" // kFullBufferSizeMs... #include "modules/audio_processing/agc2/saturation_protector.h" #include "modules/audio_processing/agc2/vad_with_level.h" diff --git a/modules/audio_processing/agc2/adaptive_mode_level_estimator_agc.cc b/modules/audio_processing/agc2/adaptive_mode_level_estimator_agc.cc index 4cee9633f7..b7c64373fc 100644 --- a/modules/audio_processing/agc2/adaptive_mode_level_estimator_agc.cc +++ b/modules/audio_processing/agc2/adaptive_mode_level_estimator_agc.cc @@ -10,6 +10,10 @@ #include "modules/audio_processing/agc2/adaptive_mode_level_estimator_agc.h" +#include +#include + +#include "modules/audio_processing/agc2/agc2_common.h" #include "modules/audio_processing/include/audio_frame_view.h" namespace webrtc { diff --git a/modules/audio_processing/agc2/adaptive_mode_level_estimator_agc.h b/modules/audio_processing/agc2/adaptive_mode_level_estimator_agc.h index 484b128933..6d12339888 100644 --- a/modules/audio_processing/agc2/adaptive_mode_level_estimator_agc.h +++ b/modules/audio_processing/agc2/adaptive_mode_level_estimator_agc.h @@ -11,10 +11,12 @@ #ifndef MODULES_AUDIO_PROCESSING_AGC2_ADAPTIVE_MODE_LEVEL_ESTIMATOR_AGC_H_ #define MODULES_AUDIO_PROCESSING_AGC2_ADAPTIVE_MODE_LEVEL_ESTIMATOR_AGC_H_ -#include +#include +#include #include "modules/audio_processing/agc/agc.h" #include "modules/audio_processing/agc2/adaptive_mode_level_estimator.h" +#include "modules/audio_processing/agc2/saturation_protector.h" #include "modules/audio_processing/agc2/vad_with_level.h" namespace webrtc { diff --git a/modules/audio_processing/agc2/agc2_common.cc b/modules/audio_processing/agc2/agc2_common.cc index 5da353fa8f..af943df78f 100644 --- a/modules/audio_processing/agc2/agc2_common.cc +++ b/modules/audio_processing/agc2/agc2_common.cc @@ -10,6 +10,7 @@ #include "modules/audio_processing/agc2/agc2_common.h" +#include #include #include "system_wrappers/include/field_trial.h" diff --git a/modules/audio_processing/agc2/agc2_common.h b/modules/audio_processing/agc2/agc2_common.h index 71d33e594d..55dd648db4 100644 --- a/modules/audio_processing/agc2/agc2_common.h +++ b/modules/audio_processing/agc2/agc2_common.h @@ -13,8 +13,6 @@ #include -#include - namespace webrtc { constexpr float kMinFloatS16Value = -32768.f; diff --git a/modules/audio_processing/agc2/biquad_filter.cc b/modules/audio_processing/agc2/biquad_filter.cc index 9858d50584..da8557c190 100644 --- a/modules/audio_processing/agc2/biquad_filter.cc +++ b/modules/audio_processing/agc2/biquad_filter.cc @@ -10,6 +10,8 @@ #include "modules/audio_processing/agc2/biquad_filter.h" +#include + namespace webrtc { // Transposed direct form I implementation of a bi-quad filter applied to an diff --git a/modules/audio_processing/agc2/biquad_filter.h b/modules/audio_processing/agc2/biquad_filter.h index 284930c595..3d78c07607 100644 --- a/modules/audio_processing/agc2/biquad_filter.h +++ b/modules/audio_processing/agc2/biquad_filter.h @@ -11,6 +11,8 @@ #ifndef MODULES_AUDIO_PROCESSING_AGC2_BIQUAD_FILTER_H_ #define MODULES_AUDIO_PROCESSING_AGC2_BIQUAD_FILTER_H_ +#include + #include "api/array_view.h" #include "rtc_base/arraysize.h" #include "rtc_base/constructormagic.h" diff --git a/modules/audio_processing/agc2/fixed_digital_level_estimator.cc b/modules/audio_processing/agc2/fixed_digital_level_estimator.cc index 39cc764185..971f4f62b7 100644 --- a/modules/audio_processing/agc2/fixed_digital_level_estimator.cc +++ b/modules/audio_processing/agc2/fixed_digital_level_estimator.cc @@ -13,6 +13,7 @@ #include #include +#include "api/array_view.h" #include "modules/audio_processing/logging/apm_data_dumper.h" #include "rtc_base/checks.h" diff --git a/modules/audio_processing/agc2/fixed_gain_controller.cc b/modules/audio_processing/agc2/fixed_gain_controller.cc index 0d7e3a61b1..93e0081d39 100644 --- a/modules/audio_processing/agc2/fixed_gain_controller.cc +++ b/modules/audio_processing/agc2/fixed_gain_controller.cc @@ -10,13 +10,9 @@ #include "modules/audio_processing/agc2/fixed_gain_controller.h" -#include -#include - #include "api/array_view.h" #include "common_audio/include/audio_util.h" #include "modules/audio_processing/agc2/agc2_common.h" -#include "modules/audio_processing/agc2/interpolated_gain_curve.h" #include "modules/audio_processing/logging/apm_data_dumper.h" #include "rtc_base/checks.h" #include "rtc_base/logging.h" diff --git a/modules/audio_processing/agc2/gain_applier.cc b/modules/audio_processing/agc2/gain_applier.cc index 38eb1de03f..8c437177e3 100644 --- a/modules/audio_processing/agc2/gain_applier.cc +++ b/modules/audio_processing/agc2/gain_applier.cc @@ -10,6 +10,7 @@ #include "modules/audio_processing/agc2/gain_applier.h" +#include "api/array_view.h" #include "modules/audio_processing/agc2/agc2_common.h" #include "rtc_base/numerics/safe_minmax.h" diff --git a/modules/audio_processing/agc2/gain_applier.h b/modules/audio_processing/agc2/gain_applier.h index e2567b19db..7f9f00e076 100644 --- a/modules/audio_processing/agc2/gain_applier.h +++ b/modules/audio_processing/agc2/gain_applier.h @@ -11,6 +11,8 @@ #ifndef MODULES_AUDIO_PROCESSING_AGC2_GAIN_APPLIER_H_ #define MODULES_AUDIO_PROCESSING_AGC2_GAIN_APPLIER_H_ +#include + #include "modules/audio_processing/include/audio_frame_view.h" namespace webrtc { diff --git a/modules/audio_processing/agc2/interpolated_gain_curve.cc b/modules/audio_processing/agc2/interpolated_gain_curve.cc index 73e6a8ecc3..f5d6b47169 100644 --- a/modules/audio_processing/agc2/interpolated_gain_curve.cc +++ b/modules/audio_processing/agc2/interpolated_gain_curve.cc @@ -10,10 +10,12 @@ #include "modules/audio_processing/agc2/interpolated_gain_curve.h" +#include +#include + #include "modules/audio_processing/agc2/agc2_common.h" #include "modules/audio_processing/logging/apm_data_dumper.h" #include "rtc_base/checks.h" -#include "rtc_base/logging.h" namespace webrtc { diff --git a/modules/audio_processing/agc2/noise_level_estimator.cc b/modules/audio_processing/agc2/noise_level_estimator.cc index d9aaf1f9bd..6e43672ce0 100644 --- a/modules/audio_processing/agc2/noise_level_estimator.cc +++ b/modules/audio_processing/agc2/noise_level_estimator.cc @@ -10,13 +10,15 @@ #include "modules/audio_processing/agc2/noise_level_estimator.h" -#include - +#include #include +#include #include +#include "api/array_view.h" #include "common_audio/include/audio_util.h" #include "modules/audio_processing/logging/apm_data_dumper.h" +#include "rtc_base/checks.h" namespace webrtc { diff --git a/modules/audio_processing/agc2/noise_spectrum_estimator.cc b/modules/audio_processing/agc2/noise_spectrum_estimator.cc index 9e08126e89..5735faf3d2 100644 --- a/modules/audio_processing/agc2/noise_spectrum_estimator.cc +++ b/modules/audio_processing/agc2/noise_spectrum_estimator.cc @@ -16,6 +16,7 @@ #include "api/array_view.h" #include "modules/audio_processing/logging/apm_data_dumper.h" #include "rtc_base/arraysize.h" +#include "rtc_base/checks.h" namespace webrtc { namespace { diff --git a/modules/audio_processing/agc2/rnn_vad/features_extraction.cc b/modules/audio_processing/agc2/rnn_vad/features_extraction.cc index 8ab56736a2..8f472a55ed 100644 --- a/modules/audio_processing/agc2/rnn_vad/features_extraction.cc +++ b/modules/audio_processing/agc2/rnn_vad/features_extraction.cc @@ -10,6 +10,8 @@ #include "modules/audio_processing/agc2/rnn_vad/features_extraction.h" +#include + #include "modules/audio_processing/agc2/rnn_vad/lp_residual.h" #include "rtc_base/checks.h" diff --git a/modules/audio_processing/agc2/rnn_vad/features_extraction.h b/modules/audio_processing/agc2/rnn_vad/features_extraction.h index 1f63885c4e..ce5cce1857 100644 --- a/modules/audio_processing/agc2/rnn_vad/features_extraction.h +++ b/modules/audio_processing/agc2/rnn_vad/features_extraction.h @@ -11,12 +11,12 @@ #ifndef MODULES_AUDIO_PROCESSING_AGC2_RNN_VAD_FEATURES_EXTRACTION_H_ #define MODULES_AUDIO_PROCESSING_AGC2_RNN_VAD_FEATURES_EXTRACTION_H_ -#include #include #include "api/array_view.h" #include "modules/audio_processing/agc2/biquad_filter.h" #include "modules/audio_processing/agc2/rnn_vad/common.h" +#include "modules/audio_processing/agc2/rnn_vad/pitch_info.h" #include "modules/audio_processing/agc2/rnn_vad/pitch_search.h" #include "modules/audio_processing/agc2/rnn_vad/sequence_buffer.h" #include "modules/audio_processing/agc2/rnn_vad/spectral_features.h" diff --git a/modules/audio_processing/agc2/rnn_vad/fft_util.cc b/modules/audio_processing/agc2/rnn_vad/fft_util.cc index 1017400a28..a1c5dac477 100644 --- a/modules/audio_processing/agc2/rnn_vad/fft_util.cc +++ b/modules/audio_processing/agc2/rnn_vad/fft_util.cc @@ -10,6 +10,7 @@ #include "modules/audio_processing/agc2/rnn_vad/fft_util.h" +#include #include #include "rtc_base/checks.h" diff --git a/modules/audio_processing/agc2/rnn_vad/lp_residual.h b/modules/audio_processing/agc2/rnn_vad/lp_residual.h index bffafd291f..cddedca5d6 100644 --- a/modules/audio_processing/agc2/rnn_vad/lp_residual.h +++ b/modules/audio_processing/agc2/rnn_vad/lp_residual.h @@ -11,6 +11,8 @@ #ifndef MODULES_AUDIO_PROCESSING_AGC2_RNN_VAD_LP_RESIDUAL_H_ #define MODULES_AUDIO_PROCESSING_AGC2_RNN_VAD_LP_RESIDUAL_H_ +#include + #include "api/array_view.h" namespace webrtc { diff --git a/modules/audio_processing/agc2/rnn_vad/pitch_search.cc b/modules/audio_processing/agc2/rnn_vad/pitch_search.cc index 1f8859d5b0..aa0b751d28 100644 --- a/modules/audio_processing/agc2/rnn_vad/pitch_search.cc +++ b/modules/audio_processing/agc2/rnn_vad/pitch_search.cc @@ -10,6 +10,11 @@ #include "modules/audio_processing/agc2/rnn_vad/pitch_search.h" +#include +#include + +#include "rtc_base/checks.h" + namespace webrtc { namespace rnn_vad { diff --git a/modules/audio_processing/agc2/rnn_vad/pitch_search_internal.cc b/modules/audio_processing/agc2/rnn_vad/pitch_search_internal.cc index b7b44d2937..32ee8c00df 100644 --- a/modules/audio_processing/agc2/rnn_vad/pitch_search_internal.cc +++ b/modules/audio_processing/agc2/rnn_vad/pitch_search_internal.cc @@ -10,10 +10,12 @@ #include "modules/audio_processing/agc2/rnn_vad/pitch_search_internal.h" +#include #include #include +#include +#include #include -#include #include "modules/audio_processing/agc2/rnn_vad/common.h" #include "rtc_base/checks.h" diff --git a/modules/audio_processing/agc2/rnn_vad/pitch_search_internal.h b/modules/audio_processing/agc2/rnn_vad/pitch_search_internal.h index 75f7f17a42..bb747bb03e 100644 --- a/modules/audio_processing/agc2/rnn_vad/pitch_search_internal.h +++ b/modules/audio_processing/agc2/rnn_vad/pitch_search_internal.h @@ -11,6 +11,7 @@ #ifndef MODULES_AUDIO_PROCESSING_AGC2_RNN_VAD_PITCH_SEARCH_INTERNAL_H_ #define MODULES_AUDIO_PROCESSING_AGC2_RNN_VAD_PITCH_SEARCH_INTERNAL_H_ +#include #include #include "api/array_view.h" diff --git a/modules/audio_processing/agc2/rnn_vad/rnn.h b/modules/audio_processing/agc2/rnn_vad/rnn.h index b3a3b9c485..a7d057d576 100644 --- a/modules/audio_processing/agc2/rnn_vad/rnn.h +++ b/modules/audio_processing/agc2/rnn_vad/rnn.h @@ -11,6 +11,8 @@ #ifndef MODULES_AUDIO_PROCESSING_AGC2_RNN_VAD_RNN_H_ #define MODULES_AUDIO_PROCESSING_AGC2_RNN_VAD_RNN_H_ +#include +#include #include #include "api/array_view.h" diff --git a/modules/audio_processing/agc2/rnn_vad/spectral_features.h b/modules/audio_processing/agc2/rnn_vad/spectral_features.h index bedd7ab3d7..5c33dcdd24 100644 --- a/modules/audio_processing/agc2/rnn_vad/spectral_features.h +++ b/modules/audio_processing/agc2/rnn_vad/spectral_features.h @@ -13,6 +13,7 @@ #include #include +#include #include #include "api/array_view.h" diff --git a/modules/audio_processing/agc2/rnn_vad/spectral_features_internal.cc b/modules/audio_processing/agc2/rnn_vad/spectral_features_internal.cc index 9f4e21850f..74211fe814 100644 --- a/modules/audio_processing/agc2/rnn_vad/spectral_features_internal.cc +++ b/modules/audio_processing/agc2/rnn_vad/spectral_features_internal.cc @@ -12,6 +12,7 @@ #include #include +#include #include "rtc_base/checks.h" diff --git a/modules/audio_processing/agc2/rnn_vad/spectral_features_internal.h b/modules/audio_processing/agc2/rnn_vad/spectral_features_internal.h index 45bb382078..edfd18cc85 100644 --- a/modules/audio_processing/agc2/rnn_vad/spectral_features_internal.h +++ b/modules/audio_processing/agc2/rnn_vad/spectral_features_internal.h @@ -11,6 +11,7 @@ #ifndef MODULES_AUDIO_PROCESSING_AGC2_RNN_VAD_SPECTRAL_FEATURES_INTERNAL_H_ #define MODULES_AUDIO_PROCESSING_AGC2_RNN_VAD_SPECTRAL_FEATURES_INTERNAL_H_ +#include #include #include diff --git a/modules/audio_processing/agc2/saturation_protector.cc b/modules/audio_processing/agc2/saturation_protector.cc index 0895583b83..8efb572921 100644 --- a/modules/audio_processing/agc2/saturation_protector.cc +++ b/modules/audio_processing/agc2/saturation_protector.cc @@ -11,6 +11,7 @@ #include "modules/audio_processing/agc2/saturation_protector.h" #include +#include #include "modules/audio_processing/logging/apm_data_dumper.h" #include "rtc_base/numerics/safe_minmax.h" diff --git a/modules/audio_processing/agc2/signal_classifier.cc b/modules/audio_processing/agc2/signal_classifier.cc index 0ec34148b9..8778c49426 100644 --- a/modules/audio_processing/agc2/signal_classifier.cc +++ b/modules/audio_processing/agc2/signal_classifier.cc @@ -18,7 +18,7 @@ #include "modules/audio_processing/agc2/down_sampler.h" #include "modules/audio_processing/agc2/noise_spectrum_estimator.h" #include "modules/audio_processing/logging/apm_data_dumper.h" -#include "rtc_base/constructormagic.h" +#include "rtc_base/checks.h" namespace webrtc { namespace { diff --git a/modules/audio_processing/agc2/vad_with_level.cc b/modules/audio_processing/agc2/vad_with_level.cc index decfacd0c1..52970dfe67 100644 --- a/modules/audio_processing/agc2/vad_with_level.cc +++ b/modules/audio_processing/agc2/vad_with_level.cc @@ -11,10 +11,12 @@ #include "modules/audio_processing/agc2/vad_with_level.h" #include +#include +#include +#include "api/array_view.h" #include "common_audio/include/audio_util.h" #include "modules/audio_processing/agc2/rnn_vad/common.h" -#include "rtc_base/checks.h" namespace webrtc { diff --git a/modules/audio_processing/agc2/vad_with_level.h b/modules/audio_processing/agc2/vad_with_level.h index 67a00ced6c..b0ad868d4b 100644 --- a/modules/audio_processing/agc2/vad_with_level.h +++ b/modules/audio_processing/agc2/vad_with_level.h @@ -11,7 +11,6 @@ #ifndef MODULES_AUDIO_PROCESSING_AGC2_VAD_WITH_LEVEL_H_ #define MODULES_AUDIO_PROCESSING_AGC2_VAD_WITH_LEVEL_H_ -#include "api/array_view.h" #include "common_audio/resampler/include/push_resampler.h" #include "modules/audio_processing/agc2/rnn_vad/features_extraction.h" #include "modules/audio_processing/agc2/rnn_vad/rnn.h" diff --git a/modules/audio_processing/audio_buffer.cc b/modules/audio_processing/audio_buffer.cc index f163f5a07d..0c38a4fe82 100644 --- a/modules/audio_processing/audio_buffer.cc +++ b/modules/audio_processing/audio_buffer.cc @@ -10,11 +10,13 @@ #include "modules/audio_processing/audio_buffer.h" +#include +#include + #include "common_audio/channel_buffer.h" #include "common_audio/include/audio_util.h" #include "common_audio/resampler/push_sinc_resampler.h" -#include "common_audio/signal_processing/include/signal_processing_library.h" -#include "modules/audio_processing/common.h" +#include "modules/audio_processing/splitting_filter.h" #include "rtc_base/checks.h" namespace webrtc { diff --git a/modules/audio_processing/audio_buffer.h b/modules/audio_processing/audio_buffer.h index ade3eec13d..469646e8db 100644 --- a/modules/audio_processing/audio_buffer.h +++ b/modules/audio_processing/audio_buffer.h @@ -11,18 +11,21 @@ #ifndef MODULES_AUDIO_PROCESSING_AUDIO_BUFFER_H_ #define MODULES_AUDIO_PROCESSING_AUDIO_BUFFER_H_ +#include +#include #include #include #include "api/audio/audio_frame.h" #include "common_audio/channel_buffer.h" #include "modules/audio_processing/include/audio_processing.h" -#include "modules/audio_processing/splitting_filter.h" +#include "rtc_base/gtest_prod_util.h" namespace webrtc { -class PushSincResampler; class IFChannelBuffer; +class PushSincResampler; +class SplittingFilter; enum Band { kBand0To8kHz = 0, kBand8To16kHz = 1, kBand16To24kHz = 2 }; diff --git a/modules/audio_processing/audio_processing_impl.cc b/modules/audio_processing/audio_processing_impl.cc index 328c4cb5da..3207a59bfa 100644 --- a/modules/audio_processing/audio_processing_impl.cc +++ b/modules/audio_processing/audio_processing_impl.cc @@ -10,15 +10,16 @@ #include "modules/audio_processing/audio_processing_impl.h" -#include #include +#include #include +#include +#include +#include "absl/types/optional.h" +#include "api/array_view.h" #include "common_audio/audio_converter.h" -#include "common_audio/channel_buffer.h" #include "common_audio/include/audio_util.h" -#include "common_audio/signal_processing/include/signal_processing_library.h" -#include "modules/audio_processing/aec/aec_core.h" #include "modules/audio_processing/agc/agc_manager_direct.h" #include "modules/audio_processing/agc2/gain_applier.h" #include "modules/audio_processing/audio_buffer.h" @@ -28,6 +29,7 @@ #include "modules/audio_processing/gain_control_for_experimental_agc.h" #include "modules/audio_processing/gain_control_impl.h" #include "modules/audio_processing/gain_controller2.h" +#include "modules/audio_processing/include/audio_frame_view.h" #include "modules/audio_processing/level_estimator_impl.h" #include "modules/audio_processing/logging/apm_data_dumper.h" #include "modules/audio_processing/low_cut_filter.h" @@ -37,10 +39,9 @@ #include "modules/audio_processing/voice_detection_impl.h" #include "rtc_base/atomicops.h" #include "rtc_base/checks.h" +#include "rtc_base/constructormagic.h" #include "rtc_base/logging.h" -#include "rtc_base/platform_file.h" #include "rtc_base/refcountedobject.h" -#include "rtc_base/system/arch.h" #include "rtc_base/timeutils.h" #include "rtc_base/trace_event.h" #include "system_wrappers/include/metrics.h" diff --git a/modules/audio_processing/echo_cancellation_impl.cc b/modules/audio_processing/echo_cancellation_impl.cc index e6fe7691c4..e23cd02957 100644 --- a/modules/audio_processing/echo_cancellation_impl.cc +++ b/modules/audio_processing/echo_cancellation_impl.cc @@ -10,11 +10,13 @@ #include "modules/audio_processing/echo_cancellation_impl.h" +#include #include #include "modules/audio_processing/aec/aec_core.h" #include "modules/audio_processing/aec/echo_cancellation.h" #include "modules/audio_processing/audio_buffer.h" +#include "modules/audio_processing/include/config.h" #include "rtc_base/checks.h" #include "system_wrappers/include/field_trial.h" diff --git a/modules/audio_processing/echo_cancellation_impl.h b/modules/audio_processing/echo_cancellation_impl.h index 091a7b5116..34bd0bf856 100644 --- a/modules/audio_processing/echo_cancellation_impl.h +++ b/modules/audio_processing/echo_cancellation_impl.h @@ -11,12 +11,16 @@ #ifndef MODULES_AUDIO_PROCESSING_ECHO_CANCELLATION_IMPL_H_ #define MODULES_AUDIO_PROCESSING_ECHO_CANCELLATION_IMPL_H_ +#include #include +#include #include +#include "api/array_view.h" #include "modules/audio_processing/include/audio_processing.h" #include "rtc_base/constructormagic.h" #include "rtc_base/criticalsection.h" +#include "rtc_base/thread_annotations.h" namespace webrtc { diff --git a/modules/audio_processing/echo_control_mobile_impl.cc b/modules/audio_processing/echo_control_mobile_impl.cc index bd125c6e0d..3bfb65f303 100644 --- a/modules/audio_processing/echo_control_mobile_impl.cc +++ b/modules/audio_processing/echo_control_mobile_impl.cc @@ -11,11 +11,13 @@ #include "modules/audio_processing/echo_control_mobile_impl.h" #include +#include #include "modules/audio_processing/aecm/echo_control_mobile.h" #include "modules/audio_processing/audio_buffer.h" +#include "modules/audio_processing/include/audio_processing.h" +#include "rtc_base/checks.h" #include "rtc_base/constructormagic.h" -#include "rtc_base/logging.h" namespace webrtc { diff --git a/modules/audio_processing/echo_control_mobile_impl.h b/modules/audio_processing/echo_control_mobile_impl.h index a5b66c8311..6d49ef7695 100644 --- a/modules/audio_processing/echo_control_mobile_impl.h +++ b/modules/audio_processing/echo_control_mobile_impl.h @@ -11,14 +11,15 @@ #ifndef MODULES_AUDIO_PROCESSING_ECHO_CONTROL_MOBILE_IMPL_H_ #define MODULES_AUDIO_PROCESSING_ECHO_CONTROL_MOBILE_IMPL_H_ +#include +#include #include #include -#include "modules/audio_processing/include/audio_processing.h" -#include "modules/audio_processing/render_queue_item_verifier.h" +#include "api/array_view.h" #include "rtc_base/constructormagic.h" #include "rtc_base/criticalsection.h" -#include "rtc_base/swap_queue.h" +#include "rtc_base/thread_annotations.h" namespace webrtc { diff --git a/modules/audio_processing/echo_detector/circular_buffer.h b/modules/audio_processing/echo_detector/circular_buffer.h index 9f5cdfa953..c52311f863 100644 --- a/modules/audio_processing/echo_detector/circular_buffer.h +++ b/modules/audio_processing/echo_detector/circular_buffer.h @@ -11,6 +11,7 @@ #ifndef MODULES_AUDIO_PROCESSING_ECHO_DETECTOR_CIRCULAR_BUFFER_H_ #define MODULES_AUDIO_PROCESSING_ECHO_DETECTOR_CIRCULAR_BUFFER_H_ +#include #include #include "absl/types/optional.h" diff --git a/modules/audio_processing/gain_control_for_experimental_agc.cc b/modules/audio_processing/gain_control_for_experimental_agc.cc index 4ab856c2c3..1479d58b54 100644 --- a/modules/audio_processing/gain_control_for_experimental_agc.cc +++ b/modules/audio_processing/gain_control_for_experimental_agc.cc @@ -13,7 +13,6 @@ #include "modules/audio_processing/include/audio_processing.h" #include "modules/audio_processing/logging/apm_data_dumper.h" #include "rtc_base/atomicops.h" -#include "rtc_base/checks.h" #include "rtc_base/criticalsection.h" namespace webrtc { diff --git a/modules/audio_processing/gain_control_impl.cc b/modules/audio_processing/gain_control_impl.cc index 685a27ff66..d5118ba073 100644 --- a/modules/audio_processing/gain_control_impl.cc +++ b/modules/audio_processing/gain_control_impl.cc @@ -10,10 +10,14 @@ #include "modules/audio_processing/gain_control_impl.h" +#include + #include "absl/types/optional.h" #include "modules/audio_processing/agc/legacy/gain_control.h" #include "modules/audio_processing/audio_buffer.h" +#include "modules/audio_processing/include/audio_processing.h" #include "modules/audio_processing/logging/apm_data_dumper.h" +#include "rtc_base/checks.h" #include "rtc_base/constructormagic.h" namespace webrtc { diff --git a/modules/audio_processing/gain_control_impl.h b/modules/audio_processing/gain_control_impl.h index 959422fb44..c21d911326 100644 --- a/modules/audio_processing/gain_control_impl.h +++ b/modules/audio_processing/gain_control_impl.h @@ -11,14 +11,16 @@ #ifndef MODULES_AUDIO_PROCESSING_GAIN_CONTROL_IMPL_H_ #define MODULES_AUDIO_PROCESSING_GAIN_CONTROL_IMPL_H_ +#include +#include #include #include -#include "modules/audio_processing/include/audio_processing.h" -#include "modules/audio_processing/render_queue_item_verifier.h" +#include "absl/types/optional.h" +#include "api/array_view.h" +#include "modules/audio_processing/include/gain_control.h" #include "rtc_base/constructormagic.h" #include "rtc_base/criticalsection.h" -#include "rtc_base/swap_queue.h" #include "rtc_base/thread_annotations.h" namespace webrtc { diff --git a/modules/audio_processing/include/aec_dump.h b/modules/audio_processing/include/aec_dump.h index 313e9d7b1d..b734adfbbb 100644 --- a/modules/audio_processing/include/aec_dump.h +++ b/modules/audio_processing/include/aec_dump.h @@ -11,14 +11,13 @@ #ifndef MODULES_AUDIO_PROCESSING_INCLUDE_AEC_DUMP_H_ #define MODULES_AUDIO_PROCESSING_INCLUDE_AEC_DUMP_H_ -#include +#include #include -#include -#include "api/array_view.h" #include "api/audio/audio_frame.h" #include "modules/audio_processing/include/audio_frame_view.h" #include "modules/audio_processing/include/audio_processing.h" +#include "rtc_base/deprecation.h" namespace webrtc { diff --git a/modules/audio_processing/include/audio_processing.cc b/modules/audio_processing/include/audio_processing.cc index 75eedafc29..27cd8824fe 100644 --- a/modules/audio_processing/include/audio_processing.cc +++ b/modules/audio_processing/include/audio_processing.cc @@ -10,8 +10,6 @@ #include "modules/audio_processing/include/audio_processing.h" -#include "rtc_base/checks.h" - namespace webrtc { void CustomProcessing::SetRuntimeSetting( diff --git a/modules/audio_processing/include/audio_processing_statistics.h b/modules/audio_processing/include/audio_processing_statistics.h index 2318badb0c..2ff20099e2 100644 --- a/modules/audio_processing/include/audio_processing_statistics.h +++ b/modules/audio_processing/include/audio_processing_statistics.h @@ -11,6 +11,8 @@ #ifndef MODULES_AUDIO_PROCESSING_INCLUDE_AUDIO_PROCESSING_STATISTICS_H_ #define MODULES_AUDIO_PROCESSING_INCLUDE_AUDIO_PROCESSING_STATISTICS_H_ +#include + #include "absl/types/optional.h" #include "rtc_base/system/rtc_export.h" diff --git a/modules/audio_processing/level_estimator_impl.cc b/modules/audio_processing/level_estimator_impl.cc index c937f84525..5b49b35fdc 100644 --- a/modules/audio_processing/level_estimator_impl.cc +++ b/modules/audio_processing/level_estimator_impl.cc @@ -10,9 +10,13 @@ #include "modules/audio_processing/level_estimator_impl.h" +#include +#include + #include "api/array_view.h" #include "modules/audio_processing/audio_buffer.h" #include "modules/audio_processing/rms_level.h" +#include "rtc_base/checks.h" namespace webrtc { diff --git a/modules/audio_processing/logging/apm_data_dumper.cc b/modules/audio_processing/logging/apm_data_dumper.cc index e2e8602b98..d7174c6449 100644 --- a/modules/audio_processing/logging/apm_data_dumper.cc +++ b/modules/audio_processing/logging/apm_data_dumper.cc @@ -10,9 +10,6 @@ #include "modules/audio_processing/logging/apm_data_dumper.h" -#include "rtc_base/strings/string_builder.h" -#include "rtc_base/stringutils.h" - // Check to verify that the define is properly set. #if !defined(WEBRTC_APM_DEBUG_DUMP) || \ (WEBRTC_APM_DEBUG_DUMP != 0 && WEBRTC_APM_DEBUG_DUMP != 1) diff --git a/modules/audio_processing/logging/apm_data_dumper.h b/modules/audio_processing/logging/apm_data_dumper.h index d045027b35..8a751c6478 100644 --- a/modules/audio_processing/logging/apm_data_dumper.h +++ b/modules/audio_processing/logging/apm_data_dumper.h @@ -11,14 +11,10 @@ #ifndef MODULES_AUDIO_PROCESSING_LOGGING_APM_DATA_DUMPER_H_ #define MODULES_AUDIO_PROCESSING_LOGGING_APM_DATA_DUMPER_H_ +#include #include -#include -#include -#include - #include "api/array_view.h" -#include "common_audio/wav_file.h" #include "rtc_base/constructormagic.h" // Check to verify that the define is properly set. diff --git a/modules/audio_processing/low_cut_filter.cc b/modules/audio_processing/low_cut_filter.cc index 5245c68d02..581d6bc42a 100644 --- a/modules/audio_processing/low_cut_filter.cc +++ b/modules/audio_processing/low_cut_filter.cc @@ -10,8 +10,13 @@ #include "modules/audio_processing/low_cut_filter.h" +#include +#include + #include "common_audio/signal_processing/include/signal_processing_library.h" #include "modules/audio_processing/audio_buffer.h" +#include "modules/audio_processing/include/audio_processing.h" +#include "rtc_base/checks.h" namespace webrtc { namespace { diff --git a/modules/audio_processing/noise_suppression_impl.cc b/modules/audio_processing/noise_suppression_impl.cc index 15d404323c..d8d9e32340 100644 --- a/modules/audio_processing/noise_suppression_impl.cc +++ b/modules/audio_processing/noise_suppression_impl.cc @@ -11,9 +11,11 @@ #include "modules/audio_processing/noise_suppression_impl.h" #include "modules/audio_processing/audio_buffer.h" +#include "rtc_base/checks.h" #include "rtc_base/constructormagic.h" #if defined(WEBRTC_NS_FLOAT) #include "modules/audio_processing/ns/noise_suppression.h" + #define NS_CREATE WebRtcNs_Create #define NS_FREE WebRtcNs_Free #define NS_INIT WebRtcNs_Init @@ -21,6 +23,7 @@ typedef NsHandle NsState; #elif defined(WEBRTC_NS_FIXED) #include "modules/audio_processing/ns/noise_suppression_x.h" + #define NS_CREATE WebRtcNsx_Create #define NS_FREE WebRtcNsx_Free #define NS_INIT WebRtcNsx_Init diff --git a/modules/audio_processing/residual_echo_detector.cc b/modules/audio_processing/residual_echo_detector.cc index e80501358e..3454214fd7 100644 --- a/modules/audio_processing/residual_echo_detector.cc +++ b/modules/audio_processing/residual_echo_detector.cc @@ -13,9 +13,11 @@ #include #include +#include "absl/types/optional.h" #include "modules/audio_processing/audio_buffer.h" #include "modules/audio_processing/logging/apm_data_dumper.h" #include "rtc_base/atomicops.h" +#include "rtc_base/checks.h" #include "rtc_base/logging.h" #include "system_wrappers/include/metrics.h" diff --git a/modules/audio_processing/rms_level.h b/modules/audio_processing/rms_level.h index 9aa549a57c..e6b5849ead 100644 --- a/modules/audio_processing/rms_level.h +++ b/modules/audio_processing/rms_level.h @@ -11,6 +11,9 @@ #ifndef MODULES_AUDIO_PROCESSING_RMS_LEVEL_H_ #define MODULES_AUDIO_PROCESSING_RMS_LEVEL_H_ +#include +#include + #include "absl/types/optional.h" #include "api/array_view.h" diff --git a/modules/audio_processing/transient/moving_moments.cc b/modules/audio_processing/transient/moving_moments.cc index a199bb0c1b..83810bfe3c 100644 --- a/modules/audio_processing/transient/moving_moments.cc +++ b/modules/audio_processing/transient/moving_moments.cc @@ -10,7 +10,7 @@ #include "modules/audio_processing/transient/moving_moments.h" -#include +#include #include "rtc_base/checks.h" diff --git a/modules/audio_processing/transient/transient_detector.cc b/modules/audio_processing/transient/transient_detector.cc index c3bf282b0e..8997d4c092 100644 --- a/modules/audio_processing/transient/transient_detector.cc +++ b/modules/audio_processing/transient/transient_detector.cc @@ -13,12 +13,12 @@ #include #include #include - #include #include "modules/audio_processing/transient/common.h" #include "modules/audio_processing/transient/daubechies_8_wavelet_coeffs.h" #include "modules/audio_processing/transient/moving_moments.h" +#include "modules/audio_processing/transient/wpd_node.h" #include "modules/audio_processing/transient/wpd_tree.h" #include "rtc_base/checks.h" diff --git a/modules/audio_processing/transient/transient_detector.h b/modules/audio_processing/transient/transient_detector.h index 3267b3a6cd..23b88f82b1 100644 --- a/modules/audio_processing/transient/transient_detector.h +++ b/modules/audio_processing/transient/transient_detector.h @@ -11,6 +11,7 @@ #ifndef MODULES_AUDIO_PROCESSING_TRANSIENT_TRANSIENT_DETECTOR_H_ #define MODULES_AUDIO_PROCESSING_TRANSIENT_TRANSIENT_DETECTOR_H_ +#include #include #include diff --git a/modules/audio_processing/transient/transient_suppressor.h b/modules/audio_processing/transient/transient_suppressor.h index 9ae3fc660a..ae51966a3d 100644 --- a/modules/audio_processing/transient/transient_suppressor.h +++ b/modules/audio_processing/transient/transient_suppressor.h @@ -11,9 +11,9 @@ #ifndef MODULES_AUDIO_PROCESSING_TRANSIENT_TRANSIENT_SUPPRESSOR_H_ #define MODULES_AUDIO_PROCESSING_TRANSIENT_TRANSIENT_SUPPRESSOR_H_ -#include +#include +#include #include -#include #include "rtc_base/gtest_prod_util.h" diff --git a/modules/audio_processing/transient/wpd_tree.cc b/modules/audio_processing/transient/wpd_tree.cc index 72f4d76891..c8aa615881 100644 --- a/modules/audio_processing/transient/wpd_tree.cc +++ b/modules/audio_processing/transient/wpd_tree.cc @@ -10,10 +10,8 @@ #include "modules/audio_processing/transient/wpd_tree.h" -#include #include -#include "modules/audio_processing/transient/dyadic_decimator.h" #include "modules/audio_processing/transient/wpd_node.h" #include "rtc_base/checks.h" diff --git a/modules/audio_processing/transient/wpd_tree.h b/modules/audio_processing/transient/wpd_tree.h index 707a89d44a..b62135dafa 100644 --- a/modules/audio_processing/transient/wpd_tree.h +++ b/modules/audio_processing/transient/wpd_tree.h @@ -11,6 +11,7 @@ #ifndef MODULES_AUDIO_PROCESSING_TRANSIENT_WPD_TREE_H_ #define MODULES_AUDIO_PROCESSING_TRANSIENT_WPD_TREE_H_ +#include #include #include "modules/audio_processing/transient/wpd_node.h" diff --git a/modules/audio_processing/utility/ooura_fft.cc b/modules/audio_processing/utility/ooura_fft.cc index c3333cea5b..8628bd39f0 100644 --- a/modules/audio_processing/utility/ooura_fft.cc +++ b/modules/audio_processing/utility/ooura_fft.cc @@ -23,8 +23,6 @@ #include "modules/audio_processing/utility/ooura_fft.h" -#include - #include "modules/audio_processing/utility/ooura_fft_tables_common.h" #include "rtc_base/system/arch.h" #include "system_wrappers/include/cpu_features_wrapper.h" diff --git a/modules/audio_processing/utility/ooura_fft_sse2.cc b/modules/audio_processing/utility/ooura_fft_sse2.cc index 9b5d0f37a4..0e4a44becc 100644 --- a/modules/audio_processing/utility/ooura_fft_sse2.cc +++ b/modules/audio_processing/utility/ooura_fft_sse2.cc @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "modules/audio_processing/utility/ooura_fft.h" - #include +#include +#include "modules/audio_processing/utility/ooura_fft.h" #include "modules/audio_processing/utility/ooura_fft_tables_common.h" #include "modules/audio_processing/utility/ooura_fft_tables_neon_sse2.h" #include "rtc_base/system/arch.h" diff --git a/modules/audio_processing/vad/gmm.cc b/modules/audio_processing/vad/gmm.cc index cd8a1a8a37..3b8764c4d0 100644 --- a/modules/audio_processing/vad/gmm.cc +++ b/modules/audio_processing/vad/gmm.cc @@ -11,7 +11,6 @@ #include "modules/audio_processing/vad/gmm.h" #include -#include namespace webrtc { diff --git a/modules/audio_processing/vad/pitch_based_vad.cc b/modules/audio_processing/vad/pitch_based_vad.cc index 025ef2059d..68e60dc66a 100644 --- a/modules/audio_processing/vad/pitch_based_vad.cc +++ b/modules/audio_processing/vad/pitch_based_vad.cc @@ -10,7 +10,6 @@ #include "modules/audio_processing/vad/pitch_based_vad.h" -#include #include #include "modules/audio_processing/vad/common.h" diff --git a/modules/audio_processing/vad/pitch_based_vad.h b/modules/audio_processing/vad/pitch_based_vad.h index 4d327652c6..22bc0f2263 100644 --- a/modules/audio_processing/vad/pitch_based_vad.h +++ b/modules/audio_processing/vad/pitch_based_vad.h @@ -18,7 +18,6 @@ namespace webrtc { -class AudioFrame; class VadCircularBuffer; // Computes the probability of the input audio frame to be active given diff --git a/modules/audio_processing/vad/pole_zero_filter.cc b/modules/audio_processing/vad/pole_zero_filter.cc index b9967d7aea..4156d7e795 100644 --- a/modules/audio_processing/vad/pole_zero_filter.cc +++ b/modules/audio_processing/vad/pole_zero_filter.cc @@ -10,7 +10,6 @@ #include "modules/audio_processing/vad/pole_zero_filter.h" -#include #include #include diff --git a/modules/audio_processing/vad/standalone_vad.cc b/modules/audio_processing/vad/standalone_vad.cc index 19a5282c3f..1397668eb4 100644 --- a/modules/audio_processing/vad/standalone_vad.cc +++ b/modules/audio_processing/vad/standalone_vad.cc @@ -12,7 +12,7 @@ #include -#include "audio/utility/audio_frame_operations.h" +#include "common_audio/vad/include/webrtc_vad.h" #include "rtc_base/checks.h" namespace webrtc { diff --git a/modules/audio_processing/vad/standalone_vad.h b/modules/audio_processing/vad/standalone_vad.h index 79650fbe8c..3dff4163c2 100644 --- a/modules/audio_processing/vad/standalone_vad.h +++ b/modules/audio_processing/vad/standalone_vad.h @@ -11,13 +11,14 @@ #ifndef MODULES_AUDIO_PROCESSING_AGC_STANDALONE_VAD_H_ #define MODULES_AUDIO_PROCESSING_AGC_STANDALONE_VAD_H_ +#include +#include + #include "common_audio/vad/include/webrtc_vad.h" #include "modules/audio_processing/vad/common.h" namespace webrtc { -class AudioFrame; - class StandaloneVad { public: static StandaloneVad* Create(); diff --git a/modules/audio_processing/vad/vad_audio_proc.h b/modules/audio_processing/vad/vad_audio_proc.h index e34091bdb6..9be3467ef8 100644 --- a/modules/audio_processing/vad/vad_audio_proc.h +++ b/modules/audio_processing/vad/vad_audio_proc.h @@ -11,13 +11,14 @@ #ifndef MODULES_AUDIO_PROCESSING_VAD_VAD_AUDIO_PROC_H_ #define MODULES_AUDIO_PROCESSING_VAD_VAD_AUDIO_PROC_H_ +#include +#include #include -#include "modules/audio_processing/vad/common.h" +#include "modules/audio_processing/vad/common.h" // AudioFeatures, kSampleR... namespace webrtc { -class AudioFrame; class PoleZeroFilter; class VadAudioProc { diff --git a/modules/audio_processing/vad/voice_activity_detector.h b/modules/audio_processing/vad/voice_activity_detector.h index e424ac1a28..d140fe2aa3 100644 --- a/modules/audio_processing/vad/voice_activity_detector.h +++ b/modules/audio_processing/vad/voice_activity_detector.h @@ -11,6 +11,8 @@ #ifndef MODULES_AUDIO_PROCESSING_VAD_VOICE_ACTIVITY_DETECTOR_H_ #define MODULES_AUDIO_PROCESSING_VAD_VOICE_ACTIVITY_DETECTOR_H_ +#include +#include #include #include diff --git a/modules/audio_processing/voice_detection_impl.cc b/modules/audio_processing/voice_detection_impl.cc index 9280be1ef9..c55ca4aee8 100644 --- a/modules/audio_processing/voice_detection_impl.cc +++ b/modules/audio_processing/voice_detection_impl.cc @@ -10,8 +10,10 @@ #include "modules/audio_processing/voice_detection_impl.h" +#include "api/audio/audio_frame.h" #include "common_audio/vad/include/webrtc_vad.h" #include "modules/audio_processing/audio_buffer.h" +#include "rtc_base/checks.h" #include "rtc_base/constructormagic.h" namespace webrtc { diff --git a/modules/audio_processing/voice_detection_impl.h b/modules/audio_processing/voice_detection_impl.h index 4b724bdd25..c438473679 100644 --- a/modules/audio_processing/voice_detection_impl.h +++ b/modules/audio_processing/voice_detection_impl.h @@ -11,11 +11,13 @@ #ifndef MODULES_AUDIO_PROCESSING_VOICE_DETECTION_IMPL_H_ #define MODULES_AUDIO_PROCESSING_VOICE_DETECTION_IMPL_H_ +#include #include #include "modules/audio_processing/include/audio_processing.h" #include "rtc_base/constructormagic.h" #include "rtc_base/criticalsection.h" +#include "rtc_base/thread_annotations.h" namespace webrtc { @@ -42,6 +44,7 @@ class VoiceDetectionImpl : public VoiceDetection { private: class Vad; + rtc::CriticalSection* const crit_; bool enabled_ RTC_GUARDED_BY(crit_) = false; bool stream_has_voice_ RTC_GUARDED_BY(crit_) = false; diff --git a/modules/bitrate_controller/BUILD.gn b/modules/bitrate_controller/BUILD.gn index 5bf57f623c..460dfc4c22 100644 --- a/modules/bitrate_controller/BUILD.gn +++ b/modules/bitrate_controller/BUILD.gn @@ -31,9 +31,14 @@ rtc_static_library("bitrate_controller") { deps = [ "..:module_api", + "../../api/transport:network_control", + "../../api/units:data_rate", + "../../api/units:time_delta", + "../../api/units:timestamp", "../../logging:rtc_event_bwe", "../../logging:rtc_event_log_api", "../../rtc_base:checks", + "../../rtc_base:deprecation", "../../rtc_base:rtc_base_approved", "../../rtc_base/experiments:field_trial_parser", "../../system_wrappers", diff --git a/modules/bitrate_controller/include/bitrate_controller.h b/modules/bitrate_controller/include/bitrate_controller.h index f67600d190..3e11fa76a3 100644 --- a/modules/bitrate_controller/include/bitrate_controller.h +++ b/modules/bitrate_controller/include/bitrate_controller.h @@ -15,15 +15,17 @@ #ifndef MODULES_BITRATE_CONTROLLER_INCLUDE_BITRATE_CONTROLLER_H_ #define MODULES_BITRATE_CONTROLLER_INCLUDE_BITRATE_CONTROLLER_H_ -#include +#include +#include #include "modules/congestion_controller/goog_cc/delay_based_bwe.h" #include "modules/include/module.h" -#include "modules/pacing/paced_sender.h" #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" +#include "rtc_base/deprecation.h" namespace webrtc { +class Clock; class RtcEventLog; // Deprecated diff --git a/modules/bitrate_controller/send_side_bandwidth_estimation.cc b/modules/bitrate_controller/send_side_bandwidth_estimation.cc index f90ccce549..ce7c5101db 100644 --- a/modules/bitrate_controller/send_side_bandwidth_estimation.cc +++ b/modules/bitrate_controller/send_side_bandwidth_estimation.cc @@ -11,12 +11,12 @@ #include "modules/bitrate_controller/send_side_bandwidth_estimation.h" #include -#include #include #include #include #include "absl/memory/memory.h" +#include "logging/rtc_event_log/events/rtc_event.h" #include "logging/rtc_event_log/events/rtc_event_bwe_update_loss_based.h" #include "logging/rtc_event_log/rtc_event_log.h" #include "modules/remote_bitrate_estimator/include/bwe_defines.h" diff --git a/modules/bitrate_controller/send_side_bandwidth_estimation.h b/modules/bitrate_controller/send_side_bandwidth_estimation.h index 25ee7cf97b..9ee43bbcdc 100644 --- a/modules/bitrate_controller/send_side_bandwidth_estimation.h +++ b/modules/bitrate_controller/send_side_bandwidth_estimation.h @@ -13,14 +13,17 @@ #ifndef MODULES_BITRATE_CONTROLLER_SEND_SIDE_BANDWIDTH_ESTIMATION_H_ #define MODULES_BITRATE_CONTROLLER_SEND_SIDE_BANDWIDTH_ESTIMATION_H_ +#include #include #include #include #include "absl/types/optional.h" -#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" +#include "api/transport/network_types.h" +#include "api/units/data_rate.h" +#include "api/units/time_delta.h" +#include "api/units/timestamp.h" #include "rtc_base/experiments/field_trial_parser.h" -#include "rtc_base/experiments/field_trial_units.h" namespace webrtc { diff --git a/modules/congestion_controller/goog_cc/BUILD.gn b/modules/congestion_controller/goog_cc/BUILD.gn index 6e4af2f685..8b34c38f2f 100644 --- a/modules/congestion_controller/goog_cc/BUILD.gn +++ b/modules/congestion_controller/goog_cc/BUILD.gn @@ -120,6 +120,7 @@ rtc_source_set("delay_based_bwe") { deps = [ ":estimators", + "../../../api/transport:network_control", "../../../logging:rtc_event_bwe", "../../../logging:rtc_event_log_api", "../../../rtc_base:checks", @@ -128,7 +129,9 @@ rtc_source_set("delay_based_bwe") { "../../../system_wrappers:metrics", "../../pacing", "../../remote_bitrate_estimator", + "../../rtp_rtcp:rtp_rtcp_format", "//third_party/abseil-cpp/absl/memory", + "//third_party/abseil-cpp/absl/types:optional", ] } diff --git a/modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator.cc b/modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator.cc index 31a9dccc3b..a7e9ce1712 100644 --- a/modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator.cc +++ b/modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator.cc @@ -10,10 +10,13 @@ #include "modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator.h" +#include +#include #include #include "absl/memory/memory.h" #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" +#include "rtc_base/checks.h" #include "rtc_base/numerics/safe_conversions.h" #include "system_wrappers/include/field_trial.h" diff --git a/modules/congestion_controller/goog_cc/alr_detector.cc b/modules/congestion_controller/goog_cc/alr_detector.cc index ed8f3a66f4..db669428f0 100644 --- a/modules/congestion_controller/goog_cc/alr_detector.cc +++ b/modules/congestion_controller/goog_cc/alr_detector.cc @@ -10,20 +10,17 @@ #include "modules/congestion_controller/goog_cc/alr_detector.h" -#include +#include #include -#include #include "absl/memory/memory.h" +#include "logging/rtc_event_log/events/rtc_event.h" #include "logging/rtc_event_log/events/rtc_event_alr_state.h" #include "logging/rtc_event_log/rtc_event_log.h" #include "rtc_base/checks.h" #include "rtc_base/experiments/alr_experiment.h" -#include "rtc_base/format_macros.h" -#include "rtc_base/logging.h" #include "rtc_base/numerics/safe_conversions.h" #include "rtc_base/timeutils.h" -#include "system_wrappers/include/field_trial.h" namespace webrtc { AlrDetector::AlrDetector() : AlrDetector(nullptr) {} diff --git a/modules/congestion_controller/goog_cc/alr_detector.h b/modules/congestion_controller/goog_cc/alr_detector.h index 874354bc58..c30ba1d093 100644 --- a/modules/congestion_controller/goog_cc/alr_detector.h +++ b/modules/congestion_controller/goog_cc/alr_detector.h @@ -11,10 +11,11 @@ #ifndef MODULES_CONGESTION_CONTROLLER_GOOG_CC_ALR_DETECTOR_H_ #define MODULES_CONGESTION_CONTROLLER_GOOG_CC_ALR_DETECTOR_H_ +#include +#include + #include "absl/types/optional.h" -#include "common_types.h" // NOLINT(build/include) #include "modules/pacing/interval_budget.h" -#include "rtc_base/rate_statistics.h" namespace webrtc { diff --git a/modules/congestion_controller/goog_cc/alr_detector_unittest.cc b/modules/congestion_controller/goog_cc/alr_detector_unittest.cc index 3a3d002c23..425268514d 100644 --- a/modules/congestion_controller/goog_cc/alr_detector_unittest.cc +++ b/modules/congestion_controller/goog_cc/alr_detector_unittest.cc @@ -10,6 +10,7 @@ #include "modules/congestion_controller/goog_cc/alr_detector.h" +#include "rtc_base/checks.h" #include "rtc_base/experiments/alr_experiment.h" #include "test/field_trial.h" #include "test/gtest.h" diff --git a/modules/congestion_controller/goog_cc/bitrate_estimator.cc b/modules/congestion_controller/goog_cc/bitrate_estimator.cc index c776827802..985107496a 100644 --- a/modules/congestion_controller/goog_cc/bitrate_estimator.cc +++ b/modules/congestion_controller/goog_cc/bitrate_estimator.cc @@ -10,11 +10,11 @@ #include "modules/congestion_controller/goog_cc/bitrate_estimator.h" +#include #include #include #include "modules/remote_bitrate_estimator/test/bwe_test_logging.h" -#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" #include "rtc_base/logging.h" #include "system_wrappers/include/field_trial.h" diff --git a/modules/congestion_controller/goog_cc/bitrate_estimator.h b/modules/congestion_controller/goog_cc/bitrate_estimator.h index 610fa214e7..dd1e51bc28 100644 --- a/modules/congestion_controller/goog_cc/bitrate_estimator.h +++ b/modules/congestion_controller/goog_cc/bitrate_estimator.h @@ -11,7 +11,7 @@ #ifndef MODULES_CONGESTION_CONTROLLER_GOOG_CC_BITRATE_ESTIMATOR_H_ #define MODULES_CONGESTION_CONTROLLER_GOOG_CC_BITRATE_ESTIMATOR_H_ -#include +#include #include "absl/types/optional.h" diff --git a/modules/congestion_controller/goog_cc/delay_based_bwe.cc b/modules/congestion_controller/goog_cc/delay_based_bwe.cc index c21966cf7f..03d4809d11 100644 --- a/modules/congestion_controller/goog_cc/delay_based_bwe.cc +++ b/modules/congestion_controller/goog_cc/delay_based_bwe.cc @@ -11,21 +11,19 @@ #include "modules/congestion_controller/goog_cc/delay_based_bwe.h" #include -#include +#include #include #include #include "absl/memory/memory.h" +#include "api/transport/network_types.h" // For PacedPacketInfo +#include "logging/rtc_event_log/events/rtc_event.h" #include "logging/rtc_event_log/events/rtc_event_bwe_update_delay_based.h" #include "logging/rtc_event_log/rtc_event_log.h" #include "modules/congestion_controller/goog_cc/trendline_estimator.h" -#include "modules/pacing/paced_sender.h" -#include "modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h" #include "modules/remote_bitrate_estimator/test/bwe_test_logging.h" #include "rtc_base/checks.h" -#include "rtc_base/constructormagic.h" #include "rtc_base/logging.h" -#include "rtc_base/thread_annotations.h" #include "system_wrappers/include/field_trial.h" #include "system_wrappers/include/metrics.h" diff --git a/modules/congestion_controller/goog_cc/delay_based_bwe.h b/modules/congestion_controller/goog_cc/delay_based_bwe.h index 42164baad4..4eaf12ed20 100644 --- a/modules/congestion_controller/goog_cc/delay_based_bwe.h +++ b/modules/congestion_controller/goog_cc/delay_based_bwe.h @@ -11,16 +11,18 @@ #ifndef MODULES_CONGESTION_CONTROLLER_GOOG_CC_DELAY_BASED_BWE_H_ #define MODULES_CONGESTION_CONTROLLER_GOOG_CC_DELAY_BASED_BWE_H_ +#include +#include #include -#include #include +#include "absl/types/optional.h" #include "modules/congestion_controller/goog_cc/delay_increase_detector_interface.h" #include "modules/congestion_controller/goog_cc/probe_bitrate_estimator.h" #include "modules/remote_bitrate_estimator/aimd_rate_control.h" -#include "modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h" +#include "modules/remote_bitrate_estimator/include/bwe_defines.h" #include "modules/remote_bitrate_estimator/inter_arrival.h" -#include "rtc_base/checks.h" +#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" // For PacketFeedback #include "rtc_base/constructormagic.h" #include "rtc_base/race_checker.h" diff --git a/modules/congestion_controller/goog_cc/median_slope_estimator.cc b/modules/congestion_controller/goog_cc/median_slope_estimator.cc index 0ad7728302..45d2fe3211 100644 --- a/modules/congestion_controller/goog_cc/median_slope_estimator.cc +++ b/modules/congestion_controller/goog_cc/median_slope_estimator.cc @@ -10,12 +10,10 @@ #include "modules/congestion_controller/goog_cc/median_slope_estimator.h" -#include #include -#include "modules/remote_bitrate_estimator/include/bwe_defines.h" #include "modules/remote_bitrate_estimator/test/bwe_test_logging.h" -#include "rtc_base/logging.h" +#include "rtc_base/checks.h" namespace webrtc { diff --git a/modules/congestion_controller/goog_cc/trendline_estimator.h b/modules/congestion_controller/goog_cc/trendline_estimator.h index a7d22a950e..1826d81248 100644 --- a/modules/congestion_controller/goog_cc/trendline_estimator.h +++ b/modules/congestion_controller/goog_cc/trendline_estimator.h @@ -12,11 +12,11 @@ #include #include - #include #include #include "modules/congestion_controller/goog_cc/delay_increase_detector_interface.h" +#include "modules/remote_bitrate_estimator/include/bwe_defines.h" #include "rtc_base/constructormagic.h" namespace webrtc { diff --git a/modules/include/module_common_types.cc b/modules/include/module_common_types.cc index 4ad5d1444e..80eba2e305 100644 --- a/modules/include/module_common_types.cc +++ b/modules/include/module_common_types.cc @@ -11,6 +11,7 @@ #include "modules/include/module_common_types.h" #include +#include #include #include "rtc_base/numerics/safe_conversions.h" diff --git a/modules/pacing/bitrate_prober.cc b/modules/pacing/bitrate_prober.cc index db50b42673..f388c6e899 100644 --- a/modules/pacing/bitrate_prober.cc +++ b/modules/pacing/bitrate_prober.cc @@ -13,6 +13,7 @@ #include #include "absl/memory/memory.h" +#include "logging/rtc_event_log/events/rtc_event.h" #include "logging/rtc_event_log/events/rtc_event_probe_cluster_created.h" #include "logging/rtc_event_log/rtc_event_log.h" #include "rtc_base/checks.h" diff --git a/modules/pacing/bitrate_prober.h b/modules/pacing/bitrate_prober.h index b2548c006d..bb98100dfa 100644 --- a/modules/pacing/bitrate_prober.h +++ b/modules/pacing/bitrate_prober.h @@ -11,10 +11,11 @@ #ifndef MODULES_PACING_BITRATE_PROBER_H_ #define MODULES_PACING_BITRATE_PROBER_H_ +#include +#include #include #include "api/transport/network_types.h" -#include "modules/include/module_common_types.h" namespace webrtc { class RtcEventLog; diff --git a/modules/pacing/interval_budget.h b/modules/pacing/interval_budget.h index 880fe784ba..d09b06e340 100644 --- a/modules/pacing/interval_budget.h +++ b/modules/pacing/interval_budget.h @@ -11,7 +11,8 @@ #ifndef MODULES_PACING_INTERVAL_BUDGET_H_ #define MODULES_PACING_INTERVAL_BUDGET_H_ -#include "common_types.h" // NOLINT(build/include) +#include +#include namespace webrtc { diff --git a/modules/pacing/paced_sender.cc b/modules/pacing/paced_sender.cc index 3b0dc199d6..2fed7be2ba 100644 --- a/modules/pacing/paced_sender.cc +++ b/modules/pacing/paced_sender.cc @@ -11,15 +11,10 @@ #include "modules/pacing/paced_sender.h" #include -#include -#include -#include -#include -#include #include "absl/memory/memory.h" +#include "logging/rtc_event_log/rtc_event_log.h" #include "modules/congestion_controller/goog_cc/alr_detector.h" -#include "modules/include/module_common_types.h" #include "modules/pacing/bitrate_prober.h" #include "modules/pacing/interval_budget.h" #include "modules/utility/include/process_thread.h" diff --git a/modules/pacing/paced_sender.h b/modules/pacing/paced_sender.h index 94d69e5482..b6f294f6df 100644 --- a/modules/pacing/paced_sender.h +++ b/modules/pacing/paced_sender.h @@ -11,20 +11,25 @@ #ifndef MODULES_PACING_PACED_SENDER_H_ #define MODULES_PACING_PACED_SENDER_H_ +#include +#include #include #include "absl/types/optional.h" -#include "logging/rtc_event_log/rtc_event_log.h" +#include "api/transport/network_types.h" #include "modules/pacing/bitrate_prober.h" #include "modules/pacing/interval_budget.h" #include "modules/pacing/pacer.h" #include "modules/pacing/round_robin_packet_queue.h" +#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" +#include "modules/utility/include/process_thread.h" #include "rtc_base/criticalsection.h" #include "rtc_base/thread_annotations.h" -#include "system_wrappers/include/clock.h" namespace webrtc { class AlrDetector; +class Clock; +class RtcEventLog; class PacedSender : public Pacer { public: diff --git a/modules/pacing/packet_router.cc b/modules/pacing/packet_router.cc index b27c73c2f0..24be7eebf2 100644 --- a/modules/pacing/packet_router.cc +++ b/modules/pacing/packet_router.cc @@ -11,8 +11,10 @@ #include "modules/pacing/packet_router.h" #include +#include #include +#include "absl/types/optional.h" #include "modules/rtp_rtcp/include/rtp_rtcp.h" #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" #include "modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h" diff --git a/modules/pacing/packet_router.h b/modules/pacing/packet_router.h index f01e9ef493..b7cc5ff196 100644 --- a/modules/pacing/packet_router.h +++ b/modules/pacing/packet_router.h @@ -11,16 +11,17 @@ #ifndef MODULES_PACING_PACKET_ROUTER_H_ #define MODULES_PACING_PACKET_ROUTER_H_ +#include +#include #include #include -#include "common_types.h" // NOLINT(build/include) +#include "api/transport/network_types.h" #include "modules/pacing/paced_sender.h" #include "modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h" #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" #include "rtc_base/constructormagic.h" #include "rtc_base/criticalsection.h" -#include "rtc_base/race_checker.h" #include "rtc_base/thread_annotations.h" namespace webrtc { diff --git a/modules/pacing/round_robin_packet_queue.cc b/modules/pacing/round_robin_packet_queue.cc index cfdf60a2dd..e61d68215a 100644 --- a/modules/pacing/round_robin_packet_queue.cc +++ b/modules/pacing/round_robin_packet_queue.cc @@ -11,6 +11,8 @@ #include "modules/pacing/round_robin_packet_queue.h" #include +#include +#include #include "rtc_base/checks.h" diff --git a/modules/pacing/round_robin_packet_queue.h b/modules/pacing/round_robin_packet_queue.h index f8133ef780..74b855a483 100644 --- a/modules/pacing/round_robin_packet_queue.h +++ b/modules/pacing/round_robin_packet_queue.h @@ -11,12 +11,16 @@ #ifndef MODULES_PACING_ROUND_ROBIN_PACKET_QUEUE_H_ #define MODULES_PACING_ROUND_ROBIN_PACKET_QUEUE_H_ +#include +#include #include #include #include #include +#include "absl/types/optional.h" #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" +#include "system_wrappers/include/clock.h" namespace webrtc { diff --git a/modules/remote_bitrate_estimator/BUILD.gn b/modules/remote_bitrate_estimator/BUILD.gn index 1e1cadb440..3089016dc1 100644 --- a/modules/remote_bitrate_estimator/BUILD.gn +++ b/modules/remote_bitrate_estimator/BUILD.gn @@ -43,6 +43,7 @@ rtc_static_library("remote_bitrate_estimator") { "../..:webrtc_common", "../../api/units:data_rate", "../../modules:module_api", + "../../modules:module_api_public", "../../modules/rtp_rtcp:rtp_rtcp_format", "../../rtc_base:checks", "../../rtc_base:rtc_base_approved", diff --git a/modules/remote_bitrate_estimator/aimd_rate_control.cc b/modules/remote_bitrate_estimator/aimd_rate_control.cc index a6e6436897..a992e7f064 100644 --- a/modules/remote_bitrate_estimator/aimd_rate_control.cc +++ b/modules/remote_bitrate_estimator/aimd_rate_control.cc @@ -11,7 +11,6 @@ #include "modules/remote_bitrate_estimator/aimd_rate_control.h" #include - #include #include #include @@ -19,9 +18,7 @@ #include #include "modules/remote_bitrate_estimator/include/bwe_defines.h" -#include "modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h" #include "modules/remote_bitrate_estimator/overuse_detector.h" -#include "modules/remote_bitrate_estimator/test/bwe_test_logging.h" #include "rtc_base/checks.h" #include "rtc_base/logging.h" #include "rtc_base/numerics/safe_minmax.h" diff --git a/modules/remote_bitrate_estimator/aimd_rate_control.h b/modules/remote_bitrate_estimator/aimd_rate_control.h index 2a3f71d98a..24b853501b 100644 --- a/modules/remote_bitrate_estimator/aimd_rate_control.h +++ b/modules/remote_bitrate_estimator/aimd_rate_control.h @@ -11,8 +11,10 @@ #ifndef MODULES_REMOTE_BITRATE_ESTIMATOR_AIMD_RATE_CONTROL_H_ #define MODULES_REMOTE_BITRATE_ESTIMATOR_AIMD_RATE_CONTROL_H_ +#include + +#include "absl/types/optional.h" #include "modules/remote_bitrate_estimator/include/bwe_defines.h" -#include "rtc_base/constructormagic.h" namespace webrtc { diff --git a/modules/remote_bitrate_estimator/include/bwe_defines.h b/modules/remote_bitrate_estimator/include/bwe_defines.h index d9185de99c..209850716c 100644 --- a/modules/remote_bitrate_estimator/include/bwe_defines.h +++ b/modules/remote_bitrate_estimator/include/bwe_defines.h @@ -11,6 +11,8 @@ #ifndef MODULES_REMOTE_BITRATE_ESTIMATOR_INCLUDE_BWE_DEFINES_H_ #define MODULES_REMOTE_BITRATE_ESTIMATOR_INCLUDE_BWE_DEFINES_H_ +#include + #include "absl/types/optional.h" #include "api/units/data_rate.h" diff --git a/modules/remote_bitrate_estimator/inter_arrival.cc b/modules/remote_bitrate_estimator/inter_arrival.cc index 3a0f579052..b8e683b89a 100644 --- a/modules/remote_bitrate_estimator/inter_arrival.cc +++ b/modules/remote_bitrate_estimator/inter_arrival.cc @@ -10,10 +10,9 @@ #include "modules/remote_bitrate_estimator/inter_arrival.h" -#include #include -#include "modules/include/module_common_types.h" +#include "modules/include/module_common_types_public.h" #include "rtc_base/logging.h" namespace webrtc { diff --git a/modules/remote_bitrate_estimator/overuse_detector.cc b/modules/remote_bitrate_estimator/overuse_detector.cc index 776ca42a56..f3dbe1e998 100644 --- a/modules/remote_bitrate_estimator/overuse_detector.cc +++ b/modules/remote_bitrate_estimator/overuse_detector.cc @@ -12,15 +12,12 @@ #include #include -#include - #include #include #include "modules/remote_bitrate_estimator/include/bwe_defines.h" #include "modules/remote_bitrate_estimator/test/bwe_test_logging.h" #include "rtc_base/checks.h" -#include "rtc_base/logging.h" #include "rtc_base/numerics/safe_minmax.h" #include "system_wrappers/include/field_trial.h" diff --git a/modules/remote_bitrate_estimator/overuse_detector.h b/modules/remote_bitrate_estimator/overuse_detector.h index f322c30496..61d1c3f707 100644 --- a/modules/remote_bitrate_estimator/overuse_detector.h +++ b/modules/remote_bitrate_estimator/overuse_detector.h @@ -10,9 +10,8 @@ #ifndef MODULES_REMOTE_BITRATE_ESTIMATOR_OVERUSE_DETECTOR_H_ #define MODULES_REMOTE_BITRATE_ESTIMATOR_OVERUSE_DETECTOR_H_ -#include +#include -#include "modules/include/module_common_types.h" #include "modules/remote_bitrate_estimator/include/bwe_defines.h" #include "rtc_base/constructormagic.h" diff --git a/modules/remote_bitrate_estimator/overuse_estimator.cc b/modules/remote_bitrate_estimator/overuse_estimator.cc index 09de5c6e7c..206ceba84c 100644 --- a/modules/remote_bitrate_estimator/overuse_estimator.cc +++ b/modules/remote_bitrate_estimator/overuse_estimator.cc @@ -12,9 +12,7 @@ #include #include -#include #include - #include #include "modules/remote_bitrate_estimator/include/bwe_defines.h" diff --git a/modules/remote_bitrate_estimator/overuse_estimator.h b/modules/remote_bitrate_estimator/overuse_estimator.h index 4c924938aa..3d7bd16be4 100644 --- a/modules/remote_bitrate_estimator/overuse_estimator.h +++ b/modules/remote_bitrate_estimator/overuse_estimator.h @@ -10,6 +10,7 @@ #ifndef MODULES_REMOTE_BITRATE_ESTIMATOR_OVERUSE_ESTIMATOR_H_ #define MODULES_REMOTE_BITRATE_ESTIMATOR_OVERUSE_ESTIMATOR_H_ +#include #include #include "common_types.h" // NOLINT(build/include) diff --git a/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream.cc b/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream.cc index 3d791f7848..1f0de47d05 100644 --- a/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream.cc +++ b/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream.cc @@ -10,12 +10,18 @@ #include "modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream.h" +#include +#include #include +#include "absl/types/optional.h" +#include "common_types.h" // NOLINT(build/include) #include "modules/remote_bitrate_estimator/aimd_rate_control.h" +#include "modules/remote_bitrate_estimator/include/bwe_defines.h" #include "modules/remote_bitrate_estimator/inter_arrival.h" #include "modules/remote_bitrate_estimator/overuse_detector.h" #include "modules/remote_bitrate_estimator/overuse_estimator.h" +#include "rtc_base/checks.h" #include "rtc_base/logging.h" #include "system_wrappers/include/clock.h" #include "system_wrappers/include/metrics.h" diff --git a/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream.h b/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream.h index 18b435affd..638f0d6802 100644 --- a/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream.h +++ b/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream.h @@ -11,6 +11,8 @@ #ifndef MODULES_REMOTE_BITRATE_ESTIMATOR_REMOTE_BITRATE_ESTIMATOR_SINGLE_STREAM_H_ #define MODULES_REMOTE_BITRATE_ESTIMATOR_REMOTE_BITRATE_ESTIMATOR_SINGLE_STREAM_H_ +#include +#include #include #include #include @@ -20,9 +22,13 @@ #include "rtc_base/constructormagic.h" #include "rtc_base/criticalsection.h" #include "rtc_base/rate_statistics.h" +#include "rtc_base/thread_annotations.h" namespace webrtc { +class Clock; +struct RTPHeader; + class RemoteBitrateEstimatorSingleStream : public RemoteBitrateEstimator { public: RemoteBitrateEstimatorSingleStream(RemoteBitrateObserver* observer, diff --git a/modules/rtp_rtcp/BUILD.gn b/modules/rtp_rtcp/BUILD.gn index fad15b1428..5b9fa9cd65 100644 --- a/modules/rtp_rtcp/BUILD.gn +++ b/modules/rtp_rtcp/BUILD.gn @@ -85,6 +85,7 @@ rtc_source_set("rtp_rtcp_format") { deps = [ "..:module_api", + "..:module_api_public", "../..:webrtc_common", "../../api:array_view", "../../api:libjingle_peerconnection_api", @@ -96,6 +97,7 @@ rtc_source_set("rtp_rtcp_format") { "../../rtc_base:deprecation", "../../rtc_base:rtc_base_approved", "../../system_wrappers", + "../video_coding:codec_globals_headers", "//third_party/abseil-cpp/absl/types:optional", "//third_party/abseil-cpp/absl/types:variant", ] @@ -186,7 +188,10 @@ rtc_static_library("rtp_rtcp") { deps = [ ":rtp_rtcp_format", + ":rtp_video_header", "..:module_api", + "..:module_api_public", + "..:module_fec_api", "../..:webrtc_common", "../../api:array_view", "../../api:libjingle_peerconnection_api", @@ -194,6 +199,7 @@ rtc_static_library("rtp_rtcp") { "../../api/audio_codecs:audio_codecs_api", "../../api/video:video_bitrate_allocation", "../../api/video:video_bitrate_allocator", + "../../api/video:video_frame", "../../api/video_codecs:video_codecs_api", "../../call:rtp_interfaces", "../../common_video", @@ -216,9 +222,11 @@ rtc_static_library("rtp_rtcp") { "../../system_wrappers:metrics", "../audio_coding:audio_format_conversion", "../remote_bitrate_estimator", + "../video_coding:codec_globals_headers", "//third_party/abseil-cpp/absl/container:inlined_vector", "//third_party/abseil-cpp/absl/memory", "//third_party/abseil-cpp/absl/types:optional", + "//third_party/abseil-cpp/absl/types:variant", ] } @@ -264,6 +272,7 @@ rtc_source_set("rtp_video_header") { "../../api/video:video_frame", "../../modules/video_coding:codec_globals_headers", "//third_party/abseil-cpp/absl/container:inlined_vector", + "//third_party/abseil-cpp/absl/types:optional", "//third_party/abseil-cpp/absl/types:variant", ] } diff --git a/modules/rtp_rtcp/include/flexfec_receiver.h b/modules/rtp_rtcp/include/flexfec_receiver.h index f006111e11..f0ed576c87 100644 --- a/modules/rtp_rtcp/include/flexfec_receiver.h +++ b/modules/rtp_rtcp/include/flexfec_receiver.h @@ -11,16 +11,20 @@ #ifndef MODULES_RTP_RTCP_INCLUDE_FLEXFEC_RECEIVER_H_ #define MODULES_RTP_RTCP_INCLUDE_FLEXFEC_RECEIVER_H_ +#include #include +#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" #include "modules/rtp_rtcp/include/ulpfec_receiver.h" #include "modules/rtp_rtcp/source/forward_error_correction.h" #include "modules/rtp_rtcp/source/rtp_packet_received.h" #include "rtc_base/sequenced_task_checker.h" -#include "system_wrappers/include/clock.h" +#include "rtc_base/thread_annotations.h" namespace webrtc { +class Clock; + class FlexfecReceiver { public: FlexfecReceiver(uint32_t ssrc, diff --git a/modules/rtp_rtcp/include/flexfec_sender.h b/modules/rtp_rtcp/include/flexfec_sender.h index fbe35ce43a..acee11764c 100644 --- a/modules/rtp_rtcp/include/flexfec_sender.h +++ b/modules/rtp_rtcp/include/flexfec_sender.h @@ -21,13 +21,12 @@ #include "modules/rtp_rtcp/include/rtp_header_extension_map.h" #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" #include "modules/rtp_rtcp/source/rtp_header_extension_size.h" -#include "modules/rtp_rtcp/source/rtp_packet_to_send.h" #include "modules/rtp_rtcp/source/ulpfec_generator.h" #include "rtc_base/random.h" -#include "system_wrappers/include/clock.h" namespace webrtc { +class Clock; class RtpPacketToSend; // Note that this class is not thread safe, and thus requires external diff --git a/modules/rtp_rtcp/include/remote_ntp_time_estimator.h b/modules/rtp_rtcp/include/remote_ntp_time_estimator.h index 5195e8ab7e..e6d269c4dd 100644 --- a/modules/rtp_rtcp/include/remote_ntp_time_estimator.h +++ b/modules/rtp_rtcp/include/remote_ntp_time_estimator.h @@ -11,7 +11,7 @@ #ifndef MODULES_RTP_RTCP_INCLUDE_REMOTE_NTP_TIME_ESTIMATOR_H_ #define MODULES_RTP_RTCP_INCLUDE_REMOTE_NTP_TIME_ESTIMATOR_H_ -#include +#include #include "rtc_base/constructormagic.h" #include "rtc_base/numerics/moving_median_filter.h" diff --git a/modules/rtp_rtcp/include/rtp_header_extension_map.h b/modules/rtp_rtcp/include/rtp_header_extension_map.h index 8ee97eff90..b691cdd030 100644 --- a/modules/rtp_rtcp/include/rtp_header_extension_map.h +++ b/modules/rtp_rtcp/include/rtp_header_extension_map.h @@ -11,6 +11,7 @@ #ifndef MODULES_RTP_RTCP_INCLUDE_RTP_HEADER_EXTENSION_MAP_H_ #define MODULES_RTP_RTCP_INCLUDE_RTP_HEADER_EXTENSION_MAP_H_ +#include #include #include "api/array_view.h" diff --git a/modules/rtp_rtcp/include/rtp_rtcp_defines.cc b/modules/rtp_rtcp/include/rtp_rtcp_defines.cc index e1dca33386..1da8ade774 100644 --- a/modules/rtp_rtcp/include/rtp_rtcp_defines.cc +++ b/modules/rtp_rtcp/include/rtp_rtcp_defines.cc @@ -10,6 +10,13 @@ #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" +#include +#include +#include +#include + +#include "api/array_view.h" + namespace webrtc { StreamDataCounters::StreamDataCounters() : first_packet_time_ms(-1) {} diff --git a/modules/rtp_rtcp/source/dtmf_queue.cc b/modules/rtp_rtcp/source/dtmf_queue.cc index 86ddb105f9..10e674789a 100644 --- a/modules/rtp_rtcp/source/dtmf_queue.cc +++ b/modules/rtp_rtcp/source/dtmf_queue.cc @@ -10,6 +10,10 @@ #include "modules/rtp_rtcp/source/dtmf_queue.h" +#include + +#include "rtc_base/checks.h" + namespace { constexpr size_t kDtmfOutbandMax = 20; } diff --git a/modules/rtp_rtcp/source/dtmf_queue.h b/modules/rtp_rtcp/source/dtmf_queue.h index db70c97508..e5955a1297 100644 --- a/modules/rtp_rtcp/source/dtmf_queue.h +++ b/modules/rtp_rtcp/source/dtmf_queue.h @@ -11,6 +11,7 @@ #ifndef MODULES_RTP_RTCP_SOURCE_DTMF_QUEUE_H_ #define MODULES_RTP_RTCP_SOURCE_DTMF_QUEUE_H_ +#include #include #include "rtc_base/criticalsection.h" diff --git a/modules/rtp_rtcp/source/flexfec_header_reader_writer.cc b/modules/rtp_rtcp/source/flexfec_header_reader_writer.cc index d7666e1192..b813340ea6 100644 --- a/modules/rtp_rtcp/source/flexfec_header_reader_writer.cc +++ b/modules/rtp_rtcp/source/flexfec_header_reader_writer.cc @@ -12,12 +12,11 @@ #include -#include - #include "modules/rtp_rtcp/source/byte_io.h" #include "modules/rtp_rtcp/source/forward_error_correction_internal.h" #include "rtc_base/checks.h" #include "rtc_base/logging.h" +#include "rtc_base/scoped_ref_ptr.h" namespace webrtc { diff --git a/modules/rtp_rtcp/source/flexfec_header_reader_writer.h b/modules/rtp_rtcp/source/flexfec_header_reader_writer.h index 1d6ddda4b4..d305c4c288 100644 --- a/modules/rtp_rtcp/source/flexfec_header_reader_writer.h +++ b/modules/rtp_rtcp/source/flexfec_header_reader_writer.h @@ -11,6 +11,9 @@ #ifndef MODULES_RTP_RTCP_SOURCE_FLEXFEC_HEADER_READER_WRITER_H_ #define MODULES_RTP_RTCP_SOURCE_FLEXFEC_HEADER_READER_WRITER_H_ +#include +#include + #include "modules/rtp_rtcp/source/forward_error_correction.h" namespace webrtc { diff --git a/modules/rtp_rtcp/source/flexfec_receiver.cc b/modules/rtp_rtcp/source/flexfec_receiver.cc index c3ed4d53b2..1a62bced68 100644 --- a/modules/rtp_rtcp/source/flexfec_receiver.cc +++ b/modules/rtp_rtcp/source/flexfec_receiver.cc @@ -10,6 +10,9 @@ #include "modules/rtp_rtcp/include/flexfec_receiver.h" +#include + +#include "api/array_view.h" #include "rtc_base/checks.h" #include "rtc_base/logging.h" #include "rtc_base/scoped_ref_ptr.h" diff --git a/modules/rtp_rtcp/source/flexfec_sender.cc b/modules/rtp_rtcp/source/flexfec_sender.cc index 286f47c5fe..1204b2d978 100644 --- a/modules/rtp_rtcp/source/flexfec_sender.cc +++ b/modules/rtp_rtcp/source/flexfec_sender.cc @@ -10,11 +10,15 @@ #include "modules/rtp_rtcp/include/flexfec_sender.h" +#include +#include #include #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" #include "modules/rtp_rtcp/source/forward_error_correction.h" #include "modules/rtp_rtcp/source/rtp_header_extensions.h" +#include "modules/rtp_rtcp/source/rtp_packet_to_send.h" +#include "rtc_base/checks.h" #include "rtc_base/logging.h" namespace webrtc { diff --git a/modules/rtp_rtcp/source/forward_error_correction.cc b/modules/rtp_rtcp/source/forward_error_correction.cc index b743110b2d..a52fecad18 100644 --- a/modules/rtp_rtcp/source/forward_error_correction.cc +++ b/modules/rtp_rtcp/source/forward_error_correction.cc @@ -11,11 +11,10 @@ #include "modules/rtp_rtcp/source/forward_error_correction.h" #include - #include -#include #include +#include "modules/include/module_common_types_public.h" #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" #include "modules/rtp_rtcp/source/byte_io.h" #include "modules/rtp_rtcp/source/flexfec_header_reader_writer.h" diff --git a/modules/rtp_rtcp/source/forward_error_correction.h b/modules/rtp_rtcp/source/forward_error_correction.h index 819f6bcec5..adb7572ae6 100644 --- a/modules/rtp_rtcp/source/forward_error_correction.h +++ b/modules/rtp_rtcp/source/forward_error_correction.h @@ -11,16 +11,15 @@ #ifndef MODULES_RTP_RTCP_SOURCE_FORWARD_ERROR_CORRECTION_H_ #define MODULES_RTP_RTCP_SOURCE_FORWARD_ERROR_CORRECTION_H_ +#include #include - #include #include #include +#include "modules/include/module_fec_types.h" #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" #include "modules/rtp_rtcp/source/forward_error_correction_internal.h" -#include "rtc_base/constructormagic.h" -#include "rtc_base/refcount.h" #include "rtc_base/scoped_ref_ptr.h" namespace webrtc { diff --git a/modules/rtp_rtcp/source/forward_error_correction_internal.cc b/modules/rtp_rtcp/source/forward_error_correction_internal.cc index 7e5fd91e03..9b02026a77 100644 --- a/modules/rtp_rtcp/source/forward_error_correction_internal.cc +++ b/modules/rtp_rtcp/source/forward_error_correction_internal.cc @@ -10,6 +10,7 @@ #include "modules/rtp_rtcp/source/forward_error_correction_internal.h" +#include #include #include "modules/rtp_rtcp/source/fec_private_tables_bursty.h" diff --git a/modules/rtp_rtcp/source/forward_error_correction_internal.h b/modules/rtp_rtcp/source/forward_error_correction_internal.h index 2e8a202113..ed93f520e5 100644 --- a/modules/rtp_rtcp/source/forward_error_correction_internal.h +++ b/modules/rtp_rtcp/source/forward_error_correction_internal.h @@ -11,9 +11,11 @@ #ifndef MODULES_RTP_RTCP_SOURCE_FORWARD_ERROR_CORRECTION_INTERNAL_H_ #define MODULES_RTP_RTCP_SOURCE_FORWARD_ERROR_CORRECTION_INTERNAL_H_ -#include "modules/include/module_common_types.h" +#include +#include #include "api/array_view.h" +#include "modules/include/module_fec_types.h" namespace webrtc { diff --git a/modules/rtp_rtcp/source/packet_loss_stats.cc b/modules/rtp_rtcp/source/packet_loss_stats.cc index 076348d2da..36f0a63d59 100644 --- a/modules/rtp_rtcp/source/packet_loss_stats.cc +++ b/modules/rtp_rtcp/source/packet_loss_stats.cc @@ -10,6 +10,8 @@ #include "modules/rtp_rtcp/source/packet_loss_stats.h" +#include +#include #include #include "rtc_base/checks.h" diff --git a/modules/rtp_rtcp/source/playout_delay_oracle.cc b/modules/rtp_rtcp/source/playout_delay_oracle.cc index d3a75dd13a..dc33fad536 100644 --- a/modules/rtp_rtcp/source/playout_delay_oracle.cc +++ b/modules/rtp_rtcp/source/playout_delay_oracle.cc @@ -13,7 +13,6 @@ #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" #include "modules/rtp_rtcp/source/rtp_header_extensions.h" #include "rtc_base/checks.h" -#include "rtc_base/logging.h" namespace webrtc { diff --git a/modules/rtp_rtcp/source/playout_delay_oracle.h b/modules/rtp_rtcp/source/playout_delay_oracle.h index 6e6e253c8c..0e3bd39a7e 100644 --- a/modules/rtp_rtcp/source/playout_delay_oracle.h +++ b/modules/rtp_rtcp/source/playout_delay_oracle.h @@ -13,8 +13,10 @@ #include -#include "modules/include/module_common_types.h" +#include "common_types.h" // NOLINT(build/include) +#include "modules/include/module_common_types_public.h" #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" +#include "rtc_base/constructormagic.h" #include "rtc_base/criticalsection.h" #include "rtc_base/thread_annotations.h" diff --git a/modules/rtp_rtcp/source/remote_ntp_time_estimator.cc b/modules/rtp_rtcp/source/remote_ntp_time_estimator.cc index fc867a491a..fd19b1383a 100644 --- a/modules/rtp_rtcp/source/remote_ntp_time_estimator.cc +++ b/modules/rtp_rtcp/source/remote_ntp_time_estimator.cc @@ -10,8 +10,9 @@ #include "modules/rtp_rtcp/include/remote_ntp_time_estimator.h" +#include + #include "rtc_base/logging.h" -#include "rtc_base/time/timestamp_extrapolator.h" #include "system_wrappers/include/clock.h" namespace webrtc { diff --git a/modules/rtp_rtcp/source/rtcp_nack_stats.cc b/modules/rtp_rtcp/source/rtcp_nack_stats.cc index 24b708502e..1d652d0b5b 100644 --- a/modules/rtp_rtcp/source/rtcp_nack_stats.cc +++ b/modules/rtp_rtcp/source/rtcp_nack_stats.cc @@ -10,7 +10,7 @@ #include "modules/rtp_rtcp/source/rtcp_nack_stats.h" -#include "modules/include/module_common_types.h" +#include "modules/include/module_common_types_public.h" namespace webrtc { diff --git a/modules/rtp_rtcp/source/rtcp_packet.h b/modules/rtp_rtcp/source/rtcp_packet.h index 11037cbd82..40e51e87ad 100644 --- a/modules/rtp_rtcp/source/rtcp_packet.h +++ b/modules/rtp_rtcp/source/rtcp_packet.h @@ -11,6 +11,10 @@ #ifndef MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_H_ #define MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_H_ +#include +#include + +#include "api/array_view.h" #include "rtc_base/buffer.h" #include "rtc_base/function_view.h" diff --git a/modules/rtp_rtcp/source/rtcp_packet/app.cc b/modules/rtp_rtcp/source/rtcp_packet/app.cc index 4e21bc93e4..eadd4d9c35 100644 --- a/modules/rtp_rtcp/source/rtcp_packet/app.cc +++ b/modules/rtp_rtcp/source/rtcp_packet/app.cc @@ -10,6 +10,9 @@ #include "modules/rtp_rtcp/source/rtcp_packet/app.h" +#include +#include + #include "modules/rtp_rtcp/source/byte_io.h" #include "modules/rtp_rtcp/source/rtcp_packet/common_header.h" #include "rtc_base/checks.h" diff --git a/modules/rtp_rtcp/source/rtcp_packet/app.h b/modules/rtp_rtcp/source/rtcp_packet/app.h index 19a97e0ed9..a9602a80cf 100644 --- a/modules/rtp_rtcp/source/rtcp_packet/app.h +++ b/modules/rtp_rtcp/source/rtcp_packet/app.h @@ -11,6 +11,9 @@ #ifndef MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_APP_H_ #define MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_APP_H_ +#include +#include + #include "modules/rtp_rtcp/source/rtcp_packet.h" #include "rtc_base/buffer.h" diff --git a/modules/rtp_rtcp/source/rtcp_packet/bye.cc b/modules/rtp_rtcp/source/rtcp_packet/bye.cc index 0e2eb9e41a..23ac35f856 100644 --- a/modules/rtp_rtcp/source/rtcp_packet/bye.cc +++ b/modules/rtp_rtcp/source/rtcp_packet/bye.cc @@ -10,6 +10,8 @@ #include "modules/rtp_rtcp/source/rtcp_packet/bye.h" +#include +#include #include #include "modules/rtp_rtcp/source/byte_io.h" diff --git a/modules/rtp_rtcp/source/rtcp_packet/extended_jitter_report.cc b/modules/rtp_rtcp/source/rtcp_packet/extended_jitter_report.cc index 27ed4ccef4..5e7dadd1f4 100644 --- a/modules/rtp_rtcp/source/rtcp_packet/extended_jitter_report.cc +++ b/modules/rtp_rtcp/source/rtcp_packet/extended_jitter_report.cc @@ -10,6 +10,7 @@ #include "modules/rtp_rtcp/source/rtcp_packet/extended_jitter_report.h" +#include #include #include "modules/rtp_rtcp/source/byte_io.h" diff --git a/modules/rtp_rtcp/source/rtcp_packet/extended_reports.cc b/modules/rtp_rtcp/source/rtcp_packet/extended_reports.cc index 5513f37dba..2b5f9cacd7 100644 --- a/modules/rtp_rtcp/source/rtcp_packet/extended_reports.cc +++ b/modules/rtp_rtcp/source/rtcp_packet/extended_reports.cc @@ -10,6 +10,8 @@ #include "modules/rtp_rtcp/source/rtcp_packet/extended_reports.h" +#include + #include "modules/rtp_rtcp/source/byte_io.h" #include "modules/rtp_rtcp/source/rtcp_packet/common_header.h" #include "rtc_base/checks.h" diff --git a/modules/rtp_rtcp/source/rtcp_packet/nack.cc b/modules/rtp_rtcp/source/rtcp_packet/nack.cc index 6a4a0bdc0e..6fe7eade62 100644 --- a/modules/rtp_rtcp/source/rtcp_packet/nack.cc +++ b/modules/rtp_rtcp/source/rtcp_packet/nack.cc @@ -11,6 +11,7 @@ #include "modules/rtp_rtcp/source/rtcp_packet/nack.h" #include +#include #include #include "modules/rtp_rtcp/source/byte_io.h" diff --git a/modules/rtp_rtcp/source/rtcp_packet/psfb.h b/modules/rtp_rtcp/source/rtcp_packet/psfb.h index ae66a17238..46ee291285 100644 --- a/modules/rtp_rtcp/source/rtcp_packet/psfb.h +++ b/modules/rtp_rtcp/source/rtcp_packet/psfb.h @@ -12,6 +12,9 @@ #ifndef MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_PSFB_H_ #define MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_PSFB_H_ +#include +#include + #include "modules/rtp_rtcp/source/rtcp_packet.h" namespace webrtc { diff --git a/modules/rtp_rtcp/source/rtcp_packet/receiver_report.h b/modules/rtp_rtcp/source/rtcp_packet/receiver_report.h index 8f143da72c..7470d1d2e1 100644 --- a/modules/rtp_rtcp/source/rtcp_packet/receiver_report.h +++ b/modules/rtp_rtcp/source/rtcp_packet/receiver_report.h @@ -11,6 +11,8 @@ #ifndef MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_RECEIVER_REPORT_H_ #define MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_RECEIVER_REPORT_H_ +#include +#include #include #include "modules/rtp_rtcp/source/rtcp_packet.h" diff --git a/modules/rtp_rtcp/source/rtcp_packet/remb.cc b/modules/rtp_rtcp/source/rtcp_packet/remb.cc index 02406116f6..3ed1fbdb80 100644 --- a/modules/rtp_rtcp/source/rtcp_packet/remb.cc +++ b/modules/rtp_rtcp/source/rtcp_packet/remb.cc @@ -10,6 +10,7 @@ #include "modules/rtp_rtcp/source/rtcp_packet/remb.h" +#include #include #include "modules/rtp_rtcp/source/byte_io.h" diff --git a/modules/rtp_rtcp/source/rtcp_packet/rrtr.h b/modules/rtp_rtcp/source/rtcp_packet/rrtr.h index a470b1a217..8eb4ce62ad 100644 --- a/modules/rtp_rtcp/source/rtcp_packet/rrtr.h +++ b/modules/rtp_rtcp/source/rtcp_packet/rrtr.h @@ -12,6 +12,9 @@ #ifndef MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_RRTR_H_ #define MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_RRTR_H_ +#include +#include + #include "system_wrappers/include/ntp_time.h" namespace webrtc { diff --git a/modules/rtp_rtcp/source/rtcp_packet/rtpfb.h b/modules/rtp_rtcp/source/rtcp_packet/rtpfb.h index a0407411ab..21977736b6 100644 --- a/modules/rtp_rtcp/source/rtcp_packet/rtpfb.h +++ b/modules/rtp_rtcp/source/rtcp_packet/rtpfb.h @@ -12,6 +12,9 @@ #ifndef MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_RTPFB_H_ #define MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_RTPFB_H_ +#include +#include + #include "modules/rtp_rtcp/source/rtcp_packet.h" namespace webrtc { diff --git a/modules/rtp_rtcp/source/rtcp_packet/sdes.cc b/modules/rtp_rtcp/source/rtcp_packet/sdes.cc index 337c8b04a8..0ef432903d 100644 --- a/modules/rtp_rtcp/source/rtcp_packet/sdes.cc +++ b/modules/rtp_rtcp/source/rtcp_packet/sdes.cc @@ -10,6 +10,7 @@ #include "modules/rtp_rtcp/source/rtcp_packet/sdes.h" +#include #include #include "modules/rtp_rtcp/source/byte_io.h" diff --git a/modules/rtp_rtcp/source/rtcp_packet/tmmbn.cc b/modules/rtp_rtcp/source/rtcp_packet/tmmbn.cc index 4d38b3b6db..f57e5749c2 100644 --- a/modules/rtp_rtcp/source/rtcp_packet/tmmbn.cc +++ b/modules/rtp_rtcp/source/rtcp_packet/tmmbn.cc @@ -10,7 +10,6 @@ #include "modules/rtp_rtcp/source/rtcp_packet/tmmbn.h" -#include "modules/rtp_rtcp/source/byte_io.h" #include "modules/rtp_rtcp/source/rtcp_packet/common_header.h" #include "rtc_base/checks.h" #include "rtc_base/logging.h" diff --git a/modules/rtp_rtcp/source/rtcp_packet/tmmbr.cc b/modules/rtp_rtcp/source/rtcp_packet/tmmbr.cc index d8f073b87f..9dc745e509 100644 --- a/modules/rtp_rtcp/source/rtcp_packet/tmmbr.cc +++ b/modules/rtp_rtcp/source/rtcp_packet/tmmbr.cc @@ -10,7 +10,6 @@ #include "modules/rtp_rtcp/source/rtcp_packet/tmmbr.h" -#include "modules/rtp_rtcp/source/byte_io.h" #include "modules/rtp_rtcp/source/rtcp_packet/common_header.h" #include "rtc_base/checks.h" #include "rtc_base/logging.h" diff --git a/modules/rtp_rtcp/source/rtcp_packet/transport_feedback.cc b/modules/rtp_rtcp/source/rtcp_packet/transport_feedback.cc index 4703d3132e..28165594be 100644 --- a/modules/rtp_rtcp/source/rtcp_packet/transport_feedback.cc +++ b/modules/rtp_rtcp/source/rtcp_packet/transport_feedback.cc @@ -11,9 +11,10 @@ #include "modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h" #include +#include #include -#include "modules/include/module_common_types.h" +#include "modules/include/module_common_types_public.h" #include "modules/rtp_rtcp/source/byte_io.h" #include "modules/rtp_rtcp/source/rtcp_packet/common_header.h" #include "rtc_base/checks.h" diff --git a/modules/rtp_rtcp/source/rtp_format.cc b/modules/rtp_rtcp/source/rtp_format.cc index 69a91a2228..0010d90750 100644 --- a/modules/rtp_rtcp/source/rtp_format.cc +++ b/modules/rtp_rtcp/source/rtp_format.cc @@ -10,13 +10,15 @@ #include "modules/rtp_rtcp/source/rtp_format.h" -#include - #include "absl/memory/memory.h" +#include "absl/types/variant.h" #include "modules/rtp_rtcp/source/rtp_format_h264.h" #include "modules/rtp_rtcp/source/rtp_format_video_generic.h" #include "modules/rtp_rtcp/source/rtp_format_vp8.h" #include "modules/rtp_rtcp/source/rtp_format_vp9.h" +#include "modules/video_coding/codecs/h264/include/h264_globals.h" +#include "modules/video_coding/codecs/vp8/include/vp8_globals.h" +#include "modules/video_coding/codecs/vp9/include/vp9_globals.h" #include "rtc_base/checks.h" namespace webrtc { diff --git a/modules/rtp_rtcp/source/rtp_format.h b/modules/rtp_rtcp/source/rtp_format.h index 44e21e0738..71c7dc5e0e 100644 --- a/modules/rtp_rtcp/source/rtp_format.h +++ b/modules/rtp_rtcp/source/rtp_format.h @@ -11,17 +11,17 @@ #ifndef MODULES_RTP_RTCP_SOURCE_RTP_FORMAT_H_ #define MODULES_RTP_RTCP_SOURCE_RTP_FORMAT_H_ +#include #include -#include #include #include "api/array_view.h" #include "common_types.h" // NOLINT(build/include) #include "modules/include/module_common_types.h" -#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" -#include "rtc_base/constructormagic.h" +#include "modules/rtp_rtcp/source/rtp_video_header.h" namespace webrtc { + class RtpPacketToSend; class RtpPacketizer { diff --git a/modules/rtp_rtcp/source/rtp_format_h264.cc b/modules/rtp_rtcp/source/rtp_format_h264.cc index a60457d186..7a7bcdfbb8 100644 --- a/modules/rtp_rtcp/source/rtp_format_h264.cc +++ b/modules/rtp_rtcp/source/rtp_format_h264.cc @@ -11,10 +11,16 @@ #include "modules/rtp_rtcp/source/rtp_format_h264.h" #include +#include +#include +#include #include #include #include +#include "absl/types/optional.h" +#include "absl/types/variant.h" +#include "common_types.h" // NOLINT(build/include) #include "common_video/h264/h264_common.h" #include "common_video/h264/pps_parser.h" #include "common_video/h264/sps_parser.h" diff --git a/modules/rtp_rtcp/source/rtp_format_h264.h b/modules/rtp_rtcp/source/rtp_format_h264.h index 73e40878a1..fbd4fd9509 100644 --- a/modules/rtp_rtcp/source/rtp_format_h264.h +++ b/modules/rtp_rtcp/source/rtp_format_h264.h @@ -11,12 +11,17 @@ #ifndef MODULES_RTP_RTCP_SOURCE_RTP_FORMAT_H264_H_ #define MODULES_RTP_RTCP_SOURCE_RTP_FORMAT_H264_H_ +#include +#include #include #include #include -#include +#include "api/array_view.h" +#include "modules/include/module_common_types.h" #include "modules/rtp_rtcp/source/rtp_format.h" +#include "modules/rtp_rtcp/source/rtp_packet_to_send.h" +#include "modules/video_coding/codecs/h264/include/h264_globals.h" #include "rtc_base/buffer.h" #include "rtc_base/constructormagic.h" diff --git a/modules/rtp_rtcp/source/rtp_format_video_generic.cc b/modules/rtp_rtcp/source/rtp_format_video_generic.cc index edd1e3c530..92aada4688 100644 --- a/modules/rtp_rtcp/source/rtp_format_video_generic.cc +++ b/modules/rtp_rtcp/source/rtp_format_video_generic.cc @@ -8,11 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include +#include +#include -#include "modules/include/module_common_types.h" +#include "absl/types/optional.h" #include "modules/rtp_rtcp/source/rtp_format_video_generic.h" #include "modules/rtp_rtcp/source/rtp_packet_to_send.h" +#include "rtc_base/checks.h" #include "rtc_base/logging.h" namespace webrtc { diff --git a/modules/rtp_rtcp/source/rtp_format_video_generic.h b/modules/rtp_rtcp/source/rtp_format_video_generic.h index 03509f5041..3458d49423 100644 --- a/modules/rtp_rtcp/source/rtp_format_video_generic.h +++ b/modules/rtp_rtcp/source/rtp_format_video_generic.h @@ -10,6 +10,7 @@ #ifndef MODULES_RTP_RTCP_SOURCE_RTP_FORMAT_VIDEO_GENERIC_H_ #define MODULES_RTP_RTCP_SOURCE_RTP_FORMAT_VIDEO_GENERIC_H_ +#include #include #include "api/array_view.h" @@ -18,6 +19,10 @@ #include "rtc_base/constructormagic.h" namespace webrtc { + +class RtpPacketToSend; +struct RTPVideoHeader; + namespace RtpFormatVideoGeneric { static const uint8_t kKeyFrameBit = 0x01; static const uint8_t kFirstPacketBit = 0x02; diff --git a/modules/rtp_rtcp/source/rtp_format_vp8.cc b/modules/rtp_rtcp/source/rtp_format_vp8.cc index f40434e7e0..a1248cf040 100644 --- a/modules/rtp_rtcp/source/rtp_format_vp8.cc +++ b/modules/rtp_rtcp/source/rtp_format_vp8.cc @@ -10,13 +10,13 @@ #include "modules/rtp_rtcp/source/rtp_format_vp8.h" +#include #include // memcpy - -#include -#include #include +#include "common_types.h" // NOLINT(build/include) #include "modules/rtp_rtcp/source/rtp_packet_to_send.h" +#include "modules/video_coding/codecs/interface/common_constants.h" #include "rtc_base/checks.h" #include "rtc_base/logging.h" diff --git a/modules/rtp_rtcp/source/rtp_format_vp8.h b/modules/rtp_rtcp/source/rtp_format_vp8.h index e4bc36e3f3..444298fbbf 100644 --- a/modules/rtp_rtcp/source/rtp_format_vp8.h +++ b/modules/rtp_rtcp/source/rtp_format_vp8.h @@ -25,13 +25,15 @@ #ifndef MODULES_RTP_RTCP_SOURCE_RTP_FORMAT_VP8_H_ #define MODULES_RTP_RTCP_SOURCE_RTP_FORMAT_VP8_H_ -#include +#include +#include #include #include "absl/container/inlined_vector.h" #include "api/array_view.h" -#include "modules/include/module_common_types.h" #include "modules/rtp_rtcp/source/rtp_format.h" +#include "modules/rtp_rtcp/source/rtp_packet_to_send.h" +#include "modules/video_coding/codecs/vp8/include/vp8_globals.h" #include "rtc_base/constructormagic.h" namespace webrtc { diff --git a/modules/rtp_rtcp/source/rtp_format_vp9.cc b/modules/rtp_rtcp/source/rtp_format_vp9.cc index dae3151e3b..9cd75143b8 100644 --- a/modules/rtp_rtcp/source/rtp_format_vp9.cc +++ b/modules/rtp_rtcp/source/rtp_format_vp9.cc @@ -12,9 +12,9 @@ #include -#include - +#include "common_types.h" // NOLINT(build/include) #include "modules/rtp_rtcp/source/rtp_packet_to_send.h" +#include "modules/video_coding/codecs/interface/common_constants.h" #include "rtc_base/bitbuffer.h" #include "rtc_base/checks.h" #include "rtc_base/logging.h" diff --git a/modules/rtp_rtcp/source/rtp_format_vp9.h b/modules/rtp_rtcp/source/rtp_format_vp9.h index 8a2a2a604c..c3b8f17a4b 100644 --- a/modules/rtp_rtcp/source/rtp_format_vp9.h +++ b/modules/rtp_rtcp/source/rtp_format_vp9.h @@ -21,12 +21,14 @@ #ifndef MODULES_RTP_RTCP_SOURCE_RTP_FORMAT_VP9_H_ #define MODULES_RTP_RTCP_SOURCE_RTP_FORMAT_VP9_H_ +#include +#include #include #include "api/array_view.h" -#include "modules/include/module_common_types.h" #include "modules/rtp_rtcp/source/rtp_format.h" #include "modules/rtp_rtcp/source/rtp_packet_to_send.h" +#include "modules/video_coding/codecs/vp9/include/vp9_globals.h" #include "rtc_base/constructormagic.h" namespace webrtc { diff --git a/modules/rtp_rtcp/source/rtp_generic_frame_descriptor.cc b/modules/rtp_rtcp/source/rtp_generic_frame_descriptor.cc index 0d1b9d157c..c27fb6e3f6 100644 --- a/modules/rtp_rtcp/source/rtp_generic_frame_descriptor.cc +++ b/modules/rtp_rtcp/source/rtp_generic_frame_descriptor.cc @@ -10,6 +10,8 @@ #include "modules/rtp_rtcp/source/rtp_generic_frame_descriptor.h" +#include + #include "rtc_base/checks.h" namespace webrtc { diff --git a/modules/rtp_rtcp/source/rtp_header_extensions.cc b/modules/rtp_rtcp/source/rtp_header_extensions.cc index fc4b7ceb92..082e0e0d61 100644 --- a/modules/rtp_rtcp/source/rtp_header_extensions.cc +++ b/modules/rtp_rtcp/source/rtp_header_extensions.cc @@ -10,10 +10,13 @@ #include "modules/rtp_rtcp/source/rtp_header_extensions.h" +#include + #include "modules/rtp_rtcp/include/rtp_cvo.h" #include "modules/rtp_rtcp/source/byte_io.h" +// TODO(bug:9855) Move kNoSpatialIdx from vp9_globals.h to common_constants +#include "modules/video_coding/codecs/interface/common_constants.h" #include "rtc_base/checks.h" -#include "rtc_base/logging.h" namespace webrtc { // Absolute send time in RTP streams. diff --git a/modules/rtp_rtcp/source/rtp_header_extensions.h b/modules/rtp_rtcp/source/rtp_header_extensions.h index 84e9831479..cd01c1aaeb 100644 --- a/modules/rtp_rtcp/source/rtp_header_extensions.h +++ b/modules/rtp_rtcp/source/rtp_header_extensions.h @@ -10,13 +10,17 @@ #ifndef MODULES_RTP_RTCP_SOURCE_RTP_HEADER_EXTENSIONS_H_ #define MODULES_RTP_RTCP_SOURCE_RTP_HEADER_EXTENSIONS_H_ +#include #include #include #include "api/array_view.h" +#include "api/rtp_headers.h" #include "api/video/video_content_type.h" +#include "api/video/video_frame_marking.h" #include "api/video/video_rotation.h" #include "api/video/video_timing.h" +#include "common_types.h" // NOLINT(build/include) #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" namespace webrtc { diff --git a/modules/rtp_rtcp/source/rtp_header_parser.cc b/modules/rtp_rtcp/source/rtp_header_parser.cc index df68f74dd9..bc05033efa 100644 --- a/modules/rtp_rtcp/source/rtp_header_parser.cc +++ b/modules/rtp_rtcp/source/rtp_header_parser.cc @@ -9,9 +9,12 @@ */ #include "modules/rtp_rtcp/include/rtp_header_parser.h" +#include + #include "modules/rtp_rtcp/include/rtp_header_extension_map.h" #include "modules/rtp_rtcp/source/rtp_utility.h" #include "rtc_base/criticalsection.h" +#include "rtc_base/thread_annotations.h" namespace webrtc { diff --git a/modules/rtp_rtcp/source/rtp_packet.cc b/modules/rtp_rtcp/source/rtp_packet.cc index 2c29ccae66..9d4dce4dea 100644 --- a/modules/rtp_rtcp/source/rtp_packet.cc +++ b/modules/rtp_rtcp/source/rtp_packet.cc @@ -10,11 +10,11 @@ #include "modules/rtp_rtcp/source/rtp_packet.h" +#include #include #include #include "api/rtpparameters.h" -#include "common_types.h" // NOLINT(build/include) #include "modules/rtp_rtcp/source/byte_io.h" #include "rtc_base/checks.h" #include "rtc_base/logging.h" diff --git a/modules/rtp_rtcp/source/rtp_packet_received.cc b/modules/rtp_rtcp/source/rtp_packet_received.cc index c8deb99d90..93c0a1e530 100644 --- a/modules/rtp_rtcp/source/rtp_packet_received.cc +++ b/modules/rtp_rtcp/source/rtp_packet_received.cc @@ -10,6 +10,8 @@ #include "modules/rtp_rtcp/source/rtp_packet_received.h" +#include +#include #include #include "modules/rtp_rtcp/source/rtp_header_extensions.h" diff --git a/modules/rtp_rtcp/source/rtp_packet_received.h b/modules/rtp_rtcp/source/rtp_packet_received.h index 86900310e4..566b116a10 100644 --- a/modules/rtp_rtcp/source/rtp_packet_received.h +++ b/modules/rtp_rtcp/source/rtp_packet_received.h @@ -10,9 +10,11 @@ #ifndef MODULES_RTP_RTCP_SOURCE_RTP_PACKET_RECEIVED_H_ #define MODULES_RTP_RTCP_SOURCE_RTP_PACKET_RECEIVED_H_ +#include #include -#include "common_types.h" // NOLINT(build/include) +#include "api/array_view.h" +#include "api/rtp_headers.h" #include "modules/rtp_rtcp/source/rtp_packet.h" #include "system_wrappers/include/ntp_time.h" diff --git a/modules/rtp_rtcp/source/rtp_packet_to_send.cc b/modules/rtp_rtcp/source/rtp_packet_to_send.cc index 0153bbe73a..b55e74aaf0 100644 --- a/modules/rtp_rtcp/source/rtp_packet_to_send.cc +++ b/modules/rtp_rtcp/source/rtp_packet_to_send.cc @@ -10,6 +10,8 @@ #include "modules/rtp_rtcp/source/rtp_packet_to_send.h" +#include + namespace webrtc { RtpPacketToSend::RtpPacketToSend(const ExtensionManager* extensions) diff --git a/modules/rtp_rtcp/source/rtp_packet_to_send.h b/modules/rtp_rtcp/source/rtp_packet_to_send.h index 1ed7dda478..56b1024a05 100644 --- a/modules/rtp_rtcp/source/rtp_packet_to_send.h +++ b/modules/rtp_rtcp/source/rtp_packet_to_send.h @@ -10,9 +10,12 @@ #ifndef MODULES_RTP_RTCP_SOURCE_RTP_PACKET_TO_SEND_H_ #define MODULES_RTP_RTCP_SOURCE_RTP_PACKET_TO_SEND_H_ +#include +#include #include #include "api/array_view.h" +#include "api/video/video_timing.h" #include "modules/rtp_rtcp/source/rtp_header_extensions.h" #include "modules/rtp_rtcp/source/rtp_packet.h" diff --git a/modules/rtp_rtcp/source/rtp_rtcp_impl.cc b/modules/rtp_rtcp/source/rtp_rtcp_impl.cc index ee3c4801f7..d54f942333 100644 --- a/modules/rtp_rtcp/source/rtp_rtcp_impl.cc +++ b/modules/rtp_rtcp/source/rtp_rtcp_impl.cc @@ -11,12 +11,14 @@ #include "modules/rtp_rtcp/source/rtp_rtcp_impl.h" #include - #include +#include #include #include +#include -#include "api/rtpparameters.h" +#include "modules/rtp_rtcp/source/rtcp_packet/dlrr.h" +#include "modules/rtp_rtcp/source/rtp_rtcp_config.h" #include "rtc_base/checks.h" #include "rtc_base/logging.h" diff --git a/modules/rtp_rtcp/source/rtp_rtcp_impl.h b/modules/rtp_rtcp/source/rtp_rtcp_impl.h index 9c2b085840..c7a0c3bf27 100644 --- a/modules/rtp_rtcp/source/rtp_rtcp_impl.h +++ b/modules/rtp_rtcp/source/rtp_rtcp_impl.h @@ -11,17 +11,24 @@ #ifndef MODULES_RTP_RTCP_SOURCE_RTP_RTCP_IMPL_H_ #define MODULES_RTP_RTCP_SOURCE_RTP_RTCP_IMPL_H_ +#include +#include #include #include #include -#include #include #include "absl/types/optional.h" +#include "api/rtp_headers.h" #include "api/video/video_bitrate_allocation.h" +#include "common_types.h" // NOLINT(build/include) +#include "modules/include/module_common_types.h" +#include "modules/include/module_fec_types.h" +#include "modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h" #include "modules/rtp_rtcp/include/rtp_rtcp.h" -#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" +#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" // RTCPPacketType #include "modules/rtp_rtcp/source/packet_loss_stats.h" +#include "modules/rtp_rtcp/source/rtcp_packet/tmmb_item.h" #include "modules/rtp_rtcp/source/rtcp_receiver.h" #include "modules/rtp_rtcp/source/rtcp_sender.h" #include "modules/rtp_rtcp/source/rtp_sender.h" @@ -30,6 +37,10 @@ namespace webrtc { +class Clock; +struct PacedPacketInfo; +struct RTPVideoHeader; + class ModuleRtpRtcpImpl : public RtpRtcp, public RTCPReceiver::ModuleRtpRtcp { public: explicit ModuleRtpRtcpImpl(const RtpRtcp::Configuration& configuration); diff --git a/modules/rtp_rtcp/source/rtp_sender_audio.cc b/modules/rtp_rtcp/source/rtp_sender_audio.cc index bf86a39339..7941d916f0 100644 --- a/modules/rtp_rtcp/source/rtp_sender_audio.cc +++ b/modules/rtp_rtcp/source/rtp_sender_audio.cc @@ -11,16 +11,17 @@ #include "modules/rtp_rtcp/source/rtp_sender_audio.h" #include - #include #include +#include "api/audio_codecs/audio_format.h" #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" #include "modules/rtp_rtcp/source/byte_io.h" #include "modules/rtp_rtcp/source/rtp_header_extensions.h" +#include "modules/rtp_rtcp/source/rtp_packet.h" #include "modules/rtp_rtcp/source/rtp_packet_to_send.h" +#include "rtc_base/checks.h" #include "rtc_base/logging.h" -#include "rtc_base/timeutils.h" #include "rtc_base/trace_event.h" namespace webrtc { diff --git a/modules/rtp_rtcp/source/rtp_sender_audio.h b/modules/rtp_rtcp/source/rtp_sender_audio.h index 63dfc2b99c..a1e760bfbf 100644 --- a/modules/rtp_rtcp/source/rtp_sender_audio.h +++ b/modules/rtp_rtcp/source/rtp_sender_audio.h @@ -11,14 +11,18 @@ #ifndef MODULES_RTP_RTCP_SOURCE_RTP_SENDER_AUDIO_H_ #define MODULES_RTP_RTCP_SOURCE_RTP_SENDER_AUDIO_H_ +#include +#include + #include "common_types.h" // NOLINT(build/include) #include "modules/rtp_rtcp/source/dtmf_queue.h" -#include "modules/rtp_rtcp/source/rtp_rtcp_config.h" #include "modules/rtp_rtcp/source/rtp_sender.h" #include "modules/rtp_rtcp/source/rtp_utility.h" #include "rtc_base/constructormagic.h" #include "rtc_base/criticalsection.h" #include "rtc_base/onetimeevent.h" +#include "rtc_base/thread_annotations.h" +#include "system_wrappers/include/clock.h" namespace webrtc { diff --git a/modules/rtp_rtcp/source/rtp_utility.cc b/modules/rtp_rtcp/source/rtp_utility.cc index 228572f8d1..a75c8cffb6 100644 --- a/modules/rtp_rtcp/source/rtp_utility.cc +++ b/modules/rtp_rtcp/source/rtp_utility.cc @@ -10,9 +10,19 @@ #include "modules/rtp_rtcp/source/rtp_utility.h" +#include +#include + +#include "api/array_view.h" +#include "api/video/video_content_type.h" +#include "api/video/video_frame_marking.h" +#include "api/video/video_rotation.h" +#include "api/video/video_timing.h" #include "modules/rtp_rtcp/include/rtp_cvo.h" #include "modules/rtp_rtcp/source/byte_io.h" #include "modules/rtp_rtcp/source/rtp_header_extensions.h" +#include "modules/video_coding/codecs/interface/common_constants.h" +#include "rtc_base/checks.h" #include "rtc_base/logging.h" #include "rtc_base/stringutils.h" diff --git a/modules/rtp_rtcp/source/rtp_utility.h b/modules/rtp_rtcp/source/rtp_utility.h index 762f964a2e..533a0dd2c1 100644 --- a/modules/rtp_rtcp/source/rtp_utility.h +++ b/modules/rtp_rtcp/source/rtp_utility.h @@ -11,14 +11,13 @@ #ifndef MODULES_RTP_RTCP_SOURCE_RTP_UTILITY_H_ #define MODULES_RTP_RTCP_SOURCE_RTP_UTILITY_H_ +#include #include -#include -#include "modules/rtp_rtcp/include/receive_statistics.h" +#include "api/rtp_headers.h" +#include "common_types.h" // NOLINT(build/include) #include "modules/rtp_rtcp/include/rtp_header_extension_map.h" #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" -#include "modules/rtp_rtcp/source/rtp_rtcp_config.h" -#include "rtc_base/deprecation.h" namespace webrtc { diff --git a/modules/rtp_rtcp/source/rtp_video_header.h b/modules/rtp_rtcp/source/rtp_video_header.h index 288b7d03a0..4426c41895 100644 --- a/modules/rtp_rtcp/source/rtp_video_header.h +++ b/modules/rtp_rtcp/source/rtp_video_header.h @@ -10,7 +10,10 @@ #ifndef MODULES_RTP_RTCP_SOURCE_RTP_VIDEO_HEADER_H_ #define MODULES_RTP_RTCP_SOURCE_RTP_VIDEO_HEADER_H_ +#include + #include "absl/container/inlined_vector.h" +#include "absl/types/optional.h" #include "absl/types/variant.h" #include "api/video/video_content_type.h" #include "api/video/video_frame_marking.h" diff --git a/modules/rtp_rtcp/source/time_util.cc b/modules/rtp_rtcp/source/time_util.cc index 6ac280a61d..d967f3a98b 100644 --- a/modules/rtp_rtcp/source/time_util.cc +++ b/modules/rtp_rtcp/source/time_util.cc @@ -12,6 +12,7 @@ #include +#include "rtc_base/checks.h" #include "rtc_base/timeutils.h" namespace webrtc { diff --git a/modules/rtp_rtcp/source/tmmbr_help.cc b/modules/rtp_rtcp/source/tmmbr_help.cc index 8aa4530211..315a4c2120 100644 --- a/modules/rtp_rtcp/source/tmmbr_help.cc +++ b/modules/rtp_rtcp/source/tmmbr_help.cc @@ -10,6 +10,7 @@ #include "modules/rtp_rtcp/source/tmmbr_help.h" +#include #include #include diff --git a/modules/rtp_rtcp/source/tmmbr_help.h b/modules/rtp_rtcp/source/tmmbr_help.h index 91aeaf4641..bf86f65222 100644 --- a/modules/rtp_rtcp/source/tmmbr_help.h +++ b/modules/rtp_rtcp/source/tmmbr_help.h @@ -11,7 +11,9 @@ #ifndef MODULES_RTP_RTCP_SOURCE_TMMBR_HELP_H_ #define MODULES_RTP_RTCP_SOURCE_TMMBR_HELP_H_ +#include #include + #include "modules/rtp_rtcp/source/rtcp_packet/tmmb_item.h" namespace webrtc { diff --git a/modules/rtp_rtcp/source/ulpfec_generator.cc b/modules/rtp_rtcp/source/ulpfec_generator.cc index e5777edab8..56dae29450 100644 --- a/modules/rtp_rtcp/source/ulpfec_generator.cc +++ b/modules/rtp_rtcp/source/ulpfec_generator.cc @@ -10,12 +10,15 @@ #include "modules/rtp_rtcp/source/ulpfec_generator.h" +#include +#include #include #include #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" #include "modules/rtp_rtcp/source/byte_io.h" #include "modules/rtp_rtcp/source/forward_error_correction.h" +#include "modules/rtp_rtcp/source/forward_error_correction_internal.h" #include "modules/rtp_rtcp/source/rtp_utility.h" #include "rtc_base/checks.h" diff --git a/modules/rtp_rtcp/source/ulpfec_generator.h b/modules/rtp_rtcp/source/ulpfec_generator.h index efc753f4c7..74a1d80256 100644 --- a/modules/rtp_rtcp/source/ulpfec_generator.h +++ b/modules/rtp_rtcp/source/ulpfec_generator.h @@ -11,10 +11,13 @@ #ifndef MODULES_RTP_RTCP_SOURCE_ULPFEC_GENERATOR_H_ #define MODULES_RTP_RTCP_SOURCE_ULPFEC_GENERATOR_H_ +#include +#include #include #include #include +#include "modules/include/module_fec_types.h" #include "modules/rtp_rtcp/source/forward_error_correction.h" namespace webrtc { diff --git a/modules/rtp_rtcp/source/ulpfec_header_reader_writer.cc b/modules/rtp_rtcp/source/ulpfec_header_reader_writer.cc index c54d3cdd8f..22af7e7736 100644 --- a/modules/rtp_rtcp/source/ulpfec_header_reader_writer.cc +++ b/modules/rtp_rtcp/source/ulpfec_header_reader_writer.cc @@ -10,11 +10,12 @@ #include "modules/rtp_rtcp/source/ulpfec_header_reader_writer.h" -#include +#include #include "modules/rtp_rtcp/source/byte_io.h" #include "modules/rtp_rtcp/source/forward_error_correction_internal.h" #include "rtc_base/checks.h" +#include "rtc_base/scoped_ref_ptr.h" namespace webrtc { diff --git a/modules/rtp_rtcp/source/ulpfec_header_reader_writer.h b/modules/rtp_rtcp/source/ulpfec_header_reader_writer.h index fc83afdf0c..a8bb737dbb 100644 --- a/modules/rtp_rtcp/source/ulpfec_header_reader_writer.h +++ b/modules/rtp_rtcp/source/ulpfec_header_reader_writer.h @@ -11,6 +11,9 @@ #ifndef MODULES_RTP_RTCP_SOURCE_ULPFEC_HEADER_READER_WRITER_H_ #define MODULES_RTP_RTCP_SOURCE_ULPFEC_HEADER_READER_WRITER_H_ +#include +#include + #include "modules/rtp_rtcp/source/forward_error_correction.h" namespace webrtc { diff --git a/modules/rtp_rtcp/source/ulpfec_receiver_impl.cc b/modules/rtp_rtcp/source/ulpfec_receiver_impl.cc index eb09c95813..7da6b88a00 100644 --- a/modules/rtp_rtcp/source/ulpfec_receiver_impl.cc +++ b/modules/rtp_rtcp/source/ulpfec_receiver_impl.cc @@ -10,12 +10,13 @@ #include "modules/rtp_rtcp/source/ulpfec_receiver_impl.h" +#include #include #include #include "modules/rtp_rtcp/source/byte_io.h" -#include "rtc_base/checks.h" #include "rtc_base/logging.h" +#include "rtc_base/scoped_ref_ptr.h" #include "system_wrappers/include/clock.h" namespace webrtc { diff --git a/modules/rtp_rtcp/source/ulpfec_receiver_impl.h b/modules/rtp_rtcp/source/ulpfec_receiver_impl.h index 96367dc7aa..0943266161 100644 --- a/modules/rtp_rtcp/source/ulpfec_receiver_impl.h +++ b/modules/rtp_rtcp/source/ulpfec_receiver_impl.h @@ -11,9 +11,12 @@ #ifndef MODULES_RTP_RTCP_SOURCE_ULPFEC_RECEIVER_IMPL_H_ #define MODULES_RTP_RTCP_SOURCE_ULPFEC_RECEIVER_IMPL_H_ +#include +#include #include #include +#include "api/rtp_headers.h" #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" #include "modules/rtp_rtcp/include/ulpfec_receiver.h" #include "modules/rtp_rtcp/source/forward_error_correction.h" diff --git a/modules/utility/source/process_thread_impl.cc b/modules/utility/source/process_thread_impl.cc index 97272da2bf..9756250360 100644 --- a/modules/utility/source/process_thread_impl.cc +++ b/modules/utility/source/process_thread_impl.cc @@ -10,6 +10,8 @@ #include "modules/utility/source/process_thread_impl.h" +#include + #include "modules/include/module.h" #include "rtc_base/checks.h" #include "rtc_base/task_queue.h" diff --git a/modules/utility/source/process_thread_impl.h b/modules/utility/source/process_thread_impl.h index c1f6ed4447..6f119d42a9 100644 --- a/modules/utility/source/process_thread_impl.h +++ b/modules/utility/source/process_thread_impl.h @@ -11,14 +11,17 @@ #ifndef MODULES_UTILITY_SOURCE_PROCESS_THREAD_IMPL_H_ #define MODULES_UTILITY_SOURCE_PROCESS_THREAD_IMPL_H_ +#include #include #include #include +#include "modules/include/module.h" #include "modules/utility/include/process_thread.h" #include "rtc_base/criticalsection.h" #include "rtc_base/location.h" #include "rtc_base/platform_thread.h" +#include "rtc_base/task_queue.h" #include "rtc_base/thread_checker.h" #include "system_wrappers/include/event_wrapper.h" diff --git a/p2p/base/dtlstransport.cc b/p2p/base/dtlstransport.cc index f498253c25..eaf054003b 100644 --- a/p2p/base/dtlstransport.cc +++ b/p2p/base/dtlstransport.cc @@ -20,6 +20,7 @@ #include "rtc_base/dscp.h" #include "rtc_base/logging.h" #include "rtc_base/messagequeue.h" +#include "rtc_base/rtccertificate.h" #include "rtc_base/sslstreamadapter.h" #include "rtc_base/stream.h" #include "rtc_base/thread.h" diff --git a/p2p/base/dtlstransport_unittest.cc b/p2p/base/dtlstransport_unittest.cc index 2ccb64cbaf..a9000c38fe 100644 --- a/p2p/base/dtlstransport_unittest.cc +++ b/p2p/base/dtlstransport_unittest.cc @@ -19,6 +19,7 @@ #include "rtc_base/dscp.h" #include "rtc_base/gunit.h" #include "rtc_base/helpers.h" +#include "rtc_base/rtccertificate.h" #include "rtc_base/ssladapter.h" #include "rtc_base/sslidentity.h" #include "rtc_base/sslstreamadapter.h" diff --git a/p2p/base/fakedtlstransport.h b/p2p/base/fakedtlstransport.h index f28f7273c6..e336b08d02 100644 --- a/p2p/base/fakedtlstransport.h +++ b/p2p/base/fakedtlstransport.h @@ -21,6 +21,7 @@ #include "p2p/base/dtlstransportinternal.h" #include "p2p/base/fakeicetransport.h" #include "rtc_base/fakesslidentity.h" +#include "rtc_base/rtccertificate.h" namespace cricket { diff --git a/rtc_base/BUILD.gn b/rtc_base/BUILD.gn index 36e4f57a36..86bdf2b667 100644 --- a/rtc_base/BUILD.gn +++ b/rtc_base/BUILD.gn @@ -285,6 +285,7 @@ rtc_source_set("logging") { visibility = [ "*" ] libs = [] deps = [ + ":checks", ":criticalsection", ":macromagic", ":platform_thread_types", @@ -370,6 +371,7 @@ rtc_source_set("rate_limiter") { deps = [ ":rtc_base_approved", "../system_wrappers", + "//third_party/abseil-cpp/absl/types:optional", ] } diff --git a/rtc_base/asynctcpsocket.h b/rtc_base/asynctcpsocket.h index c145d6f08f..9567dd9143 100644 --- a/rtc_base/asynctcpsocket.h +++ b/rtc_base/asynctcpsocket.h @@ -11,14 +11,15 @@ #ifndef RTC_BASE_ASYNCTCPSOCKET_H_ #define RTC_BASE_ASYNCTCPSOCKET_H_ +#include #include -#include "rtc_base/asyncpacketsocket.h" // for PacketOptions, AsyncPacketSo... -#include "rtc_base/asyncsocket.h" // for AsyncSocket -#include "rtc_base/buffer.h" // for Buffer -#include "rtc_base/constructormagic.h" // for RTC_DISALLOW_COPY_AND_ASSIGN -#include "rtc_base/socket.h" // for Socket, Socket::Option -#include "rtc_base/socketaddress.h" // for SocketAddress +#include "rtc_base/asyncpacketsocket.h" +#include "rtc_base/asyncsocket.h" +#include "rtc_base/buffer.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/socket.h" +#include "rtc_base/socketaddress.h" namespace rtc { diff --git a/rtc_base/asyncudpsocket.h b/rtc_base/asyncudpsocket.h index d814b4bfd0..030946d8a0 100644 --- a/rtc_base/asyncudpsocket.h +++ b/rtc_base/asyncudpsocket.h @@ -11,9 +11,13 @@ #ifndef RTC_BASE_ASYNCUDPSOCKET_H_ #define RTC_BASE_ASYNCUDPSOCKET_H_ +#include #include #include "rtc_base/asyncpacketsocket.h" +#include "rtc_base/asyncsocket.h" +#include "rtc_base/socket.h" +#include "rtc_base/socketaddress.h" #include "rtc_base/socketfactory.h" namespace rtc { diff --git a/rtc_base/bitrateallocationstrategy.cc b/rtc_base/bitrateallocationstrategy.cc index c9fa937ca3..3c412071ae 100644 --- a/rtc_base/bitrateallocationstrategy.cc +++ b/rtc_base/bitrateallocationstrategy.cc @@ -11,6 +11,8 @@ #include "rtc_base/bitrateallocationstrategy.h" #include +#include +#include #include #include diff --git a/rtc_base/bitrateallocationstrategy.h b/rtc_base/bitrateallocationstrategy.h index e1e47ba163..e68ea74698 100644 --- a/rtc_base/bitrateallocationstrategy.h +++ b/rtc_base/bitrateallocationstrategy.h @@ -11,8 +11,10 @@ #ifndef RTC_BASE_BITRATEALLOCATIONSTRATEGY_H_ #define RTC_BASE_BITRATEALLOCATIONSTRATEGY_H_ +#include #include #include + #include "api/array_view.h" #include "rtc_base/experiments/field_trial_parser.h" #include "rtc_base/experiments/field_trial_units.h" diff --git a/rtc_base/bufferqueue.cc b/rtc_base/bufferqueue.cc index 48ff2e6d31..74f7a502c0 100644 --- a/rtc_base/bufferqueue.cc +++ b/rtc_base/bufferqueue.cc @@ -10,6 +10,8 @@ #include "rtc_base/bufferqueue.h" +#include +#include #include namespace rtc { diff --git a/rtc_base/bufferqueue.h b/rtc_base/bufferqueue.h index 94ab0ca4c9..63f5182509 100644 --- a/rtc_base/bufferqueue.h +++ b/rtc_base/bufferqueue.h @@ -11,12 +11,14 @@ #ifndef RTC_BASE_BUFFERQUEUE_H_ #define RTC_BASE_BUFFERQUEUE_H_ +#include #include #include #include "rtc_base/buffer.h" #include "rtc_base/constructormagic.h" #include "rtc_base/criticalsection.h" +#include "rtc_base/thread_annotations.h" namespace rtc { diff --git a/rtc_base/bytebuffer.h b/rtc_base/bytebuffer.h index 9e08f025a8..4d25c21050 100644 --- a/rtc_base/bytebuffer.h +++ b/rtc_base/bytebuffer.h @@ -11,6 +11,8 @@ #ifndef RTC_BASE_BYTEBUFFER_H_ #define RTC_BASE_BYTEBUFFER_H_ +#include +#include #include #include "rtc_base/buffer.h" diff --git a/rtc_base/copyonwritebuffer.cc b/rtc_base/copyonwritebuffer.cc index 6c48d52f17..8f5126a282 100644 --- a/rtc_base/copyonwritebuffer.cc +++ b/rtc_base/copyonwritebuffer.cc @@ -10,6 +10,8 @@ #include "rtc_base/copyonwritebuffer.h" +#include + namespace rtc { CopyOnWriteBuffer::CopyOnWriteBuffer() { diff --git a/rtc_base/copyonwritebuffer.h b/rtc_base/copyonwritebuffer.h index 177e38f7a7..cc174dfc7c 100644 --- a/rtc_base/copyonwritebuffer.h +++ b/rtc_base/copyonwritebuffer.h @@ -11,7 +11,11 @@ #ifndef RTC_BASE_COPYONWRITEBUFFER_H_ #define RTC_BASE_COPYONWRITEBUFFER_H_ +#include #include +#include +#include +#include #include #include "rtc_base/buffer.h" diff --git a/rtc_base/criticalsection.cc b/rtc_base/criticalsection.cc index d8a5b48c05..4e00be968d 100644 --- a/rtc_base/criticalsection.cc +++ b/rtc_base/criticalsection.cc @@ -10,6 +10,8 @@ #include "rtc_base/criticalsection.h" +#include + #include "rtc_base/atomicops.h" #include "rtc_base/checks.h" #include "rtc_base/platform_thread_types.h" diff --git a/rtc_base/event_tracer.cc b/rtc_base/event_tracer.cc index c61def9e07..201abdd233 100644 --- a/rtc_base/event_tracer.cc +++ b/rtc_base/event_tracer.cc @@ -10,7 +10,9 @@ #include "rtc_base/event_tracer.h" #include - +#include +#include +#include #include #include @@ -20,6 +22,9 @@ #include "rtc_base/event.h" #include "rtc_base/logging.h" #include "rtc_base/platform_thread.h" +#include "rtc_base/platform_thread_types.h" +#include "rtc_base/thread_annotations.h" +#include "rtc_base/thread_checker.h" #include "rtc_base/timeutils.h" #include "rtc_base/trace_event.h" diff --git a/rtc_base/experiments/alr_experiment.cc b/rtc_base/experiments/alr_experiment.cc index dff5acecc8..25e948d98a 100644 --- a/rtc_base/experiments/alr_experiment.cc +++ b/rtc_base/experiments/alr_experiment.cc @@ -10,9 +10,10 @@ #include "rtc_base/experiments/alr_experiment.h" +#include +#include #include -#include "rtc_base/format_macros.h" #include "rtc_base/logging.h" #include "system_wrappers/include/field_trial.h" diff --git a/rtc_base/experiments/alr_experiment.h b/rtc_base/experiments/alr_experiment.h index 4d9fd00130..876bd02517 100644 --- a/rtc_base/experiments/alr_experiment.h +++ b/rtc_base/experiments/alr_experiment.h @@ -11,6 +11,8 @@ #ifndef RTC_BASE_EXPERIMENTS_ALR_EXPERIMENT_H_ #define RTC_BASE_EXPERIMENTS_ALR_EXPERIMENT_H_ +#include + #include "absl/types/optional.h" namespace webrtc { diff --git a/rtc_base/experiments/field_trial_units.cc b/rtc_base/experiments/field_trial_units.cc index f53978b211..8c201a6ee7 100644 --- a/rtc_base/experiments/field_trial_units.cc +++ b/rtc_base/experiments/field_trial_units.cc @@ -9,6 +9,7 @@ */ #include "rtc_base/experiments/field_trial_units.h" +#include #include #include diff --git a/rtc_base/fakesslidentity.h b/rtc_base/fakesslidentity.h index 9d5770ce28..b19cbfbb49 100644 --- a/rtc_base/fakesslidentity.h +++ b/rtc_base/fakesslidentity.h @@ -14,6 +14,7 @@ #include #include +#include "rtc_base/sslcertificate.h" #include "rtc_base/sslidentity.h" namespace rtc { diff --git a/rtc_base/file.h b/rtc_base/file.h index 75fd93d131..bc0974ae2a 100644 --- a/rtc_base/file.h +++ b/rtc_base/file.h @@ -11,8 +11,8 @@ #ifndef RTC_BASE_FILE_H_ #define RTC_BASE_FILE_H_ +#include #include - #include #include "rtc_base/constructormagic.h" diff --git a/rtc_base/file_posix.cc b/rtc_base/file_posix.cc index b0fec9f9fc..492019280c 100644 --- a/rtc_base/file_posix.cc +++ b/rtc_base/file_posix.cc @@ -8,17 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "rtc_base/file.h" - #include #include -#include -#include +#include +#include #include - #include #include "rtc_base/checks.h" +#include "rtc_base/file.h" +#include "rtc_base/platform_file.h" namespace rtc { diff --git a/rtc_base/filerotatingstream.cc b/rtc_base/filerotatingstream.cc index 31b00512d2..c28616d8f6 100644 --- a/rtc_base/filerotatingstream.cc +++ b/rtc_base/filerotatingstream.cc @@ -13,12 +13,12 @@ #include #include #include +#include #include "rtc_base/checks.h" #include "rtc_base/fileutils.h" #include "rtc_base/logging.h" #include "rtc_base/pathutils.h" -#include "rtc_base/strings/string_builder.h" // Note: We use fprintf for logging in the write paths of this stream to avoid // infinite loops when logging. diff --git a/rtc_base/filerotatingstream.h b/rtc_base/filerotatingstream.h index 4dab3455db..1d3da92eea 100644 --- a/rtc_base/filerotatingstream.h +++ b/rtc_base/filerotatingstream.h @@ -11,6 +11,7 @@ #ifndef RTC_BASE_FILEROTATINGSTREAM_H_ #define RTC_BASE_FILEROTATINGSTREAM_H_ +#include #include #include #include diff --git a/rtc_base/fileutils.h b/rtc_base/fileutils.h index f7afaf9595..deaf2e387a 100644 --- a/rtc_base/fileutils.h +++ b/rtc_base/fileutils.h @@ -19,15 +19,12 @@ #include #include #include -#include -#include #endif // WEBRTC_WIN #include "rtc_base/constructormagic.h" namespace rtc { -class FileStream; class Pathname; ////////////////////////// diff --git a/rtc_base/helpers.h b/rtc_base/helpers.h index d3b09cfd48..a93b321eab 100644 --- a/rtc_base/helpers.h +++ b/rtc_base/helpers.h @@ -11,6 +11,8 @@ #ifndef RTC_BASE_HELPERS_H_ #define RTC_BASE_HELPERS_H_ +#include +#include #include namespace rtc { diff --git a/rtc_base/ipaddress.cc b/rtc_base/ipaddress.cc index 9967ff3237..027a7b219e 100644 --- a/rtc_base/ipaddress.cc +++ b/rtc_base/ipaddress.cc @@ -11,24 +11,17 @@ #if defined(WEBRTC_POSIX) #include #include -#include #ifdef OPENBSD #include #endif #ifndef __native_client__ #include #endif -#include #include -#include #endif -#include - #include "rtc_base/byteorder.h" -#include "rtc_base/checks.h" #include "rtc_base/ipaddress.h" -#include "rtc_base/logging.h" #include "rtc_base/nethelpers.h" #include "rtc_base/stringutils.h" diff --git a/rtc_base/logging.cc b/rtc_base/logging.cc index 53a1ed849b..9c4ee4147c 100644 --- a/rtc_base/logging.cc +++ b/rtc_base/logging.cc @@ -20,24 +20,28 @@ #include #elif defined(WEBRTC_ANDROID) #include + // Android has a 1024 limit on log inputs. We use 60 chars as an // approx for the header/tag portion. // See android/system/core/liblog/logd_write.c static const int kMaxLogLineSize = 1024 - 60; #endif // WEBRTC_MAC && !defined(WEBRTC_IOS) || WEBRTC_ANDROID +#include +#include #include - #include #include #include +#include "rtc_base/checks.h" #include "rtc_base/criticalsection.h" #include "rtc_base/logging.h" #include "rtc_base/platform_thread_types.h" #include "rtc_base/stringencode.h" #include "rtc_base/strings/string_builder.h" #include "rtc_base/stringutils.h" +#include "rtc_base/thread_annotations.h" #include "rtc_base/timeutils.h" namespace rtc { diff --git a/rtc_base/logsinks.cc b/rtc_base/logsinks.cc index 662b1f20de..c01bafbdd2 100644 --- a/rtc_base/logsinks.cc +++ b/rtc_base/logsinks.cc @@ -10,10 +10,12 @@ #include "rtc_base/logsinks.h" +#include #include #include #include "rtc_base/checks.h" +#include "rtc_base/stream.h" namespace rtc { diff --git a/rtc_base/logsinks.h b/rtc_base/logsinks.h index caf4a5f728..d0867a2202 100644 --- a/rtc_base/logsinks.h +++ b/rtc_base/logsinks.h @@ -11,6 +11,7 @@ #ifndef RTC_BASE_LOGSINKS_H_ #define RTC_BASE_LOGSINKS_H_ +#include #include #include diff --git a/rtc_base/messagedigest.cc b/rtc_base/messagedigest.cc index 9c10bcd486..5a0d16a9a0 100644 --- a/rtc_base/messagedigest.cc +++ b/rtc_base/messagedigest.cc @@ -10,9 +10,9 @@ #include "rtc_base/messagedigest.h" -#include - #include +#include +#include #include "rtc_base/openssldigest.h" #include "rtc_base/stringencode.h" diff --git a/rtc_base/messagedigest.h b/rtc_base/messagedigest.h index fc82088543..757f914876 100644 --- a/rtc_base/messagedigest.h +++ b/rtc_base/messagedigest.h @@ -11,6 +11,7 @@ #ifndef RTC_BASE_MESSAGEDIGEST_H_ #define RTC_BASE_MESSAGEDIGEST_H_ +#include #include namespace rtc { diff --git a/rtc_base/messagequeue.cc b/rtc_base/messagequeue.cc index 84d3a96eb8..d710ba58a4 100644 --- a/rtc_base/messagequeue.cc +++ b/rtc_base/messagequeue.cc @@ -8,14 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ #include -#include // for move +#include +#include #include "rtc_base/atomicops.h" #include "rtc_base/checks.h" #include "rtc_base/logging.h" #include "rtc_base/messagequeue.h" #include "rtc_base/thread.h" -#include "rtc_base/timeutils.h" // for TimeMillis, TimeDiff, TimeUntil +#include "rtc_base/timeutils.h" #include "rtc_base/trace_event.h" namespace rtc { diff --git a/rtc_base/nethelpers.h b/rtc_base/nethelpers.h index 429f0c0c74..138f9583cc 100644 --- a/rtc_base/nethelpers.h +++ b/rtc_base/nethelpers.h @@ -12,8 +12,7 @@ #define RTC_BASE_NETHELPERS_H_ #if defined(WEBRTC_POSIX) -#include -#include +#include #elif WEBRTC_WIN #include // NOLINT #endif @@ -21,7 +20,7 @@ #include #include "rtc_base/asyncresolverinterface.h" -#include "rtc_base/ipaddress.h" // for IPAddress +#include "rtc_base/ipaddress.h" #include "rtc_base/signalthread.h" #include "rtc_base/socketaddress.h" diff --git a/rtc_base/network/sent_packet.h b/rtc_base/network/sent_packet.h index ec80982751..0cad31ca91 100644 --- a/rtc_base/network/sent_packet.h +++ b/rtc_base/network/sent_packet.h @@ -11,7 +11,8 @@ #ifndef RTC_BASE_NETWORK_SENT_PACKET_H_ #define RTC_BASE_NETWORK_SENT_PACKET_H_ -#include +#include +#include #include "absl/types/optional.h" diff --git a/rtc_base/networkmonitor.cc b/rtc_base/networkmonitor.cc index e3b2efde22..0185eab856 100644 --- a/rtc_base/networkmonitor.cc +++ b/rtc_base/networkmonitor.cc @@ -10,7 +10,10 @@ #include "rtc_base/networkmonitor.h" +#include + #include "rtc_base/checks.h" +#include "rtc_base/location.h" #include "rtc_base/logging.h" namespace { diff --git a/rtc_base/nullsocketserver.h b/rtc_base/nullsocketserver.h index 408bcd1b2f..47a7fa6118 100644 --- a/rtc_base/nullsocketserver.h +++ b/rtc_base/nullsocketserver.h @@ -11,7 +11,9 @@ #ifndef RTC_BASE_NULLSOCKETSERVER_H_ #define RTC_BASE_NULLSOCKETSERVER_H_ +#include "rtc_base/asyncsocket.h" #include "rtc_base/event.h" +#include "rtc_base/socket.h" #include "rtc_base/socketserver.h" namespace rtc { diff --git a/rtc_base/numerics/sample_counter.h b/rtc_base/numerics/sample_counter.h index 4fe71d1942..18bd36b8f3 100644 --- a/rtc_base/numerics/sample_counter.h +++ b/rtc_base/numerics/sample_counter.h @@ -11,6 +11,8 @@ #ifndef RTC_BASE_NUMERICS_SAMPLE_COUNTER_H_ #define RTC_BASE_NUMERICS_SAMPLE_COUNTER_H_ +#include + #include "absl/types/optional.h" namespace rtc { diff --git a/rtc_base/openssladapter.cc b/rtc_base/openssladapter.cc index 2ca17a618e..fcfa53b7ee 100644 --- a/rtc_base/openssladapter.cc +++ b/rtc_base/openssladapter.cc @@ -10,26 +10,25 @@ #include "rtc_base/openssladapter.h" -#if defined(WEBRTC_POSIX) -#include -#endif +#include #include -#include #include -#include #include #include -#include #include "rtc_base/openssl.h" -#include "absl/memory/memory.h" // for make_unique +#include +#include + +#include "absl/memory/memory.h" #include "rtc_base/checks.h" +#include "rtc_base/location.h" #include "rtc_base/logging.h" #include "rtc_base/numerics/safe_conversions.h" +#include "rtc_base/opensslcertificate.h" #include "rtc_base/opensslutility.h" #include "rtc_base/stringencode.h" -#include "rtc_base/stringutils.h" #include "rtc_base/thread.h" #ifndef OPENSSL_IS_BORINGSSL diff --git a/rtc_base/openssladapter.h b/rtc_base/openssladapter.h index 45ffc6f0dc..e77575e129 100644 --- a/rtc_base/openssladapter.h +++ b/rtc_base/openssladapter.h @@ -11,24 +11,24 @@ #ifndef RTC_BASE_OPENSSLADAPTER_H_ #define RTC_BASE_OPENSSLADAPTER_H_ -#include - +#include +#include #include #include #include -#include "rtc_base/asyncsocket.h" // for AsyncSocket -#include "rtc_base/buffer.h" // for Buffer -#include "rtc_base/messagehandler.h" // for MessageHandler -#include "rtc_base/messagequeue.h" // for Message -#include "rtc_base/opensslidentity.h" // for SSL_CTX, OpenSSLIdentity -#include "rtc_base/opensslsessioncache.h" // for OpenSSLSessionCache -#include "rtc_base/socket.h" // for Socket::ConnState -#include "rtc_base/socketaddress.h" // for SocketAddress -#include "rtc_base/ssladapter.h" // for SSLAdapter, SSLAdapterFactory -#include "rtc_base/sslcertificate.h" // for SSLCertificateVerifier -#include "rtc_base/sslidentity.h" // for SSLIdentity -#include "rtc_base/sslstreamadapter.h" // for SSLMode, SSLRole, SSL_MODE... +#include "rtc_base/asyncsocket.h" +#include "rtc_base/buffer.h" +#include "rtc_base/messagehandler.h" +#include "rtc_base/messagequeue.h" +#include "rtc_base/opensslidentity.h" +#include "rtc_base/opensslsessioncache.h" +#include "rtc_base/socket.h" +#include "rtc_base/socketaddress.h" +#include "rtc_base/ssladapter.h" +#include "rtc_base/sslcertificate.h" +#include "rtc_base/sslidentity.h" +#include "rtc_base/sslstreamadapter.h" namespace rtc { diff --git a/rtc_base/opensslcertificate.cc b/rtc_base/opensslcertificate.cc index 92443a4458..fa41065cb3 100644 --- a/rtc_base/opensslcertificate.cc +++ b/rtc_base/opensslcertificate.cc @@ -10,10 +10,6 @@ #include "rtc_base/opensslcertificate.h" -#include -#include -#include - #if defined(WEBRTC_WIN) // Must be included first before openssl headers. #include "rtc_base/win32.h" // NOLINT @@ -21,24 +17,17 @@ #include #include -#include -#include #include -#include +#include #include "absl/memory/memory.h" -#include "rtc_base/arraysize.h" #include "rtc_base/checks.h" #include "rtc_base/helpers.h" #include "rtc_base/logging.h" -#include "rtc_base/numerics/safe_conversions.h" -#include "rtc_base/openssl.h" +#include "rtc_base/messagedigest.h" #include "rtc_base/openssldigest.h" #include "rtc_base/opensslidentity.h" #include "rtc_base/opensslutility.h" -#ifndef WEBRTC_EXCLUDE_BUILT_IN_SSL_ROOT_CERTS -#include "rtc_base/sslroots.h" -#endif // WEBRTC_EXCLUDE_BUILT_IN_SSL_ROOT_CERTS namespace rtc { diff --git a/rtc_base/opensslcertificate.h b/rtc_base/opensslcertificate.h index ef416a1df4..40de0216c4 100644 --- a/rtc_base/opensslcertificate.h +++ b/rtc_base/opensslcertificate.h @@ -11,16 +11,16 @@ #ifndef RTC_BASE_OPENSSLCERTIFICATE_H_ #define RTC_BASE_OPENSSLCERTIFICATE_H_ -#include // for X509, SSL_CTX +#include -#include // for size_t -#include // for int64_t +#include +#include #include -#include "rtc_base/buffer.h" // for Buffer -#include "rtc_base/constructormagic.h" // for RTC_DISALLOW_COPY_AND_ASSIGN -#include "rtc_base/sslcertificate.h" // for SSLCertificate -#include "rtc_base/sslidentity.h" // for SSLIdentityParams +#include "rtc_base/buffer.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/sslcertificate.h" +#include "rtc_base/sslidentity.h" namespace rtc { diff --git a/rtc_base/openssldigest.cc b/rtc_base/openssldigest.cc index 9b644c460b..da90b65f82 100644 --- a/rtc_base/openssldigest.cc +++ b/rtc_base/openssldigest.cc @@ -10,7 +10,7 @@ #include "rtc_base/openssldigest.h" -#include "rtc_base/checks.h" +#include "rtc_base/checks.h" // RTC_DCHECK, RTC_CHECK #include "rtc_base/openssl.h" namespace rtc { diff --git a/rtc_base/openssldigest.h b/rtc_base/openssldigest.h index 78d28d75b6..78986f5af7 100644 --- a/rtc_base/openssldigest.h +++ b/rtc_base/openssldigest.h @@ -11,7 +11,8 @@ #ifndef RTC_BASE_OPENSSLDIGEST_H_ #define RTC_BASE_OPENSSLDIGEST_H_ -#include // for EVP_MD, EVP_MD_CTX +#include +#include #include #include "rtc_base/messagedigest.h" diff --git a/rtc_base/opensslidentity.cc b/rtc_base/opensslidentity.cc index a5bbd5d72d..9850c855ea 100644 --- a/rtc_base/opensslidentity.cc +++ b/rtc_base/opensslidentity.cc @@ -21,18 +21,17 @@ #include #include -#include #include #include #include +#include + #include "absl/memory/memory.h" #include "rtc_base/checks.h" -#include "rtc_base/helpers.h" #include "rtc_base/logging.h" #include "rtc_base/numerics/safe_conversions.h" #include "rtc_base/openssl.h" -#include "rtc_base/openssldigest.h" #include "rtc_base/opensslutility.h" namespace rtc { diff --git a/rtc_base/opensslidentity.h b/rtc_base/opensslidentity.h index d0e87a0c78..21bee91d36 100644 --- a/rtc_base/opensslidentity.h +++ b/rtc_base/opensslidentity.h @@ -11,17 +11,17 @@ #ifndef RTC_BASE_OPENSSLIDENTITY_H_ #define RTC_BASE_OPENSSLIDENTITY_H_ -#include // for EVP_PKEY, SSL_CTX +#include -#include // for time_t -#include // for unique_ptr +#include +#include #include -#include "rtc_base/checks.h" // for RTC_DCHECK -#include "rtc_base/constructormagic.h" // for RTC_DISALLOW_COPY_AND_ASSIGN -#include "rtc_base/opensslcertificate.h" // for OpenSSLCertificate -#include "rtc_base/sslcertificate.h" // for SSLCertChain -#include "rtc_base/sslidentity.h" // for SSLIdentity, KeyParams, SSL... +#include "rtc_base/checks.h" +#include "rtc_base/constructormagic.h" +#include "rtc_base/opensslcertificate.h" +#include "rtc_base/sslcertificate.h" +#include "rtc_base/sslidentity.h" namespace rtc { diff --git a/rtc_base/opensslstreamadapter.cc b/rtc_base/opensslstreamadapter.cc index 3eb3b80c7b..47ca125b52 100644 --- a/rtc_base/opensslstreamadapter.cc +++ b/rtc_base/opensslstreamadapter.cc @@ -32,6 +32,7 @@ #include "rtc_base/openssladapter.h" #include "rtc_base/openssldigest.h" #include "rtc_base/opensslidentity.h" +#include "rtc_base/sslcertificate.h" #include "rtc_base/stream.h" #include "rtc_base/stringutils.h" #include "rtc_base/thread.h" diff --git a/rtc_base/opensslstreamadapter.h b/rtc_base/opensslstreamadapter.h index 61ffc3dbfe..d282932d05 100644 --- a/rtc_base/opensslstreamadapter.h +++ b/rtc_base/opensslstreamadapter.h @@ -13,13 +13,18 @@ #include +#include +#include #include #include #include #include "rtc_base/buffer.h" +#include "rtc_base/messagequeue.h" #include "rtc_base/opensslidentity.h" +#include "rtc_base/sslidentity.h" #include "rtc_base/sslstreamadapter.h" +#include "rtc_base/stream.h" namespace rtc { @@ -47,7 +52,7 @@ namespace rtc { // Look in sslstreamadapter.h for documentation of the methods. -class OpenSSLIdentity; +class SSLCertChain; /////////////////////////////////////////////////////////////////////////////// diff --git a/rtc_base/opensslutility.cc b/rtc_base/opensslutility.cc index 46f4547436..a3f33478eb 100644 --- a/rtc_base/opensslutility.cc +++ b/rtc_base/opensslutility.cc @@ -9,29 +9,21 @@ */ #include "rtc_base/opensslutility.h" - -#include - -#if defined(WEBRTC_POSIX) -#include -#endif - #if defined(WEBRTC_WIN) // Must be included first before openssl headers. #include "rtc_base/win32.h" // NOLINT #endif // WEBRTC_WIN -#include -#include #include #include #include +#include "rtc_base/openssl.h" + +#include #include "rtc_base/arraysize.h" -#include "rtc_base/checks.h" #include "rtc_base/logging.h" #include "rtc_base/numerics/safe_conversions.h" -#include "rtc_base/openssl.h" #include "rtc_base/opensslcertificate.h" #ifndef WEBRTC_EXCLUDE_BUILT_IN_SSL_ROOT_CERTS #include "rtc_base/sslroots.h" diff --git a/rtc_base/platform_file.cc b/rtc_base/platform_file.cc index d74acddd02..baefb22931 100644 --- a/rtc_base/platform_file.cc +++ b/rtc_base/platform_file.cc @@ -12,11 +12,11 @@ #if defined(WEBRTC_WIN) #include + #include "rtc_base/stringutils.h" // For ToUtf16 #else #include #include -#include #include #endif diff --git a/rtc_base/platform_thread.cc b/rtc_base/platform_thread.cc index 79d9d53aee..ba84b6ae8e 100644 --- a/rtc_base/platform_thread.cc +++ b/rtc_base/platform_thread.cc @@ -10,15 +10,17 @@ #include "rtc_base/platform_thread.h" +#if !defined(WEBRTC_WIN) +#include +#endif +#include +#include +#include + #include "rtc_base/atomicops.h" #include "rtc_base/checks.h" #include "rtc_base/timeutils.h" -#if defined(WEBRTC_LINUX) -#include -#include -#endif - namespace rtc { namespace { #if defined(WEBRTC_WIN) diff --git a/rtc_base/platform_thread.h b/rtc_base/platform_thread.h index ea67aca42b..47c23dc1b5 100644 --- a/rtc_base/platform_thread.h +++ b/rtc_base/platform_thread.h @@ -11,6 +11,9 @@ #ifndef RTC_BASE_PLATFORM_THREAD_H_ #define RTC_BASE_PLATFORM_THREAD_H_ +#ifndef WEBRTC_WIN +#include +#endif #include #include "rtc_base/constructormagic.h" diff --git a/rtc_base/race_checker.h b/rtc_base/race_checker.h index d6eba08276..4d574601eb 100644 --- a/rtc_base/race_checker.h +++ b/rtc_base/race_checker.h @@ -12,7 +12,7 @@ #define RTC_BASE_RACE_CHECKER_H_ #include "rtc_base/checks.h" -#include "rtc_base/platform_thread_types.h" // for PlatformThreadRef +#include "rtc_base/platform_thread_types.h" #include "rtc_base/thread_annotations.h" namespace rtc { diff --git a/rtc_base/random.h b/rtc_base/random.h index 2faa9856dc..e1c3bb7058 100644 --- a/rtc_base/random.h +++ b/rtc_base/random.h @@ -11,6 +11,7 @@ #ifndef RTC_BASE_RANDOM_H_ #define RTC_BASE_RANDOM_H_ +#include #include #include "rtc_base/checks.h" diff --git a/rtc_base/rate_limiter.cc b/rtc_base/rate_limiter.cc index 0343f256b2..5c7bdefb0c 100644 --- a/rtc_base/rate_limiter.cc +++ b/rtc_base/rate_limiter.cc @@ -9,6 +9,10 @@ */ #include "rtc_base/rate_limiter.h" + +#include + +#include "absl/types/optional.h" #include "system_wrappers/include/clock.h" namespace webrtc { diff --git a/rtc_base/rate_limiter.h b/rtc_base/rate_limiter.h index 0bfde0da25..43ef88d8fc 100644 --- a/rtc_base/rate_limiter.h +++ b/rtc_base/rate_limiter.h @@ -11,11 +11,13 @@ #ifndef RTC_BASE_RATE_LIMITER_H_ #define RTC_BASE_RATE_LIMITER_H_ -#include +#include +#include #include "rtc_base/constructormagic.h" #include "rtc_base/criticalsection.h" #include "rtc_base/rate_statistics.h" +#include "rtc_base/thread_annotations.h" namespace webrtc { diff --git a/rtc_base/rate_statistics.h b/rtc_base/rate_statistics.h index 68035c9a68..d4ccc59bf5 100644 --- a/rtc_base/rate_statistics.h +++ b/rtc_base/rate_statistics.h @@ -11,6 +11,8 @@ #ifndef RTC_BASE_RATE_STATISTICS_H_ #define RTC_BASE_RATE_STATISTICS_H_ +#include +#include #include #include "absl/types/optional.h" diff --git a/rtc_base/rtccertificate.cc b/rtc_base/rtccertificate.cc index 786333fcc3..17c157535f 100644 --- a/rtc_base/rtccertificate.cc +++ b/rtc_base/rtccertificate.cc @@ -14,6 +14,8 @@ #include "rtc_base/checks.h" #include "rtc_base/refcountedobject.h" +#include "rtc_base/sslcertificate.h" +#include "rtc_base/sslidentity.h" #include "rtc_base/timeutils.h" namespace rtc { diff --git a/rtc_base/rtccertificate.h b/rtc_base/rtccertificate.h index d5422f8b4a..0adefbce28 100644 --- a/rtc_base/rtccertificate.h +++ b/rtc_base/rtccertificate.h @@ -12,15 +12,18 @@ #define RTC_BASE_RTCCERTIFICATE_H_ #include - #include +#include #include "rtc_base/refcount.h" #include "rtc_base/scoped_ref_ptr.h" -#include "rtc_base/sslidentity.h" namespace rtc { +class SSLCertChain; +class SSLCertificate; +class SSLIdentity; + // This class contains PEM strings of an RTCCertificate's private key and // certificate and acts as a text representation of RTCCertificate. Certificates // can be serialized and deserialized to and from this format, which allows for diff --git a/rtc_base/rtccertificategenerator.cc b/rtc_base/rtccertificategenerator.cc index 0b51c611ba..3867ceb53b 100644 --- a/rtc_base/rtccertificategenerator.cc +++ b/rtc_base/rtccertificategenerator.cc @@ -10,10 +10,15 @@ #include "rtc_base/rtccertificategenerator.h" +#include #include #include +#include #include "rtc_base/checks.h" +#include "rtc_base/location.h" +#include "rtc_base/messagehandler.h" +#include "rtc_base/messagequeue.h" #include "rtc_base/refcountedobject.h" #include "rtc_base/sslidentity.h" diff --git a/rtc_base/rtccertificategenerator.h b/rtc_base/rtccertificategenerator.h index a6c503a9f2..fed075e6dd 100644 --- a/rtc_base/rtccertificategenerator.h +++ b/rtc_base/rtccertificategenerator.h @@ -11,6 +11,8 @@ #ifndef RTC_BASE_RTCCERTIFICATEGENERATOR_H_ #define RTC_BASE_RTCCERTIFICATEGENERATOR_H_ +#include + #include "absl/types/optional.h" #include "rtc_base/refcount.h" #include "rtc_base/rtccertificate.h" diff --git a/rtc_base/sequenced_task_checker_impl.cc b/rtc_base/sequenced_task_checker_impl.cc index 16069c25f7..717cb95040 100644 --- a/rtc_base/sequenced_task_checker_impl.cc +++ b/rtc_base/sequenced_task_checker_impl.cc @@ -14,6 +14,7 @@ #include #endif +#include "rtc_base/checks.h" #include "rtc_base/sequenced_task_checker.h" #include "rtc_base/task_queue.h" diff --git a/rtc_base/signalthread.cc b/rtc_base/signalthread.cc index 2e0fa0cb6b..5dd9387931 100644 --- a/rtc_base/signalthread.cc +++ b/rtc_base/signalthread.cc @@ -10,9 +10,13 @@ #include "rtc_base/signalthread.h" +#include + #include "absl/memory/memory.h" #include "rtc_base/checks.h" +#include "rtc_base/location.h" #include "rtc_base/nullsocketserver.h" +#include "rtc_base/socketserver.h" namespace rtc { diff --git a/rtc_base/signalthread.h b/rtc_base/signalthread.h index 448b2890e5..9208e2c246 100644 --- a/rtc_base/signalthread.h +++ b/rtc_base/signalthread.h @@ -14,13 +14,13 @@ #include #include "rtc_base/checks.h" -#include "rtc_base/constructormagic.h" // for RTC_DISALLOW_IMPLI... -#include "rtc_base/criticalsection.h" // for CriticalSection -#include "rtc_base/messagehandler.h" // for MessageHandler -#include "rtc_base/messagequeue.h" // for Message -#include "rtc_base/third_party/sigslot/sigslot.h" // for has_slots, signal_... -#include "rtc_base/thread.h" // for Thread -#include "rtc_base/thread_annotations.h" // for RTC_EXCLUSIVE_LOCK... +#include "rtc_base/constructormagic.h" +#include "rtc_base/criticalsection.h" +#include "rtc_base/messagehandler.h" +#include "rtc_base/messagequeue.h" +#include "rtc_base/third_party/sigslot/sigslot.h" +#include "rtc_base/thread.h" +#include "rtc_base/thread_annotations.h" namespace rtc { diff --git a/rtc_base/socketadapters.cc b/rtc_base/socketadapters.cc index 98be868db6..45e002a6c7 100644 --- a/rtc_base/socketadapters.cc +++ b/rtc_base/socketadapters.cc @@ -13,18 +13,23 @@ #endif #include +#include +#include +#include #include #if defined(WEBRTC_WIN) #include #include #include + #define SECURITY_WIN32 #include #endif #include +#include "rtc_base/buffer.h" #include "rtc_base/bytebuffer.h" #include "rtc_base/checks.h" #include "rtc_base/httpcommon.h" diff --git a/rtc_base/socketaddresspair.h b/rtc_base/socketaddresspair.h index 5ff148a75d..6691386d3a 100644 --- a/rtc_base/socketaddresspair.h +++ b/rtc_base/socketaddresspair.h @@ -11,6 +11,8 @@ #ifndef RTC_BASE_SOCKETADDRESSPAIR_H_ #define RTC_BASE_SOCKETADDRESSPAIR_H_ +#include + #include "rtc_base/socketaddress.h" namespace rtc { diff --git a/rtc_base/socketstream.cc b/rtc_base/socketstream.cc index 2ea1cec0ac..8978404cf4 100644 --- a/rtc_base/socketstream.cc +++ b/rtc_base/socketstream.cc @@ -11,6 +11,7 @@ #include "rtc_base/socketstream.h" #include "rtc_base/checks.h" +#include "rtc_base/socket.h" namespace rtc { diff --git a/rtc_base/ssladapter.h b/rtc_base/ssladapter.h index 4843d264fc..7ebedcadf0 100644 --- a/rtc_base/ssladapter.h +++ b/rtc_base/ssladapter.h @@ -16,6 +16,7 @@ #include "rtc_base/asyncsocket.h" #include "rtc_base/sslcertificate.h" +#include "rtc_base/sslidentity.h" #include "rtc_base/sslstreamadapter.h" namespace rtc { diff --git a/rtc_base/sslcertificate.cc b/rtc_base/sslcertificate.cc index d735ebf950..934848fb73 100644 --- a/rtc_base/sslcertificate.cc +++ b/rtc_base/sslcertificate.cc @@ -10,15 +10,15 @@ #include "rtc_base/sslcertificate.h" -#include // for transform +#include #include #include -#include "absl/memory/memory.h" // for WrapUnique, make_unique -#include "rtc_base/checks.h" // for FatalLogCall, RTC_DC... -#include "rtc_base/opensslcertificate.h" // for OpenSSLCertificate -#include "rtc_base/sslfingerprint.h" // for SSLFingerprint -#include "rtc_base/third_party/base64/base64.h" // for Base64 +#include "absl/memory/memory.h" +#include "rtc_base/checks.h" +#include "rtc_base/opensslcertificate.h" +#include "rtc_base/sslfingerprint.h" +#include "rtc_base/third_party/base64/base64.h" namespace rtc { diff --git a/rtc_base/sslcertificate.h b/rtc_base/sslcertificate.h index c04852f2f2..59567c93a6 100644 --- a/rtc_base/sslcertificate.h +++ b/rtc_base/sslcertificate.h @@ -15,6 +15,8 @@ #ifndef RTC_BASE_SSLCERTIFICATE_H_ #define RTC_BASE_SSLCERTIFICATE_H_ +#include +#include #include #include #include diff --git a/rtc_base/sslfingerprint.cc b/rtc_base/sslfingerprint.cc index 03a627f546..db13cf625c 100644 --- a/rtc_base/sslfingerprint.cc +++ b/rtc_base/sslfingerprint.cc @@ -11,11 +11,16 @@ #include "rtc_base/sslfingerprint.h" #include +#include +#include #include #include "absl/memory/memory.h" #include "rtc_base/logging.h" #include "rtc_base/messagedigest.h" +#include "rtc_base/rtccertificate.h" +#include "rtc_base/sslcertificate.h" +#include "rtc_base/sslidentity.h" #include "rtc_base/stringencode.h" namespace rtc { diff --git a/rtc_base/sslfingerprint.h b/rtc_base/sslfingerprint.h index b8109e88f3..ea10ede720 100644 --- a/rtc_base/sslfingerprint.h +++ b/rtc_base/sslfingerprint.h @@ -11,15 +11,17 @@ #ifndef RTC_BASE_SSLFINGERPRINT_H_ #define RTC_BASE_SSLFINGERPRINT_H_ +#include +#include #include #include "rtc_base/copyonwritebuffer.h" -#include "rtc_base/rtccertificate.h" -#include "rtc_base/sslidentity.h" namespace rtc { +class RTCCertificate; class SSLCertificate; +class SSLIdentity; struct SSLFingerprint { // TODO(steveanton): Remove once downstream projects have moved off of this. diff --git a/rtc_base/sslidentity.cc b/rtc_base/sslidentity.cc index 1d136d7298..e15fde6bf2 100644 --- a/rtc_base/sslidentity.cc +++ b/rtc_base/sslidentity.cc @@ -11,15 +11,16 @@ // Handling of certificates and keypairs for SSLStreamAdapter's peer mode. #include "rtc_base/sslidentity.h" -#include // for strspn -#include +#include +#include #include -#include "rtc_base/checks.h" // for FatalLogCall, RTC_DC... -#include "rtc_base/opensslidentity.h" // for OpenSSLIdentity -#include "rtc_base/strings/string_builder.h" // for StringBuilder -#include "rtc_base/third_party/base64/base64.h" // for Base64, Base64::DO_P... -#include "rtc_base/timeutils.h" // for TmToSeconds +#include "rtc_base/checks.h" +#include "rtc_base/opensslidentity.h" +#include "rtc_base/sslcertificate.h" +#include "rtc_base/strings/string_builder.h" +#include "rtc_base/third_party/base64/base64.h" +#include "rtc_base/timeutils.h" namespace rtc { @@ -239,7 +240,7 @@ int64_t ASN1TimeToSec(const unsigned char* s, size_t length, bool long_format) { year += 100; } - std::tm tm; + tm tm; tm.tm_year = year; // Read out remaining ASN1 time data and store it in |tm| in documented diff --git a/rtc_base/sslidentity.h b/rtc_base/sslidentity.h index d17d38bacd..39feeabab3 100644 --- a/rtc_base/sslidentity.h +++ b/rtc_base/sslidentity.h @@ -13,13 +13,15 @@ #ifndef RTC_BASE_SSLIDENTITY_H_ #define RTC_BASE_SSLIDENTITY_H_ +#include #include #include -#include "rtc_base/sslcertificate.h" - namespace rtc { +class SSLCertChain; +class SSLCertificate; + // KT_LAST is intended for vector declarations and loops over all key types; // it does not represent any key type in itself. // KT_DEFAULT is used as the default KeyType for KeyParams. diff --git a/rtc_base/stream.cc b/rtc_base/stream.cc index ea2e47a6fb..abaa96ee51 100644 --- a/rtc_base/stream.cc +++ b/rtc_base/stream.cc @@ -7,28 +7,23 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ - -#if defined(WEBRTC_POSIX) -#include -#endif // WEBRTC_POSIX #include +#include #include -#include - -#include // for memcpy, memmove, strlen #include #include #include "rtc_base/checks.h" -#include "rtc_base/location.h" // for RTC_FROM_HERE +#include "rtc_base/location.h" #include "rtc_base/messagequeue.h" #include "rtc_base/stream.h" #include "rtc_base/thread.h" #if defined(WEBRTC_WIN) #include + #define fileno _fileno -#include "rtc_base/stringutils.h" // for ToUtf16 +#include "rtc_base/stringutils.h" #endif namespace rtc { diff --git a/rtc_base/string_to_number.cc b/rtc_base/string_to_number.cc index 9201242d5f..634652b83f 100644 --- a/rtc_base/string_to_number.cc +++ b/rtc_base/string_to_number.cc @@ -10,6 +10,7 @@ #include "rtc_base/string_to_number.h" +#include #include #include diff --git a/rtc_base/string_to_number.h b/rtc_base/string_to_number.h index 7ea9f251ed..4cb521595d 100644 --- a/rtc_base/string_to_number.h +++ b/rtc_base/string_to_number.h @@ -13,6 +13,7 @@ #include #include +#include #include "absl/types/optional.h" diff --git a/rtc_base/stringencode.cc b/rtc_base/stringencode.cc index 36c3f91236..df981b04a1 100644 --- a/rtc_base/stringencode.cc +++ b/rtc_base/stringencode.cc @@ -10,6 +10,8 @@ #include "rtc_base/stringencode.h" +#include + #include "rtc_base/arraysize.h" #include "rtc_base/checks.h" #include "rtc_base/stringutils.h" diff --git a/rtc_base/stringencode.h b/rtc_base/stringencode.h index 5d436dfd57..09bf77f446 100644 --- a/rtc_base/stringencode.h +++ b/rtc_base/stringencode.h @@ -11,9 +11,12 @@ #ifndef RTC_BASE_STRINGENCODE_H_ #define RTC_BASE_STRINGENCODE_H_ +#include #include +#include #include +#include "absl/types/optional.h" #include "rtc_base/checks.h" #include "rtc_base/string_to_number.h" diff --git a/rtc_base/strings/audio_format_to_string.cc b/rtc_base/strings/audio_format_to_string.cc index a149344198..7e91c3b49d 100644 --- a/rtc_base/strings/audio_format_to_string.cc +++ b/rtc_base/strings/audio_format_to_string.cc @@ -10,6 +10,8 @@ #include "rtc_base/strings/audio_format_to_string.h" +#include + #include "rtc_base/strings/string_builder.h" namespace rtc { diff --git a/rtc_base/strings/string_builder.cc b/rtc_base/strings/string_builder.cc index 0dca938a1e..adf4fa9e81 100644 --- a/rtc_base/strings/string_builder.cc +++ b/rtc_base/strings/string_builder.cc @@ -10,11 +10,11 @@ #include "rtc_base/strings/string_builder.h" -#include // for va_end, va_list, va_start -#include // for strlen +#include +#include -#include "rtc_base/checks.h" // for FatalLogCall, RTC_DCHECK -#include "rtc_base/numerics/safe_minmax.h" // for SafeMin +#include "rtc_base/checks.h" +#include "rtc_base/numerics/safe_minmax.h" namespace rtc { diff --git a/rtc_base/stringutils.cc b/rtc_base/stringutils.cc index 333c060738..c808eb2cc4 100644 --- a/rtc_base/stringutils.cc +++ b/rtc_base/stringutils.cc @@ -10,8 +10,6 @@ #include "rtc_base/stringutils.h" -#include "rtc_base/checks.h" - namespace rtc { size_t strcpyn(char* buffer, diff --git a/rtc_base/stringutils.h b/rtc_base/stringutils.h index 2f75c0978b..45f3a3acd0 100644 --- a/rtc_base/stringutils.h +++ b/rtc_base/stringutils.h @@ -20,6 +20,7 @@ #include #include #include + #define alloca _alloca #endif // WEBRTC_WIN @@ -29,6 +30,7 @@ #else // BSD #include #endif // !BSD +#include #endif // WEBRTC_POSIX #include diff --git a/rtc_base/synchronization/rw_lock_posix.cc b/rtc_base/synchronization/rw_lock_posix.cc index 7e37dc924f..15ef3d706e 100644 --- a/rtc_base/synchronization/rw_lock_posix.cc +++ b/rtc_base/synchronization/rw_lock_posix.cc @@ -10,6 +10,8 @@ #include "rtc_base/synchronization/rw_lock_posix.h" +#include + namespace webrtc { RWLockPosix::RWLockPosix() : lock_() {} diff --git a/rtc_base/system/file_wrapper.cc b/rtc_base/system/file_wrapper.cc index 72f5f259db..c033a792a5 100644 --- a/rtc_base/system/file_wrapper.cc +++ b/rtc_base/system/file_wrapper.cc @@ -13,14 +13,11 @@ #ifdef _WIN32 #include #else -#include #include #endif #include -#include "rtc_base/checks.h" - namespace webrtc { namespace { FILE* FileOpen(const char* file_name_utf8, bool read_only) { diff --git a/rtc_base/system/file_wrapper.h b/rtc_base/system/file_wrapper.h index 5411b04f69..0bb86a397f 100644 --- a/rtc_base/system/file_wrapper.h +++ b/rtc_base/system/file_wrapper.h @@ -14,7 +14,6 @@ #include #include -#include "common_types.h" // NOLINT(build/include) #include "rtc_base/criticalsection.h" // Implementation that can read (exclusive) or write from/to a file. diff --git a/rtc_base/task_queue_libevent.cc b/rtc_base/task_queue_libevent.cc index ce05bae137..905bbdac0e 100644 --- a/rtc_base/task_queue_libevent.cc +++ b/rtc_base/task_queue_libevent.cc @@ -10,17 +10,17 @@ #include "rtc_base/task_queue.h" -#include // for EAGAIN, errno +#include #include -#include // for pthread_getspecific +#include #include -#include // for uint32_t -#include // for nanosleep, timespec +#include +#include #include #include -#include // for unique_ptr, allocator -#include // for remove_reference<>::... -#include // for move +#include +#include +#include #include "base/third_party/libevent/event.h" #include "rtc_base/checks.h" @@ -28,13 +28,13 @@ #include "rtc_base/logging.h" #include "rtc_base/numerics/safe_conversions.h" #include "rtc_base/platform_thread.h" -#include "rtc_base/platform_thread_types.h" // for CurrentThreadRef +#include "rtc_base/platform_thread_types.h" #include "rtc_base/refcount.h" #include "rtc_base/refcountedobject.h" -#include "rtc_base/scoped_ref_ptr.h" // for scoped_refptr +#include "rtc_base/scoped_ref_ptr.h" #include "rtc_base/system/unused.h" #include "rtc_base/task_queue_posix.h" -#include "rtc_base/thread_annotations.h" // for RTC_GUARDED_BY +#include "rtc_base/thread_annotations.h" #include "rtc_base/timeutils.h" namespace rtc { diff --git a/rtc_base/thread.cc b/rtc_base/thread.cc index b6c6a47a34..4dd5fd2224 100644 --- a/rtc_base/thread.cc +++ b/rtc_base/thread.cc @@ -24,9 +24,11 @@ #pragma warning(disable : 4722) #endif -#include // for move +#include +#include #include "rtc_base/checks.h" +#include "rtc_base/criticalsection.h" #include "rtc_base/logging.h" #include "rtc_base/nullsocketserver.h" #include "rtc_base/timeutils.h" @@ -34,6 +36,7 @@ #if defined(WEBRTC_MAC) #include "rtc_base/system/cocoa_threading.h" + /* * These are forward-declarations for methods that are part of the * ObjC runtime. They are declared in the private header objc-internal.h. diff --git a/rtc_base/thread.h b/rtc_base/thread.h index fde5e8bf39..039192ce7f 100644 --- a/rtc_base/thread.h +++ b/rtc_base/thread.h @@ -11,16 +11,22 @@ #ifndef RTC_BASE_THREAD_H_ #define RTC_BASE_THREAD_H_ +#include #include #include #include +#include #if defined(WEBRTC_POSIX) #include #endif #include "rtc_base/constructormagic.h" +#include "rtc_base/location.h" +#include "rtc_base/messagehandler.h" #include "rtc_base/messagequeue.h" #include "rtc_base/platform_thread_types.h" +#include "rtc_base/socketserver.h" +#include "rtc_base/thread_annotations.h" #if defined(WEBRTC_WIN) #include "rtc_base/win32.h" diff --git a/rtc_base/timestampaligner.cc b/rtc_base/timestampaligner.cc index a9bcafbdc5..f2da101727 100644 --- a/rtc_base/timestampaligner.cc +++ b/rtc_base/timestampaligner.cc @@ -8,6 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ +#include #include #include "rtc_base/checks.h" diff --git a/rtc_base/timeutils.cc b/rtc_base/timeutils.cc index de8fc3259c..dc5b611f64 100644 --- a/rtc_base/timeutils.cc +++ b/rtc_base/timeutils.cc @@ -14,6 +14,7 @@ #include #if defined(WEBRTC_MAC) #include +#include "rtc_base/numerics/safe_conversions.h" #endif #endif @@ -28,7 +29,6 @@ #endif #include "rtc_base/checks.h" -#include "rtc_base/numerics/safe_conversions.h" #include "rtc_base/timeutils.h" namespace rtc { @@ -154,7 +154,7 @@ int64_t TimestampWrapAroundHandler::Unwrap(uint32_t ts) { return ts + (num_wrap_ << 32); } -int64_t TmToSeconds(const std::tm& tm) { +int64_t TmToSeconds(const tm& tm) { static short int mdays[12] = {31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31}; static short int cumul_mdays[12] = {0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334}; diff --git a/rtc_base/timeutils.h b/rtc_base/timeutils.h index 3a412a47cf..4e38a03140 100644 --- a/rtc_base/timeutils.h +++ b/rtc_base/timeutils.h @@ -13,8 +13,6 @@ #include #include - -#include #include #include "rtc_base/checks.h" @@ -110,10 +108,10 @@ class TimestampWrapAroundHandler { int64_t num_wrap_; }; -// Convert from std::tm, which is relative to 1900-01-01 00:00 to number of -// seconds from 1970-01-01 00:00 ("epoch"). Don't return time_t since that +// Convert from tm, which is relative to 1900-01-01 00:00 to number of +// seconds from 1970-01-01 00:00 ("epoch"). Don't return time_t since that // is still 32 bits on many systems. -int64_t TmToSeconds(const std::tm& tm); +int64_t TmToSeconds(const tm& tm); // Return the number of microseconds since January 1, 1970, UTC. // Useful mainly when producing logs to be correlated with other diff --git a/rtc_base/unixfilesystem.cc b/rtc_base/unixfilesystem.cc index 818cb8a9d7..2a941e2b74 100644 --- a/rtc_base/unixfilesystem.cc +++ b/rtc_base/unixfilesystem.cc @@ -10,16 +10,15 @@ #include "rtc_base/unixfilesystem.h" -#include -#include -#include #include #include +#include #if defined(WEBRTC_MAC) && !defined(WEBRTC_IOS) #include #include #include + #include "rtc_base/macutils.h" #endif // WEBRTC_MAC && !defined(WEBRTC_IOS) @@ -30,27 +29,16 @@ #elif !defined(__native_client__) #include #endif // !defined(__native_client__) -#include -#include #include #endif // WEBRTC_POSIX && !WEBRTC_MAC || WEBRTC_IOS -#if defined(WEBRTC_LINUX) && !defined(WEBRTC_ANDROID) -#include -#include -#endif - #if defined(__native_client__) && !defined(__GLIBC__) #include #endif -#include "rtc_base/arraysize.h" #include "rtc_base/checks.h" -#include "rtc_base/fileutils.h" #include "rtc_base/logging.h" #include "rtc_base/pathutils.h" -#include "rtc_base/stream.h" -#include "rtc_base/stringutils.h" namespace rtc { diff --git a/rtc_base/unixfilesystem.h b/rtc_base/unixfilesystem.h index 711d7b3ea1..d95132c0a5 100644 --- a/rtc_base/unixfilesystem.h +++ b/rtc_base/unixfilesystem.h @@ -11,9 +11,10 @@ #ifndef RTC_BASE_UNIXFILESYSTEM_H_ #define RTC_BASE_UNIXFILESYSTEM_H_ -#include +#include #include "rtc_base/fileutils.h" +#include "rtc_base/pathutils.h" namespace rtc { diff --git a/rtc_base/zero_memory.h b/rtc_base/zero_memory.h index cb4646c1fe..f697bcbd6b 100644 --- a/rtc_base/zero_memory.h +++ b/rtc_base/zero_memory.h @@ -11,6 +11,7 @@ #ifndef RTC_BASE_ZERO_MEMORY_H_ #define RTC_BASE_ZERO_MEMORY_H_ +#include #include #include "api/array_view.h" diff --git a/sdk/android/BUILD.gn b/sdk/android/BUILD.gn index cc686be440..68cd77a669 100644 --- a/sdk/android/BUILD.gn +++ b/sdk/android/BUILD.gn @@ -987,6 +987,7 @@ if (is_android) { ":base_jni", ":generated_audio_device_module_base_jni", ":native_api_jni", + "../../modules/audio_device:audio_device_api", "../../modules/audio_device:audio_device_buffer", "../../rtc_base:checks", "../../rtc_base:rtc_base_approved", diff --git a/sdk/android/src/jni/audio_device/audio_device_module.cc b/sdk/android/src/jni/audio_device/audio_device_module.cc index dc3a8fe4ba..e04a01faea 100644 --- a/sdk/android/src/jni/audio_device/audio_device_module.cc +++ b/sdk/android/src/jni/audio_device/audio_device_module.cc @@ -12,6 +12,7 @@ #include +#include "modules/audio_device/audio_device_buffer.h" #include "rtc_base/checks.h" #include "rtc_base/logging.h" #include "rtc_base/refcountedobject.h" diff --git a/sdk/android/src/jni/audio_device/audio_device_module.h b/sdk/android/src/jni/audio_device/audio_device_module.h index cddd3e0676..476da14ceb 100644 --- a/sdk/android/src/jni/audio_device/audio_device_module.h +++ b/sdk/android/src/jni/audio_device/audio_device_module.h @@ -14,10 +14,13 @@ #include #include "absl/types/optional.h" -#include "modules/audio_device/audio_device_buffer.h" +#include "modules/audio_device/include/audio_device.h" #include "sdk/android/native_api/jni/scoped_java_ref.h" namespace webrtc { + +class AudioDeviceBuffer; + namespace jni { class AudioInput { diff --git a/system_wrappers/include/clock.h b/system_wrappers/include/clock.h index 4b6eab8edc..f1fc11f172 100644 --- a/system_wrappers/include/clock.h +++ b/system_wrappers/include/clock.h @@ -11,6 +11,7 @@ #ifndef SYSTEM_WRAPPERS_INCLUDE_CLOCK_H_ #define SYSTEM_WRAPPERS_INCLUDE_CLOCK_H_ +#include #include #include "rtc_base/synchronization/rw_lock_wrapper.h" diff --git a/system_wrappers/include/rtp_to_ntp_estimator.h b/system_wrappers/include/rtp_to_ntp_estimator.h index d7009d8b1f..51da4d2e97 100644 --- a/system_wrappers/include/rtp_to_ntp_estimator.h +++ b/system_wrappers/include/rtp_to_ntp_estimator.h @@ -11,10 +11,12 @@ #ifndef SYSTEM_WRAPPERS_INCLUDE_RTP_TO_NTP_ESTIMATOR_H_ #define SYSTEM_WRAPPERS_INCLUDE_RTP_TO_NTP_ESTIMATOR_H_ +#include #include #include "absl/types/optional.h" #include "modules/include/module_common_types_public.h" +#include "rtc_base/checks.h" #include "rtc_base/numerics/moving_median_filter.h" #include "system_wrappers/include/ntp_time.h" diff --git a/system_wrappers/source/clock.cc b/system_wrappers/source/clock.cc index 35ab5f0878..4f5d9cff1f 100644 --- a/system_wrappers/source/clock.cc +++ b/system_wrappers/source/clock.cc @@ -17,6 +17,8 @@ #include +#include "rtc_base/criticalsection.h" + #elif defined(WEBRTC_POSIX) #include @@ -24,7 +26,6 @@ #endif // defined(WEBRTC_POSIX) -#include "rtc_base/criticalsection.h" #include "rtc_base/synchronization/rw_lock_wrapper.h" #include "rtc_base/timeutils.h" diff --git a/system_wrappers/source/event.cc b/system_wrappers/source/event.cc index d1d2cdaff0..30d2643134 100644 --- a/system_wrappers/source/event.cc +++ b/system_wrappers/source/event.cc @@ -14,9 +14,6 @@ #include #elif defined(WEBRTC_MAC) && !defined(WEBRTC_IOS) #include -#include -#else -#include #endif #include "rtc_base/event.h" diff --git a/system_wrappers/source/field_trial.cc b/system_wrappers/source/field_trial.cc index 60158f4886..ac7131144a 100644 --- a/system_wrappers/source/field_trial.cc +++ b/system_wrappers/source/field_trial.cc @@ -9,6 +9,7 @@ #include "system_wrappers/include/field_trial.h" +#include #include // Simple field trial implementation, which allows client to diff --git a/system_wrappers/source/rtp_to_ntp_estimator.cc b/system_wrappers/source/rtp_to_ntp_estimator.cc index 730c4f6691..aaef4b1b27 100644 --- a/system_wrappers/source/rtp_to_ntp_estimator.cc +++ b/system_wrappers/source/rtp_to_ntp_estimator.cc @@ -10,9 +10,10 @@ #include "system_wrappers/include/rtp_to_ntp_estimator.h" +#include + #include "rtc_base/checks.h" #include "rtc_base/logging.h" -#include "system_wrappers/include/clock.h" namespace webrtc { namespace {