Position overlays in AVDACodecImage

media/gpu/android_video_decode_accelerator.cc

 // Copyright (c) 2013 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/android_video_decode_accelerator.h"
 
 #include <stddef.h>
 
 #include <memory>
 
@@ skipping 468 matching lines @@
     incoming_bundle_ = nullptr;
     return;
   }
 
   // Move |incoming_bundle_| to |codec_config_|.  Our caller must set up an
   // incoming bundle properly, since we don't want to accidentally overwrite
   // |surface_bundle| for a codec that's being released elsewhere.
   // TODO(liberato): it doesn't make sense anymore for the PictureBufferManager
   // to create the surface texture.  We can probably make an overlay impl out
   // of it, and provide the surface texture to |picture_buffer_manager_|.
-  if (incoming_bundle_->overlay) {
-    picture_buffer_manager_.InitializeForOverlay();
-  } else {
-    incoming_bundle_->surface_texture_surface =
-        picture_buffer_manager_.InitializeForSurfaceTexture();
-    incoming_bundle_->surface_texture =
-        picture_buffer_manager_.surface_texture();
-
-    if (!incoming_bundle_->surface_texture) {
-      NOTIFY_ERROR(PLATFORM_FAILURE, "Could not allocate surface texture");
-      incoming_bundle_ = nullptr;
-      return;
-    }
+  if (!picture_buffer_manager_.Initialize(incoming_bundle_)) {
+    NOTIFY_ERROR(PLATFORM_FAILURE, "Could not allocate surface texture");
+    incoming_bundle_ = nullptr;
+    return;
   }
 
   // If we have a media codec, then SetSurface.  If that doesn't work, then we
   // do not try to allocate a new codec; we might not be at a keyframe, etc.
   // If we get here with a codec, then we must setSurface.
   if (media_codec_) {
     // TODO(liberato): fail on api check?
     if (!media_codec_->SetSurface(incoming_bundle_->j_surface().obj())) {
       NOTIFY_ERROR(PLATFORM_FAILURE, "MediaCodec failed to switch surfaces.");
       // We're not going to use |incoming_bundle_|.
@@ skipping 1172 matching lines @@
   codec_allocator_->ReleaseMediaCodec(std::move(media_codec_),
                                       codec_config_->surface_bundle);
 }
 
 void AndroidVideoDecodeAccelerator::ReleaseCodecAndBundle() {
   ReleaseCodec();
   codec_config_->surface_bundle = nullptr;
 }
 
 }  // namespace media