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

Commit 3e03f09c authored by Hangyu Kuang's avatar Hangyu Kuang Committed by Android (Google) Code Review
Browse files

Merge "Revert "stagefright: Remove AVC Base Profile restriction in ACodec... 

Merge "Revert "stagefright: Remove AVC Base Profile restriction in ACodec encoder setup."" into nyc-dev
parents da626b0e 8eadd773

media/libstagefright/ACodec.cpp

+7 −17
Original line number Diff line number Diff line
@@ -3947,6 +3947,13 @@ status_t ACodec::setupAVCEncoderParameters(const sp<AMessage> &msg) { 
        h264type.eLevel = static_cast<OMX_VIDEO_AVCLEVELTYPE>(level);

    }



    // XXX

    if (h264type.eProfile != OMX_VIDEO_AVCProfileBaseline) {

        ALOGW("Use baseline profile instead of %d for AVC recording",

            h264type.eProfile);

        h264type.eProfile = OMX_VIDEO_AVCProfileBaseline;

    }



    if (h264type.eProfile == OMX_VIDEO_AVCProfileBaseline) {

        h264type.nSliceHeaderSpacing = 0;

        h264type.bUseHadamard = OMX_TRUE;
@@ -3964,23 +3971,6 @@ status_t ACodec::setupAVCEncoderParameters(const sp<AMessage> &msg) { 
        h264type.bDirect8x8Inference = OMX_FALSE;

        h264type.bDirectSpatialTemporal = OMX_FALSE;

        h264type.nCabacInitIdc = 0;

    } else if (h264type.eProfile == OMX_VIDEO_AVCProfileMain ||

            h264type.eProfile == OMX_VIDEO_AVCProfileHigh) {

        h264type.nSliceHeaderSpacing = 0;

        h264type.bUseHadamard = OMX_TRUE;

        h264type.nRefFrames = 2;

        h264type.nBFrames = 1;

        h264type.nPFrames = setPFramesSpacing(iFrameInterval, frameRate);

        h264type.nAllowedPictureTypes =

            OMX_VIDEO_PictureTypeI | OMX_VIDEO_PictureTypeP | OMX_VIDEO_PictureTypeB;

        h264type.nRefIdx10ActiveMinus1 = 0;

        h264type.nRefIdx11ActiveMinus1 = 0;

        h264type.bEntropyCodingCABAC = OMX_TRUE;

        h264type.bWeightedPPrediction = OMX_TRUE;

        h264type.bconstIpred = OMX_TRUE;

        h264type.bDirect8x8Inference = OMX_TRUE;

        h264type.bDirectSpatialTemporal = OMX_TRUE;

        h264type.nCabacInitIdc = 1;

    }



    if (h264type.nBFrames != 0) {