diff options
author | Jeff Tinker <jtinker@google.com> | 2011-12-07 20:23:20 -0800 |
---|---|---|
committer | Jeff Tinker <jtinker@google.com> | 2011-12-07 20:23:20 -0800 |
commit | 8e49b604c806eabe3eea2bd24813cdfc4b87c64c (patch) | |
tree | 8bf163231b5a4d481b9f17375ab0967727474d11 /media/libstagefright/DRMExtractor.cpp | |
parent | 4fe1c6c3988f79fd67c14a1f91e4b1df8a7e806f (diff) | |
download | frameworks_av-8e49b604c806eabe3eea2bd24813cdfc4b87c64c.zip frameworks_av-8e49b604c806eabe3eea2bd24813cdfc4b87c64c.tar.gz frameworks_av-8e49b604c806eabe3eea2bd24813cdfc4b87c64c.tar.bz2 |
Fix ANRs due to Widevine DRM plugin sniff taking too long.
Add a Widevine-specific format sniffer to avoid having to
refetch data from the remote server.
Change-Id: I5fdb21fe7a0d6e74f2a6f06e6fbf8070b068ac60
related-to-bug: 5725548
Diffstat (limited to 'media/libstagefright/DRMExtractor.cpp')
-rw-r--r-- | media/libstagefright/DRMExtractor.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/media/libstagefright/DRMExtractor.cpp b/media/libstagefright/DRMExtractor.cpp index 1f3d581..afc4a80 100644 --- a/media/libstagefright/DRMExtractor.cpp +++ b/media/libstagefright/DRMExtractor.cpp @@ -282,13 +282,13 @@ bool SniffDRM( if (decryptHandle != NULL) { if (decryptHandle->decryptApiType == DecryptApiType::CONTAINER_BASED) { *mimeType = String8("drm+container_based+") + decryptHandle->mimeType; + *confidence = 10.0f; } else if (decryptHandle->decryptApiType == DecryptApiType::ELEMENTARY_STREAM_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"); + *confidence = 10.0f; + } else { + return false; } - *confidence = 10.0f; return true; } |