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

Merge "Simplify the code in the stagefright commandline utility." into kraken

Browse Source
This commit is contained in:
Andreas Huber
2010-06-10 15:15:50 -07:00
committed by Android (Google) Code Review
parent fbdb5f1bb6 c0668843d3
commit a6ef19a8f4
2 changed files with 4 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
cmds/stagefright/Android.mk
View File

@@ -14,6 +14,7 @@ LOCAL_SHARED_LIBRARIES := \
LOCAL_C_INCLUDES:= \
$(JNI_H_INCLUDE) \
frameworks/base/media/libstagefright \
frameworks/base/media/libstagefright/include \
$(TOP)/external/opencore/extern_libs_v2/khronos/openmax/include
LOCAL_CFLAGS += -Wno-multichar

17
cmds/stagefright/stagefright.cpp
View File

@@ -26,12 +26,11 @@
#include <binder/ProcessState.h>
#include <media/IMediaPlayerService.h>
#include <media/stagefright/AudioPlayer.h>
#include <media/stagefright/CachingDataSource.h>
#include <media/stagefright/FileSource.h>
#include <media/stagefright/HTTPDataSource.h>
#include <media/stagefright/DataSource.h>
#include <media/stagefright/JPEGSource.h>
#include <media/stagefright/MediaDebug.h>
#include <media/stagefright/MediaDefs.h>
#include <media/stagefright/MediaErrors.h>
#include <media/stagefright/MediaExtractor.h>
#include <media/stagefright/MediaSource.h>
#include <media/stagefright/MetaData.h>
@@ -482,17 +481,7 @@ int main(int argc, char **argv) {
for (int k = 0; k < argc; ++k) {
const char *filename = argv[k];
sp<DataSource> dataSource;
if (!strncasecmp("http://", filename, 7)) {
dataSource = new HTTPDataSource(filename);
if (((HTTPDataSource *)dataSource.get())->connect() != OK) {
fprintf(stderr, "failed to connect to HTTP server.\n");
return -1;
}
dataSource = new CachingDataSource(dataSource, 32 * 1024, 20);
} else {
dataSource = new FileSource(filename);
}
sp<DataSource> dataSource = DataSource::CreateFromURI(filename);
if (dataSource == NULL) {
fprintf(stderr, "Unable to create data source.\n");