diff options
| -rw-r--r-- | media/test/ffmpeg_tests/ffmpeg_tests.cc | 9 | ||||
| -rw-r--r-- | media/video/ffmpeg_video_decode_engine.cc | 6 |
2 files changed, 3 insertions, 12 deletions
diff --git a/media/test/ffmpeg_tests/ffmpeg_tests.cc b/media/test/ffmpeg_tests/ffmpeg_tests.cc index 5745fe9..d594c4e 100644 --- a/media/test/ffmpeg_tests/ffmpeg_tests.cc +++ b/media/test/ffmpeg_tests/ffmpeg_tests.cc @@ -33,7 +33,7 @@ #if defined(OS_WIN) // Enable to build with exception handler -//#define ENABLE_WINDOWS_EXCEPTIONS 1 +// #define ENABLE_WINDOWS_EXCEPTIONS 1 #ifdef ENABLE_WINDOWS_EXCEPTIONS // warning: disable warning about exception handler. @@ -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; diff --git a/media/video/ffmpeg_video_decode_engine.cc b/media/video/ffmpeg_video_decode_engine.cc index 7a8181b..6dac790 100644 --- a/media/video/ffmpeg_video_decode_engine.cc +++ b/media/video/ffmpeg_video_decode_engine.cc @@ -39,7 +39,7 @@ void FFmpegVideoDecodeEngine::Initialize( const VideoCodecConfig& config) { allocator_.reset(new FFmpegVideoAllocator()); - // Always try to use three threads for video decoding. There is little reason + // Always try to use two threads for video decoding. There is little reason // not to since current day CPUs tend to be multi-core and we measured // performance benefits on older machines such as P4s with hyperthreading. // @@ -71,9 +71,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)); |