Fix Android black frames from MSE config changes.

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 143 matching lines @@
   // 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.
 }
 
 bool AndroidCopyingBackingStrategy::ArePicturesOverlayable() {
   return false;
 }
 
+void AndroidCopyingBackingStrategy::UpdatePictureBufferSize(
+    media::PictureBuffer* picture_buffer,
+    const gfx::Size& new_size) {
+  // This strategy uses 2D textures who's allocated memory is dependent on the
+  // size. To update size in all places, we must:
+  // 1) Update the PictureBuffer meta-data
+  picture_buffer->set_size(new_size);
+
+  // 2) Update the GL texture via glTextImage2D. This step assumes the caller

[DaleCurtis, 2016/03/08 18:29:03]

glTexImage2D unless there's an ASCII art GL command I don't know about :)

[chcunningham, 2016/03/08 22:19:12]

Done. :)

+  // has made our GL context current.
+  glBindTexture(GL_TEXTURE_2D, picture_buffer->texture_id());
+  glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, new_size.width(), new_size.height(),
+               0, GL_RGBA, GL_UNSIGNED_BYTE, nullptr);
+  state_provider_->GetGlDecoder()->RestoreActiveTextureUnitBinding(
+      GL_TEXTURE_2D);
+
+  // 3) Update the CHROMIUM Texture's size.
+  gpu::gles2::TextureRef* texture_ref =
+      state_provider_->GetTextureForPicture(*picture_buffer);
+  RETURN_IF_NULL(texture_ref);

[DaleCurtis, 2016/03/08 18:29:03]

Should this function return an error if this occurs?

[chcunningham, 2016/03/08 22:19:12]

I think its should be ok as-is. This macro This macro will post an error an
error to the state_provider_ if null is returned. IIUC this our pattern for
reporting the errors from AVDA strategies. 

+  gpu::gles2::TextureManager* texture_manager =
+      state_provider_->GetGlDecoder()->GetContextGroup()->texture_manager();
+  RETURN_IF_NULL(texture_manager);

[DaleCurtis, 2016/03/08 18:29:03]

Ditto?

[chcunningham, 2016/03/08 22:19:12]

Ditto

+  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