diff options
author | noamsml@google.com <noamsml@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-08 21:23:24 +0000 |
---|---|---|
committer | noamsml@google.com <noamsml@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-08 21:23:24 +0000 |
commit | d9d59d9f96995bab6a2fc212277511f7a0186a94 (patch) | |
tree | ab95dc9e7a17f97e2554fb3b144cc15aab186d35 /media/cast/cast_receiver_impl.cc | |
parent | e1f0b85058b95912bf34064e7e9a0ae2cb12d254 (diff) | |
download | chromium_src-d9d59d9f96995bab6a2fc212277511f7a0186a94.zip chromium_src-d9d59d9f96995bab6a2fc212277511f7a0186a94.tar.gz chromium_src-d9d59d9f96995bab6a2fc212277511f7a0186a94.tar.bz2 |
Revert 243647 "Cast:Adding cast_transport_config and cleaning up"
> Cast:Adding cast_transport_config and cleaning up
>
> BUG=327482
>
> Review URL: https://codereview.chromium.org/109413004
TBR=mikhal@chromium.org
Review URL: https://codereview.chromium.org/129113003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@243648 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/cast/cast_receiver_impl.cc')
-rw-r--r-- | media/cast/cast_receiver_impl.cc | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/media/cast/cast_receiver_impl.cc b/media/cast/cast_receiver_impl.cc index 4f4feb1..e2c004f 100644 --- a/media/cast/cast_receiver_impl.cc +++ b/media/cast/cast_receiver_impl.cc @@ -66,7 +66,7 @@ class LocalFrameReceiver : public FrameReceiver { }; // The video and audio receivers should only be called from the main thread. -class LocalPacketReceiver : public transport::PacketReceiver { +class LocalPacketReceiver : public PacketReceiver { public: LocalPacketReceiver(scoped_refptr<CastEnvironment> cast_environment, AudioReceiver* audio_receiver, @@ -149,9 +149,7 @@ CastReceiverImpl::CastReceiverImpl( const AudioReceiverConfig& audio_config, const VideoReceiverConfig& video_config, PacketSender* const packet_sender) - : pacer_(cast_environment->Clock(), packet_sender, - cast_environment->GetMessageTaskRunnerForThread( - CastEnvironment::TRANSPORT)), + : pacer_(cast_environment, packet_sender), audio_receiver_(cast_environment, audio_config, &pacer_), video_receiver_(cast_environment, video_config, &pacer_), frame_receiver_(new LocalFrameReceiver(cast_environment, @@ -165,7 +163,7 @@ CastReceiverImpl::CastReceiverImpl( CastReceiverImpl::~CastReceiverImpl() {} -scoped_refptr<transport::PacketReceiver> CastReceiverImpl::packet_receiver() { +scoped_refptr<PacketReceiver> CastReceiverImpl::packet_receiver() { return packet_receiver_; } |