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

Commit af527936 authored by Lajos Molnar's avatar Lajos Molnar Committed by Android (Google) Code Review
Browse files

Merge "Remove deprecated image defines"

parents 221a3389 252e0d8a

media/libstagefright/codecs/on2/dec/SoftVPX.cpp

+7 −7
Original line number Diff line number Diff line
@@ -139,7 +139,7 @@ bool SoftVPX::outputBuffers(bool flushDecoder, bool display, bool eos, bool *por 
        uint32_t height = mImg->d_h;

        outInfo = *outQueue.begin();

        outHeader = outInfo->mHeader;

        CHECK_EQ(mImg->fmt, IMG_FMT_I420);

        CHECK_EQ(mImg->fmt, VPX_IMG_FMT_I420);

        handlePortSettingsChange(portWillReset, width, height);

        if (*portWillReset) {

            return true;
@@ -151,12 +151,12 @@ bool SoftVPX::outputBuffers(bool flushDecoder, bool display, bool eos, bool *por 
        outHeader->nTimeStamp = *(OMX_TICKS *)mImg->user_priv;



        uint8_t *dst = outHeader->pBuffer;

        const uint8_t *srcY = (const uint8_t *)mImg->planes[PLANE_Y];

        const uint8_t *srcU = (const uint8_t *)mImg->planes[PLANE_U];

        const uint8_t *srcV = (const uint8_t *)mImg->planes[PLANE_V];

        size_t srcYStride = mImg->stride[PLANE_Y];

        size_t srcUStride = mImg->stride[PLANE_U];

        size_t srcVStride = mImg->stride[PLANE_V];

        const uint8_t *srcY = (const uint8_t *)mImg->planes[VPX_PLANE_Y];

        const uint8_t *srcU = (const uint8_t *)mImg->planes[VPX_PLANE_U];

        const uint8_t *srcV = (const uint8_t *)mImg->planes[VPX_PLANE_V];

        size_t srcYStride = mImg->stride[VPX_PLANE_Y];

        size_t srcUStride = mImg->stride[VPX_PLANE_U];

        size_t srcVStride = mImg->stride[VPX_PLANE_V];

        copyYV12FrameToOutputBuffer(dst, srcY, srcU, srcV, srcYStride, srcUStride, srcVStride);



        mImg = NULL;