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

Commit 02f530f4 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "hal: enable low latency support for sample rates other than 48 KHz"

parents 8d6edc60 51bb57d3

configs/common_au/audio_policy_configuration.xml

+21 −1
Original line number Diff line number Diff line
@@ -77,6 +77,26 @@ 
                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>

                </mixPort>

                <mixPort name="carplay_8k_sys" role="source">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                        samplingRates="8000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>

                </mixPort>

                <mixPort name="carplay_16k_sys" role="source">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                        samplingRates="16000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>

                </mixPort>

                <mixPort name="carplay_24k_sys" role="source">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                        samplingRates="24000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>

                </mixPort>

                <mixPort name="carplay_32k_sys" role="source">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                        samplingRates="32000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>

                </mixPort>

                <mixPort name="carplay_48k_sys" role="source">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                        samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>

                </mixPort>

                <mixPort name="nav_guidance" role="source">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
@@ -296,7 +316,7 @@ 
                <route type="mix" sink="Media Bus"

                       sources="media"/>

                <route type="mix" sink="Sys Notification Bus"

                       sources="sys_notification"/>

                       sources="sys_notification,carplay_8k_sys,carplay_16k_sys,carplay_24k_sys,carplay_32k_sys,carplay_48k_sys"/>

                <route type="mix" sink="Nav Guidance Bus"

                       sources="nav_guidance"/>

                <route type="mix" sink="Phone Bus"

configs/msmnile_au/audio_io_policy.conf

+2 −2
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ outputs { 
  sys_notification {

    flags AUDIO_OUTPUT_FLAG_SYS_NOTIFICATION

    formats AUDIO_FORMAT_PCM_16_BIT

    sampling_rates 48000

    sampling_rates 8000|16000|24000|32000|48000

    bit_width 16

    app_type 69937

  }
@@ -98,7 +98,7 @@ outputs { 
  phone {

    flags AUDIO_OUTPUT_FLAG_PHONE

    formats AUDIO_FORMAT_PCM_16_BIT

    sampling_rates 48000

    sampling_rates 8000|16000|24000|32000|48000

    bit_width 16

    app_type 69936

  }

configs/msmnile_au/audio_policy_configuration.xml

+21 −1
Original line number Diff line number Diff line
@@ -78,6 +78,26 @@ 
                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>

                </mixPort>

                <mixPort name="carplay_8k_sys" role="source">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                        samplingRates="8000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>

                </mixPort>

                <mixPort name="carplay_16k_sys" role="source">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                        samplingRates="16000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>

                </mixPort>

                <mixPort name="carplay_24k_sys" role="source">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                        samplingRates="24000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>

                </mixPort>

                <mixPort name="carplay_32k_sys" role="source">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                        samplingRates="32000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>

                </mixPort>

                <mixPort name="carplay_48k_sys" role="source">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                        samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>

                </mixPort>

                <mixPort name="nav_guidance" role="source">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
@@ -433,7 +453,7 @@ 
                <route type="mix" sink="Media Bus"

                       sources="media,direct_pcm,compressed_offload,voip_rx,mmap_no_irq_out"/>

                <route type="mix" sink="Sys Notification Bus"

                       sources="sys_notification,mmap_no_irq_out"/>

                       sources="sys_notification,mmap_no_irq_out,carplay_8k_sys,carplay_16k_sys,carplay_24k_sys,carplay_32k_sys,carplay_48k_sys"/>

                <route type="mix" sink="Nav Guidance Bus"

                       sources="nav_guidance,mmap_no_irq_out"/>

                <route type="mix" sink="Phone Bus"

configs/msmsteppe_au/audio_io_policy.conf

+2 −2
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ outputs { 
  sys_notification {

    flags AUDIO_OUTPUT_FLAG_SYS_NOTIFICATION

    formats AUDIO_FORMAT_PCM_16_BIT

    sampling_rates 48000

    sampling_rates 8000|16000|24000|32000|48000

    bit_width 16

    app_type 69937

  }
@@ -98,7 +98,7 @@ outputs { 
  phone {

    flags AUDIO_OUTPUT_FLAG_PHONE

    formats AUDIO_FORMAT_PCM_16_BIT

    sampling_rates 48000

    sampling_rates 8000|16000|24000|32000|48000

    bit_width 16

    app_type 69936

  }

configs/msmsteppe_au/audio_policy_configuration.xml

+21 −1
Original line number Diff line number Diff line
@@ -78,6 +78,26 @@ 
                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>

                </mixPort>

                <mixPort name="carplay_8k_sys" role="source">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                        samplingRates="8000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>

                </mixPort>

                <mixPort name="carplay_16k_sys" role="source">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                        samplingRates="16000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>

                </mixPort>

                <mixPort name="carplay_24k_sys" role="source">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                        samplingRates="24000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>

                </mixPort>

                <mixPort name="carplay_32k_sys" role="source">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                        samplingRates="32000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>

                </mixPort>

                <mixPort name="carplay_48k_sys" role="source">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                        samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>

                </mixPort>

                <mixPort name="nav_guidance" role="source">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
@@ -433,7 +453,7 @@ 
                <route type="mix" sink="Media Bus"

                       sources="media,direct_pcm,compressed_offload,voip_rx,mmap_no_irq_out"/>

                <route type="mix" sink="Sys Notification Bus"

                       sources="sys_notification,mmap_no_irq_out"/>

                       sources="sys_notification,mmap_no_irq_out,carplay_8k_sys,carplay_16k_sys,carplay_24k_sys,carplay_32k_sys,carplay_48k_sys"/>

                <route type="mix" sink="Nav Guidance Bus"

                       sources="nav_guidance,mmap_no_irq_out"/>

                <route type="mix" sink="Phone Bus"