forked/ustreamer
1
0
Fork 0
mirror of https://github.com/pikvm/ustreamer.git synced 2026-05-26 15:26:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

using desired_frames_interval instead of soft_delay

Browse Source
This commit is contained in:
Devaev Maxim
2019-06-29 07:02:21 +03:00
parent 7a85774085
commit a1cd490fdf
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/stream.c
View File

@@ -556,15 +556,12 @@ static long double _workers_pool_get_fluency_delay(struct _workers_pool_t *pool)
long double sum_comp_time = 0; long double sum_comp_time = 0;
long double avg_comp_time; long double avg_comp_time;
long double min_delay; long double min_delay;
long double soft_delay;
for (unsigned number = 0; number < pool->n_workers; ++number) { for (unsigned number = 0; number < pool->n_workers; ++number) {
# define WORKER(_next) pool->workers[number]._next # define WORKER(_next) pool->workers[number]._next
A_MUTEX_LOCK(&WORKER(last_comp_time_mutex)); A_MUTEX_LOCK(&WORKER(last_comp_time_mutex));
if (WORKER(last_comp_time) > 0) { sum_comp_time += WORKER(last_comp_time);
sum_comp_time += WORKER(last_comp_time);
}
A_MUTEX_UNLOCK(&WORKER(last_comp_time_mutex)); A_MUTEX_UNLOCK(&WORKER(last_comp_time_mutex));
# undef WORKER # undef WORKER
@@ -574,10 +571,9 @@ static long double _workers_pool_get_fluency_delay(struct _workers_pool_t *pool)
min_delay = avg_comp_time / pool->n_workers; // Среднее время работы размазывается на N воркеров min_delay = avg_comp_time / pool->n_workers; // Среднее время работы размазывается на N воркеров
if (pool->desired_frames_interval > 0 && min_delay > 0) { if (pool->desired_frames_interval > 0 && min_delay > 0 && pool->desired_frames_interval > min_delay) {
// Искусственное время задержки на основе желаемого FPS, если включен --desired-fps // Искусственное время задержки на основе желаемого FPS, если включен --desired-fps
soft_delay = pool->desired_frames_interval - sum_comp_time; return pool->desired_frames_interval;
return (min_delay > soft_delay ? min_delay : soft_delay);
} }
return min_delay; return min_delay;