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

Commit c54efee7 authored by Subhadra Jagadeesan's avatar Subhadra Jagadeesan Committed by Ramireddy KrishnaKanth Reddy
Browse files

config: Enable 64-bit lib for extension features 

Changes to support 64-bit libs path used across audio
extensions and also in effect conf for 64-bit platform feature.

Change-Id: I80cc7bf64e90ce001b755ba4f16f2e9fe45ecdf1
parent 0d460b48

configs/msmnile_au/audio_effects_64.conf

0 → 100755
+354 −0
Original line number Diff line number Diff line 
# List of effect libraries to load. Each library element must contain a "path" element

# giving the full path of the library .so file.

#    libraries {

#        <lib name> {

#          path <lib path>

#        }

#    }

libraries {

  bundle {

    path /vendor/lib64/soundfx/libbundlewrapper.so

  }

  reverb {

    path /vendor/lib64/soundfx/libreverbwrapper.so

  }

  qcbassboost {

    path /vendor/lib64/soundfx/libqcbassboost.so

  }

  qcvirt {

    path /vendor/lib64/soundfx/libqcvirt.so

  }

  qcreverb {

    path /vendor/lib64/soundfx/libqcreverb.so

  }

  visualizer_sw {

    path /vendor/lib64/soundfx/libvisualizer.so

  }

  visualizer_hw {

    path /vendor/lib64/soundfx/libqcomvisualizer.so

  }

  downmix {

    path /vendor/lib64/soundfx/libdownmix.so

  }

  loudness_enhancer {

    path /vendor/lib64/soundfx/libldnhncr.so

  }

  dynamics_processing {

    path /vendor/lib64/soundfx/libdynproc.so

  }

  proxy {

    path /vendor/lib64/soundfx/libeffectproxy.so

  }

  offload_bundle {

    path /vendor/lib64/soundfx/libqcompostprocbundle.so

  }

  audio_pre_processing {

    path /vendor/lib64/soundfx/libqcomvoiceprocessing.so

  }

  audio_bmt {

    path /vendor/lib64/soundfx/libqtiautobundle.so

  }

  audio_fnb {

    path /vendor/lib64/soundfx/libqtiautobundle.so

  }

  audio_delay {

    path /vendor/lib64/soundfx/libqtiautobundle.so

  }

  audio_volume {

    path /vendor/lib64/soundfx/libqtiautobundle.so

  }

  audio_avc {

    path /vendor/lib64/soundfx/libqtiautobundle.so

  }

  audio_sumx {

    path /vendor/lib64/soundfx/libqtiautobundle.so

  }

  audio_synth {

    path /vendor/lib64/soundfx/libqtiautobundle.so

  }

}



# Default pre-processing library. Add to audio_effect.conf "libraries" section if

# audio HAL implements support for default software audio pre-processing effects

#

#  pre_processing {

#    path /vendor/lib/soundfx/libaudiopreprocessing.so

#  }



# list of effects to load. Each effect element must contain a "library" and a "uuid" element.

# The value of the "library" element must correspond to the name of one library element in the

# "libraries" element.

# The name of the effect element is indicative, only the value of the "uuid" element

# designates the effect.

# The uuid is the implementation specific UUID as specified by the effect vendor. This is not the

# generic effect type UUID.

#    effects {

#        <fx name> {

#            library <lib name>

#            uuid <effect uuid>

#        }

#        ...

#    }



