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

Commit ebc0faff authored by Hangyu Kuang's avatar Hangyu Kuang Committed by Gerrit Code Review
Browse files

Merge "SoftAvcEnc:Configured constrained_intra_pred flag in internalSetParameter"

parents c29470f6 047ccc77

media/libstagefright/codecs/avcenc/SoftAVCEnc.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1000,6 +1000,7 @@ OMX_ERRORTYPE SoftAVC::internalSetParameter(OMX_INDEXTYPE index, const OMX_PTR p 
            }



            mIInterval = avcType->nPFrames + avcType->nBFrames;

            mConstrainedIntraFlag = avcType->bconstIpred;



            if (OMX_VIDEO_AVCLoopFilterDisable == avcType->eLoopFilterMode)

                mDisableDeblkLevel = 4;
@@ -1009,7 +1010,6 @@ OMX_ERRORTYPE SoftAVC::internalSetParameter(OMX_INDEXTYPE index, const OMX_PTR p 
                    || avcType->nRefIdx10ActiveMinus1 != 0

                    || avcType->nRefIdx11ActiveMinus1 != 0

                    || avcType->bWeightedPPrediction != OMX_FALSE

                    || avcType->bconstIpred != OMX_FALSE

                    || avcType->bDirect8x8Inference != OMX_FALSE

                    || avcType->bDirectSpatialTemporal != OMX_FALSE

                    || avcType->nCabacInitIdc != 0) {