Introducing DecoderBuffer and general Buffer cleanup.

media/filters/gpu_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_GPU_VIDEO_DECODER_H_
 #define MEDIA_FILTERS_GPU_VIDEO_DECODER_H_
 
 #include <deque>
 #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"
 
 class MessageLoop;
 template <class T> class scoped_refptr;
 namespace base {
 class MessageLoopProxy;
 class SharedMemory;
 }
@@ skipping 69 matching lines @@
     // enough).
     kDrainingDecoder,
     kDecoderDrained,
   };
 
   // If no demuxer read is in flight and no bitstream buffers are in the
   // decoder, kick some off demuxing/decoding.
   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
   // ready frame to the client if there is a pending read.  A NULL |frame|
   // merely triggers delivery, and requires the ready_video_frames_ queue not be
   // empty.
   void EnqueueFrameAndTriggerFrameDelivery(
       const scoped_refptr<VideoFrame>& frame);
 
   // Indicate the picturebuffer can be reused by the decoder.
@@ skipping 56 matching lines @@
   // Is a demuxer read in flight?
   bool demuxer_read_in_progress_;
 
   // Shared-memory buffer pool.  Since allocating SHM segments requires a
   // round-trip to the browser process, we keep allocation out of the
   // steady-state of the decoder.
   std::vector<SHMBuffer*> available_shm_segments_;
 
   // 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_;
 
   // The texture target used for decoded pictures.
   uint32 decoder_texture_target_;
 
   struct BufferTimeData {
     BufferTimeData(int32 bbid, base::TimeDelta ts, base::TimeDelta dur);
     ~BufferTimeData();
@@ skipping 15 matching lines @@
 
   // Indicates decoding error occurred.
   bool error_occured_;
 
   DISALLOW_COPY_AND_ASSIGN(GpuVideoDecoder);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_FILTERS_GPU_VIDEO_DECODER_H_