Merge "Fixed energy computation for eq and bass boost" into oc-mr1-dev am: 82d6adc7a0 (1e9c9212) · Commits · e / os / android_frameworks_av

media/libeffects/lvm/wrapper/Bundle/EffectBundle.cpp

+23 −13

Original line number	Diff line number	Diff line
		@@ -1011,8 +1011,12 @@ void LvmEffect_limitLevel(EffectContext *pContext) {
		float energyBassBoost = 0;
		float crossCorrection = 0;

		bool eqEnabled = pContext->pBundledContext->bEqualizerEnabled == LVM_TRUE;
		bool bbEnabled = pContext->pBundledContext->bBassEnabled == LVM_TRUE;
		bool viEnabled = pContext->pBundledContext->bVirtualizerEnabled == LVM_TRUE;

		//EQ contribution
		if (pContext->pBundledContext->bEqualizerEnabled == LVM_TRUE) {
		if (eqEnabled) {
		for (int i = 0; i < FIVEBAND_NUMBANDS; i++) {
		float bandFactor = pContext->pBundledContext->bandGaindB[i]/15.0;
		float bandCoefficient = LimitLevel_bandEnergyCoefficient[i];
		@@ -1042,12 +1046,13 @@ void LvmEffect_limitLevel(EffectContext *pContext) {
		}

		//BassBoost contribution
		if (pContext->pBundledContext->bBassEnabled == LVM_TRUE) {
		if (bbEnabled) {
		float boostFactor = (pContext->pBundledContext->BassStrengthSaved)/1000.0;
		float boostCoefficient = LimitLevel_bassBoostEnergyCoefficient;

		energyContribution += boostFactor * boostCoefficient * boostCoefficient;

		if (eqEnabled) {
		for (int i = 0; i < FIVEBAND_NUMBANDS; i++) {
		float bandFactor = pContext->pBundledContext->bandGaindB[i]/15.0;
		float bandCrossCoefficient = LimitLevel_bassBoostEnergyCrossCoefficient[i];
		@@ -1057,16 +1062,17 @@ void LvmEffect_limitLevel(EffectContext *pContext) {
		energyBassBoost += bandEnergy;
		}
		}
		}

		//Virtualizer contribution
		if (pContext->pBundledContext->bVirtualizerEnabled == LVM_TRUE) {
		if (viEnabled) {
		energyContribution += LimitLevel_virtualizerContribution *
		LimitLevel_virtualizerContribution;
		}

		double totalEnergyEstimation = sqrt(energyContribution + energyCross + energyBassBoost) -
		crossCorrection;
		ALOGV(" TOTAL energy estimation: %0.2f", totalEnergyEstimation);
		ALOGV(" TOTAL energy estimation: %0.2f dB", totalEnergyEstimation);

		//roundoff
		int maxLevelRound = (int)(totalEnergyEstimation + 0.99);
		@@ -1084,6 +1090,8 @@ void LvmEffect_limitLevel(EffectContext *pContext) {
		/* Activate the initial settings */
		LvmStatus = LVM_SetControlParameters(pContext->pBundledContext->hInstance, &ActiveParams);
		LVM_ERROR_CHECK(LvmStatus, "LVM_SetControlParameters", "LvmEffect_limitLevel")

		ALOGV("LVM_SetControlParameters return:%d", (int)LvmStatus);
		//ALOGV("\tLvmEffect_limitLevel just Set -> %d\n",
		// ActiveParams.pEQNB_BandDefinition[band].Gain);

		@@ -1334,6 +1342,8 @@ int Effect_setConfig(EffectContext pContext, effect_config_t pConfig){
		ALOGV("\tEffect_setConfig Succesfully called LVM_SetControlParameters\n");
		pContext->pBundledContext->SampleRate = SampleRate;

		LvmEffect_limitLevel(pContext);

		}else{
		//ALOGV("\tEffect_setConfig keep sampling rate at %d", SampleRate);
		}
		@@ -3824,10 +3834,10 @@ int Effect_command(effect_handle_t self,
		if(rightdB > maxdB){
		maxdB = rightdB;
		}
		//ALOGV("\tEFFECT_CMD_SET_VOLUME Session: %d, SessionID: %d VOLUME is %d dB (%d), "
		//ALOGV("\tEFFECT_CMD_SET_VOLUME Session: %d, SessionID: %d VOLUME is %d dB, "
		// "effect is %d",
		//pContext->pBundledContext->SessionNo, pContext->pBundledContext->SessionId,
		//(int32_t)maxdB, maxVol<<7, pContext->EffectType);
		//(int32_t)maxdB, pContext->EffectType);
		//ALOGV("\tEFFECT_CMD_SET_VOLUME: Left is %d, Right is %d", leftVolume, rightVolume);
		//ALOGV("\tEFFECT_CMD_SET_VOLUME: Left %ddB, Right %ddB, Position %ddB",
		// leftdB, rightdB, pandB);

media/libeffects/lvm/wrapper/Bundle/EffectBundle.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -213,7 +213,7 @@ static const float LimitLevel_bandEnergyCrossCoefficient[FIVEBAND_NUMBANDS-1] =
		static const float LimitLevel_bassBoostEnergyCrossCoefficient[FIVEBAND_NUMBANDS] = {
		221.21, 208.10, 28.16, 0.0, 0.0 };

		static const float LimitLevel_bassBoostEnergyCoefficient = 7.12;
		static const float LimitLevel_bassBoostEnergyCoefficient = 9.00;

		static const float LimitLevel_virtualizerContribution = 1.9;