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

Commit c356b493 authored by Vignesh Venkatasubramanian's avatar Vignesh Venkatasubramanian Committed by android-build-merger
Browse files

Merge "DO NOT MERGE - Remove deprecated image defines" into lmp-dev 

am: 3990c542

* commit '3990c542':
  DO NOT MERGE - Remove deprecated image defines
parents 0fefc974 3990c542

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

+7 −7
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ void SoftVPX::onQueueFilled(OMX_U32 /* portIndex */) { 
        }



        if (mImg != NULL) {

            CHECK_EQ(mImg->fmt, IMG_FMT_I420);

            CHECK_EQ(mImg->fmt, VPX_IMG_FMT_I420);



            uint32_t width = mImg->d_w;

            uint32_t height = mImg->d_h;
@@ -149,12 +149,12 @@ void SoftVPX::onQueueFilled(OMX_U32 /* portIndex */) { 
            outHeader->nTimeStamp = inHeader->nTimeStamp;



            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;