Merge "msm8909: Bringup changes for HIDL component and compilation fix"

# Copyright (c) 2014-2016, 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.

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

  }

  reverb {

    path /system/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 /system/lib/soundfx/libvisualizer.so

  }

  visualizer_hw {

    path /system/lib/soundfx/libqcomvisualizer.so

  }

  downmix {

    path /system/lib/soundfx/libdownmix.so

  }

  loudness_enhancer {

    path /system/lib/soundfx/libldnhncr.so

  }

  proxy {

    path /system/lib/soundfx/libeffectproxy.so

  }

  offload_bundle {

    path /system/lib/soundfx/libqcompostprocbundle.so

  }

  audio_pre_processing {

    path /system/lib/soundfx/libqcomvoiceprocessing.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 /system/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

  }

  loudness_enhancer {

    library loudness_enhancer

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

  }

  aec {

    library audio_pre_processing

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

  }

  ns {

    library audio_pre_processing

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

  }

}

# 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>}

#                ...

#            }

#            ...

#        }

#        ...

#    }

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

pre_processing {

  voice_communication {

    aec {

    }

    ns  {

    }

  }

}

#

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

#

<?xml version="1.0" encoding="ISO-8859-1"?>

<!-- Copyright (c) 2015-2016, 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_platform_info>

    <interface_names>

        <device name="AUDIO_DEVICE_IN_BUILTIN_MIC" interface="QUATERNARY_MI2S" codec_type="external"/>

        <device name="AUDIO_DEVICE_IN_BACK_MIC" interface="QUATERNARY_MI2S" codec_type="external"/>

        <device name="AUDIO_DEVICE_IN_BUILTIN_MIC" interface="TERT_MI2S" codec_type="internal"/>

        <device name="AUDIO_DEVICE_IN_BACK_MIC" interface="TERT_MI2S" codec_type="internal"/>

    </interface_names>

</audio_platform_info>

# Copyright (c) 2014-2016, 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.

# Global configuration section: lists input and output devices always present on the device

# as well as the output device selected by default.

# Devices are designated by a string that corresponds to the enum in audio.h

global_configuration {

  attached_output_devices AUDIO_DEVICE_OUT_EARPIECE|AUDIO_DEVICE_OUT_SPEAKER

  default_output_device AUDIO_DEVICE_OUT_SPEAKER

  attached_input_devices AUDIO_DEVICE_IN_BUILTIN_MIC|AUDIO_DEVICE_IN_BACK_MIC|AUDIO_DEVICE_IN_REMOTE_SUBMIX|AUDIO_DEVICE_IN_VOICE_CALL|AUDIO_DEVICE_IN_FM_TUNER

}

# audio hardware module section: contains descriptors for all audio hw modules present on the

# device. Each hw module node is named after the corresponding hw module library base name.

# For instance, "primary" corresponds to audio.primary.<device>.so.

# The "primary" module is mandatory and must include at least one output with

# AUDIO_OUTPUT_FLAG_PRIMARY flag.

# Each module descriptor contains one or more output profile descriptors and zero or more

# input profile descriptors. Each profile lists all the parameters supported by a given output

# or input stream category.

# The "channel_masks", "formats", "devices" and "flags" are specified using strings corresponding

# to enums in audio.h and audio_policy.h. They are concatenated by use of "|" without space or "\n".

