summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/MediaExtractor.cpp
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2011-09-08 14:12:44 -0700
committerAndreas Huber <andih@google.com>2011-09-30 15:26:31 -0700
commit2944eca607304a095ea43ba2b8f0b9de61249f9f (patch)
treef3dbe4e61cc94ec086b098c7387034f226a2ac14 /media/libstagefright/MediaExtractor.cpp
parentd3523f89a867afa111bb332887bf006ec3ae93e6 (diff)
downloadframeworks_av-2944eca607304a095ea43ba2b8f0b9de61249f9f.zip
frameworks_av-2944eca607304a095ea43ba2b8f0b9de61249f9f.tar.gz
frameworks_av-2944eca607304a095ea43ba2b8f0b9de61249f9f.tar.bz2
Support for an MPEG2 Program Stream extractor.
Change-Id: I606d87c278f72b22a5b6d7ee57bce6b02e280d41
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 a8023df..2221268 100644
--- a/media/libstagefright/MediaExtractor.cpp
+++ b/media/libstagefright/MediaExtractor.cpp
@@ -24,6 +24,7 @@
#include "include/MPEG4Extractor.h"
#include "include/WAVExtractor.h"
#include "include/OggExtractor.h"
+#include "include/MPEG2PSExtractor.h"
#include "include/MPEG2TSExtractor.h"
#include "include/DRMExtractor.h"
#include "include/WVMExtractor.h"
@@ -115,6 +116,8 @@ sp<MediaExtractor> MediaExtractor::Create(
ret = new WVMExtractor(source);
} else if (!strcasecmp(mime, MEDIA_MIMETYPE_AUDIO_AAC_ADTS)) {
ret = new AACExtractor(source);
+ } else if (!strcasecmp(mime, MEDIA_MIMETYPE_CONTAINER_MPEG2PS)) {
+ ret = new MPEG2PSExtractor(source);
}
if (ret != NULL) {