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

Commit 8a3d60dd authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 7218778 from 1c03d6e0 to rvc-qpr3-release 

Change-Id: I326450639aa6f26396934ec4e4b1296467569e46
parents 89602dea 1c03d6e0

media/libstagefright/codecs/m4v_h263/enc/src/mp4enc_api.cpp

+3 −0
Original line number Diff line number Diff line
@@ -491,6 +491,9 @@ OSCL_EXPORT_REF Bool PVInitVideoEncoder(VideoEncControls *encoderControl, Vid 
    }

    for (i = 0; i < encParams->nLayers; i++)

    {

        if (encOption->encHeight[i] == 0 || encOption->encWidth[i] == 0 ||

                encOption->encHeight[i] % 16 != 0 || encOption->encWidth[i] % 16 != 0)

            goto CLEAN_UP;

        encParams->LayerHeight[i] = encOption->encHeight[i];

        encParams->LayerWidth[i] = encOption->encWidth[i];

    }

media/libstagefright/foundation/ABuffer.cpp

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ ABuffer::~ABuffer() { 


void ABuffer::setRange(size_t offset, size_t size) {

    CHECK_LE(offset, mCapacity);

    CHECK_LE(offset + size, mCapacity);

    CHECK_LE(size, mCapacity - offset);



    mRangeOffset = offset;

    mRangeLength = size;