From ed7b8b1e55b97c9eb2687388545045d96f6ca4c8 Mon Sep 17 00:00:00 2001 From: "Piotr (Peter) Slatala" Date: Mon, 29 Oct 2018 10:43:16 -0700 Subject: [PATCH] Update media transport settings struct 1) Add an explicit copy constructor with default implementation. 2) Pass it by const reference. Bug: webrtc:9719 Change-Id: I8e4c8c837ad048ee030f86c01c24102015e12949 Reviewed-on: https://webrtc-review.googlesource.com/c/108380 Reviewed-by: Seth Hampson Commit-Queue: Peter Slatala Cr-Commit-Position: refs/heads/master@{#25432} --- api/media_transport_interface.cc | 10 ++++++++-- api/media_transport_interface.h | 4 +++- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/api/media_transport_interface.cc b/api/media_transport_interface.cc index 40dde2aed3..c583fb4c8d 100644 --- a/api/media_transport_interface.cc +++ b/api/media_transport_interface.cc @@ -23,6 +23,10 @@ namespace webrtc { MediaTransportSettings::MediaTransportSettings() = default; +MediaTransportSettings::MediaTransportSettings(const MediaTransportSettings&) = + default; +MediaTransportSettings& MediaTransportSettings::operator=( + const MediaTransportSettings&) = default; MediaTransportSettings::~MediaTransportSettings() = default; MediaTransportEncodedAudioFrame::~MediaTransportEncodedAudioFrame() {} @@ -84,14 +88,16 @@ MediaTransportFactory::CreateMediaTransport( rtc::PacketTransportInternal* packet_transport, rtc::Thread* network_thread, bool is_caller) { - return std::unique_ptr(nullptr); + MediaTransportSettings settings; + settings.is_caller = is_caller; + return CreateMediaTransport(packet_transport, network_thread, settings); } RTCErrorOr> MediaTransportFactory::CreateMediaTransport( rtc::PacketTransportInternal* packet_transport, rtc::Thread* network_thread, - const MediaTransportSettings settings) { + const MediaTransportSettings& settings) { return std::unique_ptr(nullptr); } diff --git a/api/media_transport_interface.h b/api/media_transport_interface.h index 0e6a3fc270..6580370a0e 100644 --- a/api/media_transport_interface.h +++ b/api/media_transport_interface.h @@ -39,6 +39,8 @@ namespace webrtc { // A collection of settings for creation of media transport. struct MediaTransportSettings final { MediaTransportSettings(); + MediaTransportSettings(const MediaTransportSettings&); + MediaTransportSettings& operator=(const MediaTransportSettings&); ~MediaTransportSettings(); // Group calls are not currently supported, in 1:1 call one side must set @@ -280,7 +282,7 @@ class MediaTransportFactory { virtual RTCErrorOr> CreateMediaTransport(rtc::PacketTransportInternal* packet_transport, rtc::Thread* network_thread, - const MediaTransportSettings settings); + const MediaTransportSettings& settings); }; } // namespace webrtc