Fix overlay computation in GpuMemoryBufferVideoFramePool

media/video/gpu_memory_buffer_video_frame_pool.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 "media/video/gpu_memory_buffer_video_frame_pool.h"
 
 #include <GLES2/gl2.h>
 #include <GLES2/gl2ext.h>
 #include <stddef.h>
 #include <stdint.h>
@@ skipping 582 matching lines @@
 
   auto release_mailbox_callback = BindToCurrentLoop(
       base::Bind(&PoolImpl::MailboxHoldersReleased, this, frame_resources));
 
   // Create the VideoFrame backed by native textures.
   gfx::Size visible_size = video_frame->visible_rect().size();
   scoped_refptr<VideoFrame> frame = VideoFrame::WrapNativeTextures(
       output_format_, mailbox_holders, release_mailbox_callback, coded_size,
       gfx::Rect(visible_size), video_frame->natural_size(),
       video_frame->timestamp());
-  if (frame &&
-      video_frame->metadata()->IsTrue(VideoFrameMetadata::ALLOW_OVERLAY))
-    frame->metadata()->SetBoolean(VideoFrameMetadata::ALLOW_OVERLAY, true);
 
   if (!frame) {
     release_mailbox_callback.Run(gpu::SyncToken());
     frame_ready_cb.Run(video_frame);
     return;
   }
 
+  // Compute whether or not this frame may be displayed as an overlay.

[hubbe, 2016/05/18 00:03:32]

Not a very good comment, as it doesn't explain why we sometimes ask the frame if
overlay is allowed and sometimes not.

[ccameron, 2016/05/18 03:04:00]

Good point -- removed the comment, since it doesn't add anything.

+  bool allow_overlay = false;
+  switch (output_format_) {
+    case PIXEL_FORMAT_I420:
+      allow_overlay =
+          video_frame->metadata()->IsTrue(VideoFrameMetadata::ALLOW_OVERLAY);
+      break;
+    case PIXEL_FORMAT_NV12:
+    case PIXEL_FORMAT_UYVY:
+      allow_overlay = true;
+      break;
+    default:
+      break;
+  }
+  frame->metadata()->SetBoolean(VideoFrameMetadata::ALLOW_OVERLAY,
+                                allow_overlay);
+
   base::TimeTicks render_time;
   if (video_frame->metadata()->GetTimeTicks(VideoFrameMetadata::REFERENCE_TIME,
                                             &render_time)) {
     frame->metadata()->SetTimeTicks(VideoFrameMetadata::REFERENCE_TIME,
                                     render_time);
   }
 
   frame->metadata()->SetBoolean(VideoFrameMetadata::READ_LOCK_FENCES_ENABLED,
                                 true);
 
@@ skipping 127 matching lines @@
 }
 
 void GpuMemoryBufferVideoFramePool::MaybeCreateHardwareFrame(
     const scoped_refptr<VideoFrame>& video_frame,
     const FrameReadyCB& frame_ready_cb) {
   DCHECK(video_frame);
   pool_impl_->CreateHardwareFrame(video_frame, frame_ready_cb);
 }
 
 }  // namespace media