diff options
| author | Marco Nelissen <marcone@google.com> | 2013-02-15 08:26:24 -0800 |
|---|---|---|
| committer | Marco Nelissen <marcone@google.com> | 2013-02-15 11:46:09 -0800 |
| commit | ab89ac209fd1c3b0a2227168a48d7f3ae9bc43f3 (patch) | |
| tree | dda17a3e4149815397c7bef198e64bc81dee3552 /media/libstagefright/MediaExtractor.cpp | |
| parent | 05f625c46b992ab66b8d1527a366fe2746b4e3c7 (diff) | |
| download | frameworks_av-ab89ac209fd1c3b0a2227168a48d7f3ae9bc43f3.zip frameworks_av-ab89ac209fd1c3b0a2227168a48d7f3ae9bc43f3.tar.gz frameworks_av-ab89ac209fd1c3b0a2227168a48d7f3ae9bc43f3.tar.bz2 | |
Remove FragmentedMP4Extractor
MPEG4Extractor now supports fragmented mp4 files.
Change-Id: I5659a51f4e5e4407a12535e69238fe3abffda7dc
Diffstat (limited to 'media/libstagefright/MediaExtractor.cpp')
| -rw-r--r-- | media/libstagefright/MediaExtractor.cpp | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/media/libstagefright/MediaExtractor.cpp b/media/libstagefright/MediaExtractor.cpp index b18c916..9ab6611 100644 --- a/media/libstagefright/MediaExtractor.cpp +++ b/media/libstagefright/MediaExtractor.cpp @@ -21,7 +21,6 @@ #include "include/AMRExtractor.h" #include "include/MP3Extractor.h" #include "include/MPEG4Extractor.h" -#include "include/FragmentedMP4Extractor.h" #include "include/WAVExtractor.h" #include "include/OggExtractor.h" #include "include/MPEG2PSExtractor.h" @@ -94,12 +93,7 @@ sp<MediaExtractor> MediaExtractor::Create( MediaExtractor *ret = NULL; if (!strcasecmp(mime, MEDIA_MIMETYPE_CONTAINER_MPEG4) || !strcasecmp(mime, "audio/mp4")) { - int fragmented = 0; - if (meta != NULL && meta->findInt32("fragmented", &fragmented) && fragmented) { - ret = new FragmentedMP4Extractor(source); - } else { - ret = new MPEG4Extractor(source); - } + ret = new MPEG4Extractor(source); } else if (!strcasecmp(mime, MEDIA_MIMETYPE_AUDIO_MPEG)) { ret = new MP3Extractor(source, meta); } else if (!strcasecmp(mime, MEDIA_MIMETYPE_AUDIO_AMR_NB) |