media: Optimize HW Video to 2D Canvas copy.

media/blink/webmediaplayer_params.h

 // Copyright 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.
 
 #ifndef MEDIA_BLINK_WEBMEDIAPLAYER_PARAMS_H_
 #define MEDIA_BLINK_WEBMEDIAPLAYER_PARAMS_H_
 
 #include "base/callback.h"
 #include "base/memory/ref_counted.h"
 #include "media/base/media_export.h"
 #include "media/blink/encrypted_media_player_support.h"
+#include "media/filters/context_3d_provider.h"
 
 namespace base {
 class SingleThreadTaskRunner;
 }
 
 namespace blink {
 class WebMediaPlayerClient;
 }
 
 namespace media {
 class AudioHardwareConfig;
 class AudioRendererSink;
 class GpuVideoAcceleratorFactories;
 class MediaLog;
 
 // Holds parameters for constructing WebMediaPlayerImpl without having
 // to plumb arguments through various abstraction layers.
 class MEDIA_EXPORT WebMediaPlayerParams {
  public:
   // Callback used to create EncryptedMediaPlayerSupport instances. This
   // callback must always return a valid EncryptedMediaPlayerSupport object.
   typedef base::Callback<scoped_ptr<EncryptedMediaPlayerSupport>(
       blink::WebMediaPlayerClient*)> EncryptedMediaPlayerSupportCreateCB;
   typedef base::Callback<void(const base::Closure&)> DeferLoadCB;
 
   // |defer_load_cb|, |audio_renderer_sink|, and |compositor_task_runner| may be

[scherkus (not reviewing), 2014/10/30 20:40:11]

update docs that state that the context provider CB may be null

[dshwang, 2014/10/31 09:29:16]

Thank you for checking. Done.

   // null.
   WebMediaPlayerParams(
       const DeferLoadCB& defer_load_cb,
       const scoped_refptr<AudioRendererSink>& audio_renderer_sink,
       const AudioHardwareConfig& audio_hardware_config,
       const scoped_refptr<MediaLog>& media_log,
       const scoped_refptr<GpuVideoAcceleratorFactories>& gpu_factories,
       const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner,
       const scoped_refptr<base::SingleThreadTaskRunner>& compositor_task_runner,
       const EncryptedMediaPlayerSupportCreateCB&
           encrypted_media_player_support_cb,
+      const Context3DProviderCB& shared_main_thread_context_3d_provider_cb,

[scherkus (not reviewing), 2014/10/30 20:40:12]

naming suggestion: just use "context_3d_provider_cb"

the "shared_main_thread" part is an implementation detail of content/renderer/
code, which media/blink/ code knows nothing about

[dshwang, 2014/10/31 09:29:16]

That's right! Done.

       blink::WebContentDecryptionModule* initial_cdm);
 
   ~WebMediaPlayerParams();
 
-  base::Callback<void(const base::Closure&)> defer_load_cb() const {
-    return defer_load_cb_;
-  }
+  DeferLoadCB defer_load_cb() const { return defer_load_cb_; }
 
   const scoped_refptr<AudioRendererSink>& audio_renderer_sink() const {
     return audio_renderer_sink_;
   }
 
   const AudioHardwareConfig& audio_hardware_config() const {
     return audio_hardware_config_;
   }
 
   const scoped_refptr<MediaLog>& media_log() const {
@@ skipping 11 matching lines @@
   }
 
   const scoped_refptr<base::SingleThreadTaskRunner>&
   compositor_task_runner() const {
     return compositor_task_runner_;
   }
 
   scoped_ptr<EncryptedMediaPlayerSupport>
   CreateEncryptedMediaPlayerSupport(blink::WebMediaPlayerClient* client) const;
 
+  Context3DProviderCB shared_main_thread_context_3d_provider_cb() const {
+    return shared_main_thread_context_3d_provider_cb_;
+  }
+
  private:
-  base::Callback<void(const base::Closure&)> defer_load_cb_;
+  DeferLoadCB defer_load_cb_;
   scoped_refptr<AudioRendererSink> audio_renderer_sink_;
   const AudioHardwareConfig& audio_hardware_config_;
   scoped_refptr<MediaLog> media_log_;
   scoped_refptr<GpuVideoAcceleratorFactories> gpu_factories_;
   scoped_refptr<base::SingleThreadTaskRunner> media_task_runner_;
   scoped_refptr<base::SingleThreadTaskRunner> compositor_task_runner_;
   EncryptedMediaPlayerSupportCreateCB encrypted_media_player_support_cb_;
+  Context3DProviderCB shared_main_thread_context_3d_provider_cb_;
   blink::WebContentDecryptionModule* initial_cdm_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(WebMediaPlayerParams);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BLINK_WEBMEDIAPLAYER_PARAMS_H_