Merge 658f5e2f on remote branch

# 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/lib/soundfx/libbundlewrapper.so

  }

  reverb {

    path /vendor/lib/soundfx/libreverbwrapper.so

  }

  qcbassboost {

    path /vendor/lib/soundfx/libqcbassboost.so

  }

  qcvirt {

    path /vendor/lib/soundfx/libqcvirt.so

  }

  qcreverb {

    path /vendor/lib/soundfx/libqcreverb.so

  }

  visualizer_sw {

    path /vendor/lib/soundfx/libvisualizer.so

  }

  visualizer_hw {

    path /vendor/lib/soundfx/libqcomvisualizer.so

  }

  downmix {

    path /vendor/lib/soundfx/libdownmix.so

  }

  loudness_enhancer {

    path /vendor/lib/soundfx/libldnhncr.so

  }

  dynamics_processing {

    path /vendor/lib/soundfx/libdynproc.so

  }

  proxy {

    path /vendor/lib/soundfx/libeffectproxy.so

  }

  offload_bundle {

    path /vendor/lib/soundfx/libqcompostprocbundle.so

  }

  audio_pre_processing {

    path /vendor/lib/soundfx/libqcomvoiceprocessing.so

  }

  volume_listener {

    path /vendor/lib/soundfx/libvolumelistener.so

  }

  audiosphere {

    path /vendor/lib/soundfx/libasphere.so

  }

  shoebox {

    path /vendor/lib/soundfx/libshoebox.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

  }

  music_helper {

    library volume_listener

    uuid 08b8b058-0590-11e5-ac71-0025b32654a0

  }

  ring_helper {

    library volume_listener

    uuid 0956df94-0590-11e5-bdbe-0025b32654a0

  }

  alarm_helper {

    library volume_listener

    uuid 09f303e2-0590-11e5-8fdb-0025b32654a0

  }

  # voice_helper is called when stream type is voice_call in VoIP usecase

  voice_helper {

    library volume_listener

    uuid 0ace5c08-0590-11e5-ae9e-0025b32654a0

  }

  notification_helper {

    library volume_listener

    uuid 0b776dde-0590-11e5-81ba-0025b32654a0

  }

  audiosphere {

    library audiosphere

    uuid 184e62ab-2d19-4364-9d1b-c0a40733866c

  }

  shoebox {

    library shoebox

    uuid 1eab784c-1a36-4b2a-b7fc-e34c44cab89e

  }

}

# additional effect from vendor

# UUID generated using version 1

output_session_processing {

    music {

        music_helper {

        }

    }

    ring {

        ring_helper {

        }

    }

    alarm {

        alarm_helper {

        }

    }

    # stream type voice_call is used for VoIP call

    voice_call {

        voice_helper {

        }

    }

    notification {

        notification_helper {

        }

    }

}

# 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

#

<?xml version="1.0" encoding="UTF-8"?>

<!--- Copyright (c) 2018-2019, The Linux Foundation. All rights reserved.            -->

<!---                                                                           -->

<!--- Redistribution and use in source and binary forms, with or without        -->

<!--- modification, are permitted provided that the following conditions are    -->

<!--- met:                                                                      -->

<!---     * Redistributions of source code must retain the above copyright      -->

<!---       notice, this list of conditions and the following disclaimer.       -->

<!---     * Redistributions in binary form must reproduce the above             -->

<!---       copyright notice, this list of conditions and the following         -->

<!---       disclaimer in the documentation and/or other materials provided     -->

<!---       with the distribution.                                              -->

<!---     * Neither the name of The Linux Foundation nor the names of its       -->

<!---       contributors may be used to endorse or promote products derived     -->

<!---       from this software without specific prior written permission.       -->

<!---                                                                           -->

<!--- THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED              -->

<!--- WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF      -->

<!--- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT    -->

<!--- ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS    -->

<!--- BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR    -->

<!--- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF      -->

<!--- SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR           -->

<!--- BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,     -->

<!--- WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE      -->

<!--- OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN    -->

<!--- IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.                             -->

