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

Commit eeb4d73d authored by Ram Mohan M's avatar Ram Mohan M Committed by android-build-merger
Browse files

Merge "Fix strides while extracting graphic buffer" into oc-dev 

am: fa77e3f5

Change-Id: If464ccff42d0d3b00232fa0bebfe4069339d94d5
parents 04476645 fa77e3f5

media/libstagefright/omx/SoftVideoEncoderOMXComponent.cpp

+5 −7
Original line number Diff line number Diff line
@@ -615,26 +615,24 @@ const uint8_t *SoftVideoEncoderOMXComponent::extractGraphicBuffer( 


    switch (format) {

        case HAL_PIXEL_FORMAT_YV12:  // YCrCb / YVU planar

            // convert to flex YUV

            ycbcr.y = bits;

            ycbcr.cr = (uint8_t *)bits + srcStride * srcVStride;

            ycbcr.cb = (uint8_t *)ycbcr.cr + (srcStride >> 1) * (srcVStride >> 1);

            ycbcr.chroma_step = 1;

            ycbcr.cstride = srcVStride >> 1;

            ycbcr.ystride = srcVStride;

            ycbcr.cstride = srcStride >> 1;

            ycbcr.ystride = srcStride;

            ConvertFlexYUVToPlanar(dst, dstStride, dstVStride, &ycbcr, width, height);

            break;

        case HAL_PIXEL_FORMAT_YCrCb_420_SP:  // YCrCb / YVU semiplanar, NV21

            // convert to flex YUV

            ycbcr.y = bits;

            ycbcr.cr = (uint8_t *)bits + srcStride * srcVStride;

            ycbcr.cb = (uint8_t *)ycbcr.cr + 1;

            ycbcr.chroma_step = 2;

            ycbcr.cstride = srcVStride;

            ycbcr.ystride = srcVStride;

            ycbcr.cstride = srcStride;

            ycbcr.ystride = srcStride;

            ConvertFlexYUVToPlanar(dst, dstStride, dstVStride, &ycbcr, width, height);

            break;

        case HAL_PIXEL_FORMAT_YCbCr_420_888:

        case HAL_PIXEL_FORMAT_YCbCr_420_888:  // YCbCr / YUV planar

            ConvertFlexYUVToPlanar(dst, dstStride, dstVStride, &ycbcr, width, height);

            break;

        case HAL_PIXEL_FORMAT_RGBX_8888: