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

Create own instance of MonoTime for ToxAV.

Browse Source
This commit is contained in:
zoff99 2020-04-07 15:56:29 +02:00 committed by iphydf
parent 27f24e61b2
commit 97fc2f4c0b
No known key found for this signature in database
GPG Key ID: 3855DBA2D74403C9
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
toxav/toxav.c
View File

@ -100,6 +100,7 @@ struct ToxAV {
int32_t dmssa; /** Average decoding time in ms */
uint32_t interval; /** Calculated interval */
Mono_Time *toxav_mono_time; /** ToxAV's own mono_time instance */
};
static void callback_bwc(BWController *bwc, uint32_t friend_number, float loss, void *user_data);
@ -156,6 +157,7 @@ ToxAV *toxav_new(Tox *tox, Toxav_Err_New *error)
av->tox = tox;
av->m = m;
av->toxav_mono_time = mono_time_new();
av->msi = msi_new(av->m);
if (av->msi == nullptr) {
@ -212,6 +214,8 @@ void toxav_kill(ToxAV *av)
}
}
mono_time_free(av->toxav_mono_time);
pthread_mutex_unlock(av->mutex);
pthread_mutex_destroy(av->mutex);
@ -235,7 +239,7 @@ void toxav_iterate(ToxAV *av)
return;
}
uint64_t start = current_time_monotonic(av->m->mono_time);
uint64_t start = current_time_monotonic(av->toxav_mono_time);
int32_t rc = 500;
ToxAVCall *i = av->calls[av->calls_head];
@ -273,7 +277,7 @@ void toxav_iterate(ToxAV *av)
}
av->interval = rc < av->dmssa ? 0 : (rc - av->dmssa);
av->dmsst += current_time_monotonic(av->m->mono_time) - start;
av->dmsst += current_time_monotonic(av->toxav_mono_time) - start;
if (++av->dmssc == 3) {
av->dmssa = av->dmsst / 3 + 5; /* NOTE Magic Offset 5 for precision */
@ -1317,10 +1321,10 @@ static bool call_prepare_transmission(ToxAVCall *call)
}
/* Prepare bwc */
call->bwc = bwc_new(av->m, call->friend_number, callback_bwc, call, av->m->mono_time);
call->bwc = bwc_new(av->m, call->friend_number, callback_bwc, call, av->toxav_mono_time);
{ /* Prepare audio */
call->audio = ac_new(av->m->mono_time, av->m->log, av, call->friend_number, av->acb, av->acb_user_data);
call->audio = ac_new(av->toxav_mono_time, av->m->log, av, call->friend_number, av->acb, av->acb_user_data);
if (!call->audio) {
LOGGER_ERROR(av->m->log, "Failed to create audio codec session");
@ -1336,7 +1340,7 @@ static bool call_prepare_transmission(ToxAVCall *call)
}
}
{ /* Prepare video */
call->video = vc_new(av->m->mono_time, av->m->log, av, call->friend_number, av->vcb, av->vcb_user_data);
call->video = vc_new(av->toxav_mono_time, av->m->log, av, call->friend_number, av->vcb, av->vcb_user_data);
if (!call->video) {
LOGGER_ERROR(av->m->log, "Failed to create video codec session");