diff options
| author | Jeff Tinker <jtinker@google.com> | 2013-08-22 23:08:10 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-08-22 23:08:10 +0000 |
| commit | 62c1a46eec047eb5fbc4b90432ec1ce65b76fb75 (patch) | |
| tree | dce59b6f085880d667534b7190df11d1c52b6343 /drm | |
| parent | 4b820b0e1fa069714b123fc35784541d0f94d267 (diff) | |
| parent | 9cf69e0fc110f17c28e988ed0f9bf91abfaf710d (diff) | |
| download | frameworks_av-62c1a46eec047eb5fbc4b90432ec1ce65b76fb75.zip frameworks_av-62c1a46eec047eb5fbc4b90432ec1ce65b76fb75.tar.gz frameworks_av-62c1a46eec047eb5fbc4b90432ec1ce65b76fb75.tar.bz2 | |
Merge "Add ability to test supported content types to MediaDrm" into klp-dev
Diffstat (limited to 'drm')
| -rw-r--r-- | drm/mediadrm/plugins/mock/MockDrmCryptoPlugin.cpp | 8 | ||||
| -rw-r--r-- | drm/mediadrm/plugins/mock/MockDrmCryptoPlugin.h | 1 |
2 files changed, 9 insertions, 0 deletions
diff --git a/drm/mediadrm/plugins/mock/MockDrmCryptoPlugin.cpp b/drm/mediadrm/plugins/mock/MockDrmCryptoPlugin.cpp index 06fc29d..4770db0 100644 --- a/drm/mediadrm/plugins/mock/MockDrmCryptoPlugin.cpp +++ b/drm/mediadrm/plugins/mock/MockDrmCryptoPlugin.cpp @@ -48,6 +48,14 @@ namespace android { return (!memcmp(uuid, mock_uuid, sizeof(uuid))); } + bool MockDrmFactory::isContentTypeSupported(const String8 &mimeType) + { + if (mimeType != "" && mimeType != "video/mp4") { + return false; + } + return true; + } + status_t MockDrmFactory::createDrmPlugin(const uint8_t uuid[16], DrmPlugin **plugin) { *plugin = new MockDrmPlugin(); diff --git a/drm/mediadrm/plugins/mock/MockDrmCryptoPlugin.h b/drm/mediadrm/plugins/mock/MockDrmCryptoPlugin.h index ca9eac7..2297f9b 100644 --- a/drm/mediadrm/plugins/mock/MockDrmCryptoPlugin.h +++ b/drm/mediadrm/plugins/mock/MockDrmCryptoPlugin.h @@ -32,6 +32,7 @@ namespace android { virtual ~MockDrmFactory() {} bool isCryptoSchemeSupported(const uint8_t uuid[16]); + bool isContentTypeSupported(const String8 &mimeType); status_t createDrmPlugin(const uint8_t uuid[16], DrmPlugin **plugin); }; |