Fix Android black frames from MSE config changes.

media/filters/gpu_video_decoder.cc

 // Copyright (c) 2012 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 "media/filters/gpu_video_decoder.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 458 matching lines @@
   DVLOG(3) << "PictureReady()";
   DCheckGpuVideoAcceleratorFactoriesTaskRunnerIsCurrent();
 
   PictureBufferMap::iterator it =
       assigned_picture_buffers_.find(picture.picture_buffer_id());
   if (it == assigned_picture_buffers_.end()) {
     DLOG(ERROR) << "Missing picture buffer: " << picture.picture_buffer_id();
     NotifyError(VideoDecodeAccelerator::PLATFORM_FAILURE);
     return;
   }
-  const PictureBuffer& pb = it->second;
+  PictureBuffer& pb = it->second;
+  if (picture.size_changed()) {
+    // Update the PictureBuffer size to match that of the Picture. Some VDA's
+    // (e.g. Android) will handle resolution changes internally without
+    // requesting new PictureBuffers. Sending a Picture of unmatched size is
+    // the signal that we should update the size of our PictureBuffer.
+    DCHECK(pb.size() != picture.visible_rect().size());
+    DVLOG(3) << __FUNCTION__ << " Updating size of PictureBuffer[" << pb.id()
+             << "] from:" << pb.size().ToString()
+             << " to:" << picture.visible_rect().size().ToString();
+    pb.set_size(picture.visible_rect().size());

[jbauman, 2016/03/07 23:53:50]

Hmm, should it be using the coded size instead? I'm not sure if that actually
matters, though.

[chcunningham, 2016/03/08 03:19:36]

I had the same concern, but Frank convinced me this should be ok. Coded size is
definitely distinct from visible size, but for AVDA this is always the same. See
Frank's reply earlier: "i agree that the flag is very AVDA-specific..."

+  }
 
   // Update frame's timestamp.
   base::TimeDelta timestamp;
   // Some of the VDAs like DXVA, AVDA, and VTVDA don't support and thus don't

[jbauman, 2016/03/07 23:53:50]

Is this comment still true with AVDA?

[chcunningham, 2016/03/08 03:19:36]

No longer true for AVDA. I've updated this comment.

   // provide us with visible size in picture.size, passing (0, 0) instead, so
   // for those cases drop it and use config information instead.
   gfx::Rect visible_rect;
   gfx::Size natural_size;
   GetBufferData(picture.bitstream_buffer_id(), &timestamp, &visible_rect,
                 &natural_size);
 
   if (!picture.visible_rect().IsEmpty()) {
     visible_rect = picture.visible_rect();
   }
@@ skipping 214 matching lines @@
   }
   return false;
 }
 
 void GpuVideoDecoder::DCheckGpuVideoAcceleratorFactoriesTaskRunnerIsCurrent()
     const {
   DCHECK(factories_->GetTaskRunner()->BelongsToCurrentThread());
 }
 
 }  // namespace media