<audio_effects_conf version="2.0" xmlns="http://schemas.android.com/audio/audio_effects_conf/v2_0">

    <libraries>

        <library name="bundle" path="libbundlewrapper.so"/>

        <library name="reverb" path="libreverbwrapper.so"/>

        <library name="qcbassboost" path="libqcbassboost.so"/>

        <library name="qcvirt" path="libqcvirt.so"/>

        <library name="qcreverb" path="libqcreverb.so"/>

        <library name="visualizer_sw" path="libvisualizer.so"/>

        <library name="visualizer_hw" path="libqcomvisualizer.so"/>

        <library name="downmix" path="libdownmix.so"/>

        <library name="loudness_enhancer" path="libldnhncr.so"/>

        <library name="dynamics_processing" path="libdynproc.so"/>

        <library name="proxy" path="libeffectproxy.so"/>

        <library name="offload_bundle" path="libqcompostprocbundle.so"/>

        <library name="audio_pre_processing" path="libqcomvoiceprocessing.so"/>

        <library name="volume_listener" path="libvolumelistener.so"/>

        <library name="audiosphere" path="libasphere.so"/>

        <library name="shoebox" path="libshoebox.so"/>

    </libraries>

    <effects>

        <effectProxy name="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"/>

        </effectProxy>

        <effectProxy name="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"/>

        </effectProxy>

        <effectProxy name="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"/>

        </effectProxy>

        <effect name="volume" library="bundle" uuid="119341a0-8469-11df-81f9-0002a5d5c51b"/>

        <effectProxy name="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"/>

        </effectProxy>

        <effectProxy name="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"/>

        </effectProxy>

        <effectProxy name="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"/>

        </effectProxy>

        <effectProxy name="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"/>

        </effectProxy>

        <effectProxy name="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"/>

        </effectProxy>

        <effect name="downmix" library="downmix" uuid="93f04452-e4fe-41cc-91f9-e475b6d1d69f"/>

        <effect name="hw_acc" library="offload_bundle" uuid="7d1580bd-297f-4683-9239-e475b6d1d69f"/>

        <effect name="loudness_enhancer" library="loudness_enhancer" uuid="fa415329-2034-4bea-b5dc-5b381c8d1e2c"/>

        <effect name="dynamics_processing" library="dynamics_processing" uuid="e0e6539b-1781-7261-676f-6d7573696340"/>

        <effect name="aec" library="audio_pre_processing" uuid="0f8d0d2a-59e5-45fe-b6e4-248c8a799109"/>

        <effect name="ns" library="audio_pre_processing" uuid="1d97bb0b-9e2f-4403-9ae3-58c2554306f8"/>

        <effect name="music_helper" library="volume_listener" uuid="08b8b058-0590-11e5-ac71-0025b32654a0"/>

        <effect name="ring_helper" library="volume_listener" uuid="0956df94-0590-11e5-bdbe-0025b32654a0"/>

        <effect name="alarm_helper" library="volume_listener" uuid="09f303e2-0590-11e5-8fdb-0025b32654a0"/>

        <effect name="voice_helper" library="volume_listener" uuid="0ace5c08-0590-11e5-ae9e-0025b32654a0"/>

        <effect name="notification_helper" library="volume_listener" uuid="0b776dde-0590-11e5-81ba-0025b32654a0"/>

        <effect name="audiosphere" library="audiosphere" uuid="184e62ab-2d19-4364-9d1b-c0a40733866c"/>

        <effect name="shoebox" library="shoebox" uuid="1eab784c-1a36-4b2a-b7fc-e34c44cab89e"/>

    </effects>

    <postprocess>

        <stream type="music">

            <apply effect="music_helper"/>

        </stream>

        <stream type="ring">

            <apply effect="ring_helper"/>

        </stream>

        <stream type="alarm">

            <apply effect="alarm_helper"/>

        </stream>

        <stream type="voice_call">

            <apply effect="voice_helper"/>

        </stream>

        <stream type="notification">

            <apply effect="notification_helper"/>

        </stream>

    </postprocess>

    <preprocess>

        <stream type="voice_communication">

            <apply effect="aec"/>

            <apply effect="ns"/>

        </stream>

    </preprocess>

</audio_effects_conf>

# List of profiles for the output device session where stream is routed.

# A stream opened with the inputs attributes which match the "flags" and

# "formats" as specified in the profile is routed to a device at

# sample rate specified under "sampling_rates" and bit width under

# "bit_width" and the topology extracted from the acdb data against

# the "app_type".

#

# the flags and formats are specified using the strings corresponding to

# enums in audio.h and audio_policy.h. They are concatenated with "|"

# without space or "\n".

# the flags and formats should match the ones in "audio_policy.conf"

