diff options
| author | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-06 13:13:42 +0000 |
|---|---|---|
| committer | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-06 13:13:42 +0000 |
| commit | c462c90bfcdfc8085a8eb70b1fffba95898fc050 (patch) | |
| tree | 1bccba456d8ac6c72a907c643b2c9474404b27ca /media/tools | |
| parent | af915b00a594f29a34e4c687d3697855a8830ae1 (diff) | |
| download | chromium_src-c462c90bfcdfc8085a8eb70b1fffba95898fc050.zip chromium_src-c462c90bfcdfc8085a8eb70b1fffba95898fc050.tar.gz chromium_src-c462c90bfcdfc8085a8eb70b1fffba95898fc050.tar.bz2 | |
Combine audio decoding and video decoding onto a single thread.
Our use of multithreaded video decoding results in a video decoding thread that is idle most of the time. Instead of being idle it can be doing real work like decoding audio. The end result is one less thread created per media element.
BUG=61293
TBR=brettw
Review URL: https://chromiumcodereview.appspot.com/10915091
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@155179 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 984cff1..ed162ce 100644 --- a/media/tools/player_wtl/movie.cc +++ b/media/tools/player_wtl/movie.cc @@ -79,11 +79,11 @@ bool Movie::Open(const wchar_t* url, VideoRendererBase* video_renderer) { collection->AddAudioDecoder(new FFmpegAudioDecoder( base::Bind(&MessageLoopFactory::GetMessageLoop, base::Unretained(message_loop_factory_.get()), - media::MessageLoopFactory::kAudioDecoder))); + media::MessageLoopFactory::kDecoder))); collection->GetVideoDecoders()->push_back(new FFmpegVideoDecoder( base::Bind(&MessageLoopFactory::GetMessageLoop, base::Unretained(message_loop_factory_.get()), - media::MessageLoopFactory::kVideoDecoder), + media::MessageLoopFactory::kDecoder), 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 d65389d..fd30b9a 100644 --- a/media/tools/player_x11/player_x11.cc +++ b/media/tools/player_x11/player_x11.cc @@ -120,11 +120,11 @@ bool InitPipeline(const scoped_refptr<base::MessageLoopProxy>& message_loop, collection->AddAudioDecoder(new media::FFmpegAudioDecoder( base::Bind(&media::MessageLoopFactory::GetMessageLoop, base::Unretained(message_loop_factory), - media::MessageLoopFactory::kAudioDecoder))); + media::MessageLoopFactory::kDecoder))); collection->GetVideoDecoders()->push_back(new media::FFmpegVideoDecoder( base::Bind(&media::MessageLoopFactory::GetMessageLoop, base::Unretained(message_loop_factory), - media::MessageLoopFactory::kVideoDecoder), + media::MessageLoopFactory::kDecoder), NULL)); // Create our video renderer and save a reference to it for painting. |