Add status parameter to DemuxerStream::ReadCB

media/filters/ffmpeg_video_decoder.cc

Index: media/filters/ffmpeg_video_decoder.cc
diff --git a/media/filters/ffmpeg_video_decoder.cc b/media/filters/ffmpeg_video_decoder.cc
index 1902fd86b56fa09e93299752dd749d57a21bd72e..f498f71ea23a73a9bfb567208dbfcf2abb66ad13 100644
--- a/media/filters/ffmpeg_video_decoder.cc
+++ b/media/filters/ffmpeg_video_decoder.cc
@@ -217,15 +217,17 @@ void FFmpegVideoDecoder::ReadFromDemuxerStream() {
 }
 
 void FFmpegVideoDecoder::DecodeBuffer(
-    const scoped_refptr<DecoderBuffer>& buffer) {
+    DemuxerStream::Status status, const scoped_refptr<DecoderBuffer>& buffer) {
+  DCHECK_EQ(status != DemuxerStream::kOk, !buffer);
+
   // TODO(scherkus): fix FFmpegDemuxerStream::Read() to not execute our read
   // callback on the same execution stack so we can get rid of forced task post.
   message_loop_->PostTask(FROM_HERE, base::Bind(
-      &FFmpegVideoDecoder::DoDecodeBuffer, this, buffer));
+      &FFmpegVideoDecoder::DoDecodeBuffer, this, status, buffer));
 }
 
 void FFmpegVideoDecoder::DoDecodeBuffer(
-    const scoped_refptr<DecoderBuffer>& buffer) {
+    DemuxerStream::Status status, const scoped_refptr<DecoderBuffer>& buffer) {
   DCHECK_EQ(MessageLoop::current(), message_loop_);
   DCHECK_NE(state_, kUninitialized);
   DCHECK_NE(state_, kDecodeFinished);
@@ -237,8 +239,12 @@ void FFmpegVideoDecoder::DoDecodeBuffer(
     return;
   }
 
-  if (!buffer) {
-    DeliverFrame(NULL);
+  if (status != DemuxerStream::kOk) {
+    // TODO(acolwell): Add support for reinitializing the decoder when
+    // |status| == kConfigChanged. For now we just trigger a decode error.
+    DecoderStatus decoder_status =
+        (status == DemuxerStream::kAborted) ? kOk : kDecodeError;
+    base::ResetAndReturn(&read_cb_).Run(decoder_status, NULL);
     return;
   }