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

Commit 181bd0ea authored by Chong Zhang's avatar Chong Zhang Committed by android-build-merger
Browse files

Merge "Fix color conversion from OMX_COLOR_FormatYUV420SemiPlanar" into qt-dev am: 243787c8 

am: 6e89801b

Change-Id: I63e68869d3d7099fca688f4261a3fd0a6270946c
parents 50d41ded 6e89801b

media/libstagefright/colorconversion/ColorConverter.cpp

+6 −1
Original line number Diff line number Diff line
@@ -395,11 +395,16 @@ status_t ColorConverter::convertYUV420SemiPlanarUseLibYUV( 
                dst.mStride, src.cropWidth(), src.cropHeight());

        break;



    case OMX_COLOR_Format32BitRGBA8888:

    case OMX_COLOR_Format32bitBGRA8888:

        libyuv::NV12ToARGB(src_y, src.mStride, src_u, src.mStride, (uint8 *)dst_ptr,

                dst.mStride, src.cropWidth(), src.cropHeight());

        break;



    case OMX_COLOR_Format32BitRGBA8888:

        libyuv::NV12ToABGR(src_y, src.mStride, src_u, src.mStride, (uint8 *)dst_ptr,

                dst.mStride, src.cropWidth(), src.cropHeight());

        break;



    default:

        return ERROR_UNSUPPORTED;

   }