diff options
| author | Gloria Wang <gwang@google.com> | 2010-11-01 15:53:16 -0700 |
|---|---|---|
| committer | Gloria Wang <gwang@google.com> | 2010-11-05 10:33:58 -0700 |
| commit | b371426ce4cf2fa6d8c3d1903b61322feb165d35 (patch) | |
| tree | ce2c36b33cf39e393b68d5feba1cb03d7ef0ed53 /media/libstagefright/DRMExtractor.cpp | |
| parent | a935bc4696e4060c362b0f6913cc220331667a35 (diff) | |
| download | frameworks_av-b371426ce4cf2fa6d8c3d1903b61322feb165d35.zip frameworks_av-b371426ce4cf2fa6d8c3d1903b61322feb165d35.tar.gz frameworks_av-b371426ce4cf2fa6d8c3d1903b61322feb165d35.tar.bz2 | |
Add support for WV DRM
Change-Id: I0408c5e0a488f112a84337b21b0cd4613a4da461
Diffstat (limited to 'media/libstagefright/DRMExtractor.cpp')
| -rw-r--r-- | media/libstagefright/DRMExtractor.cpp | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/media/libstagefright/DRMExtractor.cpp b/media/libstagefright/DRMExtractor.cpp index aa9ad23..3c98932 100644 --- a/media/libstagefright/DRMExtractor.cpp +++ b/media/libstagefright/DRMExtractor.cpp @@ -280,18 +280,23 @@ bool SniffDRM( if (gDrmManagerClient == NULL) { gDrmManagerClient = new DrmManagerClient(); } + + if (gDrmManagerClient == NULL) { + return false; + } } DecryptHandle *decryptHandle = source->DrmInitialization(gDrmManagerClient); if (decryptHandle != NULL) { if (decryptHandle->decryptApiType == DecryptApiType::CONTAINER_BASED) { - *mimeType = String8("drm+container_based+"); + *mimeType = String8("drm+container_based+") + decryptHandle->mimeType; } else if (decryptHandle->decryptApiType == DecryptApiType::ELEMENTARY_STREAM_BASED) { - *mimeType = String8("drm+es_based+"); + *mimeType = String8("drm+es_based+") + decryptHandle->mimeType; + } else if (decryptHandle->decryptApiType == DecryptApiType::WV_BASED) { + *mimeType = MEDIA_MIMETYPE_CONTAINER_WVM; + LOGW("SniffWVM: found match\n"); } - - *mimeType += decryptHandle->mimeType; *confidence = 10.0f; return true; |