Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c0668843 authored by Andreas Huber's avatar Andreas Huber
Browse files

Simplify the code in the stagefright commandline utility. 

Change-Id: Ia222b25ef12af34f6434421fd96b67eca800d1ab
parent 66b89a62

cmds/stagefright/Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -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

cmds/stagefright/stagefright.cpp

+3 −14
Original line number Diff line number Diff line
@@ -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");