Merge "ACodec is a little more aggressive in its error checking now." (4108fbc2) · Commits · e / os / android_frameworks_base

media/libstagefright/ACodec.cpp

+7 −4

Original line number	Diff line number	Diff line
		@@ -746,6 +746,10 @@ status_t ACodec::setComponentRole(
		"audio_decoder.aac", "audio_encoder.aac" },
		{ MEDIA_MIMETYPE_AUDIO_VORBIS,
		"audio_decoder.vorbis", "audio_encoder.vorbis" },
		{ MEDIA_MIMETYPE_AUDIO_G711_MLAW,
		"audio_decoder.g711mlaw", "audio_encoder.g711mlaw" },
		{ MEDIA_MIMETYPE_AUDIO_G711_ALAW,
		"audio_decoder.g711alaw", "audio_encoder.g711alaw" },
		{ MEDIA_MIMETYPE_VIDEO_AVC,
		"video_decoder.avc", "video_encoder.avc" },
		{ MEDIA_MIMETYPE_VIDEO_MPEG4,
		@@ -855,10 +859,6 @@ status_t ACodec::configureCodec(
		}
		}

		if (err != OK) {
		return err;
		}

		int32_t maxInputSize;
		if (msg->findInt32("max-input-size", &maxInputSize)) {
		err = setMinBufferSize(kPortIndexInput, (size_t)maxInputSize);
		@@ -2770,6 +2770,9 @@ bool ACodec::LoadedState::onConfigureComponent(
		status_t err = mCodec->configureCodec(mime.c_str(), msg);

		if (err != OK) {
		ALOGE("[%s] configureCodec returning error %d",
		mCodec->mComponentName.c_str(), err);

		mCodec->signalError(OMX_ErrorUndefined, err);
		return false;
		}

+4 −2

Original line number	Diff line number	Diff line
		@@ -1332,8 +1332,6 @@ void OMXCodec::setComponentRole(
		"audio_decoder.mp1", "audio_encoder.mp1" },
		{ MEDIA_MIMETYPE_AUDIO_MPEG_LAYER_II,
		"audio_decoder.mp2", "audio_encoder.mp2" },
		{ MEDIA_MIMETYPE_AUDIO_MPEG,
		"audio_decoder.mp3", "audio_encoder.mp3" },
		{ MEDIA_MIMETYPE_AUDIO_AMR_NB,
		"audio_decoder.amrnb", "audio_encoder.amrnb" },
		{ MEDIA_MIMETYPE_AUDIO_AMR_WB,
		@@ -1342,6 +1340,10 @@ void OMXCodec::setComponentRole(
		"audio_decoder.aac", "audio_encoder.aac" },
		{ MEDIA_MIMETYPE_AUDIO_VORBIS,
		"audio_decoder.vorbis", "audio_encoder.vorbis" },
		{ MEDIA_MIMETYPE_AUDIO_G711_MLAW,
		"audio_decoder.g711mlaw", "audio_encoder.g711mlaw" },
		{ MEDIA_MIMETYPE_AUDIO_G711_ALAW,
		"audio_decoder.g711alaw", "audio_encoder.g711alaw" },
		{ MEDIA_MIMETYPE_VIDEO_AVC,
		"video_decoder.avc", "video_encoder.avc" },
		{ MEDIA_MIMETYPE_VIDEO_MPEG4,

+12 −0

Original line number	Diff line number	Diff line
		@@ -236,6 +236,18 @@ OMX_ERRORTYPE SoftAMR::internalSetParameter(
		return OMX_ErrorNone;
		}

		case OMX_IndexParamAudioPcm:
		{
		const OMX_AUDIO_PARAM_PCMMODETYPE *pcmParams =
		(OMX_AUDIO_PARAM_PCMMODETYPE *)params;

		if (pcmParams->nPortIndex != 1) {
		return OMX_ErrorUndefined;
		}

		return OMX_ErrorNone;
		}

		default:
		return SimpleSoftOMXComponent::internalSetParameter(index, params);
		}

+4 −2

Original line number	Diff line number	Diff line
		@@ -140,7 +140,7 @@ OMX_ERRORTYPE SoftG711::internalSetParameter(
		OMX_AUDIO_PARAM_PCMMODETYPE *pcmParams =
		(OMX_AUDIO_PARAM_PCMMODETYPE *)params;

		if (pcmParams->nPortIndex != 0) {
		if (pcmParams->nPortIndex != 0 && pcmParams->nPortIndex != 1) {
		return OMX_ErrorUndefined;
		}

		@@ -148,7 +148,9 @@ OMX_ERRORTYPE SoftG711::internalSetParameter(
		return OMX_ErrorUndefined;
		}

		if(pcmParams->nPortIndex == 0) {
		mNumChannels = pcmParams->nChannels;
		}

		return OMX_ErrorNone;
		}