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

Commit 4fc643f7 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "post_proc: Update acdb_audio_cal_cfg structure to support Instance ID"

parents 33ce13ac 3db4a293
Loading
Loading
Loading
Loading
+4 −0
Original line number Original line Diff line number Diff line
@@ -112,6 +112,10 @@ ifeq ($(strip $(AUDIO_FEATURE_ENABLED_DTS_EAGLE)), true)
LOCAL_CFLAGS += -DHW_ACC_HPX
LOCAL_CFLAGS += -DHW_ACC_HPX
endif
endif


ifeq ($(strip $(AUDIO_FEATURE_ENABLED_INSTANCE_ID)), true)
    LOCAL_CFLAGS += -DINSTANCE_ID_ENABLED
endif

LOCAL_MODULE:= libhwacceffectswrapper
LOCAL_MODULE:= libhwacceffectswrapper
LOCAL_VENDOR_MODULE := true
LOCAL_VENDOR_MODULE := true


+5 −1
Original line number Original line Diff line number Diff line
/*
/*
 * Copyright (c) 2013-2015, 2017, The Linux Foundation. All rights reserved.
 * Copyright (c) 2013-2015, 2017-2018, The Linux Foundation. All rights reserved.
 * Not a Contribution.
 * Not a Contribution.
 *
 *
 * Copyright (C) 2013 The Android Open Source Project
 * Copyright (C) 2013 The Android Open Source Project
@@ -63,6 +63,10 @@ typedef struct acdb_audio_cal_cfg {
        uint32_t sampling_rate;
        uint32_t sampling_rate;
        uint32_t cal_type;
        uint32_t cal_type;
        uint32_t module_id;
        uint32_t module_id;
#ifdef INSTANCE_ID_ENABLED
        uint16_t instance_id;
        uint16_t reserved;
#endif
        uint32_t param_id;
        uint32_t param_id;
} acdb_audio_cal_cfg_t;
} acdb_audio_cal_cfg_t;