From a4407329d4e16eab3d2e87cde0824188c06acb5a Mon Sep 17 00:00:00 2001 From: "pbos@webrtc.org" Date: Tue, 16 Jul 2013 12:32:05 +0000 Subject: [PATCH] Include files from webrtc/.. paths in video_coding/. BUG=1662 R=tommi@webrtc.org Review URL: https://webrtc-codereview.appspot.com/1783006 git-svn-id: http://webrtc.googlecode.com/svn/trunk@4348 4adac7df-926f-26a2-2b94-8c16560cd09d --- .../codecs/i420/main/source/i420.cc | 6 ++--- .../mock/mock_video_codec_interface.h | 6 ++--- .../codecs/interface/video_codec_interface.h | 12 +++++----- .../test/mock/mock_packet_manipulator.h | 8 +++---- .../codecs/test/packet_manipulator.cc | 2 +- .../codecs/test/packet_manipulator.h | 6 ++--- .../test/packet_manipulator_unittest.cc | 12 +++++----- .../test/predictive_packet_manipulator.cc | 4 ++-- .../test/predictive_packet_manipulator.h | 4 ++-- .../modules/video_coding/codecs/test/stats.cc | 2 +- .../modules/video_coding/codecs/test/stats.h | 2 +- .../codecs/test/stats_unittest.cc | 6 ++--- .../codecs/test/videoprocessor.cc | 4 ++-- .../video_coding/codecs/test/videoprocessor.h | 18 +++++++------- .../test/videoprocessor_integrationtest.cc | 2 +- .../codecs/test/videoprocessor_unittest.cc | 22 ++++++++--------- .../codecs/test_framework/benchmark.cc | 13 +++++----- .../codecs/test_framework/benchmark.h | 3 +-- .../test_framework/normal_async_test.cc | 14 +++++------ .../codecs/test_framework/normal_async_test.h | 6 ++--- .../codecs/test_framework/normal_test.cc | 10 ++++---- .../codecs/test_framework/normal_test.h | 3 +-- .../codecs/test_framework/packet_loss_test.cc | 6 ++--- .../codecs/test_framework/packet_loss_test.h | 2 +- .../codecs/test_framework/test.cc | 6 ++--- .../video_coding/codecs/test_framework/test.h | 8 +++---- .../codecs/test_framework/unit_test.cc | 10 ++++---- .../codecs/test_framework/unit_test.h | 5 ++-- .../codecs/test_framework/video_source.cc | 6 ++--- .../codecs/test_framework/video_source.h | 3 +-- .../codecs/tools/video_quality_measurement.cc | 24 +++++++++---------- .../codecs/vp8/default_temporal_layers.cc | 7 +++--- .../vp8/default_temporal_layers_unittest.cc | 6 ++--- .../video_coding/codecs/vp8/include/vp8.h | 2 +- .../codecs/vp8/include/vp8_common_types.h | 2 +- .../codecs/vp8/reference_picture_selection.cc | 8 +++---- .../codecs/vp8/reference_picture_selection.h | 2 +- .../reference_picture_selection_unittest.cc | 8 +++---- .../video_coding/codecs/vp8/temporal_layers.h | 1 - .../codecs/vp8/test/vp8_impl_unittest.cc | 6 ++--- .../video_coding/codecs/vp8/vp8_impl.cc | 8 +++---- .../video_coding/codecs/vp8/vp8_impl.h | 2 +- .../codecs/vp8/vp8_sequence_coder.cc | 2 +- .../main/interface/mock/mock_vcm_callbacks.h | 2 +- .../main/interface/video_coding_defines.h | 6 ++--- .../video_coding/main/source/codec_database.h | 12 +++++----- .../video_coding/main/source/codec_timer.cc | 2 +- .../video_coding/main/source/codec_timer.h | 4 ++-- .../main/source/content_metrics_processing.cc | 6 ++--- .../main/source/content_metrics_processing.h | 2 +- .../main/source/decoding_state.cc | 10 ++++---- .../video_coding/main/source/decoding_state.h | 2 +- .../main/source/decoding_state_unittest.cc | 12 +++++----- .../video_coding/main/source/encoded_frame.cc | 8 +++---- .../video_coding/main/source/encoded_frame.h | 10 ++++---- .../video_coding/main/source/frame_buffer.cc | 4 ++-- .../video_coding/main/source/frame_buffer.h | 10 ++++---- .../main/source/generic_decoder.cc | 10 ++++---- .../main/source/generic_decoder.h | 10 ++++---- .../main/source/generic_encoder.cc | 8 +++---- .../main/source/generic_encoder.h | 2 +- .../main/source/inter_frame_delay.cc | 2 +- .../main/source/inter_frame_delay.h | 2 +- .../main/source/internal_defines.h | 2 +- .../main/source/jitter_estimator.cc | 8 +++---- .../main/source/jitter_estimator.h | 4 ++-- .../main/source/media_opt_util.cc | 16 ++++++------- .../video_coding/main/source/media_opt_util.h | 2 +- .../main/source/media_optimization.cc | 2 +- .../main/source/media_optimization.h | 10 ++++---- .../video_coding/main/source/packet.cc | 4 ++-- .../modules/video_coding/main/source/packet.h | 6 ++--- .../video_coding/main/source/qm_select.cc | 12 +++++----- .../video_coding/main/source/qm_select.h | 5 ++-- .../video_coding/main/source/qm_select_data.h | 3 +-- .../main/source/qm_select_unittest.cc | 6 ++--- .../video_coding/main/source/receiver.h | 2 +- .../main/source/receiver_unittest.cc | 4 ++-- .../video_coding/main/source/rtt_filter.cc | 6 ++--- .../video_coding/main/source/rtt_filter.h | 2 +- .../video_coding/main/source/session_info.cc | 4 ++-- .../video_coding/main/source/session_info.h | 6 ++--- .../main/source/session_info_unittest.cc | 8 +++---- .../main/source/timestamp_extrapolator.cc | 6 ++--- .../main/source/timestamp_extrapolator.h | 4 ++-- .../video_coding/main/source/timestamp_map.cc | 4 ++-- .../video_coding/main/source/timestamp_map.h | 2 +- .../main/source/timing_unittest.cc | 4 ++-- .../main/source/video_coding_impl.cc | 16 ++++++------- .../main/source/video_coding_impl.h | 2 +- .../video_coding_robustness_unittest.cc | 2 +- .../main/test/codec_database_test.h | 4 ++-- .../main/test/decode_from_storage_test.cc | 1 + .../main/test/generic_codec_test.h | 8 +++---- .../video_coding/main/test/media_opt_test.cc | 2 +- .../video_coding/main/test/media_opt_test.h | 12 +++++----- .../video_coding/main/test/mt_rx_tx_test.cc | 1 - .../video_coding/main/test/mt_test_common.h | 8 +++---- .../video_coding/main/test/normal_test.h | 5 ++-- .../main/test/quality_modes_test.cc | 4 ++-- .../main/test/quality_modes_test.h | 8 +++---- .../video_coding/main/test/receiver_tests.h | 15 ++++++------ .../video_coding/main/test/test_callbacks.h | 12 +++++----- .../video_coding/main/test/test_util.h | 2 +- .../video_coding/main/test/tester_main.cc | 6 ++--- .../video_coding/main/test/video_source.cc | 4 ++-- .../video_coding/main/test/video_source.h | 5 ++-- .../utility/include/mock/mock_frame_dropper.h | 2 +- 108 files changed, 328 insertions(+), 336 deletions(-) diff --git a/webrtc/modules/video_coding/codecs/i420/main/source/i420.cc b/webrtc/modules/video_coding/codecs/i420/main/source/i420.cc index 44603b465..69cc9e2ba 100644 --- a/webrtc/modules/video_coding/codecs/i420/main/source/i420.cc +++ b/webrtc/modules/video_coding/codecs/i420/main/source/i420.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "modules/video_coding/codecs/i420/main/interface/i420.h" +#include "webrtc/modules/video_coding/codecs/i420/main/interface/i420.h" -#include #include +#include -#include "common_video/libyuv/include/webrtc_libyuv.h" +#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/codecs/interface/mock/mock_video_codec_interface.h b/webrtc/modules/video_coding/codecs/interface/mock/mock_video_codec_interface.h index fa145b8fe..69e99ae4b 100644 --- a/webrtc/modules/video_coding/codecs/interface/mock/mock_video_codec_interface.h +++ b/webrtc/modules/video_coding/codecs/interface/mock/mock_video_codec_interface.h @@ -13,9 +13,9 @@ #include -#include "gmock/gmock.h" -#include "modules/video_coding/codecs/interface/video_codec_interface.h" -#include "typedefs.h" +#include "testing/gmock/include/gmock/gmock.h" +#include "webrtc/modules/video_coding/codecs/interface/video_codec_interface.h" +#include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/codecs/interface/video_codec_interface.h b/webrtc/modules/video_coding/codecs/interface/video_codec_interface.h index f80d21e90..f3bee5e85 100644 --- a/webrtc/modules/video_coding/codecs/interface/video_codec_interface.h +++ b/webrtc/modules/video_coding/codecs/interface/video_codec_interface.h @@ -13,13 +13,13 @@ #include -#include "common_types.h" -#include "common_video/interface/i420_video_frame.h" -#include "modules/interface/module_common_types.h" -#include "modules/video_coding/codecs/interface/video_error_codes.h" -#include "common_video/interface/video_image.h" +#include "webrtc/common_types.h" +#include "webrtc/common_video/interface/i420_video_frame.h" +#include "webrtc/common_video/interface/video_image.h" +#include "webrtc/modules/interface/module_common_types.h" +#include "webrtc/modules/video_coding/codecs/interface/video_error_codes.h" -#include "typedefs.h" +#include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/codecs/test/mock/mock_packet_manipulator.h b/webrtc/modules/video_coding/codecs/test/mock/mock_packet_manipulator.h index 57d21ca1f..75fe63fe5 100644 --- a/webrtc/modules/video_coding/codecs/test/mock/mock_packet_manipulator.h +++ b/webrtc/modules/video_coding/codecs/test/mock/mock_packet_manipulator.h @@ -11,13 +11,13 @@ #ifndef WEBRTC_MODULES_VIDEO_CODING_CODECS_TEST_MOCK_MOCK_PACKET_MANIPULATOR_H_ #define WEBRTC_MODULES_VIDEO_CODING_CODECS_TEST_MOCK_MOCK_PACKET_MANIPULATOR_H_ -#include "modules/video_coding/codecs/test/packet_manipulator.h" +#include "webrtc/modules/video_coding/codecs/test/packet_manipulator.h" #include -#include "common_video/interface/video_image.h" -#include "gmock/gmock.h" -#include "typedefs.h" +#include "testing/gmock/include/gmock/gmock.h" +#include "webrtc/common_video/interface/video_image.h" +#include "webrtc/typedefs.h" namespace webrtc { namespace test { diff --git a/webrtc/modules/video_coding/codecs/test/packet_manipulator.cc b/webrtc/modules/video_coding/codecs/test/packet_manipulator.cc index 7ac4c0aea..cff3ac7df 100644 --- a/webrtc/modules/video_coding/codecs/test/packet_manipulator.cc +++ b/webrtc/modules/video_coding/codecs/test/packet_manipulator.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "modules/video_coding/codecs/test/packet_manipulator.h" +#include "webrtc/modules/video_coding/codecs/test/packet_manipulator.h" #include #include diff --git a/webrtc/modules/video_coding/codecs/test/packet_manipulator.h b/webrtc/modules/video_coding/codecs/test/packet_manipulator.h index e3891cbee..c586de091 100644 --- a/webrtc/modules/video_coding/codecs/test/packet_manipulator.h +++ b/webrtc/modules/video_coding/codecs/test/packet_manipulator.h @@ -13,9 +13,9 @@ #include -#include "modules/video_coding/codecs/interface/video_codec_interface.h" -#include "system_wrappers/interface/critical_section_wrapper.h" -#include "testsupport/packet_reader.h" +#include "webrtc/modules/video_coding/codecs/interface/video_codec_interface.h" +#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" +#include "webrtc/test/testsupport/packet_reader.h" namespace webrtc { namespace test { diff --git a/webrtc/modules/video_coding/codecs/test/packet_manipulator_unittest.cc b/webrtc/modules/video_coding/codecs/test/packet_manipulator_unittest.cc index cb95f54f2..576d00570 100644 --- a/webrtc/modules/video_coding/codecs/test/packet_manipulator_unittest.cc +++ b/webrtc/modules/video_coding/codecs/test/packet_manipulator_unittest.cc @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "modules/video_coding/codecs/test/packet_manipulator.h" +#include "webrtc/modules/video_coding/codecs/test/packet_manipulator.h" #include -#include "gtest/gtest.h" -#include "modules/video_coding/codecs/interface/video_codec_interface.h" -#include "modules/video_coding/codecs/test/predictive_packet_manipulator.h" -#include "testsupport/unittest_utils.h" -#include "typedefs.h" +#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/modules/video_coding/codecs/interface/video_codec_interface.h" +#include "webrtc/modules/video_coding/codecs/test/predictive_packet_manipulator.h" +#include "webrtc/test/testsupport/unittest_utils.h" +#include "webrtc/typedefs.h" namespace webrtc { namespace test { 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 566837841..03920ff8f 100644 --- a/webrtc/modules/video_coding/codecs/test/predictive_packet_manipulator.cc +++ b/webrtc/modules/video_coding/codecs/test/predictive_packet_manipulator.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "modules/video_coding/codecs/test/predictive_packet_manipulator.h" +#include "webrtc/modules/video_coding/codecs/test/predictive_packet_manipulator.h" #include #include -#include "testsupport/packet_reader.h" +#include "webrtc/test/testsupport/packet_reader.h" namespace webrtc { namespace test { diff --git a/webrtc/modules/video_coding/codecs/test/predictive_packet_manipulator.h b/webrtc/modules/video_coding/codecs/test/predictive_packet_manipulator.h index 22a0ce94f..3b895cc92 100644 --- a/webrtc/modules/video_coding/codecs/test/predictive_packet_manipulator.h +++ b/webrtc/modules/video_coding/codecs/test/predictive_packet_manipulator.h @@ -13,8 +13,8 @@ #include -#include "modules/video_coding/codecs/test/packet_manipulator.h" -#include "testsupport/packet_reader.h" +#include "webrtc/modules/video_coding/codecs/test/packet_manipulator.h" +#include "webrtc/test/testsupport/packet_reader.h" namespace webrtc { namespace test { diff --git a/webrtc/modules/video_coding/codecs/test/stats.cc b/webrtc/modules/video_coding/codecs/test/stats.cc index e9c943873..b85e65967 100644 --- a/webrtc/modules/video_coding/codecs/test/stats.cc +++ b/webrtc/modules/video_coding/codecs/test/stats.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "modules/video_coding/codecs/test/stats.h" +#include "webrtc/modules/video_coding/codecs/test/stats.h" #include // min_element, max_element #include diff --git a/webrtc/modules/video_coding/codecs/test/stats.h b/webrtc/modules/video_coding/codecs/test/stats.h index ec2bb9d53..464535d20 100644 --- a/webrtc/modules/video_coding/codecs/test/stats.h +++ b/webrtc/modules/video_coding/codecs/test/stats.h @@ -13,7 +13,7 @@ #include -#include "common_video/interface/video_image.h" +#include "webrtc/common_video/interface/video_image.h" namespace webrtc { namespace test { diff --git a/webrtc/modules/video_coding/codecs/test/stats_unittest.cc b/webrtc/modules/video_coding/codecs/test/stats_unittest.cc index 53a50d751..a2d27e71d 100644 --- a/webrtc/modules/video_coding/codecs/test/stats_unittest.cc +++ b/webrtc/modules/video_coding/codecs/test/stats_unittest.cc @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "modules/video_coding/codecs/test/stats.h" +#include "webrtc/modules/video_coding/codecs/test/stats.h" -#include "gtest/gtest.h" -#include "typedefs.h" +#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/typedefs.h" 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 2cea66c71..a68845aa1 100644 --- a/webrtc/modules/video_coding/codecs/test/videoprocessor.cc +++ b/webrtc/modules/video_coding/codecs/test/videoprocessor.cc @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "modules/video_coding/codecs/test/videoprocessor.h" +#include "webrtc/modules/video_coding/codecs/test/videoprocessor.h" #include #include #include #include -#include "system_wrappers/interface/cpu_info.h" +#include "webrtc/system_wrappers/interface/cpu_info.h" namespace webrtc { namespace test { diff --git a/webrtc/modules/video_coding/codecs/test/videoprocessor.h b/webrtc/modules/video_coding/codecs/test/videoprocessor.h index 07f63bcb7..1b5c502fc 100644 --- a/webrtc/modules/video_coding/codecs/test/videoprocessor.h +++ b/webrtc/modules/video_coding/codecs/test/videoprocessor.h @@ -13,15 +13,15 @@ #include -#include "common_video/libyuv/include/webrtc_libyuv.h" -#include "common_video/libyuv/include/scaler.h" -#include "common_video/interface/i420_video_frame.h" -#include "modules/video_coding/codecs/interface/video_codec_interface.h" -#include "modules/video_coding/codecs/test/packet_manipulator.h" -#include "modules/video_coding/codecs/test/stats.h" -#include "system_wrappers/interface/tick_util.h" -#include "testsupport/frame_reader.h" -#include "testsupport/frame_writer.h" +#include "webrtc/common_video/interface/i420_video_frame.h" +#include "webrtc/common_video/libyuv/include/scaler.h" +#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" +#include "webrtc/modules/video_coding/codecs/interface/video_codec_interface.h" +#include "webrtc/modules/video_coding/codecs/test/packet_manipulator.h" +#include "webrtc/modules/video_coding/codecs/test/stats.h" +#include "webrtc/system_wrappers/interface/tick_util.h" +#include "webrtc/test/testsupport/frame_reader.h" +#include "webrtc/test/testsupport/frame_writer.h" namespace webrtc { namespace test { diff --git a/webrtc/modules/video_coding/codecs/test/videoprocessor_integrationtest.cc b/webrtc/modules/video_coding/codecs/test/videoprocessor_integrationtest.cc index 3ae18bd33..ca27b421e 100644 --- a/webrtc/modules/video_coding/codecs/test/videoprocessor_integrationtest.cc +++ b/webrtc/modules/video_coding/codecs/test/videoprocessor_integrationtest.cc @@ -10,7 +10,7 @@ #include -#include "gtest/gtest.h" +#include "testing/gtest/include/gtest/gtest.h" #include "webrtc/modules/video_coding/codecs/interface/video_codec_interface.h" #include "webrtc/modules/video_coding/codecs/test/packet_manipulator.h" diff --git a/webrtc/modules/video_coding/codecs/test/videoprocessor_unittest.cc b/webrtc/modules/video_coding/codecs/test/videoprocessor_unittest.cc index d0cd2c9dc..88b5467f1 100644 --- a/webrtc/modules/video_coding/codecs/test/videoprocessor_unittest.cc +++ b/webrtc/modules/video_coding/codecs/test/videoprocessor_unittest.cc @@ -8,17 +8,17 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "gtest/gtest.h" -#include "gmock/gmock.h" -#include "modules/video_coding/codecs/test/mock/mock_packet_manipulator.h" -#include "modules/video_coding/codecs/test/videoprocessor.h" -#include "modules/video_coding/codecs/interface/mock/mock_video_codec_interface.h" -#include "modules/video_coding/main/interface/video_coding.h" -#include "testsupport/mock/mock_frame_reader.h" -#include "testsupport/mock/mock_frame_writer.h" -#include "testsupport/packet_reader.h" -#include "testsupport/unittest_utils.h" -#include "typedefs.h" +#include "testing/gmock/include/gmock/gmock.h" +#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/modules/video_coding/codecs/interface/mock/mock_video_codec_interface.h" +#include "webrtc/modules/video_coding/codecs/test/mock/mock_packet_manipulator.h" +#include "webrtc/modules/video_coding/codecs/test/videoprocessor.h" +#include "webrtc/modules/video_coding/main/interface/video_coding.h" +#include "webrtc/test/testsupport/mock/mock_frame_reader.h" +#include "webrtc/test/testsupport/mock/mock_frame_writer.h" +#include "webrtc/test/testsupport/packet_reader.h" +#include "webrtc/test/testsupport/unittest_utils.h" +#include "webrtc/typedefs.h" using ::testing::_; using ::testing::AtLeast; diff --git a/webrtc/modules/video_coding/codecs/test_framework/benchmark.cc b/webrtc/modules/video_coding/codecs/test_framework/benchmark.cc index 1d714e6e0..1118937c6 100644 --- a/webrtc/modules/video_coding/codecs/test_framework/benchmark.cc +++ b/webrtc/modules/video_coding/codecs/test_framework/benchmark.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "benchmark.h" +#include "webrtc/modules/video_coding/codecs/test_framework/benchmark.h" #include #include @@ -18,11 +18,11 @@ #include #endif -#include "common_video/libyuv/include/webrtc_libyuv.h" -#include "system_wrappers/interface/event_wrapper.h" -#include "modules/video_coding/codecs/test_framework/video_source.h" -#include "testsupport/fileutils.h" -#include "testsupport/metrics/video_metrics.h" +#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" +#include "webrtc/modules/video_coding/codecs/test_framework/video_source.h" +#include "webrtc/system_wrappers/interface/event_wrapper.h" +#include "webrtc/test/testsupport/fileutils.h" +#include "webrtc/test/testsupport/metrics/video_metrics.h" #define SSIM_CALC 0 // by default, don't compute SSIM @@ -301,4 +301,3 @@ Benchmark::CodecSpecific_InitBitrate() _encoder->SetRates(_bitRate, _inst.maxFramerate); } } - diff --git a/webrtc/modules/video_coding/codecs/test_framework/benchmark.h b/webrtc/modules/video_coding/codecs/test_framework/benchmark.h index 57806e59f..4bad98971 100644 --- a/webrtc/modules/video_coding/codecs/test_framework/benchmark.h +++ b/webrtc/modules/video_coding/codecs/test_framework/benchmark.h @@ -11,7 +11,7 @@ #ifndef WEBRTC_MODULES_VIDEO_CODING_CODECS_TEST_FRAWEWORK_BENCHMARK_H_ #define WEBRTC_MODULES_VIDEO_CODING_CODECS_TEST_FRAWEWORK_BENCHMARK_H_ -#include "normal_async_test.h" +#include "webrtc/modules/video_coding/codecs/test_framework/normal_async_test.h" class VideoSource; @@ -37,4 +37,3 @@ protected: }; #endif // WEBRTC_MODULES_VIDEO_CODING_CODECS_TEST_FRAWEWORK_BENCHMARK_H_ - diff --git a/webrtc/modules/video_coding/codecs/test_framework/normal_async_test.cc b/webrtc/modules/video_coding/codecs/test_framework/normal_async_test.cc index 917063dc6..9eda36e84 100644 --- a/webrtc/modules/video_coding/codecs/test_framework/normal_async_test.cc +++ b/webrtc/modules/video_coding/codecs/test_framework/normal_async_test.cc @@ -8,19 +8,19 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "normal_async_test.h" +#include "webrtc/modules/video_coding/codecs/test_framework/normal_async_test.h" #include -#include #include #include +#include #include -#include "common_video/libyuv/include/webrtc_libyuv.h" -#include "gtest/gtest.h" -#include "tick_util.h" -#include "testsupport/fileutils.h" -#include "typedefs.h" +#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" +#include "webrtc/system_wrappers/interface/tick_util.h" +#include "webrtc/test/testsupport/fileutils.h" +#include "webrtc/typedefs.h" using namespace webrtc; diff --git a/webrtc/modules/video_coding/codecs/test_framework/normal_async_test.h b/webrtc/modules/video_coding/codecs/test_framework/normal_async_test.h index 4bd983dcc..d2d17eebc 100644 --- a/webrtc/modules/video_coding/codecs/test_framework/normal_async_test.h +++ b/webrtc/modules/video_coding/codecs/test_framework/normal_async_test.h @@ -11,13 +11,13 @@ #ifndef WEBRTC_MODULES_VIDEO_CODING_CODECS_TEST_FRAMEWORK_NORMAL_ASYNC_TEST_H_ #define WEBRTC_MODULES_VIDEO_CODING_CODECS_TEST_FRAMEWORK_NORMAL_ASYNC_TEST_H_ -#include "common_types.h" +#include "webrtc/common_types.h" -#include "normal_test.h" -#include "rw_lock_wrapper.h" #include #include #include +#include "webrtc/modules/video_coding/codecs/test_framework/normal_test.h" +#include "webrtc/system_wrappers/interface/rw_lock_wrapper.h" class FrameQueueTuple { diff --git a/webrtc/modules/video_coding/codecs/test_framework/normal_test.cc b/webrtc/modules/video_coding/codecs/test_framework/normal_test.cc index 043478dea..7fa844d75 100644 --- a/webrtc/modules/video_coding/codecs/test_framework/normal_test.cc +++ b/webrtc/modules/video_coding/codecs/test_framework/normal_test.cc @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "normal_test.h" +#include "webrtc/modules/video_coding/codecs/test_framework/normal_test.h" -#include #include #include +#include -#include "common_video/libyuv/include/webrtc_libyuv.h" -#include "gtest/gtest.h" -#include "testsupport/fileutils.h" +#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" +#include "webrtc/test/testsupport/fileutils.h" NormalTest::NormalTest() : diff --git a/webrtc/modules/video_coding/codecs/test_framework/normal_test.h b/webrtc/modules/video_coding/codecs/test_framework/normal_test.h index 22166bb3b..ce73ae6c7 100644 --- a/webrtc/modules/video_coding/codecs/test_framework/normal_test.h +++ b/webrtc/modules/video_coding/codecs/test_framework/normal_test.h @@ -11,7 +11,7 @@ #ifndef WEBRTC_MODULES_VIDEO_CODING_CODECS_TEST_FRAMEWORK_NORMAL_TEST_H_ #define WEBRTC_MODULES_VIDEO_CODING_CODECS_TEST_FRAMEWORK_NORMAL_TEST_H_ -#include "test.h" +#include "webrtc/modules/video_coding/codecs/test_framework/test.h" class NormalTest : public CodecTest { @@ -43,4 +43,3 @@ protected: }; #endif // WEBRTC_MODULES_VIDEO_CODING_CODECS_TEST_FRAMEWORK_NORMAL_TEST_H_ - 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 0bbbbfa05..58e9eb8d6 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,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "packet_loss_test.h" -#include "video_source.h" -#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" using namespace webrtc; diff --git a/webrtc/modules/video_coding/codecs/test_framework/packet_loss_test.h b/webrtc/modules/video_coding/codecs/test_framework/packet_loss_test.h index 50f386b33..e917054b4 100644 --- a/webrtc/modules/video_coding/codecs/test_framework/packet_loss_test.h +++ b/webrtc/modules/video_coding/codecs/test_framework/packet_loss_test.h @@ -13,7 +13,7 @@ #include -#include "normal_async_test.h" +#include "webrtc/modules/video_coding/codecs/test_framework/normal_async_test.h" class PacketLossTest : public NormalAsyncTest { diff --git a/webrtc/modules/video_coding/codecs/test_framework/test.cc b/webrtc/modules/video_coding/codecs/test_framework/test.cc index 55a587322..1501b5f0d 100644 --- a/webrtc/modules/video_coding/codecs/test_framework/test.cc +++ b/webrtc/modules/video_coding/codecs/test_framework/test.cc @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "test.h" +#include "webrtc/modules/video_coding/codecs/test_framework/test.h" #include #include -#include "testsupport/metrics/video_metrics.h" -#include "common_video/libyuv/include/webrtc_libyuv.h" +#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" +#include "webrtc/test/testsupport/metrics/video_metrics.h" using namespace webrtc; diff --git a/webrtc/modules/video_coding/codecs/test_framework/test.h b/webrtc/modules/video_coding/codecs/test_framework/test.h index 8748864bd..69b6abaa9 100644 --- a/webrtc/modules/video_coding/codecs/test_framework/test.h +++ b/webrtc/modules/video_coding/codecs/test_framework/test.h @@ -11,11 +11,11 @@ #ifndef WEBRTC_MODULES_VIDEO_CODING_CODECS_TEST_FRAWEWORK_TEST_H_ #define WEBRTC_MODULES_VIDEO_CODING_CODECS_TEST_FRAWEWORK_TEST_H_ -#include "modules/interface/module_common_types.h" -#include "video_codec_interface.h" -#include -#include #include +#include +#include +#include "webrtc/modules/interface/module_common_types.h" +#include "webrtc/modules/video_coding/codecs/interface/video_codec_interface.h" class CodecTest { 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 f1a7e2d4e..9c9bb3be0 100644 --- a/webrtc/modules/video_coding/codecs/test_framework/unit_test.cc +++ b/webrtc/modules/video_coding/codecs/test_framework/unit_test.cc @@ -14,11 +14,11 @@ #include -#include "gtest/gtest.h" -#include "testsupport/fileutils.h" -#include "tick_util.h" -#include "unit_test.h" -#include "video_source.h" +#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" +#include "webrtc/system_wrappers/interface/tick_util.h" +#include "webrtc/test/testsupport/fileutils.h" using namespace webrtc; diff --git a/webrtc/modules/video_coding/codecs/test_framework/unit_test.h b/webrtc/modules/video_coding/codecs/test_framework/unit_test.h index 50fb6ded8..34d487853 100644 --- a/webrtc/modules/video_coding/codecs/test_framework/unit_test.h +++ b/webrtc/modules/video_coding/codecs/test_framework/unit_test.h @@ -11,8 +11,8 @@ #ifndef WEBRTC_MODULES_VIDEO_CODING_CODECS_TEST_FRAMEWORK_UNIT_TEST_H_ #define WEBRTC_MODULES_VIDEO_CODING_CODECS_TEST_FRAMEWORK_UNIT_TEST_H_ -#include "test.h" -#include "event_wrapper.h" +#include "webrtc/modules/video_coding/codecs/test_framework/test.h" +#include "webrtc/system_wrappers/interface/event_wrapper.h" // Disable "conditional expression is constant" warnings on the perfectly // acceptable @@ -103,4 +103,3 @@ private: }; #endif // WEBRTC_MODULES_VIDEO_CODING_CODECS_TEST_FRAMEWORK_UNIT_TEST_H_ - diff --git a/webrtc/modules/video_coding/codecs/test_framework/video_source.cc b/webrtc/modules/video_coding/codecs/test_framework/video_source.cc index 32adf06bc..23fbaa84a 100644 --- a/webrtc/modules/video_coding/codecs/test_framework/video_source.cc +++ b/webrtc/modules/video_coding/codecs/test_framework/video_source.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "video_source.h" +#include "webrtc/modules/video_coding/codecs/test_framework/video_source.h" #include -#include "gtest/gtest.h" -#include "testsupport/fileutils.h" +#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/testsupport/fileutils.h" VideoSource::VideoSource() : diff --git a/webrtc/modules/video_coding/codecs/test_framework/video_source.h b/webrtc/modules/video_coding/codecs/test_framework/video_source.h index 9fe3df863..b3c4e7917 100644 --- a/webrtc/modules/video_coding/codecs/test_framework/video_source.h +++ b/webrtc/modules/video_coding/codecs/test_framework/video_source.h @@ -12,7 +12,7 @@ #define WEBRTC_MODULES_VIDEO_CODING_CODECS_TEST_FRAMEWORK_VIDEO_SOURCE_H_ #include -#include "common_video/libyuv/include/webrtc_libyuv.h" +#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" enum VideoSize { @@ -106,4 +106,3 @@ private: #endif // 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 6ea13d191..2c6c17d15 100644 --- a/webrtc/modules/video_coding/codecs/tools/video_quality_measurement.cc +++ b/webrtc/modules/video_coding/codecs/tools/video_quality_measurement.cc @@ -19,18 +19,18 @@ #define S_ISDIR(mode) (((mode) & S_IFMT) == S_IFDIR) #endif -#include "common_types.h" -#include "google/gflags.h" -#include "modules/video_coding/codecs/test/packet_manipulator.h" -#include "modules/video_coding/codecs/test/stats.h" -#include "modules/video_coding/codecs/test/videoprocessor.h" -#include "modules/video_coding/codecs/vp8/include/vp8.h" -#include "modules/video_coding/main/interface/video_coding.h" -#include "system_wrappers/interface/trace.h" -#include "testsupport/frame_reader.h" -#include "testsupport/frame_writer.h" -#include "testsupport/metrics/video_metrics.h" -#include "testsupport/packet_reader.h" +#include "gflags/gflags.h" +#include "webrtc/common_types.h" +#include "webrtc/modules/video_coding/codecs/test/packet_manipulator.h" +#include "webrtc/modules/video_coding/codecs/test/stats.h" +#include "webrtc/modules/video_coding/codecs/test/videoprocessor.h" +#include "webrtc/modules/video_coding/codecs/vp8/include/vp8.h" +#include "webrtc/modules/video_coding/main/interface/video_coding.h" +#include "webrtc/system_wrappers/interface/trace.h" +#include "webrtc/test/testsupport/frame_reader.h" +#include "webrtc/test/testsupport/frame_writer.h" +#include "webrtc/test/testsupport/metrics/video_metrics.h" +#include "webrtc/test/testsupport/packet_reader.h" DEFINE_string(test_name, "Quality test", "The name of the test to run. "); DEFINE_string(test_description, "", "A more detailed description about what " 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 11523d712..9429ebf0d 100644 --- a/webrtc/modules/video_coding/codecs/vp8/default_temporal_layers.cc +++ b/webrtc/modules/video_coding/codecs/vp8/default_temporal_layers.cc @@ -9,16 +9,16 @@ #include "webrtc/modules/video_coding/codecs/vp8/default_temporal_layers.h" +#include #include #include -#include #include "webrtc/modules/interface/module_common_types.h" #include "webrtc/modules/video_coding/codecs/interface/video_codec_interface.h" #include "webrtc/modules/video_coding/codecs/vp8/include/vp8_common_types.h" -#include "vpx/vpx_encoder.h" -#include "vpx/vp8cx.h" +#include "third_party/libvpx/source/libvpx/vpx/vpx_encoder.h" +#include "third_party/libvpx/source/libvpx/vpx/vp8cx.h" namespace webrtc { @@ -278,4 +278,3 @@ void DefaultTemporalLayers::PopulateCodecSpecific( } } } // namespace webrtc - diff --git a/webrtc/modules/video_coding/codecs/vp8/default_temporal_layers_unittest.cc b/webrtc/modules/video_coding/codecs/vp8/default_temporal_layers_unittest.cc index 278a0577c..ae8eb7a40 100644 --- a/webrtc/modules/video_coding/codecs/vp8/default_temporal_layers_unittest.cc +++ b/webrtc/modules/video_coding/codecs/vp8/default_temporal_layers_unittest.cc @@ -9,12 +9,12 @@ */ -#include "gtest/gtest.h" +#include "testing/gtest/include/gtest/gtest.h" #include "webrtc/modules/video_coding/codecs/interface/video_codec_interface.h" #include "webrtc/modules/video_coding/codecs/vp8/default_temporal_layers.h" -#include "vpx/vpx_encoder.h" -#include "vpx/vp8cx.h" +#include "third_party/libvpx/source/libvpx/vpx/vpx_encoder.h" +#include "third_party/libvpx/source/libvpx/vpx/vp8cx.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/codecs/vp8/include/vp8.h b/webrtc/modules/video_coding/codecs/vp8/include/vp8.h index d1f7b7698..f5dae471d 100644 --- a/webrtc/modules/video_coding/codecs/vp8/include/vp8.h +++ b/webrtc/modules/video_coding/codecs/vp8/include/vp8.h @@ -13,7 +13,7 @@ #ifndef WEBRTC_MODULES_VIDEO_CODING_CODECS_VP8_INCLUDE_VP8_H_ #define WEBRTC_MODULES_VIDEO_CODING_CODECS_VP8_INCLUDE_VP8_H_ -#include "modules/video_coding/codecs/interface/video_codec_interface.h" +#include "webrtc/modules/video_coding/codecs/interface/video_codec_interface.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/codecs/vp8/include/vp8_common_types.h b/webrtc/modules/video_coding/codecs/vp8/include/vp8_common_types.h index 6f347cd7b..8b97b3b46 100644 --- a/webrtc/modules/video_coding/codecs/vp8/include/vp8_common_types.h +++ b/webrtc/modules/video_coding/codecs/vp8/include/vp8_common_types.h @@ -11,7 +11,7 @@ #ifndef WEBRTC_MODULES_VIDEO_CODING_CODECS_VP8_COMMON_TYPES_H_ #define WEBRTC_MODULES_VIDEO_CODING_CODECS_VP8_COMMON_TYPES_H_ -#include "common_types.h" +#include "webrtc/common_types.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/codecs/vp8/reference_picture_selection.cc b/webrtc/modules/video_coding/codecs/vp8/reference_picture_selection.cc index 3ae6f19bc..8a23f3960 100644 --- a/webrtc/modules/video_coding/codecs/vp8/reference_picture_selection.cc +++ b/webrtc/modules/video_coding/codecs/vp8/reference_picture_selection.cc @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "reference_picture_selection.h" +#include "webrtc/modules/video_coding/codecs/vp8/reference_picture_selection.h" -#include "typedefs.h" -#include "vpx/vpx_encoder.h" -#include "vpx/vp8cx.h" +#include "webrtc/typedefs.h" +#include "third_party/libvpx/source/libvpx/vpx/vpx_encoder.h" +#include "third_party/libvpx/source/libvpx/vpx/vp8cx.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/codecs/vp8/reference_picture_selection.h b/webrtc/modules/video_coding/codecs/vp8/reference_picture_selection.h index 59e5940cc..a47b8de85 100644 --- a/webrtc/modules/video_coding/codecs/vp8/reference_picture_selection.h +++ b/webrtc/modules/video_coding/codecs/vp8/reference_picture_selection.h @@ -16,7 +16,7 @@ #ifndef WEBRTC_MODULES_VIDEO_CODING_CODECS_REFERENCE_PICTURE_SELECTION_H_ #define WEBRTC_MODULES_VIDEO_CODING_CODECS_REFERENCE_PICTURE_SELECTION_H_ -#include "typedefs.h" +#include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/codecs/vp8/reference_picture_selection_unittest.cc b/webrtc/modules/video_coding/codecs/vp8/reference_picture_selection_unittest.cc index 52092a8cc..4a1ea9a33 100644 --- a/webrtc/modules/video_coding/codecs/vp8/reference_picture_selection_unittest.cc +++ b/webrtc/modules/video_coding/codecs/vp8/reference_picture_selection_unittest.cc @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "gtest/gtest.h" -#include "reference_picture_selection.h" -#include "vpx/vpx_encoder.h" -#include "vpx/vp8cx.h" +#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/modules/video_coding/codecs/vp8/reference_picture_selection.h" +#include "third_party/libvpx/source/libvpx/vpx/vpx_encoder.h" +#include "third_party/libvpx/source/libvpx/vpx/vp8cx.h" using webrtc::ReferencePictureSelection; diff --git a/webrtc/modules/video_coding/codecs/vp8/temporal_layers.h b/webrtc/modules/video_coding/codecs/vp8/temporal_layers.h index f08d8da4b..4895dc98b 100644 --- a/webrtc/modules/video_coding/codecs/vp8/temporal_layers.h +++ b/webrtc/modules/video_coding/codecs/vp8/temporal_layers.h @@ -44,4 +44,3 @@ class TemporalLayers { } // namespace webrtc #endif // WEBRTC_MODULES_VIDEO_CODING_CODECS_VP8_TEMPORAL_LAYERS_H_ - diff --git a/webrtc/modules/video_coding/codecs/vp8/test/vp8_impl_unittest.cc b/webrtc/modules/video_coding/codecs/vp8/test/vp8_impl_unittest.cc index 7866fba7a..dd3d61763 100644 --- a/webrtc/modules/video_coding/codecs/vp8/test/vp8_impl_unittest.cc +++ b/webrtc/modules/video_coding/codecs/vp8/test/vp8_impl_unittest.cc @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "gtest/gtest.h" -#include "webrtc/modules/video_coding/codecs/vp8/include/vp8.h" -#include "webrtc/modules/video_coding/codecs/test_framework/video_source.h" +#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" +#include "webrtc/modules/video_coding/codecs/vp8/include/vp8.h" #include "webrtc/system_wrappers/interface/scoped_ptr.h" #include "webrtc/system_wrappers/interface/tick_util.h" #include "webrtc/test/testsupport/fileutils.h" diff --git a/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc b/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc index 488d951c8..ba7a9030b 100644 --- a/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc +++ b/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc @@ -18,10 +18,10 @@ #include #include -#include "vpx/vpx_encoder.h" -#include "vpx/vpx_decoder.h" -#include "vpx/vp8cx.h" -#include "vpx/vp8dx.h" +#include "third_party/libvpx/source/libvpx/vpx/vpx_encoder.h" +#include "third_party/libvpx/source/libvpx/vpx/vpx_decoder.h" +#include "third_party/libvpx/source/libvpx/vpx/vp8cx.h" +#include "third_party/libvpx/source/libvpx/vpx/vp8dx.h" #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" #include "webrtc/modules/interface/module_common_types.h" diff --git a/webrtc/modules/video_coding/codecs/vp8/vp8_impl.h b/webrtc/modules/video_coding/codecs/vp8/vp8_impl.h index 94adc00bd..d420ba024 100644 --- a/webrtc/modules/video_coding/codecs/vp8/vp8_impl.h +++ b/webrtc/modules/video_coding/codecs/vp8/vp8_impl.h @@ -13,7 +13,7 @@ #ifndef WEBRTC_MODULES_VIDEO_CODING_CODECS_VP8_IMPL_H_ #define WEBRTC_MODULES_VIDEO_CODING_CODECS_VP8_IMPL_H_ -#include "modules/video_coding/codecs/vp8/include/vp8.h" +#include "webrtc/modules/video_coding/codecs/vp8/include/vp8.h" // VPX forward declaration typedef struct vpx_codec_ctx vpx_codec_ctx_t; diff --git a/webrtc/modules/video_coding/codecs/vp8/vp8_sequence_coder.cc b/webrtc/modules/video_coding/codecs/vp8/vp8_sequence_coder.cc index 83c940a3a..1bd3e1a62 100644 --- a/webrtc/modules/video_coding/codecs/vp8/vp8_sequence_coder.cc +++ b/webrtc/modules/video_coding/codecs/vp8/vp8_sequence_coder.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "gtest/gtest.h" +#include "testing/gtest/include/gtest/gtest.h" #include "webrtc/common_video/interface/i420_video_frame.h" #include "webrtc/common_video/interface/video_image.h" #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" diff --git a/webrtc/modules/video_coding/main/interface/mock/mock_vcm_callbacks.h b/webrtc/modules/video_coding/main/interface/mock/mock_vcm_callbacks.h index d53caee9b..302d4a3a1 100644 --- a/webrtc/modules/video_coding/main/interface/mock/mock_vcm_callbacks.h +++ b/webrtc/modules/video_coding/main/interface/mock/mock_vcm_callbacks.h @@ -11,7 +11,7 @@ #ifndef WEBRTC_MODULES_VIDEO_CODING_MAIN_INTERFACE_MOCK_MOCK_VCM_CALLBACKS_H_ #define WEBRTC_MODULES_VIDEO_CODING_MAIN_INTERFACE_MOCK_MOCK_VCM_CALLBACKS_H_ -#include "gmock/gmock.h" +#include "testing/gmock/include/gmock/gmock.h" #include "webrtc/modules/video_coding/main/interface/video_coding_defines.h" #include "webrtc/typedefs.h" diff --git a/webrtc/modules/video_coding/main/interface/video_coding_defines.h b/webrtc/modules/video_coding/main/interface/video_coding_defines.h index 1a749bcbb..ab5c517e4 100644 --- a/webrtc/modules/video_coding/main/interface/video_coding_defines.h +++ b/webrtc/modules/video_coding/main/interface/video_coding_defines.h @@ -11,9 +11,9 @@ #ifndef WEBRTC_MODULES_INTERFACE_VIDEO_CODING_DEFINES_H_ #define WEBRTC_MODULES_INTERFACE_VIDEO_CODING_DEFINES_H_ -#include "typedefs.h" -#include "common_video/interface/i420_video_frame.h" -#include "modules/interface/module_common_types.h" +#include "webrtc/common_video/interface/i420_video_frame.h" +#include "webrtc/modules/interface/module_common_types.h" +#include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/main/source/codec_database.h b/webrtc/modules/video_coding/main/source/codec_database.h index b2082d4dc..2a28ed4fb 100644 --- a/webrtc/modules/video_coding/main/source/codec_database.h +++ b/webrtc/modules/video_coding/main/source/codec_database.h @@ -13,12 +13,12 @@ #include -#include "modules/video_coding/codecs/interface/video_codec_interface.h" -#include "modules/video_coding/main/interface/video_coding.h" -#include "modules/video_coding/main/source/generic_decoder.h" -#include "modules/video_coding/main/source/generic_encoder.h" -#include "system_wrappers/interface/scoped_ptr.h" -#include "typedefs.h" +#include "webrtc/modules/video_coding/codecs/interface/video_codec_interface.h" +#include "webrtc/modules/video_coding/main/interface/video_coding.h" +#include "webrtc/modules/video_coding/main/source/generic_decoder.h" +#include "webrtc/modules/video_coding/main/source/generic_encoder.h" +#include "webrtc/system_wrappers/interface/scoped_ptr.h" +#include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/main/source/codec_timer.cc b/webrtc/modules/video_coding/main/source/codec_timer.cc index 3b92bb485..9fee00bb4 100644 --- a/webrtc/modules/video_coding/main/source/codec_timer.cc +++ b/webrtc/modules/video_coding/main/source/codec_timer.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "codec_timer.h" +#include "webrtc/modules/video_coding/main/source/codec_timer.h" #include diff --git a/webrtc/modules/video_coding/main/source/codec_timer.h b/webrtc/modules/video_coding/main/source/codec_timer.h index 3acc0d3eb..e56aa6df8 100644 --- a/webrtc/modules/video_coding/main/source/codec_timer.h +++ b/webrtc/modules/video_coding/main/source/codec_timer.h @@ -11,8 +11,8 @@ #ifndef WEBRTC_MODULES_VIDEO_CODING_CODEC_TIMER_H_ #define WEBRTC_MODULES_VIDEO_CODING_CODEC_TIMER_H_ -#include "typedefs.h" -#include "module_common_types.h" +#include "webrtc/modules/interface/module_common_types.h" +#include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/main/source/content_metrics_processing.cc b/webrtc/modules/video_coding/main/source/content_metrics_processing.cc index 504bdcc1a..757ffb0e4 100644 --- a/webrtc/modules/video_coding/main/source/content_metrics_processing.cc +++ b/webrtc/modules/video_coding/main/source/content_metrics_processing.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "modules/video_coding/main/source/content_metrics_processing.h" +#include "webrtc/modules/video_coding/main/source/content_metrics_processing.h" #include -#include "modules/interface/module_common_types.h" -#include "modules/video_coding/main/interface/video_coding_defines.h" +#include "webrtc/modules/interface/module_common_types.h" +#include "webrtc/modules/video_coding/main/interface/video_coding_defines.h" namespace webrtc { ////////////////////////////////// diff --git a/webrtc/modules/video_coding/main/source/content_metrics_processing.h b/webrtc/modules/video_coding/main/source/content_metrics_processing.h index 0317add77..3517f757d 100644 --- a/webrtc/modules/video_coding/main/source/content_metrics_processing.h +++ b/webrtc/modules/video_coding/main/source/content_metrics_processing.h @@ -11,7 +11,7 @@ #ifndef WEBRTC_MODULES_VIDEO_CODING_CONTENT_METRICS_PROCESSING_H_ #define WEBRTC_MODULES_VIDEO_CODING_CONTENT_METRICS_PROCESSING_H_ -#include "typedefs.h" +#include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/main/source/decoding_state.cc b/webrtc/modules/video_coding/main/source/decoding_state.cc index 9d74c94cd..2d970fc8d 100644 --- a/webrtc/modules/video_coding/main/source/decoding_state.cc +++ b/webrtc/modules/video_coding/main/source/decoding_state.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "modules/video_coding/main/source/decoding_state.h" +#include "webrtc/modules/video_coding/main/source/decoding_state.h" -#include "modules/video_coding/main/source/frame_buffer.h" -#include "modules/video_coding/main/source/jitter_buffer_common.h" -#include "modules/video_coding/main/source/packet.h" -#include "modules/interface/module_common_types.h" +#include "webrtc/modules/interface/module_common_types.h" +#include "webrtc/modules/video_coding/main/source/frame_buffer.h" +#include "webrtc/modules/video_coding/main/source/jitter_buffer_common.h" +#include "webrtc/modules/video_coding/main/source/packet.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/main/source/decoding_state.h b/webrtc/modules/video_coding/main/source/decoding_state.h index 1fdc1fb23..99ee33519 100644 --- a/webrtc/modules/video_coding/main/source/decoding_state.h +++ b/webrtc/modules/video_coding/main/source/decoding_state.h @@ -11,7 +11,7 @@ #ifndef WEBRTC_MODULES_VIDEO_CODING_DECODING_STATE_H_ #define WEBRTC_MODULES_VIDEO_CODING_DECODING_STATE_H_ -#include "typedefs.h" +#include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/main/source/decoding_state_unittest.cc b/webrtc/modules/video_coding/main/source/decoding_state_unittest.cc index 509ca9e0b..6b47ebcb8 100644 --- a/webrtc/modules/video_coding/main/source/decoding_state_unittest.cc +++ b/webrtc/modules/video_coding/main/source/decoding_state_unittest.cc @@ -10,12 +10,12 @@ #include -#include "modules/video_coding/main/source/decoding_state.h" -#include "modules/video_coding/main/source/frame_buffer.h" -#include "gtest/gtest.h" -#include "modules/video_coding/main/source/jitter_buffer_common.h" -#include "modules/interface/module_common_types.h" -#include "modules/video_coding/main/source/packet.h" +#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/modules/interface/module_common_types.h" +#include "webrtc/modules/video_coding/main/source/decoding_state.h" +#include "webrtc/modules/video_coding/main/source/frame_buffer.h" +#include "webrtc/modules/video_coding/main/source/jitter_buffer_common.h" +#include "webrtc/modules/video_coding/main/source/packet.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/main/source/encoded_frame.cc b/webrtc/modules/video_coding/main/source/encoded_frame.cc index bfefee99e..b6ed7ce8a 100644 --- a/webrtc/modules/video_coding/main/source/encoded_frame.cc +++ b/webrtc/modules/video_coding/main/source/encoded_frame.cc @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "encoded_frame.h" -#include "generic_encoder.h" -#include "jitter_buffer_common.h" -#include "video_coding_defines.h" +#include "webrtc/modules/video_coding/main/interface/video_coding_defines.h" +#include "webrtc/modules/video_coding/main/source/encoded_frame.h" +#include "webrtc/modules/video_coding/main/source/generic_encoder.h" +#include "webrtc/modules/video_coding/main/source/jitter_buffer_common.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/main/source/encoded_frame.h b/webrtc/modules/video_coding/main/source/encoded_frame.h index 90cc48126..b741236d6 100644 --- a/webrtc/modules/video_coding/main/source/encoded_frame.h +++ b/webrtc/modules/video_coding/main/source/encoded_frame.h @@ -13,11 +13,11 @@ #include -#include "common_types.h" -#include "common_video/interface/video_image.h" -#include "modules/interface/module_common_types.h" -#include "modules/video_coding/codecs/interface/video_codec_interface.h" -#include "modules/video_coding/main/interface/video_coding_defines.h" +#include "webrtc/common_types.h" +#include "webrtc/common_video/interface/video_image.h" +#include "webrtc/modules/interface/module_common_types.h" +#include "webrtc/modules/video_coding/codecs/interface/video_codec_interface.h" +#include "webrtc/modules/video_coding/main/interface/video_coding_defines.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/main/source/frame_buffer.cc b/webrtc/modules/video_coding/main/source/frame_buffer.cc index a88ff977b..398c12a68 100644 --- a/webrtc/modules/video_coding/main/source/frame_buffer.cc +++ b/webrtc/modules/video_coding/main/source/frame_buffer.cc @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "frame_buffer.h" -#include "packet.h" +#include "webrtc/modules/video_coding/main/source/frame_buffer.h" +#include "webrtc/modules/video_coding/main/source/packet.h" #include #include diff --git a/webrtc/modules/video_coding/main/source/frame_buffer.h b/webrtc/modules/video_coding/main/source/frame_buffer.h index 7a9868855..4f6f8ae02 100644 --- a/webrtc/modules/video_coding/main/source/frame_buffer.h +++ b/webrtc/modules/video_coding/main/source/frame_buffer.h @@ -11,11 +11,11 @@ #ifndef WEBRTC_MODULES_VIDEO_CODING_FRAME_BUFFER_H_ #define WEBRTC_MODULES_VIDEO_CODING_FRAME_BUFFER_H_ -#include "modules/interface/module_common_types.h" -#include "modules/video_coding/main/source/encoded_frame.h" -#include "modules/video_coding/main/source/jitter_buffer_common.h" -#include "modules/video_coding/main/source/session_info.h" -#include "typedefs.h" +#include "webrtc/modules/interface/module_common_types.h" +#include "webrtc/modules/video_coding/main/source/encoded_frame.h" +#include "webrtc/modules/video_coding/main/source/jitter_buffer_common.h" +#include "webrtc/modules/video_coding/main/source/session_info.h" +#include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/main/source/generic_decoder.cc b/webrtc/modules/video_coding/main/source/generic_decoder.cc index fdb97b55e..afc4b1aa1 100644 --- a/webrtc/modules/video_coding/main/source/generic_decoder.cc +++ b/webrtc/modules/video_coding/main/source/generic_decoder.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "video_coding.h" -#include "trace.h" -#include "trace_event.h" -#include "generic_decoder.h" -#include "internal_defines.h" +#include "webrtc/modules/video_coding/main/interface/video_coding.h" +#include "webrtc/modules/video_coding/main/source/generic_decoder.h" +#include "webrtc/modules/video_coding/main/source/internal_defines.h" #include "webrtc/system_wrappers/interface/clock.h" +#include "webrtc/system_wrappers/interface/trace.h" +#include "webrtc/system_wrappers/interface/trace_event.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/main/source/generic_decoder.h b/webrtc/modules/video_coding/main/source/generic_decoder.h index f65f30fb6..04e6cf483 100644 --- a/webrtc/modules/video_coding/main/source/generic_decoder.h +++ b/webrtc/modules/video_coding/main/source/generic_decoder.h @@ -11,11 +11,11 @@ #ifndef WEBRTC_MODULES_VIDEO_CODING_GENERIC_DECODER_H_ #define WEBRTC_MODULES_VIDEO_CODING_GENERIC_DECODER_H_ -#include "timing.h" -#include "timestamp_map.h" -#include "video_codec_interface.h" -#include "encoded_frame.h" -#include "module_common_types.h" +#include "webrtc/modules/interface/module_common_types.h" +#include "webrtc/modules/video_coding/codecs/interface/video_codec_interface.h" +#include "webrtc/modules/video_coding/main/source/encoded_frame.h" +#include "webrtc/modules/video_coding/main/source/timestamp_map.h" +#include "webrtc/modules/video_coding/main/source/timing.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/main/source/generic_encoder.cc b/webrtc/modules/video_coding/main/source/generic_encoder.cc index 7831b3d75..beed8bfff 100644 --- a/webrtc/modules/video_coding/main/source/generic_encoder.cc +++ b/webrtc/modules/video_coding/main/source/generic_encoder.cc @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "encoded_frame.h" -#include "generic_encoder.h" -#include "media_optimization.h" -#include "../../../../engine_configurations.h" +#include "webrtc/engine_configurations.h" +#include "webrtc/modules/video_coding/main/source/encoded_frame.h" +#include "webrtc/modules/video_coding/main/source/generic_encoder.h" +#include "webrtc/modules/video_coding/main/source/media_optimization.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/main/source/generic_encoder.h b/webrtc/modules/video_coding/main/source/generic_encoder.h index 854766191..a5b87e795 100644 --- a/webrtc/modules/video_coding/main/source/generic_encoder.h +++ b/webrtc/modules/video_coding/main/source/generic_encoder.h @@ -11,7 +11,7 @@ #ifndef WEBRTC_MODULES_VIDEO_CODING_GENERIC_ENCODER_H_ #define WEBRTC_MODULES_VIDEO_CODING_GENERIC_ENCODER_H_ -#include "video_codec_interface.h" +#include "webrtc/modules/video_coding/codecs/interface/video_codec_interface.h" #include diff --git a/webrtc/modules/video_coding/main/source/inter_frame_delay.cc b/webrtc/modules/video_coding/main/source/inter_frame_delay.cc index ab756e185..4786917e1 100644 --- a/webrtc/modules/video_coding/main/source/inter_frame_delay.cc +++ b/webrtc/modules/video_coding/main/source/inter_frame_delay.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "inter_frame_delay.h" +#include "webrtc/modules/video_coding/main/source/inter_frame_delay.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/main/source/inter_frame_delay.h b/webrtc/modules/video_coding/main/source/inter_frame_delay.h index 64f4c7be6..58b326ae9 100644 --- a/webrtc/modules/video_coding/main/source/inter_frame_delay.h +++ b/webrtc/modules/video_coding/main/source/inter_frame_delay.h @@ -11,7 +11,7 @@ #ifndef WEBRTC_MODULES_VIDEO_CODING_INTER_FRAME_DELAY_H_ #define WEBRTC_MODULES_VIDEO_CODING_INTER_FRAME_DELAY_H_ -#include "typedefs.h" +#include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/main/source/internal_defines.h b/webrtc/modules/video_coding/main/source/internal_defines.h index ed2c2a3b4..efc6d8dd1 100644 --- a/webrtc/modules/video_coding/main/source/internal_defines.h +++ b/webrtc/modules/video_coding/main/source/internal_defines.h @@ -11,7 +11,7 @@ #ifndef WEBRTC_MODULES_VIDEO_CODING_SOURCE_INTERNAL_DEFINES_H_ #define WEBRTC_MODULES_VIDEO_CODING_SOURCE_INTERNAL_DEFINES_H_ -#include "typedefs.h" +#include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/main/source/jitter_estimator.cc b/webrtc/modules/video_coding/main/source/jitter_estimator.cc index 397032f51..deb036300 100644 --- a/webrtc/modules/video_coding/main/source/jitter_estimator.cc +++ b/webrtc/modules/video_coding/main/source/jitter_estimator.cc @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "trace.h" -#include "internal_defines.h" -#include "jitter_estimator.h" -#include "rtt_filter.h" +#include "webrtc/modules/video_coding/main/source/internal_defines.h" +#include "webrtc/modules/video_coding/main/source/jitter_estimator.h" +#include "webrtc/modules/video_coding/main/source/rtt_filter.h" +#include "webrtc/system_wrappers/interface/trace.h" #include #include diff --git a/webrtc/modules/video_coding/main/source/jitter_estimator.h b/webrtc/modules/video_coding/main/source/jitter_estimator.h index 3a24c74ee..dda8f8da8 100644 --- a/webrtc/modules/video_coding/main/source/jitter_estimator.h +++ b/webrtc/modules/video_coding/main/source/jitter_estimator.h @@ -11,8 +11,8 @@ #ifndef WEBRTC_MODULES_VIDEO_CODING_JITTER_ESTIMATOR_H_ #define WEBRTC_MODULES_VIDEO_CODING_JITTER_ESTIMATOR_H_ -#include "typedefs.h" -#include "rtt_filter.h" +#include "webrtc/modules/video_coding/main/source/rtt_filter.h" +#include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/main/source/media_opt_util.cc b/webrtc/modules/video_coding/main/source/media_opt_util.cc index 787d947fb..ba86575fa 100644 --- a/webrtc/modules/video_coding/main/source/media_opt_util.cc +++ b/webrtc/modules/video_coding/main/source/media_opt_util.cc @@ -8,19 +8,19 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "modules/video_coding/main/source/media_opt_util.h" +#include "webrtc/modules/video_coding/main/source/media_opt_util.h" #include -#include #include #include +#include -#include "modules/interface/module_common_types.h" -#include "modules/video_coding/codecs/vp8/include/vp8_common_types.h" -#include "modules/video_coding/main/interface/video_coding_defines.h" -#include "modules/video_coding/main/source/er_tables_xor.h" -#include "modules/video_coding/main/source/fec_tables_xor.h" -#include "modules/video_coding/main/source/nack_fec_tables.h" +#include "webrtc/modules/interface/module_common_types.h" +#include "webrtc/modules/video_coding/codecs/vp8/include/vp8_common_types.h" +#include "webrtc/modules/video_coding/main/interface/video_coding_defines.h" +#include "webrtc/modules/video_coding/main/source/er_tables_xor.h" +#include "webrtc/modules/video_coding/main/source/fec_tables_xor.h" +#include "webrtc/modules/video_coding/main/source/nack_fec_tables.h" namespace webrtc { namespace media_optimization { 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 7460688d1..d52da15c8 100644 --- a/webrtc/modules/video_coding/main/source/media_opt_util.h +++ b/webrtc/modules/video_coding/main/source/media_opt_util.h @@ -14,9 +14,9 @@ #include #include -#include "webrtc/modules/video_coding/utility/include/exp_filter.h" #include "webrtc/modules/video_coding/main/source/internal_defines.h" #include "webrtc/modules/video_coding/main/source/qm_select.h" +#include "webrtc/modules/video_coding/utility/include/exp_filter.h" #include "webrtc/system_wrappers/interface/trace.h" #include "webrtc/typedefs.h" diff --git a/webrtc/modules/video_coding/main/source/media_optimization.cc b/webrtc/modules/video_coding/main/source/media_optimization.cc index 0ba272dbc..7c6966d60 100644 --- a/webrtc/modules/video_coding/main/source/media_optimization.cc +++ b/webrtc/modules/video_coding/main/source/media_optimization.cc @@ -10,9 +10,9 @@ #include "webrtc/modules/video_coding/main/source/media_optimization.h" -#include "webrtc/modules/video_coding/utility/include/frame_dropper.h" #include "webrtc/modules/video_coding/main/source/content_metrics_processing.h" #include "webrtc/modules/video_coding/main/source/qm_select.h" +#include "webrtc/modules/video_coding/utility/include/frame_dropper.h" #include "webrtc/system_wrappers/interface/clock.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/main/source/media_optimization.h b/webrtc/modules/video_coding/main/source/media_optimization.h index 662f5fead..be20b58e1 100644 --- a/webrtc/modules/video_coding/main/source/media_optimization.h +++ b/webrtc/modules/video_coding/main/source/media_optimization.h @@ -11,11 +11,11 @@ #ifndef WEBRTC_MODULES_VIDEO_CODING_MEDIA_OPTIMIZATION_H_ #define WEBRTC_MODULES_VIDEO_CODING_MEDIA_OPTIMIZATION_H_ -#include "module_common_types.h" -#include "video_coding.h" -#include "trace.h" -#include "media_opt_util.h" -#include "qm_select.h" +#include "webrtc/modules/interface/module_common_types.h" +#include "webrtc/modules/video_coding/main/interface/video_coding.h" +#include "webrtc/modules/video_coding/main/source/media_opt_util.h" +#include "webrtc/modules/video_coding/main/source/qm_select.h" +#include "webrtc/system_wrappers/interface/trace.h" #include diff --git a/webrtc/modules/video_coding/main/source/packet.cc b/webrtc/modules/video_coding/main/source/packet.cc index 86583da69..ad69418be 100644 --- a/webrtc/modules/video_coding/main/source/packet.cc +++ b/webrtc/modules/video_coding/main/source/packet.cc @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "packet.h" -#include "module_common_types.h" +#include "webrtc/modules/interface/module_common_types.h" +#include "webrtc/modules/video_coding/main/source/packet.h" #include diff --git a/webrtc/modules/video_coding/main/source/packet.h b/webrtc/modules/video_coding/main/source/packet.h index 43c05867b..e9a81bb1f 100644 --- a/webrtc/modules/video_coding/main/source/packet.h +++ b/webrtc/modules/video_coding/main/source/packet.h @@ -11,9 +11,9 @@ #ifndef WEBRTC_MODULES_VIDEO_CODING_PACKET_H_ #define WEBRTC_MODULES_VIDEO_CODING_PACKET_H_ -#include "typedefs.h" -#include "module_common_types.h" -#include "jitter_buffer_common.h" +#include "webrtc/modules/interface/module_common_types.h" +#include "webrtc/modules/video_coding/main/source/jitter_buffer_common.h" +#include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/main/source/qm_select.cc b/webrtc/modules/video_coding/main/source/qm_select.cc index aaf5d7f77..85c5f366d 100644 --- a/webrtc/modules/video_coding/main/source/qm_select.cc +++ b/webrtc/modules/video_coding/main/source/qm_select.cc @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "modules/video_coding/main/source/qm_select.h" +#include "webrtc/modules/video_coding/main/source/qm_select.h" #include -#include "modules/interface/module_common_types.h" -#include "modules/video_coding/main/source/internal_defines.h" -#include "modules/video_coding/main/source/qm_select_data.h" -#include "modules/video_coding/main/interface/video_coding_defines.h" -#include "system_wrappers/interface/trace.h" +#include "webrtc/modules/interface/module_common_types.h" +#include "webrtc/modules/video_coding/main/interface/video_coding_defines.h" +#include "webrtc/modules/video_coding/main/source/internal_defines.h" +#include "webrtc/modules/video_coding/main/source/qm_select_data.h" +#include "webrtc/system_wrappers/interface/trace.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/main/source/qm_select.h b/webrtc/modules/video_coding/main/source/qm_select.h index 0d8ca293b..ce5723670 100644 --- a/webrtc/modules/video_coding/main/source/qm_select.h +++ b/webrtc/modules/video_coding/main/source/qm_select.h @@ -11,8 +11,8 @@ #ifndef WEBRTC_MODULES_VIDEO_CODING_QM_SELECT_H_ #define WEBRTC_MODULES_VIDEO_CODING_QM_SELECT_H_ -#include "common_types.h" -#include "typedefs.h" +#include "webrtc/common_types.h" +#include "webrtc/typedefs.h" /******************************************************/ /* Quality Modes: Resolution and Robustness settings */ @@ -372,4 +372,3 @@ class VCMQmRobustness : public VCMQmMethod { }; } // namespace webrtc #endif // WEBRTC_MODULES_VIDEO_CODING_QM_SELECT_H_ - diff --git a/webrtc/modules/video_coding/main/source/qm_select_data.h b/webrtc/modules/video_coding/main/source/qm_select_data.h index 742bd7206..dc6bce481 100644 --- a/webrtc/modules/video_coding/main/source/qm_select_data.h +++ b/webrtc/modules/video_coding/main/source/qm_select_data.h @@ -16,7 +16,7 @@ * This file includes parameters for content-aware media optimization ****************************************************************/ -#include "typedefs.h" +#include "webrtc/typedefs.h" namespace webrtc { // @@ -225,4 +225,3 @@ const float kSpatialErrVertVsHoriz = 0.1f; // percentage to favor H over V } // namespace webrtc #endif // WEBRTC_MODULES_VIDEO_CODING_SOURCE_QM_SELECT_DATA_H_ - diff --git a/webrtc/modules/video_coding/main/source/qm_select_unittest.cc b/webrtc/modules/video_coding/main/source/qm_select_unittest.cc index 7f309ceb2..5a7daed14 100644 --- a/webrtc/modules/video_coding/main/source/qm_select_unittest.cc +++ b/webrtc/modules/video_coding/main/source/qm_select_unittest.cc @@ -13,10 +13,10 @@ * In particular, for the selection of spatial and/or temporal down-sampling. */ -#include +#include "testing/gtest/include/gtest/gtest.h" -#include "modules/video_coding/main/source/qm_select.h" -#include "modules/interface/module_common_types.h" +#include "webrtc/modules/interface/module_common_types.h" +#include "webrtc/modules/video_coding/main/source/qm_select.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/main/source/receiver.h b/webrtc/modules/video_coding/main/source/receiver.h index 6bf76f43f..aeeb7ac1b 100644 --- a/webrtc/modules/video_coding/main/source/receiver.h +++ b/webrtc/modules/video_coding/main/source/receiver.h @@ -11,10 +11,10 @@ #ifndef WEBRTC_MODULES_VIDEO_CODING_MAIN_SOURCE_RECEIVER_H_ #define WEBRTC_MODULES_VIDEO_CODING_MAIN_SOURCE_RECEIVER_H_ -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" #include "webrtc/modules/video_coding/main/source/jitter_buffer.h" #include "webrtc/modules/video_coding/main/source/packet.h" #include "webrtc/modules/video_coding/main/source/timing.h" +#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/main/source/receiver_unittest.cc b/webrtc/modules/video_coding/main/source/receiver_unittest.cc index fee1f8e83..7441baecc 100644 --- a/webrtc/modules/video_coding/main/source/receiver_unittest.cc +++ b/webrtc/modules/video_coding/main/source/receiver_unittest.cc @@ -12,11 +12,11 @@ #include #include "testing/gtest/include/gtest/gtest.h" -#include "webrtc/modules/video_coding/main/source/receiver.h" #include "webrtc/modules/video_coding/main/source/packet.h" +#include "webrtc/modules/video_coding/main/source/receiver.h" +#include "webrtc/modules/video_coding/main/source/stream_generator.h" #include "webrtc/modules/video_coding/main/source/timing.h" #include "webrtc/modules/video_coding/main/test/test_util.h" -#include "webrtc/modules/video_coding/main/source/stream_generator.h" #include "webrtc/system_wrappers/interface/clock.h" #include "webrtc/system_wrappers/interface/critical_section_wrapper.h" diff --git a/webrtc/modules/video_coding/main/source/rtt_filter.cc b/webrtc/modules/video_coding/main/source/rtt_filter.cc index 3e9e545f8..e609592ba 100644 --- a/webrtc/modules/video_coding/main/source/rtt_filter.cc +++ b/webrtc/modules/video_coding/main/source/rtt_filter.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "trace.h" -#include "internal_defines.h" -#include "rtt_filter.h" +#include "webrtc/modules/video_coding/main/source/internal_defines.h" +#include "webrtc/modules/video_coding/main/source/rtt_filter.h" +#include "webrtc/system_wrappers/interface/trace.h" #include #include diff --git a/webrtc/modules/video_coding/main/source/rtt_filter.h b/webrtc/modules/video_coding/main/source/rtt_filter.h index da7bb7b5a..9ce3798b0 100644 --- a/webrtc/modules/video_coding/main/source/rtt_filter.h +++ b/webrtc/modules/video_coding/main/source/rtt_filter.h @@ -11,7 +11,7 @@ #ifndef WEBRTC_MODULES_VIDEO_CODING_RTT_FILTER_H_ #define WEBRTC_MODULES_VIDEO_CODING_RTT_FILTER_H_ -#include "typedefs.h" +#include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/main/source/session_info.cc b/webrtc/modules/video_coding/main/source/session_info.cc index e36d2a7af..86af76265 100644 --- a/webrtc/modules/video_coding/main/source/session_info.cc +++ b/webrtc/modules/video_coding/main/source/session_info.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "modules/video_coding/main/source/session_info.h" +#include "webrtc/modules/video_coding/main/source/session_info.h" -#include "modules/video_coding/main/source/packet.h" +#include "webrtc/modules/video_coding/main/source/packet.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/main/source/session_info.h b/webrtc/modules/video_coding/main/source/session_info.h index bfd8bdedc..b87e0e00c 100644 --- a/webrtc/modules/video_coding/main/source/session_info.h +++ b/webrtc/modules/video_coding/main/source/session_info.h @@ -13,9 +13,9 @@ #include -#include "modules/interface/module_common_types.h" -#include "modules/video_coding/main/source/packet.h" -#include "typedefs.h" // NOLINT(build/include) +#include "webrtc/modules/interface/module_common_types.h" +#include "webrtc/modules/video_coding/main/source/packet.h" +#include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/main/source/session_info_unittest.cc b/webrtc/modules/video_coding/main/source/session_info_unittest.cc index 4163359c9..f15fbc78c 100644 --- a/webrtc/modules/video_coding/main/source/session_info_unittest.cc +++ b/webrtc/modules/video_coding/main/source/session_info_unittest.cc @@ -10,10 +10,10 @@ #include -#include "gtest/gtest.h" -#include "modules/interface/module_common_types.h" -#include "modules/video_coding/main/source/packet.h" -#include "modules/video_coding/main/source/session_info.h" +#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/modules/interface/module_common_types.h" +#include "webrtc/modules/video_coding/main/source/packet.h" +#include "webrtc/modules/video_coding/main/source/session_info.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/main/source/timestamp_extrapolator.cc b/webrtc/modules/video_coding/main/source/timestamp_extrapolator.cc index 6e4b266ae..1d911a54e 100644 --- a/webrtc/modules/video_coding/main/source/timestamp_extrapolator.cc +++ b/webrtc/modules/video_coding/main/source/timestamp_extrapolator.cc @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "internal_defines.h" -#include "timestamp_extrapolator.h" -#include "trace.h" +#include "webrtc/modules/video_coding/main/source/internal_defines.h" +#include "webrtc/modules/video_coding/main/source/timestamp_extrapolator.h" #include "webrtc/system_wrappers/interface/clock.h" +#include "webrtc/system_wrappers/interface/trace.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/main/source/timestamp_extrapolator.h b/webrtc/modules/video_coding/main/source/timestamp_extrapolator.h index 13ca37df5..4565186a3 100644 --- a/webrtc/modules/video_coding/main/source/timestamp_extrapolator.h +++ b/webrtc/modules/video_coding/main/source/timestamp_extrapolator.h @@ -11,8 +11,8 @@ #ifndef WEBRTC_MODULES_VIDEO_CODING_TIMESTAMP_EXTRAPOLATOR_H_ #define WEBRTC_MODULES_VIDEO_CODING_TIMESTAMP_EXTRAPOLATOR_H_ -#include "typedefs.h" -#include "rw_lock_wrapper.h" +#include "webrtc/system_wrappers/interface/rw_lock_wrapper.h" +#include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/main/source/timestamp_map.cc b/webrtc/modules/video_coding/main/source/timestamp_map.cc index d7c554ed0..f3806bb87 100644 --- a/webrtc/modules/video_coding/main/source/timestamp_map.cc +++ b/webrtc/modules/video_coding/main/source/timestamp_map.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "timestamp_map.h" -#include #include +#include +#include "webrtc/modules/video_coding/main/source/timestamp_map.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/main/source/timestamp_map.h b/webrtc/modules/video_coding/main/source/timestamp_map.h index 069feeb45..14e06290f 100644 --- a/webrtc/modules/video_coding/main/source/timestamp_map.h +++ b/webrtc/modules/video_coding/main/source/timestamp_map.h @@ -11,7 +11,7 @@ #ifndef WEBRTC_MODULES_VIDEO_CODING_TIMESTAMP_MAP_H_ #define WEBRTC_MODULES_VIDEO_CODING_TIMESTAMP_MAP_H_ -#include "typedefs.h" +#include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/main/source/timing_unittest.cc b/webrtc/modules/video_coding/main/source/timing_unittest.cc index 806aac855..496946ebb 100644 --- a/webrtc/modules/video_coding/main/source/timing_unittest.cc +++ b/webrtc/modules/video_coding/main/source/timing_unittest.cc @@ -8,10 +8,10 @@ * 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/main/interface/video_coding.h" #include "webrtc/modules/video_coding/main/source/internal_defines.h" diff --git a/webrtc/modules/video_coding/main/source/video_coding_impl.cc b/webrtc/modules/video_coding/main/source/video_coding_impl.cc index 4e11cf7d8..4dc2eb513 100644 --- a/webrtc/modules/video_coding/main/source/video_coding_impl.cc +++ b/webrtc/modules/video_coding/main/source/video_coding_impl.cc @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "video_coding_impl.h" -#include "common_video/libyuv/include/webrtc_libyuv.h" -#include "common_types.h" -#include "encoded_frame.h" -#include "jitter_buffer.h" -#include "packet.h" -#include "trace.h" -#include "video_codec_interface.h" +#include "webrtc/common_types.h" +#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" +#include "webrtc/modules/video_coding/codecs/interface/video_codec_interface.h" +#include "webrtc/modules/video_coding/main/source/encoded_frame.h" +#include "webrtc/modules/video_coding/main/source/jitter_buffer.h" +#include "webrtc/modules/video_coding/main/source/packet.h" +#include "webrtc/modules/video_coding/main/source/video_coding_impl.h" #include "webrtc/system_wrappers/interface/clock.h" +#include "webrtc/system_wrappers/interface/trace.h" #include "webrtc/system_wrappers/interface/trace_event.h" namespace webrtc diff --git a/webrtc/modules/video_coding/main/source/video_coding_impl.h b/webrtc/modules/video_coding/main/source/video_coding_impl.h index 632db50ed..64ccfe21a 100644 --- a/webrtc/modules/video_coding/main/source/video_coding_impl.h +++ b/webrtc/modules/video_coding/main/source/video_coding_impl.h @@ -11,7 +11,7 @@ #ifndef WEBRTC_MODULES_VIDEO_CODING_VIDEO_CODING_IMPL_H_ #define WEBRTC_MODULES_VIDEO_CODING_VIDEO_CODING_IMPL_H_ -#include "modules/video_coding/main/interface/video_coding.h" +#include "webrtc/modules/video_coding/main/interface/video_coding.h" #include diff --git a/webrtc/modules/video_coding/main/source/video_coding_robustness_unittest.cc b/webrtc/modules/video_coding/main/source/video_coding_robustness_unittest.cc index 3c53945bb..cb3bfb15f 100644 --- a/webrtc/modules/video_coding/main/source/video_coding_robustness_unittest.cc +++ b/webrtc/modules/video_coding/main/source/video_coding_robustness_unittest.cc @@ -11,8 +11,8 @@ #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" #include "webrtc/modules/video_coding/codecs/interface/mock/mock_video_codec_interface.h" -#include "webrtc/modules/video_coding/main/interface/video_coding.h" #include "webrtc/modules/video_coding/main/interface/mock/mock_vcm_callbacks.h" +#include "webrtc/modules/video_coding/main/interface/video_coding.h" #include "webrtc/modules/video_coding/main/test/test_util.h" #include "webrtc/system_wrappers/interface/clock.h" diff --git a/webrtc/modules/video_coding/main/test/codec_database_test.h b/webrtc/modules/video_coding/main/test/codec_database_test.h index 631819ec3..13b4bdbc3 100644 --- a/webrtc/modules/video_coding/main/test/codec_database_test.h +++ b/webrtc/modules/video_coding/main/test/codec_database_test.h @@ -11,8 +11,8 @@ #ifndef WEBRTC_MODULES_VIDEO_CODING_TEST_CODEC_DATABASE_TEST_H_ #define WEBRTC_MODULES_VIDEO_CODING_TEST_CODEC_DATABASE_TEST_H_ -#include "video_coding.h" -#include "test_util.h" +#include "webrtc/modules/video_coding/main/interface/video_coding.h" +#include "webrtc/modules/video_coding/main/test/test_util.h" #include diff --git a/webrtc/modules/video_coding/main/test/decode_from_storage_test.cc b/webrtc/modules/video_coding/main/test/decode_from_storage_test.cc index 3a32431b3..612b49e01 100644 --- a/webrtc/modules/video_coding/main/test/decode_from_storage_test.cc +++ b/webrtc/modules/video_coding/main/test/decode_from_storage_test.cc @@ -9,6 +9,7 @@ */ #include "webrtc/modules/video_coding/main/test/receiver_tests.h" +#include "webrtc/modules/video_coding/main/test/test_util.h" #include "webrtc/modules/video_coding/main/test/vcm_payload_sink_factory.h" #include "webrtc/system_wrappers/interface/trace.h" #include "webrtc/test/testsupport/fileutils.h" diff --git a/webrtc/modules/video_coding/main/test/generic_codec_test.h b/webrtc/modules/video_coding/main/test/generic_codec_test.h index acfff8dba..9f53e9a2d 100644 --- a/webrtc/modules/video_coding/main/test/generic_codec_test.h +++ b/webrtc/modules/video_coding/main/test/generic_codec_test.h @@ -11,13 +11,13 @@ #ifndef WEBRTC_MODULES_VIDEO_CODING_TEST_GENERIC_CODEC_TEST_H_ #define WEBRTC_MODULES_VIDEO_CODING_TEST_GENERIC_CODEC_TEST_H_ -#include "video_coding.h" +#include "webrtc/modules/video_coding/main/interface/video_coding.h" -#include #include +#include -#include "test_callbacks.h" -#include "test_util.h" +#include "webrtc/modules/video_coding/main/test/test_callbacks.h" +#include "webrtc/modules/video_coding/main/test/test_util.h" /* Test consists of: 1. Sanity checks diff --git a/webrtc/modules/video_coding/main/test/media_opt_test.cc b/webrtc/modules/video_coding/main/test/media_opt_test.cc index 490e940f9..0e6a10d8c 100644 --- a/webrtc/modules/video_coding/main/test/media_opt_test.cc +++ b/webrtc/modules/video_coding/main/test/media_opt_test.cc @@ -13,8 +13,8 @@ #include "webrtc/modules/video_coding/main/test/media_opt_test.h" -#include #include +#include #include #include diff --git a/webrtc/modules/video_coding/main/test/media_opt_test.h b/webrtc/modules/video_coding/main/test/media_opt_test.h index 7f6d5e387..5a95276ab 100644 --- a/webrtc/modules/video_coding/main/test/media_opt_test.h +++ b/webrtc/modules/video_coding/main/test/media_opt_test.h @@ -15,12 +15,12 @@ #include -#include "receiver_tests.h" // receive side callbacks -#include "rtp_rtcp.h" -#include "test_callbacks.h" -#include "test_util.h" -#include "video_coding.h" -#include "video_source.h" +#include "webrtc/modules/rtp_rtcp/interface/rtp_rtcp.h" +#include "webrtc/modules/video_coding/main/interface/video_coding.h" +#include "webrtc/modules/video_coding/main/test/receiver_tests.h" // receive side callbacks +#include "webrtc/modules/video_coding/main/test/test_callbacks.h" +#include "webrtc/modules/video_coding/main/test/test_util.h" +#include "webrtc/modules/video_coding/main/test/video_source.h" // media optimization test // This test simulates a complete encode-decode cycle via the RTP module. diff --git a/webrtc/modules/video_coding/main/test/mt_rx_tx_test.cc b/webrtc/modules/video_coding/main/test/mt_rx_tx_test.cc index c711578ca..40ea24d10 100644 --- a/webrtc/modules/video_coding/main/test/mt_rx_tx_test.cc +++ b/webrtc/modules/video_coding/main/test/mt_rx_tx_test.cc @@ -380,4 +380,3 @@ int MTRxTxTest(CmdArgs& args) return 0; } - diff --git a/webrtc/modules/video_coding/main/test/mt_test_common.h b/webrtc/modules/video_coding/main/test/mt_test_common.h index 2386085b7..08813a0de 100644 --- a/webrtc/modules/video_coding/main/test/mt_test_common.h +++ b/webrtc/modules/video_coding/main/test/mt_test_common.h @@ -15,10 +15,10 @@ #ifndef WEBRTC_MODULES_VIDEO_CODING_TEST_MT_TEST_COMMON_H_ #define WEBRTC_MODULES_VIDEO_CODING_TEST_MT_TEST_COMMON_H_ -#include "rtp_rtcp.h" -#include "test_callbacks.h" -#include "test_util.h" -#include "video_coding.h" +#include "webrtc/modules/rtp_rtcp/interface/rtp_rtcp.h" +#include "webrtc/modules/video_coding/main/interface/video_coding.h" +#include "webrtc/modules/video_coding/main/test/test_callbacks.h" +#include "webrtc/modules/video_coding/main/test/video_source.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/main/test/normal_test.h b/webrtc/modules/video_coding/main/test/normal_test.h index 9d2bcd29f..28a37c457 100644 --- a/webrtc/modules/video_coding/main/test/normal_test.h +++ b/webrtc/modules/video_coding/main/test/normal_test.h @@ -11,8 +11,9 @@ #ifndef WEBRTC_MODULES_VIDEO_CODING_TEST_NORMAL_TEST_H_ #define WEBRTC_MODULES_VIDEO_CODING_TEST_NORMAL_TEST_H_ -#include "video_coding.h" -#include "test_util.h" +#include "webrtc/modules/video_coding/main/interface/video_coding.h" +#include "webrtc/modules/video_coding/main/test/test_util.h" +#include "webrtc/modules/video_coding/main/test/video_source.h" #include #include diff --git a/webrtc/modules/video_coding/main/test/quality_modes_test.cc b/webrtc/modules/video_coding/main/test/quality_modes_test.cc index de7ec4bc5..31242774b 100644 --- a/webrtc/modules/video_coding/main/test/quality_modes_test.cc +++ b/webrtc/modules/video_coding/main/test/quality_modes_test.cc @@ -10,10 +10,10 @@ #include "webrtc/modules/video_coding/main/test/quality_modes_test.h" -#include #include -#include #include +#include +#include #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" #include "webrtc/modules/video_coding/main/interface/video_coding.h" diff --git a/webrtc/modules/video_coding/main/test/quality_modes_test.h b/webrtc/modules/video_coding/main/test/quality_modes_test.h index 5ed4ffd84..38da78d94 100644 --- a/webrtc/modules/video_coding/main/test/quality_modes_test.h +++ b/webrtc/modules/video_coding/main/test/quality_modes_test.h @@ -11,10 +11,10 @@ #ifndef WEBRTC_MODULES_VIDEO_CODING_TEST_QUALITY_MODSE_TEST_H_ #define WEBRTC_MODULES_VIDEO_CODING_TEST_QUALITY_MODSE_TEST_H_ -#include "video_processing.h" -#include "normal_test.h" -#include "system_wrappers/interface/data_log.h" -#include "video_coding_defines.h" +#include "webrtc/modules/video_coding/main/interface/video_coding_defines.h" +#include "webrtc/modules/video_coding/main/test/normal_test.h" +#include "webrtc/modules/video_processing/main/interface/video_processing.h" +#include "webrtc/system_wrappers/interface/data_log.h" int qualityModeTest(const CmdArgs& args); diff --git a/webrtc/modules/video_coding/main/test/receiver_tests.h b/webrtc/modules/video_coding/main/test/receiver_tests.h index 47f9572bb..ca276e9c5 100644 --- a/webrtc/modules/video_coding/main/test/receiver_tests.h +++ b/webrtc/modules/video_coding/main/test/receiver_tests.h @@ -11,15 +11,16 @@ #ifndef WEBRTC_MODULES_VIDEO_CODING_TEST_RECEIVER_TESTS_H_ #define WEBRTC_MODULES_VIDEO_CODING_TEST_RECEIVER_TESTS_H_ -#include "video_coding.h" -#include "module_common_types.h" -#include "common_types.h" -#include "rtp_rtcp.h" -#include "typedefs.h" -#include "test_util.h" +#include "webrtc/common_types.h" +#include "webrtc/modules/interface/module_common_types.h" +#include "webrtc/modules/rtp_rtcp/interface/rtp_rtcp.h" +#include "webrtc/modules/video_coding/main/interface/video_coding.h" +#include "webrtc/modules/video_coding/main/test/test_util.h" +#include "webrtc/modules/video_coding/main/test/video_source.h" +#include "webrtc/typedefs.h" -#include #include +#include class RtpDataCallback : public webrtc::NullRtpData { public: diff --git a/webrtc/modules/video_coding/main/test/test_callbacks.h b/webrtc/modules/video_coding/main/test/test_callbacks.h index f2375d177..429760672 100644 --- a/webrtc/modules/video_coding/main/test/test_callbacks.h +++ b/webrtc/modules/video_coding/main/test/test_callbacks.h @@ -16,16 +16,16 @@ */ -#include #include #include #include +#include -#include "module_common_types.h" -#include "rtp_rtcp.h" -#include "test_util.h" -#include "trace.h" -#include "video_coding.h" +#include "webrtc/modules/interface/module_common_types.h" +#include "webrtc/modules/rtp_rtcp/interface/rtp_rtcp.h" +#include "webrtc/modules/video_coding/main/interface/video_coding.h" +#include "webrtc/modules/video_coding/main/test/test_util.h" +#include "webrtc/system_wrappers/interface/trace.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/main/test/test_util.h b/webrtc/modules/video_coding/main/test/test_util.h index c08786aaf..36ca2198f 100644 --- a/webrtc/modules/video_coding/main/test/test_util.h +++ b/webrtc/modules/video_coding/main/test/test_util.h @@ -19,8 +19,8 @@ #include "webrtc/modules/interface/module_common_types.h" #include "webrtc/modules/video_coding/main/interface/video_coding.h" -#include "webrtc/system_wrappers/interface/event_wrapper.h" #include "webrtc/system_wrappers/interface/constructor_magic.h" +#include "webrtc/system_wrappers/interface/event_wrapper.h" enum { kMaxNackListSize = 250 }; enum { kMaxPacketAgeToNack = 450 }; diff --git a/webrtc/modules/video_coding/main/test/tester_main.cc b/webrtc/modules/video_coding/main/test/tester_main.cc index 8d4a4e16e..eec5902ad 100644 --- a/webrtc/modules/video_coding/main/test/tester_main.cc +++ b/webrtc/modules/video_coding/main/test/tester_main.cc @@ -12,14 +12,14 @@ #include #include -#include "google/gflags.h" +#include "gflags/gflags.h" #include "webrtc/modules/video_coding/main/interface/video_coding.h" -#include "webrtc/modules/video_coding/main/test/receiver_tests.h" -#include "webrtc/modules/video_coding/main/test/normal_test.h" #include "webrtc/modules/video_coding/main/test/codec_database_test.h" #include "webrtc/modules/video_coding/main/test/generic_codec_test.h" #include "webrtc/modules/video_coding/main/test/media_opt_test.h" +#include "webrtc/modules/video_coding/main/test/normal_test.h" #include "webrtc/modules/video_coding/main/test/quality_modes_test.h" +#include "webrtc/modules/video_coding/main/test/receiver_tests.h" #include "webrtc/modules/video_coding/main/test/test_util.h" #include "webrtc/test/testsupport/fileutils.h" diff --git a/webrtc/modules/video_coding/main/test/video_source.cc b/webrtc/modules/video_coding/main/test/video_source.cc index 3078f769e..781ea2c25 100644 --- a/webrtc/modules/video_coding/main/test/video_source.cc +++ b/webrtc/modules/video_coding/main/test/video_source.cc @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "video_source.h" +#include "webrtc/modules/video_coding/main/test/video_source.h" #include -#include "testsupport/fileutils.h" +#include "webrtc/test/testsupport/fileutils.h" VideoSource::VideoSource() : diff --git a/webrtc/modules/video_coding/main/test/video_source.h b/webrtc/modules/video_coding/main/test/video_source.h index 822249e57..98cc3fe02 100644 --- a/webrtc/modules/video_coding/main/test/video_source.h +++ b/webrtc/modules/video_coding/main/test/video_source.h @@ -11,8 +11,8 @@ #ifndef WEBRTC_MODULES_VIDEO_CODING_TEST_VIDEO_SOURCE_H_ #define WEBRTC_MODULES_VIDEO_CODING_TEST_VIDEO_SOURCE_H_ -#include "common_video/libyuv/include/webrtc_libyuv.h" -#include "typedefs.h" +#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" +#include "webrtc/typedefs.h" #include @@ -80,4 +80,3 @@ private: }; #endif // WEBRTC_MODULES_VIDEO_CODING_TEST_VIDEO_SOURCE_H_ - diff --git a/webrtc/modules/video_coding/utility/include/mock/mock_frame_dropper.h b/webrtc/modules/video_coding/utility/include/mock/mock_frame_dropper.h index fe4e86706..b820f9f75 100644 --- a/webrtc/modules/video_coding/utility/include/mock/mock_frame_dropper.h +++ b/webrtc/modules/video_coding/utility/include/mock/mock_frame_dropper.h @@ -12,7 +12,7 @@ #include -#include "gmock/gmock.h" +#include "testing/gmock/include/gmock/gmock.h" #include "webrtc/modules/video_coding/utility/include/frame_dropper.h" #include "webrtc/typedefs.h"