Split out AVDA cleanups from SetSurface() change.

media/gpu/avda_picture_buffer_manager.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 MEDIA_GPU_AVDA_PICTURE_BUFFER_MANAGER_H_
 #define MEDIA_GPU_AVDA_PICTURE_BUFFER_MANAGER_H_
 
 #include <stdint.h>
 #include <vector>
 
 #include "base/macros.h"
 #include "media/gpu/avda_state_provider.h"
 #include "media/gpu/media_gpu_export.h"
 
 namespace gpu {
 namespace gles2 {
 class GLStreamTextureImage;
 }
 }
 
 namespace gl {
 class ScopedJavaSurface;
 class SurfaceTexture;
 }
 
 namespace media {
+class AVDACodecImage;
 class AVDASharedState;
 class VideoCodecBridge;
 
 // AVDAPictureBufferManager is used by AVDA to associate its PictureBuffers with
 // MediaCodec output buffers. It attaches AVDACodecImages to the PictureBuffer
 // textures so that when they're used to draw the AVDACodecImage can release the
 // MediaCodec buffer to the backing Surface. If the Surface is a SurfaceTexture,
 // the front buffer can then be used to draw without needing to copy the pixels.
 // If the Surface is a SurfaceView, the release causes the frame to be displayed
 // immediately.
 class MEDIA_GPU_EXPORT AVDAPictureBufferManager {
  public:
   using PictureBufferMap = std::map<int32_t, PictureBuffer>;
 
-  AVDAPictureBufferManager();
+  explicit AVDAPictureBufferManager(AVDAStateProvider* state_provider);
   virtual ~AVDAPictureBufferManager();
 
-  // Must be called before anything else. If |surface_view_id| is |kNoSurfaceID|
+  // Must be called before anything else. If |surface_id| is |kNoSurfaceID|
   // then a new SurfaceTexture will be returned. Otherwise, the corresponding
   // SurfaceView will be returned.
-  gl::ScopedJavaSurface Initialize(AVDAStateProvider* state_provider,
-                                   int surface_view_id);
+  gl::ScopedJavaSurface Initialize(int surface_id);
 
   void Destroy(const PictureBufferMap& buffers);
 
   // Returns the GL texture target that the PictureBuffer textures use.
   uint32_t GetTextureTarget() const;
 
   // Returns the size to use when requesting picture buffers.
   gfx::Size GetPictureBufferSize() const;
 
   // Sets up |picture_buffer| so that its texture will refer to the image that
@@ skipping 20 matching lines @@
   void CodecChanged(VideoCodecBridge* codec);
 
   // Whether the pictures buffers are overlayable.
   bool ArePicturesOverlayable();
 
  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 PictureBuffer& picture_buffer);
 
-  gpu::gles2::TextureRef* GetTextureForPicture(
-      const PictureBuffer& picture_buffer);
-
   // 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 PictureBuffer& picture_buffer,
-      const scoped_refptr<gpu::gles2::GLStreamTextureImage>& image);
+  void SetImageForPicture(const PictureBuffer& picture_buffer,
+                          gpu::gles2::GLStreamTextureImage* image);
+
+  AVDACodecImage* GetImageForPicture(int picture_buffer_id) const;
 
   scoped_refptr<AVDASharedState> shared_state_;
 
-  AVDAStateProvider* state_provider_;
+  AVDAStateProvider* const state_provider_;
 
   // The SurfaceTexture to render to. Non-null after Initialize() if
   // we're not rendering to a SurfaceView.
   scoped_refptr<gl::SurfaceTexture> surface_texture_;
 
-  class OnFrameAvailableHandler;
-  scoped_refptr<OnFrameAvailableHandler> on_frame_available_handler_;
-
   VideoCodecBridge* media_codec_;
 
   // Picture buffer IDs that are out for display. Stored in order of frames as
   // they are returned from the decoder.
   std::vector<int32_t> pictures_out_for_display_;
 
+  // Maps a picture buffer id to a AVDACodecImage.
+  std::map<int, scoped_refptr<AVDACodecImage>> codec_images_;
+
   DISALLOW_COPY_AND_ASSIGN(AVDAPictureBufferManager);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_GPU_AVDA_PICTURE_BUFFER_MANAGER_H_