Merge "hal: Fix for FM mute issue on start of FM record"

This commit is contained in:
Linux Build Service Account 2015-01-21 09:38:20 -08:00 committed by Gerrit - the friendly Code Review server
commit 1147f08d97
2 changed files with 16 additions and 1 deletions

View File

@ -34,6 +34,7 @@
#ifdef FM_ENABLED
#define AUDIO_PARAMETER_KEY_HANDLE_FM "handle_fm"
#define AUDIO_PARAMETER_KEY_FM_VOLUME "fm_volume"
#define AUDIO_PARAMETER_KEY_REC_PLAY_CONC "rec_play_conc_on"
static struct pcm_config pcm_config_fm = {
.channels = 2,
@ -280,6 +281,21 @@ void audio_extn_fm_set_parameters(struct audio_device *adev,
fm_set_volume(adev, vol);
}
#ifdef RECORD_PLAY_CONCURRENCY
ret = str_parms_get_str(parms, AUDIO_PARAMETER_KEY_REC_PLAY_CONC,
value, sizeof(value));
if ((ret >= 0)
&& (fmmod.is_fm_running == true)) {
if (!strncmp("true", value, sizeof("true")))
ALOGD("Record play concurrency ON Forcing FM device reroute");
else
ALOGD("Record play concurrency OFF Forcing FM device reroute");
select_devices(adev, USECASE_AUDIO_PLAYBACK_FM);
fm_set_volume(adev,fmmod.fm_volume);
}
#endif
exit:
ALOGV("%s: exit", __func__);
}

View File

@ -2238,7 +2238,6 @@ int platform_set_parameters(void *platform, struct str_parms *parms)
ALOGD("setting record playback concurrency to false");
my_data->rec_play_conc_set = false;
}
str_parms_del(parms, AUDIO_PARAMETER_KEY_REC_PLAY_CONC);
}
#endif
ALOGV("%s: exit with code(%d)", __func__, ret);