Tighten up media::DecoderBuffer data requirements.

media/filters/ffmpeg_demuxer.cc

 // Copyright (c) 2012 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/filters/ffmpeg_demuxer.h"
 
 #include <algorithm>
 #include <string>
 
 #include "base/bind.h"
@@ skipping 570 matching lines @@
   // Queue the packet with the appropriate stream.
   DCHECK_GE(packet->stream_index, 0);
   DCHECK_LT(packet->stream_index, static_cast<int>(streams_.size()));
 
   // Defend against ffmpeg giving us a bad stream index.
   if (packet->stream_index >= 0 &&
       packet->stream_index < static_cast<int>(streams_.size()) &&
       streams_[packet->stream_index] &&
       (!audio_disabled_ ||
        streams_[packet->stream_index]->type() != DemuxerStream::AUDIO)) {
+
+    // TODO(scherkus): Fix demuxing upstream to never return packets w/o data
+    // when av_read_frame() returns success code. See bug comment for ideas:
+    //
+    // https://code.google.com/p/chromium/issues/detail?id=169133#c10
+    if (!packet->data) {
+      ScopedAVPacket new_packet(new AVPacket());
+      av_new_packet(new_packet.get(), 0);
+
+      new_packet->pts = packet->pts;
+      new_packet->dts = packet->dts;
+      new_packet->pos = packet->pos;
+      new_packet->duration = packet->duration;
+      new_packet->convergence_duration = packet->convergence_duration;
+      new_packet->flags = packet->flags;
+      new_packet->stream_index = packet->stream_index;
+
+      packet.swap(new_packet);
+    }
+
     FFmpegDemuxerStream* demuxer_stream = streams_[packet->stream_index];
     demuxer_stream->EnqueuePacket(packet.Pass());
   }
 
   // Keep reading until we've reached capacity.
   ReadFrameIfNeeded();
 }
 
 void FFmpegDemuxer::OnDataSourceStopped(const base::Closure& callback) {
   // This will block until all tasks complete. Note that after this returns it's
@@ skipping 57 matching lines @@
   }
   for (size_t i = 0; i < buffered.size(); ++i)
     host_->AddBufferedTimeRange(buffered.start(i), buffered.end(i));
 }
 
 void FFmpegDemuxer::OnDataSourceError() {
   host_->OnDemuxerError(PIPELINE_ERROR_READ);
 }
 
 }  // namespace media