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

Commit 51fd9e9e authored by Shunkai Yao's avatar Shunkai Yao Committed by Android (Google) Code Review
Browse files

Merge "Remove Descriptor proxy field from individual effect" into udc-dev

parents 0b1aefa0 db026a8c

audio/aidl/default/bassboost/BassBoostSw.cpp

+1 −2
Original line number Diff line number Diff line
@@ -68,8 +68,7 @@ const std::vector<Range::BassBoostRange> BassBoostSw::kRanges = { 
const Capability BassBoostSw::kCapability = {.range = {BassBoostSw::kRanges}};

const Descriptor BassBoostSw::kDescriptor = {

        .common = {.id = {.type = getEffectTypeUuidBassBoost(),

                          .uuid = getEffectImplUuidBassBoostSw(),

                          .proxy = getEffectImplUuidBassBoostProxy()},

                          .uuid = getEffectImplUuidBassBoostSw()},

                   .flags = {.type = Flags::Type::INSERT,

                             .insert = Flags::Insert::FIRST,

                             .volume = Flags::Volume::CTRL},

audio/aidl/default/equalizer/EqualizerSw.cpp

+8 −10
Original line number Diff line number Diff line
@@ -88,10 +88,8 @@ const std::vector<Range::EqualizerRange> EqualizerSw::kRanges = { 
        MAKE_RANGE(Equalizer, centerFreqMh, std::vector<int>({1}), std::vector<int>({0}))};



const Capability EqualizerSw::kEqCap = {.range = EqualizerSw::kRanges};

const Descriptor EqualizerSw::kDesc = {

        .common = {.id = {.type = getEffectTypeUuidEqualizer(),

                          .uuid = getEffectImplUuidEqualizerSw(),

                          .proxy = getEffectImplUuidEqualizerProxy()},

const Descriptor EqualizerSw::kDesc = {.common = {.id = {.type = getEffectTypeUuidEqualizer(),

                                                         .uuid = getEffectImplUuidEqualizerSw()},

                                                  .flags = {.type = Flags::Type::INSERT,

                                                            .insert = Flags::Insert::FIRST,

                                                            .volume = Flags::Volume::CTRL},

audio/aidl/default/virtualizer/VirtualizerSw.cpp

+2 −2
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


#include <algorithm>

#include <cstddef>

#include <optional>



#define LOG_TAG "AHAL_VirtualizerSw"

#include <Utils.h>
@@ -76,8 +77,7 @@ const Capability VirtualizerSw::kCapability = { 


const Descriptor VirtualizerSw::kDescriptor = {

        .common = {.id = {.type = getEffectTypeUuidVirtualizer(),

                          .uuid = getEffectImplUuidVirtualizerSw(),

                          .proxy = getEffectImplUuidVirtualizerProxy()},

                          .uuid = getEffectImplUuidVirtualizerSw()},

                   .flags = {.type = Flags::Type::INSERT,

                             .insert = Flags::Insert::FIRST,

                             .volume = Flags::Volume::CTRL},