| Index: media/cast/cast_sender_impl.cc
|
| diff --git a/media/cast/cast_sender_impl.cc b/media/cast/cast_sender_impl.cc
|
| index 8ec91b31ea1d14178cc67b9ee79323f795fced12..da4d4dd910a77ad11c59ffc3997f5a70dc36031b 100644
|
| --- a/media/cast/cast_sender_impl.cc
|
| +++ b/media/cast/cast_sender_impl.cc
|
| @@ -40,9 +40,10 @@ class LocalFrameInput : public FrameInput {
|
| audio_bus, recorded_time, done_callback));
|
| }
|
|
|
| - virtual void InsertCodedAudioFrame(const EncodedAudioFrame* audio_frame,
|
| - const base::TimeTicks& recorded_time,
|
| - const base::Closure callback) OVERRIDE {
|
| + virtual void InsertCodedAudioFrame(
|
| + const transport::EncodedAudioFrame* audio_frame,
|
| + const base::TimeTicks& recorded_time,
|
| + const base::Closure callback) OVERRIDE {
|
| cast_environment_->PostTask(CastEnvironment::MAIN, FROM_HERE,
|
| base::Bind(&AudioSender::InsertCodedAudioFrame, audio_sender_,
|
| audio_frame, recorded_time, callback));
|
| @@ -85,7 +86,7 @@ class LocalFrameInput : public FrameInput {
|
| // separate video cameras, each MUST be identified as a different
|
| // SSRC.
|
|
|
| -class LocalCastSenderPacketReceiver : public PacketReceiver {
|
| +class LocalCastSenderPacketReceiver : public transport::PacketReceiver {
|
| public:
|
| LocalCastSenderPacketReceiver(scoped_refptr<CastEnvironment> cast_environment,
|
| base::WeakPtr<AudioSender> audio_sender,
|
| @@ -157,7 +158,9 @@ CastSenderImpl::CastSenderImpl(
|
| const VideoSenderConfig& video_config,
|
| const scoped_refptr<GpuVideoAcceleratorFactories>& gpu_factories,
|
| PacketSender* const packet_sender)
|
| - : pacer_(cast_environment, packet_sender),
|
| + : pacer_(cast_environment->Clock(), packet_sender,
|
| + cast_environment->GetMessageTaskRunnerForThread(
|
| + CastEnvironment::TRANSPORT)),
|
| audio_sender_(cast_environment, audio_config, &pacer_),
|
| video_sender_(cast_environment, video_config, gpu_factories, &pacer_),
|
| frame_input_(new LocalFrameInput(cast_environment,
|
| @@ -174,7 +177,7 @@ scoped_refptr<FrameInput> CastSenderImpl::frame_input() {
|
| return frame_input_;
|
| }
|
|
|
| -scoped_refptr<PacketReceiver> CastSenderImpl::packet_receiver() {
|
| +scoped_refptr<transport::PacketReceiver> CastSenderImpl::packet_receiver() {
|
| return packet_receiver_;
|
| }
|
|
|
|
|