From 5212700c79f713f0ff009af761064fc30afe5960 Mon Sep 17 00:00:00 2001 From: mbonadei Date: Mon, 28 Aug 2017 06:46:48 -0700 Subject: [PATCH] Removing dependencies on stub headers within WebRTC. Headers webrtc/video_receive_stream.h and webrtc/video_send_stream.h have been moved to webrtc/call in https://codereview.webrtc.org/3000253002, this CL is just switching WebRTC internal dependencies to actual headers instead of depending on the backward compatibility ones. BUG=webrtc:8107 Review-Url: https://codereview.webrtc.org/3007553002 Cr-Commit-Position: refs/heads/master@{#19561} --- webrtc/media/engine/fakewebrtccall.h | 4 ++-- webrtc/modules/video_coding/DEPS | 1 + webrtc/modules/video_coding/include/video_codec_initializer.h | 2 +- webrtc/test/frame_generator_capturer.cc | 2 +- webrtc/test/rtp_rtcp_observer.h | 2 +- webrtc/test/vcm_capturer.cc | 2 +- webrtc/video/send_delay_stats.h | 2 +- webrtc/video/send_statistics_proxy.h | 2 +- webrtc/video/video_send_stream.cc | 2 +- webrtc/video/video_send_stream_tests.cc | 2 +- webrtc/video/video_stream_encoder.h | 2 +- 11 files changed, 12 insertions(+), 11 deletions(-) diff --git a/webrtc/media/engine/fakewebrtccall.h b/webrtc/media/engine/fakewebrtccall.h index 91585f69a9..cd8d3709ef 100644 --- a/webrtc/media/engine/fakewebrtccall.h +++ b/webrtc/media/engine/fakewebrtccall.h @@ -31,8 +31,8 @@ #include "webrtc/call/flexfec_receive_stream.h" #include "webrtc/modules/rtp_rtcp/source/rtp_packet_received.h" #include "webrtc/rtc_base/buffer.h" -#include "webrtc/video_receive_stream.h" -#include "webrtc/video_send_stream.h" +#include "webrtc/call/video_receive_stream.h" +#include "webrtc/call/video_send_stream.h" namespace cricket { class FakeAudioSendStream final : public webrtc::AudioSendStream { diff --git a/webrtc/modules/video_coding/DEPS b/webrtc/modules/video_coding/DEPS index df2a440766..69984cf03f 100644 --- a/webrtc/modules/video_coding/DEPS +++ b/webrtc/modules/video_coding/DEPS @@ -3,6 +3,7 @@ include_rules = [ "+third_party/openh264", "+vpx", "+webrtc/base", + "+webrtc/call", "+webrtc/common_video", "+webrtc/system_wrappers", "+webrtc/rtc_tools", diff --git a/webrtc/modules/video_coding/include/video_codec_initializer.h b/webrtc/modules/video_coding/include/video_codec_initializer.h index 159218d514..ef3ff9c1f2 100644 --- a/webrtc/modules/video_coding/include/video_codec_initializer.h +++ b/webrtc/modules/video_coding/include/video_codec_initializer.h @@ -15,7 +15,7 @@ #include #include -#include "webrtc/video_send_stream.h" +#include "webrtc/call/video_send_stream.h" namespace webrtc { diff --git a/webrtc/test/frame_generator_capturer.cc b/webrtc/test/frame_generator_capturer.cc index 73cc5aed72..4f1937b40a 100644 --- a/webrtc/test/frame_generator_capturer.cc +++ b/webrtc/test/frame_generator_capturer.cc @@ -20,7 +20,7 @@ #include "webrtc/rtc_base/timeutils.h" #include "webrtc/system_wrappers/include/clock.h" #include "webrtc/test/frame_generator.h" -#include "webrtc/video_send_stream.h" +#include "webrtc/call/video_send_stream.h" namespace webrtc { namespace test { diff --git a/webrtc/test/rtp_rtcp_observer.h b/webrtc/test/rtp_rtcp_observer.h index 4154010dca..8d6fefdcd8 100644 --- a/webrtc/test/rtp_rtcp_observer.h +++ b/webrtc/test/rtp_rtcp_observer.h @@ -22,7 +22,7 @@ #include "webrtc/test/direct_transport.h" #include "webrtc/test/gtest.h" #include "webrtc/typedefs.h" -#include "webrtc/video_send_stream.h" +#include "webrtc/call/video_send_stream.h" namespace { const int kShortTimeoutMs = 500; diff --git a/webrtc/test/vcm_capturer.cc b/webrtc/test/vcm_capturer.cc index 85cf0cdf01..0c6ded03b4 100644 --- a/webrtc/test/vcm_capturer.cc +++ b/webrtc/test/vcm_capturer.cc @@ -12,7 +12,7 @@ #include "webrtc/modules/video_capture/video_capture_factory.h" #include "webrtc/rtc_base/logging.h" -#include "webrtc/video_send_stream.h" +#include "webrtc/call/video_send_stream.h" namespace webrtc { namespace test { diff --git a/webrtc/video/send_delay_stats.h b/webrtc/video/send_delay_stats.h index 658cf2b176..5d8538eb5d 100644 --- a/webrtc/video/send_delay_stats.h +++ b/webrtc/video/send_delay_stats.h @@ -21,7 +21,7 @@ #include "webrtc/rtc_base/thread_annotations.h" #include "webrtc/system_wrappers/include/clock.h" #include "webrtc/video/stats_counter.h" -#include "webrtc/video_send_stream.h" +#include "webrtc/call/video_send_stream.h" namespace webrtc { diff --git a/webrtc/video/send_statistics_proxy.h b/webrtc/video/send_statistics_proxy.h index 81da6cb535..fead8488f3 100644 --- a/webrtc/video/send_statistics_proxy.h +++ b/webrtc/video/send_statistics_proxy.h @@ -28,7 +28,7 @@ #include "webrtc/video/report_block_stats.h" #include "webrtc/video/stats_counter.h" #include "webrtc/video/video_stream_encoder.h" -#include "webrtc/video_send_stream.h" +#include "webrtc/call/video_send_stream.h" namespace webrtc { diff --git a/webrtc/video/video_send_stream.cc b/webrtc/video/video_send_stream.cc index ce1eb2f0fb..f2b8d4a957 100644 --- a/webrtc/video/video_send_stream.cc +++ b/webrtc/video/video_send_stream.cc @@ -36,7 +36,7 @@ #include "webrtc/system_wrappers/include/field_trial.h" #include "webrtc/video/call_stats.h" #include "webrtc/video/payload_router.h" -#include "webrtc/video_send_stream.h" +#include "webrtc/call/video_send_stream.h" namespace webrtc { diff --git a/webrtc/video/video_send_stream_tests.cc b/webrtc/video/video_send_stream_tests.cc index 7a60b765e2..9a7429f2f2 100644 --- a/webrtc/video/video_send_stream_tests.cc +++ b/webrtc/video/video_send_stream_tests.cc @@ -44,7 +44,7 @@ #include "webrtc/video/send_statistics_proxy.h" #include "webrtc/video/transport_adapter.h" -#include "webrtc/video_send_stream.h" +#include "webrtc/call/video_send_stream.h" namespace webrtc { diff --git a/webrtc/video/video_stream_encoder.h b/webrtc/video/video_stream_encoder.h index c554e11588..8f6cb07755 100644 --- a/webrtc/video/video_stream_encoder.h +++ b/webrtc/video/video_stream_encoder.h @@ -32,7 +32,7 @@ #include "webrtc/system_wrappers/include/atomic32.h" #include "webrtc/typedefs.h" #include "webrtc/video/overuse_frame_detector.h" -#include "webrtc/video_send_stream.h" +#include "webrtc/call/video_send_stream.h" namespace webrtc {