diff options
| author | Aviral Gupta <aviralg@codeaurora.org> | 2012-07-30 00:07:46 +0530 |
|---|---|---|
| committer | Giulio Cervera <giulio.cervera@gmail.com> | 2012-09-04 03:22:36 +0200 |
| commit | 50fa9018ffcac83d7f1a75c42a7a1abcc7a51053 (patch) | |
| tree | 309d1b9d87ae91a91db99720c11ee8a4595a8276 /include/system | |
| parent | 8ec8b960b01dc1aab2be67f50b608b1a23f33959 (diff) | |
| download | system_core-50fa9018ffcac83d7f1a75c42a7a1abcc7a51053.tar.gz system_core-50fa9018ffcac83d7f1a75c42a7a1abcc7a51053.tar.bz2 system_core-50fa9018ffcac83d7f1a75c42a7a1abcc7a51053.zip | |
include/system: JB upgrade for the MPQ8064
Include the flags for the MPQ8064.
Change-Id: Ic1bd11d341456a8b217d63cddbb19a9a92ee86c5
Diffstat (limited to 'include/system')
| -rwxr-xr-x[-rw-r--r--] | include/system/audio.h | 31 | ||||
| -rw-r--r-- | include/system/audio_policy.h | 9 |
2 files changed, 38 insertions, 2 deletions
diff --git a/include/system/audio.h b/include/system/audio.h index 3194d735..418ee5c0 100644..100755 --- a/include/system/audio.h +++ b/include/system/audio.h @@ -76,6 +76,16 @@ typedef enum { AUDIO_SOURCE_MAX = AUDIO_SOURCE_CNT - 1, } audio_source_t; +#ifdef QCOM_HARDWARE +typedef enum { + QCOM_AUDIO_SOURCE_DEFAULT = 0x100, + QCOM_AUDIO_SOURCE_DIGITAL_BROADCAST_MAIN_AD = 0x101, + QCOM_AUDIO_SOURCE_DIGITAL_BROADCAST_MAIN_ONLY = 0x104, + QCOM_AUDIO_SOURCE_ANALOG_BROADCAST = 0x102, + QCOM_AUDIO_SOURCE_HDMI_IN = 0x103, +} qcom_audio_source_t; +#endif + /* special audio session values * (XXX: should this be living in the audio effects land?) */ @@ -149,8 +159,15 @@ typedef enum { #ifdef QCOM_HARDWARE AUDIO_FORMAT_EVRC = 0x08000000UL, AUDIO_FORMAT_QCELP = 0x09000000UL, - AUDIO_FORMAT_EVRCB = 0x0a000000UL, - AUDIO_FORMAT_EVRCWB = 0x0b000000UL, + AUDIO_FORMAT_AC3 = 0x0a000000UL, + AUDIO_FORMAT_AC3_PLUS = 0x0b000000UL, + AUDIO_FORMAT_DTS = 0x0c000000UL, + AUDIO_FORMAT_WMA = 0x0d000000UL, + AUDIO_FORMAT_WMA_PRO = 0x0e000000UL, + AUDIO_FORMAT_AAC_ADIF = 0x0f000000UL, + AUDIO_FORMAT_EVRCB = 0x10000000UL, + AUDIO_FORMAT_EVRCWB = 0x11000000UL, + AUDIO_FORMAT_EAC3 = 0x12000000UL, #endif AUDIO_FORMAT_MAIN_MASK = 0xFF000000UL, AUDIO_FORMAT_SUB_MASK = 0x00FFFFFFUL, @@ -198,6 +215,10 @@ typedef enum { AUDIO_CHANNEL_OUT_FRONT_RIGHT | AUDIO_CHANNEL_OUT_FRONT_CENTER | AUDIO_CHANNEL_OUT_BACK_CENTER), +#ifdef QCOM_HARDWARE + AUDIO_CHANNEL_OUT_PENTA = (AUDIO_CHANNEL_OUT_QUAD | + AUDIO_CHANNEL_OUT_FRONT_CENTER), +#endif AUDIO_CHANNEL_OUT_5POINT1 = (AUDIO_CHANNEL_OUT_FRONT_LEFT | AUDIO_CHANNEL_OUT_FRONT_RIGHT | AUDIO_CHANNEL_OUT_FRONT_CENTER | @@ -574,6 +595,12 @@ static inline bool audio_is_valid_format(audio_format_t format) case AUDIO_FORMAT_EVRC: case AUDIO_FORMAT_EVRCB: case AUDIO_FORMAT_EVRCWB: + case AUDIO_FORMAT_AC3: + case AUDIO_FORMAT_EAC3: + case AUDIO_FORMAT_AAC_ADIF: + case AUDIO_FORMAT_WMA: + case AUDIO_FORMAT_WMA_PRO: + case AUDIO_FORMAT_DTS: #endif return true; default: diff --git a/include/system/audio_policy.h b/include/system/audio_policy.h index 91b8e9c4..17452290 100644 --- a/include/system/audio_policy.h +++ b/include/system/audio_policy.h @@ -29,6 +29,15 @@ __BEGIN_DECLS /* The enums were moved here mostly from * frameworks/base/include/media/AudioSystem.h */ +#ifdef QCOM_HARDWARE +/* request to open a direct output with get_output() (by opposition to + * sharing an output with other AudioTracks) + */ +typedef enum { + AUDIO_POLICY_OUTPUT_FLAG_INDIRECT = 0x0, + AUDIO_POLICY_OUTPUT_FLAG_DIRECT = 0x1 +} audio_policy_output_flags_t; +#endif /* device categories used for audio_policy->set_force_use() */ typedef enum { |