From 2a7df583c86ce4506566424103e1ff322f901149 Mon Sep 17 00:00:00 2001 From: Steve Kondik Date: Sat, 30 Apr 2016 21:37:30 -0700 Subject: hal: Fix warnings when building with clang Change-Id: If7e46636e4512ab4eb482ce729297d1f04396bff --- hal/Android.mk | 1 + hal/audio_extn/utils.c | 1 - hal/audio_hw.c | 22 ++++------------------ hal/msm8974/platform.c | 1 - hal/platform_info.c | 4 ---- hal/voice.c | 7 ++----- hal/voice_extn/compress_voip.c | 1 - hal/voice_extn/voice_extn.h | 2 +- policy_hal/Android.mk | 2 +- policy_hal/AudioPolicyManager.cpp | 19 +++++++++---------- policy_hal/AudioPolicyManager.h | 4 ++++ 11 files changed, 22 insertions(+), 42 deletions(-) diff --git a/hal/Android.mk b/hal/Android.mk index 25962fb2..7474d0b9 100644 --- a/hal/Android.mk +++ b/hal/Android.mk @@ -256,6 +256,7 @@ ifeq ($(strip $(AUDIO_FEATURE_ENABLED_AUXPCM_BT)),true) endif LOCAL_CFLAGS += -Wall -Werror +LOCAL_CLANG_CFLAGS += -Wno-unused-variable -Wno-missing-field-initializers LOCAL_COPY_HEADERS_TO := mm-audio LOCAL_COPY_HEADERS := audio_extn/audio_defs.h diff --git a/hal/audio_extn/utils.c b/hal/audio_extn/utils.c index 32cdcc85..ec841f28 100644 --- a/hal/audio_extn/utils.c +++ b/hal/audio_extn/utils.c @@ -755,7 +755,6 @@ int b64encode(uint8_t *inp, int ilen, char* outp) default: break; } -done: outp[k] = '\0'; return k; } diff --git a/hal/audio_hw.c b/hal/audio_hw.c index 3bd4a1f6..10ed1a63 100644 --- a/hal/audio_hw.c +++ b/hal/audio_hw.c @@ -254,8 +254,6 @@ static struct audio_device *adev = NULL; static pthread_mutex_t adev_init_lock; static unsigned int audio_device_ref_count; -static int set_voice_volume_l(struct audio_device *adev, float volume); - static amplifier_device_t * get_amplifier_device(void) { if (adev) @@ -934,7 +932,6 @@ int select_devices(struct audio_device *adev, audio_usecase_t uc_id) struct audio_usecase *voip_usecase = NULL; struct audio_usecase *hfp_usecase = NULL; audio_usecase_t hfp_ucid; - struct listnode *node; int status = 0; usecase = get_usecase_from_list(adev, uc_id); @@ -1124,7 +1121,7 @@ int select_devices(struct audio_device *adev, audio_usecase_t uc_id) static int stop_input_stream(struct stream_in *in) { - int i, ret = 0; + int ret = 0; struct audio_usecase *uc_info; struct audio_device *adev = in->dev; @@ -1591,7 +1588,7 @@ static int check_and_set_hdmi_channels(struct audio_device *adev, static int stop_output_stream(struct stream_out *out) { - int i, ret = 0; + int ret = 0; struct audio_usecase *uc_info; struct audio_device *adev = out->dev; @@ -2029,12 +2026,9 @@ static int out_set_parameters(struct audio_stream *stream, const char *kvpairs) { struct stream_out *out = (struct stream_out *)stream; struct audio_device *adev = out->dev; - struct audio_usecase *usecase; - struct listnode *node; struct str_parms *parms; char value[32]; int ret = 0, val = 0, err; - bool select_new_device = false; ALOGD("%s: enter: usecase(%d: %s) kvpairs: %s", __func__, out->usecase, use_case_table[out->usecase], kvpairs); @@ -2719,7 +2713,6 @@ static int in_set_parameters(struct audio_stream *stream, const char *kvpairs) struct stream_in *in = (struct stream_in *)stream; struct audio_device *adev = in->dev; struct str_parms *parms; - char *str; char value[32]; int ret = 0, val = 0, err; @@ -2762,7 +2755,6 @@ static int in_set_parameters(struct audio_stream *stream, const char *kvpairs) } } -done: pthread_mutex_unlock(&adev->lock); pthread_mutex_unlock(&in->lock); @@ -2778,7 +2770,6 @@ static char* in_get_parameters(const struct audio_stream *stream, struct stream_in *in = (struct stream_in *)stream; struct str_parms *query = str_parms_create_str(keys); char *str; - char value[256]; struct str_parms *reply = str_parms_create(); if (!query || !reply) { @@ -2815,7 +2806,7 @@ static ssize_t in_read(struct audio_stream_in *stream, void *buffer, { struct stream_in *in = (struct stream_in *)stream; struct audio_device *adev = in->dev; - int i, ret = -1; + int ret = -1; int snd_scard_state = get_snd_card_state(adev); lock_input_stream(in); @@ -2977,7 +2968,7 @@ static int adev_open_output_stream(struct audio_hw_device *dev, { struct audio_device *adev = (struct audio_device *)dev; struct stream_out *out; - int i, ret = 0; + int ret = 0; audio_format_t format; *stream_out = NULL; @@ -3379,7 +3370,6 @@ static int adev_set_parameters(struct audio_hw_device *dev, const char *kvpairs) { struct audio_device *adev = (struct audio_device *)dev; struct str_parms *parms; - char *str; char value[32]; int val; int ret; @@ -3394,8 +3384,6 @@ static int adev_set_parameters(struct audio_hw_device *dev, const char *kvpairs) if (ret >= 0) { char *snd_card_status = value+2; if (strstr(snd_card_status, "OFFLINE")) { - struct listnode *node; - struct audio_usecase *usecase; ALOGD("Received sound card OFFLINE status"); set_snd_card_state(adev,SND_CARD_STATE_OFFLINE); //close compress sessions on OFFLINE status @@ -3880,8 +3868,6 @@ static int period_size_is_plausible_for_low_latency(int period_size) static int adev_open(const hw_module_t *module, const char *name, hw_device_t **device) { - int i, ret; - ALOGD("%s: enter", __func__); if (strcmp(name, AUDIO_HARDWARE_INTERFACE) != 0) return -EINVAL; diff --git a/hal/msm8974/platform.c b/hal/msm8974/platform.c index 4cc371cb..7699d523 100644 --- a/hal/msm8974/platform.c +++ b/hal/msm8974/platform.c @@ -2915,7 +2915,6 @@ void platform_get_parameters(void *platform, /* Handle audio calibration keys */ get_audiocal(platform, query, reply); -done: kv_pairs = str_parms_to_str(reply); ALOGV_IF(kv_pairs != NULL, "%s: exit: returns - %s", __func__, kv_pairs); free(kv_pairs); diff --git a/hal/platform_info.c b/hal/platform_info.c index 9f78939b..c5e2f885 100644 --- a/hal/platform_info.c +++ b/hal/platform_info.c @@ -280,10 +280,6 @@ done: static void start_tag(void *userdata __unused, const XML_Char *tag_name, const XML_Char **attr) { - const XML_Char *attr_name = NULL; - const XML_Char *attr_value = NULL; - unsigned int i; - if (strcmp(tag_name, "bit_width_configs") == 0) { section = BITWIDTH; } else if (strcmp(tag_name, "acdb_ids") == 0) { diff --git a/hal/voice.c b/hal/voice.c index 40aa8fbc..53dc1af4 100644 --- a/hal/voice.c +++ b/hal/voice.c @@ -111,7 +111,7 @@ void voice_set_sidetone(struct audio_device *adev, int voice_stop_usecase(struct audio_device *adev, audio_usecase_t usecase_id) { - int i, ret = 0; + int ret = 0; struct audio_usecase *uc_info; struct voice_session *session = NULL; @@ -164,7 +164,7 @@ int voice_stop_usecase(struct audio_device *adev, audio_usecase_t usecase_id) int voice_start_usecase(struct audio_device *adev, audio_usecase_t usecase_id) { - int i, ret = 0; + int ret = 0; struct audio_usecase *uc_info; int pcm_dev_rx_id, pcm_dev_tx_id; uint32_t sample_rate = 8000; @@ -314,7 +314,6 @@ int voice_check_and_set_incall_rec_usecase(struct audio_device *adev, { int ret = 0; uint32_t session_id; - int usecase_id; int rec_mode = INCALL_REC_NONE; if (voice_is_call_state_active(adev)) { @@ -505,9 +504,7 @@ void voice_get_parameters(struct audio_device *adev, int voice_set_parameters(struct audio_device *adev, struct str_parms *parms) { - char *str; char value[32]; - int val; int ret = 0, err; char *kv_pairs = str_parms_to_str(parms); diff --git a/hal/voice_extn/compress_voip.c b/hal/voice_extn/compress_voip.c index 2acb4373..c768e455 100644 --- a/hal/voice_extn/compress_voip.c +++ b/hal/voice_extn/compress_voip.c @@ -392,7 +392,6 @@ int voice_extn_compress_voip_set_parameters(struct audio_device *adev, voip_set_dtx(adev, flag); } -done: ALOGV("%s: exit", __func__); free(kv_pairs); return ret; diff --git a/hal/voice_extn/voice_extn.h b/hal/voice_extn/voice_extn.h index 989ee798..8c379507 100644 --- a/hal/voice_extn/voice_extn.h +++ b/hal/voice_extn/voice_extn.h @@ -105,7 +105,7 @@ static void voice_extn_out_get_parameters(struct stream_out *out __unused, int voice_extn_check_and_set_incall_music_usecase(struct audio_device *adev, struct stream_out *out); #else -static int voice_extn_check_and_set_incall_music_usecase(struct audio_device *adev __unused, +inline int voice_extn_check_and_set_incall_music_usecase(struct audio_device *adev __unused, struct stream_out *out __unused) { return -ENOSYS; diff --git a/policy_hal/Android.mk b/policy_hal/Android.mk index 7fb88eb9..3ddc450c 100644 --- a/policy_hal/Android.mk +++ b/policy_hal/Android.mk @@ -27,7 +27,7 @@ LOCAL_SHARED_LIBRARIES := \ LOCAL_STATIC_LIBRARIES := \ libmedia_helper \ -LOCAL_CFLAGS += -Wall -Werror +LOCAL_CFLAGS += -Wall -Werror -Wno-overloaded-virtual ifeq ($(strip $(AUDIO_FEATURE_ENABLED_VOICE_CONCURRENCY)),true) LOCAL_CFLAGS += -DVOICE_CONCURRENCY diff --git a/policy_hal/AudioPolicyManager.cpp b/policy_hal/AudioPolicyManager.cpp index 0986bbfc..22b9ae44 100644 --- a/policy_hal/AudioPolicyManager.cpp +++ b/policy_hal/AudioPolicyManager.cpp @@ -1079,8 +1079,6 @@ status_t AudioPolicyManagerCustom::startSource(sp outputD } } } - uint32_t muteWaitMs = setOutputDevice(outputDesc, device, force); - // handle special case for sonification while in call if (isInCall()) { handleIncallSonification(stream, true, false, outputDesc->mIoHandle); @@ -1304,7 +1302,6 @@ audio_io_handle_t AudioPolicyManagerCustom::getOutputForDevice( const audio_offload_info_t *offloadInfo) { audio_io_handle_t output = AUDIO_IO_HANDLE_NONE; - uint32_t latency = 0; status_t status; #ifdef AUDIO_POLICY_TEST @@ -1725,8 +1722,8 @@ status_t AudioPolicyManagerCustom::getInputForAttr(const audio_attributes_t *att audio_port_handle_t selectedDeviceId, input_type_t *inputType) { - audio_source_t inputSource = attr->source; #ifdef VOICE_CONCURRENCY + audio_source_t inputSource = attr->source; char propValue[PROPERTY_VALUE_MAX]; bool prop_rec_enabled=false, prop_voip_enabled = false; @@ -1961,9 +1958,11 @@ AudioPolicyManagerCustom::AudioPolicyManagerCustom(AudioPolicyClientInterface *c : AudioPolicyManager(clientInterface), mHdmiAudioDisabled(false), mHdmiAudioEvent(false), - mPrevPhoneState(0), - mPrevFMVolumeDb(0.0f), + mPrevPhoneState(0) +#ifdef FM_POWER_OPT + ,mPrevFMVolumeDb(0.0f), mFMIsActive(false) +#endif { char ssr_enabled[PROPERTY_VALUE_MAX] = {0}; bool prop_ssr_enabled = false; @@ -1973,14 +1972,14 @@ AudioPolicyManagerCustom::AudioPolicyManagerCustom(AudioPolicyClientInterface *c } for (size_t i = 0; i < mHwModules.size(); i++) { - ALOGV("Hw module %d", i); + ALOGV("Hw module %zu", i); for (size_t j = 0; j < mHwModules[i]->mInputProfiles.size(); j++) { const sp inProfile = mHwModules[i]->mInputProfiles[j]; - ALOGV("Input profile ", j); + ALOGV("Input profile %zu", j); for (size_t k = 0; k < inProfile->mChannelMasks.size(); k++) { audio_channel_mask_t channelMask = inProfile->mChannelMasks.itemAt(k); - ALOGV("Channel Mask %x size %d", channelMask, + ALOGV("Channel Mask %x size %zu", channelMask, inProfile->mChannelMasks.size()); if (AUDIO_CHANNEL_IN_5POINT1 == channelMask) { if (!prop_ssr_enabled) { @@ -1988,7 +1987,7 @@ AudioPolicyManagerCustom::AudioPolicyManagerCustom(AudioPolicyClientInterface *c " input profile as SSR(surround sound record)" " is not supported on this chipset variant"); inProfile->mChannelMasks.removeItemsAt(k, 1); - ALOGV("Channel Mask size now %d", + ALOGV("Channel Mask size now %zu", inProfile->mChannelMasks.size()); } } diff --git a/policy_hal/AudioPolicyManager.h b/policy_hal/AudioPolicyManager.h index 9b4a44a4..0bfdf292 100644 --- a/policy_hal/AudioPolicyManager.h +++ b/policy_hal/AudioPolicyManager.h @@ -140,13 +140,17 @@ private: const audio_offload_info_t *offloadInfo); // Used for voip + voice concurrency usecase int mPrevPhoneState; +#ifdef VOICE_CONCURRENCY int mvoice_call_state; +#endif #ifdef RECORD_PLAY_CONCURRENCY // Used for record + playback concurrency bool mIsInputRequestOnProgress; #endif +#ifdef FM_POWER_OPT float mPrevFMVolumeDb; bool mFMIsActive; +#endif }; }; -- cgit v1.2.3