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/DataSource.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/DataSource.cpp')
| -rw-r--r-- | media/libstagefright/DataSource.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/media/libstagefright/DataSource.cpp b/media/libstagefright/DataSource.cpp index 70523c1..6a29682 100644 --- a/media/libstagefright/DataSource.cpp +++ b/media/libstagefright/DataSource.cpp @@ -27,6 +27,7 @@ #include "include/DRMExtractor.h" #include "include/FLACExtractor.h" #include "include/AACExtractor.h" +#include "include/WVMExtractor.h" #include "matroska/MatroskaExtractor.h" @@ -115,6 +116,7 @@ void DataSource::RegisterDefaultSniffers() { RegisterSniffer(SniffAAC); RegisterSniffer(SniffAVI); RegisterSniffer(SniffMPEG2PS); + RegisterSniffer(SniffWVM); char value[PROPERTY_VALUE_MAX]; if (property_get("drm.service.enabled", value, NULL) |