summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/MediaExtractor.cpp
diff options
context:
space:
mode:
authorJames Dong <jdong@google.com>2011-12-08 19:31:59 -0800
committerJames Dong <jdong@google.com>2011-12-08 21:01:31 -0800
commitaadbd80b307c817698ce5110ff8e002804d1b230 (patch)
treebe5cab6d739c403a2a1a5a0b5a38c5bf2f330fd3 /media/libstagefright/MediaExtractor.cpp
parentbe5f49fb6e17e0b9588d3b94022b7e3eb6d47317 (diff)
downloadframeworks_base-aadbd80b307c817698ce5110ff8e002804d1b230.zip
frameworks_base-aadbd80b307c817698ce5110ff8e002804d1b230.tar.gz
frameworks_base-aadbd80b307c817698ce5110ff8e002804d1b230.tar.bz2
Fixed the false drm recognition.
Change-Id: If0198e52ff7bbd7422f219f55a37aae97f7d74f1 related-to-bug: 5732033
Diffstat (limited to 'media/libstagefright/MediaExtractor.cpp')
-rw-r--r--media/libstagefright/MediaExtractor.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/media/libstagefright/MediaExtractor.cpp b/media/libstagefright/MediaExtractor.cpp
index 374ecf7..9eee6aa 100644
--- a/media/libstagefright/MediaExtractor.cpp
+++ b/media/libstagefright/MediaExtractor.cpp
@@ -111,6 +111,9 @@ sp<MediaExtractor> MediaExtractor::Create(
ret = new MPEG2TSExtractor(source);
} else if (!strcasecmp(mime, MEDIA_MIMETYPE_CONTAINER_WVM)) {
ret = new WVMExtractor(source);
+ if (ret != NULL) {
+ isDrm = true;
+ }
} else if (!strcasecmp(mime, MEDIA_MIMETYPE_AUDIO_AAC_ADTS)) {
ret = new AACExtractor(source);
} else if (!strcasecmp(mime, MEDIA_MIMETYPE_CONTAINER_MPEG2PS)) {