Merge changes I937ac6ab,Ib94f78f7 am: fcb69b8543 (e6364241) · Commits · e / os / android_frameworks_av

media/libstagefright/codecs/aacenc/SoftAACEncoder.cpp

+4 −4

Original line number	Diff line number	Diff line
		@@ -337,7 +337,7 @@ status_t SoftAACEncoder::setAudioParams() {
		// We call this whenever sample rate, number of channels or bitrate change
		// in reponse to setParameter calls.

		ALOGV("setAudioParams: %lu Hz, %lu channels, %lu bps",
		ALOGV("setAudioParams: %u Hz, %u channels, %u bps",
		mSampleRate, mNumChannels, mBitRate);

		status_t err = setAudioSpecificConfigData();
		@@ -387,12 +387,12 @@ status_t SoftAACEncoder::setAudioSpecificConfigData() {
		int32_t index;
		status_t err = getSampleRateTableIndex(mSampleRate, index);
		if (err != OK) {
		ALOGE("Unsupported sample rate (%lu Hz)", mSampleRate);
		ALOGE("Unsupported sample rate (%u Hz)", mSampleRate);
		return err;
		}

		if (mNumChannels > 2 \|\| mNumChannels <= 0) {
		ALOGE("Unsupported number of channels(%lu)", mNumChannels);
		ALOGE("Unsupported number of channels(%u)", mNumChannels);
		return UNKNOWN_ERROR;
		}

		@@ -403,7 +403,7 @@ status_t SoftAACEncoder::setAudioSpecificConfigData() {
		return OK;
		}

		void SoftAACEncoder::onQueueFilled(OMX_U32 portIndex) {
		void SoftAACEncoder::onQueueFilled(OMX_U32 /portIndex/) {
		if (mSignalledError) {
		return;
		}

+2 −2

Original line number	Diff line number	Diff line
		@@ -90,7 +90,7 @@ int encode(
		VO_AUDIO_CODECAPI AudioAPI;
		VO_MEM_OPERATOR moper;
		VO_CODEC_INIT_USERDATA useData;
		VO_HANDLE hCodec;
		VO_HANDLE hCodec = NULL;
		VO_CODECBUFFER inData;
		VO_CODECBUFFER outData;
		VO_AUDIO_OUTPUTINFO outFormat;
		@@ -211,7 +211,7 @@ int encode(
		if(returnCode == 0)
		{
		framenum++;
		printf(" Frames processed: %hd\r", framenum);
		printf(" Frames processed: %d\r", framenum);
		if(framenum == 1)
		{
		fwrite(OutputBuf, 1, outData.Length + size1, fdst);