Add ContentVideoViewOverlay to AVDA.

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>
 
@@ skipping 25 matching lines @@
 // 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>;
 
   explicit AVDAPictureBufferManager(AVDAStateProvider* state_provider);
   virtual ~AVDAPictureBufferManager();
 
-  // 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.
+  // Call either InitializeForOverlay or InitializeForSurfaceTexture before
+  // anything else.  InitializeForOverlay will set us up to render codec buffers
+  // at the approrpriate time for display, but will assume that consuming the
+  // resulting buffers is handled elsewhere (e.g., SurfaceFlinger).
   //
-  // May be called multiple times to switch to a new |surface_id|. Picture
-  // buffers will be updated to use the new surface during the call to
-  // UseCodecBufferForPictureBuffer().
-  gl::ScopedJavaSurface Initialize(int surface_id);
+  // InitializeForSurfaceTexture will create a SurfaceTexture and return the
+  // surface for it.  We will arrange to consume the buffers at the right time,
+  // in addition to releasing codec buffers for rendering.
+  //
+  // One may call these multiple times to change between overlay and ST.
+  //
+  // Picture buffers will be updated to reflect the new surface during the call
+  // to UseCodecBufferForPicture().
+  void InitializeForOverlay();
+  gl::ScopedJavaSurface InitializeForSurfaceTexture();
 
   void Destroy(const PictureBufferMap& buffers);
 
   // Sets up |picture_buffer| so that its texture will refer to the image that
   // is represented by the decoded output buffer at codec_buffer_index.
   void UseCodecBufferForPictureBuffer(int32_t codec_buffer_index,
                                       const PictureBuffer& picture_buffer);
 
   // Assigns a picture buffer and attaches an image to its texture.
   void AssignOnePictureBuffer(const PictureBuffer& picture_buffer,
@@ skipping 57 matching lines @@
 
   // 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_