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

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

Merge "bug fix: add missing color formats to the check for valid formats" into oc-mr1-dev 

am: 6a563237

Change-Id: I9d359b70e00ba4fca5de45e0cccbb7be019f3be6
parents 9942d5e4 6a563237

media/omx/1.0/vts/functional/video/VtsHalMediaOmxV1_0TargetVideoDecTest.cpp

+4 −2
Original line number Diff line number Diff line
@@ -839,7 +839,7 @@ void getDefaultColorFormat(sp<IOmxNode> omxNode, OMX_U32 kPortIndexOutput, 
    OMX_VIDEO_PARAM_PORTFORMATTYPE portFormat;

    *eColorFormat = OMX_COLOR_FormatUnused;

    portFormat.nIndex = 0;

    while (1) {

    while (portFormat.nIndex < 512) {

        status = getPortParam(omxNode, OMX_IndexParamVideoPortFormat,

                              kPortIndexOutput, &portFormat);

        if (status != ::android::hardware::media::omx::V1_0::Status::OK) break;
@@ -853,7 +853,9 @@ void getDefaultColorFormat(sp<IOmxNode> omxNode, OMX_U32 kPortIndexOutput, 
            break;

        }

        if (OMX_COLOR_FormatYUV420SemiPlanar == portFormat.eColorFormat ||

            OMX_COLOR_FormatYUV420Planar == portFormat.eColorFormat) {

            OMX_COLOR_FormatYUV420Planar == portFormat.eColorFormat ||

            OMX_COLOR_FormatYUV420PackedPlanar == portFormat.eColorFormat ||

            OMX_COLOR_FormatYUV420PackedSemiPlanar == portFormat.eColorFormat) {

            *eColorFormat = portFormat.eColorFormat;

            break;

        }