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

content/common/gpu/media/android_copying_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_copying_backing_strategy.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/trace_event/trace_event.h"
 #include "content/common/gpu/media/avda_return_on_failure.h"
 #include "gpu/command_buffer/service/gles2_cmd_copy_texture_chromium.h"
 #include "gpu/command_buffer/service/gles2_cmd_decoder.h"
 #include "media/base/limits.h"
 #include "media/video/picture.h"
 #include "ui/gl/android/surface_texture.h"
 #include "ui/gl/gl_bindings.h"
 
 namespace content {
 
-// TODO(liberato): It is unclear if we have an issue with deadlock during
-// playback if we lower this.  Previously (crbug.com/176036), a deadlock
-// could occur during preroll.  More recent tests have shown some
-// instability with kNumPictureBuffers==2 with similar symptoms
-// during playback.  crbug.com/:531588 .
-enum { kNumPictureBuffers = media::limits::kMaxVideoFrames + 1 };
-
 const static GLfloat kIdentityMatrix[16] = {1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f,
                                             0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f,
                                             0.0f, 0.0f, 0.0f, 1.0f};
 
 AndroidCopyingBackingStrategy::AndroidCopyingBackingStrategy()
     : state_provider_(nullptr), surface_texture_id_(0), media_codec_(nullptr) {}
 
 AndroidCopyingBackingStrategy::~AndroidCopyingBackingStrategy() {}
 
 void AndroidCopyingBackingStrategy::Initialize(
     AVDAStateProvider* state_provider) {
   state_provider_ = state_provider;
 }
 
 void AndroidCopyingBackingStrategy::Cleanup(
     const AndroidVideoDecodeAccelerator::OutputBufferMap&) {
   DCHECK(state_provider_->ThreadChecker().CalledOnValidThread());
   if (copier_)
     copier_->Destroy();
 
   if (surface_texture_id_)
     glDeleteTextures(1, &surface_texture_id_);
 }
 
-uint32 AndroidCopyingBackingStrategy::GetNumPictureBuffers() const {
-  return kNumPictureBuffers;
-}
-
 uint32 AndroidCopyingBackingStrategy::GetTextureTarget() const {
   return GL_TEXTURE_2D;
 }
 
 scoped_refptr<gfx::SurfaceTexture>
 AndroidCopyingBackingStrategy::CreateSurfaceTexture() {
   glGenTextures(1, &surface_texture_id_);
   glActiveTexture(GL_TEXTURE0);
   glBindTexture(GL_TEXTURE_EXTERNAL_OES, surface_texture_id_);
 
@@ skipping 72 matching lines @@
       false, false, false, kIdentityMatrix);
 }
 
 void AndroidCopyingBackingStrategy::CodecChanged(
     media::VideoCodecBridge* codec,
     const AndroidVideoDecodeAccelerator::OutputBufferMap&) {
   media_codec_ = codec;
 }
 
 }  // namespace content