diff options
| author | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-21 19:21:26 +0000 |
|---|---|---|
| committer | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-21 19:21:26 +0000 |
| commit | a857720adbefb288556f10cc0134f67445c4837f (patch) | |
| tree | c7f2a47471bb55e5cc27d85f3470e515e7ae8ca1 /media/tools | |
| parent | 6f445b5a71f8bc6c64c40d3ffe4b107102cb3cdb (diff) | |
| download | chromium_src-a857720adbefb288556f10cc0134f67445c4837f.zip chromium_src-a857720adbefb288556f10cc0134f67445c4837f.tar.gz chromium_src-a857720adbefb288556f10cc0134f67445c4837f.tar.bz2 | |
Combine media decoding and pipeline threads.
After r168350 the pipeline thread no longer gets blocked on IO for demuxing, which opens the possibility to run decoders on the pipeline thread.
Doing local testing with chrome://tracing reveals these threads are mostly idle and can be combined without incurring performance/playback regressions.
BUG=61293
TBR=jamesr,tkent
Review URL: https://codereview.chromium.org/11299118
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@169087 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/tools')
| -rw-r--r-- | media/tools/player_wtl/movie.cc | 4 | ||||
| -rw-r--r-- | media/tools/player_x11/player_x11.cc | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/media/tools/player_wtl/movie.cc b/media/tools/player_wtl/movie.cc index 2debaa7..679c4f5 100644 --- a/media/tools/player_wtl/movie.cc +++ b/media/tools/player_wtl/movie.cc @@ -78,11 +78,11 @@ bool Movie::Open(const wchar_t* file_path, VideoRendererBase* video_renderer) { collection->GetAudioDecoders()->push_back(new FFmpegAudioDecoder( base::Bind(&MessageLoopFactory::GetMessageLoop, base::Unretained(message_loop_factory_.get()), - media::MessageLoopFactory::kDecoder))); + media::MessageLoopFactory::kPipeline))); collection->GetVideoDecoders()->push_back(new FFmpegVideoDecoder( base::Bind(&MessageLoopFactory::GetMessageLoop, base::Unretained(message_loop_factory_.get()), - media::MessageLoopFactory::kDecoder), + media::MessageLoopFactory::kPipeline), NULL)); // TODO(vrk): Re-enabled audio. (crbug.com/112159) diff --git a/media/tools/player_x11/player_x11.cc b/media/tools/player_x11/player_x11.cc index d8aa656..a4fe749 100644 --- a/media/tools/player_x11/player_x11.cc +++ b/media/tools/player_x11/player_x11.cc @@ -114,11 +114,11 @@ bool InitPipeline(const scoped_refptr<base::MessageLoopProxy>& message_loop, collection->GetAudioDecoders()->push_back(new media::FFmpegAudioDecoder( base::Bind(&media::MessageLoopFactory::GetMessageLoop, base::Unretained(message_loop_factory), - media::MessageLoopFactory::kDecoder))); + media::MessageLoopFactory::kPipeline))); collection->GetVideoDecoders()->push_back(new media::FFmpegVideoDecoder( base::Bind(&media::MessageLoopFactory::GetMessageLoop, base::Unretained(message_loop_factory), - media::MessageLoopFactory::kDecoder), + media::MessageLoopFactory::kPipeline), NULL)); // Create our video renderer and save a reference to it for painting. |