Merge "ACodec: Added support for E-AC3 decoders" into lmp-mr1-dev (0b460ad7) · Commits · e / os / android_frameworks_av

include/media/stagefright/ACodec.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -283,6 +283,8 @@ private:

		status_t setupAC3Codec(bool encoder, int32_t numChannels, int32_t sampleRate);

		status_t setupEAC3Codec(bool encoder, int32_t numChannels, int32_t sampleRate);

		status_t selectAudioPortFormat(
		OMX_U32 portIndex, OMX_AUDIO_CODINGTYPE desiredFormat);

include/media/stagefright/MediaDefs.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -47,6 +47,7 @@ extern const char *MEDIA_MIMETYPE_AUDIO_FLAC;
		extern const char *MEDIA_MIMETYPE_AUDIO_AAC_ADTS;
		extern const char *MEDIA_MIMETYPE_AUDIO_MSGSM;
		extern const char *MEDIA_MIMETYPE_AUDIO_AC3;
		extern const char *MEDIA_MIMETYPE_AUDIO_EAC3;

		extern const char *MEDIA_MIMETYPE_CONTAINER_MPEG4;
		extern const char *MEDIA_MIMETYPE_CONTAINER_WAV;

media/libstagefright/ACodec.cpp

+67 −0

Original line number	Diff line number	Diff line
		@@ -1106,6 +1106,8 @@ status_t ACodec::setComponentRole(
		"video_decoder.mpeg2", "video_encoder.mpeg2" },
		{ MEDIA_MIMETYPE_AUDIO_AC3,
		"audio_decoder.ac3", "audio_encoder.ac3" },
		{ MEDIA_MIMETYPE_AUDIO_EAC3,
		"audio_decoder.eac3", "audio_encoder.eac3" },
		};

		static const size_t kNumMimeToRole =
		@@ -1540,6 +1542,15 @@ status_t ACodec::configureCodec(
		} else {
		err = setupAC3Codec(encoder, numChannels, sampleRate);
		}
		} else if (!strcasecmp(mime, MEDIA_MIMETYPE_AUDIO_EAC3)) {
		int32_t numChannels;
		int32_t sampleRate;
		if (!msg->findInt32("channel-count", &numChannels)
		\|\| !msg->findInt32("sample-rate", &sampleRate)) {
		err = INVALID_OPERATION;
		} else {
		err = setupEAC3Codec(encoder, numChannels, sampleRate);
		}
		}

		if (err != OK) {
		@@ -1825,6 +1836,44 @@ status_t ACodec::setupAC3Codec(
		sizeof(def));
		}

		status_t ACodec::setupEAC3Codec(
		bool encoder, int32_t numChannels, int32_t sampleRate) {
		status_t err = setupRawAudioFormat(
		encoder ? kPortIndexInput : kPortIndexOutput, sampleRate, numChannels);

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

		if (encoder) {
		ALOGW("EAC3 encoding is not supported.");
		return INVALID_OPERATION;
		}

		OMX_AUDIO_PARAM_ANDROID_EAC3TYPE def;
		InitOMXParams(&def);
		def.nPortIndex = kPortIndexInput;

		err = mOMX->getParameter(
		mNode,
		(OMX_INDEXTYPE)OMX_IndexParamAudioAndroidEac3,
		&def,
		sizeof(def));

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

		def.nChannels = numChannels;
		def.nSampleRate = sampleRate;

		return mOMX->setParameter(
		mNode,
		(OMX_INDEXTYPE)OMX_IndexParamAudioAndroidEac3,
		&def,
		sizeof(def));
		}

		static OMX_AUDIO_AMRBANDMODETYPE pickModeFromBitRate(
		bool isAMRWB, int32_t bps) {
		if (isAMRWB) {
		@@ -3500,6 +3549,24 @@ status_t ACodec::getPortFormat(OMX_U32 portIndex, sp<AMessage> &notify) {
		break;
		}

		case OMX_AUDIO_CodingAndroidEAC3:
		{
		OMX_AUDIO_PARAM_ANDROID_EAC3TYPE params;
		InitOMXParams(&params);
		params.nPortIndex = portIndex;

		CHECK_EQ((status_t)OK, mOMX->getParameter(
		mNode,
		(OMX_INDEXTYPE)OMX_IndexParamAudioAndroidEac3,
		&params,
		sizeof(params)));

		notify->setString("mime", MEDIA_MIMETYPE_AUDIO_EAC3);
		notify->setInt32("channel-count", params.nChannels);
		notify->setInt32("sample-rate", params.nSampleRate);
		break;
		}

		case OMX_AUDIO_CodingAndroidOPUS:
		{
		OMX_AUDIO_PARAM_ANDROID_OPUSTYPE params;

media/libstagefright/MediaDefs.cpp

+1 −0

Original line number	Diff line number	Diff line
		@@ -45,6 +45,7 @@ const char *MEDIA_MIMETYPE_AUDIO_FLAC = "audio/flac";
		const char *MEDIA_MIMETYPE_AUDIO_AAC_ADTS = "audio/aac-adts";
		const char *MEDIA_MIMETYPE_AUDIO_MSGSM = "audio/gsm";
		const char *MEDIA_MIMETYPE_AUDIO_AC3 = "audio/ac3";
		const char *MEDIA_MIMETYPE_AUDIO_EAC3 = "audio/eac3";

		const char *MEDIA_MIMETYPE_CONTAINER_MPEG4 = "video/mp4";
		const char *MEDIA_MIMETYPE_CONTAINER_WAV = "audio/x-wav";