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

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

Merge "Equalizer presets negative index filter out and validation" into main... 

Merge "Equalizer presets negative index filter out and validation" into main am: 924bb6be am: 6b68eb61

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



Change-Id: I4aa77e8cc63de378e662dde0983cf0fd42972d3b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 00137676 6b68eb61

media/libaudiohal/impl/effectsAidlConversion/AidlConversionEq.cpp

+14 −2
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include <cstdint>

#include <cstring>

#include <optional>

#include <unordered_set>

#define LOG_TAG "AidlConversionEQ"

//#define LOG_NDEBUG 0
@@ -262,10 +263,21 @@ status_t AidlConversionEq::getParameter(EffectParamWriter& param) { 
        }

        case EQ_PARAM_GET_NUM_OF_PRESETS: {

            Parameter aidlParam = VALUE_OR_RETURN_STATUS(getAidlParameter(Equalizer::presets));

            const auto& presets = VALUE_OR_RETURN_STATUS(GET_PARAMETER_SPECIFIC_FIELD(

            auto presets = VALUE_OR_RETURN_STATUS(GET_PARAMETER_SPECIFIC_FIELD(

                    aidlParam, Equalizer, equalizer, Equalizer::presets,

                    std::vector<Equalizer::Preset>));

            uint16_t num = presets.size();

            // it was assumed the presets index in the range of [0, NUM_OF_PRESETS - 1], so

            // filter out presets out of this range (one example is preset {-1, "custom"})

            std::erase_if(presets, [](const auto& preset) { return preset.index < 0; });

            // validate remaining indexes are unique [0, num - 1]

            std::unordered_set<uint16_t> uniqueIndices;

            const uint16_t num = presets.size();

            for (const auto& preset : presets) {

                if (preset.index >= num || 0 != uniqueIndices.count(preset.index)) {

                    return BAD_VALUE;

                }

                uniqueIndices.insert(preset.index);

            }

            return param.writeToValue(&num);

        }

        case EQ_PARAM_GET_PRESET_NAME: {