Index: media/cast/cast_sender_impl.cc |
diff --git a/media/cast/cast_sender_impl.cc b/media/cast/cast_sender_impl.cc |
index 69ebd53c6bd4c155498c0356d61ef4a24d01307e..af97be12cfe56f28484a57fe035710299febe10e 100644 |
--- a/media/cast/cast_sender_impl.cc |
+++ b/media/cast/cast_sender_impl.cc |
@@ -32,9 +32,10 @@ class LocalFrameInput : public FrameInput { |
video_frame, capture_time)); |
} |
- virtual void InsertCodedVideoFrame(const EncodedVideoFrame* video_frame, |
- const base::TimeTicks& capture_time, |
- const base::Closure callback) OVERRIDE { |
+ virtual void InsertCodedVideoFrame( |
+ const transport::EncodedVideoFrame* video_frame, |
+ const base::TimeTicks& capture_time, |
+ const base::Closure callback) OVERRIDE { |
cast_environment_->PostTask(CastEnvironment::MAIN, FROM_HERE, |
base::Bind(&VideoSender::InsertCodedVideoFrame, video_sender_, |
video_frame, capture_time, callback)); |
@@ -48,9 +49,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)); |
@@ -93,7 +95,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, |
@@ -168,7 +170,9 @@ CastSenderImpl::CastSenderImpl( |
const VideoSenderConfig& video_config, |
VideoEncoderController* const video_encoder_controller, |
PacketSender* const packet_sender) |
- : pacer_(cast_environment, packet_sender), |
+ : pacer_(cast_environment->Clock(), packet_sender, |
+ cast_environment->GetMessageTaskRunnerForThread( |
+ CastEnvironment::MAIN)), |
audio_sender_(cast_environment, audio_config, &pacer_), |
video_sender_(cast_environment, video_config, video_encoder_controller, |
&pacer_), |
@@ -186,7 +190,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_; |
} |