zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove deprecated CreateMediaTransport method

Browse Source 
Bug: webrtc:9719
Change-Id: I4aef407c4770fc98abcbc114b87e73bbf13d8f56
Reviewed-on: https://webrtc-review.googlesource.com/c/124021
Reviewed-by: Steve Anton <steveanton@webrtc.org>
Reviewed-by: Anton Sukhanov <sukhanov@webrtc.org>
Reviewed-by: Bjorn Mellem <mellem@webrtc.org>
Commit-Queue: Peter Slatala <psla@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#26860}
This commit is contained in:
Piotr (Peter) Slatala
2019-02-22 10:39:55 -08:00
committed by Commit Bot
parent 39b69ccf14
commit 1a16da1cf2
4 changed files with 5 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
api/media_transport_interface.cc
View File

@ -33,16 +33,6 @@ MediaTransportSettings::~MediaTransportSettings() = default;
SendDataParams::SendDataParams() = default;
SendDataParams::SendDataParams(const SendDataParams&) = default;
RTCErrorOr<std::unique_ptr<MediaTransportInterface>>
MediaTransportFactory::CreateMediaTransport(
rtc::PacketTransportInternal* packet_transport,
rtc::Thread* network_thread,
bool is_caller) {
MediaTransportSettings settings;
settings.is_caller = is_caller;
return CreateMediaTransport(packet_transport, network_thread, settings);
}
RTCErrorOr<std::unique_ptr<MediaTransportInterface>>
MediaTransportFactory::CreateMediaTransport(
rtc::PacketTransportInternal* packet_transport,

11
api/media_transport_interface.h
View File

@ -318,17 +318,6 @@ class MediaTransportFactory {
// - Does not take ownership of packet_transport or network_thread.
// - Does not support group calls, in 1:1 call one side must set
// is_caller = true and another is_caller = false.
// TODO(bugs.webrtc.org/9938) This constructor will be removed and replaced
// with the one below.
virtual RTCErrorOr<std::unique_ptr<MediaTransportInterface>>
CreateMediaTransport(rtc::PacketTransportInternal* packet_transport,
rtc::Thread* network_thread,
bool is_caller);
// Creates media transport.
// - Does not take ownership of packet_transport or network_thread.
// TODO(bugs.webrtc.org/9938): remove default implementation once all children
// override it.
virtual RTCErrorOr<std::unique_ptr<MediaTransportInterface>>
CreateMediaTransport(rtc::PacketTransportInternal* packet_transport,
rtc::Thread* network_thread,

9
api/test/fake_media_transport.h
View File

@ -110,15 +110,6 @@ class FakeMediaTransportFactory : public MediaTransportFactory {
FakeMediaTransportFactory() = default;
~FakeMediaTransportFactory() = default;
RTCErrorOr<std::unique_ptr<MediaTransportInterface>> CreateMediaTransport(
rtc::PacketTransportInternal* packet_transport,
rtc::Thread* network_thread,
bool is_caller) override {
MediaTransportSettings settings;
settings.is_caller = is_caller;
return CreateMediaTransport(packet_transport, network_thread, settings);
}
RTCErrorOr<std::unique_ptr<MediaTransportInterface>> CreateMediaTransport(
rtc::PacketTransportInternal* packet_transport,
rtc::Thread* network_thread,

8
pc/channel_manager_unittest.cc
View File

@ -69,10 +69,12 @@ class ChannelManagerTest : public testing::Test {
std::unique_ptr<webrtc::MediaTransportInterface> CreateMediaTransport(
rtc::PacketTransportInternal* packet_transport) {
webrtc::MediaTransportSettings settings;
settings.is_caller = true;
auto media_transport_result =
fake_media_transport_factory_.CreateMediaTransport(packet_transport,
network_.get(),
/*is_caller=*/true);
fake_media_transport_factory_.CreateMediaTransport(
packet_transport, network_.get(),
/*is_caller=*/settings);
RTC_CHECK(media_transport_result.ok());
return media_transport_result.MoveValue();
}