effects {



# additions for the proxy implementation

# Proxy implementation

  #effectname {

    #library proxy

    #uuid  xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx



    # SW implemetation of the effect. Added as a node under the proxy to

    # indicate this as a sub effect.

      #libsw {

         #library libSW

         #uuid  yyyyyyyy-yyyy-yyyy-yyyy-yyyyyyyyyyyy

      #} End of SW effect



    # HW implementation of the effect. Added as a node under the proxy to

    # indicate this as a sub effect.

      #libhw {

         #library libHW

         #uuid  zzzzzzzz-zzzz-zzzz-zzzz-zzzzzzzzzzzz

      #}End of HW effect

  #} End of effect proxy



  bassboost {

    library proxy

    uuid 14804144-a5ee-4d24-aa88-0002a5d5c51b



    libsw {

      library qcbassboost

      uuid 23aca180-44bd-11e2-bcfd-0800200c9a66

    }



    libhw {

      library offload_bundle

      uuid 2c4a8c24-1581-487f-94f6-0002a5d5c51b

    }

  }

  virtualizer {

    library proxy

    uuid d3467faa-acc7-4d34-acaf-0002a5d5c51b



    libsw {

      library qcvirt

      uuid e6c98a16-22a3-11e2-b87b-f23c91aec05e

    }



    libhw {

      library offload_bundle

      uuid 509a4498-561a-4bea-b3b1-0002a5d5c51b

    }

  }

  equalizer {

    library proxy

    uuid c8e70ecd-48ca-456e-8a4f-0002a5d5c51b



    libsw {

      library bundle

      uuid ce772f20-847d-11df-bb17-0002a5d5c51b

    }



    libhw {

      library offload_bundle

      uuid a0dac280-401c-11e3-9379-0002a5d5c51b

    }

  }

  volume {

    library bundle

    uuid 119341a0-8469-11df-81f9-0002a5d5c51b

  }

  reverb_env_aux {

    library proxy

    uuid 48404ac9-d202-4ccc-bf84-0002a5d5c51b



    libsw {

      library qcreverb

      uuid a8c1e5f3-293d-43cd-95ec-d5e26c02e217

    }



    libhw {

      library offload_bundle

      uuid 79a18026-18fd-4185-8233-0002a5d5c51b

    }

  }

  reverb_env_ins {

    library proxy

    uuid b707403a-a1c1-4291-9573-0002a5d5c51b



    libsw {

      library qcreverb

      uuid 791fff8b-8129-4655-83a4-59bc61034c3a

    }



    libhw {

      library offload_bundle

      uuid eb64ea04-973b-43d2-8f5e-0002a5d5c51b

    }

  }

  reverb_pre_aux {

    library proxy

    uuid 1b78f587-6d1c-422e-8b84-0002a5d5c51b



    libsw {

      library qcreverb

      uuid 53ef1db5-c0c0-445b-b060-e34d20ebb70a

    }



    libhw {

      library offload_bundle

      uuid 6987be09-b142-4b41-9056-0002a5d5c51b

    }

  }

  reverb_pre_ins {

    library proxy

    uuid f3e178d2-ebcb-408e-8357-0002a5d5c51b



    libsw {

      library qcreverb

      uuid b08a0e38-22a5-11e2-b87b-f23c91aec05e

    }



    libhw {

      library offload_bundle

      uuid aa2bebf6-47cf-4613-9bca-0002a5d5c51b

    }

  }

  visualizer {

    library proxy

    uuid 1d0a1a53-7d5d-48f2-8e71-27fbd10d842c



    libsw {

      library visualizer_sw

      uuid  d069d9e0-8329-11df-9168-0002a5d5c51b

    }



    libhw {

      library visualizer_hw

      uuid 7a8044a0-1a71-11e3-a184-0002a5d5c51b

    }

  }

  downmix {

    library downmix

    uuid 93f04452-e4fe-41cc-91f9-e475b6d1d69f

  }

  hw_acc {

    library offload_bundle

    uuid 7d1580bd-297f-4683-9239-e475b6d1d69f

  }

  loudness_enhancer {

    library loudness_enhancer

    uuid fa415329-2034-4bea-b5dc-5b381c8d1e2c

  }

  dynamics_processing {

    library dynamics_processing

    uuid e0e6539b-1781-7261-676f-6d7573696340

  }

  aec {

    library audio_pre_processing

    uuid 0f8d0d2a-59e5-45fe-b6e4-248c8a799109

  }

  ns {

    library audio_pre_processing

    uuid 1d97bb0b-9e2f-4403-9ae3-58c2554306f8

  }

  auto_bmt {

    library auto_bmt

    uuid e039757b-a367-44e9-9bbb-634af0c51cb7

  }

  auto_fnb {

    library auto_fnb

    uuid 6bc88c84-a544-11e8-98d0-529269fb1459

  }

  auto_delay {

    library auto_delay

    uuid a31574a6-a5e7-11e8-98d0-529269fb1459

  }

  auto_volume {

    library auto_volume

    uuid 3d844dd4-a367-11e8-9eb6-529269fb1459

  }

  auto_avc {

    library auto_avc

    uuid 2130c69e-6a3a-4e35-9890-71687f0b78bf

  }

  auto_sumx {

    library auto_sumx

    uuid 32e9fe7f-de63-4d1b-a5d2-281e8492f3ce

  }

  auto_synth {

    library auto_synth

    uuid a124b54f-4026-4ed2-9316-4ba2d5effdb8

  }

}



