Merge 217276 "Add media::VideoEncodeAccelerator with WebRTC inte..."

> Add media::VideoEncodeAccelerator with WebRTC integration
> 
> * Adds media::VideoEncodeAccelerator class.
> * Add GpuVideoEncodeAccelerator{,Host} classes and appropriate IPC.
> * Integrates into WebRTC stack with RTCVideoEncoderFactory/RTCVideoEncoder.
> * Rename media::GpuVideoDecodeFactories -> media::GpuVideoAcceleratorFactories
>   and generalize for use by the encode accelerator implementations as well.
> 
> BUG=260210
> BUG=170345
> TEST=local build, run on CrOS snow; local build, unittests on desktop Linux
> 
> Review URL: https://chromiumcodereview.appspot.com/20632002

TBR=sheu@chromium.org

Review URL: https://codereview.chromium.org/22875014

git-svn-id: svn://svn.chromium.org/chrome/branches/1599/src@217691 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 5 insertions, 4 deletions

diff --git a/content/renderer/media/webmediaplayer_params.h b/content/renderer/media/webmediaplayer_params.h
index 4347a4a..bf39864 100644
--- a/content/renderer/media/webmediaplayer_params.h
+++ b/content/renderer/media/webmediaplayer_params.h
@@ -14,7 +14,7 @@ class MessageLoopProxy;
 
 namespace media {
 class AudioRendererSink;
-class GpuVideoDecoderFactories;
+class GpuVideoAcceleratorFactories;
 class MediaLog;
 }
 
@@ -30,7 +30,7 @@ class WebMediaPlayerParams {
       const scoped_refptr<base::MessageLoopProxy>& message_loop_proxy,
       const base::Callback<void(const base::Closure&)>& defer_load_cb,
       const scoped_refptr<media::AudioRendererSink>& audio_renderer_sink,
-      const scoped_refptr<media::GpuVideoDecoderFactories>& gpu_factories,
+      const scoped_refptr<media::GpuVideoAcceleratorFactories>& gpu_factories,
       const scoped_refptr<media::MediaLog>& media_log);
   ~WebMediaPlayerParams();
 
@@ -46,7 +46,8 @@ class WebMediaPlayerParams {
     return audio_renderer_sink_;
   }
 
-  const scoped_refptr<media::GpuVideoDecoderFactories>& gpu_factories() const {
+  const scoped_refptr<media::GpuVideoAcceleratorFactories>& gpu_factories()
+      const {
     return gpu_factories_;
   }
 
@@ -58,7 +59,7 @@ class WebMediaPlayerParams {
   scoped_refptr<base::MessageLoopProxy> message_loop_proxy_;
   base::Callback<void(const base::Closure&)> defer_load_cb_;
   scoped_refptr<media::AudioRendererSink> audio_renderer_sink_;
-  scoped_refptr<media::GpuVideoDecoderFactories> gpu_factories_;
+  scoped_refptr<media::GpuVideoAcceleratorFactories> gpu_factories_;
   scoped_refptr<media::MediaLog> media_log_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(WebMediaPlayerParams);