Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c6707889 authored by Shunkai Yao's avatar Shunkai Yao Committed by Automerger Merge Worker
Browse files

Merge "[AIDL CTS] pass Equalizer implementation cts" am: 6710d52c am:... 

Merge "[AIDL CTS] pass Equalizer implementation cts" am: 6710d52c am: aed58452 am: 36c6e51c am: b6d71c58

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2448443



Change-Id: Ib1d339780ac6de059bd57f1caf6076d336fe75ac
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d2e46d96 b6d71c58

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,