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

Commit 148fca54 authored by Pawin Vongmasa's avatar Pawin Vongmasa
Browse files

Handle OMX_IndexParamAudioPortFormat in SoftFlacDecoder 

Test: make vts -j99 BUILD_GOOGLE_VTS=true TARGET_PRODUCT=aosp_arm64 \
&& vts-tradefed run commandAndExit vts \
--skip-all-system-status-check --primary-abi-only \
--skip-preconditions --module VtsHalMediaOmxV1_0Test -l INFO

Bug: 65463651

Change-Id: I24cbc5c1a0e109806dde0ad5847e969ec78d1e2e
parent 3b224af5

media/libstagefright/codecs/flac/dec/SoftFlacDecoder.cpp

+46 −0
Original line number Diff line number Diff line
@@ -126,6 +126,29 @@ OMX_ERRORTYPE SoftFlacDecoder::internalGetParameter( 
        OMX_INDEXTYPE index, OMX_PTR params) {

    ALOGV("internalGetParameter: index(%x)", index);

    switch ((OMX_U32)index) {

        case OMX_IndexParamAudioPortFormat:

        {

            OMX_AUDIO_PARAM_PORTFORMATTYPE *formatParams =

                (OMX_AUDIO_PARAM_PORTFORMATTYPE *)params;



            if (!isValidOMXParam(formatParams)) {

                return OMX_ErrorBadParameter;

            }



            if (formatParams->nPortIndex > 1) {

                return OMX_ErrorUndefined;

            }



            if (formatParams->nIndex > 0) {

                return OMX_ErrorNoMore;

            }



            formatParams->eEncoding =

                (formatParams->nPortIndex == 0)

                    ? OMX_AUDIO_CodingFLAC : OMX_AUDIO_CodingPCM;



            return OMX_ErrorNone;

        }

        case OMX_IndexParamAudioFlac:

        {

            OMX_AUDIO_PARAM_FLACTYPE *flacParams =
@@ -219,6 +242,29 @@ OMX_ERRORTYPE SoftFlacDecoder::internalSetParameter( 
            return OMX_ErrorNone;

        }



        case OMX_IndexParamAudioPortFormat:

        {

            const OMX_AUDIO_PARAM_PORTFORMATTYPE *formatParams =

                (const OMX_AUDIO_PARAM_PORTFORMATTYPE *)params;



            if (!isValidOMXParam(formatParams)) {

                return OMX_ErrorBadParameter;

            }



            if (formatParams->nPortIndex > 1) {

                return OMX_ErrorUndefined;

            }



            if ((formatParams->nPortIndex == 0

                        && formatParams->eEncoding != OMX_AUDIO_CodingFLAC)

                || (formatParams->nPortIndex == 1

                        && formatParams->eEncoding != OMX_AUDIO_CodingPCM)) {

                return OMX_ErrorUndefined;

            }



            return OMX_ErrorNone;

        }



        case OMX_IndexParamAudioPcm:

        {

            const OMX_AUDIO_PARAM_PCMMODETYPE *pcmParams =