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

Commit 8ac1a9f6 authored by Vignesh Venkatasubramanian's avatar Vignesh Venkatasubramanian
Browse files

DO NOT MERGE - Remove deprecated image defines 

libvpx has always supported the VPX_ prefixed versions of these defines.
The unprefixed versions have been removed in the most recent release.

https://chromium.googlesource.com/webm/libvpx/+/9cdaa3d72eade9ad162ef8f78a93bd8f85c6de10

BUG=23452792

Change-Id: I8a656f2262f117d7a95271f45100b8c6fd0a470f
parent e6bd186c

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

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

        }





        if (mImg != NULL) {

        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 width = mImg->d_w;

            uint32_t height = mImg->d_h;

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

            outHeader->nTimeStamp = inHeader->nTimeStamp;





            uint8_t *dst = outHeader->pBuffer;

            uint8_t *dst = outHeader->pBuffer;

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

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

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

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

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

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

            size_t srcYStride = mImg->stride[PLANE_Y];

            size_t srcYStride = mImg->stride[VPX_PLANE_Y];

            size_t srcUStride = mImg->stride[PLANE_U];

            size_t srcUStride = mImg->stride[VPX_PLANE_U];

            size_t srcVStride = mImg->stride[PLANE_V];

            size_t srcVStride = mImg->stride[VPX_PLANE_V];

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

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





            mImg = NULL;

            mImg = NULL;