diff options
| author | Jean-Michel Trivi <jmtrivi@google.com> | 2011-07-25 16:19:07 -0700 |
|---|---|---|
| committer | Jean-Michel Trivi <jmtrivi@google.com> | 2011-07-25 17:02:11 -0700 |
| commit | 6d4f39754bff9c1dcb8023839ea583b6d0723b14 (patch) | |
| tree | 55422cde2d37010f95a20a7a4488a27a2fdc0e05 /include/system | |
| parent | 2ca55922181e6702d9b2a4c5ea4cae96a370d8f9 (diff) | |
| download | system_core-6d4f39754bff9c1dcb8023839ea583b6d0723b14.tar.gz system_core-6d4f39754bff9c1dcb8023839ea583b6d0723b14.tar.bz2 system_core-6d4f39754bff9c1dcb8023839ea583b6d0723b14.zip | |
Fix bug 4319552 Use commonly defined channel mask values in native
The native channel mask values are equal to the Java values, which
differ from other standards simply for legacy reasons. It is
preferrable to use commonly used values, and translate from the
Java constants to the common values when specifying a Java mask.
The new definitions uses the same values and ordering as in
OpenSL ES and other standards.
Change-Id: I879f64b281714c60684cd8b36fe6ae648a555121
Diffstat (limited to 'include/system')
| -rw-r--r-- | include/system/audio.h | 38 |
1 files changed, 18 insertions, 20 deletions
diff --git a/include/system/audio.h b/include/system/audio.h index f4aaa4f7..52ba5e7b 100644 --- a/include/system/audio.h +++ b/include/system/audio.h @@ -152,28 +152,26 @@ typedef enum { AUDIO_FORMAT_PCM_SUB_8_24_BIT), } audio_format_t; -/* Channel mask definitions must be kept in sync with JAVA values in - * frameworks/base/media/java/android/media/AudioFormat.java */ typedef enum { /* output channels */ - AUDIO_CHANNEL_OUT_FRONT_LEFT = 0x4, - AUDIO_CHANNEL_OUT_FRONT_RIGHT = 0x8, - AUDIO_CHANNEL_OUT_FRONT_CENTER = 0x10, - AUDIO_CHANNEL_OUT_LOW_FREQUENCY = 0x20, - AUDIO_CHANNEL_OUT_BACK_LEFT = 0x40, - AUDIO_CHANNEL_OUT_BACK_RIGHT = 0x80, - AUDIO_CHANNEL_OUT_FRONT_LEFT_OF_CENTER = 0x100, - AUDIO_CHANNEL_OUT_FRONT_RIGHT_OF_CENTER = 0x200, - AUDIO_CHANNEL_OUT_BACK_CENTER = 0x400, - AUDIO_CHANNEL_OUT_SIDE_LEFT = 0x800, - AUDIO_CHANNEL_OUT_SIDE_RIGHT = 0x1000, - AUDIO_CHANNEL_OUT_TOP_CENTER = 0x2000, - AUDIO_CHANNEL_OUT_TOP_FRONT_LEFT = 0x4000, - AUDIO_CHANNEL_OUT_TOP_FRONT_CENTER = 0x8000, - AUDIO_CHANNEL_OUT_TOP_FRONT_RIGHT = 0x10000, - AUDIO_CHANNEL_OUT_TOP_BACK_LEFT = 0x20000, - AUDIO_CHANNEL_OUT_TOP_BACK_CENTER = 0x40000, - AUDIO_CHANNEL_OUT_TOP_BACK_RIGHT = 0x80000, + AUDIO_CHANNEL_OUT_FRONT_LEFT = 0x1, + AUDIO_CHANNEL_OUT_FRONT_RIGHT = 0x2, + AUDIO_CHANNEL_OUT_FRONT_CENTER = 0x4, + AUDIO_CHANNEL_OUT_LOW_FREQUENCY = 0x8, + AUDIO_CHANNEL_OUT_BACK_LEFT = 0x10, + AUDIO_CHANNEL_OUT_BACK_RIGHT = 0x20, + AUDIO_CHANNEL_OUT_FRONT_LEFT_OF_CENTER = 0x40, + AUDIO_CHANNEL_OUT_FRONT_RIGHT_OF_CENTER = 0x80, + AUDIO_CHANNEL_OUT_BACK_CENTER = 0x100, + AUDIO_CHANNEL_OUT_SIDE_LEFT = 0x200, + AUDIO_CHANNEL_OUT_SIDE_RIGHT = 0x400, + AUDIO_CHANNEL_OUT_TOP_CENTER = 0x800, + AUDIO_CHANNEL_OUT_TOP_FRONT_LEFT = 0x1000, + AUDIO_CHANNEL_OUT_TOP_FRONT_CENTER = 0x2000, + AUDIO_CHANNEL_OUT_TOP_FRONT_RIGHT = 0x4000, + AUDIO_CHANNEL_OUT_TOP_BACK_LEFT = 0x8000, + AUDIO_CHANNEL_OUT_TOP_BACK_CENTER = 0x10000, + AUDIO_CHANNEL_OUT_TOP_BACK_RIGHT = 0x20000, AUDIO_CHANNEL_OUT_MONO = AUDIO_CHANNEL_OUT_FRONT_LEFT, AUDIO_CHANNEL_OUT_STEREO = (AUDIO_CHANNEL_OUT_FRONT_LEFT | |