Introducing DecoderBuffer and general Buffer cleanup.

media/filters/gpu_video_decoder.h

Index: media/filters/gpu_video_decoder.h
diff --git a/media/filters/gpu_video_decoder.h b/media/filters/gpu_video_decoder.h
index b91b0150a0f4c368116c69cc41b830f724cf368a..ae0b8245fdf1b2ad3073b4e6f677c66e9abe617c 100644
--- a/media/filters/gpu_video_decoder.h
+++ b/media/filters/gpu_video_decoder.h
@@ -9,6 +9,7 @@
 #include <list>
 #include <map>
 
+#include "media/base/decoder_buffer.h"

[scherkus (not reviewing), 2012/05/26 01:36:32]

fwd decl instead?

[DaleCurtis, 2012/05/29 21:17:01]

Done.

 #include "media/base/pipeline_status.h"
 #include "media/base/video_decoder.h"
 #include "media/video/video_decode_accelerator.h"
@@ -98,7 +99,7 @@ class MEDIA_EXPORT GpuVideoDecoder
   void EnsureDemuxOrDecode();
 
   // Callback to pass to demuxer_stream_->Read() for receiving encoded bits.
-  void RequestBufferDecode(const scoped_refptr<Buffer>& buffer);
+  void RequestBufferDecode(const scoped_refptr<DecoderBuffer>& buffer);
 
   // Enqueue a frame for later delivery (or drop it on the floor if a
   // vda->Reset() is in progress) and trigger out-of-line delivery of the oldest
@@ -175,10 +176,10 @@ class MEDIA_EXPORT GpuVideoDecoder
 
   // Book-keeping variables.
   struct BufferPair {
-    BufferPair(SHMBuffer* s, const scoped_refptr<Buffer>& b);
+    BufferPair(SHMBuffer* s, const scoped_refptr<DecoderBuffer>& b);
     ~BufferPair();
     SHMBuffer* shm_buffer;
-    scoped_refptr<Buffer> buffer;
+    scoped_refptr<DecoderBuffer> buffer;
   };
   std::map<int32, BufferPair> bitstream_buffers_in_decoder_;
   std::map<int32, PictureBuffer> picture_buffers_in_decoder_;