summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/MediaExtractor.cpp
diff options
context:
space:
mode:
authorGloria Wang <gwang@google.com>2010-11-01 15:53:16 -0700
committerGloria Wang <gwang@google.com>2010-11-05 10:33:58 -0700
commitb371426ce4cf2fa6d8c3d1903b61322feb165d35 (patch)
treece2c36b33cf39e393b68d5feba1cb03d7ef0ed53 /media/libstagefright/MediaExtractor.cpp
parenta935bc4696e4060c362b0f6913cc220331667a35 (diff)
downloadframeworks_av-b371426ce4cf2fa6d8c3d1903b61322feb165d35.zip
frameworks_av-b371426ce4cf2fa6d8c3d1903b61322feb165d35.tar.gz
frameworks_av-b371426ce4cf2fa6d8c3d1903b61322feb165d35.tar.bz2
Add support for WV DRM
Change-Id: I0408c5e0a488f112a84337b21b0cd4613a4da461
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 965c370..d12ac64 100644
--- a/media/libstagefright/MediaExtractor.cpp
+++ b/media/libstagefright/MediaExtractor.cpp
@@ -25,6 +25,7 @@
#include "include/OggExtractor.h"
#include "include/MPEG2TSExtractor.h"
#include "include/DRMExtractor.h"
+#include "include/WVMExtractor.h"
#include "matroska/MatroskaExtractor.h"
@@ -92,6 +93,8 @@ sp<MediaExtractor> MediaExtractor::Create(
return new MatroskaExtractor(source);
} else if (!strcasecmp(mime, MEDIA_MIMETYPE_CONTAINER_MPEG2TS)) {
return new MPEG2TSExtractor(source);
+ } else if (!strcasecmp(mime, MEDIA_MIMETYPE_CONTAINER_WVM)) {
+ return new WVMExtractor(source);
}
return NULL;