Position overlays in AVDACodecImage

media/gpu/avda_picture_buffer_manager.cc

 // 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.
 
 #include "media/gpu/avda_picture_buffer_manager.h"
 
 #include <EGL/egl.h>
 #include <EGL/eglext.h>
 
 #include "base/android/build_info.h"
@@ skipping 54 matching lines @@
 }
 
 }  // namespace
 
 AVDAPictureBufferManager::AVDAPictureBufferManager(
     AVDAStateProvider* state_provider)
     : state_provider_(state_provider), media_codec_(nullptr) {}
 
 AVDAPictureBufferManager::~AVDAPictureBufferManager() {}
 
-void AVDAPictureBufferManager::InitializeForOverlay() {
-  shared_state_ = new AVDASharedState();
-  surface_texture_ = nullptr;
-}
-
-gl::ScopedJavaSurface AVDAPictureBufferManager::InitializeForSurfaceTexture() {
-  shared_state_ = new AVDASharedState();
+bool AVDAPictureBufferManager::Initialize(
+    scoped_refptr<AVDASurfaceBundle> surface_bundle) {
+  shared_state_ = nullptr;
   surface_texture_ = nullptr;
 
-  // Create a SurfaceTexture.
-  surface_texture_ =
-      CreateAttachedSurfaceTexture(state_provider_->GetGlDecoder());
-  if (!surface_texture_)
-    return gl::ScopedJavaSurface();
+  if (!surface_bundle->overlay) {
+    // Create the surface texture.
+    surface_texture_ =
+        CreateAttachedSurfaceTexture(state_provider_->GetGlDecoder());
+    if (!surface_texture_)
+      return false;
 
-  shared_state_->SetSurfaceTexture(surface_texture_);
-  return gl::ScopedJavaSurface(surface_texture_.get());
+    surface_bundle->surface_texture_surface =
+        gl::ScopedJavaSurface(surface_texture_.get());
+    surface_bundle->surface_texture = surface_texture_;
+  }
+
+  // Only do this once the surface texture is filled in, since the constructor
+  // assumes that it will be.
+  shared_state_ = new AVDASharedState(surface_bundle);
+
+  return true;
 }
 
 void AVDAPictureBufferManager::Destroy(const PictureBufferMap& buffers) {
   // Do nothing if Initialize() has not been called.
   if (!shared_state_)
     return;
 
   ReleaseCodecBuffers(buffers);
   CodecChanged(nullptr);
   surface_texture_ = nullptr;
@@ skipping 178 matching lines @@
 
 bool AVDAPictureBufferManager::HasUnrenderedPictures() const {
   for (int id : pictures_out_for_display_) {
     if (GetImageForPicture(id)->is_unrendered())
       return true;
   }
   return false;
 }
 
 }  // namespace media