diff options
| author | Eric Laurent <elaurent@google.com> | 2011-05-27 10:19:43 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-05-27 10:19:43 -0700 |
| commit | 38d14f76048e6a14303dc81275303b63c9d7b064 (patch) | |
| tree | 8e74969c78ceb141b79e2cc44071b7647a44bc54 /include | |
| parent | 2b8f76cdbb254ac1170087a40dbf30b7627f3516 (diff) | |
| parent | 9714b27bb41d999cb61b22833d3f253552b3c82b (diff) | |
| download | system_core-38d14f76048e6a14303dc81275303b63c9d7b064.zip system_core-38d14f76048e6a14303dc81275303b63c9d7b064.tar.gz system_core-38d14f76048e6a14303dc81275303b63c9d7b064.tar.bz2 | |
Merge "Added PCM formats to audio.h"
Diffstat (limited to 'include')
| -rw-r--r-- | include/system/audio.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/include/system/audio.h b/include/system/audio.h index 8f2ac0c..3294500 100644 --- a/include/system/audio.h +++ b/include/system/audio.h @@ -88,8 +88,10 @@ typedef enum { /* PCM sub formats */ typedef enum { - AUDIO_FORMAT_PCM_SUB_16_BIT = 0x1, /* DO NOT CHANGE */ - AUDIO_FORMAT_PCM_SUB_8_BIT = 0x2, /* DO NOT CHANGE */ + AUDIO_FORMAT_PCM_SUB_16_BIT = 0x1, /* DO NOT CHANGE - PCM signed 16 bits */ + AUDIO_FORMAT_PCM_SUB_8_BIT = 0x2, /* DO NOT CHANGE - PCM unsigned 8 bits */ + AUDIO_FORMAT_PCM_SUB_32_BIT = 0x3, /* PCM signed .31 fixed point */ + AUDIO_FORMAT_PCM_SUB_8_24_BIT = 0x4, /* PCM signed 7.24 fixed point */ } audio_format_pcm_sub_fmt_t; /* MP3 sub format field definition : can use 11 LSBs in the same way as MP3 @@ -144,6 +146,10 @@ typedef enum { AUDIO_FORMAT_PCM_SUB_16_BIT), AUDIO_FORMAT_PCM_8_BIT = (AUDIO_FORMAT_PCM | AUDIO_FORMAT_PCM_SUB_8_BIT), + AUDIO_FORMAT_PCM_32_BIT = (AUDIO_FORMAT_PCM | + AUDIO_FORMAT_PCM_SUB_32_BIT), + AUDIO_FORMAT_PCM_8_24_BIT = (AUDIO_FORMAT_PCM | + AUDIO_FORMAT_PCM_SUB_8_24_BIT), } audio_format_t; /* Channel mask definitions must be kept in sync with JAVA values in |