diff options
| author | rvargas@google.com <rvargas@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-18 21:42:26 +0000 |
|---|---|---|
| committer | rvargas@google.com <rvargas@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-18 21:42:26 +0000 |
| commit | 147af6dcdc20b7162ed186ab18eeced8123ba9a0 (patch) | |
| tree | d1529d350550a6c37ecbb787e21c3f13e85b5009 | |
| parent | 5a196bd4513a7902e82dc278f2a7919181429ec7 (diff) | |
| download | chromium_src-147af6dcdc20b7162ed186ab18eeced8123ba9a0.zip chromium_src-147af6dcdc20b7162ed186ab18eeced8123ba9a0.tar.gz chromium_src-147af6dcdc20b7162ed186ab18eeced8123ba9a0.tar.bz2 | |
Revert 56582 - ffmpeg flag CODEC_FLAG2_FAST removed
BUG=52607
TEST=ffmpeg_tests tulip\tulip2.mp4 should be same performance as media_bench.exe --video-threads=3 --fast2 --stream=video tulip\tulip2.mp4
Review URL: http://codereview.chromium.org/3157024
TBR=fbarchard@chromium.org
Review URL: http://codereview.chromium.org/3125023
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56606 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | media/filters/ffmpeg_video_decode_engine.cc | 3 | ||||
| -rw-r--r-- | media/test/ffmpeg_tests/ffmpeg_tests.cc | 1 | ||||
| -rw-r--r-- | media/tools/media_bench/media_bench.cc | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/media/filters/ffmpeg_video_decode_engine.cc b/media/filters/ffmpeg_video_decode_engine.cc index 17d1c3c..97eb24e 100644 --- a/media/filters/ffmpeg_video_decode_engine.cc +++ b/media/filters/ffmpeg_video_decode_engine.cc @@ -55,7 +55,8 @@ void FFmpegVideoDecodeEngine::Initialize( // TODO(fbarchard): Improve thread logic based on size / codec. // TODO(fbarchard): Fix bug affecting video-cookie.html - int decode_threads = kDecodeThreads; + 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)); diff --git a/media/test/ffmpeg_tests/ffmpeg_tests.cc b/media/test/ffmpeg_tests/ffmpeg_tests.cc index 0aa2ae7..4e0820d 100644 --- a/media/test/ffmpeg_tests/ffmpeg_tests.cc +++ b/media/test/ffmpeg_tests/ffmpeg_tests.cc @@ -228,6 +228,7 @@ int main(int argc, const char** argv) { video_threads = 1; } + codec_context->flags2 |= CODEC_FLAG2_FAST; codec_context->error_concealment = FF_EC_GUESS_MVS | FF_EC_DEBLOCK; codec_context->error_recognition = FF_ER_CAREFUL; diff --git a/media/tools/media_bench/media_bench.cc b/media/tools/media_bench/media_bench.cc index 37d7b45..86833b1 100644 --- a/media/tools/media_bench/media_bench.cc +++ b/media/tools/media_bench/media_bench.cc @@ -330,7 +330,6 @@ int main(int argc, const char** argv) { codec_context->skip_frame = AVDISCARD_NONREF; } if (fast2) { - // Note this flag is no longer necessary for H264 multithreading. codec_context->flags2 |= CODEC_FLAG2_FAST; } if (error_correction) { |