Merge "Support AC3 in stagefright" (a19c9d49) · Commits · e / os / android_frameworks_av

include/media/stagefright/ACodec.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -247,6 +247,8 @@ private:
		int32_t numChannels, int32_t sampleRate, int32_t bitRate,
		int32_t aacProfile, bool isADTS);

		status_t setupAC3Codec(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
		@@ -44,6 +44,7 @@ extern const char *MEDIA_MIMETYPE_AUDIO_RAW;
		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_CONTAINER_MPEG4;
		extern const char *MEDIA_MIMETYPE_CONTAINER_WAV;

media/libstagefright/ACodec.cpp

+70 −1

Original line number	Diff line number	Diff line
		@@ -35,7 +35,9 @@

		#include <media/hardware/HardwareAPI.h>

		#include <OMX_AudioExt.h>
		#include <OMX_Component.h>
		#include <OMX_IndexExt.h>

		#include "include/avc_utils.h"

		@@ -967,6 +969,8 @@ status_t ACodec::setComponentRole(
		"audio_decoder.gsm", "audio_encoder.gsm" },
		{ MEDIA_MIMETYPE_VIDEO_MPEG2,
		"video_decoder.mpeg2", "video_encoder.mpeg2" },
		{ MEDIA_MIMETYPE_AUDIO_AC3,
		"audio_decoder.ac3", "audio_encoder.ac3" },
		};

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

		if (err != OK) {
		@@ -1454,6 +1467,44 @@ status_t ACodec::setupAACCodec(
		mNode, OMX_IndexParamAudioAac, &profile, sizeof(profile));
		}

		status_t ACodec::setupAC3Codec(
		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("AC3 encoding is not supported.");
		return INVALID_OPERATION;
		}

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

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

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

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

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

		static OMX_AUDIO_AMRBANDMODETYPE pickModeFromBitRate(
		bool isAMRWB, int32_t bps) {
		if (isAMRWB) {
		@@ -2532,7 +2583,7 @@ void ACodec::sendFormatChange(const sp<AMessage> &reply) {
		{
		OMX_AUDIO_PORTDEFINITIONTYPE *audioDef = &def.format.audio;

		switch (audioDef->eEncoding) {
		switch ((int)audioDef->eEncoding) {
		case OMX_AUDIO_CodingPCM:
		{
		OMX_AUDIO_PARAM_PCMMODETYPE params;
		@@ -2638,6 +2689,24 @@ void ACodec::sendFormatChange(const sp<AMessage> &reply) {
		break;
		}

		case OMX_AUDIO_CodingAndroidAC3:
		{
		OMX_AUDIO_PARAM_ANDROID_AC3TYPE params;
		InitOMXParams(&params);
		params.nPortIndex = kPortIndexOutput;

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

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

		default:
		TRESPASS();
		}

media/libstagefright/MediaDefs.cpp

+1 −0

Original line number	Diff line number	Diff line
		@@ -42,6 +42,7 @@ const char *MEDIA_MIMETYPE_AUDIO_RAW = "audio/raw";
		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_CONTAINER_MPEG4 = "video/mp4";
		const char *MEDIA_MIMETYPE_CONTAINER_WAV = "audio/x-wav";