summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
Diffstat (limited to 'media')
-rw-r--r--media/base/pipeline_impl.cc8
-rw-r--r--media/filters/decoder_base.h13
-rw-r--r--media/filters/ffmpeg_demuxer.cc7
-rw-r--r--media/filters/ffmpeg_video_decoder.cc11
-rw-r--r--media/filters/omx_video_decoder.cc2
5 files changed, 14 insertions, 27 deletions
diff --git a/media/base/pipeline_impl.cc b/media/base/pipeline_impl.cc
index 5d7759c..bd9e9fe 100644
--- a/media/base/pipeline_impl.cc
+++ b/media/base/pipeline_impl.cc
@@ -93,12 +93,8 @@ bool PipelineImpl::Start(FilterFactory* factory,
// Kick off initialization!
running_ = true;
- message_loop_->PostTask(
- FROM_HERE,
- NewRunnableMethod(this,
- &PipelineImpl::StartTask,
- make_scoped_refptr(factory),
- url,
+ message_loop_->PostTask(FROM_HERE,
+ NewRunnableMethod(this, &PipelineImpl::StartTask, factory, url,
callback.release()));
return true;
}
diff --git a/media/filters/decoder_base.h b/media/filters/decoder_base.h
index 355bb06..60245ed 100644
--- a/media/filters/decoder_base.h
+++ b/media/filters/decoder_base.h
@@ -30,26 +30,21 @@ class DecoderBase : public Decoder {
// MediaFilter implementation.
virtual void Stop(FilterCallback* callback) {
- this->message_loop()->PostTask(
- FROM_HERE,
+ this->message_loop()->PostTask(FROM_HERE,
NewRunnableMethod(this, &DecoderBase::StopTask, callback));
}
virtual void Seek(base::TimeDelta time,
FilterCallback* callback) {
- this->message_loop()->PostTask(
- FROM_HERE,
+ this->message_loop()->PostTask(FROM_HERE,
NewRunnableMethod(this, &DecoderBase::SeekTask, time, callback));
}
// Decoder implementation.
virtual void Initialize(DemuxerStream* demuxer_stream,
FilterCallback* callback) {
- this->message_loop()->PostTask(
- FROM_HERE,
- NewRunnableMethod(this,
- &DecoderBase::InitializeTask,
- make_scoped_refptr(demuxer_stream),
+ this->message_loop()->PostTask(FROM_HERE,
+ NewRunnableMethod(this, &DecoderBase::InitializeTask, demuxer_stream,
callback));
}
diff --git a/media/filters/ffmpeg_demuxer.cc b/media/filters/ffmpeg_demuxer.cc
index 5869e3a..797481b 100644
--- a/media/filters/ffmpeg_demuxer.cc
+++ b/media/filters/ffmpeg_demuxer.cc
@@ -310,11 +310,8 @@ void FFmpegDemuxer::OnAudioRendererDisabled() {
void FFmpegDemuxer::Initialize(DataSource* data_source,
FilterCallback* callback) {
- message_loop()->PostTask(
- FROM_HERE,
- NewRunnableMethod(this,
- &FFmpegDemuxer::InitializeTask,
- make_scoped_refptr(data_source),
+ message_loop()->PostTask(FROM_HERE,
+ NewRunnableMethod(this, &FFmpegDemuxer::InitializeTask, data_source,
callback));
}
diff --git a/media/filters/ffmpeg_video_decoder.cc b/media/filters/ffmpeg_video_decoder.cc
index 73deb74..c79f679 100644
--- a/media/filters/ffmpeg_video_decoder.cc
+++ b/media/filters/ffmpeg_video_decoder.cc
@@ -36,12 +36,11 @@ FFmpegVideoDecoder::~FFmpegVideoDecoder() {
void FFmpegVideoDecoder::Initialize(DemuxerStream* demuxer_stream,
FilterCallback* callback) {
if (MessageLoop::current() != message_loop()) {
- message_loop()->PostTask(
- FROM_HERE,
- NewRunnableMethod(this,
- &FFmpegVideoDecoder::Initialize,
- make_scoped_refptr(demuxer_stream),
- callback));
+ message_loop()->PostTask(FROM_HERE,
+ NewRunnableMethod(this,
+ &FFmpegVideoDecoder::Initialize,
+ demuxer_stream,
+ callback));
return;
}
diff --git a/media/filters/omx_video_decoder.cc b/media/filters/omx_video_decoder.cc
index 178a29c..82793de 100644
--- a/media/filters/omx_video_decoder.cc
+++ b/media/filters/omx_video_decoder.cc
@@ -57,7 +57,7 @@ void OmxVideoDecoder::Initialize(DemuxerStream* demuxer_stream,
FROM_HERE,
NewRunnableMethod(this,
&OmxVideoDecoder::Initialize,
- make_scoped_refptr(demuxer_stream),
+ demuxer_stream,
callback));
return;
}