audio: derive sound device for concurrent playback usecases am: 2d809e0d10 am: 8a692c65cc
am: 63bbcbc7e5
Change-Id: Ib8fc1761e38f1206c17f85fbf96613907486e608
diff --git a/hal/msm8916/platform.c b/hal/msm8916/platform.c
index 373f25a..f086f4c 100644
--- a/hal/msm8916/platform.c
+++ b/hal/msm8916/platform.c
@@ -1057,7 +1057,7 @@
{
struct platform_data *my_data = (struct platform_data *)platform;
- if (platform == NULL || device_name == NULL) {
+ if (platform == NULL) {
ALOGW("%s: something wrong, use legacy get_snd_device name", __func__);
strlcpy(device_name, platform_get_snd_device_name(snd_device),
DEVICE_NAME_MAX_SIZE);
diff --git a/hal/msm8960/platform.c b/hal/msm8960/platform.c
index 7b76df3..eafb64a 100644
--- a/hal/msm8960/platform.c
+++ b/hal/msm8960/platform.c
@@ -1099,7 +1099,8 @@
snd_device_t snd_device,
char *device_name)
{
- device_name = platform_get_snd_device_name(snd_device);
+ strlcpy(device_name, platform_get_snd_device_name(snd_device),
+ DEVICE_NAME_MAX_SIZE);
return 0;
}
diff --git a/hal/msm8974/platform.c b/hal/msm8974/platform.c
index a890b61..e3a9518 100644
--- a/hal/msm8974/platform.c
+++ b/hal/msm8974/platform.c
@@ -1364,9 +1364,10 @@
{
struct platform_data *my_data = (struct platform_data *)platform;
- if (platform == NULL || device_name == NULL) {
+ if (platform == NULL) {
ALOGW("%s: something wrong, use legacy get_snd_device name", __func__);
- device_name = platform_get_snd_device_name(snd_device);
+ strlcpy(device_name, platform_get_snd_device_name(snd_device),
+ DEVICE_NAME_MAX_SIZE);
} else if (snd_device >= SND_DEVICE_MIN && snd_device < SND_DEVICE_MAX) {
if (operator_specific_device_table[snd_device] != NULL) {
strlcpy(device_name, get_operator_specific_device_mixer_path(snd_device),
@@ -2624,7 +2625,8 @@
}
bool platform_check_and_set_capture_backend_cfg(struct audio_device* adev,
- struct audio_usecase *usecase, snd_device_t snd_device)
+ struct audio_usecase *usecase __unused,
+ snd_device_t snd_device __unused)
{
enum pcm_format in_pcm_format = PCM_FORMAT_S16_LE;
diff --git a/hal/platform_api.h b/hal/platform_api.h
index e97975a..6f4e3dd 100644
--- a/hal/platform_api.h
+++ b/hal/platform_api.h
@@ -28,6 +28,7 @@
};
enum card_status_t;
+struct audio_usecase;
void *platform_init(struct audio_device *adev);
void platform_deinit(void *platform);
diff --git a/post_proc/bundle.c b/post_proc/bundle.c
index df327ab..73b9ae5 100644
--- a/post_proc/bundle.c
+++ b/post_proc/bundle.c
@@ -244,7 +244,7 @@
__attribute__ ((visibility ("default")))
int offload_effects_bundle_hal_stop_output(audio_io_handle_t output, int pcm_id)
{
- int ret;
+ int ret = 0;
struct listnode *node;
struct listnode *fx_node;
output_context_t *out_ctxt;
@@ -750,11 +750,11 @@
__attribute__ ((visibility ("default")))
audio_effect_library_t AUDIO_EFFECT_LIBRARY_INFO_SYM = {
- tag : AUDIO_EFFECT_LIBRARY_TAG,
- version : EFFECT_LIBRARY_API_VERSION,
- name : "Offload Effects Bundle Library",
- implementor : "The Android Open Source Project",
- create_effect : effect_lib_create,
- release_effect : effect_lib_release,
- get_descriptor : effect_lib_get_descriptor,
+ .tag = AUDIO_EFFECT_LIBRARY_TAG,
+ .version = EFFECT_LIBRARY_API_VERSION,
+ .name = "Offload Effects Bundle Library",
+ .implementor = "The Android Open Source Project",
+ .create_effect = effect_lib_create,
+ .release_effect = effect_lib_release,
+ .get_descriptor = effect_lib_get_descriptor,
};
diff --git a/post_proc/equalizer.c b/post_proc/equalizer.c
index 7cff348..1525226 100644
--- a/post_proc/equalizer.c
+++ b/post_proc/equalizer.c
@@ -183,7 +183,7 @@
int equalizer_get_num_presets(equalizer_context_t *context __unused)
{
- ALOGV("%s: presets_num: %d", __func__,
+ ALOGV("%s: presets_num: %zu", __func__,
sizeof(equalizer_preset_names)/sizeof(char *));
return sizeof(equalizer_preset_names)/sizeof(char *);
}
diff --git a/visualizer/offload_visualizer.c b/visualizer/offload_visualizer.c
index 69cea57..8b1c469 100644
--- a/visualizer/offload_visualizer.c
+++ b/visualizer/offload_visualizer.c
@@ -81,11 +81,11 @@
effect_ops_t ops;
};
-typedef struct output_context_s {
+struct output_context_s {
struct listnode outputs_list_node; /* node in active_outputs_list */
audio_io_handle_t handle; /* io handle */
struct listnode effects_list; /* list of effects attached to this output */
-} output_context_t;
+};
/* maximum time since last capture buffer update before resetting capture buffer. This means
@@ -427,7 +427,7 @@
__attribute__ ((visibility ("default")))
int visualizer_hal_start_output(audio_io_handle_t output, int pcm_id) {
- int ret;
+ int ret = 0;
struct listnode *node;
ALOGV("%s output %d pcm_id %d", __func__, output, pcm_id);
@@ -473,7 +473,7 @@
__attribute__ ((visibility ("default")))
int visualizer_hal_stop_output(audio_io_handle_t output, int pcm_id) {
- int ret;
+ int ret = 0;
struct listnode *node;
struct listnode *fx_node;
output_context_t *out_ctxt;
@@ -869,8 +869,8 @@
case VISUALIZER_CMD_MEASURE: {
if (pReplyData == NULL || replySize == NULL ||
*replySize < (sizeof(int32_t) * MEASUREMENT_COUNT)) {
- ALOGV("%s VISUALIZER_CMD_MEASURE error *replySize %d <"
- "(sizeof(int32_t) * MEASUREMENT_COUNT) %d",
+ ALOGV("%s VISUALIZER_CMD_MEASURE error *replySize %u <"
+ "(sizeof(int32_t) * MEASUREMENT_COUNT) %zu",
__func__, *replySize, sizeof(int32_t) * MEASUREMENT_COUNT);
android_errorWriteLog(0x534e4554, "30229821");
return -EINVAL;