Enable deferred rendering strategy for Android WebView for Spitzer

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 67 matching lines @@
       factories_(factories),
       state_(kNormal),
       request_surface_cb_(request_surface_cb),
       decoder_texture_target_(0),
       pixel_format_(PIXEL_FORMAT_UNKNOWN),
       next_picture_buffer_id_(0),
       next_bitstream_buffer_id_(0),
       available_pictures_(0),
       needs_all_picture_buffers_to_decode_(false),
       supports_deferred_initialization_(false),
+      requires_texture_copy_(false),
       weak_factory_(this) {
   DCHECK(factories_);
 }
 
 void GpuVideoDecoder::Reset(const base::Closure& closure)  {
   DVLOG(3) << "Reset()";
   DCheckGpuVideoAcceleratorFactoriesTaskRunnerIsCurrent();
 
   if (state_ == kDrainingDecoder) {
     base::ThreadTaskRunnerHandle::Get()->PostTask(
@@ skipping 96 matching lines @@
              << " is_encrypted: " << (config.is_encrypted() ? "yes." : "no.");
     bound_init_cb.Run(false);
     return;
   }
 
   config_ = config;
   needs_all_picture_buffers_to_decode_ =
       capabilities.flags &
       VideoDecodeAccelerator::Capabilities::NEEDS_ALL_PICTURE_BUFFERS_TO_DECODE;
   needs_bitstream_conversion_ = (config.codec() == kCodecH264);
+  requires_texture_copy_ =

[Tima Vaisburd, 2016/06/09 22:51:26]

Bo Liu> do this:
Bo Liu>
https://cs.chromium.org/chromium/src/content/renderer/render_frame_impl.cc?rc...

I followed liberato@'s advise to pass the flag through Capabilities, in this
case it seems we can keep the existing command line option?

[boliu, 2016/06/10 00:41:03]

You are not actually using the command line here though?

Using GpuPreferences is fine

[Tima Vaisburd, 2016/06/10 00:49:41]

VideoDecodeAccelerator::Capabilities extracts the flag from GpuPreferences. They
copy command line flag that is set here:
https://cs.chromium.org/chromium/src/android_webview/lib/main/aw_main_delegat...

[boliu, 2016/06/10 00:53:33]

which is fine
I meant you are not using the switch in this CL

+      capabilities.flags &
+      VideoDecodeAccelerator::Capabilities::REQUIRES_TEXTURE_COPY;
   supports_deferred_initialization_ = !!(
       capabilities.flags &
       VideoDecodeAccelerator::Capabilities::SUPPORTS_DEFERRED_INITIALIZATION);
   output_cb_ = output_cb;
 
   if (config.is_encrypted() && !supports_deferred_initialization_) {
     DVLOG(1) << __FUNCTION__
              << " Encrypted stream requires deferred initialialization.";
     bound_init_cb.Run(false);
     return;
@@ skipping 367 matching lines @@
   if (!frame) {
     DLOG(ERROR) << "Create frame failed for: " << picture.picture_buffer_id();
     NotifyError(VideoDecodeAccelerator::PLATFORM_FAILURE);
     return;
   }
   if (picture.allow_overlay())
     frame->metadata()->SetBoolean(VideoFrameMetadata::ALLOW_OVERLAY, true);
 #if defined(OS_MACOSX) || defined(OS_WIN)
   frame->metadata()->SetBoolean(VideoFrameMetadata::DECODER_OWNS_FRAME, true);
 #endif
+
+  // We keep deferred rendering strategy for Android WebView, that can only work
+  // with COPY_REQUIRED. See http://crbug.com/582170.
+  if (requires_texture_copy_)
+    frame->metadata()->SetBoolean(VideoFrameMetadata::COPY_REQUIRED, true);
+
   CHECK_GT(available_pictures_, 0);
   --available_pictures_;
 
   bool inserted =
       picture_buffers_at_display_
           .insert(std::make_pair(picture.picture_buffer_id(), pb.texture_ids()))
           .second;
   DCHECK(inserted);
 
   DeliverFrame(frame);
@@ skipping 190 matching lines @@
   }
   return false;
 }
 
 void GpuVideoDecoder::DCheckGpuVideoAcceleratorFactoriesTaskRunnerIsCurrent()
     const {
   DCHECK(factories_->GetTaskRunner()->BelongsToCurrentThread());
 }
 
 }  // namespace media