# additional effect from vendor

# UUID generated using version 1



# Added aec, ns effects for voice_communication, which are supported by the board



pre_processing {

  voice_communication {

    aec {

    }

    ns  {

    }

  }

}



# Default pre-processing effects. Add to audio_effect.conf "effects" section if

# audio HAL implements support for them.

#

#  agc {

#    library pre_processing

#    uuid aa8130e0-66fc-11e0-bad0-0002a5d5c51b

#  }

#  aec {

#    library pre_processing

#    uuid bb392ec0-8d4d-11e0-a896-0002a5d5c51b

#  }

#  ns {

#    library pre_processing

#    uuid c06c8400-8e06-11e0-9cb6-0002a5d5c51b

#  }



# Audio preprocessor configurations.

# The pre processor configuration consists in a list of elements each describing

# pre processor settings for a given input source. Valid input source names are:

# "mic", "camcorder", "voice_recognition", "voice_communication"

# Each input source element contains a list of effects elements. The name of the effect

# element must be the name of one of the effects in the "effects" list of the file.

# Each effect element may optionally contain a list of parameters and their

# default value to apply when the pre processor effect is created.

# A parameter is defined by a "param" element and a "value" element. Each of these elements

# consists in one or more elements specifying a type followed by a value.

# The types defined are: "int", "short", "float", "bool" and "string"

# When both "param" and "value" are a single int, a simple form is allowed where just

# the param and value pair is present in the parameter description

#    pre_processing {

#        <input source name> {

#            <fx name> {

#                <param 1 name> {

#                    param {

#                        int|short|float|bool|string <value>

#                        [ int|short|float|bool|string <value> ]

#                        ...

#                    }

#                    value {

#                        int|short|float|bool|string <value>

#                        [ int|short|float|bool|string <value> ]

#                        ...

#                    }

#                }

#                <param 2 name > {<param> <value>}

#                ...

#            }

#            ...

#        }

#        ...

#    }



#

# TODO: add default audio pre processor configurations after debug and tuning phase

#

configs/msmnile_au/msmnile_au.mk

+10 −1
Original line number Diff line number Diff line
@@ -159,10 +159,17 @@ endif 
#Automotive audio specific device overlays

DEVICE_PACKAGE_OVERLAYS += vendor/qcom/opensource/audio-hal/primary-hal/configs/common_au/overlay



ifneq ( ,$(filter U UpsideDownCake 14, $(PLATFORM_VERSION)))

PRODUCT_COPY_FILES += \

    $(TOPDIR)vendor/qcom/opensource/audio-hal/primary-hal/configs/msmnile_au/audio_effects_64.conf:$(TARGET_COPY_OUT_VENDOR)/etc/audio_effects.conf

else

