From 0b9e29c87da2d9c1a3792d2c87197b0688b68e4e Mon Sep 17 00:00:00 2001 From: Henrik Kjellander Date: Mon, 16 Nov 2015 11:12:24 +0100 Subject: [PATCH] Remove include dirs from modules/{media_file,pacing} Also move files out of media_file/source. BUG=webrtc:5095 TESTED=git cl try -c --bot=android_compile_rel --bot=linux_compile_rel --bot=win_compile_rel --bot=mac_compile_rel --bot=ios_rel --bot=linux_gn_rel --bot=win_x64_gn_rel --bot=mac_x64_gn_rel --bot=android_gn_rel -m tryserver.webrtc R=asapersson@webrtc.org, perkj@webrtc.org, tommi@webrtc.org Review URL: https://codereview.webrtc.org/1435093002 . Cr-Commit-Position: refs/heads/master@{#10647} --- webrtc/call/call.cc | 2 +- webrtc/call/congestion_controller.cc | 4 ++-- webrtc/modules/media_file/BUILD.gn | 12 ++++++------ webrtc/modules/media_file/media_file.gypi | 12 ++++++------ webrtc/modules/media_file/{include => }/media_file.h | 8 ++++---- .../media_file/{include => }/media_file_defines.h | 6 +++--- .../media_file/{source => }/media_file_impl.cc | 2 +- .../media_file/{source => }/media_file_impl.h | 12 ++++++------ .../media_file/{source => }/media_file_unittest.cc | 2 +- .../media_file/{source => }/media_file_utility.cc | 2 +- .../media_file/{source => }/media_file_utility.h | 8 ++++---- webrtc/modules/media_file/source/OWNERS | 5 ----- webrtc/modules/modules.gyp | 2 +- webrtc/modules/pacing/BUILD.gn | 4 ++-- webrtc/modules/pacing/bitrate_prober.cc | 2 +- .../pacing/{include => }/mock/mock_paced_sender.h | 8 ++++---- webrtc/modules/pacing/paced_sender.cc | 2 +- webrtc/modules/pacing/{include => }/paced_sender.h | 6 +++--- webrtc/modules/pacing/paced_sender_unittest.cc | 2 +- webrtc/modules/pacing/pacing.gypi | 4 ++-- webrtc/modules/pacing/packet_router.cc | 2 +- webrtc/modules/pacing/{include => }/packet_router.h | 8 ++++---- webrtc/modules/pacing/packet_router_unittest.cc | 2 +- .../remote_bitrate_estimator_abs_send_time.cc | 2 +- .../remote_estimator_proxy.cc | 2 +- .../remote_estimator_proxy_unittest.cc | 2 +- .../test/bwe_test_framework.h | 2 +- webrtc/modules/utility/include/file_recorder.h | 2 +- webrtc/modules/utility/source/file_player_impl.h | 4 ++-- webrtc/modules/utility/source/file_recorder_impl.cc | 2 +- webrtc/modules/utility/source/file_recorder_impl.h | 4 ++-- webrtc/test/fake_audio_device.cc | 2 +- webrtc/video/rampup_tests.cc | 2 +- webrtc/video/video_send_stream.cc | 2 +- .../video_engine/encoder_state_feedback_unittest.cc | 4 ++-- webrtc/video_engine/vie_channel.cc | 4 ++-- webrtc/video_engine/vie_encoder.cc | 2 +- webrtc/voice_engine/voe_file_impl.cc | 2 +- 38 files changed, 75 insertions(+), 80 deletions(-) rename webrtc/modules/media_file/{include => }/media_file.h (97%) rename webrtc/modules/media_file/{include => }/media_file_defines.h (90%) rename webrtc/modules/media_file/{source => }/media_file_impl.cc (99%) rename webrtc/modules/media_file/{source => }/media_file_impl.h (92%) rename webrtc/modules/media_file/{source => }/media_file_unittest.cc (98%) rename webrtc/modules/media_file/{source => }/media_file_utility.cc (99%) rename webrtc/modules/media_file/{source => }/media_file_utility.h (97%) delete mode 100644 webrtc/modules/media_file/source/OWNERS rename webrtc/modules/pacing/{include => }/mock/mock_paced_sender.h (81%) rename webrtc/modules/pacing/{include => }/paced_sender.h (97%) rename webrtc/modules/pacing/{include => }/packet_router.h (89%) diff --git a/webrtc/call/call.cc b/webrtc/call/call.cc index 95e065d883..128a992311 100644 --- a/webrtc/call/call.cc +++ b/webrtc/call/call.cc @@ -29,7 +29,7 @@ #include "webrtc/common.h" #include "webrtc/config.h" #include "webrtc/modules/bitrate_controller/include/bitrate_controller.h" -#include "webrtc/modules/pacing/include/paced_sender.h" +#include "webrtc/modules/pacing/paced_sender.h" #include "webrtc/modules/rtp_rtcp/include/rtp_header_parser.h" #include "webrtc/modules/rtp_rtcp/source/byte_io.h" #include "webrtc/modules/utility/include/process_thread.h" diff --git a/webrtc/call/congestion_controller.cc b/webrtc/call/congestion_controller.cc index d29b0d7745..387792f338 100644 --- a/webrtc/call/congestion_controller.cc +++ b/webrtc/call/congestion_controller.cc @@ -14,8 +14,8 @@ #include "webrtc/base/thread_annotations.h" #include "webrtc/common.h" #include "webrtc/modules/bitrate_controller/include/bitrate_controller.h" -#include "webrtc/modules/pacing/include/paced_sender.h" -#include "webrtc/modules/pacing/include/packet_router.h" +#include "webrtc/modules/pacing/paced_sender.h" +#include "webrtc/modules/pacing/packet_router.h" #include "webrtc/modules/remote_bitrate_estimator/include/send_time_history.h" #include "webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time.h" #include "webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream.h" diff --git a/webrtc/modules/media_file/BUILD.gn b/webrtc/modules/media_file/BUILD.gn index 70abb51f4d..2a4be728f3 100644 --- a/webrtc/modules/media_file/BUILD.gn +++ b/webrtc/modules/media_file/BUILD.gn @@ -14,12 +14,12 @@ config("media_file_config") { source_set("media_file") { sources = [ - "include/media_file.h", - "include/media_file_defines.h", - "source/media_file_impl.cc", - "source/media_file_impl.h", - "source/media_file_utility.cc", - "source/media_file_utility.h", + "media_file.h", + "media_file_defines.h", + "media_file_impl.cc", + "media_file_impl.h", + "media_file_utility.cc", + "media_file_utility.h", ] if (is_win) { diff --git a/webrtc/modules/media_file/media_file.gypi b/webrtc/modules/media_file/media_file.gypi index b3d8968b16..94a99a22f1 100644 --- a/webrtc/modules/media_file/media_file.gypi +++ b/webrtc/modules/media_file/media_file.gypi @@ -17,12 +17,12 @@ '<(webrtc_root)/common_audio/common_audio.gyp:common_audio', ], 'sources': [ - 'include/media_file.h', - 'include/media_file_defines.h', - 'source/media_file_impl.cc', - 'source/media_file_impl.h', - 'source/media_file_utility.cc', - 'source/media_file_utility.h', + 'media_file.h', + 'media_file_defines.h', + 'media_file_impl.cc', + 'media_file_impl.h', + 'media_file_utility.cc', + 'media_file_utility.h', ], # source # TODO(jschuh): Bug 1348: fix size_t to int truncations. 'msvs_disabled_warnings': [ 4267, ], diff --git a/webrtc/modules/media_file/include/media_file.h b/webrtc/modules/media_file/media_file.h similarity index 97% rename from webrtc/modules/media_file/include/media_file.h rename to webrtc/modules/media_file/media_file.h index 22c727e1a8..f6924d6bb0 100644 --- a/webrtc/modules/media_file/include/media_file.h +++ b/webrtc/modules/media_file/media_file.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_MEDIA_FILE_INCLUDE_MEDIA_FILE_H_ -#define WEBRTC_MODULES_MEDIA_FILE_INCLUDE_MEDIA_FILE_H_ +#ifndef WEBRTC_MODULES_MEDIA_FILE_MEDIA_FILE_H_ +#define WEBRTC_MODULES_MEDIA_FILE_MEDIA_FILE_H_ #include "webrtc/common_types.h" #include "webrtc/modules/include/module.h" #include "webrtc/modules/include/module_common_types.h" -#include "webrtc/modules/media_file/include/media_file_defines.h" +#include "webrtc/modules/media_file/media_file_defines.h" #include "webrtc/typedefs.h" namespace webrtc { @@ -177,4 +177,4 @@ protected: virtual ~MediaFile() {} }; } // namespace webrtc -#endif // WEBRTC_MODULES_MEDIA_FILE_INCLUDE_MEDIA_FILE_H_ +#endif // WEBRTC_MODULES_MEDIA_FILE_MEDIA_FILE_H_ diff --git a/webrtc/modules/media_file/include/media_file_defines.h b/webrtc/modules/media_file/media_file_defines.h similarity index 90% rename from webrtc/modules/media_file/include/media_file_defines.h rename to webrtc/modules/media_file/media_file_defines.h index 05e7e72770..a021a148a5 100644 --- a/webrtc/modules/media_file/include/media_file_defines.h +++ b/webrtc/modules/media_file/media_file_defines.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_MEDIA_FILE_INCLUDE_MEDIA_FILE_DEFINES_H_ -#define WEBRTC_MODULES_MEDIA_FILE_INCLUDE_MEDIA_FILE_DEFINES_H_ +#ifndef WEBRTC_MODULES_MEDIA_FILE_MEDIA_FILE_DEFINES_H_ +#define WEBRTC_MODULES_MEDIA_FILE_MEDIA_FILE_DEFINES_H_ #include "webrtc/engine_configurations.h" #include "webrtc/modules/include/module_common_types.h" @@ -48,4 +48,4 @@ protected: FileCallback() {} }; } // namespace webrtc -#endif // WEBRTC_MODULES_MEDIA_FILE_INCLUDE_MEDIA_FILE_DEFINES_H_ +#endif // WEBRTC_MODULES_MEDIA_FILE_MEDIA_FILE_DEFINES_H_ diff --git a/webrtc/modules/media_file/source/media_file_impl.cc b/webrtc/modules/media_file/media_file_impl.cc similarity index 99% rename from webrtc/modules/media_file/source/media_file_impl.cc rename to webrtc/modules/media_file/media_file_impl.cc index 50175b86d5..abc7b9d9e0 100644 --- a/webrtc/modules/media_file/source/media_file_impl.cc +++ b/webrtc/modules/media_file/media_file_impl.cc @@ -11,7 +11,7 @@ #include #include "webrtc/base/format_macros.h" -#include "webrtc/modules/media_file/source/media_file_impl.h" +#include "webrtc/modules/media_file/media_file_impl.h" #include "webrtc/system_wrappers/include/critical_section_wrapper.h" #include "webrtc/system_wrappers/include/file_wrapper.h" #include "webrtc/system_wrappers/include/tick_util.h" diff --git a/webrtc/modules/media_file/source/media_file_impl.h b/webrtc/modules/media_file/media_file_impl.h similarity index 92% rename from webrtc/modules/media_file/source/media_file_impl.h rename to webrtc/modules/media_file/media_file_impl.h index 618497955e..c23f514c75 100644 --- a/webrtc/modules/media_file/source/media_file_impl.h +++ b/webrtc/modules/media_file/media_file_impl.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_MEDIA_FILE_SOURCE_MEDIA_FILE_IMPL_H_ -#define WEBRTC_MODULES_MEDIA_FILE_SOURCE_MEDIA_FILE_IMPL_H_ +#ifndef WEBRTC_MODULES_MEDIA_FILE_MEDIA_FILE_IMPL_H_ +#define WEBRTC_MODULES_MEDIA_FILE_MEDIA_FILE_IMPL_H_ #include "webrtc/common_types.h" #include "webrtc/modules/include/module_common_types.h" -#include "webrtc/modules/media_file/include/media_file.h" -#include "webrtc/modules/media_file/include/media_file_defines.h" -#include "webrtc/modules/media_file/source/media_file_utility.h" +#include "webrtc/modules/media_file/media_file.h" +#include "webrtc/modules/media_file/media_file_defines.h" +#include "webrtc/modules/media_file/media_file_utility.h" #include "webrtc/system_wrappers/include/critical_section_wrapper.h" namespace webrtc { @@ -145,4 +145,4 @@ private: }; } // namespace webrtc -#endif // WEBRTC_MODULES_MEDIA_FILE_SOURCE_MEDIA_FILE_IMPL_H_ +#endif // WEBRTC_MODULES_MEDIA_FILE_MEDIA_FILE_IMPL_H_ diff --git a/webrtc/modules/media_file/source/media_file_unittest.cc b/webrtc/modules/media_file/media_file_unittest.cc similarity index 98% rename from webrtc/modules/media_file/source/media_file_unittest.cc rename to webrtc/modules/media_file/media_file_unittest.cc index 4a50c2e2d0..c12ea57ea2 100644 --- a/webrtc/modules/media_file/source/media_file_unittest.cc +++ b/webrtc/modules/media_file/media_file_unittest.cc @@ -9,7 +9,7 @@ */ #include "testing/gtest/include/gtest/gtest.h" -#include "webrtc/modules/media_file/include/media_file.h" +#include "webrtc/modules/media_file/media_file.h" #include "webrtc/system_wrappers/include/sleep.h" #include "webrtc/test/testsupport/fileutils.h" #include "webrtc/test/testsupport/gtest_disable.h" diff --git a/webrtc/modules/media_file/source/media_file_utility.cc b/webrtc/modules/media_file/media_file_utility.cc similarity index 99% rename from webrtc/modules/media_file/source/media_file_utility.cc rename to webrtc/modules/media_file/media_file_utility.cc index fad7fe4079..babfa6378b 100644 --- a/webrtc/modules/media_file/source/media_file_utility.cc +++ b/webrtc/modules/media_file/media_file_utility.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/media_file/source/media_file_utility.h" +#include "webrtc/modules/media_file/media_file_utility.h" #include #include diff --git a/webrtc/modules/media_file/source/media_file_utility.h b/webrtc/modules/media_file/media_file_utility.h similarity index 97% rename from webrtc/modules/media_file/source/media_file_utility.h rename to webrtc/modules/media_file/media_file_utility.h index 65921bd963..8f543bafd3 100644 --- a/webrtc/modules/media_file/source/media_file_utility.h +++ b/webrtc/modules/media_file/media_file_utility.h @@ -9,13 +9,13 @@ */ // Note: the class cannot be used for reading and writing at the same time. -#ifndef WEBRTC_MODULES_MEDIA_FILE_SOURCE_MEDIA_FILE_UTILITY_H_ -#define WEBRTC_MODULES_MEDIA_FILE_SOURCE_MEDIA_FILE_UTILITY_H_ +#ifndef WEBRTC_MODULES_MEDIA_FILE_MEDIA_FILE_UTILITY_H_ +#define WEBRTC_MODULES_MEDIA_FILE_MEDIA_FILE_UTILITY_H_ #include #include "webrtc/common_types.h" -#include "webrtc/modules/media_file/include/media_file_defines.h" +#include "webrtc/modules/media_file/media_file_defines.h" namespace webrtc { class InStream; @@ -281,4 +281,4 @@ private: uint8_t _tempData[WAV_MAX_BUFFER_SIZE]; }; } // namespace webrtc -#endif // WEBRTC_MODULES_MEDIA_FILE_SOURCE_MEDIA_FILE_UTILITY_H_ +#endif // WEBRTC_MODULES_MEDIA_FILE_MEDIA_FILE_UTILITY_H_ diff --git a/webrtc/modules/media_file/source/OWNERS b/webrtc/modules/media_file/source/OWNERS deleted file mode 100644 index 3ee6b4bf5f..0000000000 --- a/webrtc/modules/media_file/source/OWNERS +++ /dev/null @@ -1,5 +0,0 @@ - -# These are for the common case of adding or renaming files. If you're doing -# structural changes, please get a review from a reviewer in this file. -per-file *.gyp=* -per-file *.gypi=* diff --git a/webrtc/modules/modules.gyp b/webrtc/modules/modules.gyp index 419580f47c..22dbff2f04 100644 --- a/webrtc/modules/modules.gyp +++ b/webrtc/modules/modules.gyp @@ -211,7 +211,7 @@ 'desktop_capture/win/cursor_unittest.cc', 'desktop_capture/win/cursor_unittest_resources.h', 'desktop_capture/win/cursor_unittest_resources.rc', - 'media_file/source/media_file_unittest.cc', + 'media_file/media_file_unittest.cc', 'module_common_types_unittest.cc', 'pacing/bitrate_prober_unittest.cc', 'pacing/paced_sender_unittest.cc', diff --git a/webrtc/modules/pacing/BUILD.gn b/webrtc/modules/pacing/BUILD.gn index 3e478c1e76..0354c64fcb 100644 --- a/webrtc/modules/pacing/BUILD.gn +++ b/webrtc/modules/pacing/BUILD.gn @@ -10,10 +10,10 @@ source_set("pacing") { sources = [ "bitrate_prober.cc", "bitrate_prober.h", - "include/paced_sender.h", - "include/packet_router.h", "paced_sender.cc", + "paced_sender.h", "packet_router.cc", + "packet_router.h", ] configs += [ "../..:common_config" ] diff --git a/webrtc/modules/pacing/bitrate_prober.cc b/webrtc/modules/pacing/bitrate_prober.cc index bbbe54f54e..db903f06c5 100644 --- a/webrtc/modules/pacing/bitrate_prober.cc +++ b/webrtc/modules/pacing/bitrate_prober.cc @@ -15,7 +15,7 @@ #include #include -#include "webrtc/modules/pacing/include/paced_sender.h" +#include "webrtc/modules/pacing/paced_sender.h" #include "webrtc/system_wrappers/include/logging.h" namespace webrtc { diff --git a/webrtc/modules/pacing/include/mock/mock_paced_sender.h b/webrtc/modules/pacing/mock/mock_paced_sender.h similarity index 81% rename from webrtc/modules/pacing/include/mock/mock_paced_sender.h rename to webrtc/modules/pacing/mock/mock_paced_sender.h index b2cefdff8b..01d5f6a6e9 100644 --- a/webrtc/modules/pacing/include/mock/mock_paced_sender.h +++ b/webrtc/modules/pacing/mock/mock_paced_sender.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_PACING_INCLUDE_MOCK_MOCK_PACED_SENDER_H_ -#define WEBRTC_MODULES_PACING_INCLUDE_MOCK_MOCK_PACED_SENDER_H_ +#ifndef WEBRTC_MODULES_PACING_MOCK_MOCK_PACED_SENDER_H_ +#define WEBRTC_MODULES_PACING_MOCK_MOCK_PACED_SENDER_H_ #include "testing/gmock/include/gmock/gmock.h" #include -#include "webrtc/modules/pacing/include/paced_sender.h" +#include "webrtc/modules/pacing/paced_sender.h" #include "webrtc/system_wrappers/include/clock.h" namespace webrtc { @@ -35,4 +35,4 @@ class MockPacedSender : public PacedSender { } // namespace webrtc -#endif // WEBRTC_MODULES_PACING_INCLUDE_MOCK_MOCK_PACED_SENDER_H_ +#endif // WEBRTC_MODULES_PACING_MOCK_MOCK_PACED_SENDER_H_ diff --git a/webrtc/modules/pacing/paced_sender.cc b/webrtc/modules/pacing/paced_sender.cc index 40887154a4..3c299f827e 100644 --- a/webrtc/modules/pacing/paced_sender.cc +++ b/webrtc/modules/pacing/paced_sender.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/pacing/include/paced_sender.h" +#include "webrtc/modules/pacing/paced_sender.h" #include diff --git a/webrtc/modules/pacing/include/paced_sender.h b/webrtc/modules/pacing/paced_sender.h similarity index 97% rename from webrtc/modules/pacing/include/paced_sender.h rename to webrtc/modules/pacing/paced_sender.h index 2c8e36ec85..fa9f59a3d7 100644 --- a/webrtc/modules/pacing/include/paced_sender.h +++ b/webrtc/modules/pacing/paced_sender.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_PACING_INCLUDE_PACED_SENDER_H_ -#define WEBRTC_MODULES_PACING_INCLUDE_PACED_SENDER_H_ +#ifndef WEBRTC_MODULES_PACING_PACED_SENDER_H_ +#define WEBRTC_MODULES_PACING_PACED_SENDER_H_ #include #include @@ -150,4 +150,4 @@ class PacedSender : public Module, public RtpPacketSender { uint64_t packet_counter_; }; } // namespace webrtc -#endif // WEBRTC_MODULES_PACING_INCLUDE_PACED_SENDER_H_ +#endif // WEBRTC_MODULES_PACING_PACED_SENDER_H_ diff --git a/webrtc/modules/pacing/paced_sender_unittest.cc b/webrtc/modules/pacing/paced_sender_unittest.cc index c27444c5ac..78a49cd4c3 100644 --- a/webrtc/modules/pacing/paced_sender_unittest.cc +++ b/webrtc/modules/pacing/paced_sender_unittest.cc @@ -12,7 +12,7 @@ #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" -#include "webrtc/modules/pacing/include/paced_sender.h" +#include "webrtc/modules/pacing/paced_sender.h" #include "webrtc/system_wrappers/include/clock.h" using testing::_; diff --git a/webrtc/modules/pacing/pacing.gypi b/webrtc/modules/pacing/pacing.gypi index faa97841c1..90f663c1b0 100644 --- a/webrtc/modules/pacing/pacing.gypi +++ b/webrtc/modules/pacing/pacing.gypi @@ -17,12 +17,12 @@ '<(webrtc_root)/modules/modules.gyp:rtp_rtcp', ], 'sources': [ - 'include/paced_sender.h', - 'include/packet_router.h', 'bitrate_prober.cc', 'bitrate_prober.h', 'paced_sender.cc', + 'paced_sender.h', 'packet_router.cc', + 'packet_router.h', ], }, ], # targets diff --git a/webrtc/modules/pacing/packet_router.cc b/webrtc/modules/pacing/packet_router.cc index 7af74ec723..5fd350834a 100644 --- a/webrtc/modules/pacing/packet_router.cc +++ b/webrtc/modules/pacing/packet_router.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/pacing/include/packet_router.h" +#include "webrtc/modules/pacing/packet_router.h" #include "webrtc/base/atomicops.h" #include "webrtc/base/checks.h" diff --git a/webrtc/modules/pacing/include/packet_router.h b/webrtc/modules/pacing/packet_router.h similarity index 89% rename from webrtc/modules/pacing/include/packet_router.h rename to webrtc/modules/pacing/packet_router.h index 7a65295f83..edef1aa9b3 100644 --- a/webrtc/modules/pacing/include/packet_router.h +++ b/webrtc/modules/pacing/packet_router.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_PACING_INCLUDE_PACKET_ROUTER_H_ -#define WEBRTC_MODULES_PACING_INCLUDE_PACKET_ROUTER_H_ +#ifndef WEBRTC_MODULES_PACING_PACKET_ROUTER_H_ +#define WEBRTC_MODULES_PACING_PACKET_ROUTER_H_ #include @@ -18,7 +18,7 @@ #include "webrtc/base/scoped_ptr.h" #include "webrtc/base/thread_annotations.h" #include "webrtc/common_types.h" -#include "webrtc/modules/pacing/include/paced_sender.h" +#include "webrtc/modules/pacing/paced_sender.h" #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" namespace webrtc { @@ -63,4 +63,4 @@ class PacketRouter : public PacedSender::Callback, RTC_DISALLOW_COPY_AND_ASSIGN(PacketRouter); }; } // namespace webrtc -#endif // WEBRTC_MODULES_PACING_INCLUDE_PACKET_ROUTER_H_ +#endif // WEBRTC_MODULES_PACING_PACKET_ROUTER_H_ diff --git a/webrtc/modules/pacing/packet_router_unittest.cc b/webrtc/modules/pacing/packet_router_unittest.cc index f17f797fbb..31acf44b9b 100644 --- a/webrtc/modules/pacing/packet_router_unittest.cc +++ b/webrtc/modules/pacing/packet_router_unittest.cc @@ -13,7 +13,7 @@ #include "webrtc/base/checks.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" -#include "webrtc/modules/pacing/include/packet_router.h" +#include "webrtc/modules/pacing/packet_router.h" #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp.h" #include "webrtc/modules/rtp_rtcp/mocks/mock_rtp_rtcp.h" #include "webrtc/base/scoped_ptr.h" diff --git a/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time.cc b/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time.cc index 2dc32a7ee7..51f7d4320a 100644 --- a/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time.cc +++ b/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time.cc @@ -16,7 +16,7 @@ #include "webrtc/base/scoped_ptr.h" #include "webrtc/base/thread_annotations.h" #include "webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h" -#include "webrtc/modules/pacing/include/paced_sender.h" +#include "webrtc/modules/pacing/paced_sender.h" #include "webrtc/system_wrappers/include/clock.h" #include "webrtc/system_wrappers/include/critical_section_wrapper.h" #include "webrtc/system_wrappers/include/logging.h" diff --git a/webrtc/modules/remote_bitrate_estimator/remote_estimator_proxy.cc b/webrtc/modules/remote_bitrate_estimator/remote_estimator_proxy.cc index 5c453705f7..28807b483a 100644 --- a/webrtc/modules/remote_bitrate_estimator/remote_estimator_proxy.cc +++ b/webrtc/modules/remote_bitrate_estimator/remote_estimator_proxy.cc @@ -13,7 +13,7 @@ #include "webrtc/base/checks.h" #include "webrtc/base/logging.h" #include "webrtc/system_wrappers/include/clock.h" -#include "webrtc/modules/pacing/include/packet_router.h" +#include "webrtc/modules/pacing/packet_router.h" #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h" #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp.h" diff --git a/webrtc/modules/remote_bitrate_estimator/remote_estimator_proxy_unittest.cc b/webrtc/modules/remote_bitrate_estimator/remote_estimator_proxy_unittest.cc index 826a724e33..7ddd31467b 100644 --- a/webrtc/modules/remote_bitrate_estimator/remote_estimator_proxy_unittest.cc +++ b/webrtc/modules/remote_bitrate_estimator/remote_estimator_proxy_unittest.cc @@ -11,7 +11,7 @@ #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" -#include "webrtc/modules/pacing/include/packet_router.h" +#include "webrtc/modules/pacing/packet_router.h" #include "webrtc/modules/remote_bitrate_estimator/remote_estimator_proxy.h" #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h" #include "webrtc/system_wrappers/include/clock.h" diff --git a/webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework.h b/webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework.h index 6b5f04b68f..d94ee17951 100644 --- a/webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework.h +++ b/webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework.h @@ -25,7 +25,7 @@ #include "webrtc/base/scoped_ptr.h" #include "webrtc/modules/bitrate_controller/include/bitrate_controller.h" #include "webrtc/modules/include/module_common_types.h" -#include "webrtc/modules/pacing/include/paced_sender.h" +#include "webrtc/modules/pacing/paced_sender.h" #include "webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h" #include "webrtc/modules/remote_bitrate_estimator/test/bwe_test_logging.h" #include "webrtc/modules/remote_bitrate_estimator/test/packet.h" diff --git a/webrtc/modules/utility/include/file_recorder.h b/webrtc/modules/utility/include/file_recorder.h index 0c285d442f..09ed8ae350 100644 --- a/webrtc/modules/utility/include/file_recorder.h +++ b/webrtc/modules/utility/include/file_recorder.h @@ -14,7 +14,7 @@ #include "webrtc/common_types.h" #include "webrtc/engine_configurations.h" #include "webrtc/modules/include/module_common_types.h" -#include "webrtc/modules/media_file/include/media_file_defines.h" +#include "webrtc/modules/media_file/media_file_defines.h" #include "webrtc/system_wrappers/include/tick_util.h" #include "webrtc/typedefs.h" #include "webrtc/video_frame.h" diff --git a/webrtc/modules/utility/source/file_player_impl.h b/webrtc/modules/utility/source/file_player_impl.h index 2dfe68273e..beb6379ff0 100644 --- a/webrtc/modules/utility/source/file_player_impl.h +++ b/webrtc/modules/utility/source/file_player_impl.h @@ -14,8 +14,8 @@ #include "webrtc/common_audio/resampler/include/resampler.h" #include "webrtc/common_types.h" #include "webrtc/engine_configurations.h" -#include "webrtc/modules/media_file/include/media_file.h" -#include "webrtc/modules/media_file/include/media_file_defines.h" +#include "webrtc/modules/media_file/media_file.h" +#include "webrtc/modules/media_file/media_file_defines.h" #include "webrtc/modules/utility/include/file_player.h" #include "webrtc/modules/utility/source/coder.h" #include "webrtc/system_wrappers/include/critical_section_wrapper.h" diff --git a/webrtc/modules/utility/source/file_recorder_impl.cc b/webrtc/modules/utility/source/file_recorder_impl.cc index cbd7c08d6b..88b20eeac2 100644 --- a/webrtc/modules/utility/source/file_recorder_impl.cc +++ b/webrtc/modules/utility/source/file_recorder_impl.cc @@ -10,7 +10,7 @@ #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" #include "webrtc/engine_configurations.h" -#include "webrtc/modules/media_file/include/media_file.h" +#include "webrtc/modules/media_file/media_file.h" #include "webrtc/modules/utility/source/file_recorder_impl.h" #include "webrtc/system_wrappers/include/logging.h" diff --git a/webrtc/modules/utility/source/file_recorder_impl.h b/webrtc/modules/utility/source/file_recorder_impl.h index 01072cdc3d..e3f06c455e 100644 --- a/webrtc/modules/utility/source/file_recorder_impl.h +++ b/webrtc/modules/utility/source/file_recorder_impl.h @@ -21,8 +21,8 @@ #include "webrtc/common_types.h" #include "webrtc/engine_configurations.h" #include "webrtc/modules/include/module_common_types.h" -#include "webrtc/modules/media_file/include/media_file.h" -#include "webrtc/modules/media_file/include/media_file_defines.h" +#include "webrtc/modules/media_file/media_file.h" +#include "webrtc/modules/media_file/media_file_defines.h" #include "webrtc/modules/utility/include/file_recorder.h" #include "webrtc/modules/utility/source/coder.h" #include "webrtc/system_wrappers/include/event_wrapper.h" diff --git a/webrtc/test/fake_audio_device.cc b/webrtc/test/fake_audio_device.cc index e307dd7664..4408804037 100644 --- a/webrtc/test/fake_audio_device.cc +++ b/webrtc/test/fake_audio_device.cc @@ -13,7 +13,7 @@ #include #include "testing/gtest/include/gtest/gtest.h" -#include "webrtc/modules/media_file/source/media_file_utility.h" +#include "webrtc/modules/media_file/media_file_utility.h" #include "webrtc/system_wrappers/include/clock.h" #include "webrtc/system_wrappers/include/event_wrapper.h" #include "webrtc/system_wrappers/include/file_wrapper.h" diff --git a/webrtc/video/rampup_tests.cc b/webrtc/video/rampup_tests.cc index cce0795b11..6450e0290d 100644 --- a/webrtc/video/rampup_tests.cc +++ b/webrtc/video/rampup_tests.cc @@ -12,7 +12,7 @@ #include "webrtc/base/checks.h" #include "webrtc/base/common.h" #include "webrtc/base/event.h" -#include "webrtc/modules/pacing/include/packet_router.h" +#include "webrtc/modules/pacing/packet_router.h" #include "webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time.h" #include "webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream.h" #include "webrtc/modules/remote_bitrate_estimator/remote_estimator_proxy.h" diff --git a/webrtc/video/video_send_stream.cc b/webrtc/video/video_send_stream.cc index 6e63264c4b..bc59900eff 100644 --- a/webrtc/video/video_send_stream.cc +++ b/webrtc/video/video_send_stream.cc @@ -21,7 +21,7 @@ #include "webrtc/call/congestion_controller.h" #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" #include "webrtc/modules/bitrate_controller/include/bitrate_controller.h" -#include "webrtc/modules/pacing/include/packet_router.h" +#include "webrtc/modules/pacing/packet_router.h" #include "webrtc/video/video_capture_input.h" #include "webrtc/video_engine/call_stats.h" #include "webrtc/video_engine/encoder_state_feedback.h" diff --git a/webrtc/video_engine/encoder_state_feedback_unittest.cc b/webrtc/video_engine/encoder_state_feedback_unittest.cc index ea252dc48a..6024790c76 100644 --- a/webrtc/video_engine/encoder_state_feedback_unittest.cc +++ b/webrtc/video_engine/encoder_state_feedback_unittest.cc @@ -18,8 +18,8 @@ #include "webrtc/base/scoped_ptr.h" #include "webrtc/common.h" #include "webrtc/modules/bitrate_controller/include/bitrate_controller.h" -#include "webrtc/modules/pacing/include/paced_sender.h" -#include "webrtc/modules/pacing/include/packet_router.h" +#include "webrtc/modules/pacing/paced_sender.h" +#include "webrtc/modules/pacing/packet_router.h" #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" #include "webrtc/modules/utility/include/mock/mock_process_thread.h" #include "webrtc/video_engine/payload_router.h" diff --git a/webrtc/video_engine/vie_channel.cc b/webrtc/video_engine/vie_channel.cc index 90f79b1112..4d7357e60b 100644 --- a/webrtc/video_engine/vie_channel.cc +++ b/webrtc/video_engine/vie_channel.cc @@ -19,8 +19,8 @@ #include "webrtc/common_video/interface/incoming_video_stream.h" #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" #include "webrtc/frame_callback.h" -#include "webrtc/modules/pacing/include/paced_sender.h" -#include "webrtc/modules/pacing/include/packet_router.h" +#include "webrtc/modules/pacing/paced_sender.h" +#include "webrtc/modules/pacing/packet_router.h" #include "webrtc/modules/rtp_rtcp/include/rtp_receiver.h" #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp.h" #include "webrtc/modules/utility/include/process_thread.h" diff --git a/webrtc/video_engine/vie_encoder.cc b/webrtc/video_engine/vie_encoder.cc index d9a45b02ed..509ac09505 100644 --- a/webrtc/video_engine/vie_encoder.cc +++ b/webrtc/video_engine/vie_encoder.cc @@ -22,7 +22,7 @@ #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" #include "webrtc/frame_callback.h" #include "webrtc/modules/bitrate_controller/include/bitrate_controller.h" -#include "webrtc/modules/pacing/include/paced_sender.h" +#include "webrtc/modules/pacing/paced_sender.h" #include "webrtc/modules/utility/include/process_thread.h" #include "webrtc/modules/video_coding/codecs/interface/video_codec_interface.h" #include "webrtc/modules/video_coding/main/interface/video_coding.h" diff --git a/webrtc/voice_engine/voe_file_impl.cc b/webrtc/voice_engine/voe_file_impl.cc index c2d5887ce9..2091e7073b 100644 --- a/webrtc/voice_engine/voe_file_impl.cc +++ b/webrtc/voice_engine/voe_file_impl.cc @@ -10,7 +10,7 @@ #include "webrtc/voice_engine/voe_file_impl.h" -#include "webrtc/modules/media_file/include/media_file.h" +#include "webrtc/modules/media_file/media_file.h" #include "webrtc/system_wrappers/include/critical_section_wrapper.h" #include "webrtc/system_wrappers/include/file_wrapper.h" #include "webrtc/system_wrappers/include/trace.h"