diff options
| author | Eric Laurent <elaurent@google.com> | 2012-09-06 18:04:40 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-06 18:04:40 -0700 |
| commit | 3f014b988ea901ccc249d05ab11bcfd6010878d7 (patch) | |
| tree | cd37b37400fd7948c59185b4ced0d9344a220425 | |
| parent | 207466367ac9d8a0c9df8d40f9e5c449ec587eab (diff) | |
| parent | a07ef69482e28199bb34ac94e1e621f7afaf842e (diff) | |
| download | hardware_libhardware-3f014b988ea901ccc249d05ab11bcfd6010878d7.zip hardware_libhardware-3f014b988ea901ccc249d05ab11bcfd6010878d7.tar.gz hardware_libhardware-3f014b988ea901ccc249d05ab11bcfd6010878d7.tar.bz2 | |
Merge "audio effects: add audio source indication" into jb-mr1-dev
| -rw-r--r-- | include/hardware/audio_effect.h | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/include/hardware/audio_effect.h b/include/hardware/audio_effect.h index 4037bbb..46e323d 100644 --- a/include/hardware/audio_effect.h +++ b/include/hardware/audio_effect.h @@ -142,6 +142,10 @@ typedef struct effect_descriptor_s { // | | | 1 requires audio mode updates // | | | 2..3 reserved // +---------------------------+-----------+----------------------------------- +// | Audio source indication | 20..21 | 0 none +// | | | 1 requires audio source updates +// | | | 2..3 reserved +// +---------------------------+-----------+----------------------------------- // Insert mode #define EFFECT_FLAG_TYPE_SHIFT 0 @@ -216,6 +220,13 @@ typedef struct effect_descriptor_s { #define EFFECT_FLAG_AUDIO_MODE_IND (1 << EFFECT_FLAG_AUDIO_MODE_SHIFT) #define EFFECT_FLAG_AUDIO_MODE_NONE (0 << EFFECT_FLAG_AUDIO_MODE_SHIFT) +// Audio source indication +#define EFFECT_FLAG_AUDIO_SOURCE_SHIFT (EFFECT_FLAG_AUDIO_MODE_SHIFT + EFFECT_FLAG_AUDIO_MODE_SIZE) +#define EFFECT_FLAG_AUDIO_SOURCE_SIZE 2 +#define EFFECT_FLAG_AUDIO_SOURCE_MASK (((1 << EFFECT_FLAG_AUDIO_SOURCE_SIZE) -1) \ + << EFFECT_FLAG_AUDIO_SOURCE_SHIFT) +#define EFFECT_FLAG_AUDIO_SOURCE_IND (1 << EFFECT_FLAG_AUDIO_SOURCE_SHIFT) +#define EFFECT_FLAG_AUDIO_SOURCE_NONE (0 << EFFECT_FLAG_AUDIO_SOURCE_SHIFT) #define EFFECT_MAKE_API_VERSION(M, m) (((M)<<16) | ((m) & 0xFFFF)) #define EFFECT_API_VERSION_MAJOR(v) ((v)>>16) @@ -413,6 +424,7 @@ enum effect_command_e { EFFECT_CMD_GET_FEATURE_SUPPORTED_CONFIGS,// get all supported configurations for a feature. EFFECT_CMD_GET_FEATURE_CONFIG, // get current feature configuration EFFECT_CMD_SET_FEATURE_CONFIG, // set current feature configuration + EFFECT_CMD_SET_AUDIO_SOURCE, // set the audio source (see audio.h, audio_source_t) EFFECT_CMD_FIRST_PROPRIETARY = 0x10000 // first proprietary command code }; @@ -705,6 +717,20 @@ enum effect_command_e { // size: sizeof(uint32_t) // data: status //================================================================================================== +// command: EFFECT_CMD_SET_AUDIO_SOURCE +//-------------------------------------------------------------------------------------------------- +// description: +// Set the audio source the capture path is configured for (Camcorder, voice recognition...). +// See audio.h, audio_source_t for values. +//-------------------------------------------------------------------------------------------------- +// command format: +// size: sizeof(uint32_t) +// data: uint32_t +//-------------------------------------------------------------------------------------------------- +// reply format: +// size: 0 +// data: N/A +//================================================================================================== // command: EFFECT_CMD_FIRST_PROPRIETARY //-------------------------------------------------------------------------------------------------- // description: |