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-Original-Commit-Position: refs/heads/master@{#19561}
Cr-Mirrored-From: https://chromium.googlesource.com/external/webrtc
Cr-Mirrored-Commit: 5212700c79f713f0ff009af761064fc30afe5960
diff --git a/media/engine/fakewebrtccall.h b/media/engine/fakewebrtccall.h
index 91585f6..cd8d370 100644
--- a/media/engine/fakewebrtccall.h
+++ b/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/modules/video_coding/DEPS b/modules/video_coding/DEPS
index df2a440..69984cf 100644
--- a/modules/video_coding/DEPS
+++ b/modules/video_coding/DEPS
@@ -3,6 +3,7 @@
"+third_party/openh264",
"+vpx",
"+webrtc/base",
+ "+webrtc/call",
"+webrtc/common_video",
"+webrtc/system_wrappers",
"+webrtc/rtc_tools",
diff --git a/modules/video_coding/include/video_codec_initializer.h b/modules/video_coding/include/video_codec_initializer.h
index 159218d..ef3ff9c 100644
--- a/modules/video_coding/include/video_codec_initializer.h
+++ b/modules/video_coding/include/video_codec_initializer.h
@@ -15,7 +15,7 @@
#include <string>
#include <vector>
-#include "webrtc/video_send_stream.h"
+#include "webrtc/call/video_send_stream.h"
namespace webrtc {
diff --git a/test/frame_generator_capturer.cc b/test/frame_generator_capturer.cc
index 73cc5ae..4f1937b 100644
--- a/test/frame_generator_capturer.cc
+++ b/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/test/rtp_rtcp_observer.h b/test/rtp_rtcp_observer.h
index 4154010..8d6fefd 100644
--- a/test/rtp_rtcp_observer.h
+++ b/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/test/vcm_capturer.cc b/test/vcm_capturer.cc
index 85cf0cd..0c6ded0 100644
--- a/test/vcm_capturer.cc
+++ b/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/video/send_delay_stats.h b/video/send_delay_stats.h
index 658cf2b..5d8538e 100644
--- a/video/send_delay_stats.h
+++ b/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/video/send_statistics_proxy.h b/video/send_statistics_proxy.h
index 81da6cb..fead848 100644
--- a/video/send_statistics_proxy.h
+++ b/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/video/video_send_stream.cc b/video/video_send_stream.cc
index ce1eb2f..f2b8d4a 100644
--- a/video/video_send_stream.cc
+++ b/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/video/video_send_stream_tests.cc b/video/video_send_stream_tests.cc
index 7a60b76..9a7429f 100644
--- a/video/video_send_stream_tests.cc
+++ b/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/video/video_stream_encoder.h b/video/video_stream_encoder.h
index c554e11..8f6cb07 100644
--- a/video/video_stream_encoder.h
+++ b/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 {
