Merge "Handle OMX_IndexParamAudioPortFormat in SoftFlacDecoder" into oc-mr1-dev (e85bce95) · Commits · e / os / android_frameworks_av

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 =