Move SurfaceTexture construction to BackingStrategy.

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 37 matching lines @@
     // Called before the AVDA does any Destroy() work.  This will be
     // the last call that the BackingStrategy receives.
     virtual void Cleanup() = 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;
 
-    // Use the provided PictureBuffer to hold the current surface.
-    virtual void AssignCurrentSurfaceToPictureBuffer(
+    // 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,
         const media::PictureBuffer&) = 0;
   };
 
   AndroidVideoDecodeAccelerator(
       const base::WeakPtr<gpu::gles2::GLES2Decoder> decoder,
       const base::Callback<bool(void)>& make_context_current,
       scoped_ptr<BackingStrategy> strategy);
 
   ~AndroidVideoDecodeAccelerator() override;
 
   // Does not take ownership of |client| which must outlive |*this|.
   bool Initialize(media::VideoCodecProfile profile, Client* client) 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;
 
   // AndroidVideoDecodeStateProvider
   const gfx::Size& GetSize() const override;
   const base::ThreadChecker& ThreadChecker() const override;
-  gfx::SurfaceTexture* GetSurfaceTexture() const override;
-  uint32 GetSurfaceTextureId() const override;
   gpu::gles2::GLES2Decoder* GetGlDecoder() const override;
   media::VideoCodecBridge* GetMediaCodec() override;
   void PostError(const ::tracked_objects::Location& from_here,
                  media::VideoDecodeAccelerator::Error error) override;
 
   static media::VideoDecodeAccelerator::SupportedProfiles
       GetSupportedProfiles();
 
  private:
   enum State {
@@ skipping 70 matching lines @@
   // to ignore ReusePictureBuffer calls that were in flight when the
   // DismissPictureBuffer call was made.
   std::set<int32> dismissed_picture_ids_;
 
   // The low-level decoder which Android SDK provides.
   scoped_ptr<media::VideoCodecBridge> media_codec_;
 
   // A container of texture. Used to set a texture to |media_codec_|.
   scoped_refptr<gfx::SurfaceTexture> surface_texture_;
 
-  // The texture id which is set to |surface_texture_|.
-  uint32 surface_texture_id_;
-
   // Set to true after requesting picture buffers to the client.
   bool picturebuffers_requested_;
 
   // The resolution of the stream.
   gfx::Size size_;
 
   // Encoded bitstream buffers to be passed to media codec, queued until an
   // input buffer is available, along with the time when they were first
   // enqueued.
   typedef std::queue<std::pair<media::BitstreamBuffer, base::Time> >
@@ skipping 21 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_