Enable SurfaceView fullscreen video on Android with WebMediaPlayerImpl

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"
 #include "base/callback_helpers.h"
 #include "base/command_line.h"
 #include "base/cpu.h"
 #include "base/message_loop/message_loop.h"
 #include "base/metrics/histogram.h"
 #include "base/stl_util.h"
 #include "base/task_runner_util.h"
 #include "build/build_config.h"
 #include "gpu/command_buffer/common/mailbox_holder.h"
 #include "media/base/bind_to_current_loop.h"
 #include "media/base/decoder_buffer.h"
 #include "media/base/media_switches.h"
 #include "media/base/pipeline.h"
+#include "media/base/surface_manager.h"
 #include "media/base/video_decoder_config.h"
 #include "media/renderers/gpu_video_accelerator_factories.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
 namespace media {
 
 const char GpuVideoDecoder::kDecoderName[] = "GpuVideoDecoder";
 
 // Maximum number of concurrent VDA::Decode() operations GVD will maintain.
 // Higher values allow better pipelining in the GPU, but also require more
@@ skipping 23 matching lines @@
                                         base::TimeDelta ts,
                                         const gfx::Rect& vr,
                                         const gfx::Size& ns)
     : bitstream_buffer_id(bbid),
       timestamp(ts),
       visible_rect(vr),
       natural_size(ns) {}
 
 GpuVideoDecoder::BufferData::~BufferData() {}
 
-GpuVideoDecoder::GpuVideoDecoder(GpuVideoAcceleratorFactories* factories)
+GpuVideoDecoder::GpuVideoDecoder(GpuVideoAcceleratorFactories* factories,
+                                 const RequestSurfaceCB& request_surface_cb)
     : needs_bitstream_conversion_(false),
       factories_(factories),
       state_(kNormal),
+      request_surface_cb_(request_surface_cb),
       decoder_texture_target_(0),
       next_picture_buffer_id_(0),
       next_bitstream_buffer_id_(0),
       available_pictures_(0),
       needs_all_picture_buffers_to_decode_(false),
       weak_factory_(this) {
   DCHECK(factories_);
 }
 
 void GpuVideoDecoder::Reset(const base::Closure& closure)  {
@@ skipping 59 matching lines @@
                  BindToCurrentLoop(init_cb));
 
 #if !defined(OS_ANDROID)
   if (config.is_encrypted()) {
     DVLOG(1) << "Encrypted stream not supported.";
     bound_init_cb.Run(false);
     return;
   }
 #endif
 
-  bool previously_initialized = config_.IsValidConfig();
-  DVLOG(1) << "(Re)initializing GVD with config: "
-           << config.AsHumanReadableString();
-
   // TODO(posciak): destroy and create a new VDA on codec/profile change
   // (http://crbug.com/260224).
+  bool previously_initialized = config_.IsValidConfig();
+  DVLOG(1) << (previously_initialized ? "Reinitializing" : "Initializing")
+           << "GVD with config: " << config.AsHumanReadableString();
+
   if (previously_initialized && (config_.profile() != config.profile())) {
     DVLOG(1) << "Codec or profile changed, cannot reinitialize.";
     bound_init_cb.Run(false);
     return;
   }
 
   VideoDecodeAccelerator::Capabilities capabilities =
       factories_->GetVideoDecodeAcceleratorCapabilities();
   if (!IsProfileSupported(capabilities, config.profile(),
                           config.coded_size())) {
@@ skipping 14 matching lines @@
     DVLOG(3) << __FUNCTION__
              << " Expecting initialized VDA to detect in-stream config change.";
     // Reinitialization with a different config (but same codec and profile).
     // VDA should handle it by detecting this in-stream by itself,
     // no need to notify it.
     bound_init_cb.Run(true);
     return;
   }
 
   vda_ = factories_->CreateVideoDecodeAccelerator();
-
-  VideoDecodeAccelerator::Config vda_config(config);
-
-  if (!vda_ || !vda_->Initialize(vda_config, this)) {
-    DVLOG(1) << "VDA initialization failed.";
+  if (!vda_) {
+    DVLOG(1) << "Failed to create a VDA.";
     bound_init_cb.Run(false);
     return;
   }
 
+  // CompleteInitialization will clear both of these callbacks.
+  init_cb_ = bound_init_cb;
   if (config.is_encrypted()) {
-    init_cb_ = bound_init_cb;
     set_cdm_ready_cb_ = set_cdm_ready_cb;
+  }
+
+  if (!request_surface_cb_.is_null()) {
+    // If we have surface request callback we should call it and complete
+    // initialization with the returned surface.
+    request_surface_cb_.Run(BindToCurrentLoop(base::Bind(
+        &GpuVideoDecoder::CompleteInitialization, weak_factory_.GetWeakPtr())));
+    return;
+  }
+
+  CompleteInitialization(VideoDecodeAccelerator::Config::kNoSurfaceID);
+}
+
+void GpuVideoDecoder::CompleteInitialization(int surface_id) {
+  DCheckGpuVideoAcceleratorFactoriesTaskRunnerIsCurrent();
+  DCHECK(!init_cb_.is_null());
+
+  VideoDecodeAccelerator::Config vda_config(config_);
+  vda_config.surface_id = surface_id;
+  if (!vda_->Initialize(vda_config, this)) {
+    DVLOG(1) << "VDA::Initialize failed.";
+    base::ResetAndReturn(&init_cb_).Run(false);
+    return;
+  }
+
+  // If the stream is encrypted we need to request and attach the CDM
+  // before completing initialization.
+  if (config_.is_encrypted()) {
     set_cdm_ready_cb_.Run(BindToCurrentLoop(
         base::Bind(&GpuVideoDecoder::SetCdm, weak_factory_.GetWeakPtr())));
     return;
   }
 
-  DVLOG(3) << "GpuVideoDecoder::Initialize() succeeded.";
-  bound_init_cb.Run(true);
+  base::ResetAndReturn(&init_cb_).Run(true);
 }
 
 void GpuVideoDecoder::SetCdm(CdmContext* cdm_context,
                              const CdmAttachedCB& cdm_attached_cb) {
   DVLOG(2) << __FUNCTION__;
   DCheckGpuVideoAcceleratorFactoriesTaskRunnerIsCurrent();
 
   DCHECK(!init_cb_.is_null());
   DCHECK(!set_cdm_ready_cb_.is_null());
   set_cdm_ready_cb_.Reset();
@@ skipping 467 matching lines @@
   }
   return false;
 }
 
 void GpuVideoDecoder::DCheckGpuVideoAcceleratorFactoriesTaskRunnerIsCurrent()
     const {
   DCHECK(factories_->GetTaskRunner()->BelongsToCurrentThread());
 }
 
 }  // namespace media