diff options
| author | Jungshik Jang <jayjang@google.com> | 2014-07-15 19:40:32 +0900 |
|---|---|---|
| committer | Jungshik Jang <jayjang@google.com> | 2014-07-16 09:21:04 +0900 |
| commit | cadd5bb70eae200d744f115fd63c3ebe17069db8 (patch) | |
| tree | 49fda685ef138770ef6fe3f06ffc0055c3949b0b /include/system | |
| parent | e9f7361ea9506c8bd8ad1442a43f270859b1b119 (diff) | |
| download | system_core-cadd5bb70eae200d744f115fd63c3ebe17069db8.zip system_core-cadd5bb70eae200d744f115fd63c3ebe17069db8.tar.gz system_core-cadd5bb70eae200d744f115fd63c3ebe17069db8.tar.bz2 | |
Add force usage and config type for HDMI-CEC system audio mode.
New Usage Type: AUDIO_POLICY_FORCE_FOR_HDMI_SYSTEM_AUDIO
New Config Type: AUDIO_POLICY_FORCE_HDMI_SYSTEM_AUDIO_ENFORCED
When HDMI-CEC system audio mode is enabled, AudioService will
call
setForceUse(AUDIO_POLICY_FORCE_FOR_HDMI_SYSTEM_AUDIO,
AUDIO_POLICY_FORCE_HDMI_SYSTEM_AUDIO_ENFORCED);
in order to notify enabled system audio mode, so that
audio policy manager chooses proper output.
When it turns into off, AudioService will call
setForceUse(AUDIO_POLICY_FORCE_FOR_HDMI_SYSTEM_AUDIO,
AUDIO_POLICY_FORCE_NONE);
Along with it, add new audio output devic type,
AUDIO_DEVICE_OUT_AUX_LINE, in order to distinguish
line out for headphone and aux output of av device.
Bug: 16305986
Bug: 16002150
Change-Id: Idecdf626737f6635ea3cda638c343260b1661c77
Diffstat (limited to 'include/system')
| -rw-r--r-- | include/system/audio.h | 3 | ||||
| -rw-r--r-- | include/system/audio_policy.h | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/include/system/audio.h b/include/system/audio.h index f42c640..bf3dee7 100644 --- a/include/system/audio.h +++ b/include/system/audio.h @@ -575,6 +575,8 @@ enum { AUDIO_DEVICE_OUT_SPDIF = 0x80000, /* FM transmitter out */ AUDIO_DEVICE_OUT_FM = 0x100000, + /* Line out for av devices */ + AUDIO_DEVICE_OUT_AUX_LINE = 0x200000, AUDIO_DEVICE_OUT_DEFAULT = AUDIO_DEVICE_BIT_DEFAULT, AUDIO_DEVICE_OUT_ALL = (AUDIO_DEVICE_OUT_EARPIECE | AUDIO_DEVICE_OUT_SPEAKER | @@ -597,6 +599,7 @@ enum { AUDIO_DEVICE_OUT_HDMI_ARC | AUDIO_DEVICE_OUT_SPDIF | AUDIO_DEVICE_OUT_FM | + AUDIO_DEVICE_OUT_AUX_LINE | AUDIO_DEVICE_OUT_DEFAULT), AUDIO_DEVICE_OUT_ALL_A2DP = (AUDIO_DEVICE_OUT_BLUETOOTH_A2DP | AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_HEADPHONES | diff --git a/include/system/audio_policy.h b/include/system/audio_policy.h index a6554de..2881104 100644 --- a/include/system/audio_policy.h +++ b/include/system/audio_policy.h @@ -44,6 +44,7 @@ typedef enum { AUDIO_POLICY_FORCE_DIGITAL_DOCK, AUDIO_POLICY_FORCE_NO_BT_A2DP, /* A2DP sink is not preferred to speaker or wired HS */ AUDIO_POLICY_FORCE_SYSTEM_ENFORCED, + AUDIO_POLICY_FORCE_HDMI_SYSTEM_AUDIO_ENFORCED, AUDIO_POLICY_FORCE_CFG_CNT, AUDIO_POLICY_FORCE_CFG_MAX = AUDIO_POLICY_FORCE_CFG_CNT - 1, @@ -58,6 +59,7 @@ typedef enum { AUDIO_POLICY_FORCE_FOR_RECORD, AUDIO_POLICY_FORCE_FOR_DOCK, AUDIO_POLICY_FORCE_FOR_SYSTEM, + AUDIO_POLICY_FORCE_FOR_HDMI_SYSTEM_AUDIO, AUDIO_POLICY_FORCE_USE_CNT, AUDIO_POLICY_FORCE_USE_MAX = AUDIO_POLICY_FORCE_USE_CNT - 1, |