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

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

Merge "Fix deadlock" into jb-mr1-dev

parents b0c1e303 fd7ec80f

media/libstagefright/NuMediaExtractor.cpp

+17 −1
Original line number Diff line number Diff line
@@ -126,6 +126,7 @@ status_t NuMediaExtractor::setDataSource( 
}



status_t NuMediaExtractor::setDataSource(int fd, off64_t offset, off64_t size) {



    Mutex::Autolock autoLock(mLock);



    if (mImpl != NULL) {
@@ -134,7 +135,22 @@ status_t NuMediaExtractor::setDataSource(int fd, off64_t offset, off64_t size) { 


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



    return setDataSource(fileSource);

    status_t err = fileSource->initCheck();

    if (err != OK) {

        return err;

    }



    mImpl = MediaExtractor::Create(fileSource);



    if (mImpl == NULL) {

        return ERROR_UNSUPPORTED;

    }



    mDataSource = fileSource;



    updateDurationAndBitrate();



    return OK;

}



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