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

Removed new calls on RtpTransportControllerSend.

Browse Source 
new is an unsafe construct, while these specific cases were properly
handled it is a code smell and using unique_ptr from the start makes the
code more obviously correct.

Bug: None
Change-Id: I2554cef8d3a8432a3ced1623292fae0adff9421d
Reviewed-on: https://webrtc-review.googlesource.com/56620
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Commit-Queue: Sebastian Jansson <srte@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#22147}
This commit is contained in:
Sebastian Jansson
2018-02-22 10:31:14 +01:00
committed by Commit Bot
parent 5d436ac0bf
commit 9a03dd89e0
2 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ortc/rtptransportcontrolleradapter.cc
View File

@ -24,6 +24,7 @@
#include "ortc/rtptransportadapter.h" #include "ortc/rtptransportadapter.h"
#include "pc/rtpmediautils.h" #include "pc/rtpmediautils.h"
#include "rtc_base/checks.h" #include "rtc_base/checks.h"
#include "rtc_base/ptr_util.h"
namespace webrtc { namespace webrtc {
@ -650,12 +651,11 @@ void RtpTransportControllerAdapter::Init_w() {
call_config.bitrate_config.min_bitrate_bps = kMinBandwidthBps; call_config.bitrate_config.min_bitrate_bps = kMinBandwidthBps;
call_config.bitrate_config.start_bitrate_bps = kStartBandwidthBps; call_config.bitrate_config.start_bitrate_bps = kStartBandwidthBps;
call_config.bitrate_config.max_bitrate_bps = kMaxBandwidthBps; call_config.bitrate_config.max_bitrate_bps = kMaxBandwidthBps;
std::unique_ptr<RtpTransportControllerSend> controller_send =
call_send_rtp_transport_controller_ = new RtpTransportControllerSend( rtc::MakeUnique<RtpTransportControllerSend>(
Clock::GetRealTimeClock(), event_log_, call_config.bitrate_config); Clock::GetRealTimeClock(), event_log_, call_config.bitrate_config);
call_.reset(webrtc::Call::Create( call_send_rtp_transport_controller_ = controller_send.get();
call_config, std::unique_ptr<RtpTransportControllerSendInterface>( call_.reset(webrtc::Call::Create(call_config, std::move(controller_send)));
call_send_rtp_transport_controller_)));
} }
void RtpTransportControllerAdapter::Close_w() { void RtpTransportControllerAdapter::Close_w() {

9
test/call_test.cc
View File

@ -171,12 +171,11 @@ void CallTest::CreateCalls(const Call::Config& sender_config,
} }
void CallTest::CreateSenderCall(const Call::Config& config) { void CallTest::CreateSenderCall(const Call::Config& config) {
sender_call_transport_controller_ = new RtpTransportControllerSend( std::unique_ptr<RtpTransportControllerSend> controller_send =
rtc::MakeUnique<RtpTransportControllerSend>(
Clock::GetRealTimeClock(), config.event_log, config.bitrate_config); Clock::GetRealTimeClock(), config.event_log, config.bitrate_config);
sender_call_transport_controller_ = controller_send.get();
sender_call_.reset( sender_call_.reset(Call::Create(config, std::move(controller_send)));
Call::Create(config, std::unique_ptr<RtpTransportControllerSend>(
sender_call_transport_controller_)));
} }
void CallTest::CreateReceiverCall(const Call::Config& config) { void CallTest::CreateReceiverCall(const Call::Config& config) {