StarMirror/toxcore
1
0
Fork 0
mirror of https://github.com/irungentoo/toxcore.git synced 2024-03-22 13:30:51 +08:00
Code Issues Projects Releases Wiki Activity

Fixed this

Browse Source
This commit is contained in:
mannol 2014-05-17 23:15:54 +02:00
parent 843171fbc8
commit ea96c1758a
1 changed files with 14 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
toxav/toxav.c
View File

@ -122,26 +122,18 @@ void toxav_kill ( ToxAv *av )
int i = 0; int i = 0;
for (; i < av->max_calls; i ++) { for (; i < av->max_calls; i ++) {
if ( av->calls[i].crtps[audio_index] ) { if ( av->calls[i].crtps[audio_index] )
rtp_terminate_session(av->calls[i].crtps[audio_index], av->msi_session->messenger_handle); rtp_terminate_session(av->calls[i].crtps[audio_index], av->msi_session->messenger_handle);
}
if ( av->calls[i].crtps[video_index] ) {
if ( av->calls[i].crtps[video_index] )
rtp_terminate_session(av->calls[i].crtps[video_index], av->msi_session->messenger_handle); rtp_terminate_session(av->calls[i].crtps[video_index], av->msi_session->messenger_handle);
}
av->calls[i].crtps[audio_index] = NULL;
av->calls[i].crtps[video_index] = NULL;
if ( av->calls[i].j_buf ) {
terminate_queue(av->calls[i].j_buf);
av->calls[i].j_buf = NULL;
}
if ( av->calls[i].cs ) { if ( av->calls[i].j_buf ) terminate_queue(av->calls[i].j_buf);
codec_terminate_session(av->calls[i].cs);
av->calls[i].cs = NULL; if ( av->calls[i].cs ) codec_terminate_session(av->calls[i].cs);
}
} }
free(av->calls); free(av->calls);
@ -568,18 +560,20 @@ inline__ int toxav_recv_audio ( ToxAv *av, int32_t call_index, int frame_size, i
if ( recved_size == ErrorAudioPacketLost ) { if ( recved_size == ErrorAudioPacketLost ) {
int dec_size = opus_decode(call->cs->audio_decoder, NULL, 0, dest, frame_size, 1); int dec_size = opus_decode(call->cs->audio_decoder, NULL, 0, dest, frame_size, 1);
if ( dec_size != OPUS_OK ) if ( dec_size < 0 ) {
LOGGER_WARNING("Decoding error: %s", opus_strerror(dec_size));
return ErrorInternal; return ErrorInternal;
else }
return dec_size; else return dec_size;
} else if ( recved_size ) { } else if ( recved_size ) {
int dec_size = opus_decode(call->cs->audio_decoder, packet, recved_size, dest, frame_size, 0); int dec_size = opus_decode(call->cs->audio_decoder, packet, recved_size, dest, frame_size, 0);
if ( dec_size != OPUS_OK ) if ( dec_size < 0 ) {
LOGGER_WARNING("Decoding error: %s", opus_strerror(dec_size));
return ErrorInternal; return ErrorInternal;
else }
return dec_size; else return dec_size;
} else { } else {
return 0; /* Nothing received */ return 0; /* Nothing received */
} }