Don't require VDAs to return all PictureBuffers at once.

content/common/gpu/media/android_deferred_rendering_backing_strategy.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 "content/common/gpu/media/android_deferred_rendering_backing_strategy.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "base/metrics/histogram.h"
 #include "content/common/gpu/gpu_channel.h"
 #include "content/common/gpu/media/avda_codec_image.h"
 #include "content/common/gpu/media/avda_return_on_failure.h"
 #include "content/common/gpu/media/avda_shared_state.h"
 #include "gpu/command_buffer/service/texture_manager.h"
 #include "ui/gl/android/surface_texture.h"
 #include "ui/gl/gl_bindings.h"
 
 namespace content {
 
-// TODO(liberato): This is an entirely made-up number.  It depends on how
-// many decoded buffers that the MediaCodec is willing to have outstanding
-// at any one time.  Only one is guaranteed.  crbug.com/531606.
-enum { kNumPictureBuffers = 3 };
-
 AndroidDeferredRenderingBackingStrategy::
     AndroidDeferredRenderingBackingStrategy()
     : state_provider_(nullptr), media_codec_(nullptr) {}
 
 AndroidDeferredRenderingBackingStrategy::
     ~AndroidDeferredRenderingBackingStrategy() {}
 
 void AndroidDeferredRenderingBackingStrategy::Initialize(
     AVDAStateProvider* state_provider) {
   state_provider_ = state_provider;
   shared_state_ = new AVDASharedState();
 }
 
 void AndroidDeferredRenderingBackingStrategy::Cleanup(
     const AndroidVideoDecodeAccelerator::OutputBufferMap& buffers) {
   for (const std::pair<int, media::PictureBuffer>& entry : buffers) {
     AVDACodecImage* avImage = GetImageForPicture(entry.second);
     if (avImage) {
       avImage->SetMediaCodecBufferIndex(-1);
       avImage->SetMediaCodec(nullptr);
     }
   }
 }
 
-uint32 AndroidDeferredRenderingBackingStrategy::GetNumPictureBuffers() const {
-  return kNumPictureBuffers;
-}
-
 uint32 AndroidDeferredRenderingBackingStrategy::GetTextureTarget() const {
   return GL_TEXTURE_EXTERNAL_OES;
 }
 
 scoped_refptr<gfx::SurfaceTexture>
 AndroidDeferredRenderingBackingStrategy::CreateSurfaceTexture() {
   // AVDACodecImage will handle attaching this to a texture later.
   surface_texture_ = gfx::SurfaceTexture::Create(0);
   // Detach from our GL context so that the GLImages can attach.  It will
   // silently fail to delete texture 0.
@@ skipping 123 matching lines @@
   // doesn't know about them.
   media_codec_ = codec;
   for (const std::pair<int, media::PictureBuffer>& entry : buffers) {
     AVDACodecImage* avImage = GetImageForPicture(entry.second);
     avImage->SetMediaCodec(codec);
     avImage->SetMediaCodecBufferIndex(-1);
   }
 }
 
 }  // namespace content