Select BackingStrategy based on GpuPreferences

content/common/gpu/media/android_video_decode_accelerator.cc

 // Copyright (c) 2013 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_video_decode_accelerator.h"
 
 #include <stddef.h>
 
 #include "base/android/build_info.h"
 #include "base/auto_reset.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "base/metrics/histogram.h"
 #include "base/trace_event/trace_event.h"
 #include "content/common/gpu/gpu_channel.h"
 #include "content/common/gpu/media/android_copying_backing_strategy.h"
 #include "content/common/gpu/media/android_deferred_rendering_backing_strategy.h"
 #include "content/common/gpu/media/avda_return_on_failure.h"
 #include "content/common/gpu/media/shared_memory_region.h"
 #include "gpu/command_buffer/service/gles2_cmd_decoder.h"
-#include "gpu/command_buffer/service/gpu_switches.h"
 #include "gpu/command_buffer/service/mailbox_manager.h"
 #include "media/base/android/media_codec_bridge.h"
 #include "media/base/android/media_codec_util.h"
 #include "media/base/bind_to_current_loop.h"
 #include "media/base/bitstream_buffer.h"
 #include "media/base/limits.h"
 #include "media/base/media.h"
 #include "media/base/timestamp_constants.h"
 #include "media/base/video_decoder_config.h"
 #include "media/video/picture.h"
@@ skipping 1112 matching lines @@
   } else {
     most_recent_work_ = now;
   }
 
   if (should_be_running)
     g_avda_timer.Pointer()->StartTimer(this);
   else
     g_avda_timer.Pointer()->StopTimer(this);
 }
 
-// static
 bool AndroidVideoDecodeAccelerator::UseDeferredRenderingStrategy() {
-  const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
   // TODO(liberato, watk): Figure out what we want to do about zero copy for
   // fullscreen external SurfaceView in WebView.  http://crbug.com/582170.
-  return !cmd_line->HasSwitch(switches::kEnableThreadedTextureMailboxes);
+  const gpu::GpuPreferences& gpu_preferences =

[liberato (no reviews please), 2016/03/22 21:22:08]

i was thinking that you might pass in the GpuPreferences here, and call it from
both the constructor and GetCapabilities.  otherwise, there's still two copies
of the check.

[william.xie, 2016/03/22 23:11:07]

Thanks Frank, per https://codereview.chromium.org/1809943002/#msg28,
we should get GpuPreferences from AVDA itself.
DaleCurtis@, how do you think?

[DaleCurtis, 2016/03/22 23:14:32]

I believe Frank just means you should have UseDeferredRendereringStrategy() take
gpu preferences as a const& parameter and then pass in the value via the code
you have here. this allows you to keep the UseDeferred...() function call in the
places its used today instead of having both check this preference.

[william.xie, 2016/03/22 23:37:26]

Done.

+      gl_decoder_->GetContextGroup()->gpu_preferences();
+  return !gpu_preferences.enable_threaded_texture_mailboxes;
 }
 
 // static
 media::VideoDecodeAccelerator::Capabilities
-AndroidVideoDecodeAccelerator::GetCapabilities() {
+AndroidVideoDecodeAccelerator::GetCapabilities(
+    const gpu::GpuPreferences& gpu_preferences) {
   Capabilities capabilities;
   SupportedProfiles& profiles = capabilities.supported_profiles;
 
   SupportedProfile profile;
 
   if (media::MediaCodecUtil::IsVp8DecoderAvailable()) {
     profile.profile = media::VP8PROFILE_ANY;
     profile.min_resolution.SetSize(0, 0);
     profile.max_resolution.SetSize(1920, 1088);
     profiles.push_back(profile);
@@ skipping 10 matching lines @@
     SupportedProfile profile;
     profile.profile = supported_profile;
     profile.min_resolution.SetSize(0, 0);
     // Advertise support for 4k and let the MediaCodec fail when decoding if it
     // doesn't support the resolution. It's assumed that consumers won't have
     // software fallback for H264 on Android anyway.
     profile.max_resolution.SetSize(3840, 2160);
     profiles.push_back(profile);
   }
 
-  if (UseDeferredRenderingStrategy()) {
+  if (!gpu_preferences.enable_threaded_texture_mailboxes) {
     capabilities.flags = media::VideoDecodeAccelerator::Capabilities::
                              NEEDS_ALL_PICTURE_BUFFERS_TO_DECODE |
                          media::VideoDecodeAccelerator::Capabilities::
                              SUPPORTS_EXTERNAL_OUTPUT_SURFACE;
   }
 
   return capabilities;
 }
 
 }  // namespace content