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 toxav issues.

Browse Source
This commit is contained in:
irungentoo 2014-11-28 13:10:27 -05:00
parent 767c0653bd
commit db68c6eff6
No known key found for this signature in database
GPG Key ID: 10349DC9BED89E98
2 changed files with 28 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
toxav/codec.c
View File

@ -378,12 +378,13 @@ void cs_do(CSSession *cs)
if (!cs) return; if (!cs) return;
pthread_mutex_lock(cs->queue_mutex); pthread_mutex_lock(cs->queue_mutex);
/*
if (!cs->active) { if (!cs->active) {
pthread_mutex_unlock(cs->queue_mutex); pthread_mutex_unlock(cs->queue_mutex);
return; return;
} }
/*
/* Iterate over whole buffers and call playback callback * / /* Iterate over whole buffers and call playback callback * /
if (cs->abuf_ready) while (!DecodedAudioBuffer_empty(cs->abuf_ready)) { if (cs->abuf_ready) while (!DecodedAudioBuffer_empty(cs->abuf_ready)) {
DecodedAudio* p; DecodedAudio* p;
@ -613,8 +614,6 @@ void cs_kill(CSSession *cs)
/* Wait threads to close */ /* Wait threads to close */
pthread_mutex_unlock(cs->queue_mutex); pthread_mutex_unlock(cs->queue_mutex);
pthread_mutex_lock(cs->queue_mutex);
pthread_mutex_unlock(cs->queue_mutex);
pthread_mutex_destroy(cs->queue_mutex); pthread_mutex_destroy(cs->queue_mutex);

35
toxav/toxav.c
View File

@ -117,6 +117,19 @@ ToxAv *toxav_new( Tox *messenger, int32_t max_calls)
av->calls = calloc(sizeof(CallSpecific), max_calls); av->calls = calloc(sizeof(CallSpecific), max_calls);
av->max_calls = max_calls; av->max_calls = max_calls;
unsigned int i;
for (i = 0; i < max_calls; ++i) {
if (pthread_mutex_init(&av->calls[i].mutex, NULL) != 0 ) {
LOGGER_WARNING("Failed to init call mutex!");
msi_kill(av->msi_session);
free(av->calls);
free(av);
return NULL;
}
}
return av; return av;
} }
@ -133,6 +146,8 @@ void toxav_kill ( ToxAv *av )
rtp_kill(av->calls[i].crtps[video_index], av->msi_session->messenger_handle); rtp_kill(av->calls[i].crtps[video_index], av->msi_session->messenger_handle);
if ( av->calls[i].cs ) cs_kill(av->calls[i].cs); if ( av->calls[i].cs ) cs_kill(av->calls[i].cs);
pthread_mutex_destroy(&av->calls[i].mutex);
} }
msi_kill(av->msi_session); msi_kill(av->msi_session);
@ -166,9 +181,14 @@ void toxav_do(ToxAv *av)
uint32_t i = 0; uint32_t i = 0;
for (; i < av->max_calls; i ++) for (; i < av->max_calls; i ++) {
pthread_mutex_lock(&av->calls[i].mutex);
if (av->calls[i].call_active) cs_do(av->calls[i].cs); if (av->calls[i].call_active) cs_do(av->calls[i].cs);
pthread_mutex_unlock(&av->calls[i].mutex);
}
uint64_t end = current_time_monotonic(); uint64_t end = current_time_monotonic();
/* TODO maybe use variable for sizes */ /* TODO maybe use variable for sizes */
@ -286,11 +306,7 @@ int toxav_prepare_transmission ( ToxAv *av, int32_t call_index, int support_vide
CallSpecific *call = &av->calls[call_index]; CallSpecific *call = &av->calls[call_index];
if ( pthread_mutex_init(&call->mutex, NULL) != 0 ) { pthread_mutex_lock(&call->mutex);
LOGGER_WARNING("Failed to init call mutex!");
return av_ErrorInternal;
}
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
@ -315,8 +331,8 @@ int toxav_prepare_transmission ( ToxAv *av, int32_t call_index, int support_vide
c_self->audio_channels, c_peer->audio_channels ); c_self->audio_channels, c_peer->audio_channels );
if ( !(call->cs = cs_new(c_self, c_peer, jbuf_capacity, support_video)) ) { if ( !(call->cs = cs_new(c_self, c_peer, jbuf_capacity, support_video)) ) {
pthread_mutex_destroy(&call->mutex);
LOGGER_ERROR("Error while starting Codec State!\n"); LOGGER_ERROR("Error while starting Codec State!\n");
pthread_mutex_unlock(&call->mutex);
return av_ErrorInternal; return av_ErrorInternal;
} }
@ -328,6 +344,7 @@ int toxav_prepare_transmission ( ToxAv *av, int32_t call_index, int support_vide
if ( !call->crtps[audio_index] ) { if ( !call->crtps[audio_index] ) {
LOGGER_ERROR("Error while starting audio RTP session!\n"); LOGGER_ERROR("Error while starting audio RTP session!\n");
pthread_mutex_unlock(&call->mutex);
return av_ErrorInternal; return av_ErrorInternal;
} }
@ -346,14 +363,15 @@ int toxav_prepare_transmission ( ToxAv *av, int32_t call_index, int support_vide
} }
call->call_active = 1; call->call_active = 1;
pthread_mutex_unlock(&call->mutex);
return av_ErrorNone; return av_ErrorNone;
error: error:
rtp_kill(call->crtps[audio_index], av->messenger); rtp_kill(call->crtps[audio_index], av->messenger);
rtp_kill(call->crtps[video_index], av->messenger); rtp_kill(call->crtps[video_index], av->messenger);
cs_kill(call->cs); cs_kill(call->cs);
pthread_mutex_destroy(&call->mutex);
memset(call, 0, sizeof(CallSpecific)); memset(call, 0, sizeof(CallSpecific));
pthread_mutex_unlock(&call->mutex);
return av_ErrorInternal; return av_ErrorInternal;
} }
@ -384,7 +402,6 @@ int toxav_kill_transmission ( ToxAv *av, int32_t call_index )
call->call_active = 0; call->call_active = 0;
pthread_mutex_unlock(&call->mutex); pthread_mutex_unlock(&call->mutex);
pthread_mutex_destroy(&call->mutex);
return av_ErrorNone; return av_ErrorNone;
} }