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

Commit ff3f75c3 authored by Marco Nelissen's avatar Marco Nelissen Committed by Android (Google) Code Review
Browse files

Merge "Allow directly setting a DataSource for NuMediaExtractor" into jb-mr1-dev

parents 6de95261 dbcb4c17

include/media/stagefright/NuMediaExtractor.h

+2 −0
Original line number Diff line number Diff line
@@ -50,6 +50,8 @@ struct NuMediaExtractor : public RefBase { 


    status_t setDataSource(int fd, off64_t offset, off64_t size);



    status_t setDataSource(const sp<DataSource> &datasource);



    size_t countTracks() const;

    status_t getTrackFormat(size_t index, sp<AMessage> *format) const;

media/libstagefright/NuMediaExtractor.cpp

+13 −3
Original line number Diff line number Diff line
@@ -134,18 +134,28 @@ status_t NuMediaExtractor::setDataSource(int fd, off64_t offset, off64_t size) { 


    sp<FileSource> fileSource = new FileSource(dup(fd), offset, size);



    status_t err = fileSource->initCheck();

    return setDataSource(fileSource);

}



status_t NuMediaExtractor::setDataSource(const sp<DataSource> &source) {

    Mutex::Autolock autoLock(mLock);



    if (mImpl != NULL) {

        return -EINVAL;

    }



    status_t err = source->initCheck();

    if (err != OK) {

        return err;

    }



    mImpl = MediaExtractor::Create(fileSource);

    mImpl = MediaExtractor::Create(source);



    if (mImpl == NULL) {

        return ERROR_UNSUPPORTED;

    }



    mDataSource = fileSource;

    mDataSource = source;



    updateDurationAndBitrate();