diff options
| author | Jeff Tinker <jtinker@google.com> | 2011-12-09 14:25:49 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-12-09 14:25:49 -0800 |
| commit | 901e78d96eec495bda0dbe2e2b73009951301817 (patch) | |
| tree | ce0df52bd6db87dbbd294b0b0260ec9af29dd3db /media/libstagefright/DataSource.cpp | |
| parent | eebeceec684a36222b4559e3157b0db04c0a67ed (diff) | |
| parent | d276313bf895a6810404123c0affb4b7a6a07582 (diff) | |
| download | frameworks_av-901e78d96eec495bda0dbe2e2b73009951301817.zip frameworks_av-901e78d96eec495bda0dbe2e2b73009951301817.tar.gz frameworks_av-901e78d96eec495bda0dbe2e2b73009951301817.tar.bz2 | |
am a5038d16: am a693a4b5: Merge "Fix ANRs due to Widevine DRM plugin sniff taking too long." into ics-mr1
* commit 'a5038d169f47b2e2278c0056495dfd4808803f8a':
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 e471f73..d0a7880 100644 --- a/media/libstagefright/DataSource.cpp +++ b/media/libstagefright/DataSource.cpp @@ -32,6 +32,7 @@ #include "include/DRMExtractor.h" #include "include/FLACExtractor.h" #include "include/AACExtractor.h" +#include "include/WVMExtractor.h" #include "matroska/MatroskaExtractor.h" @@ -120,6 +121,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) |