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

Commit dd42da29 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "check error on setMediaCas" into rvc-dev am: c2dca709 am: d351053a 

Change-Id: I8cda77f582255c3fa22846793ded29836f60493a
parents 56850fb5 d351053a

media/libstagefright/NuMediaExtractor.cpp

+23 −6
Original line number Diff line number Diff line
@@ -94,11 +94,16 @@ status_t NuMediaExtractor::setDataSource( 
        return ERROR_UNSUPPORTED;

    }



    status_t err = OK;

    if (!mCasToken.empty()) {

        mImpl->setMediaCas(mCasToken);

        err = mImpl->setMediaCas(mCasToken);

        if (err != OK) {

            ALOGE("%s: failed to setMediaCas (%d)", __FUNCTION__, err);

            return err;

        }

    }



    status_t err = updateDurationAndBitrate();

    err = updateDurationAndBitrate();

    if (err == OK) {

        mDataSource = dataSource;

    }
@@ -131,7 +136,11 @@ status_t NuMediaExtractor::setDataSource(int fd, off64_t offset, off64_t size) { 
    }



    if (!mCasToken.empty()) {

        mImpl->setMediaCas(mCasToken);

        err = mImpl->setMediaCas(mCasToken);

        if (err != OK) {

            ALOGE("%s: failed to setMediaCas (%d)", __FUNCTION__, err);

            return err;

        }

    }



    err = updateDurationAndBitrate();
@@ -161,7 +170,11 @@ status_t NuMediaExtractor::setDataSource(const sp<DataSource> &source) { 
    }



    if (!mCasToken.empty()) {

        mImpl->setMediaCas(mCasToken);

        err = mImpl->setMediaCas(mCasToken);

        if (err != OK) {

            ALOGE("%s: failed to setMediaCas (%d)", __FUNCTION__, err);

            return err;

        }

    }



    err = updateDurationAndBitrate();
@@ -195,8 +208,12 @@ status_t NuMediaExtractor::setMediaCas(const HInterfaceToken &casToken) { 
    mCasToken = casToken;



    if (mImpl != NULL) {

        mImpl->setMediaCas(casToken);

        status_t err = updateDurationAndBitrate();

        status_t err = mImpl->setMediaCas(casToken);

        if (err != OK) {

            ALOGE("%s: failed to setMediaCas (%d)", __FUNCTION__, err);

            return err;

        }

        err = updateDurationAndBitrate();

        if (err != OK) {

            return err;

        }