Separate DemuxerStream and VideoDecoder.

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 <list>
 #include <map>
 #include <utility>
 #include <vector>
 
 #include "base/memory/weak_ptr.h"
 #include "media/base/pipeline_status.h"
-#include "media/base/demuxer_stream.h"
 #include "media/base/video_decoder.h"
 #include "media/video/video_decode_accelerator.h"
 
 template <class T> class scoped_refptr;
 
 namespace base {
 class MessageLoopProxy;
 class SharedMemory;
 }
 
@@ skipping 45 matching lines @@
 
    protected:
     friend class base::RefCountedThreadSafe<Factories>;
     virtual ~Factories();
   };
 
   GpuVideoDecoder(const scoped_refptr<base::MessageLoopProxy>& message_loop,
                   const scoped_refptr<Factories>& factories);
 
   // VideoDecoder implementation.
-  virtual void Initialize(DemuxerStream* stream,
+  virtual void Initialize(const VideoDecoderConfig& config,
                           const PipelineStatusCB& status_cb,
                           const StatisticsCB& statistics_cb) OVERRIDE;
-  virtual void Read(const ReadCB& read_cb) OVERRIDE;
+  virtual void Decode(const scoped_refptr<DecoderBuffer>& buffer,
+                      const ReadCB& read_cb) OVERRIDE;
   virtual void Reset(const base::Closure& closure) OVERRIDE;
   virtual void Stop(const base::Closure& closure) OVERRIDE;
   virtual bool HasAlpha() const OVERRIDE;
   virtual bool NeedsBitstreamConversion() const OVERRIDE;
   virtual bool HasOutputFrameAvailable() const OVERRIDE;
 
   // VideoDecodeAccelerator::Client implementation.
   virtual void NotifyInitializeDone() OVERRIDE;
   virtual void ProvidePictureBuffers(uint32 count,
                                      const gfx::Size& size,
                                      uint32 texture_target) OVERRIDE;
   virtual void DismissPictureBuffer(int32 id) OVERRIDE;
   virtual void PictureReady(const media::Picture& picture) OVERRIDE;
   virtual void NotifyEndOfBitstreamBuffer(int32 id) OVERRIDE;
   virtual void NotifyFlushDone() OVERRIDE;
   virtual void NotifyResetDone() OVERRIDE;
   virtual void NotifyError(media::VideoDecodeAccelerator::Error error) OVERRIDE;
 
  protected:
   virtual ~GpuVideoDecoder();
 
  private:
   enum State {
     kNormal,
     kDrainingDecoder,
     kDecoderDrained,
     kError
   };
 
-  // If no demuxer read is in flight and no bitstream buffers are in the
-  // decoder, kick some off demuxing/decoding.
-  void EnsureDemuxOrDecode();
-
   // Return true if more decode work can be piled on to the VDA.
   bool CanMoreDecodeWorkBeDone();
 
-  // Callback to pass to demuxer_stream_->Read() for receiving encoded bits.
-  void RequestBufferDecode(DemuxerStream::Status status,
-                           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 picture buffer can be reused by the decoder.
   void ReusePictureBuffer(int64 picture_buffer_id);
@@ skipping 24 matching lines @@
   // allocate as necessary.  Caller does not own returned pointer.
   SHMBuffer* GetSHM(size_t min_size);
 
   // Return a shared-memory segment to the available pool.
   void PutSHM(SHMBuffer* shm_buffer);
 
   void DestroyTextures();
 
   StatisticsCB statistics_cb_;
 
-  // Pointer to the demuxer stream that will feed us compressed buffers.
-  DemuxerStream* demuxer_stream_;
 
   bool needs_bitstream_conversion_;
 
   // Message loop on which to fire callbacks and trampoline calls to this class
   // if they arrive on other loops.
   scoped_refptr<base::MessageLoopProxy> gvd_loop_proxy_;
   base::WeakPtrFactory<GpuVideoDecoder> weak_factory_;
   base::WeakPtr<GpuVideoDecoder> weak_this_;
 
   // Message loop on which to makes all calls to vda_.  (beware this loop may be
@@ skipping 13 matching lines @@
   // Used to post tasks from the GVD thread to the VDA thread safely.
   base::WeakPtr<VideoDecodeAccelerator> weak_vda_;
 
   // Callbacks that are !is_null() only during their respective operation being
   // asynchronously executed.
   ReadCB pending_read_cb_;
   base::Closure pending_reset_cb_;
 
   State state_;
 
+  VideoDecoderConfig config_;
+
   // 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 {
@@ skipping 28 matching lines @@
   // Set during ProvidePictureBuffers(), used for checking and implementing
   // HasAvailableOutputFrames().
   int available_pictures_;
 
   DISALLOW_COPY_AND_ASSIGN(GpuVideoDecoder);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_FILTERS_GPU_VIDEO_DECODER_H_