Introducing DecoderBuffer and general Buffer cleanup.

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 <deque>
 
 #include "base/callback.h"
 #include "base/memory/ref_counted.h"
 #include "media/base/video_decoder.h"
 #include "media/crypto/aes_decryptor.h"
 
+class DecoderBuffer;
 class MessageLoop;
 
 struct AVCodecContext;
 struct AVFrame;
 
 namespace media {
 
 class MEDIA_EXPORT FFmpegVideoDecoder : public VideoDecoder {
  public:
   FFmpegVideoDecoder(const base::Callback<MessageLoop*()>& message_loop_cb);
@@ skipping 18 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 DecodeBuffer(const scoped_refptr<Buffer>& buffer);
+  void DecodeBuffer(const scoped_refptr<DecoderBuffer>& buffer);
 
   // Carries out the decoding operation scheduled by DecodeBuffer().
-  void DoDecodeBuffer(const scoped_refptr<Buffer>& buffer);
-  bool Decode(const scoped_refptr<Buffer>& buffer,
+  void DoDecodeBuffer(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_|.
@@ skipping 31 matching lines @@
   scoped_refptr<DemuxerStream> demuxer_stream_;
 
   AesDecryptor decryptor_;
 
   DISALLOW_COPY_AND_ASSIGN(FFmpegVideoDecoder);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_FILTERS_FFMPEG_VIDEO_DECODER_H_