widevine-partner/android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am b920034e: Add Yet More Backwards-Compatibility

Browse Source 
* commit 'b920034e3be73eb010a349115cf25ca2a4ef83a7':
  Add Yet More Backwards-Compatibility
This commit is contained in:
John "Juce" Bruce
2014-04-02 00:12:09 +00:00
committed by Android Git Automerger
parent 1549f7b9bd b920034e3b
commit 46be6edcc3
1 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
libwvdrmengine/mediadrm/src/WVDrmPlugin.cpp
View File

@@ -151,19 +151,11 @@ status_t WVDrmPlugin::getKeyRequest(
string cdmMimeType = mimeType.string();
// Provide backwards-compatibility for versions of apps that pass the wrong
// MIME type.
// TODO(b/13731637) - Remove this.
if (cdmMimeType == "") {
ALOGW("ALERT: Empty MIME type is supported for backwards-compatibility "
"only and may go away in the future. Switch to \"video/mp4\" to "
"become compliant.");
cdmMimeType = "video/mp4";
} else if (cdmMimeType == "video/avc") {
ALOGW("ALERT: MIME type \"video/avc\" is supported for backwards-"
"compatibility only and may go away in the future. Switch to "
"\"video/mp4\" to become compliant.");
cdmMimeType = "video/mp4";
// Provide backwards-compatibility for apps that pass non-EME-compatible MIME
// types.
if (cdmMimeType != wvcdm::ISO_BMFF_MIME_TYPE &&
cdmMimeType != wvcdm::WEBM_MIME_TYPE) {
cdmMimeType = wvcdm::ISO_BMFF_MIME_TYPE;
}
CdmInitData processedInitData;