diff options
| author | xhwang <xhwang@chromium.org> | 2014-11-18 16:16:34 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-11-19 00:17:00 +0000 |
| commit | 16ff136e88d757f4ca92291e8e221682cb1e8c63 (patch) | |
| tree | 3ad793cf6fcdb61dd32139849798ba95557ef4ed /mojo | |
| parent | c69f9dc3d6256814736abcf5b3ef0df37c1406e2 (diff) | |
| download | chromium_src-16ff136e88d757f4ca92291e8e221682cb1e8c63.zip chromium_src-16ff136e88d757f4ca92291e8e221682cb1e8c63.tar.gz chromium_src-16ff136e88d757f4ca92291e8e221682cb1e8c63.tar.bz2 | |
Move EncryptedMediaPlayerSupport and ProxyDecryptor from content to media.
Summary of changes:
- Drop EncryptedMediaPlayerSupport interface.
- Move EncryptedMediaPlayerSupportImpl to media and rename it to
EncryptedMediaPlayerSupport.
- Drop NullEncryptedMediaPlayerSupport.
- Drop EncryptedMediaPlayerSupportCreateCB from WebMediaPlayerParams, and let WebMediaPlayerImpl always own a EncryptedMediaPlayerSupport.
- EncryptedMediaPlayerSupport takes an external CdmFactory.
- Pass a CdmFactory to WebMediaPlayerImpl's constructor.
- Move ProxyDecryptor to media.
BUG=422730
Review URL: https://codereview.chromium.org/737483002
Cr-Commit-Position: refs/heads/master@{#304712}
Diffstat (limited to 'mojo')
| -rw-r--r-- | mojo/services/html_viewer/webmediaplayer_factory.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/mojo/services/html_viewer/webmediaplayer_factory.cc b/mojo/services/html_viewer/webmediaplayer_factory.cc index fbb8e9d..6c4653a 100644 --- a/mojo/services/html_viewer/webmediaplayer_factory.cc +++ b/mojo/services/html_viewer/webmediaplayer_factory.cc @@ -15,7 +15,6 @@ #include "media/base/media.h" #include "media/base/media_log.h" #include "media/base/renderer.h" -#include "media/blink/null_encrypted_media_player_support.h" #include "media/blink/webmediaplayer_impl.h" #include "media/blink/webmediaplayer_params.h" #include "media/filters/gpu_video_accelerator_factories.h" @@ -72,12 +71,12 @@ blink::WebMediaPlayer* WebMediaPlayerFactory::CreateMediaPlayer( scoped_refptr<media::GpuVideoAcceleratorFactories>(), GetMediaThreadTaskRunner(), compositor_task_runner_, - base::Bind(&media::NullEncryptedMediaPlayerSupport::Create), NULL); base::WeakPtr<media::WebMediaPlayerDelegate> delegate; - return new media::WebMediaPlayerImpl( - frame, client, delegate, renderer.Pass(), params); + // TODO(xhwang): Provide a media based CdmFactory implementation. + return new media::WebMediaPlayerImpl(frame, client, delegate, renderer.Pass(), + nullptr, params); #endif } |