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 possible threading issues.

Browse Source
This commit is contained in:
irungentoo 2014-12-03 14:41:01 -05:00
parent 475c157d68
commit f6b3e6e8fe
No known key found for this signature in database
GPG Key ID: 10349DC9BED89E98
1 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
toxav/toxav.c
View File

@ -258,8 +258,7 @@ int toxav_stop_call ( ToxAv *av, int32_t call_index )
int toxav_prepare_transmission ( ToxAv *av, int32_t call_index, int support_video ) int toxav_prepare_transmission ( ToxAv *av, int32_t call_index, int support_video )
{ {
if ( !av->msi_session || CALL_INVALID_INDEX(call_index, av->msi_session->max_calls) || if ( !av->msi_session || CALL_INVALID_INDEX(call_index, av->msi_session->max_calls) ||
!av->msi_session->calls[call_index] || !av->msi_session->calls[call_index]->csettings_peer || !av->msi_session->calls[call_index] || !av->msi_session->calls[call_index]->csettings_peer) {
av->calls[call_index].active) {
LOGGER_ERROR("Error while starting RTP session: invalid call!\n"); LOGGER_ERROR("Error while starting RTP session: invalid call!\n");
return av_ErrorNoCall; return av_ErrorNoCall;
} }
@ -267,6 +266,13 @@ int toxav_prepare_transmission ( ToxAv *av, int32_t call_index, int support_vide
ToxAvCall *call = &av->calls[call_index]; ToxAvCall *call = &av->calls[call_index];
pthread_mutex_lock(call->mutex); pthread_mutex_lock(call->mutex);
if (call->active) {
pthread_mutex_unlock(call->mutex);
LOGGER_ERROR("Error while starting RTP session: call already active!\n");
return av_ErrorNoCall;
}
const ToxAvCSettings *c_peer = toxavcsettings_cast const ToxAvCSettings *c_peer = toxavcsettings_cast
(&av->msi_session->calls[call_index]->csettings_peer[0]); (&av->msi_session->calls[call_index]->csettings_peer[0]);
const ToxAvCSettings *c_self = toxavcsettings_cast const ToxAvCSettings *c_self = toxavcsettings_cast
@ -489,15 +495,14 @@ int toxav_prepare_audio_frame ( ToxAv *av,
const int16_t *frame, const int16_t *frame,
int frame_size) int frame_size)
{ {
if (CALL_INVALID_INDEX(call_index, av->msi_session->max_calls) || !av->calls[call_index].active) { if (CALL_INVALID_INDEX(call_index, av->msi_session->max_calls)) {
LOGGER_WARNING("Action on inactive call: %d", call_index); LOGGER_WARNING("Action on nonexisting call: %d", call_index);
return av_ErrorNoCall; return av_ErrorNoCall;
} }
ToxAvCall *call = &av->calls[call_index]; ToxAvCall *call = &av->calls[call_index];
pthread_mutex_lock(call->mutex); pthread_mutex_lock(call->mutex);
if (!call->active) { if (!call->active) {
pthread_mutex_unlock(call->mutex); pthread_mutex_unlock(call->mutex);
LOGGER_WARNING("Action on inactive call: %d", call_index); LOGGER_WARNING("Action on inactive call: %d", call_index);
@ -517,8 +522,8 @@ int toxav_prepare_audio_frame ( ToxAv *av,
int toxav_send_audio ( ToxAv *av, int32_t call_index, const uint8_t *data, unsigned int size) int toxav_send_audio ( ToxAv *av, int32_t call_index, const uint8_t *data, unsigned int size)
{ {
if (CALL_INVALID_INDEX(call_index, av->msi_session->max_calls) || !av->calls[call_index].active) { if (CALL_INVALID_INDEX(call_index, av->msi_session->max_calls)) {
LOGGER_WARNING("Action on inactive call: %d", call_index); LOGGER_WARNING("Action on nonexisting call: %d", call_index);
return av_ErrorNoCall; return av_ErrorNoCall;
} }
@ -583,7 +588,13 @@ int toxav_get_active_count(ToxAv *av)
int rc = 0, i = 0; int rc = 0, i = 0;
for (; i < av->max_calls; i ++) if (av->calls[i].active) rc++; for (; i < av->max_calls; i++) {
pthread_mutex_lock(av->calls[i].mutex);
if (av->calls[i].active) rc++;
pthread_mutex_unlock(av->calls[i].mutex);
}
return rc; return rc;
} }