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

Commit e5f6cb2b authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "enumerate component input and output port format"

parents 1f7a9d4b 1e73885b

media/libstagefright/codecs/aacdec/SoftAAC2.cpp

+47 −0
Original line number Diff line number Diff line
@@ -218,6 +218,30 @@ status_t SoftAAC2::initDecoder() { 
OMX_ERRORTYPE SoftAAC2::internalGetParameter(

        OMX_INDEXTYPE index, OMX_PTR params) {

    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_CodingAAC : OMX_AUDIO_CodingPCM;



            return OMX_ErrorNone;

        }



        case OMX_IndexParamAudioAac:

        {

            OMX_AUDIO_PARAM_AACPROFILETYPE *aacParams =
@@ -342,6 +366,29 @@ OMX_ERRORTYPE SoftAAC2::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_CodingAAC)

                || (formatParams->nPortIndex == 1

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

                return OMX_ErrorUndefined;

            }



            return OMX_ErrorNone;

        }



        case OMX_IndexParamAudioAac:

        {

            const OMX_AUDIO_PARAM_AACPROFILETYPE *aacParams =

media/libstagefright/codecs/amrnb/dec/SoftAMR.cpp

+47 −0
Original line number Diff line number Diff line
@@ -143,6 +143,30 @@ status_t SoftAMR::initDecoder() { 
OMX_ERRORTYPE SoftAMR::internalGetParameter(

        OMX_INDEXTYPE index, OMX_PTR params) {

    switch (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_CodingAMR : OMX_AUDIO_CodingPCM;



            return OMX_ErrorNone;

        }



        case OMX_IndexParamAudioAmr:

        {

            OMX_AUDIO_PARAM_AMRTYPE *amrParams =
@@ -236,6 +260,29 @@ OMX_ERRORTYPE SoftAMR::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_CodingAMR)

                || (formatParams->nPortIndex == 1

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

                return OMX_ErrorUndefined;

            }



            return OMX_ErrorNone;

        }



        case OMX_IndexParamAudioAmr:

        {

            const OMX_AUDIO_PARAM_AMRTYPE *aacParams =

media/libstagefright/codecs/g711/dec/SoftG711.cpp

+47 −0
Original line number Diff line number Diff line
@@ -105,6 +105,30 @@ void SoftG711::initPorts() { 
OMX_ERRORTYPE SoftG711::internalGetParameter(

        OMX_INDEXTYPE index, OMX_PTR params) {

    switch (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_CodingG711 : OMX_AUDIO_CodingPCM;



            return OMX_ErrorNone;

        }



        case OMX_IndexParamAudioPcm:

        {

            OMX_AUDIO_PARAM_PCMMODETYPE *pcmParams =
@@ -173,6 +197,29 @@ OMX_ERRORTYPE SoftG711::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_CodingG711)

                || (formatParams->nPortIndex == 1

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

                return OMX_ErrorUndefined;

            }



            return OMX_ErrorNone;

        }



        case OMX_IndexParamStandardComponentRole:

        {

            const OMX_PARAM_COMPONENTROLETYPE *roleParams =

media/libstagefright/codecs/gsm/dec/SoftGSM.cpp

+47 −0
Original line number Diff line number Diff line
@@ -105,6 +105,30 @@ void SoftGSM::initPorts() { 
OMX_ERRORTYPE SoftGSM::internalGetParameter(

        OMX_INDEXTYPE index, OMX_PTR params) {

    switch (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_CodingGSMFR : OMX_AUDIO_CodingPCM;



            return OMX_ErrorNone;

        }



        case OMX_IndexParamAudioPcm:

        {

            OMX_AUDIO_PARAM_PCMMODETYPE *pcmParams =
@@ -164,6 +188,29 @@ OMX_ERRORTYPE SoftGSM::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_CodingGSMFR)

                || (formatParams->nPortIndex == 1

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

                return OMX_ErrorUndefined;

            }



            return OMX_ErrorNone;

        }



        case OMX_IndexParamStandardComponentRole:

        {

            const OMX_PARAM_COMPONENTROLETYPE *roleParams =

media/libstagefright/codecs/mp3dec/SoftMP3.cpp

+47 −0
Original line number Diff line number Diff line
@@ -134,6 +134,30 @@ void *SoftMP3::memsetSafe(OMX_BUFFERHEADERTYPE *outHeader, int c, size_t len) { 
OMX_ERRORTYPE SoftMP3::internalGetParameter(

        OMX_INDEXTYPE index, OMX_PTR params) {

    switch (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_CodingMP3 : OMX_AUDIO_CodingPCM;



            return OMX_ErrorNone;

        }



        case OMX_IndexParamAudioPcm:

        {

            OMX_AUDIO_PARAM_PCMMODETYPE *pcmParams =
@@ -208,6 +232,29 @@ OMX_ERRORTYPE SoftMP3::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_CodingMP3)

                || (formatParams->nPortIndex == 1

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

                return OMX_ErrorUndefined;

            }



            return OMX_ErrorNone;

        }



        case OMX_IndexParamAudioPcm:

        {

            const OMX_AUDIO_PARAM_PCMMODETYPE *pcmParams =