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

Commit 412d4744 authored by Andreas Huber's avatar Andreas Huber Committed by Android (Google) Code Review
Browse files

Merge "FINAL ATTEMPT: HTTP services are now provided from JAVA and made available to media code"

parents 4a254717 1b86fe06

cmds/stagefright/SimplePlayer.cpp

+3 −1
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#include <gui/Surface.h>

#include <media/AudioTrack.h>

#include <media/ICrypto.h>

#include <media/IMediaHTTPService.h>

#include <media/stagefright/foundation/ABuffer.h>

#include <media/stagefright/foundation/ADebug.h>

#include <media/stagefright/foundation/AMessage.h>
@@ -275,7 +276,8 @@ status_t SimplePlayer::onPrepare() { 


    mExtractor = new NuMediaExtractor;



    status_t err = mExtractor->setDataSource(mPath.c_str());

    status_t err = mExtractor->setDataSource(

            NULL /* httpService */, mPath.c_str());



    if (err != OK) {

        mExtractor.clear();

cmds/stagefright/codec.cpp

+2 −1
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#include <binder/IServiceManager.h>

#include <binder/ProcessState.h>

#include <media/ICrypto.h>

#include <media/IMediaHTTPService.h>

#include <media/IMediaPlayerService.h>

#include <media/stagefright/foundation/ABuffer.h>

#include <media/stagefright/foundation/ADebug.h>
@@ -75,7 +76,7 @@ static int decode( 
    static int64_t kTimeout = 500ll;



    sp<NuMediaExtractor> extractor = new NuMediaExtractor;

    if (extractor->setDataSource(path) != OK) {

    if (extractor->setDataSource(NULL /* httpService */, path) != OK) {

        fprintf(stderr, "unable to instantiate extractor.\n");

        return 1;

    }

cmds/stagefright/muxer.cpp

+2 −1
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include <utils/Log.h>



#include <binder/ProcessState.h>

#include <media/IMediaHTTPService.h>

#include <media/stagefright/foundation/ABuffer.h>

#include <media/stagefright/foundation/ADebug.h>

#include <media/stagefright/foundation/ALooper.h>
@@ -58,7 +59,7 @@ static int muxing( 
        int trimEndTimeMs,

        int rotationDegrees) {

    sp<NuMediaExtractor> extractor = new NuMediaExtractor;

    if (extractor->setDataSource(path) != OK) {

    if (extractor->setDataSource(NULL /* httpService */, path) != OK) {

        fprintf(stderr, "unable to instantiate extractor. %s\n", path);

        return 1;

    }

cmds/stagefright/sf2.cpp

+4 −1
Original line number Diff line number Diff line
@@ -22,6 +22,8 @@ 


#include <binder/ProcessState.h>



#include <media/IMediaHTTPService.h>



#include <media/stagefright/foundation/hexdump.h>

#include <media/stagefright/foundation/ABuffer.h>

#include <media/stagefright/foundation/ADebug.h>
@@ -111,7 +113,8 @@ protected: 
#endif



                sp<DataSource> dataSource =

                    DataSource::CreateFromURI(mURI.c_str());

                    DataSource::CreateFromURI(

                            NULL /* httpService */, mURI.c_str());



                sp<MediaExtractor> extractor =

                    MediaExtractor::Create(dataSource);

cmds/stagefright/stagefright.cpp

+3 −1
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 


#include <binder/IServiceManager.h>

#include <binder/ProcessState.h>

#include <media/IMediaHTTPService.h>

#include <media/IMediaPlayerService.h>

#include <media/stagefright/foundation/ALooper.h>

#include "include/NuCachedSource2.h"
@@ -958,7 +959,8 @@ int main(int argc, char **argv) { 


        const char *filename = argv[k];



        sp<DataSource> dataSource = DataSource::CreateFromURI(filename);

        sp<DataSource> dataSource =

            DataSource::CreateFromURI(NULL /* httpService */, filename);



        if (strncasecmp(filename, "sine:", 5) && dataSource == NULL) {

            fprintf(stderr, "Unable to create data source.\n");