Merge "AAC: Don't fail configuration on older HALs" into sc-v2-dev (182b58a8) · Commits · e / os / android_frameworks_av

media/libstagefright/ACodec.cpp

+14 −14

Original line number	Diff line number	Diff line
		@@ -5395,9 +5395,7 @@ status_t ACodec::getPortFormat(OMX_U32 portIndex, sp<AMessage> &notify) {
		err = mOMXNode->getParameter(
		(OMX_INDEXTYPE)OMX_IndexParamAudioAndroidAacDrcPresentation,
		&presentation, sizeof(presentation));
		if (err != OK) {
		return err;
		}
		if (err == OK) {
		notify->setInt32("aac-encoded-target-level",
		presentation.nEncodedTargetLevel);
		notify->setInt32("aac-drc-cut-level", presentation.nDrcCut);
		@@ -5406,12 +5404,14 @@ status_t ACodec::getPortFormat(OMX_U32 portIndex, sp<AMessage> &notify) {
		presentation.nHeavyCompression);
		notify->setInt32("aac-target-ref-level",
		presentation.nTargetReferenceLevel);
		notify->setInt32("aac-drc-effect-type", presentation.nDrcEffectType);
		notify->setInt32("aac-drc-effect-type",
		presentation.nDrcEffectType);
		notify->setInt32("aac-drc-album-mode", presentation.nDrcAlbumMode);
		notify->setInt32("aac-drc-output-loudness",
		presentation.nDrcOutputLoudness);
		}
		}
		}
		break;
		}