diff options
| author | Jeff Tinker <jtinker@google.com> | 2011-12-08 00:16:22 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-12-08 00:16:22 -0800 |
| commit | d276313bf895a6810404123c0affb4b7a6a07582 (patch) | |
| tree | 488facb65d3b9369ef06ca34c3dabcd3406da238 /media/libstagefright/DataSource.cpp | |
| parent | 59a6c2874abdee0123aba4d251d0c81df393efb8 (diff) | |
| parent | 894f3ca9a9f94225bb64f36847508a91d0b17a6e (diff) | |
| download | frameworks_av-d276313bf895a6810404123c0affb4b7a6a07582.zip frameworks_av-d276313bf895a6810404123c0affb4b7a6a07582.tar.gz frameworks_av-d276313bf895a6810404123c0affb4b7a6a07582.tar.bz2 | |
am a693a4b5: Merge "Fix ANRs due to Widevine DRM plugin sniff taking too long." into ics-mr1
* commit 'a693a4b5553584a01b8b6b3640dc0393d2d88f28':
Fix ANRs due to Widevine DRM plugin sniff taking too long.
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) |