From 12dc1a38ca54a000e4fecfbc6d41138b895c9ca5 Mon Sep 17 00:00:00 2001 From: "pbos@webrtc.org" Date: Mon, 5 Aug 2013 16:22:53 +0000 Subject: [PATCH] Switch C++-style C headers with their C equivalents. The C++ headers define the C functions within the std:: namespace, but we mainly don't use the std:: namespace for C functions. Therefore we should include the C headers. BUG=1833 R=tommi@webrtc.org Review URL: https://webrtc-codereview.appspot.com/1917004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@4486 4adac7df-926f-26a2-2b94-8c16560cd09d --- webrtc/common_audio/resampler/push_resampler.cc | 2 +- .../common_audio/resampler/push_sinc_resampler.cc | 7 ++++--- .../resampler/push_sinc_resampler_unittest.cc | 4 ++-- webrtc/common_audio/resampler/sinc_resampler.cc | 5 +++-- .../resampler/sinc_resampler_unittest.cc | 2 +- .../resampler/sinusoidal_linear_chirp_source.cc | 2 +- webrtc/common_video/jpeg/jpeg_unittest.cc | 3 ++- webrtc/common_video/plane.cc | 3 ++- webrtc/modules/audio_coding/main/source/nack.cc | 3 ++- webrtc/modules/audio_coding/main/test/APITest.cc | 2 +- webrtc/modules/audio_coding/main/test/PCMFile.cc | 2 +- webrtc/modules/audio_coding/main/test/PCMFile.h | 5 +++-- webrtc/modules/audio_coding/main/test/TestFEC.cc | 3 ++- .../modules/audio_coding/main/test/TestStereo.cc | 3 ++- webrtc/modules/audio_coding/main/test/TimedTrace.h | 4 ++-- .../audio_coding/main/test/TwoWayCommunication.cc | 2 +- .../modules/audio_coding/main/test/delay_test.cc | 2 +- webrtc/modules/audio_coding/main/test/iSACTest.cc | 4 ++-- .../main/test/initial_delay_unittest.cc | 2 +- webrtc/modules/audio_coding/main/test/opus_test.cc | 3 ++- .../audio_coding/neteq/test/NetEqRTPplay.cc | 6 +++--- .../modules/audio_coding/neteq/test/RTPencode.cc | 6 +++--- .../audio_coding/neteq4/audio_decoder_impl.cc | 3 +-- .../audio_coding/neteq4/audio_multi_vector.h | 3 ++- webrtc/modules/audio_coding/neteq4/audio_vector.h | 3 ++- .../audio_coding/neteq4/background_noise.cc | 2 +- .../modules/audio_coding/neteq4/background_noise.h | 2 +- .../neteq4/buffer_level_filter_unittest.cc | 2 +- webrtc/modules/audio_coding/neteq4/delay_manager.h | 3 ++- .../audio_coding/neteq4/delay_peak_detector.h | 3 ++- webrtc/modules/audio_coding/neteq4/dsp_helper.cc | 2 +- webrtc/modules/audio_coding/neteq4/dsp_helper.h | 2 +- .../neteq4/dtmf_tone_generator_unittest.cc | 2 +- webrtc/modules/audio_coding/neteq4/expand.cc | 2 +- .../modules/audio_coding/neteq4/interface/neteq.h | 3 ++- webrtc/modules/audio_coding/neteq4/merge.cc | 2 +- webrtc/modules/audio_coding/neteq4/normal.cc | 3 ++- webrtc/modules/audio_coding/neteq4/normal.h | 3 ++- webrtc/modules/audio_coding/neteq4/random_vector.h | 2 +- .../audio_coding/neteq4/statistics_calculator.cc | 3 +-- .../modules/audio_coding/neteq4/test/RTPencode.cc | 2 +- .../modules/audio_coding/neteq4/test/RTPjitter.cc | 2 +- webrtc/modules/audio_coding/neteq4/time_stretch.h | 3 +-- .../audio_coding/neteq4/tools/input_audio_file.h | 3 ++- .../audio_coding/neteq4/tools/neteq_rtpplay.cc | 5 +++-- webrtc/modules/audio_device/audio_device_buffer.cc | 2 +- .../modules/audio_device/audio_device_utility.cc | 2 +- .../audio_device/linux/audio_device_alsa_linux.cc | 2 +- .../audio_device/linux/audio_device_pulse_linux.cc | 2 +- .../linux/audio_mixer_manager_alsa_linux.cc | 2 +- .../linux/audio_mixer_manager_pulse_linux.cc | 2 +- .../modules/audio_device/mac/audio_device_mac.cc | 2 +- .../audio_device/test/audio_device_test_api.cc | 2 +- .../modules/audio_device/test/func_test_manager.cc | 2 +- .../audio_device/win/audio_device_wave_win.cc | 2 +- .../audio_device/win/audio_mixer_manager_win.cc | 2 +- .../aec/echo_cancellation_unittest.cc | 4 ++-- .../audio_processing/echo_control_mobile_impl.cc | 4 ++-- .../modules/audio_processing/gain_control_impl.cc | 2 +- .../audio_processing/high_pass_filter_impl.cc | 2 +- .../audio_processing/noise_suppression_impl.cc | 2 +- .../audio_processing/processing_component.cc | 2 +- .../utility/ring_buffer_unittest.cc | 8 ++++---- .../audio_processing/voice_detection_impl.cc | 2 +- webrtc/modules/desktop_capture/desktop_region.cc | 3 ++- .../desktop_capture/window_capturer_linux.cc | 2 +- .../modules/desktop_capture/window_capturer_mac.cc | 2 +- .../modules/desktop_capture/window_capturer_win.cc | 2 +- .../desktop_capture/x11/x_server_pixel_buffer.cc | 2 +- webrtc/modules/interface/module_common_types.h | 4 ++-- .../remote_rate_control.cc | 7 ++++--- .../rtp_rtcp/source/forward_error_correction.cc | 5 +++-- .../source/forward_error_correction_internal.cc | 4 ++-- webrtc/modules/rtp_rtcp/source/receiver_fec.cc | 2 +- webrtc/modules/rtp_rtcp/source/rtcp_receiver.cc | 2 +- .../modules/rtp_rtcp/source/rtcp_receiver_help.cc | 2 +- webrtc/modules/rtp_rtcp/source/rtcp_sender.cc | 7 ++++--- webrtc/modules/rtp_rtcp/source/rtcp_utility.cc | 6 +++--- webrtc/modules/rtp_rtcp/source/rtcp_utility.h | 2 +- webrtc/modules/rtp_rtcp/source/rtp_format_vp8.cc | 2 +- .../rtp_rtcp/source/rtp_header_extension.cc | 2 +- .../modules/rtp_rtcp/source/rtp_packet_history.cc | 2 +- webrtc/modules/rtp_rtcp/source/rtp_receiver.cc | 2 +- .../modules/rtp_rtcp/source/rtp_receiver_audio.cc | 5 ++--- .../rtp_rtcp/source/rtp_receiver_strategy.cc | 2 +- .../modules/rtp_rtcp/source/rtp_receiver_video.cc | 4 ++-- webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.cc | 2 +- webrtc/modules/rtp_rtcp/source/rtp_sender.cc | 2 +- webrtc/modules/rtp_rtcp/source/rtp_sender.h | 5 +++-- webrtc/modules/rtp_rtcp/source/rtp_sender_audio.cc | 2 +- webrtc/modules/rtp_rtcp/source/rtp_utility.cc | 6 +++--- webrtc/modules/rtp_rtcp/source/rtp_utility.h | 2 +- webrtc/modules/rtp_rtcp/test/testFec/test_fec.cc | 11 ++++++----- webrtc/modules/utility/source/rtp_dump_impl.cc | 2 +- .../modules/utility/source/video_frames_queue.cc | 2 +- .../video_coding/codecs/test/packet_manipulator.cc | 4 ++-- .../video_coding/codecs/test/packet_manipulator.h | 2 +- .../codecs/test/predictive_packet_manipulator.cc | 4 ++-- webrtc/modules/video_coding/codecs/test/stats.cc | 5 +++-- .../video_coding/codecs/test/videoprocessor.cc | 5 +++-- .../codecs/test_framework/benchmark.cc | 3 ++- .../codecs/test_framework/packet_loss_test.cc | 6 ++++-- .../video_coding/codecs/test_framework/test.cc | 7 ++++--- .../video_coding/codecs/test_framework/test.h | 4 +++- .../codecs/test_framework/unit_test.cc | 3 +-- .../codecs/tools/video_quality_measurement.cc | 8 ++++---- .../codecs/vp8/default_temporal_layers.cc | 2 +- .../video_coding/main/source/frame_buffer.cc | 2 +- .../video_coding/main/source/jitter_buffer.cc | 3 ++- .../video_coding/main/source/media_opt_util.h | 4 ++-- .../modules/video_coding/main/source/rtt_filter.cc | 2 +- .../video_coding/main/source/timing_unittest.cc | 7 ++++--- .../video_coding/main/test/generic_codec_test.cc | 2 +- .../video_coding/main/test/jitter_estimate_test.cc | 6 +++--- .../video_coding/main/test/jitter_estimate_test.h | 6 +++--- .../video_coding/main/test/mt_test_common.cc | 2 +- .../video_coding/main/test/pcap_file_reader.cc | 5 +++-- .../video_coding/main/test/rtp_file_reader.cc | 4 ++-- .../modules/video_coding/main/test/rtp_player.cc | 3 ++- .../video_coding/main/test/test_callbacks.cc | 2 +- .../video_coding/main/test/test_callbacks.h | 5 +++-- .../modules/video_coding/main/test/test_macros.h | 4 ++-- webrtc/modules/video_coding/main/test/test_util.cc | 5 +++-- .../main/test/vcm_payload_sink_factory.cc | 3 ++- .../video_coding/main/test/video_rtp_play_mt.cc | 2 +- .../modules/video_coding/main/test/video_source.cc | 2 +- .../video_processing/main/source/brighten.cc | 2 +- .../main/source/color_enhancement.cc | 3 ++- .../video_processing/main/source/deflickering.h | 4 ++-- .../video_processing/main/source/denoising.cc | 2 +- .../main/source/video_processing_impl.cc | 2 +- .../main/test/unit_test/color_enhancement_test.cc | 4 ++-- .../main/test/unit_test/deflickering_test.cc | 4 ++-- .../main/test/unit_test/denoising_test.cc | 4 ++-- .../modules/video_render/incoming_video_stream.cc | 4 ++-- .../modules/video_render/test/testAPI/testAPI.cc | 2 +- webrtc/modules/video_render/video_render_frames.cc | 2 +- webrtc/modules/video_render/video_render_impl.cc | 4 ++-- webrtc/system_wrappers/interface/atomic32.h | 2 +- webrtc/system_wrappers/interface/scoped_ptr.h | 5 ++--- webrtc/system_wrappers/interface/tick_util.h | 2 +- .../source/condition_variable_posix.cc | 2 +- .../source/data_log_unittest_disabled.cc | 4 ++-- webrtc/system_wrappers/source/sort.cc | 7 ++++--- webrtc/system_wrappers/source/tick_util.cc | 2 +- webrtc/system_wrappers/source/trace_impl.cc | 2 +- webrtc/system_wrappers/source/trace_posix.cc | 3 ++- webrtc/system_wrappers/source/trace_win.cc | 2 +- webrtc/system_wrappers/test/TestSort/TestSort.cc | 5 +++-- .../udp_socket_manager_wrapper.cc | 2 +- webrtc/test/libtest/helpers/bit_flip_encryption.cc | 2 +- webrtc/test/libtest/helpers/random_encryption.cc | 5 +++-- webrtc/test/testsupport/fileutils.cc | 4 ++-- webrtc/test/testsupport/fileutils.h | 2 +- webrtc/test/testsupport/fileutils_unittest.cc | 7 ++++--- webrtc/test/testsupport/frame_reader.cc | 2 +- webrtc/test/testsupport/frame_reader.h | 3 ++- webrtc/test/testsupport/frame_reader_unittest.cc | 4 ++-- webrtc/test/testsupport/frame_writer.cc | 2 +- webrtc/test/testsupport/frame_writer.h | 3 ++- webrtc/test/testsupport/frame_writer_unittest.cc | 4 ++-- webrtc/test/testsupport/metrics/video_metrics.cc | 5 +++-- .../testsupport/metrics/video_metrics_unittest.cc | 2 +- webrtc/test/testsupport/packet_reader.cc | 4 ++-- webrtc/test/testsupport/trace_to_stderr.cc | 4 ++-- webrtc/tools/converter/converter.cc | 2 +- webrtc/tools/converter/rgba_to_i420_converter.cc | 5 +++-- .../force_mic_volume_max/force_mic_volume_max.cc | 2 +- webrtc/tools/frame_analyzer/frame_analyzer.cc | 5 +++-- .../tools/frame_analyzer/video_quality_analysis.cc | 7 ++++--- .../tools/frame_editing/frame_editing_unittest.cc | 2 +- .../tools/psnr_ssim_analyzer/psnr_ssim_analyzer.cc | 5 +++-- webrtc/tools/simple_command_line_parser.cc | 5 +++-- webrtc/video_engine/call_stats.cc | 2 +- webrtc/video_engine/internal/video_call.cc | 5 +++-- webrtc/video_engine/internal/video_engine.cc | 2 +- .../video_engine/internal/video_receive_stream.cc | 4 ++-- webrtc/video_engine/stream_synchronization.cc | 5 +++-- .../test/auto_test/automated/vie_rtp_fuzz_test.cc | 4 ++-- .../automated/vie_standard_integration_test.cc | 2 +- .../auto_test/interface/vie_autotest_defines.h | 3 ++- .../test/auto_test/primitives/choice_helpers.cc | 7 ++++--- .../primitives/choice_helpers_unittest.cc | 2 +- .../test/auto_test/primitives/fake_stdin.h | 3 ++- .../auto_test/primitives/framedrop_primitives.cc | 9 +++++---- .../primitives/framedrop_primitives_unittest.cc | 7 ++++--- .../test/auto_test/primitives/input_helpers.cc | 6 +++--- .../test/auto_test/primitives/input_helpers.h | 2 +- .../auto_test/source/vie_autotest_custom_call.cc | 6 +++--- webrtc/video_engine/test/common/frame_generator.cc | 4 ++-- webrtc/video_engine/test/common/gl/gl_renderer.cc | 2 +- .../video_engine/test/common/linux/glx_renderer.cc | 4 ++-- .../libvietest/helpers/vie_file_capture_device.cc | 10 +++++----- .../libvietest/helpers/vie_to_file_renderer.cc | 14 +++++++------- .../libvietest/include/vie_file_capture_device.h | 4 ++-- .../test/libvietest/include/vie_to_file_renderer.h | 7 ++++--- .../libvietest/testbed/tb_external_transport.cc | 5 +++-- webrtc/video_engine/test/loopback.cc | 3 ++- webrtc/video_engine/vie_encoder.cc | 3 ++- webrtc/video_engine/vie_input_manager.cc | 2 +- webrtc/video_engine/vie_remb.cc | 3 ++- webrtc/video_engine/vie_sender.cc | 2 +- webrtc/voice_engine/channel_manager_base.cc | 3 ++- webrtc/voice_engine/dtmf_inband.cc | 3 ++- webrtc/voice_engine/statistics.cc | 2 +- .../test/auto_test/fakes/fake_media_process.h | 2 +- .../auto_test/fixtures/after_streaming_fixture.cc | 2 +- .../test/auto_test/fuzz/rtp_fuzz_test.cc | 4 ++-- .../standard/hardware_before_streaming_test.cc | 2 +- .../test/auto_test/standard/video_sync_test.cc | 5 +++-- .../test/auto_test/standard/voe_base_misc_test.cc | 2 +- webrtc/voice_engine/voe_hardware_impl.cc | 2 +- 212 files changed, 396 insertions(+), 334 deletions(-) diff --git a/webrtc/common_audio/resampler/push_resampler.cc b/webrtc/common_audio/resampler/push_resampler.cc index 05c6c617ef..92775afb77 100644 --- a/webrtc/common_audio/resampler/push_resampler.cc +++ b/webrtc/common_audio/resampler/push_resampler.cc @@ -10,7 +10,7 @@ #include "webrtc/common_audio/resampler/include/push_resampler.h" -#include +#include #include "webrtc/common_audio/include/audio_util.h" #include "webrtc/common_audio/resampler/include/resampler.h" diff --git a/webrtc/common_audio/resampler/push_sinc_resampler.cc b/webrtc/common_audio/resampler/push_sinc_resampler.cc index 224d757813..97febbd4dd 100644 --- a/webrtc/common_audio/resampler/push_sinc_resampler.cc +++ b/webrtc/common_audio/resampler/push_sinc_resampler.cc @@ -10,8 +10,9 @@ #include "webrtc/common_audio/resampler/push_sinc_resampler.h" -#include -#include +#include +#include + #include namespace webrtc { @@ -62,7 +63,7 @@ int PushSincResampler::Resample(const int16_t* source, resampler_->Resample(destination_frames_, float_buffer_.get()); for (int i = 0; i < destination_frames_; ++i) { float clipped = std::max(std::min(float_buffer_[i], 32767.0f), -32768.0f); - destination[i] = static_cast(std::floor(clipped + 0.5)); + destination[i] = static_cast(floor(clipped + 0.5)); } source_ptr_ = NULL; return destination_frames_; diff --git a/webrtc/common_audio/resampler/push_sinc_resampler_unittest.cc b/webrtc/common_audio/resampler/push_sinc_resampler_unittest.cc index 25b7bee2c1..28b26ac1c3 100644 --- a/webrtc/common_audio/resampler/push_sinc_resampler_unittest.cc +++ b/webrtc/common_audio/resampler/push_sinc_resampler_unittest.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include +#include #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" @@ -82,7 +82,7 @@ TEST_P(PushSincResamplerTest, Resample) { resampler_source.Run(input_samples, source.get()); for (int i = 0; i < kNumBlocks; ++i) { for (int j = 0; j < input_block_size; ++j) { - source_int[j] = static_cast(std::floor(32767 * + source_int[j] = static_cast(floor(32767 * source[i * input_block_size + j] + 0.5)); } EXPECT_EQ(output_block_size, diff --git a/webrtc/common_audio/resampler/sinc_resampler.cc b/webrtc/common_audio/resampler/sinc_resampler.cc index b66ed345a3..05c00276e1 100644 --- a/webrtc/common_audio/resampler/sinc_resampler.cc +++ b/webrtc/common_audio/resampler/sinc_resampler.cc @@ -90,8 +90,9 @@ #include "webrtc/system_wrappers/interface/cpu_features_wrapper.h" #include "webrtc/typedefs.h" -#include -#include +#include +#include + #include namespace webrtc { diff --git a/webrtc/common_audio/resampler/sinc_resampler_unittest.cc b/webrtc/common_audio/resampler/sinc_resampler_unittest.cc index b228f3d419..c085cfc20e 100644 --- a/webrtc/common_audio/resampler/sinc_resampler_unittest.cc +++ b/webrtc/common_audio/resampler/sinc_resampler_unittest.cc @@ -14,7 +14,7 @@ // MSVC++ requires this to be set before any other includes to get M_PI. #define _USE_MATH_DEFINES -#include +#include #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/webrtc/common_audio/resampler/sinusoidal_linear_chirp_source.cc b/webrtc/common_audio/resampler/sinusoidal_linear_chirp_source.cc index b7cacfa4dd..d38263c682 100644 --- a/webrtc/common_audio/resampler/sinusoidal_linear_chirp_source.cc +++ b/webrtc/common_audio/resampler/sinusoidal_linear_chirp_source.cc @@ -13,7 +13,7 @@ #include "webrtc/common_audio/resampler/sinusoidal_linear_chirp_source.h" -#include +#include namespace webrtc { diff --git a/webrtc/common_video/jpeg/jpeg_unittest.cc b/webrtc/common_video/jpeg/jpeg_unittest.cc index afe98330a2..e19ca5b771 100644 --- a/webrtc/common_video/jpeg/jpeg_unittest.cc +++ b/webrtc/common_video/jpeg/jpeg_unittest.cc @@ -8,7 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include +#include + #include #include "testing/gtest/include/gtest/gtest.h" diff --git a/webrtc/common_video/plane.cc b/webrtc/common_video/plane.cc index 7d879301c6..68d32cd459 100644 --- a/webrtc/common_video/plane.cc +++ b/webrtc/common_video/plane.cc @@ -10,8 +10,9 @@ #include "webrtc/common_video/plane.h" +#include // memcpy + #include // swap -#include // memcpy namespace webrtc { diff --git a/webrtc/modules/audio_coding/main/source/nack.cc b/webrtc/modules/audio_coding/main/source/nack.cc index f42e4d4eb9..ec6cb3d12c 100644 --- a/webrtc/modules/audio_coding/main/source/nack.cc +++ b/webrtc/modules/audio_coding/main/source/nack.cc @@ -10,8 +10,9 @@ #include "webrtc/modules/audio_coding/main/source/nack.h" +#include // For assert. + #include // For std::max. -#include // For assert. #include "webrtc/modules/interface/module_common_types.h" #include "webrtc/system_wrappers/interface/logging.h" diff --git a/webrtc/modules/audio_coding/main/test/APITest.cc b/webrtc/modules/audio_coding/main/test/APITest.cc index 8b09e12751..90f88e3bf5 100644 --- a/webrtc/modules/audio_coding/main/test/APITest.cc +++ b/webrtc/modules/audio_coding/main/test/APITest.cc @@ -10,11 +10,11 @@ #include "webrtc/modules/audio_coding/main/test/APITest.h" +#include #include #include #include -#include #include #include #include diff --git a/webrtc/modules/audio_coding/main/test/PCMFile.cc b/webrtc/modules/audio_coding/main/test/PCMFile.cc index 5c4b98ecb2..b7e65dd3f1 100644 --- a/webrtc/modules/audio_coding/main/test/PCMFile.cc +++ b/webrtc/modules/audio_coding/main/test/PCMFile.cc @@ -10,7 +10,7 @@ #include "PCMFile.h" -#include +#include #include #include diff --git a/webrtc/modules/audio_coding/main/test/PCMFile.h b/webrtc/modules/audio_coding/main/test/PCMFile.h index e3fdcd8bb6..e7387a6bf6 100644 --- a/webrtc/modules/audio_coding/main/test/PCMFile.h +++ b/webrtc/modules/audio_coding/main/test/PCMFile.h @@ -11,8 +11,9 @@ #ifndef WEBRTC_MODULES_AUDIO_CODING_MAIN_TEST_PCMFILE_H_ #define WEBRTC_MODULES_AUDIO_CODING_MAIN_TEST_PCMFILE_H_ -#include -#include +#include +#include + #include #include "module_common_types.h" diff --git a/webrtc/modules/audio_coding/main/test/TestFEC.cc b/webrtc/modules/audio_coding/main/test/TestFEC.cc index 6cb4eff27d..66c94414b7 100644 --- a/webrtc/modules/audio_coding/main/test/TestFEC.cc +++ b/webrtc/modules/audio_coding/main/test/TestFEC.cc @@ -10,7 +10,8 @@ #include "TestFEC.h" -#include +#include + #include #include "audio_coding_module_typedefs.h" diff --git a/webrtc/modules/audio_coding/main/test/TestStereo.cc b/webrtc/modules/audio_coding/main/test/TestStereo.cc index c5b8f4019e..741f00b946 100644 --- a/webrtc/modules/audio_coding/main/test/TestStereo.cc +++ b/webrtc/modules/audio_coding/main/test/TestStereo.cc @@ -10,7 +10,8 @@ #include "webrtc/modules/audio_coding/main/test/TestStereo.h" -#include +#include + #include #include "gtest/gtest.h" diff --git a/webrtc/modules/audio_coding/main/test/TimedTrace.h b/webrtc/modules/audio_coding/main/test/TimedTrace.h index 1c893fbcce..237b329e77 100644 --- a/webrtc/modules/audio_coding/main/test/TimedTrace.h +++ b/webrtc/modules/audio_coding/main/test/TimedTrace.h @@ -13,8 +13,8 @@ #include "typedefs.h" -#include -#include +#include +#include class TimedTrace { public: diff --git a/webrtc/modules/audio_coding/main/test/TwoWayCommunication.cc b/webrtc/modules/audio_coding/main/test/TwoWayCommunication.cc index 9c896f90f5..1bf88792c2 100644 --- a/webrtc/modules/audio_coding/main/test/TwoWayCommunication.cc +++ b/webrtc/modules/audio_coding/main/test/TwoWayCommunication.cc @@ -10,7 +10,7 @@ #include "TwoWayCommunication.h" -#include +#include #include #include diff --git a/webrtc/modules/audio_coding/main/test/delay_test.cc b/webrtc/modules/audio_coding/main/test/delay_test.cc index bfe6128247..d647b1fb74 100644 --- a/webrtc/modules/audio_coding/main/test/delay_test.cc +++ b/webrtc/modules/audio_coding/main/test/delay_test.cc @@ -10,9 +10,9 @@ #include "webrtc/modules/audio_coding/main/interface/audio_coding_module.h" +#include #include -#include #include #include "gflags/gflags.h" diff --git a/webrtc/modules/audio_coding/main/test/iSACTest.cc b/webrtc/modules/audio_coding/main/test/iSACTest.cc index b2b0fca0e1..64931d5401 100644 --- a/webrtc/modules/audio_coding/main/test/iSACTest.cc +++ b/webrtc/modules/audio_coding/main/test/iSACTest.cc @@ -10,14 +10,14 @@ #include "webrtc/modules/audio_coding/main/test/iSACTest.h" -#include +#include #include #include #if _WIN32 #include #elif WEBRTC_LINUX -#include +#include #else #include #include diff --git a/webrtc/modules/audio_coding/main/test/initial_delay_unittest.cc b/webrtc/modules/audio_coding/main/test/initial_delay_unittest.cc index 618ccb557b..ea2e1ca3ba 100644 --- a/webrtc/modules/audio_coding/main/test/initial_delay_unittest.cc +++ b/webrtc/modules/audio_coding/main/test/initial_delay_unittest.cc @@ -10,9 +10,9 @@ #include "webrtc/modules/audio_coding/main/interface/audio_coding_module.h" +#include #include -#include #include #include "gtest/gtest.h" diff --git a/webrtc/modules/audio_coding/main/test/opus_test.cc b/webrtc/modules/audio_coding/main/test/opus_test.cc index 36aa355c71..73507f8513 100644 --- a/webrtc/modules/audio_coding/main/test/opus_test.cc +++ b/webrtc/modules/audio_coding/main/test/opus_test.cc @@ -10,7 +10,8 @@ #include "webrtc/modules/audio_coding/main/test/opus_test.h" -#include +#include + #include #include "testing/gtest/include/gtest/gtest.h" diff --git a/webrtc/modules/audio_coding/neteq/test/NetEqRTPplay.cc b/webrtc/modules/audio_coding/neteq/test/NetEqRTPplay.cc index b3003eda3a..bbfcdf9aaa 100644 --- a/webrtc/modules/audio_coding/neteq/test/NetEqRTPplay.cc +++ b/webrtc/modules/audio_coding/neteq/test/NetEqRTPplay.cc @@ -35,14 +35,14 @@ #include #ifdef WIN32 -#include +#include #include #endif #ifdef WEBRTC_LINUX -#include +#include #include -#include +#include #endif //#include "vld.h" diff --git a/webrtc/modules/audio_coding/neteq/test/RTPencode.cc b/webrtc/modules/audio_coding/neteq/test/RTPencode.cc index a5e65b6185..46b9cd1731 100644 --- a/webrtc/modules/audio_coding/neteq/test/RTPencode.cc +++ b/webrtc/modules/audio_coding/neteq/test/RTPencode.cc @@ -11,12 +11,12 @@ //TODO(hlundin): Reformat file to meet style guide. /* header includes */ -#include "typedefs.h" #include "stdio.h" +#include "typedefs.h" #include "webrtc_neteq.h" // needed for enum WebRtcNetEQDecoder -#include +#include #include -#include +#include #ifdef WIN32 #include diff --git a/webrtc/modules/audio_coding/neteq4/audio_decoder_impl.cc b/webrtc/modules/audio_coding/neteq4/audio_decoder_impl.cc index 248556aa28..b80c829c33 100644 --- a/webrtc/modules/audio_coding/neteq4/audio_decoder_impl.cc +++ b/webrtc/modules/audio_coding/neteq4/audio_decoder_impl.cc @@ -11,8 +11,7 @@ #include "webrtc/modules/audio_coding/neteq4/audio_decoder_impl.h" #include - -#include // memmove +#include // memmove #include "webrtc/modules/audio_coding/codecs/cng/include/webrtc_cng.h" #include "webrtc/modules/audio_coding/codecs/g711/include/g711_interface.h" diff --git a/webrtc/modules/audio_coding/neteq4/audio_multi_vector.h b/webrtc/modules/audio_coding/neteq4/audio_multi_vector.h index 5f933d9339..7167c670cd 100644 --- a/webrtc/modules/audio_coding/neteq4/audio_multi_vector.h +++ b/webrtc/modules/audio_coding/neteq4/audio_multi_vector.h @@ -11,7 +11,8 @@ #ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_AUDIO_MULTI_VECTOR_H_ #define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_AUDIO_MULTI_VECTOR_H_ -#include // Access to size_t. +#include // Access to size_t. + #include #include "webrtc/modules/audio_coding/neteq4/audio_vector.h" diff --git a/webrtc/modules/audio_coding/neteq4/audio_vector.h b/webrtc/modules/audio_coding/neteq4/audio_vector.h index 6081cd8a33..3fd23693d2 100644 --- a/webrtc/modules/audio_coding/neteq4/audio_vector.h +++ b/webrtc/modules/audio_coding/neteq4/audio_vector.h @@ -11,7 +11,8 @@ #ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_AUDIO_VECTOR_H_ #define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_AUDIO_VECTOR_H_ -#include // Access to size_t. +#include // Access to size_t. + #include #include "webrtc/system_wrappers/interface/constructor_magic.h" diff --git a/webrtc/modules/audio_coding/neteq4/background_noise.cc b/webrtc/modules/audio_coding/neteq4/background_noise.cc index 7ab5eade35..4b46e6f8cb 100644 --- a/webrtc/modules/audio_coding/neteq4/background_noise.cc +++ b/webrtc/modules/audio_coding/neteq4/background_noise.cc @@ -11,9 +11,9 @@ #include "webrtc/modules/audio_coding/neteq4/background_noise.h" #include +#include // memcpy #include // min, max -#include // memcpy #include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" #include "webrtc/modules/audio_coding/neteq4/audio_multi_vector.h" diff --git a/webrtc/modules/audio_coding/neteq4/background_noise.h b/webrtc/modules/audio_coding/neteq4/background_noise.h index 6aa643b48e..85e61773b9 100644 --- a/webrtc/modules/audio_coding/neteq4/background_noise.h +++ b/webrtc/modules/audio_coding/neteq4/background_noise.h @@ -11,7 +11,7 @@ #ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_BACKGROUND_NOISE_H_ #define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_BACKGROUND_NOISE_H_ -#include // size_t +#include // size_t #include "webrtc/modules/audio_coding/neteq4/audio_multi_vector.h" #include "webrtc/system_wrappers/interface/constructor_magic.h" diff --git a/webrtc/modules/audio_coding/neteq4/buffer_level_filter_unittest.cc b/webrtc/modules/audio_coding/neteq4/buffer_level_filter_unittest.cc index febdb83c1d..ddaf08d1d3 100644 --- a/webrtc/modules/audio_coding/neteq4/buffer_level_filter_unittest.cc +++ b/webrtc/modules/audio_coding/neteq4/buffer_level_filter_unittest.cc @@ -12,7 +12,7 @@ #include "webrtc/modules/audio_coding/neteq4/buffer_level_filter.h" -#include // Access to pow function. +#include // Access to pow function. #include "gtest/gtest.h" diff --git a/webrtc/modules/audio_coding/neteq4/delay_manager.h b/webrtc/modules/audio_coding/neteq4/delay_manager.h index 9d385e7260..d46924f787 100644 --- a/webrtc/modules/audio_coding/neteq4/delay_manager.h +++ b/webrtc/modules/audio_coding/neteq4/delay_manager.h @@ -11,7 +11,8 @@ #ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DELAY_MANAGER_H_ #define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DELAY_MANAGER_H_ -#include // Provide access to size_t. +#include // Provide access to size_t. + #include #include "webrtc/modules/audio_coding/neteq4/interface/audio_decoder.h" diff --git a/webrtc/modules/audio_coding/neteq4/delay_peak_detector.h b/webrtc/modules/audio_coding/neteq4/delay_peak_detector.h index daa41a1c7e..dfdd2537d7 100644 --- a/webrtc/modules/audio_coding/neteq4/delay_peak_detector.h +++ b/webrtc/modules/audio_coding/neteq4/delay_peak_detector.h @@ -11,7 +11,8 @@ #ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DELAY_PEAK_DETECTOR_H_ #define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DELAY_PEAK_DETECTOR_H_ -#include // size_t +#include // size_t + #include #include "webrtc/system_wrappers/interface/constructor_magic.h" diff --git a/webrtc/modules/audio_coding/neteq4/dsp_helper.cc b/webrtc/modules/audio_coding/neteq4/dsp_helper.cc index ebb3966ae5..f972fc5518 100644 --- a/webrtc/modules/audio_coding/neteq4/dsp_helper.cc +++ b/webrtc/modules/audio_coding/neteq4/dsp_helper.cc @@ -11,9 +11,9 @@ #include "webrtc/modules/audio_coding/neteq4/dsp_helper.h" #include +#include // Access to memset. #include // Access to min, max. -#include // Access to memset. #include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" diff --git a/webrtc/modules/audio_coding/neteq4/dsp_helper.h b/webrtc/modules/audio_coding/neteq4/dsp_helper.h index 947824f22b..7fe1cbbb5a 100644 --- a/webrtc/modules/audio_coding/neteq4/dsp_helper.h +++ b/webrtc/modules/audio_coding/neteq4/dsp_helper.h @@ -11,7 +11,7 @@ #ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DSP_HELPER_H_ #define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DSP_HELPER_H_ -#include // Access to size_t. +#include // Access to size_t. #include "webrtc/modules/audio_coding/neteq4/audio_multi_vector.h" #include "webrtc/system_wrappers/interface/constructor_magic.h" diff --git a/webrtc/modules/audio_coding/neteq4/dtmf_tone_generator_unittest.cc b/webrtc/modules/audio_coding/neteq4/dtmf_tone_generator_unittest.cc index acd0843303..393648c499 100644 --- a/webrtc/modules/audio_coding/neteq4/dtmf_tone_generator_unittest.cc +++ b/webrtc/modules/audio_coding/neteq4/dtmf_tone_generator_unittest.cc @@ -12,7 +12,7 @@ #include "webrtc/modules/audio_coding/neteq4/dtmf_tone_generator.h" -#include +#include #include "gtest/gtest.h" #include "webrtc/modules/audio_coding/neteq4/audio_multi_vector.h" diff --git a/webrtc/modules/audio_coding/neteq4/expand.cc b/webrtc/modules/audio_coding/neteq4/expand.cc index 1e196c9d19..8719abe752 100644 --- a/webrtc/modules/audio_coding/neteq4/expand.cc +++ b/webrtc/modules/audio_coding/neteq4/expand.cc @@ -11,9 +11,9 @@ #include "webrtc/modules/audio_coding/neteq4/expand.h" #include +#include // memset #include // min, max -#include // memset #include // numeric_limits #include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" diff --git a/webrtc/modules/audio_coding/neteq4/interface/neteq.h b/webrtc/modules/audio_coding/neteq4/interface/neteq.h index 2766565e2f..59e5bab05a 100644 --- a/webrtc/modules/audio_coding/neteq4/interface/neteq.h +++ b/webrtc/modules/audio_coding/neteq4/interface/neteq.h @@ -11,7 +11,8 @@ #ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_INTERFACE_NETEQ_H_ #define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_INTERFACE_NETEQ_H_ -#include // Provide access to size_t. +#include // Provide access to size_t. + #include #include "webrtc/modules/audio_coding/neteq4/interface/audio_decoder.h" diff --git a/webrtc/modules/audio_coding/neteq4/merge.cc b/webrtc/modules/audio_coding/neteq4/merge.cc index 5c081fe989..c15fc34ee2 100644 --- a/webrtc/modules/audio_coding/neteq4/merge.cc +++ b/webrtc/modules/audio_coding/neteq4/merge.cc @@ -11,9 +11,9 @@ #include "webrtc/modules/audio_coding/neteq4/merge.h" #include +#include // memmove, memcpy, memset, size_t #include // min, max -#include // memmove, memcpy, memset, size_t #include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" #include "webrtc/modules/audio_coding/neteq4/audio_multi_vector.h" diff --git a/webrtc/modules/audio_coding/neteq4/normal.cc b/webrtc/modules/audio_coding/neteq4/normal.cc index ddbea4ca53..353c51b2dc 100644 --- a/webrtc/modules/audio_coding/neteq4/normal.cc +++ b/webrtc/modules/audio_coding/neteq4/normal.cc @@ -10,8 +10,9 @@ #include "webrtc/modules/audio_coding/neteq4/normal.h" +#include // memset, memcpy + #include // min -#include // memset, memcpy #include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" #include "webrtc/modules/audio_coding/codecs/cng/include/webrtc_cng.h" diff --git a/webrtc/modules/audio_coding/neteq4/normal.h b/webrtc/modules/audio_coding/neteq4/normal.h index aba55c468a..23fcca515d 100644 --- a/webrtc/modules/audio_coding/neteq4/normal.h +++ b/webrtc/modules/audio_coding/neteq4/normal.h @@ -11,7 +11,8 @@ #ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_NORMAL_H_ #define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_NORMAL_H_ -#include // Access to size_t. +#include // Access to size_t. + #include #include "webrtc/modules/audio_coding/neteq4/audio_multi_vector.h" diff --git a/webrtc/modules/audio_coding/neteq4/random_vector.h b/webrtc/modules/audio_coding/neteq4/random_vector.h index a456b17969..64cfe0d9dd 100644 --- a/webrtc/modules/audio_coding/neteq4/random_vector.h +++ b/webrtc/modules/audio_coding/neteq4/random_vector.h @@ -11,7 +11,7 @@ #ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_RANDOM_VECTOR_H_ #define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_RANDOM_VECTOR_H_ -#include // size_t +#include // size_t #include "webrtc/system_wrappers/interface/constructor_magic.h" #include "webrtc/typedefs.h" diff --git a/webrtc/modules/audio_coding/neteq4/statistics_calculator.cc b/webrtc/modules/audio_coding/neteq4/statistics_calculator.cc index 935520470f..b6e9222d47 100644 --- a/webrtc/modules/audio_coding/neteq4/statistics_calculator.cc +++ b/webrtc/modules/audio_coding/neteq4/statistics_calculator.cc @@ -11,8 +11,7 @@ #include "webrtc/modules/audio_coding/neteq4/statistics_calculator.h" #include - -#include // memset +#include // memset #include "webrtc/modules/audio_coding/neteq4/decision_logic.h" #include "webrtc/modules/audio_coding/neteq4/delay_manager.h" diff --git a/webrtc/modules/audio_coding/neteq4/test/RTPencode.cc b/webrtc/modules/audio_coding/neteq4/test/RTPencode.cc index 370fc05fd2..7368b0265d 100644 --- a/webrtc/modules/audio_coding/neteq4/test/RTPencode.cc +++ b/webrtc/modules/audio_coding/neteq4/test/RTPencode.cc @@ -21,7 +21,7 @@ #include #endif -#include +#include #include "webrtc/typedefs.h" // needed for NetEqDecoder diff --git a/webrtc/modules/audio_coding/neteq4/test/RTPjitter.cc b/webrtc/modules/audio_coding/neteq4/test/RTPjitter.cc index 301ceb65af..79af181fbe 100644 --- a/webrtc/modules/audio_coding/neteq4/test/RTPjitter.cc +++ b/webrtc/modules/audio_coding/neteq4/test/RTPjitter.cc @@ -23,7 +23,7 @@ #include #endif -#include +#include #include "gtest/gtest.h" #include "webrtc/typedefs.h" diff --git a/webrtc/modules/audio_coding/neteq4/time_stretch.h b/webrtc/modules/audio_coding/neteq4/time_stretch.h index e701e26684..e80c02c426 100644 --- a/webrtc/modules/audio_coding/neteq4/time_stretch.h +++ b/webrtc/modules/audio_coding/neteq4/time_stretch.h @@ -12,8 +12,7 @@ #define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_TIME_STRETCH_H_ #include - -#include // memset, size_t +#include // memset, size_t #include "webrtc/modules/audio_coding/neteq4/audio_multi_vector.h" #include "webrtc/system_wrappers/interface/constructor_magic.h" diff --git a/webrtc/modules/audio_coding/neteq4/tools/input_audio_file.h b/webrtc/modules/audio_coding/neteq4/tools/input_audio_file.h index b296cd32ef..de51ff88b8 100644 --- a/webrtc/modules/audio_coding/neteq4/tools/input_audio_file.h +++ b/webrtc/modules/audio_coding/neteq4/tools/input_audio_file.h @@ -11,7 +11,8 @@ #ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_TOOLS_INPUT_AUDIO_FILE_H_ #define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_TOOLS_INPUT_AUDIO_FILE_H_ -#include +#include + #include #include "webrtc/system_wrappers/interface/constructor_magic.h" diff --git a/webrtc/modules/audio_coding/neteq4/tools/neteq_rtpplay.cc b/webrtc/modules/audio_coding/neteq4/tools/neteq_rtpplay.cc index 1c8a8704de..c5abdf7a16 100644 --- a/webrtc/modules/audio_coding/neteq4/tools/neteq_rtpplay.cc +++ b/webrtc/modules/audio_coding/neteq4/tools/neteq_rtpplay.cc @@ -8,9 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ +#include +#include + #include -#include -#include #include #include diff --git a/webrtc/modules/audio_device/audio_device_buffer.cc b/webrtc/modules/audio_device/audio_device_buffer.cc index 63218ddfc4..e3ceb56749 100644 --- a/webrtc/modules/audio_device/audio_device_buffer.cc +++ b/webrtc/modules/audio_device/audio_device_buffer.cc @@ -14,7 +14,7 @@ #include "webrtc/system_wrappers/interface/critical_section_wrapper.h" #include "webrtc/system_wrappers/interface/trace.h" -#include +#include #include #include diff --git a/webrtc/modules/audio_device/audio_device_utility.cc b/webrtc/modules/audio_device/audio_device_utility.cc index b272c7e5f8..b6c5c48253 100644 --- a/webrtc/modules/audio_device/audio_device_utility.cc +++ b/webrtc/modules/audio_device/audio_device_utility.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include +#include #include "webrtc/modules/audio_device/audio_device_utility.h" diff --git a/webrtc/modules/audio_device/linux/audio_device_alsa_linux.cc b/webrtc/modules/audio_device/linux/audio_device_alsa_linux.cc index b2e8702b17..8181fe5428 100644 --- a/webrtc/modules/audio_device/linux/audio_device_alsa_linux.cc +++ b/webrtc/modules/audio_device/linux/audio_device_alsa_linux.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include +#include #include "webrtc/modules/audio_device/audio_device_config.h" #include "webrtc/modules/audio_device/audio_device_utility.h" diff --git a/webrtc/modules/audio_device/linux/audio_device_pulse_linux.cc b/webrtc/modules/audio_device/linux/audio_device_pulse_linux.cc index 04de0c6439..486f67eeb5 100644 --- a/webrtc/modules/audio_device/linux/audio_device_pulse_linux.cc +++ b/webrtc/modules/audio_device/linux/audio_device_pulse_linux.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include +#include #include "webrtc/modules/audio_device/audio_device_config.h" #include "webrtc/modules/audio_device/audio_device_utility.h" diff --git a/webrtc/modules/audio_device/linux/audio_mixer_manager_alsa_linux.cc b/webrtc/modules/audio_device/linux/audio_mixer_manager_alsa_linux.cc index a70b8e2885..df9dcabea5 100644 --- a/webrtc/modules/audio_device/linux/audio_mixer_manager_alsa_linux.cc +++ b/webrtc/modules/audio_device/linux/audio_mixer_manager_alsa_linux.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include +#include #include "webrtc/modules/audio_device/linux/audio_mixer_manager_alsa_linux.h" #include "webrtc/system_wrappers/interface/trace.h" diff --git a/webrtc/modules/audio_device/linux/audio_mixer_manager_pulse_linux.cc b/webrtc/modules/audio_device/linux/audio_mixer_manager_pulse_linux.cc index 953891236b..1ee94cd42f 100644 --- a/webrtc/modules/audio_device/linux/audio_mixer_manager_pulse_linux.cc +++ b/webrtc/modules/audio_device/linux/audio_mixer_manager_pulse_linux.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include +#include #include "webrtc/modules/audio_device/linux/audio_mixer_manager_pulse_linux.h" #include "webrtc/system_wrappers/interface/trace.h" diff --git a/webrtc/modules/audio_device/mac/audio_device_mac.cc b/webrtc/modules/audio_device/mac/audio_device_mac.cc index 3e669ee998..61b41cffee 100644 --- a/webrtc/modules/audio_device/mac/audio_device_mac.cc +++ b/webrtc/modules/audio_device/mac/audio_device_mac.cc @@ -18,7 +18,7 @@ #include "webrtc/system_wrappers/interface/trace.h" #include -#include +#include #include // OSAtomicCompareAndSwap() #include // mach_task_self() #include // sysctlbyname() diff --git a/webrtc/modules/audio_device/test/audio_device_test_api.cc b/webrtc/modules/audio_device/test/audio_device_test_api.cc index 88db8189b3..fb25cddeed 100644 --- a/webrtc/modules/audio_device/test/audio_device_test_api.cc +++ b/webrtc/modules/audio_device/test/audio_device_test_api.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include +#include #include #include diff --git a/webrtc/modules/audio_device/test/func_test_manager.cc b/webrtc/modules/audio_device/test/func_test_manager.cc index 018d49a68f..12a4bad491 100644 --- a/webrtc/modules/audio_device/test/func_test_manager.cc +++ b/webrtc/modules/audio_device/test/func_test_manager.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include +#include #include #include #include diff --git a/webrtc/modules/audio_device/win/audio_device_wave_win.cc b/webrtc/modules/audio_device/win/audio_device_wave_win.cc index 6efd6e1d77..b48ddfcb40 100644 --- a/webrtc/modules/audio_device/win/audio_device_wave_win.cc +++ b/webrtc/modules/audio_device/win/audio_device_wave_win.cc @@ -19,7 +19,7 @@ #include #include // CoTaskMemAlloc, CoTaskMemFree #include // StringCchCopy(), StringCchCat(), StringCchPrintf() -#include +#include // Avoids the need of Windows 7 SDK #ifndef WAVE_MAPPED_DEFAULT_COMMUNICATION_DEVICE diff --git a/webrtc/modules/audio_device/win/audio_mixer_manager_win.cc b/webrtc/modules/audio_device/win/audio_mixer_manager_win.cc index 80f43cdf3a..7b5aa69508 100644 --- a/webrtc/modules/audio_device/win/audio_mixer_manager_win.cc +++ b/webrtc/modules/audio_device/win/audio_mixer_manager_win.cc @@ -11,7 +11,7 @@ #include "webrtc/modules/audio_device/win/audio_mixer_manager_win.h" #include "webrtc/system_wrappers/interface/trace.h" -#include // assert() +#include // assert() #include // StringCchCopy(), StringCchCat(), StringCchPrintf() #ifdef _WIN32 diff --git a/webrtc/modules/audio_processing/aec/echo_cancellation_unittest.cc b/webrtc/modules/audio_processing/aec/echo_cancellation_unittest.cc index 4861df08fb..469efd3247 100644 --- a/webrtc/modules/audio_processing/aec/echo_cancellation_unittest.cc +++ b/webrtc/modules/audio_processing/aec/echo_cancellation_unittest.cc @@ -12,8 +12,8 @@ #include "webrtc/modules/audio_processing/aec/include/echo_cancellation.h" -#include -#include +#include +#include extern "C" { #include "webrtc/modules/audio_processing/aec/aec_core.h" diff --git a/webrtc/modules/audio_processing/echo_control_mobile_impl.cc b/webrtc/modules/audio_processing/echo_control_mobile_impl.cc index af8f907ac1..f785381496 100644 --- a/webrtc/modules/audio_processing/echo_control_mobile_impl.cc +++ b/webrtc/modules/audio_processing/echo_control_mobile_impl.cc @@ -10,8 +10,8 @@ #include "webrtc/modules/audio_processing/echo_control_mobile_impl.h" -#include -#include +#include +#include #include "webrtc/modules/audio_processing/aecm/include/echo_control_mobile.h" #include "webrtc/modules/audio_processing/audio_buffer.h" diff --git a/webrtc/modules/audio_processing/gain_control_impl.cc b/webrtc/modules/audio_processing/gain_control_impl.cc index e910e41ff6..35547031e3 100644 --- a/webrtc/modules/audio_processing/gain_control_impl.cc +++ b/webrtc/modules/audio_processing/gain_control_impl.cc @@ -10,7 +10,7 @@ #include "webrtc/modules/audio_processing/gain_control_impl.h" -#include +#include #include "webrtc/modules/audio_processing/agc/include/gain_control.h" #include "webrtc/system_wrappers/interface/critical_section_wrapper.h" diff --git a/webrtc/modules/audio_processing/high_pass_filter_impl.cc b/webrtc/modules/audio_processing/high_pass_filter_impl.cc index 82e87c822a..da2170373b 100644 --- a/webrtc/modules/audio_processing/high_pass_filter_impl.cc +++ b/webrtc/modules/audio_processing/high_pass_filter_impl.cc @@ -10,7 +10,7 @@ #include "webrtc/modules/audio_processing/high_pass_filter_impl.h" -#include +#include #include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" #include "webrtc/system_wrappers/interface/critical_section_wrapper.h" diff --git a/webrtc/modules/audio_processing/noise_suppression_impl.cc b/webrtc/modules/audio_processing/noise_suppression_impl.cc index 0314ceb909..41c11b1cd7 100644 --- a/webrtc/modules/audio_processing/noise_suppression_impl.cc +++ b/webrtc/modules/audio_processing/noise_suppression_impl.cc @@ -10,7 +10,7 @@ #include "webrtc/modules/audio_processing/noise_suppression_impl.h" -#include +#include #include "webrtc/system_wrappers/interface/critical_section_wrapper.h" #if defined(WEBRTC_NS_FLOAT) diff --git a/webrtc/modules/audio_processing/processing_component.cc b/webrtc/modules/audio_processing/processing_component.cc index c34c976e1f..23bf22570b 100644 --- a/webrtc/modules/audio_processing/processing_component.cc +++ b/webrtc/modules/audio_processing/processing_component.cc @@ -10,7 +10,7 @@ #include "webrtc/modules/audio_processing/processing_component.h" -#include +#include #include "webrtc/modules/audio_processing/audio_processing_impl.h" diff --git a/webrtc/modules/audio_processing/utility/ring_buffer_unittest.cc b/webrtc/modules/audio_processing/utility/ring_buffer_unittest.cc index 365eb2d9a4..2b7634dd07 100644 --- a/webrtc/modules/audio_processing/utility/ring_buffer_unittest.cc +++ b/webrtc/modules/audio_processing/utility/ring_buffer_unittest.cc @@ -14,8 +14,8 @@ extern "C" { #include "webrtc/modules/audio_processing/utility/ring_buffer.h" } -#include -#include +#include +#include #include "testing/gtest/include/gtest/gtest.h" #include "webrtc/system_wrappers/interface/scoped_ptr.h" @@ -51,9 +51,9 @@ static void RandomStressTest(int** data_ptr) { const int kNumOps = 10000; const int kMaxBufferSize = 1000; - unsigned int seed = std::time(NULL); + unsigned int seed = time(NULL); printf("seed=%u\n", seed); - std::srand(seed); + srand(seed); for (int i = 0; i < kNumTests; i++) { const int buffer_size = std::max(rand() % kMaxBufferSize, 1); scoped_array write_data(new int[buffer_size]); diff --git a/webrtc/modules/audio_processing/voice_detection_impl.cc b/webrtc/modules/audio_processing/voice_detection_impl.cc index f29767c89f..d41547c802 100644 --- a/webrtc/modules/audio_processing/voice_detection_impl.cc +++ b/webrtc/modules/audio_processing/voice_detection_impl.cc @@ -10,7 +10,7 @@ #include "webrtc/modules/audio_processing/voice_detection_impl.h" -#include +#include #include "webrtc/common_audio/vad/include/webrtc_vad.h" #include "webrtc/system_wrappers/interface/critical_section_wrapper.h" diff --git a/webrtc/modules/desktop_capture/desktop_region.cc b/webrtc/modules/desktop_capture/desktop_region.cc index a5b8ff6990..77e04725c0 100644 --- a/webrtc/modules/desktop_capture/desktop_region.cc +++ b/webrtc/modules/desktop_capture/desktop_region.cc @@ -10,8 +10,9 @@ #include "webrtc/modules/desktop_capture/desktop_region.h" +#include + #include -#include namespace webrtc { diff --git a/webrtc/modules/desktop_capture/window_capturer_linux.cc b/webrtc/modules/desktop_capture/window_capturer_linux.cc index 5229009c06..e95cad8e61 100755 --- a/webrtc/modules/desktop_capture/window_capturer_linux.cc +++ b/webrtc/modules/desktop_capture/window_capturer_linux.cc @@ -10,7 +10,7 @@ #include "webrtc/modules/desktop_capture/window_capturer.h" -#include +#include #include "webrtc/modules/desktop_capture/desktop_frame.h" diff --git a/webrtc/modules/desktop_capture/window_capturer_mac.cc b/webrtc/modules/desktop_capture/window_capturer_mac.cc index a372c3ba93..3cfde7c075 100755 --- a/webrtc/modules/desktop_capture/window_capturer_mac.cc +++ b/webrtc/modules/desktop_capture/window_capturer_mac.cc @@ -10,7 +10,7 @@ #include "webrtc/modules/desktop_capture/window_capturer.h" -#include +#include #include "webrtc/modules/desktop_capture/desktop_frame.h" diff --git a/webrtc/modules/desktop_capture/window_capturer_win.cc b/webrtc/modules/desktop_capture/window_capturer_win.cc index 97d1d27cbc..089a877790 100644 --- a/webrtc/modules/desktop_capture/window_capturer_win.cc +++ b/webrtc/modules/desktop_capture/window_capturer_win.cc @@ -10,7 +10,7 @@ #include "webrtc/modules/desktop_capture/window_capturer.h" -#include +#include #include #include "webrtc/modules/desktop_capture/desktop_frame_win.h" diff --git a/webrtc/modules/desktop_capture/x11/x_server_pixel_buffer.cc b/webrtc/modules/desktop_capture/x11/x_server_pixel_buffer.cc index 2f2a80fa5d..88f7738dcf 100644 --- a/webrtc/modules/desktop_capture/x11/x_server_pixel_buffer.cc +++ b/webrtc/modules/desktop_capture/x11/x_server_pixel_buffer.cc @@ -10,7 +10,7 @@ #include "webrtc/modules/desktop_capture/x11/x_server_pixel_buffer.h" -#include +#include #include #include "webrtc/system_wrappers/interface/logging.h" diff --git a/webrtc/modules/interface/module_common_types.h b/webrtc/modules/interface/module_common_types.h index 57a1dfb922..e40adfc70e 100644 --- a/webrtc/modules/interface/module_common_types.h +++ b/webrtc/modules/interface/module_common_types.h @@ -11,8 +11,8 @@ #ifndef MODULE_COMMON_TYPES_H #define MODULE_COMMON_TYPES_H -#include -#include // memcpy +#include +#include // memcpy #include diff --git a/webrtc/modules/remote_bitrate_estimator/remote_rate_control.cc b/webrtc/modules/remote_bitrate_estimator/remote_rate_control.cc index d07b7d8074..1f5fe42bce 100644 --- a/webrtc/modules/remote_bitrate_estimator/remote_rate_control.cc +++ b/webrtc/modules/remote_bitrate_estimator/remote_rate_control.cc @@ -10,10 +10,11 @@ #include "webrtc/modules/remote_bitrate_estimator/remote_rate_control.h" +#include +#include +#include + #include -#include -#include -#include #include "webrtc/system_wrappers/interface/trace.h" diff --git a/webrtc/modules/rtp_rtcp/source/forward_error_correction.cc b/webrtc/modules/rtp_rtcp/source/forward_error_correction.cc index d2635e8f6b..a892386a67 100644 --- a/webrtc/modules/rtp_rtcp/source/forward_error_correction.cc +++ b/webrtc/modules/rtp_rtcp/source/forward_error_correction.cc @@ -10,9 +10,10 @@ #include "webrtc/modules/rtp_rtcp/source/forward_error_correction.h" +#include +#include + #include -#include -#include #include #include "webrtc/modules/rtp_rtcp/source/forward_error_correction_internal.h" diff --git a/webrtc/modules/rtp_rtcp/source/forward_error_correction_internal.cc b/webrtc/modules/rtp_rtcp/source/forward_error_correction_internal.cc index f718f3166d..6d9be90de1 100644 --- a/webrtc/modules/rtp_rtcp/source/forward_error_correction_internal.cc +++ b/webrtc/modules/rtp_rtcp/source/forward_error_correction_internal.cc @@ -10,8 +10,8 @@ #include "webrtc/modules/rtp_rtcp/source/forward_error_correction_internal.h" -#include -#include +#include +#include #include "webrtc/modules/rtp_rtcp/source/fec_private_tables_bursty.h" #include "webrtc/modules/rtp_rtcp/source/fec_private_tables_random.h" diff --git a/webrtc/modules/rtp_rtcp/source/receiver_fec.cc b/webrtc/modules/rtp_rtcp/source/receiver_fec.cc index e99cd4db71..378d3a3919 100644 --- a/webrtc/modules/rtp_rtcp/source/receiver_fec.cc +++ b/webrtc/modules/rtp_rtcp/source/receiver_fec.cc @@ -10,7 +10,7 @@ #include "webrtc/modules/rtp_rtcp/source/receiver_fec.h" -#include +#include #include "webrtc/modules/rtp_rtcp/source/rtp_receiver_video.h" #include "webrtc/modules/rtp_rtcp/source/rtp_utility.h" diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_receiver.cc b/webrtc/modules/rtp_rtcp/source/rtcp_receiver.cc index 5e2f5ba523..871a089a83 100644 --- a/webrtc/modules/rtp_rtcp/source/rtcp_receiver.cc +++ b/webrtc/modules/rtp_rtcp/source/rtcp_receiver.cc @@ -10,7 +10,7 @@ #include "webrtc/modules/rtp_rtcp/source/rtcp_receiver.h" -#include //assert +#include //assert #include //memset #include "webrtc/modules/rtp_rtcp/source/rtcp_utility.h" diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_receiver_help.cc b/webrtc/modules/rtp_rtcp/source/rtcp_receiver_help.cc index 1ad734ccd1..be07c4e07f 100644 --- a/webrtc/modules/rtp_rtcp/source/rtcp_receiver_help.cc +++ b/webrtc/modules/rtp_rtcp/source/rtcp_receiver_help.cc @@ -10,7 +10,7 @@ #include "webrtc/modules/rtp_rtcp/source/rtcp_receiver_help.h" -#include // assert +#include // assert #include // memset #include "webrtc/modules/rtp_rtcp/source/rtp_utility.h" diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_sender.cc b/webrtc/modules/rtp_rtcp/source/rtcp_sender.cc index c7bd5ac6a0..78f178900c 100644 --- a/webrtc/modules/rtp_rtcp/source/rtcp_sender.cc +++ b/webrtc/modules/rtp_rtcp/source/rtcp_sender.cc @@ -10,11 +10,12 @@ #include "webrtc/modules/rtp_rtcp/source/rtcp_sender.h" -#include // min -#include // assert -#include // rand +#include // assert +#include // rand #include // memcpy +#include // min + #include "webrtc/common_types.h" #include "webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.h" #include "webrtc/system_wrappers/interface/critical_section_wrapper.h" diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_utility.cc b/webrtc/modules/rtp_rtcp/source/rtcp_utility.cc index 0e6a221848..8a9e1c5e34 100644 --- a/webrtc/modules/rtp_rtcp/source/rtcp_utility.cc +++ b/webrtc/modules/rtp_rtcp/source/rtcp_utility.cc @@ -10,9 +10,9 @@ #include "webrtc/modules/rtp_rtcp/source/rtcp_utility.h" -#include -#include // ceil -#include // memcpy +#include +#include // ceil +#include // memcpy namespace webrtc { // RTCPParserV2 : currently read only diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_utility.h b/webrtc/modules/rtp_rtcp/source/rtcp_utility.h index 606384abb7..fa771ab93e 100644 --- a/webrtc/modules/rtp_rtcp/source/rtcp_utility.h +++ b/webrtc/modules/rtp_rtcp/source/rtcp_utility.h @@ -11,7 +11,7 @@ #ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_UTILITY_H_ #define WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_UTILITY_H_ -#include // size_t, ptrdiff_t +#include // size_t, ptrdiff_t #include "webrtc/modules/rtp_rtcp/interface/rtp_rtcp_defines.h" #include "webrtc/modules/rtp_rtcp/source/rtp_rtcp_config.h" diff --git a/webrtc/modules/rtp_rtcp/source/rtp_format_vp8.cc b/webrtc/modules/rtp_rtcp/source/rtp_format_vp8.cc index 4eb4cd6b95..360176b3cb 100644 --- a/webrtc/modules/rtp_rtcp/source/rtp_format_vp8.cc +++ b/webrtc/modules/rtp_rtcp/source/rtp_format_vp8.cc @@ -10,9 +10,9 @@ #include "webrtc/modules/rtp_rtcp/source/rtp_format_vp8.h" +#include // assert #include // memcpy -#include // assert #include #include "webrtc/modules/rtp_rtcp/source/vp8_partition_aggregator.h" diff --git a/webrtc/modules/rtp_rtcp/source/rtp_header_extension.cc b/webrtc/modules/rtp_rtcp/source/rtp_header_extension.cc index daf7e1f571..2e72d750bd 100644 --- a/webrtc/modules/rtp_rtcp/source/rtp_header_extension.cc +++ b/webrtc/modules/rtp_rtcp/source/rtp_header_extension.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include +#include #include "webrtc/common_types.h" #include "webrtc/modules/rtp_rtcp/source/rtp_header_extension.h" diff --git a/webrtc/modules/rtp_rtcp/source/rtp_packet_history.cc b/webrtc/modules/rtp_rtcp/source/rtp_packet_history.cc index c657c92e54..56eba3b571 100644 --- a/webrtc/modules/rtp_rtcp/source/rtp_packet_history.cc +++ b/webrtc/modules/rtp_rtcp/source/rtp_packet_history.cc @@ -11,7 +11,7 @@ #include "webrtc/modules/rtp_rtcp/source/rtp_packet_history.h" #include -#include // memset +#include // memset #include "webrtc/modules/rtp_rtcp/source/rtp_utility.h" #include "webrtc/system_wrappers/interface/critical_section_wrapper.h" diff --git a/webrtc/modules/rtp_rtcp/source/rtp_receiver.cc b/webrtc/modules/rtp_rtcp/source/rtp_receiver.cc index 4fc557fae7..4762089430 100644 --- a/webrtc/modules/rtp_rtcp/source/rtp_receiver.cc +++ b/webrtc/modules/rtp_rtcp/source/rtp_receiver.cc @@ -10,7 +10,7 @@ #include "webrtc/modules/rtp_rtcp/source/rtp_receiver.h" -#include +#include #include #include #include diff --git a/webrtc/modules/rtp_rtcp/source/rtp_receiver_audio.cc b/webrtc/modules/rtp_rtcp/source/rtp_receiver_audio.cc index 130ca8a705..865add4ec6 100644 --- a/webrtc/modules/rtp_rtcp/source/rtp_receiver_audio.cc +++ b/webrtc/modules/rtp_rtcp/source/rtp_receiver_audio.cc @@ -10,10 +10,9 @@ #include "webrtc/modules/rtp_rtcp/source/rtp_receiver_audio.h" +#include // assert #include // pow() - -#include // assert -#include // memcpy() +#include // memcpy() #include "webrtc/system_wrappers/interface/critical_section_wrapper.h" #include "webrtc/system_wrappers/interface/trace.h" diff --git a/webrtc/modules/rtp_rtcp/source/rtp_receiver_strategy.cc b/webrtc/modules/rtp_rtcp/source/rtp_receiver_strategy.cc index 509d4fe0ac..2b5226a5c2 100644 --- a/webrtc/modules/rtp_rtcp/source/rtp_receiver_strategy.cc +++ b/webrtc/modules/rtp_rtcp/source/rtp_receiver_strategy.cc @@ -10,7 +10,7 @@ #include "webrtc/modules/rtp_rtcp/source/rtp_receiver_strategy.h" -#include +#include namespace webrtc { diff --git a/webrtc/modules/rtp_rtcp/source/rtp_receiver_video.cc b/webrtc/modules/rtp_rtcp/source/rtp_receiver_video.cc index b5e8662d67..9465d22dbc 100644 --- a/webrtc/modules/rtp_rtcp/source/rtp_receiver_video.cc +++ b/webrtc/modules/rtp_rtcp/source/rtp_receiver_video.cc @@ -12,8 +12,8 @@ #include -#include // assert -#include // memcpy() +#include // assert +#include // memcpy() #include "webrtc/modules/rtp_rtcp/source/receiver_fec.h" #include "webrtc/modules/rtp_rtcp/source/rtp_format_video_generic.h" diff --git a/webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.cc b/webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.cc index 55c165966d..5c7f85ef1c 100644 --- a/webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.cc +++ b/webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.cc @@ -10,7 +10,7 @@ #include "webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.h" -#include +#include #include #include "webrtc/common_types.h" diff --git a/webrtc/modules/rtp_rtcp/source/rtp_sender.cc b/webrtc/modules/rtp_rtcp/source/rtp_sender.cc index 5b6f574cdf..20dfb22788 100644 --- a/webrtc/modules/rtp_rtcp/source/rtp_sender.cc +++ b/webrtc/modules/rtp_rtcp/source/rtp_sender.cc @@ -10,7 +10,7 @@ #include "webrtc/modules/rtp_rtcp/source/rtp_sender.h" -#include // srand +#include // srand #include "webrtc/modules/rtp_rtcp/source/rtp_packet_history.h" #include "webrtc/modules/rtp_rtcp/source/rtp_sender_audio.h" diff --git a/webrtc/modules/rtp_rtcp/source/rtp_sender.h b/webrtc/modules/rtp_rtcp/source/rtp_sender.h index eef2440c42..91041faf62 100644 --- a/webrtc/modules/rtp_rtcp/source/rtp_sender.h +++ b/webrtc/modules/rtp_rtcp/source/rtp_sender.h @@ -11,8 +11,9 @@ #ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_SENDER_H_ #define WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_SENDER_H_ -#include -#include +#include +#include + #include #include "webrtc/common_types.h" diff --git a/webrtc/modules/rtp_rtcp/source/rtp_sender_audio.cc b/webrtc/modules/rtp_rtcp/source/rtp_sender_audio.cc index 55f6c15722..f800142886 100644 --- a/webrtc/modules/rtp_rtcp/source/rtp_sender_audio.cc +++ b/webrtc/modules/rtp_rtcp/source/rtp_sender_audio.cc @@ -10,7 +10,7 @@ #include "webrtc/modules/rtp_rtcp/source/rtp_sender_audio.h" -#include //assert +#include //assert #include //memcpy #include "webrtc/system_wrappers/interface/trace_event.h" diff --git a/webrtc/modules/rtp_rtcp/source/rtp_utility.cc b/webrtc/modules/rtp_rtcp/source/rtp_utility.cc index 4a3a1432fc..ca2e0afb06 100644 --- a/webrtc/modules/rtp_rtcp/source/rtp_utility.cc +++ b/webrtc/modules/rtp_rtcp/source/rtp_utility.cc @@ -10,9 +10,9 @@ #include "webrtc/modules/rtp_rtcp/source/rtp_utility.h" -#include -#include // ceil -#include // memcpy +#include +#include // ceil +#include // memcpy #if defined(_WIN32) // Order for these headers are important diff --git a/webrtc/modules/rtp_rtcp/source/rtp_utility.h b/webrtc/modules/rtp_rtcp/source/rtp_utility.h index 3bae7324aa..c2b3c25011 100644 --- a/webrtc/modules/rtp_rtcp/source/rtp_utility.h +++ b/webrtc/modules/rtp_rtcp/source/rtp_utility.h @@ -11,7 +11,7 @@ #ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_UTILITY_H_ #define WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_UTILITY_H_ -#include // size_t, ptrdiff_t +#include // size_t, ptrdiff_t #include "webrtc/modules/rtp_rtcp/interface/rtp_rtcp_defines.h" #include "webrtc/modules/rtp_rtcp/source/rtp_header_extension.h" diff --git a/webrtc/modules/rtp_rtcp/test/testFec/test_fec.cc b/webrtc/modules/rtp_rtcp/test/testFec/test_fec.cc index 336d183030..8896b68574 100644 --- a/webrtc/modules/rtp_rtcp/test/testFec/test_fec.cc +++ b/webrtc/modules/rtp_rtcp/test/testFec/test_fec.cc @@ -13,11 +13,12 @@ * functions in ForwardErrorCorrection directly. */ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include + #include #include "testing/gtest/include/gtest/gtest.h" diff --git a/webrtc/modules/utility/source/rtp_dump_impl.cc b/webrtc/modules/utility/source/rtp_dump_impl.cc index d7c112fcba..1f8715dfa5 100644 --- a/webrtc/modules/utility/source/rtp_dump_impl.cc +++ b/webrtc/modules/utility/source/rtp_dump_impl.cc @@ -10,7 +10,7 @@ #include "webrtc/modules/utility/source/rtp_dump_impl.h" -#include +#include #include #include "webrtc/system_wrappers/interface/critical_section_wrapper.h" diff --git a/webrtc/modules/utility/source/video_frames_queue.cc b/webrtc/modules/utility/source/video_frames_queue.cc index 7d6ea34b6f..535660cf9a 100644 --- a/webrtc/modules/utility/source/video_frames_queue.cc +++ b/webrtc/modules/utility/source/video_frames_queue.cc @@ -12,7 +12,7 @@ #ifdef WEBRTC_MODULE_UTILITY_VIDEO -#include +#include #include "webrtc/modules/interface/module_common_types.h" #include "webrtc/system_wrappers/interface/tick_util.h" diff --git a/webrtc/modules/video_coding/codecs/test/packet_manipulator.cc b/webrtc/modules/video_coding/codecs/test/packet_manipulator.cc index cff3ac7df4..0583e9ef11 100644 --- a/webrtc/modules/video_coding/codecs/test/packet_manipulator.cc +++ b/webrtc/modules/video_coding/codecs/test/packet_manipulator.cc @@ -10,8 +10,8 @@ #include "webrtc/modules/video_coding/codecs/test/packet_manipulator.h" -#include -#include +#include +#include namespace webrtc { namespace test { diff --git a/webrtc/modules/video_coding/codecs/test/packet_manipulator.h b/webrtc/modules/video_coding/codecs/test/packet_manipulator.h index 75550a0ff9..0fafa22d6d 100644 --- a/webrtc/modules/video_coding/codecs/test/packet_manipulator.h +++ b/webrtc/modules/video_coding/codecs/test/packet_manipulator.h @@ -11,7 +11,7 @@ #ifndef WEBRTC_MODULES_VIDEO_CODING_CODECS_TEST_PACKET_MANIPULATOR_H_ #define WEBRTC_MODULES_VIDEO_CODING_CODECS_TEST_PACKET_MANIPULATOR_H_ -#include +#include #include "webrtc/modules/video_coding/codecs/interface/video_codec_interface.h" #include "webrtc/system_wrappers/interface/critical_section_wrapper.h" diff --git a/webrtc/modules/video_coding/codecs/test/predictive_packet_manipulator.cc b/webrtc/modules/video_coding/codecs/test/predictive_packet_manipulator.cc index 03920ff8fc..c92cfa48a7 100644 --- a/webrtc/modules/video_coding/codecs/test/predictive_packet_manipulator.cc +++ b/webrtc/modules/video_coding/codecs/test/predictive_packet_manipulator.cc @@ -10,8 +10,8 @@ #include "webrtc/modules/video_coding/codecs/test/predictive_packet_manipulator.h" -#include -#include +#include +#include #include "webrtc/test/testsupport/packet_reader.h" diff --git a/webrtc/modules/video_coding/codecs/test/stats.cc b/webrtc/modules/video_coding/codecs/test/stats.cc index 17a88aff11..f6605f902f 100644 --- a/webrtc/modules/video_coding/codecs/test/stats.cc +++ b/webrtc/modules/video_coding/codecs/test/stats.cc @@ -10,9 +10,10 @@ #include "webrtc/modules/video_coding/codecs/test/stats.h" +#include +#include + #include // min_element, max_element -#include -#include namespace webrtc { namespace test { diff --git a/webrtc/modules/video_coding/codecs/test/videoprocessor.cc b/webrtc/modules/video_coding/codecs/test/videoprocessor.cc index 0409128cd8..30ee6a8e0e 100644 --- a/webrtc/modules/video_coding/codecs/test/videoprocessor.cc +++ b/webrtc/modules/video_coding/codecs/test/videoprocessor.cc @@ -10,8 +10,9 @@ #include "webrtc/modules/video_coding/codecs/test/videoprocessor.h" -#include -#include +#include +#include + #include #include diff --git a/webrtc/modules/video_coding/codecs/test_framework/benchmark.cc b/webrtc/modules/video_coding/codecs/test_framework/benchmark.cc index 1118937c64..c69803fbf9 100644 --- a/webrtc/modules/video_coding/codecs/test_framework/benchmark.cc +++ b/webrtc/modules/video_coding/codecs/test_framework/benchmark.cc @@ -10,7 +10,8 @@ #include "webrtc/modules/video_coding/codecs/test_framework/benchmark.h" -#include +#include + #include #include #include diff --git a/webrtc/modules/video_coding/codecs/test_framework/packet_loss_test.cc b/webrtc/modules/video_coding/codecs/test_framework/packet_loss_test.cc index 58e9eb8d60..6bb7bbe677 100644 --- a/webrtc/modules/video_coding/codecs/test_framework/packet_loss_test.cc +++ b/webrtc/modules/video_coding/codecs/test_framework/packet_loss_test.cc @@ -8,9 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include -#include +#include #include + +#include + #include "webrtc/modules/video_coding/codecs/test_framework/packet_loss_test.h" #include "webrtc/modules/video_coding/codecs/test_framework/video_source.h" diff --git a/webrtc/modules/video_coding/codecs/test_framework/test.cc b/webrtc/modules/video_coding/codecs/test_framework/test.cc index 1501b5f0d9..2d55f02c8c 100644 --- a/webrtc/modules/video_coding/codecs/test_framework/test.cc +++ b/webrtc/modules/video_coding/codecs/test_framework/test.cc @@ -10,7 +10,8 @@ #include "webrtc/modules/video_coding/codecs/test_framework/test.h" -#include +#include + #include #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" @@ -31,7 +32,7 @@ _description(description) { memset(&_inst, 0, sizeof(_inst)); unsigned int seed = static_cast(0); - std::srand(seed); + srand(seed); } CodecTest::CodecTest(std::string name, std::string description, @@ -46,7 +47,7 @@ _description(description) { memset(&_inst, 0, sizeof(_inst)); unsigned int seed = static_cast(0); - std::srand(seed); + srand(seed); } void diff --git a/webrtc/modules/video_coding/codecs/test_framework/test.h b/webrtc/modules/video_coding/codecs/test_framework/test.h index 69b6abaa95..890d0cb50c 100644 --- a/webrtc/modules/video_coding/codecs/test_framework/test.h +++ b/webrtc/modules/video_coding/codecs/test_framework/test.h @@ -11,9 +11,11 @@ #ifndef WEBRTC_MODULES_VIDEO_CODING_CODECS_TEST_FRAWEWORK_TEST_H_ #define WEBRTC_MODULES_VIDEO_CODING_CODECS_TEST_FRAWEWORK_TEST_H_ -#include +#include + #include #include + #include "webrtc/modules/interface/module_common_types.h" #include "webrtc/modules/video_coding/codecs/interface/video_codec_interface.h" diff --git a/webrtc/modules/video_coding/codecs/test_framework/unit_test.cc b/webrtc/modules/video_coding/codecs/test_framework/unit_test.cc index 9c9bb3be00..0fdd447b20 100644 --- a/webrtc/modules/video_coding/codecs/test_framework/unit_test.cc +++ b/webrtc/modules/video_coding/codecs/test_framework/unit_test.cc @@ -8,12 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ +#include #include #include #include -#include - #include "testing/gtest/include/gtest/gtest.h" #include "webrtc/modules/video_coding/codecs/test_framework/unit_test.h" #include "webrtc/modules/video_coding/codecs/test_framework/video_source.h" diff --git a/webrtc/modules/video_coding/codecs/tools/video_quality_measurement.cc b/webrtc/modules/video_coding/codecs/tools/video_quality_measurement.cc index 2c6c17d15b..7a124469f2 100644 --- a/webrtc/modules/video_coding/codecs/tools/video_quality_measurement.cc +++ b/webrtc/modules/video_coding/codecs/tools/video_quality_measurement.cc @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ +#include +#include +#include + #include #include // To check for directory existence. -#include -#include -#include - #ifndef S_ISDIR // Not defined in stat.h on Windows. #define S_ISDIR(mode) (((mode) & S_IFMT) == S_IFDIR) #endif diff --git a/webrtc/modules/video_coding/codecs/vp8/default_temporal_layers.cc b/webrtc/modules/video_coding/codecs/vp8/default_temporal_layers.cc index 42ddec35cf..ec0b5c635c 100644 --- a/webrtc/modules/video_coding/codecs/vp8/default_temporal_layers.cc +++ b/webrtc/modules/video_coding/codecs/vp8/default_temporal_layers.cc @@ -9,7 +9,7 @@ #include "webrtc/modules/video_coding/codecs/vp8/default_temporal_layers.h" -#include +#include #include #include diff --git a/webrtc/modules/video_coding/main/source/frame_buffer.cc b/webrtc/modules/video_coding/main/source/frame_buffer.cc index 167b05267d..32481e2a1d 100644 --- a/webrtc/modules/video_coding/main/source/frame_buffer.cc +++ b/webrtc/modules/video_coding/main/source/frame_buffer.cc @@ -10,7 +10,7 @@ #include "webrtc/modules/video_coding/main/source/frame_buffer.h" -#include +#include #include #include "webrtc/modules/video_coding/main/source/packet.h" diff --git a/webrtc/modules/video_coding/main/source/jitter_buffer.cc b/webrtc/modules/video_coding/main/source/jitter_buffer.cc index add2ec3221..17218f87bd 100644 --- a/webrtc/modules/video_coding/main/source/jitter_buffer.cc +++ b/webrtc/modules/video_coding/main/source/jitter_buffer.cc @@ -9,8 +9,9 @@ */ #include "webrtc/modules/video_coding/main/source/jitter_buffer.h" +#include + #include -#include #include #include "webrtc/modules/video_coding/main/interface/video_coding.h" diff --git a/webrtc/modules/video_coding/main/source/media_opt_util.h b/webrtc/modules/video_coding/main/source/media_opt_util.h index d52da15c87..f39a5780eb 100644 --- a/webrtc/modules/video_coding/main/source/media_opt_util.h +++ b/webrtc/modules/video_coding/main/source/media_opt_util.h @@ -11,8 +11,8 @@ #ifndef WEBRTC_MODULES_VIDEO_CODING_MEDIA_OPT_UTIL_H_ #define WEBRTC_MODULES_VIDEO_CODING_MEDIA_OPT_UTIL_H_ -#include -#include +#include +#include #include "webrtc/modules/video_coding/main/source/internal_defines.h" #include "webrtc/modules/video_coding/main/source/qm_select.h" diff --git a/webrtc/modules/video_coding/main/source/rtt_filter.cc b/webrtc/modules/video_coding/main/source/rtt_filter.cc index e609592ba0..25d89e54c0 100644 --- a/webrtc/modules/video_coding/main/source/rtt_filter.cc +++ b/webrtc/modules/video_coding/main/source/rtt_filter.cc @@ -12,7 +12,7 @@ #include "webrtc/modules/video_coding/main/source/rtt_filter.h" #include "webrtc/system_wrappers/interface/trace.h" -#include +#include #include #include diff --git a/webrtc/modules/video_coding/main/source/timing_unittest.cc b/webrtc/modules/video_coding/main/source/timing_unittest.cc index 496946ebb2..dde26a9c9c 100644 --- a/webrtc/modules/video_coding/main/source/timing_unittest.cc +++ b/webrtc/modules/video_coding/main/source/timing_unittest.cc @@ -8,9 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include -#include -#include +#include +#include +#include + #include "testing/gtest/include/gtest/gtest.h" #include "webrtc/modules/video_coding/main/interface/video_coding.h" diff --git a/webrtc/modules/video_coding/main/test/generic_codec_test.cc b/webrtc/modules/video_coding/main/test/generic_codec_test.cc index 1a9ca3975f..925f9ab46d 100644 --- a/webrtc/modules/video_coding/main/test/generic_codec_test.cc +++ b/webrtc/modules/video_coding/main/test/generic_codec_test.cc @@ -10,7 +10,7 @@ #include "webrtc/modules/video_coding/main/test/generic_codec_test.h" -#include +#include #include #include "webrtc/common_video/interface/i420_video_frame.h" diff --git a/webrtc/modules/video_coding/main/test/jitter_estimate_test.cc b/webrtc/modules/video_coding/main/test/jitter_estimate_test.cc index ee1c0b03d7..25ef686ef8 100644 --- a/webrtc/modules/video_coding/main/test/jitter_estimate_test.cc +++ b/webrtc/modules/video_coding/main/test/jitter_estimate_test.cc @@ -9,7 +9,7 @@ */ #include -#include +#include #include "JitterEstimateTest.h" using namespace webrtc; @@ -25,8 +25,8 @@ _counter(0), _lossrate(0.0) { // Assign to random value between 0 and max of unsigned int - _seed = static_cast(std::time(0)); - std::srand(_seed); + _seed = static_cast(time(0)); + srand(_seed); _prevTimestamp = static_cast((std::rand() + 1.0)/(RAND_MAX + 1.0)*(pow((float) 2, (long) sizeof(unsigned int)*8)-1)); _prevWallClock = VCMTickTime::MillisecondTimestamp(); } diff --git a/webrtc/modules/video_coding/main/test/jitter_estimate_test.h b/webrtc/modules/video_coding/main/test/jitter_estimate_test.h index ec9fdeb9ff..086ec0c3d1 100644 --- a/webrtc/modules/video_coding/main/test/jitter_estimate_test.h +++ b/webrtc/modules/video_coding/main/test/jitter_estimate_test.h @@ -14,8 +14,8 @@ #include "typedefs.h" #include "jitter_buffer.h" #include "jitter_estimator.h" -#include -#include +#include +#include double const pi = 4*std::atan(1.0); @@ -28,7 +28,7 @@ public: { double r1 = (std::rand() + 1.0)/(RAND_MAX + 1.0); // gives equal distribution in (0, 1] double r2 = (std::rand() + 1.0)/(RAND_MAX + 1.0); - return _mu + _sigma * std::sqrt(-2*std::log(r1))*std::cos(2*pi*r2); + return _mu + _sigma * sqrt(-2*std::log(r1))*std::cos(2*pi*r2); } double GetAverage() diff --git a/webrtc/modules/video_coding/main/test/mt_test_common.cc b/webrtc/modules/video_coding/main/test/mt_test_common.cc index 04b180dc65..3b450899a1 100644 --- a/webrtc/modules/video_coding/main/test/mt_test_common.cc +++ b/webrtc/modules/video_coding/main/test/mt_test_common.cc @@ -10,7 +10,7 @@ #include "webrtc/modules/video_coding/main/test/mt_test_common.h" -#include +#include #include "webrtc/modules/rtp_rtcp/interface/rtp_header_parser.h" #include "webrtc/modules/utility/interface/rtp_dump.h" diff --git a/webrtc/modules/video_coding/main/test/pcap_file_reader.cc b/webrtc/modules/video_coding/main/test/pcap_file_reader.cc index 326fab85c3..3d4e2659df 100644 --- a/webrtc/modules/video_coding/main/test/pcap_file_reader.cc +++ b/webrtc/modules/video_coding/main/test/pcap_file_reader.cc @@ -16,8 +16,9 @@ #else #include #endif -#include -#include +#include +#include + #include #include #include diff --git a/webrtc/modules/video_coding/main/test/rtp_file_reader.cc b/webrtc/modules/video_coding/main/test/rtp_file_reader.cc index f1921e9a46..447eb9bea9 100644 --- a/webrtc/modules/video_coding/main/test/rtp_file_reader.cc +++ b/webrtc/modules/video_coding/main/test/rtp_file_reader.cc @@ -16,8 +16,8 @@ #else #include #endif -#include -#include +#include +#include #include "webrtc/modules/video_coding/main/test/rtp_player.h" #include "webrtc/system_wrappers/interface/scoped_ptr.h" diff --git a/webrtc/modules/video_coding/main/test/rtp_player.cc b/webrtc/modules/video_coding/main/test/rtp_player.cc index 0e440daebe..94957e9365 100644 --- a/webrtc/modules/video_coding/main/test/rtp_player.cc +++ b/webrtc/modules/video_coding/main/test/rtp_player.cc @@ -10,7 +10,8 @@ #include "webrtc/modules/video_coding/main/test/rtp_player.h" -#include +#include + #include #include "webrtc/modules/rtp_rtcp/interface/rtp_header_parser.h" diff --git a/webrtc/modules/video_coding/main/test/test_callbacks.cc b/webrtc/modules/video_coding/main/test/test_callbacks.cc index bbd7aeadaa..4bb1f34217 100644 --- a/webrtc/modules/video_coding/main/test/test_callbacks.cc +++ b/webrtc/modules/video_coding/main/test/test_callbacks.cc @@ -10,7 +10,7 @@ #include "webrtc/modules/video_coding/main/test/test_callbacks.h" -#include +#include #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" #include "webrtc/modules/rtp_rtcp/interface/rtp_header_parser.h" diff --git a/webrtc/modules/video_coding/main/test/test_callbacks.h b/webrtc/modules/video_coding/main/test/test_callbacks.h index 09275afd6c..9fab776ce4 100644 --- a/webrtc/modules/video_coding/main/test/test_callbacks.h +++ b/webrtc/modules/video_coding/main/test/test_callbacks.h @@ -16,10 +16,11 @@ */ -#include +#include +#include + #include #include -#include #include "webrtc/modules/interface/module_common_types.h" #include "webrtc/modules/rtp_rtcp/interface/rtp_rtcp.h" diff --git a/webrtc/modules/video_coding/main/test/test_macros.h b/webrtc/modules/video_coding/main/test/test_macros.h index 31693b5701..a8a70ea281 100644 --- a/webrtc/modules/video_coding/main/test/test_macros.h +++ b/webrtc/modules/video_coding/main/test/test_macros.h @@ -11,8 +11,8 @@ #ifndef VCM_TEST_MACROS_H #define VCM_TEST_MACROS_H -#include -#include +#include +#include extern int vcmMacrosTests; extern int vcmMacrosErrors; diff --git a/webrtc/modules/video_coding/main/test/test_util.cc b/webrtc/modules/video_coding/main/test/test_util.cc index 159de17181..f1b68dc5d4 100644 --- a/webrtc/modules/video_coding/main/test/test_util.cc +++ b/webrtc/modules/video_coding/main/test/test_util.cc @@ -10,8 +10,9 @@ #include "webrtc/modules/video_coding/main/test/test_util.h" -#include -#include +#include +#include + #include #include diff --git a/webrtc/modules/video_coding/main/test/vcm_payload_sink_factory.cc b/webrtc/modules/video_coding/main/test/vcm_payload_sink_factory.cc index ccc74e9e84..23f0f9f583 100644 --- a/webrtc/modules/video_coding/main/test/vcm_payload_sink_factory.cc +++ b/webrtc/modules/video_coding/main/test/vcm_payload_sink_factory.cc @@ -10,8 +10,9 @@ #include "webrtc/modules/video_coding/main/test/vcm_payload_sink_factory.h" +#include + #include -#include #include "webrtc/modules/rtp_rtcp/interface/rtp_rtcp.h" #include "webrtc/modules/video_coding/main/test/test_util.h" diff --git a/webrtc/modules/video_coding/main/test/video_rtp_play_mt.cc b/webrtc/modules/video_coding/main/test/video_rtp_play_mt.cc index 34f3206355..ec1cff4a21 100644 --- a/webrtc/modules/video_coding/main/test/video_rtp_play_mt.cc +++ b/webrtc/modules/video_coding/main/test/video_rtp_play_mt.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include +#include #include "webrtc/modules/video_coding/main/test/receiver_tests.h" #include "webrtc/modules/video_coding/main/test/vcm_payload_sink_factory.h" diff --git a/webrtc/modules/video_coding/main/test/video_source.cc b/webrtc/modules/video_coding/main/test/video_source.cc index 781ea2c25a..65ee6a393c 100644 --- a/webrtc/modules/video_coding/main/test/video_source.cc +++ b/webrtc/modules/video_coding/main/test/video_source.cc @@ -10,7 +10,7 @@ #include "webrtc/modules/video_coding/main/test/video_source.h" -#include +#include #include "webrtc/test/testsupport/fileutils.h" diff --git a/webrtc/modules/video_processing/main/source/brighten.cc b/webrtc/modules/video_processing/main/source/brighten.cc index 12da5746fd..8fa23c2759 100644 --- a/webrtc/modules/video_processing/main/source/brighten.cc +++ b/webrtc/modules/video_processing/main/source/brighten.cc @@ -10,7 +10,7 @@ #include "webrtc/modules/video_processing/main/source/brighten.h" -#include +#include #include "webrtc/system_wrappers/interface/trace.h" diff --git a/webrtc/modules/video_processing/main/source/color_enhancement.cc b/webrtc/modules/video_processing/main/source/color_enhancement.cc index b5247676c3..87a594b612 100644 --- a/webrtc/modules/video_processing/main/source/color_enhancement.cc +++ b/webrtc/modules/video_processing/main/source/color_enhancement.cc @@ -8,7 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include // NULL +#include // NULL + #include "webrtc/modules/video_processing/main/source/color_enhancement.h" #include "webrtc/modules/video_processing/main/source/color_enhancement_private.h" #include "webrtc/system_wrappers/interface/trace.h" diff --git a/webrtc/modules/video_processing/main/source/deflickering.h b/webrtc/modules/video_processing/main/source/deflickering.h index 94b08361b4..d3f8139bef 100644 --- a/webrtc/modules/video_processing/main/source/deflickering.h +++ b/webrtc/modules/video_processing/main/source/deflickering.h @@ -15,11 +15,11 @@ #ifndef VPM_DEFLICKERING_H #define VPM_DEFLICKERING_H +#include // NULL + #include "webrtc/modules/video_processing/main/interface/video_processing.h" #include "webrtc/typedefs.h" -#include // NULL - namespace webrtc { class VPMDeflickering diff --git a/webrtc/modules/video_processing/main/source/denoising.cc b/webrtc/modules/video_processing/main/source/denoising.cc index 42ea268479..45326fa545 100644 --- a/webrtc/modules/video_processing/main/source/denoising.cc +++ b/webrtc/modules/video_processing/main/source/denoising.cc @@ -11,7 +11,7 @@ #include "webrtc/modules/video_processing/main/source/denoising.h" #include "webrtc/system_wrappers/interface/trace.h" -#include +#include namespace webrtc { diff --git a/webrtc/modules/video_processing/main/source/video_processing_impl.cc b/webrtc/modules/video_processing/main/source/video_processing_impl.cc index 4546f9113d..8152cd1738 100644 --- a/webrtc/modules/video_processing/main/source/video_processing_impl.cc +++ b/webrtc/modules/video_processing/main/source/video_processing_impl.cc @@ -13,7 +13,7 @@ #include "webrtc/system_wrappers/interface/critical_section_wrapper.h" #include "webrtc/system_wrappers/interface/trace.h" -#include +#include namespace webrtc { diff --git a/webrtc/modules/video_processing/main/test/unit_test/color_enhancement_test.cc b/webrtc/modules/video_processing/main/test/unit_test/color_enhancement_test.cc index ea1ed41c49..c048003fb9 100644 --- a/webrtc/modules/video_processing/main/test/unit_test/color_enhancement_test.cc +++ b/webrtc/modules/video_processing/main/test/unit_test/color_enhancement_test.cc @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include -#include +#include +#include #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" #include "webrtc/modules/video_processing/main/interface/video_processing.h" diff --git a/webrtc/modules/video_processing/main/test/unit_test/deflickering_test.cc b/webrtc/modules/video_processing/main/test/unit_test/deflickering_test.cc index 48afcf569d..85f4fd6ebb 100644 --- a/webrtc/modules/video_processing/main/test/unit_test/deflickering_test.cc +++ b/webrtc/modules/video_processing/main/test/unit_test/deflickering_test.cc @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include -#include +#include +#include #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" #include "webrtc/modules/video_processing/main/interface/video_processing.h" diff --git a/webrtc/modules/video_processing/main/test/unit_test/denoising_test.cc b/webrtc/modules/video_processing/main/test/unit_test/denoising_test.cc index 8c47917771..8a3439318b 100644 --- a/webrtc/modules/video_processing/main/test/unit_test/denoising_test.cc +++ b/webrtc/modules/video_processing/main/test/unit_test/denoising_test.cc @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include -#include +#include +#include #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" #include "webrtc/modules/video_processing/main/interface/video_processing.h" diff --git a/webrtc/modules/video_render/incoming_video_stream.cc b/webrtc/modules/video_render/incoming_video_stream.cc index f3b79fef84..eb602d14e3 100644 --- a/webrtc/modules/video_render/incoming_video_stream.cc +++ b/webrtc/modules/video_render/incoming_video_stream.cc @@ -10,13 +10,13 @@ #include "webrtc/modules/video_render//incoming_video_stream.h" -#include +#include #if defined(_WIN32) #include #elif defined(WEBRTC_LINUX) -#include #include +#include #else #include #endif diff --git a/webrtc/modules/video_render/test/testAPI/testAPI.cc b/webrtc/modules/video_render/test/testAPI/testAPI.cc index 5f4fd565c6..9764ae64e7 100644 --- a/webrtc/modules/video_render/test/testAPI/testAPI.cc +++ b/webrtc/modules/video_render/test/testAPI/testAPI.cc @@ -15,7 +15,7 @@ #if defined(_WIN32) #include #include -#include +#include #include #include #include diff --git a/webrtc/modules/video_render/video_render_frames.cc b/webrtc/modules/video_render/video_render_frames.cc index b0a78b6d7f..80b3d59af3 100644 --- a/webrtc/modules/video_render/video_render_frames.cc +++ b/webrtc/modules/video_render/video_render_frames.cc @@ -10,7 +10,7 @@ #include "webrtc/modules/video_render//video_render_frames.h" -#include +#include #include "webrtc/modules/interface/module_common_types.h" #include "webrtc/system_wrappers/interface/tick_util.h" diff --git a/webrtc/modules/video_render/video_render_impl.cc b/webrtc/modules/video_render/video_render_impl.cc index f484362971..7dc0dbf325 100644 --- a/webrtc/modules/video_render/video_render_impl.cc +++ b/webrtc/modules/video_render/video_render_impl.cc @@ -8,6 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ +#include + #include "webrtc/engine_configurations.h" #include "webrtc/modules/video_render/i_video_render.h" #include "webrtc/modules/video_render/include/video_render_defines.h" @@ -16,8 +18,6 @@ #include "webrtc/system_wrappers/interface/critical_section_wrapper.h" #include "webrtc/system_wrappers/interface/trace.h" -#include - #ifdef WEBRTC_INCLUDE_INTERNAL_VIDEO_RENDER #if defined (_WIN32) diff --git a/webrtc/system_wrappers/interface/atomic32.h b/webrtc/system_wrappers/interface/atomic32.h index 9a28d41790..ab29f97a07 100644 --- a/webrtc/system_wrappers/interface/atomic32.h +++ b/webrtc/system_wrappers/interface/atomic32.h @@ -16,7 +16,7 @@ #ifndef WEBRTC_SYSTEM_WRAPPERS_INTERFACE_ATOMIC32_H_ #define WEBRTC_SYSTEM_WRAPPERS_INTERFACE_ATOMIC32_H_ -#include +#include #include "webrtc/common_types.h" #include "webrtc/system_wrappers/interface/constructor_magic.h" diff --git a/webrtc/system_wrappers/interface/scoped_ptr.h b/webrtc/system_wrappers/interface/scoped_ptr.h index 84113d832f..cfaf5cbe90 100644 --- a/webrtc/system_wrappers/interface/scoped_ptr.h +++ b/webrtc/system_wrappers/interface/scoped_ptr.h @@ -26,10 +26,9 @@ #define WEBRTC_SYSTEM_WRAPPERS_INTERFACE_SCOPED_PTR_H_ #include // for assert +#include // for ptrdiff_t #include // for free() decl -#include // for std::ptrdiff_t - #ifdef _WIN32 namespace std { using ::ptrdiff_t; }; #endif // _WIN32 @@ -149,7 +148,7 @@ class scoped_array { } } - T& operator[](std::ptrdiff_t i) const { + T& operator[](ptrdiff_t i) const { assert(ptr != NULL); assert(i >= 0); return ptr[i]; diff --git a/webrtc/system_wrappers/interface/tick_util.h b/webrtc/system_wrappers/interface/tick_util.h index 7e7d799dd3..0b7890e7c8 100644 --- a/webrtc/system_wrappers/interface/tick_util.h +++ b/webrtc/system_wrappers/interface/tick_util.h @@ -19,7 +19,7 @@ #include #include #elif WEBRTC_LINUX -#include +#include #elif WEBRTC_MAC #include #include diff --git a/webrtc/system_wrappers/source/condition_variable_posix.cc b/webrtc/system_wrappers/source/condition_variable_posix.cc index 846cd63bea..b21304245c 100644 --- a/webrtc/system_wrappers/source/condition_variable_posix.cc +++ b/webrtc/system_wrappers/source/condition_variable_posix.cc @@ -12,7 +12,7 @@ #include #if defined(WEBRTC_LINUX) -#include +#include #else #include #endif diff --git a/webrtc/system_wrappers/source/data_log_unittest_disabled.cc b/webrtc/system_wrappers/source/data_log_unittest_disabled.cc index 935f3d6c25..02d3cdb68c 100644 --- a/webrtc/system_wrappers/source/data_log_unittest_disabled.cc +++ b/webrtc/system_wrappers/source/data_log_unittest_disabled.cc @@ -10,7 +10,7 @@ #include "webrtc/system_wrappers/interface/data_log.h" -#include +#include #include "testing/gtest/include/gtest/gtest.h" @@ -44,7 +44,7 @@ TEST(TestDataLogDisabled, VerifyLoggingWorks) { TEST(TestDataLogDisabled, EnsureNoFileIsWritten) { // Remove any previous data files on disk: - std::remove(kDataLogFileName); + remove(kDataLogFileName); ASSERT_EQ(0, DataLog::CreateLog()); // Don't use the table name we would get from Combine on a disabled DataLog. // Use "table_1" instead (which is what an enabled DataLog would give us). diff --git a/webrtc/system_wrappers/source/sort.cc b/webrtc/system_wrappers/source/sort.cc index c3b61e016e..9144a58c02 100644 --- a/webrtc/system_wrappers/source/sort.cc +++ b/webrtc/system_wrappers/source/sort.cc @@ -15,12 +15,13 @@ #include "webrtc/system_wrappers/interface/sort.h" -#include -#include // memcpy +#include +#include // memcpy + #include // nothrow new #ifdef NO_STL -#include // qsort +#include // qsort #else #include // std::sort #include diff --git a/webrtc/system_wrappers/source/tick_util.cc b/webrtc/system_wrappers/source/tick_util.cc index 45302ba998..8895b9172d 100644 --- a/webrtc/system_wrappers/source/tick_util.cc +++ b/webrtc/system_wrappers/source/tick_util.cc @@ -10,7 +10,7 @@ #include "webrtc/system_wrappers/interface/tick_util.h" -#include +#include namespace webrtc { diff --git a/webrtc/system_wrappers/source/trace_impl.cc b/webrtc/system_wrappers/source/trace_impl.cc index 83c73772d0..3a313417f0 100644 --- a/webrtc/system_wrappers/source/trace_impl.cc +++ b/webrtc/system_wrappers/source/trace_impl.cc @@ -10,7 +10,7 @@ #include "webrtc/system_wrappers/source/trace_impl.h" -#include +#include #include #include #include diff --git a/webrtc/system_wrappers/source/trace_posix.cc b/webrtc/system_wrappers/source/trace_posix.cc index 664dfeb1ee..22db3fa51a 100644 --- a/webrtc/system_wrappers/source/trace_posix.cc +++ b/webrtc/system_wrappers/source/trace_posix.cc @@ -10,12 +10,13 @@ #include "webrtc/system_wrappers/source/trace_posix.h" -#include +#include #include #include #include #include #include + #ifdef WEBRTC_ANDROID #include #else diff --git a/webrtc/system_wrappers/source/trace_win.cc b/webrtc/system_wrappers/source/trace_win.cc index 6b82d66bfd..129e3dd649 100644 --- a/webrtc/system_wrappers/source/trace_win.cc +++ b/webrtc/system_wrappers/source/trace_win.cc @@ -10,7 +10,7 @@ #include "webrtc/system_wrappers/source/trace_win.h" -#include +#include #include #include "Mmsystem.h" diff --git a/webrtc/system_wrappers/test/TestSort/TestSort.cc b/webrtc/system_wrappers/test/TestSort/TestSort.cc index 1a3c198ebf..cfa47cfb95 100644 --- a/webrtc/system_wrappers/test/TestSort/TestSort.cc +++ b/webrtc/system_wrappers/test/TestSort/TestSort.cc @@ -8,9 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ +#include +#include + #include -#include -#include #include "webrtc/system_wrappers/interface/sort.h" #include "webrtc/system_wrappers/interface/tick_util.h" diff --git a/webrtc/test/channel_transport/udp_socket_manager_wrapper.cc b/webrtc/test/channel_transport/udp_socket_manager_wrapper.cc index 2a43977414..2e84c28c84 100644 --- a/webrtc/test/channel_transport/udp_socket_manager_wrapper.cc +++ b/webrtc/test/channel_transport/udp_socket_manager_wrapper.cc @@ -10,7 +10,7 @@ #include "webrtc/test/channel_transport/udp_socket_manager_wrapper.h" -#include +#include #ifdef _WIN32 #include "webrtc/system_wrappers/interface/fix_interlocked_exchange_pointer_win.h" diff --git a/webrtc/test/libtest/helpers/bit_flip_encryption.cc b/webrtc/test/libtest/helpers/bit_flip_encryption.cc index cd8841be58..6548502ef3 100644 --- a/webrtc/test/libtest/helpers/bit_flip_encryption.cc +++ b/webrtc/test/libtest/helpers/bit_flip_encryption.cc @@ -10,7 +10,7 @@ #include "webrtc/test/libtest/include/bit_flip_encryption.h" -#include +#include float NormalizedRand() { return static_cast(rand()) / diff --git a/webrtc/test/libtest/helpers/random_encryption.cc b/webrtc/test/libtest/helpers/random_encryption.cc index befcb01d4c..c07c4b033b 100644 --- a/webrtc/test/libtest/helpers/random_encryption.cc +++ b/webrtc/test/libtest/helpers/random_encryption.cc @@ -10,9 +10,10 @@ #include "webrtc/test/libtest/include/random_encryption.h" +#include +#include + #include -#include -#include #include "webrtc/video_engine/vie_defines.h" diff --git a/webrtc/test/testsupport/fileutils.cc b/webrtc/test/testsupport/fileutils.cc index d4354d80b0..d19d50fe04 100644 --- a/webrtc/test/testsupport/fileutils.cc +++ b/webrtc/test/testsupport/fileutils.cc @@ -23,8 +23,8 @@ #define S_ISDIR(mode) (((mode) & S_IFMT) == S_IFDIR) #endif -#include -#include +#include +#include #include "webrtc/typedefs.h" // For architecture defines diff --git a/webrtc/test/testsupport/fileutils.h b/webrtc/test/testsupport/fileutils.h index e642a5f034..d51bbde21e 100644 --- a/webrtc/test/testsupport/fileutils.h +++ b/webrtc/test/testsupport/fileutils.h @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include +#include // File utilities for testing purposes. // diff --git a/webrtc/test/testsupport/fileutils_unittest.cc b/webrtc/test/testsupport/fileutils_unittest.cc index 1fd11bf9af..c38e4533b1 100644 --- a/webrtc/test/testsupport/fileutils_unittest.cc +++ b/webrtc/test/testsupport/fileutils_unittest.cc @@ -10,7 +10,8 @@ #include "webrtc/test/testsupport/fileutils.h" -#include +#include + #include #include @@ -120,9 +121,9 @@ TEST_F(FileUtilsTest, DISABLED_ON_ANDROID(OutputPathFromRootWorkingDir)) { TEST_F(FileUtilsTest, CreateDirectory) { std::string directory = "fileutils-unittest-empty-dir"; // Make sure it's removed if a previous test has failed: - std::remove(directory.c_str()); + remove(directory.c_str()); ASSERT_TRUE(webrtc::test::CreateDirectory(directory)); - std::remove(directory.c_str()); + remove(directory.c_str()); } TEST_F(FileUtilsTest, WorkingDirReturnsValue) { diff --git a/webrtc/test/testsupport/frame_reader.cc b/webrtc/test/testsupport/frame_reader.cc index 28896c4971..b03616aa44 100644 --- a/webrtc/test/testsupport/frame_reader.cc +++ b/webrtc/test/testsupport/frame_reader.cc @@ -10,7 +10,7 @@ #include "webrtc/test/testsupport/frame_reader.h" -#include +#include #include "webrtc/test/testsupport/fileutils.h" diff --git a/webrtc/test/testsupport/frame_reader.h b/webrtc/test/testsupport/frame_reader.h index 8f88a894fe..4ee90f90b4 100644 --- a/webrtc/test/testsupport/frame_reader.h +++ b/webrtc/test/testsupport/frame_reader.h @@ -11,7 +11,8 @@ #ifndef WEBRTC_TEST_TESTSUPPORT_FRAME_READER_H_ #define WEBRTC_TEST_TESTSUPPORT_FRAME_READER_H_ -#include +#include + #include #include "webrtc/typedefs.h" diff --git a/webrtc/test/testsupport/frame_reader_unittest.cc b/webrtc/test/testsupport/frame_reader_unittest.cc index ea837a74b4..c70db5b6ce 100644 --- a/webrtc/test/testsupport/frame_reader_unittest.cc +++ b/webrtc/test/testsupport/frame_reader_unittest.cc @@ -28,7 +28,7 @@ class FrameReaderTest: public testing::Test { virtual ~FrameReaderTest() {} void SetUp() { // Cleanup any previous dummy input file. - std::remove(kInputFilename.c_str()); + remove(kInputFilename.c_str()); // Create a dummy input file. FILE* dummy = fopen(kInputFilename.c_str(), "wb"); @@ -41,7 +41,7 @@ class FrameReaderTest: public testing::Test { void TearDown() { delete frame_reader_; // Cleanup the dummy input file. - std::remove(kInputFilename.c_str()); + remove(kInputFilename.c_str()); } FrameReader* frame_reader_; }; diff --git a/webrtc/test/testsupport/frame_writer.cc b/webrtc/test/testsupport/frame_writer.cc index 1d564bbf21..1b9e8a82ef 100644 --- a/webrtc/test/testsupport/frame_writer.cc +++ b/webrtc/test/testsupport/frame_writer.cc @@ -10,7 +10,7 @@ #include "webrtc/test/testsupport/frame_writer.h" -#include +#include namespace webrtc { namespace test { diff --git a/webrtc/test/testsupport/frame_writer.h b/webrtc/test/testsupport/frame_writer.h index 5cd34dcd7a..daa3894a50 100644 --- a/webrtc/test/testsupport/frame_writer.h +++ b/webrtc/test/testsupport/frame_writer.h @@ -11,7 +11,8 @@ #ifndef WEBRTC_TEST_TESTSUPPORT_FRAME_WRITER_H_ #define WEBRTC_TEST_TESTSUPPORT_FRAME_WRITER_H_ -#include +#include + #include #include "webrtc/typedefs.h" diff --git a/webrtc/test/testsupport/frame_writer_unittest.cc b/webrtc/test/testsupport/frame_writer_unittest.cc index 0978dffd6a..3e32feff98 100644 --- a/webrtc/test/testsupport/frame_writer_unittest.cc +++ b/webrtc/test/testsupport/frame_writer_unittest.cc @@ -25,14 +25,14 @@ class FrameWriterTest: public testing::Test { virtual ~FrameWriterTest() {} void SetUp() { // Cleanup any previous output file. - std::remove(kOutputFilename.c_str()); + remove(kOutputFilename.c_str()); frame_writer_ = new FrameWriterImpl(kOutputFilename, kFrameLength); ASSERT_TRUE(frame_writer_->Init()); } void TearDown() { delete frame_writer_; // Cleanup the temporary file. - std::remove(kOutputFilename.c_str()); + remove(kOutputFilename.c_str()); } FrameWriter* frame_writer_; }; diff --git a/webrtc/test/testsupport/metrics/video_metrics.cc b/webrtc/test/testsupport/metrics/video_metrics.cc index e9cf57ccd0..f537e03925 100644 --- a/webrtc/test/testsupport/metrics/video_metrics.cc +++ b/webrtc/test/testsupport/metrics/video_metrics.cc @@ -10,9 +10,10 @@ #include "webrtc/test/testsupport/metrics/video_metrics.h" +#include +#include + #include // min_element, max_element -#include -#include #include "webrtc/common_video/interface/i420_video_frame.h" #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" diff --git a/webrtc/test/testsupport/metrics/video_metrics_unittest.cc b/webrtc/test/testsupport/metrics/video_metrics_unittest.cc index c825f9ebd7..2803322092 100644 --- a/webrtc/test/testsupport/metrics/video_metrics_unittest.cc +++ b/webrtc/test/testsupport/metrics/video_metrics_unittest.cc @@ -39,7 +39,7 @@ class VideoMetricsTest: public testing::Test { fclose(dummy); } void TearDown() { - std::remove(kEmptyFileName); + remove(kEmptyFileName); } webrtc::test::QualityMetricsResult psnr_result_; webrtc::test::QualityMetricsResult ssim_result_; diff --git a/webrtc/test/testsupport/packet_reader.cc b/webrtc/test/testsupport/packet_reader.cc index eaafc80f7d..54552bd0f5 100644 --- a/webrtc/test/testsupport/packet_reader.cc +++ b/webrtc/test/testsupport/packet_reader.cc @@ -10,8 +10,8 @@ #include "webrtc/test/testsupport/packet_reader.h" -#include -#include +#include +#include namespace webrtc { namespace test { diff --git a/webrtc/test/testsupport/trace_to_stderr.cc b/webrtc/test/testsupport/trace_to_stderr.cc index 39706c54d6..e378d97d1a 100644 --- a/webrtc/test/testsupport/trace_to_stderr.cc +++ b/webrtc/test/testsupport/trace_to_stderr.cc @@ -10,8 +10,8 @@ #include "webrtc/test/testsupport/trace_to_stderr.h" -#include -#include +#include +#include #include diff --git a/webrtc/tools/converter/converter.cc b/webrtc/tools/converter/converter.cc index ca3ba9ace6..6c9154c7da 100644 --- a/webrtc/tools/converter/converter.cc +++ b/webrtc/tools/converter/converter.cc @@ -7,10 +7,10 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ +#include #include #include -#include #include #include diff --git a/webrtc/tools/converter/rgba_to_i420_converter.cc b/webrtc/tools/converter/rgba_to_i420_converter.cc index 4e53f943a2..126a31c7a3 100644 --- a/webrtc/tools/converter/rgba_to_i420_converter.cc +++ b/webrtc/tools/converter/rgba_to_i420_converter.cc @@ -8,8 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include -#include +#include +#include + #include #include #include diff --git a/webrtc/tools/force_mic_volume_max/force_mic_volume_max.cc b/webrtc/tools/force_mic_volume_max/force_mic_volume_max.cc index c824f8a836..11fb18aa3e 100644 --- a/webrtc/tools/force_mic_volume_max/force_mic_volume_max.cc +++ b/webrtc/tools/force_mic_volume_max/force_mic_volume_max.cc @@ -10,7 +10,7 @@ // This utility will portably force the volume of the default microphone to max. -#include +#include #include "webrtc/system_wrappers/interface/scoped_ptr.h" #include "webrtc/test/channel_transport/include/channel_transport.h" diff --git a/webrtc/tools/frame_analyzer/frame_analyzer.cc b/webrtc/tools/frame_analyzer/frame_analyzer.cc index 6b46cfd858..d368379ed7 100644 --- a/webrtc/tools/frame_analyzer/frame_analyzer.cc +++ b/webrtc/tools/frame_analyzer/frame_analyzer.cc @@ -8,8 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include -#include +#include +#include + #include #include #include diff --git a/webrtc/tools/frame_analyzer/video_quality_analysis.cc b/webrtc/tools/frame_analyzer/video_quality_analysis.cc index d685634056..14f5ec62d0 100644 --- a/webrtc/tools/frame_analyzer/video_quality_analysis.cc +++ b/webrtc/tools/frame_analyzer/video_quality_analysis.cc @@ -10,9 +10,10 @@ #include "webrtc/tools/frame_analyzer/video_quality_analysis.h" -#include -#include -#include +#include +#include +#include + #include #define STATS_LINE_LENGTH 32 diff --git a/webrtc/tools/frame_editing/frame_editing_unittest.cc b/webrtc/tools/frame_editing/frame_editing_unittest.cc index d333fd41b8..83302181fb 100644 --- a/webrtc/tools/frame_editing/frame_editing_unittest.cc +++ b/webrtc/tools/frame_editing/frame_editing_unittest.cc @@ -9,8 +9,8 @@ */ #include +#include -#include #include #include "testing/gtest/include/gtest/gtest.h" diff --git a/webrtc/tools/psnr_ssim_analyzer/psnr_ssim_analyzer.cc b/webrtc/tools/psnr_ssim_analyzer/psnr_ssim_analyzer.cc index 8f63dae39c..1524610684 100644 --- a/webrtc/tools/psnr_ssim_analyzer/psnr_ssim_analyzer.cc +++ b/webrtc/tools/psnr_ssim_analyzer/psnr_ssim_analyzer.cc @@ -8,8 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include -#include +#include +#include + #include #include #include diff --git a/webrtc/tools/simple_command_line_parser.cc b/webrtc/tools/simple_command_line_parser.cc index d6a8c1b795..62aba3d04f 100644 --- a/webrtc/tools/simple_command_line_parser.cc +++ b/webrtc/tools/simple_command_line_parser.cc @@ -10,8 +10,9 @@ #include "webrtc/tools/simple_command_line_parser.h" -#include -#include +#include +#include + #include namespace webrtc { diff --git a/webrtc/video_engine/call_stats.cc b/webrtc/video_engine/call_stats.cc index 233d536ab5..0184e5b32e 100644 --- a/webrtc/video_engine/call_stats.cc +++ b/webrtc/video_engine/call_stats.cc @@ -10,7 +10,7 @@ #include "webrtc/video_engine/call_stats.h" -#include +#include #include "webrtc/modules/rtp_rtcp/interface/rtp_rtcp_defines.h" #include "webrtc/system_wrappers/interface/critical_section_wrapper.h" diff --git a/webrtc/video_engine/internal/video_call.cc b/webrtc/video_engine/internal/video_call.cc index da014f4b9e..99112bff4b 100644 --- a/webrtc/video_engine/internal/video_call.cc +++ b/webrtc/video_engine/internal/video_call.cc @@ -10,8 +10,9 @@ #include "webrtc/video_engine/internal/video_call.h" -#include -#include +#include +#include + #include #include diff --git a/webrtc/video_engine/internal/video_engine.cc b/webrtc/video_engine/internal/video_engine.cc index 10dd3fa5f7..ec1d2f43f7 100644 --- a/webrtc/video_engine/internal/video_engine.cc +++ b/webrtc/video_engine/internal/video_engine.cc @@ -10,7 +10,7 @@ #include "webrtc/video_engine/new_include/video_engine.h" -#include +#include #include "webrtc/video_engine/include/vie_base.h" #include "webrtc/video_engine/internal/video_call.h" diff --git a/webrtc/video_engine/internal/video_receive_stream.cc b/webrtc/video_engine/internal/video_receive_stream.cc index c6722d2241..50f4553c94 100644 --- a/webrtc/video_engine/internal/video_receive_stream.cc +++ b/webrtc/video_engine/internal/video_receive_stream.cc @@ -10,8 +10,8 @@ #include "webrtc/video_engine/internal/video_receive_stream.h" -#include -#include +#include +#include #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" #include "webrtc/system_wrappers/interface/clock.h" diff --git a/webrtc/video_engine/stream_synchronization.cc b/webrtc/video_engine/stream_synchronization.cc index 9490d101ff..fcff782000 100644 --- a/webrtc/video_engine/stream_synchronization.cc +++ b/webrtc/video_engine/stream_synchronization.cc @@ -10,9 +10,10 @@ #include "webrtc/video_engine/stream_synchronization.h" -#include #include -#include +#include + +#include #include "webrtc/system_wrappers/interface/trace.h" diff --git a/webrtc/video_engine/test/auto_test/automated/vie_rtp_fuzz_test.cc b/webrtc/video_engine/test/auto_test/automated/vie_rtp_fuzz_test.cc index f799e218ea..ab78c1ebf2 100644 --- a/webrtc/video_engine/test/auto_test/automated/vie_rtp_fuzz_test.cc +++ b/webrtc/video_engine/test/auto_test/automated/vie_rtp_fuzz_test.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include +#include #include "gflags/gflags.h" #include "testing/gtest/include/gtest/gtest.h" @@ -65,7 +65,7 @@ protected: if (FLAGS_rtp_fuzz_test_rand_seed != 0) { return FLAGS_rtp_fuzz_test_rand_seed; } - return std::time(NULL); + return time(NULL); } // Pass in a number [0, 1] which will be the bit flip probability per byte. diff --git a/webrtc/video_engine/test/auto_test/automated/vie_standard_integration_test.cc b/webrtc/video_engine/test/auto_test/automated/vie_standard_integration_test.cc index 0990fa2c8e..74aa09634f 100644 --- a/webrtc/video_engine/test/auto_test/automated/vie_standard_integration_test.cc +++ b/webrtc/video_engine/test/auto_test/automated/vie_standard_integration_test.cc @@ -13,7 +13,7 @@ // tests in this section of the code. Currently, this code makes no attempt // to verify any video output - it only checks for direct errors. -#include +#include #include "gflags/gflags.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/webrtc/video_engine/test/auto_test/interface/vie_autotest_defines.h b/webrtc/video_engine/test/auto_test/interface/vie_autotest_defines.h index 9b0cb16330..83476e0dc5 100644 --- a/webrtc/video_engine/test/auto_test/interface/vie_autotest_defines.h +++ b/webrtc/video_engine/test/auto_test/interface/vie_autotest_defines.h @@ -16,9 +16,10 @@ #ifndef WEBRTC_VIDEO_ENGINE_MAIN_TEST_AUTOTEST_INTERFACE_VIE_AUTOTEST_DEFINES_H_ #define WEBRTC_VIDEO_ENGINE_MAIN_TEST_AUTOTEST_INTERFACE_VIE_AUTOTEST_DEFINES_H_ -#include +#include #include #include + #include #include "testing/gtest/include/gtest/gtest.h" diff --git a/webrtc/video_engine/test/auto_test/primitives/choice_helpers.cc b/webrtc/video_engine/test/auto_test/primitives/choice_helpers.cc index 9836d0c0be..8cc686af9e 100644 --- a/webrtc/video_engine/test/auto_test/primitives/choice_helpers.cc +++ b/webrtc/video_engine/test/auto_test/primitives/choice_helpers.cc @@ -10,10 +10,11 @@ #include "webrtc/video_engine/test/auto_test/primitives/choice_helpers.h" +#include +#include +#include + #include -#include -#include -#include #include namespace webrtc { diff --git a/webrtc/video_engine/test/auto_test/primitives/choice_helpers_unittest.cc b/webrtc/video_engine/test/auto_test/primitives/choice_helpers_unittest.cc index b26e2f4e84..469a375eb2 100644 --- a/webrtc/video_engine/test/auto_test/primitives/choice_helpers_unittest.cc +++ b/webrtc/video_engine/test/auto_test/primitives/choice_helpers_unittest.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include +#include #include "testing/gtest/include/gtest/gtest.h" #include "webrtc/video_engine/test/auto_test/primitives/choice_helpers.h" diff --git a/webrtc/video_engine/test/auto_test/primitives/fake_stdin.h b/webrtc/video_engine/test/auto_test/primitives/fake_stdin.h index 19737367d0..c298fe2e09 100644 --- a/webrtc/video_engine/test/auto_test/primitives/fake_stdin.h +++ b/webrtc/video_engine/test/auto_test/primitives/fake_stdin.h @@ -10,7 +10,8 @@ #ifndef FAKE_STDIN_H_ #define FAKE_STDIN_H_ -#include +#include + #include #include "testing/gtest/include/gtest/gtest.h" diff --git a/webrtc/video_engine/test/auto_test/primitives/framedrop_primitives.cc b/webrtc/video_engine/test/auto_test/primitives/framedrop_primitives.cc index f62732b340..e49be53e29 100644 --- a/webrtc/video_engine/test/auto_test/primitives/framedrop_primitives.cc +++ b/webrtc/video_engine/test/auto_test/primitives/framedrop_primitives.cc @@ -8,8 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include -#include +#include +#include + #include #include @@ -294,8 +295,8 @@ void FixOutputFileForComparison(const std::string& output_file, delete[] last_frame_data; frame_reader.Close(); frame_writer.Close(); - ASSERT_EQ(0, std::remove(output_file.c_str())); - ASSERT_EQ(0, std::rename(temp_file.c_str(), output_file.c_str())); + ASSERT_EQ(0, remove(output_file.c_str())); + ASSERT_EQ(0, rename(temp_file.c_str(), output_file.c_str())); } void FrameDropDetector::ReportFrameState(State state, unsigned int timestamp, diff --git a/webrtc/video_engine/test/auto_test/primitives/framedrop_primitives_unittest.cc b/webrtc/video_engine/test/auto_test/primitives/framedrop_primitives_unittest.cc index 5edd4a3c57..c1501e5a41 100644 --- a/webrtc/video_engine/test/auto_test/primitives/framedrop_primitives_unittest.cc +++ b/webrtc/video_engine/test/auto_test/primitives/framedrop_primitives_unittest.cc @@ -10,7 +10,8 @@ #include "webrtc/video_engine/test/auto_test/primitives/framedrop_primitives.h" -#include +#include + #include #include "testing/gtest/include/gtest/gtest.h" @@ -29,11 +30,11 @@ class FrameDropPrimitivesTest: public testing::Test { virtual ~FrameDropPrimitivesTest() {} void SetUp() { // Cleanup any previous output file. - std::remove(kOutputFilename.c_str()); + remove(kOutputFilename.c_str()); } void TearDown() { // Cleanup the temporary file. - std::remove(kOutputFilename.c_str()); + remove(kOutputFilename.c_str()); } }; diff --git a/webrtc/video_engine/test/auto_test/primitives/input_helpers.cc b/webrtc/video_engine/test/auto_test/primitives/input_helpers.cc index ac63040215..b5c4ae203d 100644 --- a/webrtc/video_engine/test/auto_test/primitives/input_helpers.cc +++ b/webrtc/video_engine/test/auto_test/primitives/input_helpers.cc @@ -10,9 +10,9 @@ #include "webrtc/video_engine/test/auto_test/primitives/input_helpers.h" -#include -#include -#include +#include +#include +#include #include diff --git a/webrtc/video_engine/test/auto_test/primitives/input_helpers.h b/webrtc/video_engine/test/auto_test/primitives/input_helpers.h index 1e857d40d6..536e708a0f 100644 --- a/webrtc/video_engine/test/auto_test/primitives/input_helpers.h +++ b/webrtc/video_engine/test/auto_test/primitives/input_helpers.h @@ -11,7 +11,7 @@ #ifndef WEBRTC_VIDEO_ENGINE_TEST_AUTO_TEST_PRIMITIVES_ #define WEBRTC_VIDEO_ENGINE_TEST_AUTO_TEST_PRIMITIVES_ -#include +#include #include #include diff --git a/webrtc/video_engine/test/auto_test/source/vie_autotest_custom_call.cc b/webrtc/video_engine/test/auto_test/source/vie_autotest_custom_call.cc index b9c679d58e..cbccf6fe67 100644 --- a/webrtc/video_engine/test/auto_test/source/vie_autotest_custom_call.cc +++ b/webrtc/video_engine/test/auto_test/source/vie_autotest_custom_call.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include -#include -#include +#include +#include +#include #include diff --git a/webrtc/video_engine/test/common/frame_generator.cc b/webrtc/video_engine/test/common/frame_generator.cc index 359bbf751e..b60e9d22d9 100644 --- a/webrtc/video_engine/test/common/frame_generator.cc +++ b/webrtc/video_engine/test/common/frame_generator.cc @@ -10,8 +10,8 @@ #include "webrtc/video_engine/test/common/frame_generator.h" -#include -#include +#include +#include #include "webrtc/system_wrappers/interface/clock.h" #include "webrtc/video_engine/new_include/video_send_stream.h" diff --git a/webrtc/video_engine/test/common/gl/gl_renderer.cc b/webrtc/video_engine/test/common/gl/gl_renderer.cc index 3345fac3d5..5e229eb331 100644 --- a/webrtc/video_engine/test/common/gl/gl_renderer.cc +++ b/webrtc/video_engine/test/common/gl/gl_renderer.cc @@ -10,7 +10,7 @@ #include "webrtc/video_engine/test/common/gl/gl_renderer.h" -#include +#include #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" diff --git a/webrtc/video_engine/test/common/linux/glx_renderer.cc b/webrtc/video_engine/test/common/linux/glx_renderer.cc index 931f94e73f..312cb119a6 100644 --- a/webrtc/video_engine/test/common/linux/glx_renderer.cc +++ b/webrtc/video_engine/test/common/linux/glx_renderer.cc @@ -10,11 +10,11 @@ #include "webrtc/video_engine/test/common/linux/glx_renderer.h" +#include + #include #include -#include - #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" namespace webrtc { diff --git a/webrtc/video_engine/test/libvietest/helpers/vie_file_capture_device.cc b/webrtc/video_engine/test/libvietest/helpers/vie_file_capture_device.cc index 18d3026d02..b86ff0926a 100644 --- a/webrtc/video_engine/test/libvietest/helpers/vie_file_capture_device.cc +++ b/webrtc/video_engine/test/libvietest/helpers/vie_file_capture_device.cc @@ -55,7 +55,7 @@ bool ViEFileCaptureDevice::OpenI420File(const std::string& path, webrtc::CriticalSectionScoped cs(mutex_); assert(input_file_ == NULL); - input_file_ = std::fopen(path.c_str(), "rb"); + input_file_ = fopen(path.c_str(), "rb"); if (input_file_ == NULL) { return false; } @@ -80,10 +80,10 @@ void ViEFileCaptureDevice::ReadFileFor(uint64_t time_slice_ms, while (elapsed_ms < time_slice_ms) { FramePacemaker pacemaker(max_fps); - int read = std::fread(frame_buffer, 1, frame_length_, input_file_); + int read = fread(frame_buffer, 1, frame_length_, input_file_); - if (std::feof(input_file_)) { - std::rewind(input_file_); + if (feof(input_file_)) { + rewind(input_file_); } input_sink_->IncomingFrame(frame_buffer, read, width_, height_, webrtc::kVideoI420, @@ -101,5 +101,5 @@ void ViEFileCaptureDevice::CloseFile() { webrtc::CriticalSectionScoped cs(mutex_); assert(input_file_ != NULL); - std::fclose(input_file_); + fclose(input_file_); } diff --git a/webrtc/video_engine/test/libvietest/helpers/vie_to_file_renderer.cc b/webrtc/video_engine/test/libvietest/helpers/vie_to_file_renderer.cc index f2b334e4f2..a70d6c9149 100644 --- a/webrtc/video_engine/test/libvietest/helpers/vie_to_file_renderer.cc +++ b/webrtc/video_engine/test/libvietest/helpers/vie_to_file_renderer.cc @@ -66,7 +66,7 @@ bool ViEToFileRenderer::PrepareForRendering( assert(output_file_ == NULL); - output_file_ = std::fopen((output_path + output_filename).c_str(), "wb"); + output_file_ = fopen((output_path + output_filename).c_str(), "wb"); if (output_file_ == NULL) { return false; } @@ -86,15 +86,15 @@ void ViEToFileRenderer::StopRendering() { // Call Stop() repeatedly, waiting for ProcessRenderQueue() to finish. while (!thread_->Stop()) continue; } - std::fclose(output_file_); + fclose(output_file_); output_file_ = NULL; } bool ViEToFileRenderer::SaveOutputFile(const std::string& prefix) { assert(output_file_ == NULL && output_filename_ != ""); - if (std::rename((output_path_ + output_filename_).c_str(), + if (rename((output_path_ + output_filename_).c_str(), (output_path_ + prefix + output_filename_).c_str()) != 0) { - std::perror("Failed to rename output file"); + perror("Failed to rename output file"); return false; } ForgetOutputFile(); @@ -103,8 +103,8 @@ bool ViEToFileRenderer::SaveOutputFile(const std::string& prefix) { bool ViEToFileRenderer::DeleteOutputFile() { assert(output_file_ == NULL && output_filename_ != ""); - if (std::remove((output_path_ + output_filename_).c_str()) != 0) { - std::perror("Failed to delete output file"); + if (remove((output_path_ + output_filename_).c_str()) != 0) { + perror("Failed to delete output file"); return false; } ForgetOutputFile(); @@ -170,7 +170,7 @@ bool ViEToFileRenderer::ProcessRenderQueue() { // the renderer. frame_queue_cs_->Leave(); assert(output_file_); - int written = std::fwrite(frame->buffer.get(), sizeof(unsigned char), + int written = fwrite(frame->buffer.get(), sizeof(unsigned char), frame->buffer_size, output_file_); frame_queue_cs_->Enter(); // Return the frame. diff --git a/webrtc/video_engine/test/libvietest/include/vie_file_capture_device.h b/webrtc/video_engine/test/libvietest/include/vie_file_capture_device.h index 86534abadb..2abd88c41c 100644 --- a/webrtc/video_engine/test/libvietest/include/vie_file_capture_device.h +++ b/webrtc/video_engine/test/libvietest/include/vie_file_capture_device.h @@ -11,7 +11,7 @@ #ifndef SRC_VIDEO_ENGINE_MAIN_TEST_AUTOTEST_HELPERS_VIE_FILE_CAPTURE_DEVICE_H_ #define SRC_VIDEO_ENGINE_MAIN_TEST_AUTOTEST_HELPERS_VIE_FILE_CAPTURE_DEVICE_H_ -#include +#include #include @@ -46,7 +46,7 @@ class ViEFileCaptureDevice { private: webrtc::ViEExternalCapture* input_sink_; - std::FILE* input_file_; + FILE* input_file_; webrtc::CriticalSectionWrapper* mutex_; uint32_t frame_length_; diff --git a/webrtc/video_engine/test/libvietest/include/vie_to_file_renderer.h b/webrtc/video_engine/test/libvietest/include/vie_to_file_renderer.h index 6b04d22eba..32ee1c12dc 100644 --- a/webrtc/video_engine/test/libvietest/include/vie_to_file_renderer.h +++ b/webrtc/video_engine/test/libvietest/include/vie_to_file_renderer.h @@ -11,8 +11,9 @@ #ifndef WEBRTC_VIDEO_ENGINE_TEST_LIBVIETEST_INCLUDE_VIE_TO_FILE_RENDERER_H_ #define WEBRTC_VIDEO_ENGINE_TEST_LIBVIETEST_INCLUDE_VIE_TO_FILE_RENDERER_H_ -#include -#include +#include +#include + #include #include @@ -70,7 +71,7 @@ class ViEToFileRenderer: public webrtc::ExternalRenderer { void ForgetOutputFile(); bool ProcessRenderQueue(); - std::FILE* output_file_; + FILE* output_file_; std::string output_path_; std::string output_filename_; webrtc::scoped_ptr thread_; diff --git a/webrtc/video_engine/test/libvietest/testbed/tb_external_transport.cc b/webrtc/video_engine/test/libvietest/testbed/tb_external_transport.cc index 5bdf81cf72..f26c1e1e90 100644 --- a/webrtc/video_engine/test/libvietest/testbed/tb_external_transport.cc +++ b/webrtc/video_engine/test/libvietest/testbed/tb_external_transport.cc @@ -10,7 +10,8 @@ #include "webrtc/video_engine/test/libvietest/include/tb_external_transport.h" -#include +#include + #include #include // printf #include // rand @@ -19,7 +20,7 @@ #include #endif #if defined(WEBRTC_MAC) -#include +#include #endif #include "webrtc/system_wrappers/interface/critical_section_wrapper.h" diff --git a/webrtc/video_engine/test/loopback.cc b/webrtc/video_engine/test/loopback.cc index b298b1af55..5dae857310 100644 --- a/webrtc/video_engine/test/loopback.cc +++ b/webrtc/video_engine/test/loopback.cc @@ -8,7 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include +#include + #include #include "testing/gtest/include/gtest/gtest.h" diff --git a/webrtc/video_engine/vie_encoder.cc b/webrtc/video_engine/vie_encoder.cc index 206a718dad..af82de321b 100644 --- a/webrtc/video_engine/vie_encoder.cc +++ b/webrtc/video_engine/vie_encoder.cc @@ -10,8 +10,9 @@ #include "webrtc/video_engine/vie_encoder.h" +#include + #include -#include #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" #include "webrtc/modules/pacing/include/paced_sender.h" diff --git a/webrtc/video_engine/vie_input_manager.cc b/webrtc/video_engine/vie_input_manager.cc index 76478116d7..b1f28aea5c 100644 --- a/webrtc/video_engine/vie_input_manager.cc +++ b/webrtc/video_engine/vie_input_manager.cc @@ -10,7 +10,7 @@ #include "webrtc/video_engine/vie_input_manager.h" -#include +#include #include "webrtc/common_types.h" #include "webrtc/modules/video_capture/include/video_capture_factory.h" diff --git a/webrtc/video_engine/vie_remb.cc b/webrtc/video_engine/vie_remb.cc index 4b6f234436..578c0b4795 100644 --- a/webrtc/video_engine/vie_remb.cc +++ b/webrtc/video_engine/vie_remb.cc @@ -10,8 +10,9 @@ #include "webrtc/video_engine/vie_remb.h" +#include + #include -#include #include "webrtc/modules/rtp_rtcp/interface/rtp_rtcp.h" #include "webrtc/modules/utility/interface/process_thread.h" diff --git a/webrtc/video_engine/vie_sender.cc b/webrtc/video_engine/vie_sender.cc index f28e86551b..b90d56f29a 100644 --- a/webrtc/video_engine/vie_sender.cc +++ b/webrtc/video_engine/vie_sender.cc @@ -10,7 +10,7 @@ #include "webrtc/video_engine/vie_sender.h" -#include +#include #include "webrtc/modules/utility/interface/rtp_dump.h" #include "webrtc/system_wrappers/interface/critical_section_wrapper.h" diff --git a/webrtc/voice_engine/channel_manager_base.cc b/webrtc/voice_engine/channel_manager_base.cc index 440a0ea98f..10cb11f7ab 100644 --- a/webrtc/voice_engine/channel_manager_base.cc +++ b/webrtc/voice_engine/channel_manager_base.cc @@ -10,7 +10,8 @@ #include "webrtc/voice_engine/channel_manager_base.h" -#include +#include + #include "webrtc/system_wrappers/interface/critical_section_wrapper.h" #include "webrtc/system_wrappers/interface/rw_lock_wrapper.h" diff --git a/webrtc/voice_engine/dtmf_inband.cc b/webrtc/voice_engine/dtmf_inband.cc index ee9eb9f2e8..7ae24db22d 100644 --- a/webrtc/voice_engine/dtmf_inband.cc +++ b/webrtc/voice_engine/dtmf_inband.cc @@ -10,7 +10,8 @@ #include "webrtc/voice_engine/dtmf_inband.h" -#include +#include + #include "webrtc/system_wrappers/interface/critical_section_wrapper.h" #include "webrtc/system_wrappers/interface/trace.h" diff --git a/webrtc/voice_engine/statistics.cc b/webrtc/voice_engine/statistics.cc index a1faae747f..4717fd1391 100644 --- a/webrtc/voice_engine/statistics.cc +++ b/webrtc/voice_engine/statistics.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include +#include #include #include "webrtc/voice_engine/statistics.h" diff --git a/webrtc/voice_engine/test/auto_test/fakes/fake_media_process.h b/webrtc/voice_engine/test/auto_test/fakes/fake_media_process.h index 7e053fb312..3e1345af54 100644 --- a/webrtc/voice_engine/test/auto_test/fakes/fake_media_process.h +++ b/webrtc/voice_engine/test/auto_test/fakes/fake_media_process.h @@ -10,7 +10,7 @@ #ifndef VOICE_ENGINE_MAIN_TEST_AUTO_TEST_FAKE_MEDIA_PROCESS_H_ #define VOICE_ENGINE_MAIN_TEST_AUTO_TEST_FAKE_MEDIA_PROCESS_H_ -#include +#include class FakeMediaProcess : public webrtc::VoEMediaProcess { public: diff --git a/webrtc/voice_engine/test/auto_test/fixtures/after_streaming_fixture.cc b/webrtc/voice_engine/test/auto_test/fixtures/after_streaming_fixture.cc index 677dea6139..8cd489425d 100644 --- a/webrtc/voice_engine/test/auto_test/fixtures/after_streaming_fixture.cc +++ b/webrtc/voice_engine/test/auto_test/fixtures/after_streaming_fixture.cc @@ -10,7 +10,7 @@ #include "webrtc/voice_engine/test/auto_test/fixtures/after_streaming_fixture.h" -#include +#include AfterStreamingFixture::AfterStreamingFixture() : channel_(voe_base_->CreateChannel()) { diff --git a/webrtc/voice_engine/test/auto_test/fuzz/rtp_fuzz_test.cc b/webrtc/voice_engine/test/auto_test/fuzz/rtp_fuzz_test.cc index dab693f702..bf68da1d07 100644 --- a/webrtc/voice_engine/test/auto_test/fuzz/rtp_fuzz_test.cc +++ b/webrtc/voice_engine/test/auto_test/fuzz/rtp_fuzz_test.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include +#include #include "webrtc/test/libtest/include/bit_flip_encryption.h" #include "webrtc/voice_engine/test/auto_test/fixtures/after_streaming_fixture.h" @@ -16,7 +16,7 @@ class RtpFuzzTest : public AfterStreamingFixture { protected: void BitFlipFuzzTest(float flip_probability) { - BitFlipEncryption bit_flip_encryption(std::time(NULL), flip_probability); + BitFlipEncryption bit_flip_encryption(time(NULL), flip_probability); TEST_LOG("Starting to flip bits in RTP/RTCP packets.\n"); voe_encrypt_->RegisterExternalEncryption(channel_, bit_flip_encryption); diff --git a/webrtc/voice_engine/test/auto_test/standard/hardware_before_streaming_test.cc b/webrtc/voice_engine/test/auto_test/standard/hardware_before_streaming_test.cc index 95d4c33ec1..2fd34e7d5e 100644 --- a/webrtc/voice_engine/test/auto_test/standard/hardware_before_streaming_test.cc +++ b/webrtc/voice_engine/test/auto_test/standard/hardware_before_streaming_test.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include +#include #include "webrtc/voice_engine/test/auto_test/fixtures/after_initialization_fixture.h" diff --git a/webrtc/voice_engine/test/auto_test/standard/video_sync_test.cc b/webrtc/voice_engine/test/auto_test/standard/video_sync_test.cc index 2bf9095106..2d99fb0f38 100644 --- a/webrtc/voice_engine/test/auto_test/standard/video_sync_test.cc +++ b/webrtc/voice_engine/test/auto_test/standard/video_sync_test.cc @@ -8,7 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include +#include + #include #include @@ -66,7 +67,7 @@ class VideoSyncTest : public AfterStreamingFixture { for (; start != end; ++start) { variance += (*start - mean) * (*start - mean) / (num_elements - 1); } - return std::sqrt(variance); + return sqrt(variance); } }; diff --git a/webrtc/voice_engine/test/auto_test/standard/voe_base_misc_test.cc b/webrtc/voice_engine/test/auto_test/standard/voe_base_misc_test.cc index 5d11af3c96..8d8713c8f8 100644 --- a/webrtc/voice_engine/test/auto_test/standard/voe_base_misc_test.cc +++ b/webrtc/voice_engine/test/auto_test/standard/voe_base_misc_test.cc @@ -10,7 +10,7 @@ #include "webrtc/voice_engine/test/auto_test/fixtures/before_initialization_fixture.h" -#include +#include class VoeBaseMiscTest : public BeforeInitializationFixture { }; diff --git a/webrtc/voice_engine/voe_hardware_impl.cc b/webrtc/voice_engine/voe_hardware_impl.cc index 5a293fc1d1..f4550fcc12 100644 --- a/webrtc/voice_engine/voe_hardware_impl.cc +++ b/webrtc/voice_engine/voe_hardware_impl.cc @@ -10,7 +10,7 @@ #include "webrtc/voice_engine/voe_hardware_impl.h" -#include +#include #include "webrtc/system_wrappers/interface/critical_section_wrapper.h" #include "webrtc/system_wrappers/interface/trace.h"