hal: Compilation fixes

 * Fix surround sound recording build
 * Fix build when compress voip is disabled

Change-Id: Ia8f7598809ae9b8ae3767cae3cefdb6d49a04029

3 files changed, 45 insertions, 44 deletions

diff --git a/hal/Android.mk b/hal/Android.mk
index 7474d0b9..09fbaae1 100644
--- a/hal/Android.mk
+++ b/hal/Android.mk
@@ -257,6 +257,7 @@ endif
 
 LOCAL_CFLAGS += -Wall -Werror
 LOCAL_CLANG_CFLAGS += -Wno-unused-variable -Wno-missing-field-initializers
+LOCAL_CLANG_CFLAGS += -Wno-typedef-redefinition
 
 LOCAL_COPY_HEADERS_TO   := mm-audio
 LOCAL_COPY_HEADERS      := audio_extn/audio_defs.h
diff --git a/hal/audio_extn/ssr.c b/hal/audio_extn/ssr.c
index 5d104fcc..4c57adb0 100644
--- a/hal/audio_extn/ssr.c
+++ b/hal/audio_extn/ssr.c
@@ -301,7 +301,7 @@ static int32_t ssr_read_coeffs_from_file()
     return 0;
 }
 
-static int32_t DRC_init_lib(int num_chan, int sample_rate)
+static int32_t DRC_init_lib(int num_chan, int sample_rate __unused)
 {
     int ret = 0;
     const char *cfgFileName;
@@ -887,7 +887,7 @@ int32_t audio_extn_ssr_deinit()
     return 0;
 }
 
