| author | Jie Yuan <jie.yuan@amlogic.com> | 2018-08-02 06:35:16 (GMT) |
|---|---|---|
| committer | Gerrit Code Review <gituser@droid04> | 2018-08-02 06:35:16 (GMT) |
| commit | 2865c5ae54da5fda012ad1e46a761650b0111cd5 (patch) | |
| tree | a01854bc07bdada4360f93f178aed478348a88a6 | |
| parent | 3953acb0cde163e52f747721eabb05435798328c (diff) | |
| parent | 9d2cd7106f9c2106edef13e0a8297e601e684def (diff) | |
| download | darwin-2865c5ae54da5fda012ad1e46a761650b0111cd5.zip darwin-2865c5ae54da5fda012ad1e46a761650b0111cd5.tar.gz darwin-2865c5ae54da5fda012ad1e46a761650b0111cd5.tar.bz2 | |
Merge "darwin:modify audio_policy.config for darwin" into p-amlogic
| -rw-r--r-- | darwin.mk | 2 | ||||
| -rw-r--r-- | files/audio_policy.conf | 15 |
2 files changed, 13 insertions, 4 deletions
@@ -39,7 +39,7 @@ $(call inherit-product-if-exists, vendor/google/products/gms.mk) PRODUCT_PROPERTY_OVERRIDES += \ sys.fb.bits=32 \ - ro.hdmi.device_type=0 + ro.hdmi.device_type=5 PRODUCT_NAME := darwin PRODUCT_DEVICE := darwin diff --git a/files/audio_policy.conf b/files/audio_policy.conf index a5992e4..a133ce4 100644 --- a/files/audio_policy.conf +++ b/files/audio_policy.conf @@ -35,7 +35,7 @@ audio_hw_modules { primary { global_configuration { - attached_output_devices speaker|SPDIF + attached_output_devices speaker default_output_device AUDIO_DEVICE_OUT_SPEAKER attached_input_devices hdmi_in|line_in|tuner|spdif_in|buimic_in audio_hal_version 3.0 @@ -94,6 +94,15 @@ audio_hw_modules { } spdif_in { type AUDIO_DEVICE_IN_SPDIF + gains { + gain_1 { + mode AUDIO_GAIN_MODE_JOINT + min_value_mB 0 + max_value_mB 100 + default_value_mB 50 + step_value_mB 1 + } + } } hdmi_out { type AUDIO_DEVICE_OUT_AUX_DIGITAL @@ -130,7 +139,7 @@ audio_hw_modules { primary { sampling_rates 48000 channel_masks AUDIO_CHANNEL_OUT_STEREO - formats AUDIO_FORMAT_PCM_16_BIT + formats AUDIO_FORMAT_PCM_16_BIT|AUDIO_FORMAT_PCM_32_BIT devices speaker|hdmi_arc|SPDIF|wired_headphone|wired_headset|BT_sco|BT_sco_headset flags AUDIO_OUTPUT_FLAG_PRIMARY } @@ -164,7 +173,7 @@ audio_hw_modules { primary { sampling_rates 8000|11025|12000|16000|22050|24000|32000|44100|48000 channel_masks AUDIO_CHANNEL_IN_MONO|AUDIO_CHANNEL_IN_STEREO - formats AUDIO_FORMAT_PCM_16_BIT + formats AUDIO_FORMAT_PCM_16_BIT|AUDIO_FORMAT_PCM_32_BIT devices AUDIO_DEVICE_IN_BUILTIN_MIC|AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET|AUDIO_DEVICE_IN_WIRED_HEADSET|hdmi_in|line_in|tuner|spdif_in } } |