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

Commit 1a9395a0 authored by Ethan Chen's avatar Ethan Chen
Browse files

Merge remote-tracking branch 'caf/LA.BF64.1.2.3_rb1.6' into cm-14.1-caf-8994 

Change-Id: Id7620a8a040ecfa6bf71250bb1c081cfcee6bca5
parents e7d143cc 8af2b9c7

configs/msm8992/audio_output_policy.conf

+2 −2
Original line number Diff line number Diff line
@@ -62,14 +62,14 @@ outputs { 
  direct_pcm_16 {

    flags AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_DIRECT_PCM

    formats AUDIO_FORMAT_PCM_16_BIT|AUDIO_FORMAT_PCM_24_BIT_PACKED|AUDIO_FORMAT_PCM_8_24_BIT

    sampling_rates 44100|48000|96000|192000

    sampling_rates 48000

    bit_width 16

    app_type 69936

  }

  direct_pcm_24 {

    flags AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_DIRECT_PCM

    formats AUDIO_FORMAT_PCM_24_BIT_PACKED|AUDIO_FORMAT_PCM_8_24_BIT

    sampling_rates 44100|48000|96000|192000

    sampling_rates 48000|96000|192000

    bit_width 24

    app_type 69940

  }

configs/msm8992/audio_policy.conf

+8 −2
Original line number Diff line number Diff line
@@ -118,9 +118,15 @@ audio_hw_modules { 
    inputs {

      primary {

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

        channel_masks AUDIO_CHANNEL_IN_5POINT1|AUDIO_CHANNEL_IN_MONO|AUDIO_CHANNEL_IN_STEREO|AUDIO_CHANNEL_IN_FRONT_BACK

        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_VOICE_CALL|AUDIO_DEVICE_IN_FM_TUNER

        devices AUDIO_DEVICE_IN_WIRED_HEADSET|AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET|AUDIO_DEVICE_IN_VOICE_CALL|AUDIO_DEVICE_IN_FM_TUNER

      }

      surround_sound {

        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|AUDIO_CHANNEL_IN_5POINT1|AUDIO_CHANNEL_INDEX_MASK_3|AUDIO_CHANNEL_INDEX_MASK_4|AUDIO_CHANNEL_INDEX_MASK_6

        formats AUDIO_FORMAT_PCM_16_BIT

        devices AUDIO_DEVICE_IN_BUILTIN_MIC|AUDIO_DEVICE_IN_BACK_MIC

      }

      voice_rx {

        sampling_rates 8000|16000|48000

configs/msm8992/audio_policy_configuration.xml

+16 −9
Original line number Diff line number Diff line
@@ -132,28 +132,33 @@ 
                <mixPort name="primary input" role="sink">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                             samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000"

                             channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO,AUDIO_CHANNEL_IN_FRONT_BACK,AUDIO_CHANNEL_IN_5POINT1"/>

                             channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO,AUDIO_CHANNEL_IN_FRONT_BACK"/>

                    <profile name="" format="AUDIO_FORMAT_AMR_NB"

                             samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000"

                             channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO,AUDIO_CHANNEL_IN_FRONT_BACK,AUDIO_CHANNEL_IN_5POINT1"/>

                             channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO,AUDIO_CHANNEL_IN_FRONT_BACK"/>

                    <profile name="" format="AUDIO_FORMAT_AMR_WB"

                             samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000"

                             channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO,AUDIO_CHANNEL_IN_FRONT_BACK,AUDIO_CHANNEL_IN_5POINT1"/>

                             channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO,AUDIO_CHANNEL_IN_FRONT_BACK"/>

                    <profile name="" format="AUDIO_FORMAT_QCELP"

                             samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000"

                             channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO,AUDIO_CHANNEL_IN_FRONT_BACK,AUDIO_CHANNEL_IN_5POINT1"/>

                             channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO,AUDIO_CHANNEL_IN_FRONT_BACK"/>

                    <profile name="" format="AUDIO_FORMAT_EVRC"

                             samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000"

                             channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO,AUDIO_CHANNEL_IN_FRONT_BACK,AUDIO_CHANNEL_IN_5POINT1"/>

                             channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO,AUDIO_CHANNEL_IN_FRONT_BACK"/>

                    <profile name="" format="AUDIO_FORMAT_EVRCB"

                             samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000"

                             channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO,AUDIO_CHANNEL_IN_FRONT_BACK,AUDIO_CHANNEL_IN_5POINT1"/>

                             channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO,AUDIO_CHANNEL_IN_FRONT_BACK"/>

                    <profile name="" format="AUDIO_FORMAT_EVRCWB"

                             samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000"

                             channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO,AUDIO_CHANNEL_IN_FRONT_BACK,AUDIO_CHANNEL_IN_5POINT1"/>

                             channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO,AUDIO_CHANNEL_IN_FRONT_BACK"/>

                    <profile name="" format="AUDIO_FORMAT_EVRCNW"

                             samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000"

                             channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO,AUDIO_CHANNEL_IN_FRONT_BACK,AUDIO_CHANNEL_IN_5POINT1"/>

                             channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO,AUDIO_CHANNEL_IN_FRONT_BACK"/>

                </mixPort>

                <mixPort name="surround_sound" role="sink">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                             samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000"

                             channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO,AUDIO_CHANNEL_IN_FRONT_BACK,AUDIO_CHANNEL_INDEX_MASK_3,AUDIO_CHANNEL_INDEX_MASK_4,AUDIO_CHANNEL_IN_5POINT1,AUDIO_CHANNEL_INDEX_MASK_6"/>

                </mixPort>

                <mixPort name="voice_rx" role="sink">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
@@ -258,7 +263,9 @@ 
                <route type="mix" sink="Telephony Tx"

                       sources="voice_tx"/>

                <route type="mix" sink="primary input"

                       sources="Built-In Mic,Wired Headset Mic,BT SCO Headset Mic,Built-In Back Mic,FM Tuner,Telephony Rx"/>

                       sources="Wired Headset Mic,BT SCO Headset Mic,FM Tuner,Telephony Rx"/>

                <route type="mix" sink="surround_sound"

                       sources="Built-In Mic,Built-In Back Mic"/>

                <route type="mix" sink="Telephony Tx"

                       sources="Built-In Mic,Built-In Back Mic,Wired Headset Mic,BT SCO Headset Mic"/>

                <route type="mix" sink="voice_rx"

configs/msm8992/mixer_paths.xml

+8 −0
Original line number Diff line number Diff line
@@ -2021,6 +2021,14 @@ 
        <ctl name="MAD Input" value="DMIC1" />

    </path>



    <path name="unprocessed-handset-mic">

        <path name="handset-mic" />

    </path>



    <path name="unprocessed-mic">

        <path name="unprocessed-handset-mic" />

    </path>



    <!-- Added for ADSP testfwk -->

    <path name="ADSP testfwk">

        <ctl name="SLIMBUS_DL_HL Switch" value="1" />

configs/msm8992/mixer_paths_i2s.xml

+7 −0
Original line number Diff line number Diff line
@@ -271,4 +271,11 @@ 
        <path name="handset-mic" />

    </path>



    <path name="unprocessed-handset-mic">

        <path name="handset-mic" />

    </path>



    <path name="unprocessed-mic">

        <path name="unprocessed-handset-mic" />

    </path>

</mixer>