diff options
| author | Jean-Michel Trivi <jmtrivi@google.com> | 2011-07-26 09:27:24 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-07-26 09:27:24 -0700 |
| commit | 8e925841ab98524d93f05b6ce42cf097908e832b (patch) | |
| tree | b8290a4a30f7cb584a66c3397d0acb474acdb8a0 /include/hardware_legacy | |
| parent | 77e130e18c9bd77cb19bf9b622fd3aa01f0c5e8d (diff) | |
| parent | 20324efa14255de566551f6880740ee40809a18b (diff) | |
| download | hardware_libhardware_legacy-8e925841ab98524d93f05b6ce42cf097908e832b.tar.gz hardware_libhardware_legacy-8e925841ab98524d93f05b6ce42cf097908e832b.tar.bz2 hardware_libhardware_legacy-8e925841ab98524d93f05b6ce42cf097908e832b.zip | |
Merge "Fix bug 4319552 Use commonly defined channel mask values"
Diffstat (limited to 'include/hardware_legacy')
| -rw-r--r-- | include/hardware_legacy/AudioSystemLegacy.h | 39 |
1 files changed, 18 insertions, 21 deletions
diff --git a/include/hardware_legacy/AudioSystemLegacy.h b/include/hardware_legacy/AudioSystemLegacy.h index ccafa89..4b78f58 100644 --- a/include/hardware_legacy/AudioSystemLegacy.h +++ b/include/hardware_legacy/AudioSystemLegacy.h @@ -140,29 +140,26 @@ public: PCM_8_BIT = (PCM|PCM_SUB_8_BIT) }; - - // Channel mask definitions must be kept in sync with JAVA values - // in /media/java/android/media/AudioFormat.java enum audio_channels { // output channels - CHANNEL_OUT_FRONT_LEFT = 0x4, - CHANNEL_OUT_FRONT_RIGHT = 0x8, - CHANNEL_OUT_FRONT_CENTER = 0x10, - CHANNEL_OUT_LOW_FREQUENCY = 0x20, - CHANNEL_OUT_BACK_LEFT = 0x40, - CHANNEL_OUT_BACK_RIGHT = 0x80, - CHANNEL_OUT_FRONT_LEFT_OF_CENTER = 0x100, - CHANNEL_OUT_FRONT_RIGHT_OF_CENTER = 0x200, - CHANNEL_OUT_BACK_CENTER = 0x400, - CHANNEL_OUT_SIDE_LEFT = 0x800, - CHANNEL_OUT_SIDE_RIGHT = 0x1000, - CHANNEL_OUT_TOP_CENTER = 0x2000, - CHANNEL_OUT_TOP_FRONT_LEFT = 0x4000, - CHANNEL_OUT_TOP_FRONT_CENTER = 0x8000, - CHANNEL_OUT_TOP_FRONT_RIGHT = 0x10000, - CHANNEL_OUT_TOP_BACK_LEFT = 0x20000, - CHANNEL_OUT_TOP_BACK_CENTER = 0x40000, - CHANNEL_OUT_TOP_BACK_RIGHT = 0x80000, + CHANNEL_OUT_FRONT_LEFT = 0x1, + CHANNEL_OUT_FRONT_RIGHT = 0x2, + CHANNEL_OUT_FRONT_CENTER = 0x4, + CHANNEL_OUT_LOW_FREQUENCY = 0x8, + CHANNEL_OUT_BACK_LEFT = 0x10, + CHANNEL_OUT_BACK_RIGHT = 0x20, + CHANNEL_OUT_FRONT_LEFT_OF_CENTER = 0x40, + CHANNEL_OUT_FRONT_RIGHT_OF_CENTER = 0x80, + CHANNEL_OUT_BACK_CENTER = 0x100, + CHANNEL_OUT_SIDE_LEFT = 0x200, + CHANNEL_OUT_SIDE_RIGHT = 0x400, + CHANNEL_OUT_TOP_CENTER = 0x800, + CHANNEL_OUT_TOP_FRONT_LEFT = 0x1000, + CHANNEL_OUT_TOP_FRONT_CENTER = 0x2000, + CHANNEL_OUT_TOP_FRONT_RIGHT = 0x4000, + CHANNEL_OUT_TOP_BACK_LEFT = 0x8000, + CHANNEL_OUT_TOP_BACK_CENTER = 0x10000, + CHANNEL_OUT_TOP_BACK_RIGHT = 0x20000, CHANNEL_OUT_MONO = CHANNEL_OUT_FRONT_LEFT, CHANNEL_OUT_STEREO = (CHANNEL_OUT_FRONT_LEFT | CHANNEL_OUT_FRONT_RIGHT), |