diff options
| author | Jeff Tinker <jtinker@google.com> | 2013-08-21 11:59:23 -0700 |
|---|---|---|
| committer | Jeff Tinker <jtinker@google.com> | 2013-08-22 09:27:35 -0700 |
| commit | 9cf69e0fc110f17c28e988ed0f9bf91abfaf710d (patch) | |
| tree | c5cb3fb67b26c852f8c7bea7e4eeb87952830842 /drm/mediadrm | |
| parent | 75c16dde986e16ac5fd4d34b06b0cc6a90679866 (diff) | |
| download | frameworks_av-9cf69e0fc110f17c28e988ed0f9bf91abfaf710d.zip frameworks_av-9cf69e0fc110f17c28e988ed0f9bf91abfaf710d.tar.gz frameworks_av-9cf69e0fc110f17c28e988ed0f9bf91abfaf710d.tar.bz2 | |
Add ability to test supported content types to MediaDrm
bug: 10244066
Change-Id: I317f05b146db962c271893f6208890a5a6c396f1
Diffstat (limited to 'drm/mediadrm')
| -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); }; |