Revert 41386 - Removed custom FFmpegLock. Removed ffmpeg headers from third_p...

media/filters/ffmpeg_demuxer.cc

 // Copyright (c) 2010 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 "base/callback.h"
 #include "base/command_line.h"
 #include "base/scoped_ptr.h"
 #include "base/stl_util-inl.h"
 #include "base/string_util.h"
 #include "base/time.h"
@@ skipping 217 matching lines @@
       read_position_(0),
       first_seek_hack_(true) {
 }
 
 FFmpegDemuxer::~FFmpegDemuxer() {
   // In this destructor, we clean up resources held by FFmpeg. It is ugly to
   // close the codec contexts here because the corresponding codecs are opened
   // in the decoder filters. By reaching this point, all filters should have
   // stopped, so this is the only safe place to do the global clean up.
   // TODO(hclam): close the codecs in the corresponding decoders.
+  AutoLock auto_lock(FFmpegLock::get()->lock());
   if (!format_context_)
     return;
 
   // Iterate each stream and destroy each one of them.
   int streams = format_context_->nb_streams;
   for (int i = 0; i < streams; ++i) {
     AVStream* stream = format_context_->streams[i];
 
     // The conditions for calling avcodec_close():
     // 1. AVStream is alive.
@@ skipping 141 matching lines @@
 
   if (result < 0) {
     host()->SetError(DEMUXER_ERROR_COULD_NOT_OPEN);
     callback->Run();
     return;
   }
 
   DCHECK(context);
   format_context_ = context;
 
-  // Fully initialize AVFormatContext by parsing the stream a little.
-  result = av_find_stream_info(format_context_);
-  if (result < 0) {
-    host()->SetError(DEMUXER_ERROR_COULD_NOT_PARSE);
-    callback->Run();
-    return;
+  // Serialize calls to av_find_stream_info().
+  {
+    AutoLock auto_lock(FFmpegLock::get()->lock());
+
+    // Fully initialize AVFormatContext by parsing the stream a little.
+    result = av_find_stream_info(format_context_);
+    if (result < 0) {
+      host()->SetError(DEMUXER_ERROR_COULD_NOT_PARSE);
+      callback->Run();
+      return;
+    }
   }
 
   // Create demuxer streams for all supported streams.
   base::TimeDelta max_duration;
   for (size_t i = 0; i < format_context_->nb_streams; ++i) {
     AVCodecContext* codec_context = format_context_->streams[i]->codec;
     CodecType codec_type = codec_context->codec_type;
     if (codec_type == CODEC_TYPE_AUDIO || codec_type == CODEC_TYPE_VIDEO) {
       AVStream* stream = format_context_->streams[i];
       FFmpegDemuxerStream* demuxer_stream
@@ skipping 185 matching lines @@
   read_event_.Wait();
   return last_read_bytes_;
 }
 
 void FFmpegDemuxer::SignalReadCompleted(size_t size) {
   last_read_bytes_ = size;
   read_event_.Signal();
 }
 
 }  // namespace media