Use MediaCodec.setOutputSurface() for fullscreen transitions on M.

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 27 matching lines @@
 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.
+  //
+  // 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);
 
   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
   // 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,
                               bool have_context);
 
   // Reuses a picture buffer to hold a new frame.
   void ReuseOnePictureBuffer(const PictureBuffer& picture_buffer);
 
   // Release MediaCodec buffers.
   void ReleaseCodecBuffers(const PictureBufferMap& buffers);
 
   // Attempts to free up codec output buffers by rendering early.
   void MaybeRenderEarly();
 
   // Called when the MediaCodec instance changes. If |codec| is nullptr the
   // MediaCodec is being destroyed. Previously provided codecs should no longer
   // be referenced.
   void CodecChanged(VideoCodecBridge* codec);
 
   // Whether the pictures buffers are overlayable.
   bool ArePicturesOverlayable();
 
+  // Are there any unrendered picture buffers oustanding?
+  bool ArePicturesOutstanding() const;
+
+  // Returns the GL texture target that the PictureBuffer textures use.
+  // Always use OES textures even though this will cause flickering in dev tools
+  // when inspecting a fullscreen video.  See http://crbug.com/592798
+  enum GLenum { kTextureTarget = GL_TEXTURE_EXTERNAL_OES };

[watk, 2016/11/08 22:59:03]

constexpr instead of enum? Move to the top? If you leave it as an enum, can you
remove the name, or am I missing something? Confuses me to see another GLenum.

[DaleCurtis, 2016/11/08 23:50:11]

Whoops, that was supposed to be the type. Dropped. Still an enum though since
constexpr can't be used without declaring the it as static.

+
  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);
 
   // 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,
                           gpu::gles2::GLStreamTextureImage* image);
@@ skipping 16 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_