Merge "[AIDL CTS] pass Equalizer implementation cts" (6710d52c) · Commits · e / os / android_hardware_interfaces

audio/aidl/default/equalizer/EqualizerSw.cpp

+11 −4

Original line number	Diff line number	Diff line
		@@ -76,11 +76,10 @@ const std::vector<Equalizer::Preset> EqualizerSw::kPresets = {
		const std::vector<Range::EqualizerRange> EqualizerSw::kRanges = {
		MAKE_RANGE(Equalizer, preset, 0, EqualizerSw::kPresets.size() - 1),
		MAKE_RANGE(Equalizer, bandLevels,
		std::vector<Equalizer::BandLevel>{Equalizer::BandLevel(
		{.index = 0, .levelMb = std::numeric_limits<int>::min()})},
		std::vector<Equalizer::BandLevel>{
		Equalizer::BandLevel({.index = EqualizerSwContext::kMaxBandNumber - 1,
		.levelMb = std::numeric_limits<int>::max()})}),
		Equalizer::BandLevel({.index = 0, .levelMb = -15})},
		std::vector<Equalizer::BandLevel>{Equalizer::BandLevel(
		{.index = EqualizerSwContext::kMaxBandNumber - 1, .levelMb = 15})}),
		/* capability definition */
		MAKE_RANGE(Equalizer, bandFrequencies, EqualizerSw::kBandFrequency,
		EqualizerSw::kBandFrequency),
		@@ -171,6 +170,14 @@ ndk::ScopedAStatus EqualizerSw::getParameterEqualizer(const Equalizer::Tag& tag,
		eqParam.set<Equalizer::centerFreqMh>(mContext->getCenterFreqs());
		break;
		}
		case Equalizer::bandFrequencies: {
		eqParam.set<Equalizer::bandFrequencies>(kBandFrequency);
		break;
		}
		case Equalizer::presets: {
		eqParam.set<Equalizer::presets>(kPresets);
		break;
		}
		default: {
		LOG(ERROR) << __func__ << " not handled tag: " << toString(tag);
		return ndk::ScopedAStatus::fromExceptionCodeWithMessage(EX_ILLEGAL_ARGUMENT,