outputs {

  default {

    flags AUDIO_OUTPUT_FLAG_PRIMARY

    formats AUDIO_FORMAT_PCM_16_BIT

    sampling_rates 48000

    bit_width 16

    app_type 69937

  }

  proaudio {

    flags AUDIO_OUTPUT_FLAG_FAST|AUDIO_OUTPUT_FLAG_RAW

    formats AUDIO_FORMAT_PCM_16_BIT

    sampling_rates 48000

    bit_width 16

    app_type 69943

  }

  voip_rx {

    flags AUDIO_OUTPUT_FLAG_VOIP_RX|AUDIO_OUTPUT_FLAG_DIRECT

    formats AUDIO_FORMAT_PCM_16_BIT

    sampling_rates 8000|16000|32000|48000

    bit_width 16

    app_type 69946

  }

  deep_buffer {

    flags AUDIO_OUTPUT_FLAG_DEEP_BUFFER

    formats AUDIO_FORMAT_PCM_16_BIT

    sampling_rates 48000

    bit_width 16

    app_type 69936

  }

  direct_pcm_16 {

    flags AUDIO_OUTPUT_FLAG_DIRECT

    formats AUDIO_FORMAT_PCM_16_BIT|AUDIO_FORMAT_PCM_24_BIT_PACKED|AUDIO_FORMAT_PCM_8_24_BIT|AUDIO_FORMAT_PCM_32_BIT

    sampling_rates 44100|48000|88200|96000|176400|192000

    bit_width 16

    app_type 69936

  }

  direct_pcm_24 {

    flags AUDIO_OUTPUT_FLAG_DIRECT

    formats AUDIO_FORMAT_PCM_24_BIT_PACKED|AUDIO_FORMAT_PCM_8_24_BIT|AUDIO_FORMAT_PCM_32_BIT

    sampling_rates 44100|48000|88200|96000|176400|192000|352800|384000

    bit_width 24

    app_type 69940

  }

  direct_pcm_32 {

    flags AUDIO_OUTPUT_FLAG_DIRECT

    formats AUDIO_FORMAT_PCM_32_BIT

    sampling_rates 44100|48000|88200|96000|176400|192000|352800|384000

    bit_width 32

    app_type 69942

  }

  compress_passthrough {

    flags AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD|AUDIO_OUTPUT_FLAG_NON_BLOCKING|AUDIO_OUTPUT_FLAG_COMPRESS_PASSTHROUGH

    formats AUDIO_FORMAT_AC3|AUDIO_FORMAT_E_AC3|AUDIO_FORMAT_E_AC3_JOC|AUDIO_FORMAT_DTS|AUDIO_FORMAT_DTS_HD|AUDIO_FORMAT_DSD

    sampling_rates 32000|44100|48000|88200|96000|176400|192000|352800

    bit_width 16

    app_type 69941

  }

  compress_offload_16 {

    flags AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD|AUDIO_OUTPUT_FLAG_NON_BLOCKING

    formats AUDIO_FORMAT_MP3|AUDIO_FORMAT_PCM_16_BIT_OFFLOAD|AUDIO_FORMAT_PCM_24_BIT_OFFLOAD|AUDIO_FORMAT_FLAC|AUDIO_FORMAT_ALAC|AUDIO_FORMAT_APE|AUDIO_FORMAT_AAC_LC|AUDIO_FORMAT_AAC_HE_V1|AUDIO_FORMAT_AAC_HE_V2|AUDIO_FORMAT_WMA|AUDIO_FORMAT_WMA_PRO|AUDIO_FORMAT_VORBIS|AUDIO_FORMAT_AAC_ADTS_LC|AUDIO_FORMAT_AAC_ADTS_HE_V1|AUDIO_FORMAT_AAC_ADTS_HE_V2

    sampling_rates 44100|48000|88200|96000|176400|192000

    bit_width 16

    app_type 69936

  }

  compress_offload_24 {

    flags AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD|AUDIO_OUTPUT_FLAG_NON_BLOCKING

    formats AUDIO_FORMAT_PCM_24_BIT_OFFLOAD|AUDIO_FORMAT_FLAC|AUDIO_FORMAT_ALAC|AUDIO_FORMAT_APE|AUDIO_FORMAT_VORBIS|AUDIO_FORMAT_WMA|AUDIO_FORMAT_WMA_PRO

    sampling_rates 44100|48000|88200|96000|176400|192000

    bit_width 24

    app_type 69940

  }

}

inputs {

  record_24bit {

    formats AUDIO_FORMAT_PCM_24_BIT_PACKED|AUDIO_FORMAT_PCM_24_BIT

    sampling_rates 44100|48000|88200|96000|176400|192000

    bit_width 24

    app_type 69938

  }

  record_32bit {

    formats AUDIO_FORMAT_PCM_32_BIT|AUDIO_FORMAT_PCM_FLOAT

    sampling_rates 44100|48000|88200|96000|176400|192000

    bit_width 32

    app_type 69938

  }

}