ReleaseOutputBuffer to surface back and front buffers where possible.

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"
@@ skipping 38 matching lines @@
   state_provider_->GetGlDecoder()->RestoreTextureUnitBindings(0);
   state_provider_->GetGlDecoder()->RestoreActiveTexture();
 
   surface_texture_ = gfx::SurfaceTexture::Create(surface_texture_id_);
 
   return gfx::ScopedJavaSurface(surface_texture_.get());
 }
 
 void AndroidCopyingBackingStrategy::Cleanup(
     bool have_context,
-    const AndroidVideoDecodeAccelerator::OutputBufferMap&) {
+    const AndroidVideoDecodeAccelerator::OutputBufferMap& buffers) {
   DCHECK(state_provider_->ThreadChecker().CalledOnValidThread());
 
   if (copier_)
     copier_->Destroy();
 
   if (surface_texture_id_ && have_context)
     glDeleteTextures(1, &surface_texture_id_);
 }
 
 scoped_refptr<gfx::SurfaceTexture>
 AndroidCopyingBackingStrategy::GetSurfaceTexture() const {
   return surface_texture_;
 }
 
 uint32_t AndroidCopyingBackingStrategy::GetTextureTarget() const {
   return GL_TEXTURE_2D;
 }
 
 gfx::Size AndroidCopyingBackingStrategy::GetPictureBufferSize() const {
   return state_provider_->GetSize();
 }
 
 void AndroidCopyingBackingStrategy::UseCodecBufferForPictureBuffer(
     int32_t codec_buf_index,
-    const media::PictureBuffer& picture_buffer) {
+    const media::PictureBuffer& picture_buffer,
+    const std::vector<int32_t>& pictures_out_for_display) {
   // Make sure that the decoder is available.
   RETURN_ON_FAILURE(state_provider_, state_provider_->GetGlDecoder().get(),
                     "Failed to get gles2 decoder instance.", ILLEGAL_STATE);
 
   // Render the codec buffer into |surface_texture_|, and switch it to be
   // the front buffer.
   // This ignores the emitted ByteBuffer and instead relies on rendering to
   // the codec's SurfaceTexture and then copying from that texture to the
   // client's PictureBuffer's texture.  This means that each picture's data
   // is written three times: once to the ByteBuffer, once to the
@@ skipping 87 matching lines @@
   RETURN_IF_NULL(texture_ref);
   gpu::gles2::TextureManager* texture_manager =
       state_provider_->GetGlDecoder()->GetContextGroup()->texture_manager();
   RETURN_IF_NULL(texture_manager);
   texture_manager->SetLevelInfo(texture_ref, GetTextureTarget(), 0, GL_RGBA,
                                 new_size.width(), new_size.height(), 1, 0,
                                 GL_RGBA, GL_UNSIGNED_BYTE, gfx::Rect(new_size));
 }
 
 }  // namespace content