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

media/gpu/avda_codec_image.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_CODEC_IMAGE_H_
 #define MEDIA_GPU_AVDA_CODEC_IMAGE_H_
 
 #include <stdint.h>
 
 #include <memory>
 
 #include "base/macros.h"
 #include "gpu/command_buffer/service/gl_stream_texture_image.h"
 #include "media/gpu/avda_shared_state.h"
 
 namespace ui {
 class ScopedMakeCurrent;
 }
 
 namespace media {
 
 class VideoCodecBridge;
 
 // GLImage that renders MediaCodec buffers to a SurfaceTexture or SurfaceView as
 // needed in order to draw them.
 class AVDACodecImage : public gpu::gles2::GLStreamTextureImage {
  public:
-  AVDACodecImage(int picture_buffer_id,
-                 const scoped_refptr<AVDASharedState>& shared_state,
+  AVDACodecImage(const scoped_refptr<AVDASharedState>& shared_state,
                  VideoCodecBridge* codec,
                  const base::WeakPtr<gpu::gles2::GLES2Decoder>& decoder);
 
   // gl::GLImage implementation
   gfx::Size GetSize() override;
   unsigned GetInternalFormat() override;
   bool BindTexImage(unsigned target) override;
   void ReleaseTexImage(unsigned target) override;
   bool CopyTexImage(unsigned target) override;
   bool CopyTexSubImage(unsigned target,
@@ skipping 29 matching lines @@
   // |codec_buffer_index_| and updates the surface if specified by the given
   // |update_mode|.  See UpdateMode documentation for details.
   void UpdateSurface(UpdateMode update_mode);
 
   // Updates the MediaCodec for this image; clears |codec_buffer_index_|.
   void CodecChanged(MediaCodecBridge* codec);
 
   void set_texture(gpu::gles2::Texture* texture) { texture_ = texture; }
 
   // Decoded buffer index that has the image for us to display.
-  void set_media_codec_buffer_index(int buffer_index) {
-    codec_buffer_index_ = buffer_index;
-  }
+  void SetBufferMetadata(int buffer_index,
+                         bool has_surface_texture,
+                         const gfx::Size size);
 
-  // Set the size of the current image.
-  void set_size(const gfx::Size& size) { size_ = size; }
+  bool SetSharedState(const scoped_refptr<AVDASharedState>& shared_state);
 
   // Indicates if the codec buffer has been released to the back buffer.
   bool was_rendered_to_back_buffer() const {
     return codec_buffer_index_ == kUpdateOnly;
   }
 
   // Indicates if the codec buffer has been released to the front buffer.
   bool was_rendered_to_front_buffer() const {
     return codec_buffer_index_ == kRendered;
   }
 
+  bool has_unrendered_frame() const {
+    return codec_buffer_index_ >= kUpdateOnly;
+  }
+
  protected:
   ~AVDACodecImage() override;
 
  private:
   // Make sure that the surface texture's front buffer is current.  This will
   // save / restore the current context.  It will optionally restore the texture
   // bindings in the surface texture's context, based on |mode|.  This is
   // intended as a hint if we don't need to change contexts.  If we do need to
   // change contexts, then we'll always preserve the texture bindings in the
   // both contexts.  In other words, the caller is telling us whether it's
@@ skipping 29 matching lines @@
   int codec_buffer_index_;
 
   // Our image size.
   gfx::Size size_;
 
   // May be null.
   MediaCodecBridge* media_codec_;
 
   const base::WeakPtr<gpu::gles2::GLES2Decoder> decoder_;
 
-  // Indicates if we're rendering to a SurfaceTexture or not.
-  const bool has_surface_texture_;
+  // Indicates if we're rendering to a SurfaceTexture or not. Set during the
+  // call to SetBufferMetadata().
+  bool has_surface_texture_;
 
   // The texture that we're attached to.
   gpu::gles2::Texture* texture_;
 
-  // The picture buffer id attached to this image.
-  int picture_buffer_id_;
-
   DISALLOW_COPY_AND_ASSIGN(AVDACodecImage);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_GPU_AVDA_CODEC_IMAGE_H_