Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "DO NOT MERGE: Remove the AVI extractor." into ics-mr1

Browse Source
This commit is contained in:
Andreas Huber
2011-12-06 12:44:53 -08:00
committed by Android (Google) Code Review
parent 40cb30c2df 92f604c4d4
commit 05d6306911
3 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
media/libstagefright/Android.mk
View File

@@ -9,7 +9,6 @@ LOCAL_SRC_FILES:= \
AACWriter.cpp \ AACWriter.cpp \
AMRExtractor.cpp \ AMRExtractor.cpp \
AMRWriter.cpp \ AMRWriter.cpp \
AVIExtractor.cpp \
AudioPlayer.cpp \ AudioPlayer.cpp \
AudioSource.cpp \ AudioSource.cpp \
AwesomePlayer.cpp \ AwesomePlayer.cpp \

2
media/libstagefright/DataSource.cpp
View File

@@ -15,7 +15,6 @@
*/ */
#include "include/AMRExtractor.h" #include "include/AMRExtractor.h"
#include "include/AVIExtractor.h"
#include "include/MP3Extractor.h" #include "include/MP3Extractor.h"
#include "include/MPEG4Extractor.h" #include "include/MPEG4Extractor.h"
#include "include/WAVExtractor.h" #include "include/WAVExtractor.h"
@@ -113,7 +112,6 @@ void DataSource::RegisterDefaultSniffers() {
RegisterSniffer(SniffMPEG2TS); RegisterSniffer(SniffMPEG2TS);
RegisterSniffer(SniffMP3); RegisterSniffer(SniffMP3);
RegisterSniffer(SniffAAC); RegisterSniffer(SniffAAC);
RegisterSniffer(SniffAVI);
RegisterSniffer(SniffMPEG2PS); RegisterSniffer(SniffMPEG2PS);
char value[PROPERTY_VALUE_MAX]; char value[PROPERTY_VALUE_MAX];

3
media/libstagefright/MediaExtractor.cpp
View File

@@ -19,7 +19,6 @@
#include <utils/Log.h> #include <utils/Log.h>
#include "include/AMRExtractor.h" #include "include/AMRExtractor.h"
#include "include/AVIExtractor.h"
#include "include/MP3Extractor.h" #include "include/MP3Extractor.h"
#include "include/MPEG4Extractor.h" #include "include/MPEG4Extractor.h"
#include "include/WAVExtractor.h" #include "include/WAVExtractor.h"
@@ -110,8 +109,6 @@ sp<MediaExtractor> MediaExtractor::Create(
ret = new MatroskaExtractor(source); ret = new MatroskaExtractor(source);
} else if (!strcasecmp(mime, MEDIA_MIMETYPE_CONTAINER_MPEG2TS)) { } else if (!strcasecmp(mime, MEDIA_MIMETYPE_CONTAINER_MPEG2TS)) {
ret = new MPEG2TSExtractor(source); ret = new MPEG2TSExtractor(source);
} else if (!strcasecmp(mime, MEDIA_MIMETYPE_CONTAINER_AVI)) {
ret = new AVIExtractor(source);
} else if (!strcasecmp(mime, MEDIA_MIMETYPE_CONTAINER_WVM)) { } else if (!strcasecmp(mime, MEDIA_MIMETYPE_CONTAINER_WVM)) {
ret = new WVMExtractor(source); ret = new WVMExtractor(source);
} else if (!strcasecmp(mime, MEDIA_MIMETYPE_AUDIO_AAC_ADTS)) { } else if (!strcasecmp(mime, MEDIA_MIMETYPE_AUDIO_AAC_ADTS)) {