PRODUCT_COPY_FILES += \

    $((TOPDIR)vendor/qcom/opensource/audio-hal/primary-hal/configs/msmnile_au/audio_effects.conf:$(TARGET_COPY_OUT_VENDOR)/etc/audio_effects.conf

endif



PRODUCT_COPY_FILES += \

    vendor/qcom/opensource/audio-hal/primary-hal/configs/msmnile_au/mixer_paths_adp.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_adp.xml \

    vendor/qcom/opensource/audio-hal/primary-hal/configs/msmnile_au/audio_io_policy.conf:$(TARGET_COPY_OUT_VENDOR)/etc/audio_io_policy.conf \

    vendor/qcom/opensource/audio-hal/primary-hal/configs/msmnile_au/audio_effects.conf:$(TARGET_COPY_OUT_VENDOR)/etc/audio_effects.conf \

    vendor/qcom/opensource/audio-hal/primary-hal/configs/msmnile_au/audio_effects.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_effects.xml \

    vendor/qcom/opensource/audio-hal/primary-hal/configs/msmnile_au/mixer_paths_sa8295_adp.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_sa8295_adp.xml \

    vendor/qcom/opensource/audio-hal/primary-hal/configs/msmnile_au/audio_tuning_mixer.txt:$(TARGET_COPY_OUT_VENDOR)/etc/audio_tuning_mixer.txt \
@@ -178,6 +185,7 @@ PRODUCT_COPY_FILES += \ 
    frameworks/native/data/etc/android.hardware.audio.pro.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.audio.pro.xml \

    frameworks/native/data/etc/android.hardware.audio.low_latency.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.audio.low_latency.xml





#Automotive audio card defs dummpy files for elite and ar co-exit.

PRODUCT_COPY_FILES += \

    $(TOPDIR)vendor/qcom/opensource/audio-hal/primary-hal/configs/msmnile_au/card-defs-dummy.xml:$(TARGET_COPY_OUT_VENDOR)/etc/card-defs-dummy.xml
@@ -187,6 +195,7 @@ ifneq ($(TARGET_USES_AOSP_FOR_AUDIO), true) 
PRODUCT_COPY_FILES += \

    $(TOPDIR)vendor/qcom/opensource/audio-hal/primary-hal/configs/msmnile_au/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/audio_policy_configuration.xml

endif



PRODUCT_COPY_FILES += \

    $(TOPDIR)vendor/qcom/opensource/audio-hal/primary-hal/configs/common_au/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml \

    $(TOPDIR)frameworks/av/services/audiopolicy/config/a2dp_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/a2dp_audio_policy_configuration.xml \

hal/audio_extn/gef.c

+4 −0
Original line number Diff line number Diff line
@@ -58,8 +58,12 @@ 
#if LINUX_ENABLED

#define GEF_LIBRARY "libqtigef.so"

#else

#ifdef __LP64__

#define GEF_LIBRARY "/vendor/lib64/libqtigef.so"

#else

#define GEF_LIBRARY "/vendor/lib/libqtigef.so"

#endif

#endif



typedef void* (*gef_init_t)(void*);

typedef void (*gef_deinit_t)(void*);

hal/audio_extn/soundtrigger.c

+3 −1
Original line number Diff line number Diff line
@@ -226,8 +226,9 @@ static void get_library_path(char *lib_path) 
static void get_library_path(char *lib_path)

{

    snprintf(lib_path, MAX_LIBRARY_PATH,

             "/vendor/lib/hw/sound_trigger.primary.%s.so",

             SOUND_TRIGGER_LIBRARY_PATH,

             XSTR(SOUND_TRIGGER_PLATFORM_NAME));



}

#endif
@@ -814,6 +815,7 @@ int audio_extn_sound_trigger_init(struct audio_device *adev) 
    }



    get_library_path(sound_trigger_lib);

    ALOGV("%s: dlopen sound_trigger_lib path : %s\n", __func__, sound_trigger_lib);

    st_dev->lib_handle = dlopen(sound_trigger_lib, RTLD_NOW);



    if (st_dev->lib_handle == NULL) {

hal/audio_hw.h

+6 −0
Original line number Diff line number Diff line
@@ -120,10 +120,16 @@ typedef struct { 
#define ADM_LIBRARY_PATH "/usr/lib/libadm.so"

#endif

#else

#if defined(__LP64__)

#define VISUALIZER_LIBRARY_PATH "/vendor/lib64/soundfx/libqcomvisualizer.so"

#define OFFLOAD_EFFECTS_BUNDLE_LIBRARY_PATH "/vendor/lib64/soundfx/libqcompostprocbundle.so"

#define ADM_LIBRARY_PATH "/vendor/lib64/libadm.so"

#else

#define VISUALIZER_LIBRARY_PATH "/vendor/lib/soundfx/libqcomvisualizer.so"

#define OFFLOAD_EFFECTS_BUNDLE_LIBRARY_PATH "/vendor/lib/soundfx/libqcompostprocbundle.so"

#define ADM_LIBRARY_PATH "/vendor/lib/libadm.so"

#endif

#endif



/* Flags used to initialize acdb_settings variable that goes to ACDB library */

#define NONE_FLAG            0x00000000