diff options
| author | Eric Laurent <elaurent@google.com> | 2011-05-26 13:52:47 -0700 |
|---|---|---|
| committer | Eric Laurent <elaurent@google.com> | 2011-05-26 13:52:47 -0700 |
| commit | 9714b27bb41d999cb61b22833d3f253552b3c82b (patch) | |
| tree | 3675fe96cd87dba5ac9cc6aa19eeedb8648e8683 /include | |
| parent | 7956d759be249fabef78a933db273709661e4284 (diff) | |
| download | system_core-9714b27bb41d999cb61b22833d3f253552b3c82b.tar.gz system_core-9714b27bb41d999cb61b22833d3f253552b3c82b.tar.bz2 system_core-9714b27bb41d999cb61b22833d3f253552b3c82b.zip | |
Added PCM formats to audio.h
Added formats for 32 bit PCM audio to allow direct use of
common audio formats defined in audio.h by audio effect
API defined in audio_effect.h
Change-Id: I5d58c2db8325ca625ab6d2b10cc0d422ba119ca5
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 8f2ac0c0..32945007 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 |