commit 65f17ca6b4cff0a342144cd71376e10bbabc054f
author Niels Möller <nisse@webrtc.org> Thu Sep 12 11:59:36 2019
committer Commit Bot <commit-bot@chromium.org> Fri Sep 13 10:49:56 2019
tree 8182efb5b991407813ab4984c0945a7a78677981
parent 5f15f86f7c85887d17bc900aac8af30546c96096

Move MediaTransportInterface out of the libjingle_peerconnection_api target

And move related files into api/transport/ and api/transport/media/.
The moved files are unchanged, except that
congestion_control_interface.h and datagram_transport_interface.h
no longer include media_transport_interface.h, instead, they forward
declare the few MediaTransport* types they reference.

Bug: webrtc:8733
Change-Id: I4f4000d0d111f10d15a54c99af27ec26c46ae652
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/152482
Commit-Queue: Niels Moller <nisse@webrtc.org>
Reviewed-by: Bjorn Mellem <mellem@webrtc.org>
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#29178}

audio/BUILD.gn

diff --git a/audio/BUILD.gn b/audio/BUILD.gn
index abf4c67..dba7b58 100644
--- a/audio/BUILD.gn
+++ b/audio/BUILD.gn
@@ -54,6 +54,7 @@
     "../api/audio_codecs:audio_codecs_api",
     "../api/rtc_event_log",
     "../api/task_queue",
+    "../api/transport/media:media_transport_interface",
     "../api/transport/rtp:rtp_source",
     "../call:bitrate_allocator",
     "../call:call_interfaces",
@@ -139,6 +140,7 @@
       "../api/audio_codecs/opus:audio_encoder_opus",
       "../api/rtc_event_log",
       "../api/task_queue:default_task_queue_factory",
+      "../api/transport/media:media_transport_interface",
       "../api/units:time_delta",
       "../call:mock_bitrate_allocator",
       "../call:mock_call_interfaces",

audio/audio_send_stream.cc

diff --git a/audio/audio_send_stream.cc b/audio/audio_send_stream.cc
index 479216a..cd137d9 100644
--- a/audio/audio_send_stream.cc
+++ b/audio/audio_send_stream.cc
@@ -21,8 +21,8 @@
 #include "api/call/transport.h"
 #include "api/crypto/frame_encryptor_interface.h"
 #include "api/function_view.h"
-#include "api/media_transport_config.h"
 #include "api/rtc_event_log/rtc_event_log.h"
+#include "api/transport/media/media_transport_config.h"
 #include "audio/audio_state.h"
 #include "audio/channel_send.h"
 #include "audio/conversion.h"

audio/channel_receive.h

diff --git a/audio/channel_receive.h b/audio/channel_receive.h
index a7151bc..7527ef2 100644
--- a/audio/channel_receive.h
+++ b/audio/channel_receive.h
@@ -22,8 +22,8 @@
 #include "api/call/audio_sink.h"
 #include "api/call/transport.h"
 #include "api/crypto/crypto_options.h"
-#include "api/media_transport_config.h"
-#include "api/media_transport_interface.h"
+#include "api/transport/media/media_transport_config.h"
+#include "api/transport/media/media_transport_interface.h"
 #include "api/transport/rtp/rtp_source.h"
 #include "call/rtp_packet_sink_interface.h"
 #include "call/syncable.h"

audio/channel_send.h

diff --git a/audio/channel_send.h b/audio/channel_send.h
index 575f71f..6f94610 100644
--- a/audio/channel_send.h
+++ b/audio/channel_send.h
@@ -19,9 +19,9 @@
 #include "api/audio_codecs/audio_encoder.h"
 #include "api/crypto/crypto_options.h"
 #include "api/function_view.h"
-#include "api/media_transport_config.h"
-#include "api/media_transport_interface.h"
 #include "api/task_queue/task_queue_factory.h"
+#include "api/transport/media/media_transport_config.h"
+#include "api/transport/media/media_transport_interface.h"
 #include "modules/rtp_rtcp/include/report_block_data.h"
 #include "modules/rtp_rtcp/include/rtp_rtcp.h"
 #include "modules/rtp_rtcp/source/rtp_sender_audio.h"

audio/test/media_transport_test.cc

diff --git a/audio/test/media_transport_test.cc b/audio/test/media_transport_test.cc
index cc360df..aacee1e 100644
--- a/audio/test/media_transport_test.cc
+++ b/audio/test/media_transport_test.cc
@@ -13,11 +13,11 @@
 #include "api/audio_codecs/audio_encoder_factory_template.h"
 #include "api/audio_codecs/opus/audio_decoder_opus.h"
 #include "api/audio_codecs/opus/audio_encoder_opus.h"
-#include "api/media_transport_config.h"
 #include "api/rtc_event_log/rtc_event_log.h"
 #include "api/task_queue/default_task_queue_factory.h"
 #include "api/test/loopback_media_transport.h"
 #include "api/test/mock_audio_mixer.h"
+#include "api/transport/media/media_transport_config.h"
 #include "audio/audio_receive_stream.h"
 #include "audio/audio_send_stream.h"
 #include "call/rtp_transport_controller_send.h"