Revert "re-enable ogg threads"

Because http/tests/media/video-cookie.html is failing.

This reverts commit r58043.

TBR=fbarchard

Review URL: http://codereview.chromium.org/3231011

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58057 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 10 insertions, 1 deletions

diff --git a/media/filters/ffmpeg_video_decode_engine.cc b/media/filters/ffmpeg_video_decode_engine.cc
index 4a78fc4..f5e6d34 100644
--- a/media/filters/ffmpeg_video_decode_engine.cc
+++ b/media/filters/ffmpeg_video_decode_engine.cc
@@ -52,7 +52,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));
diff --git a/media/test/ffmpeg_tests/ffmpeg_tests.cc b/media/test/ffmpeg_tests/ffmpeg_tests.cc
index f685a08..5745fe9 100644
--- a/media/test/ffmpeg_tests/ffmpeg_tests.cc
+++ b/media/test/ffmpeg_tests/ffmpeg_tests.cc
@@ -221,6 +221,13 @@ 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;