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

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

Merge "Add Custom preset for equalizer effect to fix effect STS test case" into main am: 878d2f65 

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/3118714



Change-Id: Id41463ec768a56850144ebef5ec9411ee3788deb
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3257d914 878d2f65

media/libeffects/lvm/wrapper/Aidl/BundleTypes.h

+3 −3
Original line number Diff line number Diff line
@@ -65,9 +65,9 @@ constexpr inline std::array<std::array<int16_t, MAX_NUM_BANDS>, MAX_NUM_PRESETS> 
         {5, 3, -1, 3, 5}}}; /* Rock Preset */



static const std::vector<Equalizer::Preset> kEqPresets = {

        {0, "Normal"},      {1, "Classical"}, {2, "Dance"}, {3, "Flat"}, {4, "Folk"},

        {5, "Heavy Metal"}, {6, "Hip Hop"},   {7, "Jazz"},  {8, "Pop"},  {9, "Rock"}};



        {-1, "Custom"}, {0, "Normal"}, {1, "Classical"},   {2, "Dance"},

        {3, "Flat"},    {4, "Folk"},   {5, "Heavy Metal"}, {6, "Hip Hop"},

        {7, "Jazz"},    {8, "Pop"},    {9, "Rock"}};



const std::vector<Range::EqualizerRange> kEqRanges = {

        MAKE_RANGE(Equalizer, preset, 0, MAX_NUM_PRESETS - 1),