diff options
| author | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-28 21:06:16 +0000 |
|---|---|---|
| committer | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-28 21:06:16 +0000 |
| commit | 8c076cb4d805a90a4cce6ac55b55c707bbabfabf (patch) | |
| tree | 972614dd6e6965518b8efefb85129e6f0e5dc849 /media/tools | |
| parent | 4f7c687e57fdc5681dd9c788fabee3082d9eb778 (diff) | |
| download | chromium_src-8c076cb4d805a90a4cce6ac55b55c707bbabfabf.zip chromium_src-8c076cb4d805a90a4cce6ac55b55c707bbabfabf.tar.gz chromium_src-8c076cb4d805a90a4cce6ac55b55c707bbabfabf.tar.bz2 | |
Remove MessageLoopProxy-getting callbacks from various media classes.
Now that the pipeline and decoder threads are combined we can guarantee that a thread exists at construction time.
BUG=116873
TBR=jamesr
Review URL: https://codereview.chromium.org/11411110
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@170054 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/tools')
| -rw-r--r-- | media/tools/player_wtl/movie.cc | 9 | ||||
| -rw-r--r-- | media/tools/player_x11/player_x11.cc | 9 |
2 files changed, 4 insertions, 14 deletions
diff --git a/media/tools/player_wtl/movie.cc b/media/tools/player_wtl/movie.cc index 679c4f5..e30abd7 100644 --- a/media/tools/player_wtl/movie.cc +++ b/media/tools/player_wtl/movie.cc @@ -76,14 +76,9 @@ bool Movie::Open(const wchar_t* file_path, VideoRendererBase* video_renderer) { scoped_ptr<FilterCollection> collection(new FilterCollection()); collection->SetDemuxer(new FFmpegDemuxer(pipeline_loop, data_source)); collection->GetAudioDecoders()->push_back(new FFmpegAudioDecoder( - base::Bind(&MessageLoopFactory::GetMessageLoop, - base::Unretained(message_loop_factory_.get()), - media::MessageLoopFactory::kPipeline))); + pipeline_loop)); collection->GetVideoDecoders()->push_back(new FFmpegVideoDecoder( - base::Bind(&MessageLoopFactory::GetMessageLoop, - base::Unretained(message_loop_factory_.get()), - media::MessageLoopFactory::kPipeline), - NULL)); + pipeline_loop, NULL)); // TODO(vrk): Re-enabled audio. (crbug.com/112159) collection->AddAudioRenderer( diff --git a/media/tools/player_x11/player_x11.cc b/media/tools/player_x11/player_x11.cc index a4fe749..5822253 100644 --- a/media/tools/player_x11/player_x11.cc +++ b/media/tools/player_x11/player_x11.cc @@ -112,14 +112,9 @@ bool InitPipeline(const scoped_refptr<base::MessageLoopProxy>& message_loop, new media::FilterCollection()); collection->SetDemuxer(new media::FFmpegDemuxer(message_loop, data_source)); collection->GetAudioDecoders()->push_back(new media::FFmpegAudioDecoder( - base::Bind(&media::MessageLoopFactory::GetMessageLoop, - base::Unretained(message_loop_factory), - media::MessageLoopFactory::kPipeline))); + message_loop)); collection->GetVideoDecoders()->push_back(new media::FFmpegVideoDecoder( - base::Bind(&media::MessageLoopFactory::GetMessageLoop, - base::Unretained(message_loop_factory), - media::MessageLoopFactory::kPipeline), - NULL)); + message_loop, NULL)); // Create our video renderer and save a reference to it for painting. g_video_renderer = new media::VideoRendererBase( |