diff options
| -rw-r--r-- | media/filters/ffmpeg_video_decode_engine.cc | 4 | ||||
| -rw-r--r-- | media/test/ffmpeg_tests/ffmpeg_tests.cc | 7 |
2 files changed, 1 insertions, 10 deletions
diff --git a/media/filters/ffmpeg_video_decode_engine.cc b/media/filters/ffmpeg_video_decode_engine.cc index f5e6d34..4a78fc4 100644 --- a/media/filters/ffmpeg_video_decode_engine.cc +++ b/media/filters/ffmpeg_video_decode_engine.cc @@ -52,9 +52,7 @@ void FFmpegVideoDecodeEngine::Initialize( AVCodec* codec = avcodec_find_decoder(codec_context_->codec_id); // 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 5745fe9..f685a08 100644 --- a/media/test/ffmpeg_tests/ffmpeg_tests.cc +++ b/media/test/ffmpeg_tests/ffmpeg_tests.cc @@ -221,13 +221,6 @@ int main(int argc, const char** argv) { return 1; } - // TODO(fbarchard): On next ffmpeg roll, retest if this work around is needed. - if (codec_context->codec_id == CODEC_ID_THEORA) { - std::cerr << "Warning: Disabling threads to avoid Theora bug " - << in_path.value() << std::endl; - video_threads = 1; - } - codec_context->error_concealment = FF_EC_GUESS_MVS | FF_EC_DEBLOCK; codec_context->error_recognition = FF_ER_CAREFUL; |