dereference
/
android_hardware_qcom_audio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hal: Enhance VoIP call auto recovery if SSR occurs during call 

Enhance support for VoIP auto recovery if SSR occurs during
the VoIP call.

Change-Id: Id69cb9d17fc78fd98754b19bf84539290ff54cd9
This commit is contained in:
Venkata Narendra Kumar Gutta 2014-07-09 16:29:28 +05:30 committed by Gerrit - the friendly Code Review server
parent bc9c9ca6b0
commit ed0f94ff0a
3 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hal/audio_hw.c
View File

@ -237,7 +237,7 @@ static int get_snd_codec_id(audio_format_t format)
return id;
}
static int get_snd_card_state(struct audio_device *adev)
int get_snd_card_state(struct audio_device *adev)
{
int snd_scard_state;

2
hal/audio_hw.h
View File

@ -303,6 +303,8 @@ bool is_offload_usecase(audio_usecase_t uc_id);
int pcm_ioctl(struct pcm *pcm, int request, ...);
int get_snd_card_state(struct audio_device *adev);
#define LITERAL_TO_STRING(x) #x
#define CHECK(condition) LOG_ALWAYS_FATAL_IF(!(condition), "%s",\
__FILE__ ":" LITERAL_TO_STRING(__LINE__)\

18
hal/voice_extn/compress_voip.c
View File

@ -558,9 +558,16 @@ int voice_extn_compress_voip_start_output_stream(struct stream_out *out)
int ret = 0;
struct audio_device *adev = out->dev;
struct audio_usecase *uc_info;
int snd_card_status = get_snd_card_state(adev);
ALOGD("%s: enter", __func__);
if (SND_CARD_STATE_OFFLINE == snd_card_status) {
ret = -ENETRESET;
ALOGE("%s: sound card is not active/SSR returning error %d ", __func__, ret);
goto error;
}
if (!voip_data.out_stream_count)
ret = voice_extn_compress_voip_open_output_stream(out);
@ -570,6 +577,7 @@ int voice_extn_compress_voip_start_output_stream(struct stream_out *out)
uc_info->stream.out = out;
uc_info->devices = out->devices;
error:
ALOGV("%s: exit: status(%d)", __func__, ret);
return ret;
}
@ -579,15 +587,23 @@ int voice_extn_compress_voip_start_input_stream(struct stream_in *in)
int ret = 0;
struct audio_usecase *uc_info;
struct audio_device *adev = in->dev;
int snd_card_status = get_snd_card_state(adev);
ALOGD("%s: enter", __func__);
if (SND_CARD_STATE_OFFLINE == snd_card_status) {
ret = -ENETRESET;
ALOGE("%s: sound card is not active/SSR returning error %d ", __func__, ret);
goto error;
}
if (!voip_data.in_stream_count)
ret = voice_extn_compress_voip_open_input_stream(in);
ret = voip_start_call(adev, &in->config);
in->pcm = voip_data.pcm_tx;
error:
ALOGV("%s: exit: status(%d)", __func__, ret);
return ret;
}
@ -603,6 +619,7 @@ int voice_extn_compress_voip_close_output_stream(struct audio_stream *stream)
voip_data.out_stream_count--;
ret = voip_stop_call(adev);
voip_data.out_stream = NULL;
out->pcm = NULL;
}
ALOGV("%s: exit: status(%d)", __func__, ret);
@ -643,6 +660,7 @@ int voice_extn_compress_voip_close_input_stream(struct audio_stream *stream)
if(voip_data.in_stream_count > 0) {
voip_data.in_stream_count--;
status = voip_stop_call(adev);
in->pcm = NULL;
}
ALOGV("%s: exit: status(%d)", __func__, status);