diff options
| author | qctecmdr <qctecmdr@localhost> | 2021-12-09 00:08:23 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2021-12-09 00:08:23 -0800 |
| commit | 8a0daeb1b2bee11bdc460f8ae51a3ee05710929c (patch) | |
| tree | 1567ce4c018d6bb9ea82307eefba7ebab946751e | |
| parent | b4e3b19f2a9d9b68874325c80a98ce9b4185c3c7 (diff) | |
| parent | 4be6ff400d0ed0ddd627e3e72171f7d83a1752af (diff) | |
Merge "configs: Remove dynamic attributes from APS config"
| -rw-r--r-- | configs/holi/audio_policy_configuration.xml | 10 | ||||
| -rw-r--r-- | configs/kona/audio_policy_configuration.xml | 10 | ||||
| -rw-r--r-- | configs/lahaina/audio_policy_configuration.xml | 10 | ||||
| -rw-r--r-- | configs/lito/audio_policy_configuration.xml | 10 |
4 files changed, 16 insertions, 24 deletions
diff --git a/configs/holi/audio_policy_configuration.xml b/configs/holi/audio_policy_configuration.xml index 37c9f7ed..a584c754 100644 --- a/configs/holi/audio_policy_configuration.xml +++ b/configs/holi/audio_policy_configuration.xml @@ -84,8 +84,6 @@ <mixPort name="hifi_playback" role="source" /> <mixPort name="compress_passthrough" role="source" flags="AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD|AUDIO_OUTPUT_FLAG_NON_BLOCKING"> - <profile name="" format="dynamic" - samplingRates="dynamic" channelMasks="dynamic"/> </mixPort> <mixPort name="direct_pcm" role="source" flags="AUDIO_OUTPUT_FLAG_DIRECT"> @@ -261,11 +259,11 @@ </devicePort> <devicePort tagName="HDMI" type="AUDIO_DEVICE_OUT_AUX_DIGITAL" role="sink"> <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" - samplingRates="8000,11025,16000,22050,32000,44100,48000,64000,88200,96000,128000,176400,192000" channelMasks="dynamic"/> + samplingRates="8000,11025,16000,22050,32000,44100,48000,64000,88200,96000,128000,176400,192000"/> </devicePort> <devicePort tagName="Proxy" type="AUDIO_DEVICE_OUT_PROXY" role="sink"> <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" - samplingRates="8000,11025,16000,22050,32000,44100,48000,64000,88200,96000,128000,176400,192000" channelMasks="dynamic"/> + samplingRates="8000,11025,16000,22050,32000,44100,48000,64000,88200,96000,128000,176400,192000"/> </devicePort> <devicePort tagName="FM" type="AUDIO_DEVICE_OUT_FM" role="sink"> <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" @@ -288,11 +286,11 @@ </devicePort> <devicePort tagName="USB Device Out" type="AUDIO_DEVICE_OUT_USB_DEVICE" role="sink"> <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" - samplingRates="44100,48000,64000,88200,96000,128000,176400,192000" channelMasks="dynamic"/> + samplingRates="44100,48000,64000,88200,96000,128000,176400,192000"/> </devicePort> <devicePort tagName="USB Headset Out" type="AUDIO_DEVICE_OUT_USB_HEADSET" role="sink"> <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" - samplingRates="44100,48000,64000,88200,96000,128000,176400,192000" channelMasks="dynamic"/> + samplingRates="44100,48000,64000,88200,96000,128000,176400,192000"/> </devicePort> <!-- Input devices declaration, i.e. Source DEVICE PORT --> diff --git a/configs/kona/audio_policy_configuration.xml b/configs/kona/audio_policy_configuration.xml index d332eec3..b6054fa2 100644 --- a/configs/kona/audio_policy_configuration.xml +++ b/configs/kona/audio_policy_configuration.xml @@ -79,8 +79,6 @@ <mixPort name="hifi_playback" role="source" /> <mixPort name="compress_passthrough" role="source" flags="AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD|AUDIO_OUTPUT_FLAG_NON_BLOCKING"> - <profile name="" format="dynamic" - samplingRates="dynamic" channelMasks="dynamic"/> </mixPort> <mixPort name="direct_pcm" role="source" flags="AUDIO_OUTPUT_FLAG_DIRECT"> @@ -256,11 +254,11 @@ </devicePort> <devicePort tagName="HDMI" type="AUDIO_DEVICE_OUT_AUX_DIGITAL" role="sink"> <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" - samplingRates="8000,11025,16000,22050,32000,44100,48000,64000,88200,96000,128000,176400,192000" channelMasks="dynamic"/> + samplingRates="8000,11025,16000,22050,32000,44100,48000,64000,88200,96000,128000,176400,192000"/> </devicePort> <devicePort tagName="Proxy" type="AUDIO_DEVICE_OUT_PROXY" role="sink"> <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" - samplingRates="8000,11025,16000,22050,32000,44100,48000,64000,88200,96000,128000,176400,192000" channelMasks="dynamic"/> + samplingRates="8000,11025,16000,22050,32000,44100,48000,64000,88200,96000,128000,176400,192000"/> </devicePort> <devicePort tagName="FM" type="AUDIO_DEVICE_OUT_FM" role="sink"> <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" @@ -283,11 +281,11 @@ </devicePort> <devicePort tagName="USB Device Out" type="AUDIO_DEVICE_OUT_USB_DEVICE" role="sink"> <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" - samplingRates="44100,48000,64000,88200,96000,128000,176400,192000" channelMasks="dynamic"/> + samplingRates="44100,48000,64000,88200,96000,128000,176400,192000"/> </devicePort> <devicePort tagName="USB Headset Out" type="AUDIO_DEVICE_OUT_USB_HEADSET" role="sink"> <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" - samplingRates="44100,48000,64000,88200,96000,128000,176400,192000" channelMasks="dynamic"/> + samplingRates="44100,48000,64000,88200,96000,128000,176400,192000"/> </devicePort> <!-- Input devices declaration, i.e. Source DEVICE PORT --> diff --git a/configs/lahaina/audio_policy_configuration.xml b/configs/lahaina/audio_policy_configuration.xml index 1766ac6d..1149a6ab 100644 --- a/configs/lahaina/audio_policy_configuration.xml +++ b/configs/lahaina/audio_policy_configuration.xml @@ -84,8 +84,6 @@ <mixPort name="hifi_playback" role="source" /> <mixPort name="compress_passthrough" role="source" flags="AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD|AUDIO_OUTPUT_FLAG_NON_BLOCKING"> - <profile name="" format="dynamic" - samplingRates="dynamic" channelMasks="dynamic"/> </mixPort> <mixPort name="dsd_compress_passthrough" role="source" flags="AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD|AUDIO_OUTPUT_FLAG_NON_BLOCKING"> @@ -267,11 +265,11 @@ </devicePort> <devicePort tagName="HDMI" type="AUDIO_DEVICE_OUT_AUX_DIGITAL" role="sink"> <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" - samplingRates="8000,11025,16000,22050,32000,44100,48000,64000,88200,96000,128000,176400,192000" channelMasks="dynamic"/> + samplingRates="8000,11025,16000,22050,32000,44100,48000,64000,88200,96000,128000,176400,192000"/> </devicePort> <devicePort tagName="Proxy" type="AUDIO_DEVICE_OUT_PROXY" role="sink"> <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" - samplingRates="8000,11025,16000,22050,32000,44100,48000,64000,88200,96000,128000,176400,192000" channelMasks="dynamic"/> + samplingRates="8000,11025,16000,22050,32000,44100,48000,64000,88200,96000,128000,176400,192000"/> </devicePort> <devicePort tagName="FM" type="AUDIO_DEVICE_OUT_FM" role="sink"> <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" @@ -294,11 +292,11 @@ </devicePort> <devicePort tagName="USB Device Out" type="AUDIO_DEVICE_OUT_USB_DEVICE" role="sink"> <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" - samplingRates="44100,48000,64000,88200,96000,128000,176400,192000" channelMasks="dynamic"/> + samplingRates="44100,48000,64000,88200,96000,128000,176400,192000"/> </devicePort> <devicePort tagName="USB Headset Out" type="AUDIO_DEVICE_OUT_USB_HEADSET" role="sink"> <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" - samplingRates="44100,48000,64000,88200,96000,128000,176400,192000" channelMasks="dynamic"/> + samplingRates="44100,48000,64000,88200,96000,128000,176400,192000"/> </devicePort> <!-- Input devices declaration, i.e. Source DEVICE PORT --> diff --git a/configs/lito/audio_policy_configuration.xml b/configs/lito/audio_policy_configuration.xml index 33fb30ba..79b8ee60 100644 --- a/configs/lito/audio_policy_configuration.xml +++ b/configs/lito/audio_policy_configuration.xml @@ -80,8 +80,6 @@ <mixPort name="hifi_playback" role="source" /> <mixPort name="compress_passthrough" role="source" flags="AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD|AUDIO_OUTPUT_FLAG_NON_BLOCKING"> - <profile name="" format="dynamic" - samplingRates="dynamic" channelMasks="dynamic"/> </mixPort> <mixPort name="direct_pcm" role="source" flags="AUDIO_OUTPUT_FLAG_DIRECT"> @@ -257,11 +255,11 @@ </devicePort> <devicePort tagName="HDMI" type="AUDIO_DEVICE_OUT_AUX_DIGITAL" role="sink"> <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" - samplingRates="8000,11025,16000,22050,32000,44100,48000,64000,88200,96000,128000,176400,192000" channelMasks="dynamic"/> + samplingRates="8000,11025,16000,22050,32000,44100,48000,64000,88200,96000,128000,176400,192000"/> </devicePort> <devicePort tagName="Proxy" type="AUDIO_DEVICE_OUT_PROXY" role="sink"> <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" - samplingRates="8000,11025,16000,22050,32000,44100,48000,64000,88200,96000,128000,176400,192000" channelMasks="dynamic"/> + samplingRates="8000,11025,16000,22050,32000,44100,48000,64000,88200,96000,128000,176400,192000"/> </devicePort> <devicePort tagName="FM" type="AUDIO_DEVICE_OUT_FM" role="sink"> <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" @@ -284,11 +282,11 @@ </devicePort> <devicePort tagName="USB Device Out" type="AUDIO_DEVICE_OUT_USB_DEVICE" role="sink"> <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" - samplingRates="44100,48000,64000,88200,96000,128000,176400,192000" channelMasks="dynamic"/> + samplingRates="44100,48000,64000,88200,96000,128000,176400,192000"/> </devicePort> <devicePort tagName="USB Headset Out" type="AUDIO_DEVICE_OUT_USB_HEADSET" role="sink"> <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" - samplingRates="44100,48000,64000,88200,96000,128000,176400,192000" channelMasks="dynamic"/> + samplingRates="44100,48000,64000,88200,96000,128000,176400,192000"/> </devicePort> <!-- Input devices declaration, i.e. Source DEVICE PORT --> |