summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/AwesomePlayer.cpp
diff options
context:
space:
mode:
authorJeff Tinker <jtinker@google.com>2011-12-07 20:23:20 -0800
committerJeff Tinker <jtinker@google.com>2011-12-07 20:23:20 -0800
commit8e49b604c806eabe3eea2bd24813cdfc4b87c64c (patch)
tree8bf163231b5a4d481b9f17375ab0967727474d11 /media/libstagefright/AwesomePlayer.cpp
parent4fe1c6c3988f79fd67c14a1f91e4b1df8a7e806f (diff)
downloadframeworks_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/AwesomePlayer.cpp')
-rw-r--r--media/libstagefright/AwesomePlayer.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/media/libstagefright/AwesomePlayer.cpp b/media/libstagefright/AwesomePlayer.cpp
index f6d054d..d610ce0 100644
--- a/media/libstagefright/AwesomePlayer.cpp
+++ b/media/libstagefright/AwesomePlayer.cpp
@@ -2055,7 +2055,7 @@ status_t AwesomePlayer::finishSetDataSource_l() {
String8 mimeType;
float confidence;
sp<AMessage> dummy;
- bool success = SniffDRM(dataSource, &mimeType, &confidence, &dummy);
+ bool success = SniffWVM(dataSource, &mimeType, &confidence, &dummy);
if (!success
|| strcasecmp(
@@ -2063,6 +2063,8 @@ status_t AwesomePlayer::finishSetDataSource_l() {
return ERROR_UNSUPPORTED;
}
+ dataSource->DrmInitialization();
+
mWVMExtractor = new WVMExtractor(dataSource);
mWVMExtractor->setAdaptiveStreamingMode(true);
extractor = mWVMExtractor;