audio_hw_modules {

  primary {

    outputs {

      primary {

        sampling_rates 44100|48000

        channel_masks AUDIO_CHANNEL_OUT_STEREO

        formats AUDIO_FORMAT_PCM_16_BIT

        devices AUDIO_DEVICE_OUT_EARPIECE|AUDIO_DEVICE_OUT_SPEAKER|AUDIO_DEVICE_OUT_WIRED_HEADSET|AUDIO_DEVICE_OUT_WIRED_HEADPHONE|AUDIO_DEVICE_OUT_ALL_SCO|AUDIO_DEVICE_OUT_PROXY|AUDIO_DEVICE_OUT_ANLG_DOCK_HEADSET|AUDIO_DEVICE_OUT_FM

        flags AUDIO_OUTPUT_FLAG_PRIMARY

      }

      low_latency {

         sampling_rates 44100|48000

         channel_masks AUDIO_CHANNEL_OUT_STEREO

         formats AUDIO_FORMAT_PCM_16_BIT

         devices AUDIO_DEVICE_OUT_SPEAKER|AUDIO_DEVICE_OUT_EARPIECE|AUDIO_DEVICE_OUT_WIRED_HEADSET|AUDIO_DEVICE_OUT_WIRED_HEADPHONE|AUDIO_DEVICE_OUT_ALL_SCO|AUDIO_DEVICE_OUT_PROXY|AUDIO_DEVICE_OUT_ANLG_DOCK_HEADSET

         flags AUDIO_OUTPUT_FLAG_FAST

      }

      compress_offload {

        sampling_rates 8000|11025|16000|22050|32000|44100|48000

        channel_masks AUDIO_CHANNEL_OUT_MONO|AUDIO_CHANNEL_OUT_STEREO

        formats AUDIO_FORMAT_MP3|AUDIO_FORMAT_AAC_LC|AUDIO_FORMAT_AAC_HE_V1|AUDIO_FORMAT_AAC_HE_V2

        devices AUDIO_DEVICE_OUT_SPEAKER|AUDIO_DEVICE_OUT_EARPIECE|AUDIO_DEVICE_OUT_WIRED_HEADSET|AUDIO_DEVICE_OUT_WIRED_HEADPHONE|AUDIO_DEVICE_OUT_ALL_SCO|AUDIO_DEVICE_OUT_PROXY|AUDIO_DEVICE_OUT_ANLG_DOCK_HEADSET

        flags AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD|AUDIO_OUTPUT_FLAG_NON_BLOCKING

      }

      voip_rx {

        sampling_rates 8000|16000

        channel_masks AUDIO_CHANNEL_OUT_MONO

        formats AUDIO_FORMAT_PCM_16_BIT|AUDIO_FORMAT_AMR_NB|AUDIO_FORMAT_AMR_WB|AUDIO_FORMAT_QCELP|AUDIO_FORMAT_EVRC|AUDIO_FORMAT_EVRCB|AUDIO_FORMAT_EVRCWB|AUDIO_FORMAT_EVRCNW

        devices AUDIO_DEVICE_OUT_SPEAKER|AUDIO_DEVICE_OUT_EARPIECE|AUDIO_DEVICE_OUT_WIRED_HEADSET|AUDIO_DEVICE_OUT_WIRED_HEADPHONE|AUDIO_DEVICE_OUT_ANLG_DOCK_HEADSET|AUDIO_DEVICE_OUT_ALL_USB|AUDIO_DEVICE_OUT_ALL_SCO

        flags AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_VOIP_RX

      }

    }

    inputs {

      primary {

        sampling_rates 8000|11025|12000|16000|22050|24000|32000|44100|48000

        channel_masks AUDIO_CHANNEL_IN_MONO|AUDIO_CHANNEL_IN_STEREO|AUDIO_CHANNEL_IN_FRONT_BACK

        formats AUDIO_FORMAT_PCM_16_BIT|AUDIO_FORMAT_AMR_NB|AUDIO_FORMAT_AMR_WB|AUDIO_FORMAT_QCELP|AUDIO_FORMAT_EVRC|AUDIO_FORMAT_EVRCB|AUDIO_FORMAT_EVRCWB|AUDIO_FORMAT_EVRCNW

        devices AUDIO_DEVICE_IN_BUILTIN_MIC|AUDIO_DEVICE_IN_WIRED_HEADSET|AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET|AUDIO_DEVICE_IN_BACK_MIC|AUDIO_DEVICE_IN_ANLG_DOCK_HEADSET|AUDIO_DEVICE_IN_VOICE_CALL|AUDIO_DEVICE_IN_FM_TUNER

      }

    }

  }

  a2dp {

    outputs {

      a2dp {

        sampling_rates 44100

        channel_masks AUDIO_CHANNEL_OUT_STEREO

        formats AUDIO_FORMAT_PCM_16_BIT

        devices AUDIO_DEVICE_OUT_ALL_A2DP

      }

    }

  }

  usb {

    outputs {

      usb_accessory {

        sampling_rates 44100

        channel_masks AUDIO_CHANNEL_OUT_STEREO

        formats AUDIO_FORMAT_PCM_16_BIT

        devices AUDIO_DEVICE_OUT_USB_ACCESSORY

      }

      usb_device {

        sampling_rates dynamic

        channel_masks dynamic

        formats dynamic

        devices AUDIO_DEVICE_OUT_USB_DEVICE

      }

    }

    inputs {

      usb_device {

        sampling_rates dynamic

        channel_masks AUDIO_CHANNEL_IN_STEREO

        formats AUDIO_FORMAT_PCM_16_BIT

        devices AUDIO_DEVICE_IN_USB_DEVICE

      }

    }

  }

  r_submix {

    outputs {

      submix {

        sampling_rates 48000

        channel_masks AUDIO_CHANNEL_OUT_STEREO

        formats AUDIO_FORMAT_PCM_16_BIT

        devices AUDIO_DEVICE_OUT_REMOTE_SUBMIX

      }

    }

    inputs {

      submix {

        sampling_rates 48000

        channel_masks AUDIO_CHANNEL_IN_STEREO

        formats AUDIO_FORMAT_PCM_16_BIT

        devices AUDIO_DEVICE_IN_REMOTE_SUBMIX

      }

    }

  }

}