Merge to M51: Various fixes to prevent playback hang on MotoX.

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>
@@ skipping 67 matching lines @@
   // 2. SurfaceTexture requires us to apply a transform matrix when we show
   //    the texture.
   copier_->DoCopyTextureWithTransform(
       state_provider_->GetGlDecoder().get(), GL_TEXTURE_EXTERNAL_OES,
       surface_texture_id_, GL_TEXTURE_2D, picture_buffer_texture_id,
       state_provider_->GetSize().width(), state_provider_->GetSize().height(),
       true, false, false, transform_matrix);
 }
 
 void AndroidCopyingBackingStrategy::CodecChanged(
-    media::VideoCodecBridge* codec,
-    const AndroidVideoDecodeAccelerator::OutputBufferMap&) {
+    media::VideoCodecBridge* codec) {
   media_codec_ = codec;
 }
 
 void AndroidCopyingBackingStrategy::OnFrameAvailable() {
   // TODO(liberato): crbug.com/574948 .  The OnFrameAvailable logic can be
   // moved into AVDA, and we should wait for it before doing the copy.
   // Because there were some test failures, we don't do this now but
   // instead preserve the old behavior.
 }
 
@@ skipping 24 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