diff options
Diffstat (limited to 'include/media/AudioSystem.h')
| -rw-r--r-- | include/media/AudioSystem.h | 62 |
1 files changed, 33 insertions, 29 deletions
diff --git a/include/media/AudioSystem.h b/include/media/AudioSystem.h index f21e83d..194f23a 100644 --- a/include/media/AudioSystem.h +++ b/include/media/AudioSystem.h @@ -20,7 +20,6 @@ #include <utils/RefBase.h> #include <utils/threads.h> #include <media/IAudioFlinger.h> -#include <media/AudioCommon.h> namespace android { @@ -51,8 +50,8 @@ public: // Audio sub formats (see AudioSystem::audio_format). enum pcm_sub_format { - PCM_SUB_16_BIT = PCM_FORMAT_S15, // must be 1 for backward compatibility - PCM_SUB_8_BIT = PCM_FORMAT_U8, // must be 2 for backward compatibility + PCM_SUB_16_BIT = 0x1, // must be 1 for backward compatibility + PCM_SUB_8_BIT = 0x2, // must be 2 for backward compatibility }; // MP3 sub format field definition : can use 11 LSBs in the same way as MP3 frame header to specify @@ -104,21 +103,26 @@ public: // 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 = CHANNEL_FRONT_LEFT, - CHANNEL_OUT_FRONT_RIGHT = CHANNEL_FRONT_RIGHT, - CHANNEL_OUT_FRONT_CENTER = CHANNEL_FRONT_CENTER, - CHANNEL_OUT_LOW_FREQUENCY = CHANNEL_LOW_FREQUENCY, - CHANNEL_OUT_BACK_LEFT = CHANNEL_BACK_LEFT, - CHANNEL_OUT_BACK_RIGHT = CHANNEL_BACK_RIGHT, - CHANNEL_OUT_FRONT_LEFT_OF_CENTER = CHANNEL_FRONT_LEFT_OF_CENTER, - CHANNEL_OUT_FRONT_RIGHT_OF_CENTER = CHANNEL_FRONT_RIGHT_OF_CENTER, - CHANNEL_OUT_BACK_CENTER = CHANNEL_BACK_CENTER, - CHANNEL_OUT_MONO = CHANNEL_MONO, - CHANNEL_OUT_STEREO = CHANNEL_STEREO, - CHANNEL_OUT_QUAD = CHANNEL_QUAD, - CHANNEL_OUT_SURROUND = CHANNEL_SURROUND, - CHANNEL_OUT_5POINT1 = CHANNEL_5POINT1, - CHANNEL_OUT_7POINT1 = CHANNEL_7POINT1, + 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_MONO = CHANNEL_OUT_FRONT_LEFT, + CHANNEL_OUT_STEREO = (CHANNEL_OUT_FRONT_LEFT | CHANNEL_OUT_FRONT_RIGHT), + CHANNEL_OUT_QUAD = (CHANNEL_OUT_FRONT_LEFT | CHANNEL_OUT_FRONT_RIGHT | + CHANNEL_OUT_BACK_LEFT | CHANNEL_OUT_BACK_RIGHT), + CHANNEL_OUT_SURROUND = (CHANNEL_OUT_FRONT_LEFT | CHANNEL_OUT_FRONT_RIGHT | + CHANNEL_OUT_FRONT_CENTER | CHANNEL_OUT_BACK_CENTER), + CHANNEL_OUT_5POINT1 = (CHANNEL_OUT_FRONT_LEFT | CHANNEL_OUT_FRONT_RIGHT | + CHANNEL_OUT_FRONT_CENTER | CHANNEL_OUT_LOW_FREQUENCY | CHANNEL_OUT_BACK_LEFT | CHANNEL_OUT_BACK_RIGHT), + CHANNEL_OUT_7POINT1 = (CHANNEL_OUT_FRONT_LEFT | CHANNEL_OUT_FRONT_RIGHT | + CHANNEL_OUT_FRONT_CENTER | CHANNEL_OUT_LOW_FREQUENCY | CHANNEL_OUT_BACK_LEFT | CHANNEL_OUT_BACK_RIGHT | + CHANNEL_OUT_FRONT_LEFT_OF_CENTER | CHANNEL_OUT_FRONT_RIGHT_OF_CENTER), CHANNEL_OUT_ALL = (CHANNEL_OUT_FRONT_LEFT | CHANNEL_OUT_FRONT_RIGHT | CHANNEL_OUT_FRONT_CENTER | CHANNEL_OUT_LOW_FREQUENCY | CHANNEL_OUT_BACK_LEFT | CHANNEL_OUT_BACK_RIGHT | CHANNEL_OUT_FRONT_LEFT_OF_CENTER | CHANNEL_OUT_FRONT_RIGHT_OF_CENTER | CHANNEL_OUT_BACK_CENTER), @@ -238,17 +242,17 @@ public: enum audio_devices { // output devices - DEVICE_OUT_EARPIECE = DEVICE_EARPIECE, - DEVICE_OUT_SPEAKER = DEVICE_SPEAKER, - DEVICE_OUT_WIRED_HEADSET = DEVICE_WIRED_HEADSET, - DEVICE_OUT_WIRED_HEADPHONE = DEVICE_WIRED_HEADPHONE, - DEVICE_OUT_BLUETOOTH_SCO = DEVICE_BLUETOOTH_SCO, - DEVICE_OUT_BLUETOOTH_SCO_HEADSET = DEVICE_BLUETOOTH_SCO_HEADSET, - DEVICE_OUT_BLUETOOTH_SCO_CARKIT = DEVICE_BLUETOOTH_SCO_CARKIT, - DEVICE_OUT_BLUETOOTH_A2DP = DEVICE_BLUETOOTH_A2DP, - DEVICE_OUT_BLUETOOTH_A2DP_HEADPHONES = DEVICE_BLUETOOTH_A2DP_HEADPHONES, - DEVICE_OUT_BLUETOOTH_A2DP_SPEAKER = DEVICE_BLUETOOTH_A2DP_SPEAKER, - DEVICE_OUT_AUX_DIGITAL = DEVICE_AUX_DIGITAL, + DEVICE_OUT_EARPIECE = 0x1, + DEVICE_OUT_SPEAKER = 0x2, + DEVICE_OUT_WIRED_HEADSET = 0x4, + DEVICE_OUT_WIRED_HEADPHONE = 0x8, + DEVICE_OUT_BLUETOOTH_SCO = 0x10, + DEVICE_OUT_BLUETOOTH_SCO_HEADSET = 0x20, + DEVICE_OUT_BLUETOOTH_SCO_CARKIT = 0x40, + DEVICE_OUT_BLUETOOTH_A2DP = 0x80, + DEVICE_OUT_BLUETOOTH_A2DP_HEADPHONES = 0x100, + DEVICE_OUT_BLUETOOTH_A2DP_SPEAKER = 0x200, + DEVICE_OUT_AUX_DIGITAL = 0x400, DEVICE_OUT_DEFAULT = 0x8000, DEVICE_OUT_ALL = (DEVICE_OUT_EARPIECE | DEVICE_OUT_SPEAKER | DEVICE_OUT_WIRED_HEADSET | DEVICE_OUT_WIRED_HEADPHONE | DEVICE_OUT_BLUETOOTH_SCO | DEVICE_OUT_BLUETOOTH_SCO_HEADSET | |