Add status parameter to DemuxerStream::ReadCB

media/filters/ffmpeg_video_decoder.h

 // 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.
 
 #ifndef MEDIA_FILTERS_FFMPEG_VIDEO_DECODER_H_
 #define MEDIA_FILTERS_FFMPEG_VIDEO_DECODER_H_
 
 #include "base/callback.h"
 #include "base/memory/ref_counted.h"
 #include "media/base/decryptor.h"
+#include "media/base/demuxer_stream.h"
 #include "media/base/video_decoder.h"
 
 class MessageLoop;
 
 struct AVCodecContext;
 struct AVFrame;
 
 namespace media {
 
 class DecoderBuffer;
@@ skipping 29 matching lines @@
     kNormal,
     kFlushCodec,
     kDecodeFinished,
   };
 
   // Carries out the reading operation scheduled by Read().
   void DoRead(const ReadCB& read_cb);
 
   // Reads from the demuxer stream with corresponding callback method.
   void ReadFromDemuxerStream();
-  void DecryptOrDecodeBuffer(const scoped_refptr<DecoderBuffer>& buffer);
+  void DecryptOrDecodeBuffer(DemuxerStream::Status status,
+                             const scoped_refptr<DecoderBuffer>& buffer);
 
   // Carries out the buffer processing operation scheduled by
   // DecryptOrDecodeBuffer().
-  void DoDecryptOrDecodeBuffer(const scoped_refptr<DecoderBuffer>& buffer);
+  void DoDecryptOrDecodeBuffer(DemuxerStream::Status status,
+                               const scoped_refptr<DecoderBuffer>& buffer);
 
   // Callback called by the decryptor to deliver decrypted data buffer and
   // reporting decrypt status. This callback could be called synchronously or
   // asynchronously.
   void BufferDecrypted(Decryptor::DecryptStatus decrypt_status,
                        const scoped_refptr<DecoderBuffer>& buffer);
 
   // Carries out the operation scheduled by BufferDecrypted().
   void DoBufferDecrypted(Decryptor::DecryptStatus decrypt_status,
                          const scoped_refptr<DecoderBuffer>& buffer);
 
   void DecodeBuffer(const scoped_refptr<DecoderBuffer>& buffer);
   bool Decode(const scoped_refptr<DecoderBuffer>& buffer,
               scoped_refptr<VideoFrame>* video_frame);
 
-  // Delivers the frame to |read_cb_| and resets the callback.
-  void DeliverFrame(const scoped_refptr<VideoFrame>& video_frame);
-
   // Releases resources associated with |codec_context_| and |av_frame_|
   // and resets them to NULL.
   void ReleaseFFmpegResources();
 
   // Reset decoder and call |reset_cb_|.
   void DoReset();
 
   // This is !is_null() iff Initialize() hasn't been called.
   base::Callback<MessageLoop*()> message_loop_factory_cb_;
 
@@ skipping 22 matching lines @@
   scoped_refptr<DemuxerStream> demuxer_stream_;
 
   Decryptor* decryptor_;
 
   DISALLOW_COPY_AND_ASSIGN(FFmpegVideoDecoder);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_FILTERS_FFMPEG_VIDEO_DECODER_H_