diff options
| author | fbarchard@chromium.org <fbarchard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-18 03:04:23 +0000 |
|---|---|---|
| committer | fbarchard@chromium.org <fbarchard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-18 03:04:23 +0000 |
| commit | 5d63a467a131ade20730141464fad9bff49c7e27 (patch) | |
| tree | 21d5541527d803664945da8318cee2254f54cf43 /media | |
| parent | e5d5383b10cdb560b7563a925723f6bf69dbc5b0 (diff) | |
| download | chromium_src-5d63a467a131ade20730141464fad9bff49c7e27.zip chromium_src-5d63a467a131ade20730141464fad9bff49c7e27.tar.gz chromium_src-5d63a467a131ade20730141464fad9bff49c7e27.tar.bz2 | |
revert thread enable for ogv. bug on video-cookie.html likely affects mp4 as well
BUG=none
TEST=./src/webkit/tools/layout_tests/run_webkit_tests.sh --debug http/tests/media/\*
Review URL: http://codereview.chromium.org/3137020
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56478 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
| -rw-r--r-- | media/filters/ffmpeg_video_decode_engine.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/media/filters/ffmpeg_video_decode_engine.cc b/media/filters/ffmpeg_video_decode_engine.cc index e31c64a..97eb24e 100644 --- a/media/filters/ffmpeg_video_decode_engine.cc +++ b/media/filters/ffmpeg_video_decode_engine.cc @@ -54,7 +54,9 @@ void FFmpegVideoDecodeEngine::Initialize( AVCodec* codec = avcodec_find_decoder(codec_context_->codec_id); // TODO(fbarchard): Improve thread logic based on size / codec. - int decode_threads = kDecodeThreads; + // TODO(fbarchard): Fix bug affecting video-cookie.html + int decode_threads = (codec_context_->codec_id == CODEC_ID_THEORA) ? + 1 : kDecodeThreads; const CommandLine* cmd_line = CommandLine::ForCurrentProcess(); std::string threads(cmd_line->GetSwitchValueASCII(switches::kVideoThreads)); |