diff options
| author | Robert Lee <lerobert@google.com> | 2023-07-13 03:30:43 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2023-07-13 03:30:43 +0000 |
| commit | 7339e8dbe176b2c27f654eeeef626e3d83b46b67 (patch) | |
| tree | b1161b40e419f140ad4b0be2e31c854f65377efd /audio | |
| parent | eed6b381283bdf14a274fe66e57d75908a6de448 (diff) | |
| parent | 1cfda0e0431eb43dd7eb471ab6fb0248df3b5ad8 (diff) | |
| download | shusky-7339e8dbe176b2c27f654eeeef626e3d83b46b67.tar.gz | |
Merge "audio: add hdmi path" into udc-qpr-dev
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/husky/config/audio_policy_configuration.xml | 4 | ||||
| -rw-r--r-- | audio/husky/config/mixer_paths.xml | 6 | ||||
| -rw-r--r-- | audio/shiba/config/audio_policy_configuration.xml | 4 | ||||
| -rw-r--r-- | audio/shiba/config/mixer_paths.xml | 6 |
4 files changed, 18 insertions, 2 deletions
diff --git a/audio/husky/config/audio_policy_configuration.xml b/audio/husky/config/audio_policy_configuration.xml index a859ac1..524f102 100644 --- a/audio/husky/config/audio_policy_configuration.xml +++ b/audio/husky/config/audio_policy_configuration.xml @@ -149,7 +149,7 @@ </devicePort> <devicePort tagName="USB Headset Out" type="AUDIO_DEVICE_OUT_USB_HEADSET" role="sink"> </devicePort> - <devicePort tagName="Aux Digital" type="AUDIO_DEVICE_OUT_AUX_DIGITAL" role="sink"> + <devicePort tagName="HDMI Out" type="AUDIO_DEVICE_OUT_HDMI" role="sink"> </devicePort> <devicePort tagName="Telephony Tx" type="AUDIO_DEVICE_OUT_TELEPHONY_TX" role="sink"> </devicePort> @@ -228,6 +228,8 @@ sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,hifi_playback,compressed_offload,immersive_out"/> <route type="mix" sink="USB Headset Out" sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,hifi_playback,compressed_offload,immersive_out"/> + <route type="mix" sink="HDMI Out" + sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,compressed_offload"/> <route type="mix" sink="BT SCO" sources="primary output,deep buffer,haptic,voip_rx,compressed_offload,raw,mmap_no_irq_out"/> <route type="mix" sink="BT SCO Headset" diff --git a/audio/husky/config/mixer_paths.xml b/audio/husky/config/mixer_paths.xml index a9b7246..924c62c 100644 --- a/audio/husky/config/mixer_paths.xml +++ b/audio/husky/config/mixer_paths.xml @@ -687,6 +687,12 @@ <ctl name="R Fast Use Case Switch Enable" value="1" /--> </path> + <path name="hdmi"> + </path> + + <path name="hdmi-post"> + </path> + <path name="voice-speaker"> <ctl name="R Boost Peak Current Limit" value="3.50A"/> <ctl name="Boost Peak Current Limit" value="3.50A"/> diff --git a/audio/shiba/config/audio_policy_configuration.xml b/audio/shiba/config/audio_policy_configuration.xml index a859ac1..524f102 100644 --- a/audio/shiba/config/audio_policy_configuration.xml +++ b/audio/shiba/config/audio_policy_configuration.xml @@ -149,7 +149,7 @@ </devicePort> <devicePort tagName="USB Headset Out" type="AUDIO_DEVICE_OUT_USB_HEADSET" role="sink"> </devicePort> - <devicePort tagName="Aux Digital" type="AUDIO_DEVICE_OUT_AUX_DIGITAL" role="sink"> + <devicePort tagName="HDMI Out" type="AUDIO_DEVICE_OUT_HDMI" role="sink"> </devicePort> <devicePort tagName="Telephony Tx" type="AUDIO_DEVICE_OUT_TELEPHONY_TX" role="sink"> </devicePort> @@ -228,6 +228,8 @@ sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,hifi_playback,compressed_offload,immersive_out"/> <route type="mix" sink="USB Headset Out" sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,hifi_playback,compressed_offload,immersive_out"/> + <route type="mix" sink="HDMI Out" + sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,compressed_offload"/> <route type="mix" sink="BT SCO" sources="primary output,deep buffer,haptic,voip_rx,compressed_offload,raw,mmap_no_irq_out"/> <route type="mix" sink="BT SCO Headset" diff --git a/audio/shiba/config/mixer_paths.xml b/audio/shiba/config/mixer_paths.xml index a9b7246..924c62c 100644 --- a/audio/shiba/config/mixer_paths.xml +++ b/audio/shiba/config/mixer_paths.xml @@ -687,6 +687,12 @@ <ctl name="R Fast Use Case Switch Enable" value="1" /--> </path> + <path name="hdmi"> + </path> + + <path name="hdmi-post"> + </path> + <path name="voice-speaker"> <ctl name="R Boost Peak Current Limit" value="3.50A"/> <ctl name="Boost Peak Current Limit" value="3.50A"/> |