Fixing WebRTC after moving from src/webrtc to src/
In https://webrtc-review.googlesource.com/c/src/+/1560 we moved WebRTC
from src/webrtc to src/ (in order to preserve an healthy git history).
This CL takes care of fixing header guards, #include paths, etc...
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
TBR=tommi@webrtc.org
Bug: chromium:611808
Change-Id: Iea91618212bee0af16aa3f05071eab8f93706578
Reviewed-on: https://webrtc-review.googlesource.com/1561
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Reviewed-by: Henrik Kjellander <kjellander@webrtc.org>
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#19846}diff --git a/video/DEPS b/video/DEPS
index b80e1c9..b94455e 100644
--- a/video/DEPS
+++ b/video/DEPS
@@ -1,19 +1,19 @@
include_rules = [
- "+webrtc/call",
- "+webrtc/common_video",
- "+webrtc/logging/rtc_event_log",
- "+webrtc/media/base",
- "+webrtc/media/engine",
- "+webrtc/modules/audio_mixer",
- "+webrtc/modules/bitrate_controller",
- "+webrtc/modules/congestion_controller",
- "+webrtc/modules/pacing",
- "+webrtc/modules/remote_bitrate_estimator",
- "+webrtc/modules/rtp_rtcp",
- "+webrtc/modules/utility",
- "+webrtc/modules/video_coding",
- "+webrtc/modules/video_capture",
- "+webrtc/modules/video_processing",
- "+webrtc/system_wrappers",
- "+webrtc/voice_engine",
+ "+call",
+ "+common_video",
+ "+logging/rtc_event_log",
+ "+media/base",
+ "+media/engine",
+ "+modules/audio_mixer",
+ "+modules/bitrate_controller",
+ "+modules/congestion_controller",
+ "+modules/pacing",
+ "+modules/remote_bitrate_estimator",
+ "+modules/rtp_rtcp",
+ "+modules/utility",
+ "+modules/video_coding",
+ "+modules/video_capture",
+ "+modules/video_processing",
+ "+system_wrappers",
+ "+voice_engine",
]
diff --git a/video/call_stats.cc b/video/call_stats.cc
index 9864d4e..c9f0199 100644
--- a/video/call_stats.cc
+++ b/video/call_stats.cc
@@ -8,14 +8,14 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/video/call_stats.h"
+#include "video/call_stats.h"
#include <algorithm>
-#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h"
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/constructormagic.h"
-#include "webrtc/system_wrappers/include/metrics.h"
+#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h"
+#include "rtc_base/checks.h"
+#include "rtc_base/constructormagic.h"
+#include "system_wrappers/include/metrics.h"
namespace webrtc {
namespace {
diff --git a/video/call_stats.h b/video/call_stats.h
index efa98ad..af5c45c 100644
--- a/video/call_stats.h
+++ b/video/call_stats.h
@@ -8,16 +8,16 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef WEBRTC_VIDEO_CALL_STATS_H_
-#define WEBRTC_VIDEO_CALL_STATS_H_
+#ifndef VIDEO_CALL_STATS_H_
+#define VIDEO_CALL_STATS_H_
#include <list>
#include <memory>
-#include "webrtc/modules/include/module.h"
-#include "webrtc/rtc_base/constructormagic.h"
-#include "webrtc/rtc_base/criticalsection.h"
-#include "webrtc/system_wrappers/include/clock.h"
+#include "modules/include/module.h"
+#include "rtc_base/constructormagic.h"
+#include "rtc_base/criticalsection.h"
+#include "system_wrappers/include/clock.h"
namespace webrtc {
@@ -85,4 +85,4 @@
} // namespace webrtc
-#endif // WEBRTC_VIDEO_CALL_STATS_H_
+#endif // VIDEO_CALL_STATS_H_
diff --git a/video/call_stats_unittest.cc b/video/call_stats_unittest.cc
index 8a2a89a..989722d 100644
--- a/video/call_stats_unittest.cc
+++ b/video/call_stats_unittest.cc
@@ -10,12 +10,12 @@
#include <memory>
-#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h"
-#include "webrtc/system_wrappers/include/metrics.h"
-#include "webrtc/system_wrappers/include/metrics_default.h"
-#include "webrtc/test/gmock.h"
-#include "webrtc/test/gtest.h"
-#include "webrtc/video/call_stats.h"
+#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h"
+#include "system_wrappers/include/metrics.h"
+#include "system_wrappers/include/metrics_default.h"
+#include "test/gmock.h"
+#include "test/gtest.h"
+#include "video/call_stats.h"
using ::testing::_;
using ::testing::AnyNumber;
diff --git a/video/encoder_rtcp_feedback.cc b/video/encoder_rtcp_feedback.cc
index 1c5a31e..5a1194f 100644
--- a/video/encoder_rtcp_feedback.cc
+++ b/video/encoder_rtcp_feedback.cc
@@ -8,10 +8,10 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/video/encoder_rtcp_feedback.h"
+#include "video/encoder_rtcp_feedback.h"
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/video/video_stream_encoder.h"
+#include "rtc_base/checks.h"
+#include "video/video_stream_encoder.h"
static const int kMinKeyFrameRequestIntervalMs = 300;
diff --git a/video/encoder_rtcp_feedback.h b/video/encoder_rtcp_feedback.h
index 0e5b13b..ae62e68 100644
--- a/video/encoder_rtcp_feedback.h
+++ b/video/encoder_rtcp_feedback.h
@@ -7,15 +7,15 @@
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef WEBRTC_VIDEO_ENCODER_RTCP_FEEDBACK_H_
-#define WEBRTC_VIDEO_ENCODER_RTCP_FEEDBACK_H_
+#ifndef VIDEO_ENCODER_RTCP_FEEDBACK_H_
+#define VIDEO_ENCODER_RTCP_FEEDBACK_H_
#include <vector>
-#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h"
-#include "webrtc/rtc_base/criticalsection.h"
-#include "webrtc/system_wrappers/include/clock.h"
-#include "webrtc/typedefs.h"
+#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h"
+#include "rtc_base/criticalsection.h"
+#include "system_wrappers/include/clock.h"
+#include "typedefs.h"
namespace webrtc {
@@ -42,4 +42,4 @@
} // namespace webrtc
-#endif // WEBRTC_VIDEO_ENCODER_RTCP_FEEDBACK_H_
+#endif // VIDEO_ENCODER_RTCP_FEEDBACK_H_
diff --git a/video/encoder_rtcp_feedback_unittest.cc b/video/encoder_rtcp_feedback_unittest.cc
index 718ecac..f05556e 100644
--- a/video/encoder_rtcp_feedback_unittest.cc
+++ b/video/encoder_rtcp_feedback_unittest.cc
@@ -8,15 +8,15 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/video/encoder_rtcp_feedback.h"
+#include "video/encoder_rtcp_feedback.h"
#include <memory>
-#include "webrtc/modules/utility/include/mock/mock_process_thread.h"
-#include "webrtc/test/gmock.h"
-#include "webrtc/test/gtest.h"
-#include "webrtc/video/send_statistics_proxy.h"
-#include "webrtc/video/video_stream_encoder.h"
+#include "modules/utility/include/mock/mock_process_thread.h"
+#include "test/gmock.h"
+#include "test/gtest.h"
+#include "video/send_statistics_proxy.h"
+#include "video/video_stream_encoder.h"
using ::testing::NiceMock;
diff --git a/video/end_to_end_tests.cc b/video/end_to_end_tests.cc
index e92d8fe..06a7118 100644
--- a/video/end_to_end_tests.cc
+++ b/video/end_to_end_tests.cc
@@ -15,52 +15,52 @@
#include <string>
#include <vector>
-#include "webrtc/api/optional.h"
-#include "webrtc/api/video_codecs/video_encoder.h"
-#include "webrtc/call/call.h"
-#include "webrtc/common_video/include/frame_callback.h"
-#include "webrtc/logging/rtc_event_log/rtc_event_log.h"
-#include "webrtc/media/base/fakevideorenderer.h"
-#include "webrtc/media/base/mediaconstants.h"
-#include "webrtc/media/engine/internalencoderfactory.h"
-#include "webrtc/media/engine/simulcast_encoder_adapter.h"
-#include "webrtc/media/engine/webrtcvideoencoderfactory.h"
-#include "webrtc/modules/include/module_common_types.h"
-#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp.h"
-#include "webrtc/modules/rtp_rtcp/source/byte_io.h"
-#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/nack.h"
-#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/rapid_resync_request.h"
-#include "webrtc/modules/rtp_rtcp/source/rtp_format.h"
-#include "webrtc/modules/rtp_rtcp/source/rtp_utility.h"
-#include "webrtc/modules/video_coding/codecs/h264/include/h264.h"
-#include "webrtc/modules/video_coding/codecs/vp8/include/vp8.h"
-#include "webrtc/modules/video_coding/codecs/vp9/include/vp9.h"
-#include "webrtc/modules/video_coding/include/video_coding_defines.h"
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/event.h"
-#include "webrtc/rtc_base/file.h"
-#include "webrtc/rtc_base/ptr_util.h"
-#include "webrtc/rtc_base/random.h"
-#include "webrtc/rtc_base/rate_limiter.h"
-#include "webrtc/system_wrappers/include/metrics.h"
-#include "webrtc/system_wrappers/include/metrics_default.h"
-#include "webrtc/system_wrappers/include/sleep.h"
-#include "webrtc/test/call_test.h"
-#include "webrtc/test/direct_transport.h"
-#include "webrtc/test/encoder_settings.h"
-#include "webrtc/test/fake_decoder.h"
-#include "webrtc/test/fake_encoder.h"
-#include "webrtc/test/field_trial.h"
-#include "webrtc/test/frame_generator.h"
-#include "webrtc/test/frame_generator_capturer.h"
-#include "webrtc/test/gmock.h"
-#include "webrtc/test/gtest.h"
-#include "webrtc/test/null_transport.h"
-#include "webrtc/test/rtcp_packet_parser.h"
-#include "webrtc/test/rtp_rtcp_observer.h"
-#include "webrtc/test/testsupport/fileutils.h"
-#include "webrtc/test/testsupport/perf_test.h"
-#include "webrtc/video/transport_adapter.h"
+#include "api/optional.h"
+#include "api/video_codecs/video_encoder.h"
+#include "call/call.h"
+#include "common_video/include/frame_callback.h"
+#include "logging/rtc_event_log/rtc_event_log.h"
+#include "media/base/fakevideorenderer.h"
+#include "media/base/mediaconstants.h"
+#include "media/engine/internalencoderfactory.h"
+#include "media/engine/simulcast_encoder_adapter.h"
+#include "media/engine/webrtcvideoencoderfactory.h"
+#include "modules/include/module_common_types.h"
+#include "modules/rtp_rtcp/include/rtp_rtcp.h"
+#include "modules/rtp_rtcp/source/byte_io.h"
+#include "modules/rtp_rtcp/source/rtcp_packet/nack.h"
+#include "modules/rtp_rtcp/source/rtcp_packet/rapid_resync_request.h"
+#include "modules/rtp_rtcp/source/rtp_format.h"
+#include "modules/rtp_rtcp/source/rtp_utility.h"
+#include "modules/video_coding/codecs/h264/include/h264.h"
+#include "modules/video_coding/codecs/vp8/include/vp8.h"
+#include "modules/video_coding/codecs/vp9/include/vp9.h"
+#include "modules/video_coding/include/video_coding_defines.h"
+#include "rtc_base/checks.h"
+#include "rtc_base/event.h"
+#include "rtc_base/file.h"
+#include "rtc_base/ptr_util.h"
+#include "rtc_base/random.h"
+#include "rtc_base/rate_limiter.h"
+#include "system_wrappers/include/metrics.h"
+#include "system_wrappers/include/metrics_default.h"
+#include "system_wrappers/include/sleep.h"
+#include "test/call_test.h"
+#include "test/direct_transport.h"
+#include "test/encoder_settings.h"
+#include "test/fake_decoder.h"
+#include "test/fake_encoder.h"
+#include "test/field_trial.h"
+#include "test/frame_generator.h"
+#include "test/frame_generator_capturer.h"
+#include "test/gmock.h"
+#include "test/gtest.h"
+#include "test/null_transport.h"
+#include "test/rtcp_packet_parser.h"
+#include "test/rtp_rtcp_observer.h"
+#include "test/testsupport/fileutils.h"
+#include "test/testsupport/perf_test.h"
+#include "video/transport_adapter.h"
// Flaky under MemorySanitizer: bugs.webrtc.org/7419
#if defined(MEMORY_SANITIZER)
diff --git a/video/full_stack_tests.cc b/video/full_stack_tests.cc
index 24c3625..ddbed59 100644
--- a/video/full_stack_tests.cc
+++ b/video/full_stack_tests.cc
@@ -9,10 +9,10 @@
*/
#include <stdio.h>
-#include "webrtc/modules/pacing/alr_detector.h"
-#include "webrtc/test/field_trial.h"
-#include "webrtc/test/gtest.h"
-#include "webrtc/video/video_quality_test.h"
+#include "modules/pacing/alr_detector.h"
+#include "test/field_trial.h"
+#include "test/gtest.h"
+#include "video/video_quality_test.h"
namespace webrtc {
diff --git a/video/overuse_frame_detector.cc b/video/overuse_frame_detector.cc
index 1d8bc0b..f110e1c 100644
--- a/video/overuse_frame_detector.cc
+++ b/video/overuse_frame_detector.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/video/overuse_frame_detector.h"
+#include "video/overuse_frame_detector.h"
#include <assert.h>
#include <math.h>
@@ -19,13 +19,13 @@
#include <string>
#include <utility>
-#include "webrtc/api/video/video_frame.h"
-#include "webrtc/common_video/include/frame_callback.h"
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/logging.h"
-#include "webrtc/rtc_base/numerics/exp_filter.h"
-#include "webrtc/rtc_base/timeutils.h"
-#include "webrtc/system_wrappers/include/field_trial.h"
+#include "api/video/video_frame.h"
+#include "common_video/include/frame_callback.h"
+#include "rtc_base/checks.h"
+#include "rtc_base/logging.h"
+#include "rtc_base/numerics/exp_filter.h"
+#include "rtc_base/timeutils.h"
+#include "system_wrappers/include/field_trial.h"
#if defined(WEBRTC_MAC) && !defined(WEBRTC_IOS)
#include <mach/mach.h>
diff --git a/video/overuse_frame_detector.h b/video/overuse_frame_detector.h
index a4f4588..3cc9262 100644
--- a/video/overuse_frame_detector.h
+++ b/video/overuse_frame_detector.h
@@ -8,19 +8,19 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef WEBRTC_VIDEO_OVERUSE_FRAME_DETECTOR_H_
-#define WEBRTC_VIDEO_OVERUSE_FRAME_DETECTOR_H_
+#ifndef VIDEO_OVERUSE_FRAME_DETECTOR_H_
+#define VIDEO_OVERUSE_FRAME_DETECTOR_H_
#include <list>
#include <memory>
-#include "webrtc/api/optional.h"
-#include "webrtc/modules/video_coding/utility/quality_scaler.h"
-#include "webrtc/rtc_base/constructormagic.h"
-#include "webrtc/rtc_base/numerics/exp_filter.h"
-#include "webrtc/rtc_base/sequenced_task_checker.h"
-#include "webrtc/rtc_base/task_queue.h"
-#include "webrtc/rtc_base/thread_annotations.h"
+#include "api/optional.h"
+#include "modules/video_coding/utility/quality_scaler.h"
+#include "rtc_base/constructormagic.h"
+#include "rtc_base/numerics/exp_filter.h"
+#include "rtc_base/sequenced_task_checker.h"
+#include "rtc_base/task_queue.h"
+#include "rtc_base/thread_annotations.h"
namespace webrtc {
@@ -161,4 +161,4 @@
} // namespace webrtc
-#endif // WEBRTC_VIDEO_OVERUSE_FRAME_DETECTOR_H_
+#endif // VIDEO_OVERUSE_FRAME_DETECTOR_H_
diff --git a/video/overuse_frame_detector_unittest.cc b/video/overuse_frame_detector_unittest.cc
index 80faf65..0f3dd86 100644
--- a/video/overuse_frame_detector_unittest.cc
+++ b/video/overuse_frame_detector_unittest.cc
@@ -10,14 +10,14 @@
#include <memory>
-#include "webrtc/api/video/i420_buffer.h"
-#include "webrtc/common_video/include/video_frame.h"
-#include "webrtc/modules/video_coding/utility/quality_scaler.h"
-#include "webrtc/rtc_base/event.h"
-#include "webrtc/rtc_base/fakeclock.h"
-#include "webrtc/test/gmock.h"
-#include "webrtc/test/gtest.h"
-#include "webrtc/video/overuse_frame_detector.h"
+#include "api/video/i420_buffer.h"
+#include "common_video/include/video_frame.h"
+#include "modules/video_coding/utility/quality_scaler.h"
+#include "rtc_base/event.h"
+#include "rtc_base/fakeclock.h"
+#include "test/gmock.h"
+#include "test/gtest.h"
+#include "video/overuse_frame_detector.h"
namespace webrtc {
diff --git a/video/payload_router.cc b/video/payload_router.cc
index eabde40..a7a20de 100644
--- a/video/payload_router.cc
+++ b/video/payload_router.cc
@@ -8,12 +8,12 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/video/payload_router.h"
+#include "video/payload_router.h"
-#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp.h"
-#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h"
-#include "webrtc/modules/video_coding/include/video_codec_interface.h"
-#include "webrtc/rtc_base/checks.h"
+#include "modules/rtp_rtcp/include/rtp_rtcp.h"
+#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h"
+#include "modules/video_coding/include/video_codec_interface.h"
+#include "rtc_base/checks.h"
namespace webrtc {
diff --git a/video/payload_router.h b/video/payload_router.h
index 082ba36..9ddbce1 100644
--- a/video/payload_router.h
+++ b/video/payload_router.h
@@ -8,16 +8,16 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef WEBRTC_VIDEO_PAYLOAD_ROUTER_H_
-#define WEBRTC_VIDEO_PAYLOAD_ROUTER_H_
+#ifndef VIDEO_PAYLOAD_ROUTER_H_
+#define VIDEO_PAYLOAD_ROUTER_H_
#include <vector>
-#include "webrtc/api/video_codecs/video_encoder.h"
-#include "webrtc/common_types.h"
-#include "webrtc/rtc_base/constructormagic.h"
-#include "webrtc/rtc_base/criticalsection.h"
-#include "webrtc/rtc_base/thread_annotations.h"
+#include "api/video_codecs/video_encoder.h"
+#include "common_types.h"
+#include "rtc_base/constructormagic.h"
+#include "rtc_base/criticalsection.h"
+#include "rtc_base/thread_annotations.h"
namespace webrtc {
@@ -63,4 +63,4 @@
} // namespace webrtc
-#endif // WEBRTC_VIDEO_PAYLOAD_ROUTER_H_
+#endif // VIDEO_PAYLOAD_ROUTER_H_
diff --git a/video/payload_router_unittest.cc b/video/payload_router_unittest.cc
index 2293a24..5f56a20 100644
--- a/video/payload_router_unittest.cc
+++ b/video/payload_router_unittest.cc
@@ -10,13 +10,13 @@
#include <memory>
-#include "webrtc/call/video_config.h"
-#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp.h"
-#include "webrtc/modules/rtp_rtcp/mocks/mock_rtp_rtcp.h"
-#include "webrtc/modules/video_coding/include/video_codec_interface.h"
-#include "webrtc/test/gmock.h"
-#include "webrtc/test/gtest.h"
-#include "webrtc/video/payload_router.h"
+#include "call/video_config.h"
+#include "modules/rtp_rtcp/include/rtp_rtcp.h"
+#include "modules/rtp_rtcp/mocks/mock_rtp_rtcp.h"
+#include "modules/video_coding/include/video_codec_interface.h"
+#include "test/gmock.h"
+#include "test/gtest.h"
+#include "video/payload_router.h"
using ::testing::_;
using ::testing::AnyNumber;
diff --git a/video/picture_id_tests.cc b/video/picture_id_tests.cc
index 0c83796..ba99bd3 100644
--- a/video/picture_id_tests.cc
+++ b/video/picture_id_tests.cc
@@ -7,11 +7,11 @@
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/media/engine/internalencoderfactory.h"
-#include "webrtc/media/engine/simulcast_encoder_adapter.h"
-#include "webrtc/modules/rtp_rtcp/source/rtp_format.h"
-#include "webrtc/modules/video_coding/sequence_number_util.h"
-#include "webrtc/test/call_test.h"
+#include "media/engine/internalencoderfactory.h"
+#include "media/engine/simulcast_encoder_adapter.h"
+#include "modules/rtp_rtcp/source/rtp_format.h"
+#include "modules/video_coding/sequence_number_util.h"
+#include "test/call_test.h"
namespace webrtc {
diff --git a/video/quality_threshold.cc b/video/quality_threshold.cc
index 370fe6b..8ee9fbb 100644
--- a/video/quality_threshold.cc
+++ b/video/quality_threshold.cc
@@ -8,10 +8,10 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/video/quality_threshold.h"
+#include "video/quality_threshold.h"
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/logging.h"
+#include "rtc_base/checks.h"
+#include "rtc_base/logging.h"
namespace webrtc {
diff --git a/video/quality_threshold.h b/video/quality_threshold.h
index a142d4e..519e2c3 100644
--- a/video/quality_threshold.h
+++ b/video/quality_threshold.h
@@ -8,12 +8,12 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef WEBRTC_VIDEO_QUALITY_THRESHOLD_H_
-#define WEBRTC_VIDEO_QUALITY_THRESHOLD_H_
+#ifndef VIDEO_QUALITY_THRESHOLD_H_
+#define VIDEO_QUALITY_THRESHOLD_H_
#include <memory>
-#include "webrtc/api/optional.h"
+#include "api/optional.h"
namespace webrtc {
@@ -49,4 +49,4 @@
} // namespace webrtc
-#endif // WEBRTC_VIDEO_QUALITY_THRESHOLD_H_
+#endif // VIDEO_QUALITY_THRESHOLD_H_
diff --git a/video/quality_threshold_unittest.cc b/video/quality_threshold_unittest.cc
index 6aa70c5..c9396d7 100644
--- a/video/quality_threshold_unittest.cc
+++ b/video/quality_threshold_unittest.cc
@@ -8,9 +8,9 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/video/quality_threshold.h"
+#include "video/quality_threshold.h"
-#include "webrtc/test/gtest.h"
+#include "test/gtest.h"
namespace webrtc {
diff --git a/video/receive_statistics_proxy.cc b/video/receive_statistics_proxy.cc
index ff4c6fe..b19ec20 100644
--- a/video/receive_statistics_proxy.cc
+++ b/video/receive_statistics_proxy.cc
@@ -8,19 +8,19 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/video/receive_statistics_proxy.h"
+#include "video/receive_statistics_proxy.h"
#include <algorithm>
#include <cmath>
#include <sstream>
#include <utility>
-#include "webrtc/modules/pacing/alr_detector.h"
-#include "webrtc/modules/video_coding/include/video_codec_interface.h"
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/logging.h"
-#include "webrtc/system_wrappers/include/clock.h"
-#include "webrtc/system_wrappers/include/metrics.h"
+#include "modules/pacing/alr_detector.h"
+#include "modules/video_coding/include/video_codec_interface.h"
+#include "rtc_base/checks.h"
+#include "rtc_base/logging.h"
+#include "system_wrappers/include/clock.h"
+#include "system_wrappers/include/metrics.h"
namespace webrtc {
namespace {
diff --git a/video/receive_statistics_proxy.h b/video/receive_statistics_proxy.h
index 262be64..06bd269 100644
--- a/video/receive_statistics_proxy.h
+++ b/video/receive_statistics_proxy.h
@@ -8,26 +8,26 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef WEBRTC_VIDEO_RECEIVE_STATISTICS_PROXY_H_
-#define WEBRTC_VIDEO_RECEIVE_STATISTICS_PROXY_H_
+#ifndef VIDEO_RECEIVE_STATISTICS_PROXY_H_
+#define VIDEO_RECEIVE_STATISTICS_PROXY_H_
#include <map>
#include <string>
-#include "webrtc/api/optional.h"
-#include "webrtc/call/video_receive_stream.h"
-#include "webrtc/common_types.h"
-#include "webrtc/common_video/include/frame_callback.h"
-#include "webrtc/modules/video_coding/include/video_coding_defines.h"
-#include "webrtc/rtc_base/criticalsection.h"
-#include "webrtc/rtc_base/moving_max_counter.h"
-#include "webrtc/rtc_base/rate_statistics.h"
-#include "webrtc/rtc_base/ratetracker.h"
-#include "webrtc/rtc_base/thread_annotations.h"
-#include "webrtc/video/quality_threshold.h"
-#include "webrtc/video/report_block_stats.h"
-#include "webrtc/video/stats_counter.h"
-#include "webrtc/video/video_stream_decoder.h"
+#include "api/optional.h"
+#include "call/video_receive_stream.h"
+#include "common_types.h"
+#include "common_video/include/frame_callback.h"
+#include "modules/video_coding/include/video_coding_defines.h"
+#include "rtc_base/criticalsection.h"
+#include "rtc_base/moving_max_counter.h"
+#include "rtc_base/rate_statistics.h"
+#include "rtc_base/ratetracker.h"
+#include "rtc_base/thread_annotations.h"
+#include "video/quality_threshold.h"
+#include "video/report_block_stats.h"
+#include "video/stats_counter.h"
+#include "video/video_stream_decoder.h"
namespace webrtc {
@@ -185,4 +185,4 @@
};
} // namespace webrtc
-#endif // WEBRTC_VIDEO_RECEIVE_STATISTICS_PROXY_H_
+#endif // VIDEO_RECEIVE_STATISTICS_PROXY_H_
diff --git a/video/receive_statistics_proxy_unittest.cc b/video/receive_statistics_proxy_unittest.cc
index 068b221..3903d7f 100644
--- a/video/receive_statistics_proxy_unittest.cc
+++ b/video/receive_statistics_proxy_unittest.cc
@@ -8,18 +8,18 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/video/receive_statistics_proxy.h"
+#include "video/receive_statistics_proxy.h"
#include <limits>
#include <memory>
-#include "webrtc/api/video/i420_buffer.h"
-#include "webrtc/api/video/video_frame.h"
-#include "webrtc/api/video/video_rotation.h"
-#include "webrtc/modules/video_coding/include/video_codec_interface.h"
-#include "webrtc/system_wrappers/include/metrics.h"
-#include "webrtc/system_wrappers/include/metrics_default.h"
-#include "webrtc/test/gtest.h"
+#include "api/video/i420_buffer.h"
+#include "api/video/video_frame.h"
+#include "api/video/video_rotation.h"
+#include "modules/video_coding/include/video_codec_interface.h"
+#include "system_wrappers/include/metrics.h"
+#include "system_wrappers/include/metrics_default.h"
+#include "test/gtest.h"
namespace webrtc {
namespace {
diff --git a/video/replay.cc b/video/replay.cc
index c93017a..dab5b2e 100644
--- a/video/replay.cc
+++ b/video/replay.cc
@@ -14,28 +14,28 @@
#include <memory>
#include <sstream>
-#include "webrtc/api/video_codecs/video_decoder.h"
-#include "webrtc/call/call.h"
-#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
-#include "webrtc/logging/rtc_event_log/rtc_event_log.h"
-#include "webrtc/modules/rtp_rtcp/include/rtp_header_parser.h"
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/flags.h"
-#include "webrtc/rtc_base/string_to_number.h"
-#include "webrtc/system_wrappers/include/clock.h"
-#include "webrtc/system_wrappers/include/sleep.h"
-#include "webrtc/test/call_test.h"
-#include "webrtc/test/encoder_settings.h"
-#include "webrtc/test/fake_decoder.h"
-#include "webrtc/test/gtest.h"
-#include "webrtc/test/null_transport.h"
-#include "webrtc/test/rtp_file_reader.h"
-#include "webrtc/test/run_loop.h"
-#include "webrtc/test/run_test.h"
-#include "webrtc/test/testsupport/frame_writer.h"
-#include "webrtc/test/video_capturer.h"
-#include "webrtc/test/video_renderer.h"
-#include "webrtc/typedefs.h"
+#include "api/video_codecs/video_decoder.h"
+#include "call/call.h"
+#include "common_video/libyuv/include/webrtc_libyuv.h"
+#include "logging/rtc_event_log/rtc_event_log.h"
+#include "modules/rtp_rtcp/include/rtp_header_parser.h"
+#include "rtc_base/checks.h"
+#include "rtc_base/flags.h"
+#include "rtc_base/string_to_number.h"
+#include "system_wrappers/include/clock.h"
+#include "system_wrappers/include/sleep.h"
+#include "test/call_test.h"
+#include "test/encoder_settings.h"
+#include "test/fake_decoder.h"
+#include "test/gtest.h"
+#include "test/null_transport.h"
+#include "test/rtp_file_reader.h"
+#include "test/run_loop.h"
+#include "test/run_test.h"
+#include "test/testsupport/frame_writer.h"
+#include "test/video_capturer.h"
+#include "test/video_renderer.h"
+#include "typedefs.h"
namespace {
diff --git a/video/report_block_stats.cc b/video/report_block_stats.cc
index ac5041d..4726a46 100644
--- a/video/report_block_stats.cc
+++ b/video/report_block_stats.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/video/report_block_stats.h"
+#include "video/report_block_stats.h"
namespace webrtc {
diff --git a/video/report_block_stats.h b/video/report_block_stats.h
index c54e467..deb2afe 100644
--- a/video/report_block_stats.h
+++ b/video/report_block_stats.h
@@ -8,14 +8,14 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef WEBRTC_VIDEO_REPORT_BLOCK_STATS_H_
-#define WEBRTC_VIDEO_REPORT_BLOCK_STATS_H_
+#ifndef VIDEO_REPORT_BLOCK_STATS_H_
+#define VIDEO_REPORT_BLOCK_STATS_H_
#include <map>
#include <vector>
-#include "webrtc/common_types.h"
-#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h"
+#include "common_types.h"
+#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h"
namespace webrtc {
@@ -58,5 +58,5 @@
} // namespace webrtc
-#endif // WEBRTC_VIDEO_REPORT_BLOCK_STATS_H_
+#endif // VIDEO_REPORT_BLOCK_STATS_H_
diff --git a/video/report_block_stats_unittest.cc b/video/report_block_stats_unittest.cc
index 3ce49ee..983dcfc 100644
--- a/video/report_block_stats_unittest.cc
+++ b/video/report_block_stats_unittest.cc
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/test/gtest.h"
-#include "webrtc/video/report_block_stats.h"
+#include "test/gtest.h"
+#include "video/report_block_stats.h"
namespace webrtc {
diff --git a/video/rtp_streams_synchronizer.cc b/video/rtp_streams_synchronizer.cc
index ad7cf42..0274849 100644
--- a/video/rtp_streams_synchronizer.cc
+++ b/video/rtp_streams_synchronizer.cc
@@ -8,14 +8,14 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/video/rtp_streams_synchronizer.h"
+#include "video/rtp_streams_synchronizer.h"
-#include "webrtc/call/syncable.h"
-#include "webrtc/modules/video_coding/video_coding_impl.h"
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/logging.h"
-#include "webrtc/rtc_base/timeutils.h"
-#include "webrtc/rtc_base/trace_event.h"
+#include "call/syncable.h"
+#include "modules/video_coding/video_coding_impl.h"
+#include "rtc_base/checks.h"
+#include "rtc_base/logging.h"
+#include "rtc_base/timeutils.h"
+#include "rtc_base/trace_event.h"
namespace webrtc {
namespace {
diff --git a/video/rtp_streams_synchronizer.h b/video/rtp_streams_synchronizer.h
index c8f2d2a..0d3b205 100644
--- a/video/rtp_streams_synchronizer.h
+++ b/video/rtp_streams_synchronizer.h
@@ -11,15 +11,15 @@
// RtpStreamsSynchronizer is responsible for synchronization audio and video for
// a given voice engine channel and video receive stream.
-#ifndef WEBRTC_VIDEO_RTP_STREAMS_SYNCHRONIZER_H_
-#define WEBRTC_VIDEO_RTP_STREAMS_SYNCHRONIZER_H_
+#ifndef VIDEO_RTP_STREAMS_SYNCHRONIZER_H_
+#define VIDEO_RTP_STREAMS_SYNCHRONIZER_H_
#include <memory>
-#include "webrtc/modules/include/module.h"
-#include "webrtc/rtc_base/criticalsection.h"
-#include "webrtc/rtc_base/thread_checker.h"
-#include "webrtc/video/stream_synchronization.h"
+#include "modules/include/module.h"
+#include "rtc_base/criticalsection.h"
+#include "rtc_base/thread_checker.h"
+#include "video/stream_synchronization.h"
namespace webrtc {
@@ -63,4 +63,4 @@
} // namespace webrtc
-#endif // WEBRTC_VIDEO_RTP_STREAMS_SYNCHRONIZER_H_
+#endif // VIDEO_RTP_STREAMS_SYNCHRONIZER_H_
diff --git a/video/rtp_video_stream_receiver.cc b/video/rtp_video_stream_receiver.cc
index 5aff226..ab33fc1 100644
--- a/video/rtp_video_stream_receiver.cc
+++ b/video/rtp_video_stream_receiver.cc
@@ -8,37 +8,37 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/video/rtp_video_stream_receiver.h"
+#include "video/rtp_video_stream_receiver.h"
#include <algorithm>
#include <utility>
#include <vector>
-#include "webrtc/call/video_config.h"
-#include "webrtc/common_types.h"
-#include "webrtc/media/base/mediaconstants.h"
-#include "webrtc/modules/pacing/packet_router.h"
-#include "webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h"
-#include "webrtc/modules/rtp_rtcp/include/receive_statistics.h"
-#include "webrtc/modules/rtp_rtcp/include/rtp_cvo.h"
-#include "webrtc/modules/rtp_rtcp/include/rtp_header_parser.h"
-#include "webrtc/modules/rtp_rtcp/include/rtp_receiver.h"
-#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp.h"
-#include "webrtc/modules/rtp_rtcp/include/ulpfec_receiver.h"
-#include "webrtc/modules/rtp_rtcp/source/rtp_header_extensions.h"
-#include "webrtc/modules/rtp_rtcp/source/rtp_packet_received.h"
-#include "webrtc/modules/video_coding/frame_object.h"
-#include "webrtc/modules/video_coding/h264_sprop_parameter_sets.h"
-#include "webrtc/modules/video_coding/h264_sps_pps_tracker.h"
-#include "webrtc/modules/video_coding/packet_buffer.h"
-#include "webrtc/modules/video_coding/video_coding_impl.h"
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/location.h"
-#include "webrtc/rtc_base/logging.h"
-#include "webrtc/system_wrappers/include/field_trial.h"
-#include "webrtc/system_wrappers/include/metrics.h"
-#include "webrtc/system_wrappers/include/timestamp_extrapolator.h"
-#include "webrtc/video/receive_statistics_proxy.h"
+#include "call/video_config.h"
+#include "common_types.h"
+#include "media/base/mediaconstants.h"
+#include "modules/pacing/packet_router.h"
+#include "modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h"
+#include "modules/rtp_rtcp/include/receive_statistics.h"
+#include "modules/rtp_rtcp/include/rtp_cvo.h"
+#include "modules/rtp_rtcp/include/rtp_header_parser.h"
+#include "modules/rtp_rtcp/include/rtp_receiver.h"
+#include "modules/rtp_rtcp/include/rtp_rtcp.h"
+#include "modules/rtp_rtcp/include/ulpfec_receiver.h"
+#include "modules/rtp_rtcp/source/rtp_header_extensions.h"
+#include "modules/rtp_rtcp/source/rtp_packet_received.h"
+#include "modules/video_coding/frame_object.h"
+#include "modules/video_coding/h264_sprop_parameter_sets.h"
+#include "modules/video_coding/h264_sps_pps_tracker.h"
+#include "modules/video_coding/packet_buffer.h"
+#include "modules/video_coding/video_coding_impl.h"
+#include "rtc_base/checks.h"
+#include "rtc_base/location.h"
+#include "rtc_base/logging.h"
+#include "system_wrappers/include/field_trial.h"
+#include "system_wrappers/include/metrics.h"
+#include "system_wrappers/include/timestamp_extrapolator.h"
+#include "video/receive_statistics_proxy.h"
namespace webrtc {
diff --git a/video/rtp_video_stream_receiver.h b/video/rtp_video_stream_receiver.h
index 994ef55..facb712 100644
--- a/video/rtp_video_stream_receiver.h
+++ b/video/rtp_video_stream_receiver.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef WEBRTC_VIDEO_RTP_VIDEO_STREAM_RECEIVER_H_
-#define WEBRTC_VIDEO_RTP_VIDEO_STREAM_RECEIVER_H_
+#ifndef VIDEO_RTP_VIDEO_STREAM_RECEIVER_H_
+#define VIDEO_RTP_VIDEO_STREAM_RECEIVER_H_
#include <list>
#include <map>
@@ -17,23 +17,23 @@
#include <string>
#include <vector>
-#include "webrtc/call/rtp_packet_sink_interface.h"
-#include "webrtc/call/video_receive_stream.h"
-#include "webrtc/modules/include/module_common_types.h"
-#include "webrtc/modules/rtp_rtcp/include/receive_statistics.h"
-#include "webrtc/modules/rtp_rtcp/include/remote_ntp_time_estimator.h"
-#include "webrtc/modules/rtp_rtcp/include/rtp_payload_registry.h"
-#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp.h"
-#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h"
-#include "webrtc/modules/video_coding/h264_sps_pps_tracker.h"
-#include "webrtc/modules/video_coding/include/video_coding_defines.h"
-#include "webrtc/modules/video_coding/packet_buffer.h"
-#include "webrtc/modules/video_coding/rtp_frame_reference_finder.h"
-#include "webrtc/modules/video_coding/sequence_number_util.h"
-#include "webrtc/rtc_base/constructormagic.h"
-#include "webrtc/rtc_base/criticalsection.h"
-#include "webrtc/rtc_base/sequenced_task_checker.h"
-#include "webrtc/typedefs.h"
+#include "call/rtp_packet_sink_interface.h"
+#include "call/video_receive_stream.h"
+#include "modules/include/module_common_types.h"
+#include "modules/rtp_rtcp/include/receive_statistics.h"
+#include "modules/rtp_rtcp/include/remote_ntp_time_estimator.h"
+#include "modules/rtp_rtcp/include/rtp_payload_registry.h"
+#include "modules/rtp_rtcp/include/rtp_rtcp.h"
+#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h"
+#include "modules/video_coding/h264_sps_pps_tracker.h"
+#include "modules/video_coding/include/video_coding_defines.h"
+#include "modules/video_coding/packet_buffer.h"
+#include "modules/video_coding/rtp_frame_reference_finder.h"
+#include "modules/video_coding/sequence_number_util.h"
+#include "rtc_base/constructormagic.h"
+#include "rtc_base/criticalsection.h"
+#include "rtc_base/sequenced_task_checker.h"
+#include "typedefs.h"
namespace webrtc {
@@ -215,4 +215,4 @@
} // namespace webrtc
-#endif // WEBRTC_VIDEO_RTP_VIDEO_STREAM_RECEIVER_H_
+#endif // VIDEO_RTP_VIDEO_STREAM_RECEIVER_H_
diff --git a/video/rtp_video_stream_receiver_unittest.cc b/video/rtp_video_stream_receiver_unittest.cc
index 4f2dca7..a3d9da6 100644
--- a/video/rtp_video_stream_receiver_unittest.cc
+++ b/video/rtp_video_stream_receiver_unittest.cc
@@ -8,26 +8,26 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/test/gtest.h"
-#include "webrtc/test/gmock.h"
+#include "test/gtest.h"
+#include "test/gmock.h"
-#include "webrtc/common_video/h264/h264_common.h"
-#include "webrtc/media/base/mediaconstants.h"
-#include "webrtc/modules/pacing/packet_router.h"
-#include "webrtc/modules/rtp_rtcp/source/rtp_packet_received.h"
-#include "webrtc/modules/utility/include/process_thread.h"
-#include "webrtc/modules/video_coding/frame_object.h"
-#include "webrtc/modules/video_coding/include/video_coding_defines.h"
-#include "webrtc/modules/video_coding/packet.h"
-#include "webrtc/modules/video_coding/rtp_frame_reference_finder.h"
-#include "webrtc/modules/video_coding/timing.h"
-#include "webrtc/rtc_base/bytebuffer.h"
-#include "webrtc/rtc_base/logging.h"
-#include "webrtc/rtc_base/ptr_util.h"
-#include "webrtc/system_wrappers/include/clock.h"
-#include "webrtc/system_wrappers/include/field_trial_default.h"
-#include "webrtc/test/field_trial.h"
-#include "webrtc/video/rtp_video_stream_receiver.h"
+#include "common_video/h264/h264_common.h"
+#include "media/base/mediaconstants.h"
+#include "modules/pacing/packet_router.h"
+#include "modules/rtp_rtcp/source/rtp_packet_received.h"
+#include "modules/utility/include/process_thread.h"
+#include "modules/video_coding/frame_object.h"
+#include "modules/video_coding/include/video_coding_defines.h"
+#include "modules/video_coding/packet.h"
+#include "modules/video_coding/rtp_frame_reference_finder.h"
+#include "modules/video_coding/timing.h"
+#include "rtc_base/bytebuffer.h"
+#include "rtc_base/logging.h"
+#include "rtc_base/ptr_util.h"
+#include "system_wrappers/include/clock.h"
+#include "system_wrappers/include/field_trial_default.h"
+#include "test/field_trial.h"
+#include "video/rtp_video_stream_receiver.h"
using testing::_;
diff --git a/video/screenshare_loopback.cc b/video/screenshare_loopback.cc
index 17fd8de..8cb8193 100644
--- a/video/screenshare_loopback.cc
+++ b/video/screenshare_loopback.cc
@@ -10,12 +10,12 @@
#include <stdio.h>
-#include "webrtc/rtc_base/flags.h"
-#include "webrtc/rtc_base/stringencode.h"
-#include "webrtc/test/field_trial.h"
-#include "webrtc/test/gtest.h"
-#include "webrtc/test/run_test.h"
-#include "webrtc/video/video_quality_test.h"
+#include "rtc_base/flags.h"
+#include "rtc_base/stringencode.h"
+#include "test/field_trial.h"
+#include "test/gtest.h"
+#include "test/run_test.h"
+#include "video/video_quality_test.h"
namespace webrtc {
namespace flags {
diff --git a/video/send_delay_stats.cc b/video/send_delay_stats.cc
index b7c6658..09b60cd 100644
--- a/video/send_delay_stats.cc
+++ b/video/send_delay_stats.cc
@@ -8,12 +8,12 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/video/send_delay_stats.h"
+#include "video/send_delay_stats.h"
#include <utility>
-#include "webrtc/rtc_base/logging.h"
-#include "webrtc/system_wrappers/include/metrics.h"
+#include "rtc_base/logging.h"
+#include "system_wrappers/include/metrics.h"
namespace webrtc {
namespace {
diff --git a/video/send_delay_stats.h b/video/send_delay_stats.h
index 230fa9d..e258dfe 100644
--- a/video/send_delay_stats.h
+++ b/video/send_delay_stats.h
@@ -8,20 +8,20 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef WEBRTC_VIDEO_SEND_DELAY_STATS_H_
-#define WEBRTC_VIDEO_SEND_DELAY_STATS_H_
+#ifndef VIDEO_SEND_DELAY_STATS_H_
+#define VIDEO_SEND_DELAY_STATS_H_
#include <map>
#include <memory>
#include <set>
-#include "webrtc/common_types.h"
-#include "webrtc/modules/include/module_common_types.h"
-#include "webrtc/rtc_base/criticalsection.h"
-#include "webrtc/rtc_base/thread_annotations.h"
-#include "webrtc/system_wrappers/include/clock.h"
-#include "webrtc/video/stats_counter.h"
-#include "webrtc/call/video_send_stream.h"
+#include "common_types.h"
+#include "modules/include/module_common_types.h"
+#include "rtc_base/criticalsection.h"
+#include "rtc_base/thread_annotations.h"
+#include "system_wrappers/include/clock.h"
+#include "video/stats_counter.h"
+#include "call/video_send_stream.h"
namespace webrtc {
@@ -83,4 +83,4 @@
};
} // namespace webrtc
-#endif // WEBRTC_VIDEO_SEND_DELAY_STATS_H_
+#endif // VIDEO_SEND_DELAY_STATS_H_
diff --git a/video/send_delay_stats_unittest.cc b/video/send_delay_stats_unittest.cc
index 0644ad2..174e70d 100644
--- a/video/send_delay_stats_unittest.cc
+++ b/video/send_delay_stats_unittest.cc
@@ -8,11 +8,11 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/video/send_delay_stats.h"
+#include "video/send_delay_stats.h"
-#include "webrtc/system_wrappers/include/metrics.h"
-#include "webrtc/system_wrappers/include/metrics_default.h"
-#include "webrtc/test/gtest.h"
+#include "system_wrappers/include/metrics.h"
+#include "system_wrappers/include/metrics_default.h"
+#include "test/gtest.h"
namespace webrtc {
namespace {
diff --git a/video/send_statistics_proxy.cc b/video/send_statistics_proxy.cc
index 00dd7bf..83a25ec 100644
--- a/video/send_statistics_proxy.cc
+++ b/video/send_statistics_proxy.cc
@@ -8,18 +8,18 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/video/send_statistics_proxy.h"
+#include "video/send_statistics_proxy.h"
#include <algorithm>
#include <cmath>
#include <map>
#include <vector>
-#include "webrtc/common_types.h"
-#include "webrtc/modules/video_coding/include/video_codec_interface.h"
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/logging.h"
-#include "webrtc/system_wrappers/include/metrics.h"
+#include "common_types.h"
+#include "modules/video_coding/include/video_codec_interface.h"
+#include "rtc_base/checks.h"
+#include "rtc_base/logging.h"
+#include "system_wrappers/include/metrics.h"
namespace webrtc {
namespace {
diff --git a/video/send_statistics_proxy.h b/video/send_statistics_proxy.h
index d6e91d7..8a609e0 100644
--- a/video/send_statistics_proxy.h
+++ b/video/send_statistics_proxy.h
@@ -8,27 +8,27 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef WEBRTC_VIDEO_SEND_STATISTICS_PROXY_H_
-#define WEBRTC_VIDEO_SEND_STATISTICS_PROXY_H_
+#ifndef VIDEO_SEND_STATISTICS_PROXY_H_
+#define VIDEO_SEND_STATISTICS_PROXY_H_
#include <map>
#include <memory>
#include <string>
#include <vector>
-#include "webrtc/common_types.h"
-#include "webrtc/modules/video_coding/include/video_codec_interface.h"
-#include "webrtc/modules/video_coding/include/video_coding_defines.h"
-#include "webrtc/rtc_base/criticalsection.h"
-#include "webrtc/rtc_base/numerics/exp_filter.h"
-#include "webrtc/rtc_base/ratetracker.h"
-#include "webrtc/rtc_base/thread_annotations.h"
-#include "webrtc/system_wrappers/include/clock.h"
-#include "webrtc/video/overuse_frame_detector.h"
-#include "webrtc/video/report_block_stats.h"
-#include "webrtc/video/stats_counter.h"
-#include "webrtc/video/video_stream_encoder.h"
-#include "webrtc/call/video_send_stream.h"
+#include "common_types.h"
+#include "modules/video_coding/include/video_codec_interface.h"
+#include "modules/video_coding/include/video_coding_defines.h"
+#include "rtc_base/criticalsection.h"
+#include "rtc_base/numerics/exp_filter.h"
+#include "rtc_base/ratetracker.h"
+#include "rtc_base/thread_annotations.h"
+#include "system_wrappers/include/clock.h"
+#include "video/overuse_frame_detector.h"
+#include "video/report_block_stats.h"
+#include "video/stats_counter.h"
+#include "video/video_stream_encoder.h"
+#include "call/video_send_stream.h"
namespace webrtc {
@@ -243,4 +243,4 @@
};
} // namespace webrtc
-#endif // WEBRTC_VIDEO_SEND_STATISTICS_PROXY_H_
+#endif // VIDEO_SEND_STATISTICS_PROXY_H_
diff --git a/video/send_statistics_proxy_unittest.cc b/video/send_statistics_proxy_unittest.cc
index de42fe8..912908c 100644
--- a/video/send_statistics_proxy_unittest.cc
+++ b/video/send_statistics_proxy_unittest.cc
@@ -8,16 +8,16 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/video/send_statistics_proxy.h"
+#include "video/send_statistics_proxy.h"
#include <map>
#include <memory>
#include <string>
#include <vector>
-#include "webrtc/system_wrappers/include/metrics.h"
-#include "webrtc/system_wrappers/include/metrics_default.h"
-#include "webrtc/test/gtest.h"
+#include "system_wrappers/include/metrics.h"
+#include "system_wrappers/include/metrics_default.h"
+#include "test/gtest.h"
namespace webrtc {
namespace {
diff --git a/video/stats_counter.cc b/video/stats_counter.cc
index adc0129..bcbf912 100644
--- a/video/stats_counter.cc
+++ b/video/stats_counter.cc
@@ -8,14 +8,14 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/video/stats_counter.h"
+#include "video/stats_counter.h"
#include <algorithm>
#include <limits>
#include <map>
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/system_wrappers/include/clock.h"
+#include "rtc_base/checks.h"
+#include "system_wrappers/include/clock.h"
namespace webrtc {
diff --git a/video/stats_counter.h b/video/stats_counter.h
index 4beb5bf..1cf22bc 100644
--- a/video/stats_counter.h
+++ b/video/stats_counter.h
@@ -8,14 +8,14 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef WEBRTC_VIDEO_STATS_COUNTER_H_
-#define WEBRTC_VIDEO_STATS_COUNTER_H_
+#ifndef VIDEO_STATS_COUNTER_H_
+#define VIDEO_STATS_COUNTER_H_
#include <memory>
#include <string>
-#include "webrtc/rtc_base/constructormagic.h"
-#include "webrtc/typedefs.h"
+#include "rtc_base/constructormagic.h"
+#include "typedefs.h"
namespace webrtc {
@@ -290,4 +290,4 @@
} // namespace webrtc
-#endif // WEBRTC_VIDEO_STATS_COUNTER_H_
+#endif // VIDEO_STATS_COUNTER_H_
diff --git a/video/stats_counter_unittest.cc b/video/stats_counter_unittest.cc
index 183f260..3f00d24 100644
--- a/video/stats_counter_unittest.cc
+++ b/video/stats_counter_unittest.cc
@@ -8,10 +8,10 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/video/stats_counter.h"
+#include "video/stats_counter.h"
-#include "webrtc/system_wrappers/include/clock.h"
-#include "webrtc/test/gtest.h"
+#include "system_wrappers/include/clock.h"
+#include "test/gtest.h"
namespace webrtc {
namespace {
diff --git a/video/stream_synchronization.cc b/video/stream_synchronization.cc
index fc9ab32..f47037d 100644
--- a/video/stream_synchronization.cc
+++ b/video/stream_synchronization.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/video/stream_synchronization.h"
+#include "video/stream_synchronization.h"
#include <assert.h>
#include <math.h>
@@ -16,7 +16,7 @@
#include <algorithm>
-#include "webrtc/rtc_base/logging.h"
+#include "rtc_base/logging.h"
namespace webrtc {
diff --git a/video/stream_synchronization.h b/video/stream_synchronization.h
index d32966b..0b74e0e 100644
--- a/video/stream_synchronization.h
+++ b/video/stream_synchronization.h
@@ -8,13 +8,13 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef WEBRTC_VIDEO_STREAM_SYNCHRONIZATION_H_
-#define WEBRTC_VIDEO_STREAM_SYNCHRONIZATION_H_
+#ifndef VIDEO_STREAM_SYNCHRONIZATION_H_
+#define VIDEO_STREAM_SYNCHRONIZATION_H_
#include <list>
-#include "webrtc/system_wrappers/include/rtp_to_ntp_estimator.h"
-#include "webrtc/typedefs.h"
+#include "system_wrappers/include/rtp_to_ntp_estimator.h"
+#include "typedefs.h"
namespace webrtc {
@@ -60,4 +60,4 @@
};
} // namespace webrtc
-#endif // WEBRTC_VIDEO_STREAM_SYNCHRONIZATION_H_
+#endif // VIDEO_STREAM_SYNCHRONIZATION_H_
diff --git a/video/stream_synchronization_unittest.cc b/video/stream_synchronization_unittest.cc
index d5607a8..f9ae37d 100644
--- a/video/stream_synchronization_unittest.cc
+++ b/video/stream_synchronization_unittest.cc
@@ -12,8 +12,8 @@
#include <algorithm>
-#include "webrtc/test/gtest.h"
-#include "webrtc/video/stream_synchronization.h"
+#include "test/gtest.h"
+#include "video/stream_synchronization.h"
namespace webrtc {
diff --git a/video/transport_adapter.cc b/video/transport_adapter.cc
index 4f4dd98..8012e74 100644
--- a/video/transport_adapter.cc
+++ b/video/transport_adapter.cc
@@ -8,9 +8,9 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/video/transport_adapter.h"
+#include "video/transport_adapter.h"
-#include "webrtc/rtc_base/checks.h"
+#include "rtc_base/checks.h"
namespace webrtc {
namespace internal {
diff --git a/video/transport_adapter.h b/video/transport_adapter.h
index 3312094..c992072 100644
--- a/video/transport_adapter.h
+++ b/video/transport_adapter.h
@@ -7,12 +7,12 @@
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef WEBRTC_VIDEO_TRANSPORT_ADAPTER_H_
-#define WEBRTC_VIDEO_TRANSPORT_ADAPTER_H_
+#ifndef VIDEO_TRANSPORT_ADAPTER_H_
+#define VIDEO_TRANSPORT_ADAPTER_H_
-#include "webrtc/api/call/transport.h"
-#include "webrtc/common_types.h"
-#include "webrtc/system_wrappers/include/atomic32.h"
+#include "api/call/transport.h"
+#include "common_types.h"
+#include "system_wrappers/include/atomic32.h"
namespace webrtc {
namespace internal {
@@ -36,4 +36,4 @@
} // namespace internal
} // namespace webrtc
-#endif // WEBRTC_VIDEO_TRANSPORT_ADAPTER_H_
+#endif // VIDEO_TRANSPORT_ADAPTER_H_
diff --git a/video/video_loopback.cc b/video/video_loopback.cc
index bf00609..d5d525a 100644
--- a/video/video_loopback.cc
+++ b/video/video_loopback.cc
@@ -10,11 +10,11 @@
#include <stdio.h>
-#include "webrtc/rtc_base/flags.h"
-#include "webrtc/test/field_trial.h"
-#include "webrtc/test/gtest.h"
-#include "webrtc/test/run_test.h"
-#include "webrtc/video/video_quality_test.h"
+#include "rtc_base/flags.h"
+#include "test/field_trial.h"
+#include "test/gtest.h"
+#include "test/run_test.h"
+#include "video/video_quality_test.h"
namespace webrtc {
namespace flags {
diff --git a/video/video_quality_test.cc b/video/video_quality_test.cc
index 6294184..16b3f65 100644
--- a/video/video_quality_test.cc
+++ b/video/video_quality_test.cc
@@ -7,7 +7,7 @@
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/video/video_quality_test.h"
+#include "video/video_quality_test.h"
#include <stdio.h>
#include <algorithm>
@@ -18,44 +18,44 @@
#include <string>
#include <vector>
-#include "webrtc/api/optional.h"
-#include "webrtc/call/call.h"
-#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
-#include "webrtc/logging/rtc_event_log/rtc_event_log.h"
-#include "webrtc/media/engine/webrtcvideoengine.h"
-#include "webrtc/modules/audio_mixer/audio_mixer_impl.h"
-#include "webrtc/modules/rtp_rtcp/include/rtp_header_parser.h"
-#include "webrtc/modules/rtp_rtcp/source/rtp_format.h"
-#include "webrtc/modules/rtp_rtcp/source/rtp_utility.h"
-#include "webrtc/modules/video_coding/codecs/h264/include/h264.h"
-#include "webrtc/modules/video_coding/codecs/vp8/include/vp8.h"
-#include "webrtc/modules/video_coding/codecs/vp8/include/vp8_common_types.h"
-#include "webrtc/modules/video_coding/codecs/vp9/include/vp9.h"
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/cpu_time.h"
-#include "webrtc/rtc_base/event.h"
-#include "webrtc/rtc_base/flags.h"
-#include "webrtc/rtc_base/format_macros.h"
-#include "webrtc/rtc_base/logging.h"
-#include "webrtc/rtc_base/memory_usage.h"
-#include "webrtc/rtc_base/pathutils.h"
-#include "webrtc/rtc_base/platform_file.h"
-#include "webrtc/rtc_base/ptr_util.h"
-#include "webrtc/rtc_base/timeutils.h"
-#include "webrtc/system_wrappers/include/cpu_info.h"
-#include "webrtc/system_wrappers/include/field_trial.h"
-#include "webrtc/test/gtest.h"
-#include "webrtc/test/layer_filtering_transport.h"
-#include "webrtc/test/run_loop.h"
-#include "webrtc/test/statistics.h"
-#include "webrtc/test/testsupport/fileutils.h"
-#include "webrtc/test/testsupport/frame_writer.h"
-#include "webrtc/test/testsupport/test_output.h"
-#include "webrtc/test/vcm_capturer.h"
-#include "webrtc/test/video_renderer.h"
-#include "webrtc/voice_engine/include/voe_base.h"
+#include "api/optional.h"
+#include "call/call.h"
+#include "common_video/libyuv/include/webrtc_libyuv.h"
+#include "logging/rtc_event_log/rtc_event_log.h"
+#include "media/engine/webrtcvideoengine.h"
+#include "modules/audio_mixer/audio_mixer_impl.h"
+#include "modules/rtp_rtcp/include/rtp_header_parser.h"
+#include "modules/rtp_rtcp/source/rtp_format.h"
+#include "modules/rtp_rtcp/source/rtp_utility.h"
+#include "modules/video_coding/codecs/h264/include/h264.h"
+#include "modules/video_coding/codecs/vp8/include/vp8.h"
+#include "modules/video_coding/codecs/vp8/include/vp8_common_types.h"
+#include "modules/video_coding/codecs/vp9/include/vp9.h"
+#include "rtc_base/checks.h"
+#include "rtc_base/cpu_time.h"
+#include "rtc_base/event.h"
+#include "rtc_base/flags.h"
+#include "rtc_base/format_macros.h"
+#include "rtc_base/logging.h"
+#include "rtc_base/memory_usage.h"
+#include "rtc_base/pathutils.h"
+#include "rtc_base/platform_file.h"
+#include "rtc_base/ptr_util.h"
+#include "rtc_base/timeutils.h"
+#include "system_wrappers/include/cpu_info.h"
+#include "system_wrappers/include/field_trial.h"
+#include "test/gtest.h"
+#include "test/layer_filtering_transport.h"
+#include "test/run_loop.h"
+#include "test/statistics.h"
+#include "test/testsupport/fileutils.h"
+#include "test/testsupport/frame_writer.h"
+#include "test/testsupport/test_output.h"
+#include "test/vcm_capturer.h"
+#include "test/video_renderer.h"
+#include "voice_engine/include/voe_base.h"
-#include "webrtc/test/rtp_file_writer.h"
+#include "test/rtp_file_writer.h"
DEFINE_bool(save_worst_frame,
false,
diff --git a/video/video_quality_test.h b/video/video_quality_test.h
index 4238447..c16105c 100644
--- a/video/video_quality_test.h
+++ b/video/video_quality_test.h
@@ -7,18 +7,18 @@
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef WEBRTC_VIDEO_VIDEO_QUALITY_TEST_H_
-#define WEBRTC_VIDEO_VIDEO_QUALITY_TEST_H_
+#ifndef VIDEO_VIDEO_QUALITY_TEST_H_
+#define VIDEO_VIDEO_QUALITY_TEST_H_
#include <map>
#include <memory>
#include <string>
#include <vector>
-#include "webrtc/media/engine/simulcast_encoder_adapter.h"
-#include "webrtc/test/call_test.h"
-#include "webrtc/test/frame_generator.h"
-#include "webrtc/test/testsupport/trace_to_stderr.h"
+#include "media/engine/simulcast_encoder_adapter.h"
+#include "test/call_test.h"
+#include "test/frame_generator.h"
+#include "test/testsupport/trace_to_stderr.h"
namespace webrtc {
@@ -164,4 +164,4 @@
} // namespace webrtc
-#endif // WEBRTC_VIDEO_VIDEO_QUALITY_TEST_H_
+#endif // VIDEO_VIDEO_QUALITY_TEST_H_
diff --git a/video/video_receive_stream.cc b/video/video_receive_stream.cc
index a89e3ce..7de42f8 100644
--- a/video/video_receive_stream.cc
+++ b/video/video_receive_stream.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/video/video_receive_stream.h"
+#include "video/video_receive_stream.h"
#include <stdlib.h>
@@ -16,29 +16,29 @@
#include <string>
#include <utility>
-#include "webrtc/api/optional.h"
-#include "webrtc/call/rtp_stream_receiver_controller_interface.h"
-#include "webrtc/call/rtx_receive_stream.h"
-#include "webrtc/common_types.h"
-#include "webrtc/common_video/h264/profile_level_id.h"
-#include "webrtc/common_video/libyuv/include/webrtc_libyuv.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"
-#include "webrtc/modules/video_coding/frame_object.h"
-#include "webrtc/modules/video_coding/include/video_coding.h"
-#include "webrtc/modules/video_coding/jitter_estimator.h"
-#include "webrtc/modules/video_coding/timing.h"
-#include "webrtc/modules/video_coding/utility/ivf_file_writer.h"
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/location.h"
-#include "webrtc/rtc_base/logging.h"
-#include "webrtc/rtc_base/ptr_util.h"
-#include "webrtc/rtc_base/trace_event.h"
-#include "webrtc/system_wrappers/include/clock.h"
-#include "webrtc/system_wrappers/include/field_trial.h"
-#include "webrtc/video/call_stats.h"
-#include "webrtc/video/receive_statistics_proxy.h"
+#include "api/optional.h"
+#include "call/rtp_stream_receiver_controller_interface.h"
+#include "call/rtx_receive_stream.h"
+#include "common_types.h"
+#include "common_video/h264/profile_level_id.h"
+#include "common_video/libyuv/include/webrtc_libyuv.h"
+#include "modules/rtp_rtcp/include/rtp_receiver.h"
+#include "modules/rtp_rtcp/include/rtp_rtcp.h"
+#include "modules/utility/include/process_thread.h"
+#include "modules/video_coding/frame_object.h"
+#include "modules/video_coding/include/video_coding.h"
+#include "modules/video_coding/jitter_estimator.h"
+#include "modules/video_coding/timing.h"
+#include "modules/video_coding/utility/ivf_file_writer.h"
+#include "rtc_base/checks.h"
+#include "rtc_base/location.h"
+#include "rtc_base/logging.h"
+#include "rtc_base/ptr_util.h"
+#include "rtc_base/trace_event.h"
+#include "system_wrappers/include/clock.h"
+#include "system_wrappers/include/field_trial.h"
+#include "video/call_stats.h"
+#include "video/receive_statistics_proxy.h"
namespace webrtc {
diff --git a/video/video_receive_stream.h b/video/video_receive_stream.h
index 8b680ae..7a4a13e 100644
--- a/video/video_receive_stream.h
+++ b/video/video_receive_stream.h
@@ -8,27 +8,27 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef WEBRTC_VIDEO_VIDEO_RECEIVE_STREAM_H_
-#define WEBRTC_VIDEO_VIDEO_RECEIVE_STREAM_H_
+#ifndef VIDEO_VIDEO_RECEIVE_STREAM_H_
+#define VIDEO_VIDEO_RECEIVE_STREAM_H_
#include <memory>
#include <vector>
-#include "webrtc/call/rtp_packet_sink_interface.h"
-#include "webrtc/call/syncable.h"
-#include "webrtc/call/video_receive_stream.h"
-#include "webrtc/common_video/include/incoming_video_stream.h"
-#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
-#include "webrtc/modules/rtp_rtcp/include/flexfec_receiver.h"
-#include "webrtc/modules/video_coding/frame_buffer2.h"
-#include "webrtc/modules/video_coding/video_coding_impl.h"
-#include "webrtc/rtc_base/sequenced_task_checker.h"
-#include "webrtc/system_wrappers/include/clock.h"
-#include "webrtc/video/receive_statistics_proxy.h"
-#include "webrtc/video/rtp_streams_synchronizer.h"
-#include "webrtc/video/rtp_video_stream_receiver.h"
-#include "webrtc/video/transport_adapter.h"
-#include "webrtc/video/video_stream_decoder.h"
+#include "call/rtp_packet_sink_interface.h"
+#include "call/syncable.h"
+#include "call/video_receive_stream.h"
+#include "common_video/include/incoming_video_stream.h"
+#include "common_video/libyuv/include/webrtc_libyuv.h"
+#include "modules/rtp_rtcp/include/flexfec_receiver.h"
+#include "modules/video_coding/frame_buffer2.h"
+#include "modules/video_coding/video_coding_impl.h"
+#include "rtc_base/sequenced_task_checker.h"
+#include "system_wrappers/include/clock.h"
+#include "video/receive_statistics_proxy.h"
+#include "video/rtp_streams_synchronizer.h"
+#include "video/rtp_video_stream_receiver.h"
+#include "video/transport_adapter.h"
+#include "video/video_stream_decoder.h"
namespace webrtc {
@@ -159,4 +159,4 @@
} // namespace internal
} // namespace webrtc
-#endif // WEBRTC_VIDEO_VIDEO_RECEIVE_STREAM_H_
+#endif // VIDEO_VIDEO_RECEIVE_STREAM_H_
diff --git a/video/video_receive_stream_unittest.cc b/video/video_receive_stream_unittest.cc
index bce4fd3..97a447b 100644
--- a/video/video_receive_stream_unittest.cc
+++ b/video/video_receive_stream_unittest.cc
@@ -10,21 +10,21 @@
#include <vector>
-#include "webrtc/test/gtest.h"
-#include "webrtc/test/gmock.h"
+#include "test/gtest.h"
+#include "test/gmock.h"
-#include "webrtc/api/video_codecs/video_decoder.h"
-#include "webrtc/call/rtp_stream_receiver_controller.h"
-#include "webrtc/media/base/fakevideorenderer.h"
-#include "webrtc/modules/pacing/packet_router.h"
-#include "webrtc/modules/rtp_rtcp/source/rtp_packet_to_send.h"
-#include "webrtc/modules/utility/include/process_thread.h"
-#include "webrtc/rtc_base/criticalsection.h"
-#include "webrtc/rtc_base/event.h"
-#include "webrtc/system_wrappers/include/clock.h"
-#include "webrtc/test/field_trial.h"
-#include "webrtc/video/call_stats.h"
-#include "webrtc/video/video_receive_stream.h"
+#include "api/video_codecs/video_decoder.h"
+#include "call/rtp_stream_receiver_controller.h"
+#include "media/base/fakevideorenderer.h"
+#include "modules/pacing/packet_router.h"
+#include "modules/rtp_rtcp/source/rtp_packet_to_send.h"
+#include "modules/utility/include/process_thread.h"
+#include "rtc_base/criticalsection.h"
+#include "rtc_base/event.h"
+#include "system_wrappers/include/clock.h"
+#include "test/field_trial.h"
+#include "video/call_stats.h"
+#include "video/video_receive_stream.h"
namespace webrtc {
namespace {
diff --git a/video/video_send_stream.cc b/video/video_send_stream.cc
index 61884ca..a874298 100644
--- a/video/video_send_stream.cc
+++ b/video/video_send_stream.cc
@@ -7,7 +7,7 @@
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/video/video_send_stream.h"
+#include "video/video_send_stream.h"
#include <algorithm>
#include <cmath>
@@ -16,27 +16,27 @@
#include <utility>
#include <vector>
-#include "webrtc/call/rtp_transport_controller_send_interface.h"
-#include "webrtc/common_types.h"
-#include "webrtc/common_video/include/video_bitrate_allocator.h"
-#include "webrtc/modules/bitrate_controller/include/bitrate_controller.h"
-#include "webrtc/modules/congestion_controller/include/send_side_congestion_controller.h"
-#include "webrtc/modules/pacing/alr_detector.h"
-#include "webrtc/modules/pacing/packet_router.h"
-#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp.h"
-#include "webrtc/modules/rtp_rtcp/source/rtp_sender.h"
-#include "webrtc/modules/utility/include/process_thread.h"
-#include "webrtc/modules/video_coding/utility/ivf_file_writer.h"
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/file.h"
-#include "webrtc/rtc_base/location.h"
-#include "webrtc/rtc_base/logging.h"
-#include "webrtc/rtc_base/trace_event.h"
-#include "webrtc/rtc_base/weak_ptr.h"
-#include "webrtc/system_wrappers/include/field_trial.h"
-#include "webrtc/video/call_stats.h"
-#include "webrtc/video/payload_router.h"
-#include "webrtc/call/video_send_stream.h"
+#include "call/rtp_transport_controller_send_interface.h"
+#include "common_types.h"
+#include "common_video/include/video_bitrate_allocator.h"
+#include "modules/bitrate_controller/include/bitrate_controller.h"
+#include "modules/congestion_controller/include/send_side_congestion_controller.h"
+#include "modules/pacing/alr_detector.h"
+#include "modules/pacing/packet_router.h"
+#include "modules/rtp_rtcp/include/rtp_rtcp.h"
+#include "modules/rtp_rtcp/source/rtp_sender.h"
+#include "modules/utility/include/process_thread.h"
+#include "modules/video_coding/utility/ivf_file_writer.h"
+#include "rtc_base/checks.h"
+#include "rtc_base/file.h"
+#include "rtc_base/location.h"
+#include "rtc_base/logging.h"
+#include "rtc_base/trace_event.h"
+#include "rtc_base/weak_ptr.h"
+#include "system_wrappers/include/field_trial.h"
+#include "video/call_stats.h"
+#include "video/payload_router.h"
+#include "call/video_send_stream.h"
namespace webrtc {
diff --git a/video/video_send_stream.h b/video/video_send_stream.h
index 06fbb36..e6c0fe3 100644
--- a/video/video_send_stream.h
+++ b/video/video_send_stream.h
@@ -8,25 +8,25 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef WEBRTC_VIDEO_VIDEO_SEND_STREAM_H_
-#define WEBRTC_VIDEO_VIDEO_SEND_STREAM_H_
+#ifndef VIDEO_VIDEO_SEND_STREAM_H_
+#define VIDEO_VIDEO_SEND_STREAM_H_
#include <map>
#include <memory>
#include <vector>
-#include "webrtc/call/bitrate_allocator.h"
-#include "webrtc/call/video_receive_stream.h"
-#include "webrtc/call/video_send_stream.h"
-#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
-#include "webrtc/modules/video_coding/protection_bitrate_calculator.h"
-#include "webrtc/rtc_base/criticalsection.h"
-#include "webrtc/rtc_base/event.h"
-#include "webrtc/rtc_base/task_queue.h"
-#include "webrtc/video/encoder_rtcp_feedback.h"
-#include "webrtc/video/send_delay_stats.h"
-#include "webrtc/video/send_statistics_proxy.h"
-#include "webrtc/video/video_stream_encoder.h"
+#include "call/bitrate_allocator.h"
+#include "call/video_receive_stream.h"
+#include "call/video_send_stream.h"
+#include "common_video/libyuv/include/webrtc_libyuv.h"
+#include "modules/video_coding/protection_bitrate_calculator.h"
+#include "rtc_base/criticalsection.h"
+#include "rtc_base/event.h"
+#include "rtc_base/task_queue.h"
+#include "video/encoder_rtcp_feedback.h"
+#include "video/send_delay_stats.h"
+#include "video/send_statistics_proxy.h"
+#include "video/video_stream_encoder.h"
namespace webrtc {
@@ -108,4 +108,4 @@
} // namespace internal
} // namespace webrtc
-#endif // WEBRTC_VIDEO_VIDEO_SEND_STREAM_H_
+#endif // VIDEO_VIDEO_SEND_STREAM_H_
diff --git a/video/video_send_stream_tests.cc b/video/video_send_stream_tests.cc
index 422b983..0eeae21 100644
--- a/video/video_send_stream_tests.cc
+++ b/video/video_send_stream_tests.cc
@@ -11,40 +11,40 @@
#include <memory>
#include <vector>
-#include "webrtc/call/call.h"
-#include "webrtc/call/rtp_transport_controller_send.h"
-#include "webrtc/common_video/include/frame_callback.h"
-#include "webrtc/common_video/include/video_frame.h"
-#include "webrtc/modules/rtp_rtcp/include/rtp_header_parser.h"
-#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp.h"
-#include "webrtc/modules/rtp_rtcp/source/rtcp_sender.h"
-#include "webrtc/modules/rtp_rtcp/source/rtp_format_vp9.h"
-#include "webrtc/modules/video_coding/codecs/vp8/include/vp8.h"
-#include "webrtc/modules/video_coding/codecs/vp9/include/vp9.h"
-#include "webrtc/rtc_base/bind.h"
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/criticalsection.h"
-#include "webrtc/rtc_base/event.h"
-#include "webrtc/rtc_base/logging.h"
-#include "webrtc/rtc_base/platform_thread.h"
-#include "webrtc/rtc_base/rate_limiter.h"
-#include "webrtc/rtc_base/timeutils.h"
-#include "webrtc/system_wrappers/include/sleep.h"
-#include "webrtc/test/call_test.h"
-#include "webrtc/test/configurable_frame_size_encoder.h"
-#include "webrtc/test/fake_texture_frame.h"
-#include "webrtc/test/field_trial.h"
-#include "webrtc/test/frame_generator.h"
-#include "webrtc/test/frame_generator_capturer.h"
-#include "webrtc/test/frame_utils.h"
-#include "webrtc/test/gtest.h"
-#include "webrtc/test/null_transport.h"
-#include "webrtc/test/rtcp_packet_parser.h"
-#include "webrtc/test/testsupport/perf_test.h"
+#include "call/call.h"
+#include "call/rtp_transport_controller_send.h"
+#include "common_video/include/frame_callback.h"
+#include "common_video/include/video_frame.h"
+#include "modules/rtp_rtcp/include/rtp_header_parser.h"
+#include "modules/rtp_rtcp/include/rtp_rtcp.h"
+#include "modules/rtp_rtcp/source/rtcp_sender.h"
+#include "modules/rtp_rtcp/source/rtp_format_vp9.h"
+#include "modules/video_coding/codecs/vp8/include/vp8.h"
+#include "modules/video_coding/codecs/vp9/include/vp9.h"
+#include "rtc_base/bind.h"
+#include "rtc_base/checks.h"
+#include "rtc_base/criticalsection.h"
+#include "rtc_base/event.h"
+#include "rtc_base/logging.h"
+#include "rtc_base/platform_thread.h"
+#include "rtc_base/rate_limiter.h"
+#include "rtc_base/timeutils.h"
+#include "system_wrappers/include/sleep.h"
+#include "test/call_test.h"
+#include "test/configurable_frame_size_encoder.h"
+#include "test/fake_texture_frame.h"
+#include "test/field_trial.h"
+#include "test/frame_generator.h"
+#include "test/frame_generator_capturer.h"
+#include "test/frame_utils.h"
+#include "test/gtest.h"
+#include "test/null_transport.h"
+#include "test/rtcp_packet_parser.h"
+#include "test/testsupport/perf_test.h"
-#include "webrtc/video/send_statistics_proxy.h"
-#include "webrtc/video/transport_adapter.h"
-#include "webrtc/call/video_send_stream.h"
+#include "video/send_statistics_proxy.h"
+#include "video/transport_adapter.h"
+#include "call/video_send_stream.h"
namespace webrtc {
diff --git a/video/video_stream_decoder.cc b/video/video_stream_decoder.cc
index 009a18c..b27a52e 100644
--- a/video/video_stream_decoder.cc
+++ b/video/video_stream_decoder.cc
@@ -8,20 +8,20 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/video/video_stream_decoder.h"
+#include "video/video_stream_decoder.h"
#include <algorithm>
#include <map>
#include <vector>
-#include "webrtc/common_video/include/frame_callback.h"
-#include "webrtc/modules/video_coding/video_coding_impl.h"
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/logging.h"
-#include "webrtc/system_wrappers/include/metrics.h"
-#include "webrtc/video/call_stats.h"
-#include "webrtc/video/payload_router.h"
-#include "webrtc/video/receive_statistics_proxy.h"
+#include "common_video/include/frame_callback.h"
+#include "modules/video_coding/video_coding_impl.h"
+#include "rtc_base/checks.h"
+#include "rtc_base/logging.h"
+#include "system_wrappers/include/metrics.h"
+#include "video/call_stats.h"
+#include "video/payload_router.h"
+#include "video/receive_statistics_proxy.h"
namespace webrtc {
diff --git a/video/video_stream_decoder.h b/video/video_stream_decoder.h
index 88cff97..52d0c9a 100644
--- a/video/video_stream_decoder.h
+++ b/video/video_stream_decoder.h
@@ -8,21 +8,21 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef WEBRTC_VIDEO_VIDEO_STREAM_DECODER_H_
-#define WEBRTC_VIDEO_VIDEO_STREAM_DECODER_H_
+#ifndef VIDEO_VIDEO_STREAM_DECODER_H_
+#define VIDEO_VIDEO_STREAM_DECODER_H_
#include <list>
#include <map>
#include <memory>
#include <vector>
-#include "webrtc/media/base/videosinkinterface.h"
-#include "webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h"
-#include "webrtc/modules/video_coding/include/video_coding_defines.h"
-#include "webrtc/rtc_base/criticalsection.h"
-#include "webrtc/rtc_base/platform_thread.h"
-#include "webrtc/rtc_base/scoped_ref_ptr.h"
-#include "webrtc/typedefs.h"
+#include "media/base/videosinkinterface.h"
+#include "modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h"
+#include "modules/video_coding/include/video_coding_defines.h"
+#include "rtc_base/criticalsection.h"
+#include "rtc_base/platform_thread.h"
+#include "rtc_base/scoped_ref_ptr.h"
+#include "typedefs.h"
namespace webrtc {
@@ -102,4 +102,4 @@
} // namespace webrtc
-#endif // WEBRTC_VIDEO_VIDEO_STREAM_DECODER_H_
+#endif // VIDEO_VIDEO_STREAM_DECODER_H_
diff --git a/video/video_stream_encoder.cc b/video/video_stream_encoder.cc
index ccd2854..e37050c 100644
--- a/video/video_stream_encoder.cc
+++ b/video/video_stream_encoder.cc
@@ -8,29 +8,29 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/video/video_stream_encoder.h"
+#include "video/video_stream_encoder.h"
#include <algorithm>
#include <limits>
#include <numeric>
#include <utility>
-#include "webrtc/api/video/i420_buffer.h"
-#include "webrtc/common_video/include/video_bitrate_allocator.h"
-#include "webrtc/common_video/include/video_frame.h"
-#include "webrtc/modules/pacing/paced_sender.h"
-#include "webrtc/modules/video_coding/codecs/vp8/temporal_layers.h"
-#include "webrtc/modules/video_coding/include/video_codec_initializer.h"
-#include "webrtc/modules/video_coding/include/video_coding.h"
-#include "webrtc/modules/video_coding/include/video_coding_defines.h"
-#include "webrtc/rtc_base/arraysize.h"
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/location.h"
-#include "webrtc/rtc_base/logging.h"
-#include "webrtc/rtc_base/timeutils.h"
-#include "webrtc/rtc_base/trace_event.h"
-#include "webrtc/video/overuse_frame_detector.h"
-#include "webrtc/video/send_statistics_proxy.h"
+#include "api/video/i420_buffer.h"
+#include "common_video/include/video_bitrate_allocator.h"
+#include "common_video/include/video_frame.h"
+#include "modules/pacing/paced_sender.h"
+#include "modules/video_coding/codecs/vp8/temporal_layers.h"
+#include "modules/video_coding/include/video_codec_initializer.h"
+#include "modules/video_coding/include/video_coding.h"
+#include "modules/video_coding/include/video_coding_defines.h"
+#include "rtc_base/arraysize.h"
+#include "rtc_base/checks.h"
+#include "rtc_base/location.h"
+#include "rtc_base/logging.h"
+#include "rtc_base/timeutils.h"
+#include "rtc_base/trace_event.h"
+#include "video/overuse_frame_detector.h"
+#include "video/send_statistics_proxy.h"
namespace webrtc {
diff --git a/video/video_stream_encoder.h b/video/video_stream_encoder.h
index a0fa2df..b0169ae 100644
--- a/video/video_stream_encoder.h
+++ b/video/video_stream_encoder.h
@@ -8,31 +8,31 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef WEBRTC_VIDEO_VIDEO_STREAM_ENCODER_H_
-#define WEBRTC_VIDEO_VIDEO_STREAM_ENCODER_H_
+#ifndef VIDEO_VIDEO_STREAM_ENCODER_H_
+#define VIDEO_VIDEO_STREAM_ENCODER_H_
#include <map>
#include <memory>
#include <string>
#include <vector>
-#include "webrtc/api/video/video_rotation.h"
-#include "webrtc/api/video_codecs/video_encoder.h"
-#include "webrtc/call/call.h"
-#include "webrtc/common_types.h"
-#include "webrtc/common_video/include/video_bitrate_allocator.h"
-#include "webrtc/media/base/videosinkinterface.h"
-#include "webrtc/modules/video_coding/include/video_coding_defines.h"
-#include "webrtc/modules/video_coding/utility/quality_scaler.h"
-#include "webrtc/modules/video_coding/video_coding_impl.h"
-#include "webrtc/rtc_base/criticalsection.h"
-#include "webrtc/rtc_base/event.h"
-#include "webrtc/rtc_base/sequenced_task_checker.h"
-#include "webrtc/rtc_base/task_queue.h"
-#include "webrtc/system_wrappers/include/atomic32.h"
-#include "webrtc/typedefs.h"
-#include "webrtc/video/overuse_frame_detector.h"
-#include "webrtc/call/video_send_stream.h"
+#include "api/video/video_rotation.h"
+#include "api/video_codecs/video_encoder.h"
+#include "call/call.h"
+#include "common_types.h"
+#include "common_video/include/video_bitrate_allocator.h"
+#include "media/base/videosinkinterface.h"
+#include "modules/video_coding/include/video_coding_defines.h"
+#include "modules/video_coding/utility/quality_scaler.h"
+#include "modules/video_coding/video_coding_impl.h"
+#include "rtc_base/criticalsection.h"
+#include "rtc_base/event.h"
+#include "rtc_base/sequenced_task_checker.h"
+#include "rtc_base/task_queue.h"
+#include "system_wrappers/include/atomic32.h"
+#include "typedefs.h"
+#include "video/overuse_frame_detector.h"
+#include "call/video_send_stream.h"
namespace webrtc {
@@ -316,4 +316,4 @@
} // namespace webrtc
-#endif // WEBRTC_VIDEO_VIDEO_STREAM_ENCODER_H_
+#endif // VIDEO_VIDEO_STREAM_ENCODER_H_
diff --git a/video/video_stream_encoder_unittest.cc b/video/video_stream_encoder_unittest.cc
index 488486c..5afbe27 100644
--- a/video/video_stream_encoder_unittest.cc
+++ b/video/video_stream_encoder_unittest.cc
@@ -12,21 +12,21 @@
#include <limits>
#include <utility>
-#include "webrtc/api/video/i420_buffer.h"
-#include "webrtc/media/base/videoadapter.h"
-#include "webrtc/modules/video_coding/codecs/vp8/temporal_layers.h"
-#include "webrtc/modules/video_coding/utility/default_video_bitrate_allocator.h"
-#include "webrtc/rtc_base/fakeclock.h"
-#include "webrtc/rtc_base/logging.h"
-#include "webrtc/system_wrappers/include/metrics_default.h"
-#include "webrtc/system_wrappers/include/sleep.h"
-#include "webrtc/test/encoder_settings.h"
-#include "webrtc/test/fake_encoder.h"
-#include "webrtc/test/frame_generator.h"
-#include "webrtc/test/gmock.h"
-#include "webrtc/test/gtest.h"
-#include "webrtc/video/send_statistics_proxy.h"
-#include "webrtc/video/video_stream_encoder.h"
+#include "api/video/i420_buffer.h"
+#include "media/base/videoadapter.h"
+#include "modules/video_coding/codecs/vp8/temporal_layers.h"
+#include "modules/video_coding/utility/default_video_bitrate_allocator.h"
+#include "rtc_base/fakeclock.h"
+#include "rtc_base/logging.h"
+#include "system_wrappers/include/metrics_default.h"
+#include "system_wrappers/include/sleep.h"
+#include "test/encoder_settings.h"
+#include "test/fake_encoder.h"
+#include "test/frame_generator.h"
+#include "test/gmock.h"
+#include "test/gtest.h"
+#include "video/send_statistics_proxy.h"
+#include "video/video_stream_encoder.h"
namespace {
const int kMinPixelsPerFrame = 320 * 180;