-static void *ssr_process_thread(void *context)
+static void *ssr_process_thread(void *context __unused)
 {
     int32_t ret;
 
@@ -1019,7 +1019,7 @@ int32_t audio_extn_ssr_read(struct audio_stream_in *stream,
     return ret;
 }
 
-void audio_extn_ssr_set_parameters(struct audio_device *adev,
+void audio_extn_ssr_set_parameters(struct audio_device *adev __unused,
                                    struct str_parms *parms)
 {
     int err;
@@ -1055,7 +1055,7 @@ void audio_extn_ssr_set_parameters(struct audio_device *adev,
     }
 }
 
-void audio_extn_ssr_get_parameters(const struct audio_device *adev,
+void audio_extn_ssr_get_parameters(const struct audio_device *adev __unused,
                                    struct str_parms *parms,
                                    struct str_parms *reply)
 {
diff --git a/hal/voice_extn/voice_extn.h b/hal/voice_extn/voice_extn.h
index 26930deb..dd3fda6d 100644
--- a/hal/voice_extn/voice_extn.h
+++ b/hal/voice_extn/voice_extn.h
@@ -141,128 +141,128 @@ bool voice_extn_compress_voip_is_format_supported(audio_format_t format);
 bool voice_extn_compress_voip_is_config_supported(struct audio_config *config);
 bool voice_extn_compress_voip_is_started(struct audio_device *adev);
 #else
-static int voice_extn_compress_voip_close_output_stream(struct audio_stream *stream __unused)
+inline int voice_extn_compress_voip_close_output_stream(struct audio_stream *stream __unused)
 {
-    ALOGE("%s: COMPRESS_VOIP_ENABLED is not defined", __func__);
+    ALOGV("%s: COMPRESS_VOIP_ENABLED is not defined", __func__);
     return -ENOSYS;
 }
 
-static int voice_extn_compress_voip_open_output_stream(struct stream_out *out __unused)
+inline int voice_extn_compress_voip_open_output_stream(struct stream_out *out __unused)
 {
-    ALOGE("%s: COMPRESS_VOIP_ENABLED is not defined", __func__);
+    ALOGV("%s: COMPRESS_VOIP_ENABLED is not defined", __func__);
     return -ENOSYS;
 }
 
-static int voice_extn_compress_voip_close_input_stream(struct audio_stream *stream __unused)
+inline int voice_extn_compress_voip_close_input_stream(struct audio_stream *stream __unused)
 {
-    ALOGE("%s: COMPRESS_VOIP_ENABLED is not defined", __func__);
+    ALOGV("%s: COMPRESS_VOIP_ENABLED is not defined", __func__);
     return -ENOSYS;
 }
 
-static int voice_extn_compress_voip_open_input_stream(struct stream_in *in __unused)
+inline int voice_extn_compress_voip_open_input_stream(struct stream_in *in __unused)
 {
-    ALOGE("%s: COMPRESS_VOIP_ENABLED is not defined", __func__);
+    ALOGV("%s: COMPRESS_VOIP_ENABLED is not defined", __func__);
     return -ENOSYS;
 }
 
-static int voice_extn_compress_voip_out_get_buffer_size(struct stream_out *stream __unused)
+inline int voice_extn_compress_voip_out_get_buffer_size(struct stream_out *stream __unused)
 {
-    ALOGE("%s: COMPRESS_VOIP_ENABLED is not defined", __func__);
+    ALOGV("%s: COMPRESS_VOIP_ENABLED is not defined", __func__);
     return -ENOSYS;
 }
 
-static int voice_extn_compress_voip_in_get_buffer_size(struct stream_in *in __unused)
+inline int voice_extn_compress_voip_in_get_buffer_size(struct stream_in *in __unused)
 {
-    ALOGE("%s: COMPRESS_VOIP_ENABLED is not defined", __func__);
+    ALOGV("%s: COMPRESS_VOIP_ENABLED is not defined", __func__);
     return -ENOSYS;
 }
 
-static int voice_extn_compress_voip_start_input_stream(struct stream_in *in __unused)
+inline int voice_extn_compress_voip_start_input_stream(struct stream_in *in __unused)
 {
-    ALOGE("%s: COMPRESS_VOIP_ENABLED is not defined", __func__);
+    ALOGV("%s: COMPRESS_VOIP_ENABLED is not defined", __func__);
     return -ENOSYS;
 }
 
-static int voice_extn_compress_voip_start_output_stream(struct stream_out *out __unused)
+inline int voice_extn_compress_voip_start_output_stream(struct stream_out *out __unused)
 {
-    ALOGE("%s: COMPRESS_VOIP_ENABLED is not defined", __func__);
+    ALOGV("%s: COMPRESS_VOIP_ENABLED is not defined", __func__);
     return -ENOSYS;
 }
 
-static int voice_extn_compress_voip_set_mic_mute(struct audio_device *adev, bool state __unused)
+inline int voice_extn_compress_voip_set_mic_mute(struct audio_device *adev __unused, bool state __unused)
 {
-    ALOGE("%s: COMPRESS_VOIP_ENABLED is not defined", __func__);
+    ALOGV("%s: COMPRESS_VOIP_ENABLED is not defined", __func__);
     return 0;
 }
 
-static int voice_extn_compress_voip_set_volume(struct audio_device *adev __unused, float volume __unused)
+inline int voice_extn_compress_voip_set_volume(struct audio_device *adev __unused, float volume __unused)
 {
-    ALOGE("%s: COMPRESS_VOIP_ENABLED is not defined", __func__);
+    ALOGV("%s: COMPRESS_VOIP_ENABLED is not defined", __func__);
     return 0;
 }
 
-static int voice_extn_compress_voip_select_devices(struct audio_device *adev __unused,
+inline int voice_extn_compress_voip_select_devices(struct audio_device *adev __unused,
                                                    snd_device_t *out_snd_device __unused,
                                                    snd_device_t *in_snd_device __unused)
 {
-    ALOGE("%s: COMPRESS_VOIP_ENABLED is not defined", __func__);
+    ALOGV("%s: COMPRESS_VOIP_ENABLED is not defined", __func__);
     return -ENOSYS;
 }
 
-static int voice_extn_compress_voip_set_parameters(struct audio_device *adev __unused,
+inline int voice_extn_compress_voip_set_parameters(struct audio_device *adev __unused,
                                                     struct str_parms *parms __unused)
 {
-    ALOGE("%s: COMPRESS_VOIP_ENABLED is not defined", __func__);
+    ALOGV("%s: COMPRESS_VOIP_ENABLED is not defined", __func__);
     return -ENOSYS;
 }
 
-static void voice_extn_compress_voip_get_parameters(struct str_parms *query __unused,
+inline void voice_extn_compress_voip_get_parameters(struct str_parms *query __unused,
                                                     struct str_parms *reply __unused)
 {
-    ALOGE("%s: COMPRESS_VOIP_ENABLED is not defined", __func__);
+    ALOGV("%s: COMPRESS_VOIP_ENABLED is not defined", __func__);
 }
 
-static void voice_extn_compress_voip_out_get_parameters(struct stream_out *out __unused,
+inline void voice_extn_compress_voip_out_get_parameters(struct stream_out *out __unused,
                                                         struct str_parms *query __unused,
                                                         struct str_parms *reply __unused)
 {
-    ALOGE("%s: COMPRESS_VOIP_ENABLED is not defined", __func__);
+    ALOGV("%s: COMPRESS_VOIP_ENABLED is not defined", __func__);
 }
 
-static void voice_extn_compress_voip_in_get_parameters(struct stream_in *in __unused,
+inline void voice_extn_compress_voip_in_get_parameters(struct stream_in *in __unused,
                                                        struct str_parms *query __unused,
                                                        struct str_parms *reply __unused)
 {
-    ALOGE("%s: COMPRESS_VOIP_ENABLED is not defined", __func__);
+    ALOGV("%s: COMPRESS_VOIP_ENABLED is not defined", __func__);
 }
 
-static bool voice_extn_compress_voip_pcm_prop_check()
+inline bool voice_extn_compress_voip_pcm_prop_check()
 {
-    ALOGE("%s: COMPRESS_VOIP_ENABLED is not defined", __func__);
+    ALOGV("%s: COMPRESS_VOIP_ENABLED is not defined", __func__);
     return false;
 }
 
-static bool voice_extn_compress_voip_is_active(struct audio_device *adev __unused)
+inline bool voice_extn_compress_voip_is_active(struct audio_device *adev __unused)
 {
-    ALOGE("%s: COMPRESS_VOIP_ENABLED is not defined", __func__);
+    ALOGV("%s: COMPRESS_VOIP_ENABLED is not defined", __func__);
     return false;
 }
 
-static bool voice_extn_compress_voip_is_format_supported(audio_format_t format __unused)
+inline bool voice_extn_compress_voip_is_format_supported(audio_format_t format __unused)
 {
-    ALOGE("%s: COMPRESS_VOIP_ENABLED is not defined", __func__);
+    ALOGV("%s: COMPRESS_VOIP_ENABLED is not defined", __func__);
     return true;
 }
 
-static bool voice_extn_compress_voip_is_config_supported(struct audio_config *config __unused)
+inline bool voice_extn_compress_voip_is_config_supported(struct audio_config *config __unused)
 {
-    ALOGE("%s: COMPRESS_VOIP_ENABLED is not defined", __func__);
+    ALOGV("%s: COMPRESS_VOIP_ENABLED is not defined", __func__);
     return true;
 }
 
-static bool voice_extn_compress_voip_is_started(struct audio_device *adev __unused)
+inline bool voice_extn_compress_voip_is_started(struct audio_device *adev __unused)
 {
-    ALOGE("%s: COMPRESS_VOIP_ENABLED is not defined", __func__);
+    ALOGV("%s: COMPRESS_VOIP_ENABLED is not defined", __func__);
     return false;
 }
 #endif