ffmpeg chromium glue

media/video/ffmpeg_video_decode_engine.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/video/ffmpeg_video_decode_engine.h"
 
 #include "base/command_line.h"
 #include "base/string_number_conversions.h"
 #include "base/task.h"
 #include "media/base/buffers.h"
@@ skipping 68 matching lines @@
   // Enable motion vector search (potentially slow), strong deblocking filter
   // for damaged macroblocks, and set our error detection sensitivity.
   codec_context_->error_concealment = FF_EC_GUESS_MVS | FF_EC_DEBLOCK;
   codec_context_->error_recognition = FF_ER_CAREFUL;
 
   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;

[fbarchard, 2011/06/29 22:21:06]

Can you test if this is still necessary?

[ilja, 2011/06/30 01:28:58]

I tried and it seems it is not. But we leave this for next roll.

 
   const CommandLine* cmd_line = CommandLine::ForCurrentProcess();
   std::string threads(cmd_line->GetSwitchValueASCII(switches::kVideoThreads));
   if ((!threads.empty() &&
       !base::StringToInt(threads, &decode_threads)) ||
       decode_threads < 0 || decode_threads > kMaxDecodeThreads) {
     decode_threads = kDecodeThreads;
   }
 
   // We don't allocate AVFrame on the stack since different versions of FFmpeg
@@ skipping 20 matching lines @@
                             config.height(),
                             kNoTimestamp,
                             kNoTimestamp,
                             &video_frame);
     if (!video_frame.get()) {
       buffer_allocated = false;
       break;
     }
     frame_queue_available_.push_back(video_frame);
   }
-
+  codec_context_->thread_count = decode_threads;
   if (codec &&
-      avcodec_thread_init(codec_context_, decode_threads) >= 0 &&
       avcodec_open(codec_context_, codec) >= 0 &&
       av_frame_.get() &&
       buffer_allocated) {
     info.success = true;
   }
   event_handler_ = event_handler;
   event_handler_->OnInitializeComplete(info);
 }
 
 // TODO(scherkus): Move this function to a utility class and unit test.
@@ skipping 214 matching lines @@
       break;
   }
   return VideoFrame::INVALID;
 }
 
 }  // namespace media
 
 // Disable refcounting for this object because this object only lives
 // on the video decoder thread and there's no need to refcount it.
 DISABLE_RUNNABLE_METHOD_REFCOUNT(media::FFmpegVideoDecodeEngine);