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

Commit 3611a0ef authored by James Dong's avatar James Dong Committed by Android Git Automerger
Browse files

am 693a430c: am 903fc221: Ignore errors from correction parameter query and... 

am 693a430c: am 903fc221: Ignore errors from correction parameter query and config for M4v and H263 encoders

Merge commit '693a430c'

* commit '693a430c':
  Ignore errors from correction parameter query and config for M4v and H263 encoders
parents a03f8fb7 693a430c

media/libstagefright/OMXCodec.cpp

+9 −2
Original line number Diff line number Diff line
@@ -999,7 +999,10 @@ status_t OMXCodec::setupErrorCorrectionParameters() { 
    status_t err = mOMX->getParameter(

            mNode, OMX_IndexParamVideoErrorCorrection,

            &errorCorrectionType, sizeof(errorCorrectionType));

    CHECK_EQ(err, OK);

    if (err != OK) {

        LOGW("Error correction param query is not supported");

        return OK;  // Optional feature. Ignore this failure

    }



    errorCorrectionType.bEnableHEC = OMX_FALSE;

    errorCorrectionType.bEnableResync = OMX_TRUE;
@@ -1010,7 +1013,11 @@ status_t OMXCodec::setupErrorCorrectionParameters() { 
    err = mOMX->setParameter(

            mNode, OMX_IndexParamVideoErrorCorrection,

            &errorCorrectionType, sizeof(errorCorrectionType));

    CHECK_EQ(err, OK);

    if (err != OK) {

        LOGW("Error correction param configuration is not supported");

    }



    // Optional feature. Ignore the failure.

    return OK;

}