Handle end of stream for media...

media/filters/ffmpeg_demuxer.cc

 // Copyright (c) 2009 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/scoped_ptr.h"
 #include "base/string_util.h"
 #include "base/time.h"
 #include "media/base/filter_host.h"
 #include "media/filters/ffmpeg_common.h"
 #include "media/filters/ffmpeg_demuxer.h"
 #include "media/filters/ffmpeg_glue.h"
 
 namespace media {
 
 //
 // AVPacketBuffer
 //
 class AVPacketBuffer : public Buffer {
  public:
   AVPacketBuffer(AVPacket* packet, const base::TimeDelta& timestamp,
                  const base::TimeDelta& duration)
       : packet_(packet) {
-    DCHECK(packet);
     SetTimestamp(timestamp);
     SetDuration(duration);
   }
 
   virtual ~AVPacketBuffer() {
     av_free_packet(packet_.get());
   }
 
   // Buffer implementation.
   virtual const uint8* GetData() const {
@@ skipping 277 matching lines @@
 void FFmpegDemuxer::DemuxTask() {
   // Make sure we have work to do before demuxing.
   if (!StreamsHavePendingReads()) {
     return;
   }
 
   // Allocate and read an AVPacket from the media.
   scoped_ptr<AVPacket> packet(new AVPacket());
   int result = av_read_frame(format_context_.get(), packet.get());
   if (result < 0) {
-    // TODO(scherkus): handle end of stream by marking Buffer with the end
-    // of stream flag.
-    NOTIMPLEMENTED();
+    // If we have reached the end of stream, tell the downstream filters about
+    // the event.
+    StreamHasEnded();
     return;
   }
 
   // Queue the packet with the appropriate stream.
   // TODO(scherkus): should we post this back to the pipeline thread?  I'm
   // worried about downstream filters (i.e., decoders) executing on this
   // thread.
   DCHECK(packet->stream_index >= 0);
   DCHECK(packet->stream_index < static_cast<int>(packet_streams_.size()));
   FFmpegDemuxerStream* demuxer_stream = packet_streams_[packet->stream_index];
@@ skipping 32 matching lines @@
 bool FFmpegDemuxer::StreamsHavePendingReads() {
   StreamVector::iterator iter;
   for (iter = streams_.begin(); iter != streams_.end(); ++iter) {
     if ((*iter)->HasPendingReads()) {
       return true;
     }
   }
   return false;
 }
 
+void FFmpegDemuxer::StreamHasEnded() {
+  StreamVector::iterator iter;
+  for (iter = streams_.begin(); iter != streams_.end(); ++iter) {
+    AVPacket* packet = new AVPacket();
+    memset(packet, 0, sizeof(*packet));
+    (*iter)->EnqueuePacket(packet);
+  }
+}
+
 AVPacket* FFmpegDemuxer::ClonePacket(AVPacket* packet) {
   scoped_ptr<AVPacket> clone(new AVPacket());
   if (!clone.get() || av_new_packet(clone.get(), packet->size) < 0) {
     return NULL;
   }
   DCHECK_EQ(clone->size, packet->size);
   clone->dts = packet->dts;
   clone->pts = packet->pts;
   clone->duration = packet->duration;
   memcpy(clone->data, packet->data, clone->size);
   return clone.release();
 }
 
 }  // namespace media