diff options
| author | gunsch <gunsch@chromium.org> | 2015-04-29 20:58:45 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-04-30 03:59:13 +0000 |
| commit | 2288c539cc227ec262be28c4b684ff38527f7768 (patch) | |
| tree | 12cf88619fe8fbc979a2f0aa1f0722ff2741a500 /media/media.gyp | |
| parent | d92456f94d7d2563f3b1bd46e6b77d9c9eadd633 (diff) | |
| download | chromium_src-2288c539cc227ec262be28c4b684ff38527f7768.zip chromium_src-2288c539cc227ec262be28c4b684ff38527f7768.tar.gz chromium_src-2288c539cc227ec262be28c4b684ff38527f7768.tar.bz2 | |
Adds MediaClientAndroid to support embedder/MediaDrmBridge interaction.
This CL does a few things:
* Adds a MediaDrmBridgeDelegate interface to support per DRM-scheme logic for Android in MediaDrmBridge.
* Adds a MediaClientAndroid interface for embedders to provide MediaDrmBridgeDelegate implementations and key-system-UUID mappings
* Removes the Java-based key-system-UUID mapping path
* Embedders no longer call directly into MediaDrmBridge
R=qinmin@chromium.org,xhwang@chromium.org,boliu@chromium.org,jochen@chromium.org
BUG=462443
Review URL: https://codereview.chromium.org/962793005
Cr-Commit-Position: refs/heads/master@{#327650}
Diffstat (limited to 'media/media.gyp')
| -rw-r--r-- | media/media.gyp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/media/media.gyp b/media/media.gyp index e530e90..c228c83 100644 --- a/media/media.gyp +++ b/media/media.gyp @@ -1739,6 +1739,8 @@ 'base/android/demuxer_android.h', 'base/android/demuxer_stream_player_params.cc', 'base/android/demuxer_stream_player_params.h', + 'base/android/media_client_android.cc', + 'base/android/media_client_android.h', 'base/android/media_codec_bridge.cc', 'base/android/media_codec_bridge.h', 'base/android/media_common_android.h', @@ -1746,6 +1748,8 @@ 'base/android/media_decoder_job.h', 'base/android/media_drm_bridge.cc', 'base/android/media_drm_bridge.h', + 'base/android/media_drm_bridge_delegate.cc', + 'base/android/media_drm_bridge_delegate.h', 'base/android/media_jni_registrar.cc', 'base/android/media_jni_registrar.h', 'base/android/media_player_android.cc', |