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

Commit c4db9d17 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Audio V4: Use of EffectFlags over bitfield<EffectFlags>" into pi-dev

parents 2b2ffe64 4be23925

audio/effect/4.0/types.hal

+10 −10
Original line number Diff line number Diff line
@@ -203,7 +203,7 @@ struct EffectDescriptor { 
    Uuid type;                   // UUID of to the OpenSL ES interface implemented

                                 // by this effect

    Uuid uuid;                   // UUID for this particular implementation

    EffectFlags flags;     // effect engine capabilities/requirements flags

    bitfield<EffectFlags> flags; // effect engine capabilities/requirements flags

    uint16_t cpuLoad;            // CPU load indication expressed in 0.1 MIPS units

                                 // as estimated on an ARM9E core (ARMv5TE) with 0 WS

    uint16_t memoryUsage;        // data memory usage expressed in KB and includes

audio/effect/all-versions/default/include/effect/all-versions/default/Conversions.impl.h

+4 −1
Original line number Diff line number Diff line
@@ -19,7 +19,10 @@ 
#include <memory.h>

#include <stdio.h>



#include <common/all-versions/VersionUtils.h>



using ::android::hardware::audio::common::AUDIO_HAL_VERSION::HidlUtils;

using ::android::hardware::audio::common::utils::mkEnumConverter;



namespace android {

namespace hardware {
@@ -32,7 +35,7 @@ void effectDescriptorFromHal(const effect_descriptor_t& halDescriptor, 
                             EffectDescriptor* descriptor) {

    HidlUtils::uuidFromHal(halDescriptor.type, &descriptor->type);

    HidlUtils::uuidFromHal(halDescriptor.uuid, &descriptor->uuid);

    descriptor->flags = EffectFlags(halDescriptor.flags);

    descriptor->flags = mkEnumConverter<EffectFlags>(halDescriptor.flags);

    descriptor->cpuLoad = halDescriptor.cpuLoad;

    descriptor->memoryUsage = halDescriptor.memoryUsage;

    memcpy(descriptor->name.data(), halDescriptor.name, descriptor->name.size());

current.txt

+1 −1
Original line number Diff line number Diff line
@@ -286,7 +286,7 @@ a91b547f5922f39fe4231d97fac1c3825c1c1b0c8ef7a5136689ceed37e8bfe9 android.hardwar 
3661fa0623056922fdc4235ac5a9c91a2d066ab6f1ab4297e3b240fe302ba500 android.hardware.audio.effect@4.0::IPresetReverbEffect

e88e520f8c98a62fccd8d5316c6687808f775de145d1405a7a9a66587ee6a001 android.hardware.audio.effect@4.0::IVirtualizerEffect

fe28829dab10d171783b79ac9cc45412739f8ff275e90228d7c6370ef189b859 android.hardware.audio.effect@4.0::IVisualizerEffect

5d92f6fd58d40c56611bb12f03be6af9bcf2bb73dfb35b77a99bbf2c3ea5439b android.hardware.audio.effect@4.0::types

21c8a702579356480236c6851b5b2c16b9bd369ce12bdd6ffdc4626a89f34f73  android.hardware.audio.effect@4.0::types

42a06dc288f61b0690580f3d37b30b663c31d74d50bb58d0772386b550d5faab android.hardware.authsecret@1.0::IAuthSecret

a0f93c768c353cecee6237fe479bce47404eb10b629fafe07e32a054fd67f2af android.hardware.automotive.audiocontrol@1.0::IAudioControl

ca515ff4b63c80cf5ad7b3395c997c57d6c56157361f6c367d1c96f23cc4860a android.hardware.automotive.audiocontrol@1.0::types