Merge "Volume Control: Modify Volume Level Range Values." into main (e1f30fed) · Commits · e / os / android_frameworks_av

media/libeffects/lvm/wrapper/Aidl/BundleContext.cpp

+10 −10

Original line number	Diff line number	Diff line
		@@ -284,15 +284,15 @@ RetCode BundleContext::limitLevel() {

		// roundoff
		int maxLevelRound = (int)(totalEnergyEstimation + 0.99);
		if (maxLevelRound + mVolume > 0) {
		gainCorrection = maxLevelRound + mVolume;
		if (maxLevelRound + mVolumedB > 0) {
		gainCorrection = maxLevelRound + mVolumedB;
		}

		params.VC_EffectLevel = mVolume - gainCorrection;
		params.VC_EffectLevel = mVolumedB - gainCorrection;
		if (params.VC_EffectLevel < -96) {
		params.VC_EffectLevel = -96;
		}
		LOG(INFO) << "\tVol: " << mVolume << ", GainCorrection: " << gainCorrection
		LOG(INFO) << "\tVol: " << mVolumedB << ", GainCorrection: " << gainCorrection
		<< ", Actual vol: " << params.VC_EffectLevel;

		/* Activate the initial settings */
		@@ -576,25 +576,25 @@ RetCode BundleContext::setBassBoostStrength(int strength) {

		RetCode BundleContext::setVolumeLevel(float level) {
		if (mMuteEnabled) {
		mLevelSaved = level;
		mLevelSaveddB = level;
		} else {
		mVolume = level;
		mVolumedB = level;
		}
		LOG(INFO) << __func__ << " success with level " << level;
		return limitLevel();
		}

		float BundleContext::getVolumeLevel() const {
		return (mMuteEnabled ? mLevelSaved : mVolume);
		return (mMuteEnabled ? mLevelSaveddB : mVolumedB);
		}

		RetCode BundleContext::setVolumeMute(bool mute) {
		mMuteEnabled = mute;
		if (mMuteEnabled) {
		mLevelSaved = mVolume;
		mVolume = -96;
		mLevelSaveddB = mVolumedB;
		mVolumedB = -96;
		} else {
		mVolume = mLevelSaved;
		mVolumedB = mLevelSaveddB;
		}
		return limitLevel();
		}

+2 −2

Original line number	Diff line number	Diff line
		@@ -124,8 +124,8 @@ class BundleContext final : public EffectContext {
		bool mVirtualizerTempDisabled = false;
		::aidl::android::media::audio::common::AudioDeviceDescription mForceDevice;
		// Volume
		float mLevelSaved = 0; /* for when mute is set, level must be saved */
		float mVolume = 0;
		float mLevelSaveddB = 0; /* for when mute is set, level must be saved */
		float mVolumedB = 0;
		bool mMuteEnabled = false; /* Must store as mute = -96dB level */

		RetCode initControlParameter(LVM_ControlParams_t& params) const;

+1 −2

Original line number	Diff line number	Diff line
		@@ -129,8 +129,7 @@ static const Descriptor kVirtualizerDesc = {
		.implementor = "NXP Software Ltd."},
		.capability = kVirtualizerCap};

		static const std::vector<Range::VolumeRange> kVolumeRanges = {
		MAKE_RANGE(Volume, levelDb, -9600, 0)};
		static const std::vector<Range::VolumeRange> kVolumeRanges = {MAKE_RANGE(Volume, levelDb, -96, 0)};
		static const Capability kVolumeCap = {.range = kVolumeRanges};
		static const std::string kVolumeEffectName = "Volume";
		static const Descriptor kVolumeDesc = {