Technical Debt Paydown - move/rename files
Moved audio (alsa actually) utils files to system/core/alsa_utils.
Renamed "audio" utilities to "alsa" to better relect their purpose.
Renamed audio_hw.c -> to audio_hal. c to better reflect its purpose.
Change-Id: I67c7d47ee02abafd3e12c4c99d605a62e0f59122
diff --git a/modules/usbaudio/Android.mk b/modules/usbaudio/Android.mk
index 446281d..9df1e79 100644
--- a/modules/usbaudio/Android.mk
+++ b/modules/usbaudio/Android.mk
@@ -19,15 +19,12 @@
LOCAL_MODULE := audio.usb.default
LOCAL_MODULE_RELATIVE_PATH := hw
LOCAL_SRC_FILES := \
- audio_hw.c \
- alsa_device_profile.c \
- alsa_device_proxy.c \
- audio_logging.c \
- audio_format.c
+ audio_hal.c
LOCAL_C_INCLUDES += \
external/tinyalsa/include \
- $(call include-path-for, audio-utils)
-LOCAL_SHARED_LIBRARIES := liblog libcutils libtinyalsa libaudioutils
+ $(call include-path-for, audio-utils) \
+ $(call include-path-for, alsa-utils)
+LOCAL_SHARED_LIBRARIES := liblog libcutils libtinyalsa libaudioutils libalsautils
LOCAL_MODULE_TAGS := optional
LOCAL_CFLAGS := -Wno-unused-parameter
diff --git a/modules/usbaudio/alsa_device_profile.c b/modules/usbaudio/alsa_device_profile.c
deleted file mode 100644
index 141e06b..0000000
--- a/modules/usbaudio/alsa_device_profile.c
+++ /dev/null
@@ -1,498 +0,0 @@
-/*
- * Copyright (C) 2014 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#define LOG_TAG "alsa_device_profile"
-/*#define LOG_NDEBUG 0*/
-/*#define LOG_PCM_PARAMS 0*/
-
-#include <errno.h>
-#include <inttypes.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-#include <log/log.h>
-
-#include "alsa_device_profile.h"
-#include "audio_format.h"
-#include "audio_logging.h"
-
-#define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0]))
-
-/*TODO - Evaluate if this value should/can be retrieved from a device-specific property */
-#define BUFF_DURATION_MS 5
-
-#define DEFAULT_PERIOD_SIZE 1024
-
-static const char * const format_string_map[] = {
- "AUDIO_FORMAT_PCM_16_BIT", /* "PCM_FORMAT_S16_LE", */
- "AUDIO_FORMAT_PCM_32_BIT", /* "PCM_FORMAT_S32_LE", */
- "AUDIO_FORMAT_PCM_8_BIT", /* "PCM_FORMAT_S8", */
- "AUDIO_FORMAT_PCM_8_24_BIT", /* "PCM_FORMAT_S24_LE", */
- "AUDIO_FORMAT_PCM_24_BIT_PACKED"/* "PCM_FORMAT_S24_3LE" */
-};
-
-static const unsigned const format_byte_size_map[] = {
- 2, /* PCM_FORMAT_S16_LE */
- 4, /* PCM_FORMAT_S32_LE */
- 1, /* PCM_FORMAT_S8 */
- 4, /* PCM_FORMAT_S24_LE */
- 3, /* PCM_FORMAT_S24_3LE */
-};
-
-extern int8_t const pcm_format_value_map[50];
-
-/* sort these highest -> lowest (to default to best quality) */
-static const unsigned std_sample_rates[] =
- {48000, 44100, 32000, 24000, 22050, 16000, 12000, 11025, 8000};
-
-static void profile_reset(alsa_device_profile* profile)
-{
- profile->card = profile->device = -1;
-
- /* Fill the attribute arrays with invalid values */
- size_t index;
- for (index = 0; index < ARRAY_SIZE(profile->formats); index++) {
- profile->formats[index] = PCM_FORMAT_INVALID;
- }
-
- for (index = 0; index < ARRAY_SIZE(profile->sample_rates); index++) {
- profile->sample_rates[index] = 0;
- }
-
- for (index = 0; index < ARRAY_SIZE(profile->channel_counts); index++) {
- profile->channel_counts[index] = 0;
- }
-
- profile->min_period_size = profile->max_period_size = 0;
- profile->min_channel_count = profile->max_channel_count = DEFAULT_CHANNEL_COUNT;
-
- profile->is_valid = false;
-}
-
-void profile_init(alsa_device_profile* profile, int direction)
-{
- profile->direction = direction;
- profile_reset(profile);
-}
-
-bool profile_is_initialized(alsa_device_profile* profile)
-{
- return profile->card >= 0 && profile->device >= 0;
-}
-
-bool profile_is_valid(alsa_device_profile* profile) {
- return profile->is_valid;
-}
-
-bool profile_is_cached_for(alsa_device_profile* profile, int card, int device) {
- return card == profile->card && device == profile->device;
-}
-
-void profile_decache(alsa_device_profile* profile) {
- profile_reset(profile);
-}
-
-/*
- * Returns the supplied value rounded up to the next even multiple of 16
- */
-static unsigned int round_to_16_mult(unsigned int size)
-{
- return (size + 15) & ~15; // 0xFFFFFFF0;
-}
-
-/*
- * Returns the system defined minimum period size based on the supplied sample rate.
- */
-unsigned profile_calc_min_period_size(alsa_device_profile* profile, unsigned sample_rate)
-{
- ALOGV("profile_calc_min_period_size(%p, rate:%d)", profile, sample_rate);
- if (profile == NULL) {
- return DEFAULT_PERIOD_SIZE;
- } else {
- unsigned num_sample_frames = (sample_rate * BUFF_DURATION_MS) / 1000;
- if (num_sample_frames < profile->min_period_size) {
- num_sample_frames = profile->min_period_size;
- }
- return round_to_16_mult(num_sample_frames) * 2;
- }
-}
-
-unsigned int profile_get_period_size(alsa_device_profile* profile, unsigned sample_rate)
-{
- // return profile->default_config.period_size;
- unsigned int period_size = profile_calc_min_period_size(profile, sample_rate);
- ALOGV("profile_get_period_size(rate:%d) = %d", sample_rate, period_size);
- return period_size;
-}
-
-/*
- * Sample Rate
- */
-unsigned profile_get_default_sample_rate(alsa_device_profile* profile)
-{
- /*
- * TODO this won't be right in general. we should store a preferred rate as we are scanning.
- * But right now it will return the highest rate, which may be correct.
- */
- return profile_is_valid(profile) ? profile->sample_rates[0] : DEFAULT_SAMPLE_RATE;
-}
-
-bool profile_is_sample_rate_valid(alsa_device_profile* profile, unsigned rate)
-{
- if (profile_is_valid(profile)) {
- size_t index;
- for (index = 0; profile->sample_rates[index] != 0; index++) {
- if (profile->sample_rates[index] == rate) {
- return true;
- }
- }
-
- return false;
- } else {
- return rate == DEFAULT_SAMPLE_RATE;
- }
-}
-
-/*
- * Format
- */
-enum pcm_format profile_get_default_format(alsa_device_profile* profile)
-{
- /*
- * TODO this won't be right in general. we should store a preferred format as we are scanning.
- */
- return profile_is_valid(profile) ? profile->formats[0] : DEFAULT_SAMPLE_FORMAT;
-}
-
-bool profile_is_format_valid(alsa_device_profile* profile, enum pcm_format fmt) {
- if (profile_is_valid(profile)) {
- size_t index;
- for (index = 0; profile->formats[index] != PCM_FORMAT_INVALID; index++) {
- if (profile->formats[index] == fmt) {
- return true;
- }
- }
-
- return false;
- } else {
- return fmt == DEFAULT_SAMPLE_FORMAT;
- }
-}
-
-/*
- * Channels
- */
-unsigned profile_get_default_channel_count(alsa_device_profile* profile)
-{
- return profile_is_valid(profile) ? profile->channel_counts[0] : DEFAULT_CHANNEL_COUNT;
-}
-
-bool profile_is_channel_count_valid(alsa_device_profile* profile, unsigned count)
-{
- if (profile_is_initialized(profile)) {
- return count >= profile->min_channel_count && count <= profile->max_channel_count;
- } else {
- return count == DEFAULT_CHANNEL_COUNT;
- }
-}
-
-static bool profile_test_sample_rate(alsa_device_profile* profile, unsigned rate)
-{
- struct pcm_config config = profile->default_config;
- config.rate = rate;
-
- bool works = false; /* let's be pessimistic */
- struct pcm * pcm = pcm_open(profile->card, profile->device,
- profile->direction, &config);
-
- if (pcm != NULL) {
- works = pcm_is_ready(pcm);
- pcm_close(pcm);
- }
-
- return works;
-}
-
-static unsigned profile_enum_sample_rates(alsa_device_profile* profile, unsigned min, unsigned max)
-{
- unsigned num_entries = 0;
- unsigned index;
-
- for (index = 0; index < ARRAY_SIZE(std_sample_rates) &&
- num_entries < ARRAY_SIZE(profile->sample_rates) - 1;
- index++) {
- if (std_sample_rates[index] >= min && std_sample_rates[index] <= max
- && profile_test_sample_rate(profile, std_sample_rates[index])) {
- profile->sample_rates[num_entries++] = std_sample_rates[index];
- }
- }
-
- return num_entries; /* return # of supported rates */
-}
-
-static unsigned profile_enum_sample_formats(alsa_device_profile* profile, struct pcm_mask * mask)
-{
- const int num_slots = ARRAY_SIZE(mask->bits);
- const int bits_per_slot = sizeof(mask->bits[0]) * 8;
-
- const int table_size = ARRAY_SIZE(pcm_format_value_map);
-
- int slot_index, bit_index, table_index;
- table_index = 0;
- int num_written = 0;
- for (slot_index = 0; slot_index < num_slots && table_index < table_size;
- slot_index++) {
- unsigned bit_mask = 1;
- for (bit_index = 0;
- bit_index < bits_per_slot && table_index < table_size;
- bit_index++) {
- if ((mask->bits[slot_index] & bit_mask) != 0) {
- enum pcm_format format = pcm_format_value_map[table_index];
- /* Never return invalid (unrecognized) or 8-bit */
- if (format != PCM_FORMAT_INVALID && format != PCM_FORMAT_S8) {
- profile->formats[num_written++] = format;
- if (num_written == ARRAY_SIZE(profile->formats) - 1) {
- /* leave at least one PCM_FORMAT_INVALID at the end */
- return num_written;
- }
- }
- }
- bit_mask <<= 1;
- table_index++;
- }
- }
-
- return num_written;
-}
-
-static unsigned profile_enum_channel_counts(alsa_device_profile* profile, unsigned min,
- unsigned max)
-{
- static const unsigned std_channel_counts[] = {8, 4, 2, 1};
-
- unsigned num_counts = 0;
- unsigned index;
- /* TODO write a profile_test_channel_count() */
- /* Ensure there is at least one invalid channel count to terminate the channel counts array */
- for (index = 0; index < ARRAY_SIZE(std_channel_counts) &&
- num_counts < ARRAY_SIZE(profile->channel_counts) - 1;
- index++) {
- /* TODO Do we want a channel counts test? */
- if (std_channel_counts[index] >= min && std_channel_counts[index] <= max /* &&
- profile_test_channel_count(profile, channel_counts[index])*/) {
- profile->channel_counts[num_counts++] = std_channel_counts[index];
- }
- }
-
- return num_counts; /* return # of supported counts */
-}
-
-/*
- * Reads and decodes configuration info from the specified ALSA card/device.
- */
-static int read_alsa_device_config(alsa_device_profile * profile, struct pcm_config * config)
-{
- ALOGV("usb:audio_hw - read_alsa_device_config(c:%d d:%d t:0x%X)",
- profile->card, profile->device, profile->direction);
-
- if (profile->card < 0 || profile->device < 0) {
- return -EINVAL;
- }
-
- struct pcm_params * alsa_hw_params =
- pcm_params_get(profile->card, profile->device, profile->direction);
- if (alsa_hw_params == NULL) {
- return -EINVAL;
- }
-
- profile->min_period_size = pcm_params_get_min(alsa_hw_params, PCM_PARAM_PERIOD_SIZE);
- profile->max_period_size = pcm_params_get_max(alsa_hw_params, PCM_PARAM_PERIOD_SIZE);
-
- profile->min_channel_count = pcm_params_get_min(alsa_hw_params, PCM_PARAM_CHANNELS);
- profile->max_channel_count = pcm_params_get_max(alsa_hw_params, PCM_PARAM_CHANNELS);
-
- int ret = 0;
-
- /*
- * This Logging will be useful when testing new USB devices.
- */
-#ifdef LOG_PCM_PARAMS
- log_pcm_params(alsa_hw_params);
-#endif
-
- config->channels = pcm_params_get_min(alsa_hw_params, PCM_PARAM_CHANNELS);
- config->rate = pcm_params_get_min(alsa_hw_params, PCM_PARAM_RATE);
- config->period_size = profile_calc_min_period_size(profile, config->rate);
- config->period_count = pcm_params_get_min(alsa_hw_params, PCM_PARAM_PERIODS);
- config->format = get_pcm_format_for_mask(pcm_params_get_mask(alsa_hw_params, PCM_PARAM_FORMAT));
-#ifdef LOG_PCM_PARAMS
- log_pcm_config(config, "read_alsa_device_config");
-#endif
- if (config->format == PCM_FORMAT_INVALID) {
- ret = -EINVAL;
- }
-
- pcm_params_free(alsa_hw_params);
-
- return ret;
-}
-
-bool profile_read_device_info(alsa_device_profile* profile)
-{
- if (!profile_is_initialized(profile)) {
- return false;
- }
-
- /* let's get some defaults */
- read_alsa_device_config(profile, &profile->default_config);
- ALOGV("default_config chans:%d rate:%d format:%d count:%d size:%d",
- profile->default_config.channels, profile->default_config.rate,
- profile->default_config.format, profile->default_config.period_count,
- profile->default_config.period_size);
-
- struct pcm_params * alsa_hw_params = pcm_params_get(profile->card,
- profile->device,
- profile->direction);
- if (alsa_hw_params == NULL) {
- return false;
- }
-
- /* Formats */
- struct pcm_mask * format_mask = pcm_params_get_mask(alsa_hw_params, PCM_PARAM_FORMAT);
- profile_enum_sample_formats(profile, format_mask);
-
- /* Channels */
- profile_enum_channel_counts(
- profile, pcm_params_get_min(alsa_hw_params, PCM_PARAM_CHANNELS),
- pcm_params_get_max(alsa_hw_params, PCM_PARAM_CHANNELS));
-
- /* Sample Rates */
- profile_enum_sample_rates(
- profile, pcm_params_get_min(alsa_hw_params, PCM_PARAM_RATE),
- pcm_params_get_max(alsa_hw_params, PCM_PARAM_RATE));
-
- profile->is_valid = true;
-
- return true;
-}
-
-char * profile_get_sample_rate_strs(alsa_device_profile* profile)
-{
- char buffer[128];
- buffer[0] = '\0';
- int buffSize = ARRAY_SIZE(buffer);
-
- char numBuffer[32];
-
- int numEntries = 0;
- unsigned index;
- for (index = 0; profile->sample_rates[index] != 0; index++) {
- if (numEntries++ != 0) {
- strncat(buffer, "|", buffSize);
- }
- snprintf(numBuffer, sizeof(numBuffer), "%u", profile->sample_rates[index]);
- strncat(buffer, numBuffer, buffSize);
- }
-
- return strdup(buffer);
-}
-
-char * profile_get_format_strs(alsa_device_profile* profile)
-{
- /* TODO remove this hack when we have support for input in non PCM16 formats */
- if (profile->direction == PCM_IN) {
- return strdup("AUDIO_FORMAT_PCM_16_BIT");
- }
-
- char buffer[128];
- buffer[0] = '\0';
- int buffSize = ARRAY_SIZE(buffer);
-
- int numEntries = 0;
- unsigned index = 0;
- for (index = 0; profile->formats[index] != PCM_FORMAT_INVALID; index++) {
- if (numEntries++ != 0) {
- strncat(buffer, "|", buffSize);
- }
- strncat(buffer, format_string_map[profile->formats[index]], buffSize);
- }
-
- return strdup(buffer);
-}
-
-char * profile_get_channel_count_strs(alsa_device_profile* profile)
-{
- static const char * const out_chans_strs[] = {
- /* 0 */"AUDIO_CHANNEL_NONE", /* will never be taken as this is a terminator */
- /* 1 */"AUDIO_CHANNEL_OUT_MONO",
- /* 2 */"AUDIO_CHANNEL_OUT_STEREO",
- /* 3 */ /* "AUDIO_CHANNEL_OUT_STEREO|AUDIO_CHANNEL_OUT_FRONT_CENTER" */ NULL,
- /* 4 */"AUDIO_CHANNEL_OUT_QUAD",
- /* 5 */ /* "AUDIO_CHANNEL_OUT_QUAD|AUDIO_CHANNEL_OUT_FRONT_CENTER" */ NULL,
- /* 6 */"AUDIO_CHANNEL_OUT_5POINT1",
- /* 7 */ /* "AUDIO_CHANNEL_OUT_5POINT1|AUDIO_CHANNEL_OUT_BACK_CENTER" */ NULL,
- /* 8 */"AUDIO_CHANNEL_OUT_7POINT1",
- /* channel counts greater than this not considered */
- };
-
- static const char * const in_chans_strs[] = {
- /* 0 */"AUDIO_CHANNEL_NONE", /* will never be taken as this is a terminator */
- /* 1 */"AUDIO_CHANNEL_IN_MONO",
- /* 2 */"AUDIO_CHANNEL_IN_STEREO",
- /* channel counts greater than this not considered */
- };
-
- const bool isOutProfile = profile->direction == PCM_OUT;
-
- const char * const * const names_array = isOutProfile ? out_chans_strs : in_chans_strs;
- const size_t names_size = isOutProfile ? ARRAY_SIZE(out_chans_strs)
- : ARRAY_SIZE(in_chans_strs);
-
- char buffer[256]; /* caution, may need to be expanded */
- buffer[0] = '\0';
- const int buffer_size = ARRAY_SIZE(buffer);
- int num_entries = 0;
- /* We currently support MONO and STEREO, and always report STEREO but some (many)
- * USB Audio Devices may only announce support for MONO (a headset mic for example), or
- * The total number of output channels. SO, if the device itself doesn't explicitly
- * support STEREO, append to the channel config strings we are generating.
- */
- bool stereo_present = false;
- unsigned index;
- unsigned channel_count;
-
- for (index = 0; (channel_count = profile->channel_counts[index]) != 0; index++) {
- stereo_present = stereo_present || channel_count == 2;
- if (channel_count < names_size && names_array[channel_count] != NULL) {
- if (num_entries++ != 0) {
- strncat(buffer, "|", buffer_size);
- }
- strncat(buffer, names_array[channel_count], buffer_size);
- }
- }
-
- /* emulated modes:
- * always expose stereo as we can emulate it for PCM_OUT
- */
- if (!stereo_present) {
- if (num_entries++ != 0) {
- strncat(buffer, "|", buffer_size);
- }
- strncat(buffer, names_array[2], buffer_size); /* stereo */
- }
-
- return strdup(buffer);
-}
diff --git a/modules/usbaudio/alsa_device_profile.h b/modules/usbaudio/alsa_device_profile.h
deleted file mode 100644
index 2c0da39..0000000
--- a/modules/usbaudio/alsa_device_profile.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Copyright (C) 2014 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef ANDROID_HARDWARE_LIBHARDWARE_MODULES_USBAUDIO_ALSA_DEVICE_PROFILE_H
-#define ANDROID_HARDWARE_LIBHARDWARE_MODULES_USBAUDIO_ALSA_DEVICE_PROFILE_H
-
-#include <stdbool.h>
-
-#include <tinyalsa/asoundlib.h>
-
-#define MAX_PROFILE_FORMATS 6 /* We long support the 5 standard formats defined
- * in asound.h, so we just need this to be 1 more
- * than that */
-#define MAX_PROFILE_SAMPLE_RATES 10 /* this number needs to be 1 more than the number of
- * standard formats in std_sample_rates[]
- * (in alsa_device_profile.c) */
-#define MAX_PROFILE_CHANNEL_COUNTS 5 /* this number need to be 1 more than the number of
- * standard channel formats in std_channel_counts[]
- * (in alsa_device_profile.c) */
-
-#define DEFAULT_SAMPLE_RATE 44100
-#define DEFAULT_SAMPLE_FORMAT PCM_FORMAT_S16_LE
-#define DEFAULT_CHANNEL_COUNT 2
-
-typedef struct {
- int card;
- int device;
- int direction; /* PCM_OUT or PCM_IN */
-
- enum pcm_format formats[MAX_PROFILE_FORMATS];
-
- unsigned sample_rates[MAX_PROFILE_SAMPLE_RATES];
-
- unsigned channel_counts[MAX_PROFILE_CHANNEL_COUNTS];
-
- bool is_valid;
-
- /* read from the hardware device */
- struct pcm_config default_config;
-
- unsigned min_period_size;
- unsigned max_period_size;
-
- unsigned min_channel_count;
- unsigned max_channel_count;
-} alsa_device_profile;
-
-void profile_init(alsa_device_profile* profile, int direction);
-bool profile_is_initialized(alsa_device_profile* profile);
-bool profile_is_valid(alsa_device_profile* profile);
-bool profile_is_cached_for(alsa_device_profile* profile, int card, int device);
-void profile_decache(alsa_device_profile* profile);
-
-bool profile_read_device_info(alsa_device_profile* profile);
-
-/* Audio Config Strings Methods */
-char * profile_get_sample_rate_strs(alsa_device_profile* profile);
-char * profile_get_format_strs(alsa_device_profile* profile);
-char * profile_get_channel_count_strs(alsa_device_profile* profile);
-
-/* Sample Rate Methods */
-unsigned profile_get_default_sample_rate(alsa_device_profile* profile);
-bool profile_is_sample_rate_valid(alsa_device_profile* profile, unsigned rate);
-
-/* Format Methods */
-enum pcm_format profile_get_default_format(alsa_device_profile* profile);
-bool profile_is_format_valid(alsa_device_profile* profile, enum pcm_format fmt);
-
-/* Channel Methods */
-unsigned profile_get_default_channel_count(alsa_device_profile* profile);
-bool profile_is_channel_count_valid(alsa_device_profile* profile, unsigned count);
-
-/* Utility */
-unsigned profile_calc_min_period_size(alsa_device_profile* profile, unsigned sample_rate);
-unsigned int profile_get_period_size(alsa_device_profile* profile, unsigned sample_rate);
-
-#endif /* ANDROID_HARDWARE_LIBHARDWARE_MODULES_USBAUDIO_ALSA_DEVICE_PROFILE_H */
diff --git a/modules/usbaudio/alsa_device_proxy.c b/modules/usbaudio/alsa_device_proxy.c
deleted file mode 100644
index 3d13acd..0000000
--- a/modules/usbaudio/alsa_device_proxy.c
+++ /dev/null
@@ -1,159 +0,0 @@
-/*
- * Copyright (C) 2014 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#define LOG_TAG "alsa_device_proxy"
-/*#define LOG_NDEBUG 0*/
-/*#define LOG_PCM_PARAMS 0*/
-
-#include <log/log.h>
-
-#include <errno.h>
-
-#include "alsa_device_proxy.h"
-
-#include "audio_logging.h"
-
-#define DEFAULT_PERIOD_SIZE 1024
-#define DEFAULT_PERIOD_COUNT 2
-
-void proxy_prepare(alsa_device_proxy * proxy, alsa_device_profile* profile,
- struct pcm_config * config)
-{
- ALOGV("proxy_prepare(c:%d, d:%d)", profile->card, profile->device);
-
- proxy->profile = profile;
-
-#ifdef LOG_PCM_PARAMS
- log_pcm_config(config, "proxy_setup()");
-#endif
-
- proxy->alsa_config.format =
- config->format != PCM_FORMAT_INVALID && profile_is_format_valid(profile, config->format)
- ? config->format : profile->default_config.format;
- proxy->alsa_config.rate =
- config->rate != 0 && profile_is_sample_rate_valid(profile, config->rate)
- ? config->rate : profile->default_config.rate;
- proxy->alsa_config.channels =
- config->channels != 0 && profile_is_channel_count_valid(profile, config->channels)
- ? config->channels : profile->default_config.channels;
-
- proxy->alsa_config.period_count = profile->default_config.period_count;
- proxy->alsa_config.period_size =
- profile_get_period_size(proxy->profile, proxy->alsa_config.rate);
-
- // Hack for USB accessory audio.
- // Here we set the correct value for period_count if tinyalsa fails to get it from the
- // f_audio_source driver.
- if (proxy->alsa_config.period_count == 0) {
- proxy->alsa_config.period_count = 4;
- }
-
- proxy->pcm = NULL;
-}
-
-int proxy_open(alsa_device_proxy * proxy)
-{
- alsa_device_profile* profile = proxy->profile;
- ALOGV("proxy_open(card:%d device:%d %s)", profile->card, profile->device,
- profile->direction == PCM_OUT ? "PCM_OUT" : "PCM_IN");
-
- if (profile->card < 0 || profile->device < 0) {
- return -EINVAL;
- }
-
- proxy->pcm = pcm_open(profile->card, profile->device, profile->direction, &proxy->alsa_config);
- if (proxy->pcm == NULL) {
- return -ENOMEM;
- }
-
- if (!pcm_is_ready(proxy->pcm)) {
- ALOGE(" proxy_open() pcm_open() failed: %s", pcm_get_error(proxy->pcm));
-#if defined(LOG_PCM_PARAMS)
- log_pcm_config(&proxy->alsa_config, "config");
-#endif
- pcm_close(proxy->pcm);
- proxy->pcm = NULL;
- return -ENOMEM;
- }
-
- return 0;
-}
-
-void proxy_close(alsa_device_proxy * proxy)
-{
- ALOGV("proxy_close() [pcm:%p]", proxy->pcm);
-
- if (proxy->pcm != NULL) {
- pcm_close(proxy->pcm);
- proxy->pcm = NULL;
- }
-}
-
-/*
- * Sample Rate
- */
-unsigned proxy_get_sample_rate(const alsa_device_proxy * proxy)
-{
- return proxy->alsa_config.rate;
-}
-
-/*
- * Format
- */
-enum pcm_format proxy_get_format(const alsa_device_proxy * proxy)
-{
- return proxy->alsa_config.format;
-}
-
-/*
- * Channel Count
- */
-unsigned proxy_get_channel_count(const alsa_device_proxy * proxy)
-{
- return proxy->alsa_config.channels;
-}
-
-/*
- * Other
- */
-unsigned int proxy_get_period_size(const alsa_device_proxy * proxy)
-{
- return proxy->alsa_config.period_size;
-}
-
-unsigned int proxy_get_period_count(const alsa_device_proxy * proxy)
-{
- return proxy->alsa_config.period_count;
-}
-
-unsigned proxy_get_latency(const alsa_device_proxy * proxy)
-{
- return (proxy_get_period_size(proxy) * proxy_get_period_count(proxy) * 1000)
- / proxy_get_sample_rate(proxy);
-}
-
-/*
- * I/O
- */
-int proxy_write(const alsa_device_proxy * proxy, const void *data, unsigned int count)
-{
- return pcm_write(proxy->pcm, data, count);
-}
-
-int proxy_read(const alsa_device_proxy * proxy, void *data, unsigned int count)
-{
- return pcm_read(proxy->pcm, data, count);
-}
diff --git a/modules/usbaudio/alsa_device_proxy.h b/modules/usbaudio/alsa_device_proxy.h
deleted file mode 100644
index f090c56..0000000
--- a/modules/usbaudio/alsa_device_proxy.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (C) 2014 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef ANDROID_HARDWARE_LIBHARDWARE_MODULES_USBAUDIO_ALSA_DEVICE_PROXY_H
-#define ANDROID_HARDWARE_LIBHARDWARE_MODULES_USBAUDIO_ALSA_DEVICE_PROXY_H
-
-#include <tinyalsa/asoundlib.h>
-
-#include "alsa_device_profile.h"
-
-typedef struct {
- alsa_device_profile* profile;
-
- struct pcm_config alsa_config;
-
- struct pcm * pcm;
-} alsa_device_proxy;
-
-void proxy_prepare(alsa_device_proxy * proxy, alsa_device_profile * profile,
- struct pcm_config * config);
-
-unsigned proxy_get_sample_rate(const alsa_device_proxy * proxy);
-enum pcm_format proxy_get_format(const alsa_device_proxy * proxy);
-unsigned proxy_get_channel_count(const alsa_device_proxy * proxy);
-
-unsigned int proxy_get_period_size(const alsa_device_proxy * proxy);
-
-unsigned proxy_get_latency(const alsa_device_proxy * proxy);
-
-int proxy_open(alsa_device_proxy * proxy);
-void proxy_close(alsa_device_proxy * proxy);
-
-int proxy_write(const alsa_device_proxy * proxy, const void *data, unsigned int count);
-int proxy_read(const alsa_device_proxy * proxy, void *data, unsigned int count);
-
-#endif /* ANDROID_HARDWARE_LIBHARDWARE_MODULES_USBAUDIO_ALSA_DEVICE_PROXY_H */
diff --git a/modules/usbaudio/audio_format.c b/modules/usbaudio/audio_format.c
deleted file mode 100644
index 63b1ba8..0000000
--- a/modules/usbaudio/audio_format.c
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Copyright (C) 2014 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#define LOG_TAG "audio_format"
-/*#define LOG_NDEBUG 0*/
-
-#include "audio_format.h"
-
-#include <tinyalsa/asoundlib.h>
-
-#define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0]))
-
-/*
- * Maps from bit position in pcm_mask to PCM_ format constants.
- */
-int8_t const pcm_format_value_map[50] = {
- PCM_FORMAT_S8, /* 00 - SNDRV_PCM_FORMAT_S8 */
- PCM_FORMAT_INVALID, /* 01 - SNDRV_PCM_FORMAT_U8 */
- PCM_FORMAT_S16_LE, /* 02 - SNDRV_PCM_FORMAT_S16_LE */
- PCM_FORMAT_INVALID, /* 03 - SNDRV_PCM_FORMAT_S16_BE */
- PCM_FORMAT_INVALID, /* 04 - SNDRV_PCM_FORMAT_U16_LE */
- PCM_FORMAT_INVALID, /* 05 - SNDRV_PCM_FORMAT_U16_BE */
- PCM_FORMAT_S24_3LE, /* 06 - SNDRV_PCM_FORMAT_S24_LE */
- PCM_FORMAT_INVALID, /* 07 - SNDRV_PCM_FORMAT_S24_BE */
- PCM_FORMAT_INVALID, /* 08 - SNDRV_PCM_FORMAT_U24_LE */
- PCM_FORMAT_INVALID, /* 09 - SNDRV_PCM_FORMAT_U24_BE */
- PCM_FORMAT_S32_LE, /* 10 - SNDRV_PCM_FORMAT_S32_LE */
- PCM_FORMAT_INVALID, /* 11 - SNDRV_PCM_FORMAT_S32_BE */
- PCM_FORMAT_INVALID, /* 12 - SNDRV_PCM_FORMAT_U32_LE */
- PCM_FORMAT_INVALID, /* 13 - SNDRV_PCM_FORMAT_U32_BE */
- PCM_FORMAT_INVALID, /* 14 - SNDRV_PCM_FORMAT_FLOAT_LE */
- PCM_FORMAT_INVALID, /* 15 - SNDRV_PCM_FORMAT_FLOAT_BE */
- PCM_FORMAT_INVALID, /* 16 - SNDRV_PCM_FORMAT_FLOAT64_LE */
- PCM_FORMAT_INVALID, /* 17 - SNDRV_PCM_FORMAT_FLOAT64_BE */
- PCM_FORMAT_INVALID, /* 18 - SNDRV_PCM_FORMAT_IEC958_SUBFRAME_LE */
- PCM_FORMAT_INVALID, /* 19 - SNDRV_PCM_FORMAT_IEC958_SUBFRAME_BE */
- PCM_FORMAT_INVALID, /* 20 - SNDRV_PCM_FORMAT_MU_LAW */
- PCM_FORMAT_INVALID, /* 21 - SNDRV_PCM_FORMAT_A_LAW */
- PCM_FORMAT_INVALID, /* 22 - SNDRV_PCM_FORMAT_IMA_ADPCM */
- PCM_FORMAT_INVALID, /* 23 - SNDRV_PCM_FORMAT_MPEG */
- PCM_FORMAT_INVALID, /* 24 - SNDRV_PCM_FORMAT_GSM */
- PCM_FORMAT_INVALID, /* 25 -> 30 (not assigned) */
- PCM_FORMAT_INVALID,
- PCM_FORMAT_INVALID,
- PCM_FORMAT_INVALID,
- PCM_FORMAT_INVALID,
- PCM_FORMAT_INVALID,
- PCM_FORMAT_INVALID, /* 31 - SNDRV_PCM_FORMAT_SPECIAL */
- PCM_FORMAT_S24_3LE, /* 32 - SNDRV_PCM_FORMAT_S24_3LE */ /* ??? */
- PCM_FORMAT_INVALID, /* 33 - SNDRV_PCM_FORMAT_S24_3BE */
- PCM_FORMAT_INVALID, /* 34 - SNDRV_PCM_FORMAT_U24_3LE */
- PCM_FORMAT_INVALID, /* 35 - SNDRV_PCM_FORMAT_U24_3BE */
- PCM_FORMAT_INVALID, /* 36 - SNDRV_PCM_FORMAT_S20_3LE */
- PCM_FORMAT_INVALID, /* 37 - SNDRV_PCM_FORMAT_S20_3BE */
- PCM_FORMAT_INVALID, /* 38 - SNDRV_PCM_FORMAT_U20_3LE */
- PCM_FORMAT_INVALID, /* 39 - SNDRV_PCM_FORMAT_U20_3BE */
- PCM_FORMAT_INVALID, /* 40 - SNDRV_PCM_FORMAT_S18_3LE */
- PCM_FORMAT_INVALID, /* 41 - SNDRV_PCM_FORMAT_S18_3BE */
- PCM_FORMAT_INVALID, /* 42 - SNDRV_PCM_FORMAT_U18_3LE */
- PCM_FORMAT_INVALID, /* 43 - SNDRV_PCM_FORMAT_U18_3BE */
- PCM_FORMAT_INVALID, /* 44 - SNDRV_PCM_FORMAT_G723_24 */
- PCM_FORMAT_INVALID, /* 45 - SNDRV_PCM_FORMAT_G723_24_1B */
- PCM_FORMAT_INVALID, /* 46 - SNDRV_PCM_FORMAT_G723_40 */
- PCM_FORMAT_INVALID, /* 47 - SNDRV_PCM_FORMAT_G723_40_1B */
- PCM_FORMAT_INVALID, /* 48 - SNDRV_PCM_FORMAT_DSD_U8 */
- PCM_FORMAT_INVALID /* 49 - SNDRV_PCM_FORMAT_DSD_U16_LE */
-};
-
-/*
- * Scans the provided format mask and returns the first non-8 bit sample
- * format supported by the devices.
- */
-enum pcm_format get_pcm_format_for_mask(struct pcm_mask* mask)
-{
- int num_slots = ARRAY_SIZE(mask->bits);
- int bits_per_slot = sizeof(mask->bits[0]) * 8;
-
- int table_size = ARRAY_SIZE(pcm_format_value_map);
-
- int slot_index, bit_index, table_index;
- table_index = 0;
- int num_written = 0;
- for (slot_index = 0; slot_index < num_slots && table_index < table_size; slot_index++) {
- unsigned bit_mask = 1;
- for (bit_index = 0; bit_index < bits_per_slot && table_index < table_size; bit_index++) {
- /* skip any 8-bit formats */
- if (table_index >= 2 && (mask->bits[slot_index] & bit_mask) != 0) {
- /* just return the first one which will be at least 16-bit */
- return (int)pcm_format_value_map[table_index];
- }
- bit_mask <<= 1;
- table_index++;
- }
- }
-
- return PCM_FORMAT_INVALID;
-}
diff --git a/modules/usbaudio/audio_format.h b/modules/usbaudio/audio_format.h
deleted file mode 100644
index 712ef67..0000000
--- a/modules/usbaudio/audio_format.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (C) 2014 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef ANDROID_HARDWARE_LIBHARDWARE_MODULES_USBAUDIO_AUDIO_FORMAT_H
-#define ANDROID_HARDWARE_LIBHARDWARE_MODULES_USBAUDIO_AUDIO_FORMAT_H
-
-#include <system/audio.h>
-
-#include <tinyalsa/asoundlib.h>
-
-enum pcm_format get_pcm_format_for_mask(struct pcm_mask* mask);
-
-#endif /* ANDROID_HARDWARE_LIBHARDWARE_MODULES_USBAUDIO_AUDIO_FORMAT_H */
diff --git a/modules/usbaudio/audio_hw.c b/modules/usbaudio/audio_hal.c
similarity index 99%
rename from modules/usbaudio/audio_hw.c
rename to modules/usbaudio/audio_hal.c
index f391b10..2814e37 100644
--- a/modules/usbaudio/audio_hw.c
+++ b/modules/usbaudio/audio_hal.c
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#define LOG_TAG "usb_audio_hw"
+#define LOG_TAG "modules.usbaudio.audio_hal"
/*#define LOG_NDEBUG 0*/
#include <errno.h>
@@ -51,7 +51,7 @@
#include "alsa_device_profile.h"
#include "alsa_device_proxy.h"
-#include "audio_logging.h"
+#include "alsa_logging.h"
#define DEFAULT_INPUT_BUFFER_SIZE_MS 20
diff --git a/modules/usbaudio/audio_logging.c b/modules/usbaudio/audio_logging.c
deleted file mode 100644
index 77fbd51..0000000
--- a/modules/usbaudio/audio_logging.c
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- * Copyright (C) 2014 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#define LOG_TAG "audio_logging"
-/*#define LOG_NDEBUG 0*/
-
-#include <string.h>
-
-#include <log/log.h>
-
-#include "audio_logging.h"
-
-#define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0]))
-
-/*
- * Logging
- */
-void log_pcm_mask(const char* mask_name, struct pcm_mask* mask)
-{
- const size_t num_slots = ARRAY_SIZE(mask->bits);
- const size_t bits_per_slot = (sizeof(mask->bits[0]) * 8);
- const size_t chars_per_slot = (bits_per_slot + 1); /* comma */
-
- const size_t BUFF_SIZE =
- (num_slots * chars_per_slot + 2 + 1); /* brackets and null-terminator */
- char buff[BUFF_SIZE];
- buff[0] = '\0';
-
- size_t slot_index, bit_index;
- strcat(buff, "[");
- for (slot_index = 0; slot_index < num_slots; slot_index++) {
- unsigned bit_mask = 1;
- for (bit_index = 0; bit_index < bits_per_slot; bit_index++) {
- strcat(buff, (mask->bits[slot_index] & bit_mask) != 0 ? "1" : "0");
- bit_mask <<= 1;
- }
- if (slot_index < num_slots - 1) {
- strcat(buff, ",");
- }
- }
- strcat(buff, "]");
-
- ALOGV("%s: mask:%s", mask_name, buff);
-}
-
-void log_pcm_params(struct pcm_params * alsa_hw_params)
-{
- ALOGV("usb:audio_hw - PCM_PARAM_SAMPLE_BITS min:%u, max:%u",
- pcm_params_get_min(alsa_hw_params, PCM_PARAM_SAMPLE_BITS),
- pcm_params_get_max(alsa_hw_params, PCM_PARAM_SAMPLE_BITS));
- ALOGV("usb:audio_hw - PCM_PARAM_FRAME_BITS min:%u, max:%u",
- pcm_params_get_min(alsa_hw_params, PCM_PARAM_FRAME_BITS),
- pcm_params_get_max(alsa_hw_params, PCM_PARAM_FRAME_BITS));
- log_pcm_mask("PCM_PARAM_FORMAT",
- pcm_params_get_mask(alsa_hw_params, PCM_PARAM_FORMAT));
- log_pcm_mask("PCM_PARAM_SUBFORMAT",
- pcm_params_get_mask(alsa_hw_params, PCM_PARAM_SUBFORMAT));
- ALOGV("usb:audio_hw - PCM_PARAM_CHANNELS min:%u, max:%u",
- pcm_params_get_min(alsa_hw_params, PCM_PARAM_CHANNELS),
- pcm_params_get_max(alsa_hw_params, PCM_PARAM_CHANNELS));
- ALOGV("usb:audio_hw - PCM_PARAM_RATE min:%u, max:%u",
- pcm_params_get_min(alsa_hw_params, PCM_PARAM_RATE),
- pcm_params_get_max(alsa_hw_params, PCM_PARAM_RATE));
- ALOGV("usb:audio_hw - PCM_PARAM_PERIOD_TIME min:%u, max:%u",
- pcm_params_get_min(alsa_hw_params, PCM_PARAM_PERIOD_TIME),
- pcm_params_get_max(alsa_hw_params, PCM_PARAM_PERIOD_TIME));
- ALOGV("usb:audio_hw - PCM_PARAM_PERIOD_SIZE min:%u, max:%u",
- pcm_params_get_min(alsa_hw_params, PCM_PARAM_PERIOD_SIZE),
- pcm_params_get_max(alsa_hw_params, PCM_PARAM_PERIOD_SIZE));
- ALOGV("usb:audio_hw - PCM_PARAM_PERIOD_BYTES min:%u, max:%u",
- pcm_params_get_min(alsa_hw_params, PCM_PARAM_PERIOD_BYTES),
- pcm_params_get_max(alsa_hw_params, PCM_PARAM_PERIOD_BYTES));
- ALOGV("usb:audio_hw - PCM_PARAM_PERIODS min:%u, max:%u",
- pcm_params_get_min(alsa_hw_params, PCM_PARAM_PERIODS),
- pcm_params_get_max(alsa_hw_params, PCM_PARAM_PERIODS));
- ALOGV("usb:audio_hw - PCM_PARAM_BUFFER_TIME min:%u, max:%u",
- pcm_params_get_min(alsa_hw_params, PCM_PARAM_BUFFER_TIME),
- pcm_params_get_max(alsa_hw_params, PCM_PARAM_BUFFER_TIME));
- ALOGV("usb:audio_hw - PCM_PARAM_BUFFER_SIZE min:%u, max:%u",
- pcm_params_get_min(alsa_hw_params, PCM_PARAM_BUFFER_SIZE),
- pcm_params_get_max(alsa_hw_params, PCM_PARAM_BUFFER_SIZE));
- ALOGV("usb:audio_hw - PCM_PARAM_BUFFER_BYTES min:%u, max:%u",
- pcm_params_get_min(alsa_hw_params, PCM_PARAM_BUFFER_BYTES),
- pcm_params_get_max(alsa_hw_params, PCM_PARAM_BUFFER_BYTES));
- ALOGV("usb:audio_hw - PCM_PARAM_TICK_TIME min:%u, max:%u",
- pcm_params_get_min(alsa_hw_params, PCM_PARAM_TICK_TIME),
- pcm_params_get_max(alsa_hw_params, PCM_PARAM_TICK_TIME));
-}
-
-void log_pcm_config(struct pcm_config * config, const char* label) {
- ALOGV("log_pcm_config() - %s", label);
- ALOGV(" channels:%d", config->channels);
- ALOGV(" rate:%d", config->rate);
- ALOGV(" period_size:%d", config->period_size);
- ALOGV(" period_count:%d", config->period_count);
- ALOGV(" format:%d", config->format);
-#if 0
- /* Values to use for the ALSA start, stop and silence thresholds. Setting
- * any one of these values to 0 will cause the default tinyalsa values to be
- * used instead. Tinyalsa defaults are as follows.
- *
- * start_threshold : period_count * period_size
- * stop_threshold : period_count * period_size
- * silence_threshold : 0
- */
- unsigned int start_threshold;
- unsigned int stop_threshold;
- unsigned int silence_threshold;
-
- /* Minimum number of frames available before pcm_mmap_write() will actually
- * write into the kernel buffer. Only used if the stream is opened in mmap mode
- * (pcm_open() called with PCM_MMAP flag set). Use 0 for default.
- */
- int avail_min;
-#endif
-}
diff --git a/modules/usbaudio/audio_logging.h b/modules/usbaudio/audio_logging.h
deleted file mode 100644
index 082e8b2..0000000
--- a/modules/usbaudio/audio_logging.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (C) 2014 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef ANDROID_HARDWARE_LIBHARDWARE_MODULES_USBAUDIO_AUDIO_LOGGING_H
-#define ANDROID_HARDWARE_LIBHARDWARE_MODULES_USBAUDIO_AUDIO_LOGGING_H
-
-#include <tinyalsa/asoundlib.h>
-
-void log_pcm_mask(const char* mask_name, struct pcm_mask* mask);
-void log_pcm_params(struct pcm_params * alsa_hw_params);
-void log_pcm_config(struct pcm_config * config, const char* label);
-
-#endif /* ANDROID_HARDWARE_LIBHARDWARE_MODULES_USBAUDIO_AUDIO_LOGGING_H */