Adding ChunkDemuxer implementation.

media/filters/ffmpeg_demuxer.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 "base/callback.h"
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/stl_util-inl.h"
 #include "base/string_util.h"
@@ skipping 262 matching lines @@
 
 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.
   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.
-    // 2. AVCodecContext in AVStream is alive.
-    // 3. AVCodec in AVCodecContext is alive.
-    // Notice that closing a codec context without prior avcodec_open() will
-    // result in a crash in FFmpeg.
-    if (stream && stream->codec && stream->codec->codec) {
-      stream->discard = AVDISCARD_ALL;
-      avcodec_close(stream->codec);
-    }
-  }
-
-  // Then finally cleanup the format context.
-  av_close_input_file(format_context_);
+  DestroyAVFormatContext(format_context_);
   format_context_ = NULL;
 }
 
 void FFmpegDemuxer::PostDemuxTask() {
   message_loop_->PostTask(FROM_HERE,
       NewRunnableMethod(this, &FFmpegDemuxer::DemuxTask));
 }
 
 void FFmpegDemuxer::Stop(FilterCallback* callback) {
   // Post a task to notify the streams to stop as well.
@@ skipping 390 matching lines @@
   read_event_.Wait();
   return last_read_bytes_;
 }
 
 void FFmpegDemuxer::SignalReadCompleted(size_t size) {
   last_read_bytes_ = size;
   read_event_.Signal();
 }
 
 }  // namespace media