diff options
| author | Jeff Tinker <jtinker@google.com> | 2011-12-08 00:13:43 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-12-08 00:13:43 -0800 |
| commit | 894f3ca9a9f94225bb64f36847508a91d0b17a6e (patch) | |
| tree | 488facb65d3b9369ef06ca34c3dabcd3406da238 /media/libstagefright/DataSource.cpp | |
| parent | 2c170cd8e308712674edd2cc7eebea70359d4951 (diff) | |
| parent | 8e49b604c806eabe3eea2bd24813cdfc4b87c64c (diff) | |
| download | frameworks_av-894f3ca9a9f94225bb64f36847508a91d0b17a6e.zip frameworks_av-894f3ca9a9f94225bb64f36847508a91d0b17a6e.tar.gz frameworks_av-894f3ca9a9f94225bb64f36847508a91d0b17a6e.tar.bz2 | |
Merge "Fix ANRs due to Widevine DRM plugin sniff taking too long." into ics-mr1
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 43539bb..6134344 100644 --- a/media/libstagefright/DataSource.cpp +++ b/media/libstagefright/DataSource.cpp @@ -26,6 +26,7 @@ #include "include/DRMExtractor.h" #include "include/FLACExtractor.h" #include "include/AACExtractor.h" +#include "include/WVMExtractor.h" #include "matroska/MatroskaExtractor.h" @@ -113,6 +114,7 @@ void DataSource::RegisterDefaultSniffers() { RegisterSniffer(SniffMP3); RegisterSniffer(SniffAAC); RegisterSniffer(SniffMPEG2PS); + RegisterSniffer(SniffWVM); char value[PROPERTY_VALUE_MAX]; if (property_get("drm.service.enabled", value, NULL) |