Skip to content

Add get_microphones() and get_active_microphone() stub functions #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
AntonDehtiarov wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add get_microphones() and get_active_microphone() stub functions #9

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bfb0a28
audio: add get_micropones() function
AntonDehtiarov May 25, 2020
b84e993
audio: add get_active_micropones() function
AntonDehtiarov May 25, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 60 additions & 0 deletions audio/audio_hw.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2036,6 +2036,58 @@ static int do_init_in_pcm(struct stream_in_pcm *in,
return 0;
}

#ifdef AUDIO_DEVICE_API_VERSION_5_0
static int adev_get_microphones(const struct audio_hw_device *dev,
struct audio_microphone_characteristic_t *mic_array,
size_t *mic_count)
{
if (mic_count == NULL) {
return -ENOSYS;
}

if (*mic_count == 0) {
*mic_count = 1;
return 0;
}

if (mic_array == NULL) {
return -ENOSYS;
}

strncpy(mic_array->device_id, "mic_generic", AUDIO_MICROPHONE_ID_MAX_LEN - 1);
mic_array->device = AUDIO_DEVICE_IN_BUILTIN_MIC;
strncpy(mic_array->address, AUDIO_BOTTOM_MICROPHONE_ADDRESS,
AUDIO_DEVICE_MAX_ADDRESS_LEN - 1);
memset(mic_array->channel_mapping, AUDIO_MICROPHONE_CHANNEL_MAPPING_UNUSED,
sizeof(mic_array->channel_mapping));
mic_array->location = AUDIO_MICROPHONE_LOCATION_UNKNOWN;
mic_array->group = 0;
mic_array->index_in_the_group = 0;
mic_array->sensitivity = AUDIO_MICROPHONE_SENSITIVITY_UNKNOWN;
mic_array->max_spl = AUDIO_MICROPHONE_SPL_UNKNOWN;
mic_array->min_spl = AUDIO_MICROPHONE_SPL_UNKNOWN;
mic_array->directionality = AUDIO_MICROPHONE_DIRECTIONALITY_UNKNOWN;
mic_array->num_frequency_responses = 0;
mic_array->geometric_location.x = AUDIO_MICROPHONE_COORDINATE_UNKNOWN;
mic_array->geometric_location.y = AUDIO_MICROPHONE_COORDINATE_UNKNOWN;
mic_array->geometric_location.z = AUDIO_MICROPHONE_COORDINATE_UNKNOWN;
mic_array->orientation.x = AUDIO_MICROPHONE_COORDINATE_UNKNOWN;
mic_array->orientation.y = AUDIO_MICROPHONE_COORDINATE_UNKNOWN;
mic_array->orientation.z = AUDIO_MICROPHONE_COORDINATE_UNKNOWN;

*mic_count = 1;
return 0;
}
#endif

#ifdef AUDIO_DEVICE_API_VERSION_5_0
static int in_get_active_microphones(const struct audio_stream_in *stream,
struct audio_microphone_characteristic_t *mic_array,
size_t *mic_count) {
return adev_get_microphones(NULL, mic_array, mic_count);
}
#endif

/*********************************************************************
* Stream open and close
*********************************************************************/
Expand Down Expand Up @@ -2178,6 +2230,10 @@ static int adev_open_input_stream(struct audio_hw_device *dev,

in->common.dev = adev;

#ifdef AUDIO_DEVICE_API_VERSION_5_0
in->common.stream.get_active_microphones = in_get_active_microphones;
#endif

devices &= AUDIO_DEVICE_IN_ALL;
ret = do_init_in_common(&in->common, config, devices);
if (ret < 0) {
Expand Down Expand Up @@ -2344,6 +2400,10 @@ static int adev_open(const hw_module_t *module, const char *name,
adev->hw_device.close_input_stream = adev_close_input_stream;
adev->hw_device.dump = adev_dump;

#ifdef AUDIO_DEVICE_API_VERSION_5_0
adev->hw_device.get_microphones = adev_get_microphones;
#endif

property_get("ro.product.device", property, "generic");
snprintf(file_name, sizeof(file_name), "%s/audio.%s.xml", ETC_PATH, property);

Expand Down