forked/ustreamer
1
0
Fork 0
mirror of https://github.com/pikvm/ustreamer.git synced 2026-04-11 09:06:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "fluency synchronization"

Browse Source 
This reverts commit 291d7431b0.
This commit is contained in:
Devaev Maxim
2019-06-30 06:37:24 +03:00
parent 291d7431b0
commit c009a7efe4
1 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/stream.c
View File

@@ -102,7 +102,7 @@ static void *__worker_thread(void *v_worker);
static struct _worker_t *_workers_pool_wait(struct _workers_pool_t *pool); static struct _worker_t *_workers_pool_wait(struct _workers_pool_t *pool);
static void _workers_pool_assign(struct _workers_pool_t *pool, struct _worker_t *ready_worker, unsigned buf_index); static void _workers_pool_assign(struct _workers_pool_t *pool, struct _worker_t *ready_worker, unsigned buf_index);
static long double _workers_pool_get_fluency_delay(struct _workers_pool_t *pool, unsigned captured_fps); static long double _workers_pool_get_fluency_delay(struct _workers_pool_t *pool);
struct stream_t *stream_init(struct device_t *dev, struct encoder_t *encoder) { struct stream_t *stream_init(struct device_t *dev, struct encoder_t *encoder) {
@@ -238,7 +238,7 @@ void stream_loop(struct stream_t *stream) {
} }
captured_fps_accum += 1; captured_fps_accum += 1;
long double fluency_delay = _workers_pool_get_fluency_delay(pool, captured_fps); long double fluency_delay = _workers_pool_get_fluency_delay(pool);
grab_after = now + fluency_delay; grab_after = now + fluency_delay;
LOG_VERBOSE("Fluency: delay=%.03Lf, grab_after=%.03Lf", fluency_delay, grab_after); LOG_VERBOSE("Fluency: delay=%.03Lf, grab_after=%.03Lf", fluency_delay, grab_after);
@@ -552,8 +552,7 @@ static void _workers_pool_assign(struct _workers_pool_t *pool, struct _worker_t
LOG_DEBUG("Assigned new frame in buffer %u to worker %u", buf_index, ready_worker->number); LOG_DEBUG("Assigned new frame in buffer %u to worker %u", buf_index, ready_worker->number);
} }
static long double _workers_pool_get_fluency_delay(struct _workers_pool_t *pool, unsigned captured_fps) { static long double _workers_pool_get_fluency_delay(struct _workers_pool_t *pool) {
long double captured_frames_interval = 0;
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;
@@ -574,13 +573,7 @@ static long double _workers_pool_get_fluency_delay(struct _workers_pool_t *pool,
if (pool->desired_frames_interval > 0 && min_delay > 0 && pool->desired_frames_interval > min_delay) { if (pool->desired_frames_interval > 0 && min_delay > 0 && pool->desired_frames_interval > min_delay) {
// Искусственное время задержки на основе желаемого FPS, если включен --desired-fps // Искусственное время задержки на основе желаемого FPS, если включен --desired-fps
captured_frames_interval = (long double)1 / captured_fps; return pool->desired_frames_interval;
if (captured_frames_interval > pool->desired_frames_interval - min_delay) {
return pool->desired_frames_interval;
} else {
LOG_PERF("Performing fluency synchronization: captured_fi=%.3Lf, desired_fi=%.3Lf, min_delay=%.3Lf",
captured_frames_interval, pool->desired_frames_interval, min_delay);
}
} }
return min_delay; return min_delay;