Don't require VDAs to return all PictureBuffers at once.

content/common/gpu/media/android_video_decode_accelerator.h

 // Copyright (c) 2013 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 CONTENT_COMMON_GPU_MEDIA_ANDROID_VIDEO_DECODE_ACCELERATOR_H_
 #define CONTENT_COMMON_GPU_MEDIA_ANDROID_VIDEO_DECODE_ACCELERATOR_H_
 
 #include <list>
 #include <map>
 #include <queue>
@@ skipping 33 matching lines @@
     virtual ~BackingStrategy() {}
 
     // Called after the state provider is given, but before any other
     // calls to the BackingStrategy.
     virtual void Initialize(AVDAStateProvider* provider) = 0;
 
     // Called before the AVDA does any Destroy() work.  This will be
     // the last call that the BackingStrategy receives.
     virtual void Cleanup(const OutputBufferMap& buffer_map) = 0;
 
-    // Return the number of picture buffers that we can support.
-    virtual uint32 GetNumPictureBuffers() const = 0;
-
     // Return the GL texture target that the PictureBuffer textures use.
     virtual uint32 GetTextureTarget() const = 0;
 
     // Create and return a surface texture for the MediaCodec to use.
     virtual scoped_refptr<gfx::SurfaceTexture> CreateSurfaceTexture() = 0;
 
     // Make the provided PictureBuffer draw the image that is represented by
     // the decoded output buffer at codec_buffer_index.
     virtual void UseCodecBufferForPictureBuffer(
         int32 codec_buffer_index,
@@ skipping 15 matching lines @@
     // happens when we're starting up or re-configuring mid-stream.  Any
     // previously provided codec should no longer be referenced.
     // For convenience, a container of PictureBuffers is provided in case
     // per-image cleanup is needed.
     virtual void CodecChanged(media::VideoCodecBridge* codec,
                               const OutputBufferMap& buffer_map) = 0;
   };
 
   AndroidVideoDecodeAccelerator(
       const base::WeakPtr<gpu::gles2::GLES2Decoder> decoder,
-      const base::Callback<bool(void)>& make_context_current,
-      scoped_ptr<BackingStrategy> strategy);
+      const base::Callback<bool(void)>& make_context_current);
 
   ~AndroidVideoDecodeAccelerator() override;
 
   // media::VideoDecodeAccelerator implementation:
   bool Initialize(const Config& config, Client* client) override;
   void SetCdm(int cdm_id) override;
   void Decode(const media::BitstreamBuffer& bitstream_buffer) override;
   void AssignPictureBuffers(
       const std::vector<media::PictureBuffer>& buffers) override;
   void ReusePictureBuffer(int32 picture_buffer_id) override;
   void Flush() override;
   void Reset() override;
   void Destroy() override;
   bool CanDecodeOnIOThread() override;
 
   // AVDAStateProvider implementation:
   const gfx::Size& GetSize() const override;
   const base::ThreadChecker& ThreadChecker() const override;
   base::WeakPtr<gpu::gles2::GLES2Decoder> GetGlDecoder() const override;
   void PostError(const ::tracked_objects::Location& from_here,
                  media::VideoDecodeAccelerator::Error error) override;
 
-  static media::VideoDecodeAccelerator::SupportedProfiles
-      GetSupportedProfiles();
+  static media::VideoDecodeAccelerator::Capabilities GetCapabilities();
 
  private:
   enum State {
     NO_ERROR,
     ERROR,
   };
 
   static const base::TimeDelta kDecodePollDelay;
 
   // Configures |media_codec_| with the given codec parameters from the client.
@@ skipping 110 matching lines @@
 
   // WeakPtrFactory for posting tasks back to |this|.
   base::WeakPtrFactory<AndroidVideoDecodeAccelerator> weak_this_factory_;
 
   friend class AndroidVideoDecodeAcceleratorTest;
 };
 
 }  // namespace content
 
 #endif  // CONTENT_COMMON_GPU_MEDIA_ANDROID_VIDEO_DECODE_ACCELERATOR_H_