| Index: media/cast/sender/audio_sender.cc
|
| diff --git a/media/cast/sender/audio_sender.cc b/media/cast/sender/audio_sender.cc
|
| index 808b5ea2e7e662abf8572d4522eabf83b301842a..af76047ce3581980d4dcec132ec6cb68ac796389 100644
|
| --- a/media/cast/sender/audio_sender.cc
|
| +++ b/media/cast/sender/audio_sender.cc
|
| @@ -8,6 +8,7 @@
|
|
|
| #include "base/bind.h"
|
| #include "base/logging.h"
|
| +#include "base/memory/ptr_util.h"
|
| #include "base/message_loop/message_loop.h"
|
| #include "media/cast/common/rtp_time.h"
|
| #include "media/cast/net/cast_transport_config.h"
|
| @@ -68,16 +69,13 @@ AudioSender::AudioSender(scoped_refptr<CastEnvironment> cast_environment,
|
| transport_config.aes_iv_mask = audio_config.aes_iv_mask;
|
|
|
| transport_sender->InitializeAudio(
|
| - transport_config, base::Bind(&AudioSender::OnReceivedCastFeedback,
|
| - weak_factory_.GetWeakPtr()),
|
| - base::Bind(&AudioSender::OnMeasuredRoundTripTime,
|
| - weak_factory_.GetWeakPtr()),
|
| - base::Bind(&AudioSender::OnReceivedPli, weak_factory_.GetWeakPtr()));
|
| + transport_config, base::WrapUnique(new FrameSender::RtcpObserver(
|
| + weak_factory_.GetWeakPtr())));
|
| }
|
|
|
| AudioSender::~AudioSender() {}
|
|
|
| -void AudioSender::InsertAudio(scoped_ptr<AudioBus> audio_bus,
|
| +void AudioSender::InsertAudio(std::unique_ptr<AudioBus> audio_bus,
|
| const base::TimeTicks& recorded_time) {
|
| DCHECK(cast_environment_->CurrentlyOn(CastEnvironment::MAIN));
|
|
|
|
|