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

Commit 8e2724c4 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "audio: make direct output independent of DIRECT_PCM flag"

parents 49c6c698 ac341587

configs/msm8937/audio_output_policy.conf

+2 −9
Original line number Diff line number Diff line
@@ -25,22 +25,15 @@ outputs { 
    bit_width 16

    app_type 69936

  }

  direct {

    flags AUDIO_OUTPUT_FLAG_DIRECT

    formats AUDIO_FORMAT_PCM_16_BIT

    sampling_rates 48000

    bit_width 16

    app_type 69936

  }

  direct_pcm_16 {

    flags AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_DIRECT_PCM

    flags AUDIO_OUTPUT_FLAG_DIRECT

    formats AUDIO_FORMAT_PCM_16_BIT|AUDIO_FORMAT_PCM_24_BIT_PACKED|AUDIO_FORMAT_PCM_8_24_BIT

    sampling_rates 44100|48000|96000|192000

    bit_width 16

    app_type 69936

  }

  direct_pcm_24 {

    flags AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_DIRECT_PCM

    flags AUDIO_OUTPUT_FLAG_DIRECT

    formats AUDIO_FORMAT_PCM_24_BIT_PACKED|AUDIO_FORMAT_PCM_8_24_BIT

    sampling_rates 44100|48000|96000|192000

    bit_width 24

configs/msm8937/audio_policy.conf

+1 −8
Original line number Diff line number Diff line
@@ -47,19 +47,12 @@ audio_hw_modules { 
         devices AUDIO_DEVICE_OUT_SPEAKER|AUDIO_DEVICE_OUT_EARPIECE|AUDIO_DEVICE_OUT_WIRED_HEADSET|AUDIO_DEVICE_OUT_WIRED_HEADPHONE|AUDIO_DEVICE_OUT_LINE|AUDIO_DEVICE_OUT_ALL_SCO|AUDIO_DEVICE_OUT_AUX_DIGITAL|AUDIO_DEVICE_OUT_PROXY

         flags AUDIO_OUTPUT_FLAG_DEEP_BUFFER

      }

      multichannel {

        sampling_rates 44100|48000

        channel_masks dynamic

        formats AUDIO_FORMAT_PCM_16_BIT

        devices AUDIO_DEVICE_OUT_AUX_DIGITAL|AUDIO_DEVICE_OUT_PROXY

        flags AUDIO_OUTPUT_FLAG_DIRECT

      }

      direct_pcm {

        sampling_rates 8000|11025|16000|22050|32000|44100|48000|64000|88200|96000|176400|192000

        channel_masks AUDIO_CHANNEL_OUT_MONO|AUDIO_CHANNEL_OUT_STEREO|AUDIO_CHANNEL_OUT_2POINT1|AUDIO_CHANNEL_OUT_QUAD|AUDIO_CHANNEL_OUT_PENTA|AUDIO_CHANNEL_OUT_5POINT1|AUDIO_CHANNEL_OUT_6POINT1|AUDIO_CHANNEL_OUT_7POINT1

        formats AUDIO_FORMAT_PCM_16_BIT|AUDIO_FORMAT_PCM_24_BIT_PACKED|AUDIO_FORMAT_PCM_8_24_BIT

        devices AUDIO_DEVICE_OUT_SPEAKER|AUDIO_DEVICE_OUT_EARPIECE|AUDIO_DEVICE_OUT_WIRED_HEADSET|AUDIO_DEVICE_OUT_WIRED_HEADPHONE|AUDIO_DEVICE_OUT_LINE|AUDIO_DEVICE_OUT_ALL_SCO|AUDIO_DEVICE_OUT_PROXY|AUDIO_DEVICE_OUT_AUX_DIGITAL

        flags AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_DIRECT_PCM

        flags AUDIO_OUTPUT_FLAG_DIRECT

      }

      compress_offload {

        sampling_rates 8000|11025|12000|16000|22050|24000|32000|44100|48000|64000|88200|96000|176400|192000

configs/msm8937/audio_policy_configuration.xml

+3 −8
Original line number Diff line number Diff line
@@ -73,13 +73,8 @@ 
                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

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

                </mixPort>

                <mixPort name="multichannel" role="source"

                        flags="AUDIO_OUTPUT_FLAG_DIRECT">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                             samplingRates="8000,11025,16000,22050,32000,44100,48000,64000,88200,96000,128000,176400,192000" channelMasks="dynamic"/>

                </mixPort>

                <mixPort name="direct_pcm" role="source"

                        flags="AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_DIRECT_PCM">

                        flags="AUDIO_OUTPUT_FLAG_DIRECT">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                             samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000,64000,88200,96000,128000,176400,192000"

                             channelMasks="AUDIO_CHANNEL_OUT_MONO,AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_2POINT1,AUDIO_CHANNEL_OUT_QUAD,AUDIO_CHANNEL_OUT_PENTA,AUDIO_CHANNEL_OUT_5POINT1,AUDIO_CHANNEL_OUT_6POINT1,AUDIO_CHANNEL_OUT_7POINT1"/>
@@ -255,9 +250,9 @@ 
                <route type="mix" sink="Line"

                       sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,voip_rx"/>

                <route type="mix" sink="HDMI"

                       sources="primary output,raw,deep_buffer,multichannel,direct_pcm,compressed_offload"/>

                       sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload"/>

                <route type="mix" sink="Proxy"

                       sources="primary output,raw,deep_buffer,multichannel,direct_pcm,compressed_offload"/>

                       sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload"/>

                <route type="mix" sink="FM"

                       sources="primary output"/>

                <route type="mix" sink="BT SCO All"

configs/msm8953/audio_output_policy.conf

+2 −9
Original line number Diff line number Diff line
@@ -25,22 +25,15 @@ outputs { 
    bit_width 16

    app_type 69936

  }

  direct {

    flags AUDIO_OUTPUT_FLAG_DIRECT

    formats AUDIO_FORMAT_PCM_16_BIT

    sampling_rates 48000

    bit_width 16

    app_type 69936

  }

  direct_pcm_16 {

    flags AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_DIRECT_PCM

    flags AUDIO_OUTPUT_FLAG_DIRECT

    formats AUDIO_FORMAT_PCM_16_BIT|AUDIO_FORMAT_PCM_24_BIT_PACKED|AUDIO_FORMAT_PCM_8_24_BIT

    sampling_rates 44100|48000|96000|192000

    bit_width 16

    app_type 69936

  }

  direct_pcm_24 {

    flags AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_DIRECT_PCM

    flags AUDIO_OUTPUT_FLAG_DIRECT

    formats AUDIO_FORMAT_PCM_24_BIT_PACKED|AUDIO_FORMAT_PCM_8_24_BIT

    sampling_rates 44100|48000|96000|192000

    bit_width 24

configs/msm8953/audio_policy.conf

+1 −8
Original line number Diff line number Diff line
@@ -47,19 +47,12 @@ audio_hw_modules { 
         devices AUDIO_DEVICE_OUT_SPEAKER|AUDIO_DEVICE_OUT_EARPIECE|AUDIO_DEVICE_OUT_WIRED_HEADSET|AUDIO_DEVICE_OUT_WIRED_HEADPHONE|AUDIO_DEVICE_OUT_LINE|AUDIO_DEVICE_OUT_ALL_SCO|AUDIO_DEVICE_OUT_AUX_DIGITAL|AUDIO_DEVICE_OUT_PROXY

         flags AUDIO_OUTPUT_FLAG_DEEP_BUFFER

      }

      multichannel {

        sampling_rates 44100|48000

        channel_masks dynamic

        formats AUDIO_FORMAT_PCM_16_BIT

        devices AUDIO_DEVICE_OUT_AUX_DIGITAL|AUDIO_DEVICE_OUT_PROXY

        flags AUDIO_OUTPUT_FLAG_DIRECT

      }

      direct_pcm {

        sampling_rates 8000|11025|16000|22050|32000|44100|48000|64000|88200|96000|176400|192000

        channel_masks AUDIO_CHANNEL_OUT_MONO|AUDIO_CHANNEL_OUT_STEREO|AUDIO_CHANNEL_OUT_2POINT1|AUDIO_CHANNEL_OUT_QUAD|AUDIO_CHANNEL_OUT_PENTA|AUDIO_CHANNEL_OUT_5POINT1|AUDIO_CHANNEL_OUT_6POINT1|AUDIO_CHANNEL_OUT_7POINT1

        formats AUDIO_FORMAT_PCM_16_BIT|AUDIO_FORMAT_PCM_24_BIT_PACKED|AUDIO_FORMAT_PCM_8_24_BIT

        devices AUDIO_DEVICE_OUT_SPEAKER|AUDIO_DEVICE_OUT_EARPIECE|AUDIO_DEVICE_OUT_WIRED_HEADSET|AUDIO_DEVICE_OUT_WIRED_HEADPHONE|AUDIO_DEVICE_OUT_LINE|AUDIO_DEVICE_OUT_ALL_SCO|AUDIO_DEVICE_OUT_PROXY|AUDIO_DEVICE_OUT_AUX_DIGITAL

        flags AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_DIRECT_PCM

        flags AUDIO_OUTPUT_FLAG_DIRECT

      }

      compress_offload {

        sampling_rates 8000|11025|12000|16000|22050|24000|32000|44100|48000|64000|88200|96000|176400|192000