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 /content/renderer/media/android/webmediaplayer_android.h | |
| 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 'content/renderer/media/android/webmediaplayer_android.h')
| -rw-r--r-- | content/renderer/media/android/webmediaplayer_android.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/content/renderer/media/android/webmediaplayer_android.h b/content/renderer/media/android/webmediaplayer_android.h index 771074d..0da37eb 100644 --- a/content/renderer/media/android/webmediaplayer_android.h +++ b/content/renderer/media/android/webmediaplayer_android.h @@ -22,12 +22,12 @@ #include "content/renderer/media/android/media_info_loader.h" #include "content/renderer/media/android/media_source_delegate.h" #include "content/renderer/media/android/stream_texture_factory.h" -#include "content/renderer/media/crypto/proxy_decryptor.h" #include "gpu/command_buffer/common/mailbox.h" #include "media/base/android/media_player_android.h" #include "media/base/demuxer_stream.h" #include "media/base/media_keys.h" #include "media/base/time_delta_interpolator.h" +#include "media/cdm/proxy_decryptor.h" #include "third_party/WebKit/public/platform/WebGraphicsContext3D.h" #include "third_party/WebKit/public/platform/WebMediaPlayer.h" #include "third_party/WebKit/public/platform/WebSize.h" @@ -473,7 +473,7 @@ class WebMediaPlayerAndroid : public blink::WebMediaPlayer, std::string init_data_type_; // Manages decryption keys and decrypts encrypted frames. - scoped_ptr<ProxyDecryptor> proxy_decryptor_; + scoped_ptr<media::ProxyDecryptor> proxy_decryptor_; // Non-owned pointer to the CDM. Updated via calls to // setContentDecryptionModule(). |