Store AVDACodecImage list in shared state, cleanup callers.

content/common/gpu/media/android_deferred_rendering_backing_strategy.h

 // Copyright 2015 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_DEFERRED_RENDERING_BACKING_STRATEGY_H_
 #define CONTENT_COMMON_GPU_MEDIA_ANDROID_DEFERRED_RENDERING_BACKING_STRATEGY_H_
 
 #include <stdint.h>
 
 #include "base/macros.h"
@@ skipping 31 matching lines @@
   gfx::ScopedJavaSurface Initialize(int surface_view_id) override;
   void Cleanup(bool have_context,
                const AndroidVideoDecodeAccelerator::OutputBufferMap&) override;
   scoped_refptr<gfx::SurfaceTexture> GetSurfaceTexture() const override;
   uint32_t GetTextureTarget() const override;
   gfx::Size GetPictureBufferSize() const override;
   void UseCodecBufferForPictureBuffer(int32_t codec_buffer_index,
                                       const media::PictureBuffer&) override;
   void AssignOnePictureBuffer(const media::PictureBuffer&, bool) override;
   void ReuseOnePictureBuffer(const media::PictureBuffer&) override;
-  void CodecChanged(
-      media::VideoCodecBridge*,
-      const AndroidVideoDecodeAccelerator::OutputBufferMap&) override;
+  void CodecChanged(media::VideoCodecBridge*) override;
   void OnFrameAvailable() override;
   bool ArePicturesOverlayable() override;
   void UpdatePictureBufferSize(media::PictureBuffer* picture_buffer,
                                const gfx::Size& new_size) override;
 
  private:
   // Release any codec buffer that is associated with the given picture buffer
   // back to the codec.  It is okay if there is no such buffer.
   void ReleaseCodecBufferForPicture(const media::PictureBuffer& picture_buffer);
 
-  // Return the AVDACodecImage for a given PictureBuffer's texture.
-  AVDACodecImage* GetImageForPicture(const media::PictureBuffer&);
+  // Sets up the texture references (as found by |picture_buffer|), for the
+  // specified |image|. If |image| is null, clears any ref on the texture
+  // associated with |picture_buffer|.
   void SetImageForPicture(
       const media::PictureBuffer& picture_buffer,
       const scoped_refptr<gpu::gles2::GLStreamTextureImage>& image);
 
   // Make a copy of the SurfaceTexture's front buffer and associate all given
   // picture buffer textures with it. The picture buffer textures will not
   // dependend on |this|, the SurfaceTexture, the MediaCodec or the VDA, so it's
   // used to back the picture buffers when the VDA is being destroyed.
   void CopySurfaceTextureToPictures(
       const AndroidVideoDecodeAccelerator::OutputBufferMap& buffers);
@@ skipping 15 matching lines @@
   scoped_refptr<gfx::SurfaceTexture> surface_texture_;
 
   media::VideoCodecBridge* media_codec_;
 
   DISALLOW_COPY_AND_ASSIGN(AndroidDeferredRenderingBackingStrategy);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_COMMON_GPU_MEDIA_ANDROID_DEFERRED_RENDERING_BACKING_STRATEGY_H_