diff options
| author | xhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-16 16:55:29 +0000 |
|---|---|---|
| committer | xhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-16 16:55:29 +0000 |
| commit | 4f91fc49aff3fb7b72a94b1293836ed3a8a0361c (patch) | |
| tree | c7e26f54b2a6956aa4ea778747ad718d8d7b5d34 /media/media.gyp | |
| parent | 8ba705136f136c2091d767f3ba04159b42891b1b (diff) | |
| download | chromium_src-4f91fc49aff3fb7b72a94b1293836ed3a8a0361c.zip chromium_src-4f91fc49aff3fb7b72a94b1293836ed3a8a0361c.tar.gz chromium_src-4f91fc49aff3fb7b72a94b1293836ed3a8a0361c.tar.bz2 | |
BrowserMediaPlayerManager manages MediaKeys objects.
Changes in this CL:
- Add cdm_factory.h to support platform specific CDM creation.
- Detach BrowserMediaPlayerManager from MediaDrmBridge.
- Store the security origin of CDMs in the manager so that CDMs don't need to
know it.
- Keep the CDM ID in the manager so that CDMs don't see it.
BUG=338910
TEST=Test page plays and tests still pass.
Review URL: https://codereview.chromium.org/276973005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@271034 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/media.gyp')
| -rw-r--r-- | media/media.gyp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/media/media.gyp b/media/media.gyp index db56ca8..c108335 100644 --- a/media/media.gyp +++ b/media/media.gyp @@ -1615,6 +1615,7 @@ 'sources': [ 'base/android/audio_decoder_job.cc', 'base/android/audio_decoder_job.h', + 'base/android/cdm_factory_android.cc', 'base/android/media_codec_bridge.cc', 'base/android/media_codec_bridge.h', 'base/android/media_decoder_job.cc', @@ -1636,6 +1637,7 @@ 'base/android/webaudio_media_codec_bridge.cc', 'base/android/webaudio_media_codec_bridge.h', 'base/android/webaudio_media_codec_info.h', + 'base/cdm_factory.h', ], 'dependencies': [ '../base/base.gyp:base', |