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

Commit 9600c9d0 authored by Lajos Molnar's avatar Lajos Molnar Committed by android-build-merger
Browse files

Merge "stagefright: disable B-frames" into oc-mr1-dev 

am: fe5f909f

Change-Id: I82988760372cf4d2f2acb7dc929df04e9879d17e
parents aa88f751 fe5f909f

media/libstagefright/ACodec.cpp

+6 −1
Original line number Diff line number Diff line
@@ -4322,9 +4322,14 @@ status_t ACodec::setupAVCEncoderParameters(const sp<AMessage> &msg) { 
        h264type.bUseHadamard = OMX_TRUE;

        h264type.nRefFrames = 2;

        h264type.nBFrames = mLatency == 0 ? 1 : std::min(1U, mLatency - 1);



        // disable B-frames until MPEG4Writer can guarantee finalizing files with B-frames

        h264type.nRefFrames = 1;

        h264type.nBFrames = 0;



        h264type.nPFrames = setPFramesSpacing(iFrameInterval, frameRate, h264type.nBFrames);

        h264type.nAllowedPictureTypes =

            OMX_VIDEO_PictureTypeI | OMX_VIDEO_PictureTypeP | OMX_VIDEO_PictureTypeB;

            OMX_VIDEO_PictureTypeI | OMX_VIDEO_PictureTypeP;

        h264type.nRefIdx10ActiveMinus1 = 0;

        h264type.nRefIdx11ActiveMinus1 = 0;

        h264type.bEntropyCodingCABAC = OMX_TRUE;