diff options
| -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, 2 insertions, 3 deletions
diff --git a/media/filters/ffmpeg_video_decode_engine.cc b/media/filters/ffmpeg_video_decode_engine.cc index 97eb24e..17d1c3c 100644 --- a/media/filters/ffmpeg_video_decode_engine.cc +++ b/media/filters/ffmpeg_video_decode_engine.cc @@ -55,8 +55,7 @@ void FFmpegVideoDecodeEngine::Initialize( // TODO(fbarchard): Improve thread logic based on size / codec. // TODO(fbarchard): Fix bug affecting video-cookie.html - int decode_threads = (codec_context_->codec_id == CODEC_ID_THEORA) ? - 1 : kDecodeThreads; + int decode_threads = 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 4e0820d..0aa2ae7 100644 --- a/media/test/ffmpeg_tests/ffmpeg_tests.cc +++ b/media/test/ffmpeg_tests/ffmpeg_tests.cc @@ -228,7 +228,6 @@ 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 86833b1..37d7b45 100644 --- a/media/tools/media_bench/media_bench.cc +++ b/media/tools/media_bench/media_bench.cc @@ -330,6 +330,7 @@ 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) { |