Moved transport_adapter.h/.cc from call/ to video/ dir to remove circular dependency
Issue: video_receive_stream.cc includes transport_adapter.h which use to be inside call/ and call depends on video/ which caused circular dependency. We moved transport_adapter.h/.cc inside video/ and removed dependency of video/ on call/
BUG=webrtc:6412
NOTRY=True
Review-Url: https://codereview.webrtc.org/2470913004
Cr-Original-Commit-Position: refs/heads/master@{#14907}
Cr-Mirrored-From: https://chromium.googlesource.com/external/webrtc
Cr-Mirrored-Commit: bf6a45b44253988b8dceda43aad157f340aa6e82
diff --git a/call/BUILD.gn b/call/BUILD.gn
index 8ea5d05..98ea9bc 100644
--- a/call/BUILD.gn
+++ b/call/BUILD.gn
@@ -14,8 +14,6 @@
"call.cc",
"flexfec_receive_stream.cc",
"flexfec_receive_stream.h",
- "transport_adapter.cc",
- "transport_adapter.h",
]
if (!build_with_chromium && is_clang) {
diff --git a/call/call_perf_tests.cc b/call/call_perf_tests.cc
index 340c580..39c333e 100644
--- a/call/call_perf_tests.cc
+++ b/call/call_perf_tests.cc
@@ -17,7 +17,6 @@
#include "webrtc/base/constructormagic.h"
#include "webrtc/base/thread_annotations.h"
#include "webrtc/call.h"
-#include "webrtc/call/transport_adapter.h"
#include "webrtc/config.h"
#include "webrtc/logging/rtc_event_log/rtc_event_log.h"
#include "webrtc/modules/audio_coding/include/audio_coding_module.h"
@@ -38,6 +37,7 @@
#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 "webrtc/voice_engine/include/voe_base.h"
using webrtc::test::DriftingClock;
diff --git a/call/webrtc_call.gypi b/call/webrtc_call.gypi
index fd1d9c5..eb6f5b1 100644
--- a/call/webrtc_call.gypi
+++ b/call/webrtc_call.gypi
@@ -19,8 +19,8 @@
'call/call.cc',
'call/flexfec_receive_stream.cc',
'call/flexfec_receive_stream.h',
- 'call/transport_adapter.cc',
- 'call/transport_adapter.h',
+ '../video/transport_adapter.cc',
+ '../video/transport_adapter.h',
],
},
}
diff --git a/video/BUILD.gn b/video/BUILD.gn
index aa42dc0..e97de6f 100644
--- a/video/BUILD.gn
+++ b/video/BUILD.gn
@@ -34,6 +34,8 @@
"stats_counter.h",
"stream_synchronization.cc",
"stream_synchronization.h",
+ "transport_adapter.cc",
+ "transport_adapter.h",
"video_decoder.cc",
"video_encoder.cc",
"video_receive_stream.cc",
diff --git a/video/end_to_end_tests.cc b/video/end_to_end_tests.cc
index 2e61375..492f55d 100644
--- a/video/end_to_end_tests.cc
+++ b/video/end_to_end_tests.cc
@@ -21,7 +21,6 @@
#include "webrtc/base/optional.h"
#include "webrtc/base/rate_limiter.h"
#include "webrtc/call.h"
-#include "webrtc/call/transport_adapter.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"
@@ -51,6 +50,7 @@
#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 "webrtc/video_encoder.h"
namespace webrtc {
diff --git a/call/transport_adapter.cc b/video/transport_adapter.cc
similarity index 96%
rename from call/transport_adapter.cc
rename to video/transport_adapter.cc
index 5e59b7b..6f4e028 100644
--- a/call/transport_adapter.cc
+++ b/video/transport_adapter.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/call/transport_adapter.h"
+#include "webrtc/video/transport_adapter.h"
#include "webrtc/base/checks.h"
diff --git a/call/transport_adapter.h b/video/transport_adapter.h
similarity index 88%
rename from call/transport_adapter.h
rename to video/transport_adapter.h
index 583cdf9..2ed58aa 100644
--- a/call/transport_adapter.h
+++ b/video/transport_adapter.h
@@ -7,8 +7,8 @@
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef WEBRTC_CALL_TRANSPORT_ADAPTER_H_
-#define WEBRTC_CALL_TRANSPORT_ADAPTER_H_
+#ifndef WEBRTC_VIDEO_TRANSPORT_ADAPTER_H_
+#define WEBRTC_VIDEO_TRANSPORT_ADAPTER_H_
#include "webrtc/common_types.h"
#include "webrtc/system_wrappers/include/atomic32.h"
@@ -36,4 +36,4 @@
} // namespace internal
} // namespace webrtc
-#endif // WEBRTC_CALL_TRANSPORT_ADAPTER_H_
+#endif // WEBRTC_VIDEO_TRANSPORT_ADAPTER_H_
diff --git a/video/video_receive_stream.h b/video/video_receive_stream.h
index f2a7c81..0efbe75 100644
--- a/video/video_receive_stream.h
+++ b/video/video_receive_stream.h
@@ -14,7 +14,6 @@
#include <memory>
#include <vector>
-#include "webrtc/call/transport_adapter.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"
@@ -23,6 +22,7 @@
#include "webrtc/video/receive_statistics_proxy.h"
#include "webrtc/video/rtp_stream_receiver.h"
#include "webrtc/video/rtp_streams_synchronizer.h"
+#include "webrtc/video/transport_adapter.h"
#include "webrtc/video/video_stream_decoder.h"
#include "webrtc/video_receive_stream.h"
diff --git a/video/video_send_stream_tests.cc b/video/video_send_stream_tests.cc
index eafdefa..2b28f4f 100644
--- a/video/video_send_stream_tests.cc
+++ b/video/video_send_stream_tests.cc
@@ -19,7 +19,6 @@
#include "webrtc/base/platform_thread.h"
#include "webrtc/base/rate_limiter.h"
#include "webrtc/call.h"
-#include "webrtc/call/transport_adapter.h"
#include "webrtc/common_video/include/frame_callback.h"
#include "webrtc/modules/rtp_rtcp/include/rtp_header_parser.h"
#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp.h"
@@ -38,6 +37,7 @@
#include "webrtc/test/testsupport/perf_test.h"
#include "webrtc/video/send_statistics_proxy.h"
+#include "webrtc/video/transport_adapter.h"
#include "webrtc/video_frame.h"
#include "webrtc/video_send_stream.h"
