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

refactoring

Browse Source
This commit is contained in:
Maxim Devaev
2024-03-29 03:34:35 +02:00
parent 94b1224456
commit caf9ed7bfe
1 changed files with 39 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

110
src/ustreamer/stream.c
View File

@@ -164,38 +164,22 @@ void us_stream_loop(us_stream_s *stream) {
US_THREAD_CREATE(ctx->tid, _releaser_thread, ctx); US_THREAD_CREATE(ctx->tid, _releaser_thread, ctx);
} }
_worker_context_s jpeg_ctx = { # define CREATE_WORKER(x_cond, x_ctx, x_thread, x_capacity) \
.queue = us_queue_init(cap->run->n_bufs), _worker_context_s *x_ctx = NULL; \
.stream = stream, if (x_cond) { \
.stop = &threads_stop, US_CALLOC(x_ctx, 1); \
}; x_ctx->queue = us_queue_init(x_capacity); \
US_THREAD_CREATE(jpeg_ctx.tid, _jpeg_thread, &jpeg_ctx); x_ctx->stream = stream; \
x_ctx->stop = &threads_stop; \
_worker_context_s h264_ctx; US_THREAD_CREATE(x_ctx->tid, (x_thread), x_ctx); \
if (run->h264 != NULL) { }
h264_ctx.queue = us_queue_init(cap->run->n_bufs); CREATE_WORKER(true, jpeg_ctx, _jpeg_thread, cap->run->n_bufs);
h264_ctx.stream = stream; CREATE_WORKER((run->h264 != NULL), h264_ctx, _h264_thread, cap->run->n_bufs);
h264_ctx.stop = &threads_stop; CREATE_WORKER((stream->raw_sink != NULL), raw_ctx, _raw_thread, 2);
US_THREAD_CREATE(h264_ctx.tid, _h264_thread, &h264_ctx);
}
_worker_context_s raw_ctx;
if (stream->raw_sink != NULL) {
raw_ctx.queue = us_queue_init(2);
raw_ctx.stream = stream;
raw_ctx.stop = &threads_stop;
US_THREAD_CREATE(raw_ctx.tid, _raw_thread, &raw_ctx);
}
# ifdef WITH_V4P # ifdef WITH_V4P
_worker_context_s drm_ctx; CREATE_WORKER((run->drm != NULL), drm_ctx, _drm_thread, cap->run->n_bufs); // cppcheck-suppress assertWithSideEffect
if (run->drm != NULL) {
drm_ctx.queue = us_queue_init(cap->run->n_bufs);
drm_ctx.stream = stream;
drm_ctx.stop = &threads_stop;
US_THREAD_CREATE(drm_ctx.tid, _drm_thread, &drm_ctx); // cppcheck-suppress assertWithSideEffect
}
# endif # endif
# undef CREATE_WORKER
uint captured_fps_accum = 0; uint captured_fps_accum = 0;
sll captured_fps_ts = 0; sll captured_fps_ts = 0;
@@ -226,22 +210,17 @@ void us_stream_loop(us_stream_s *stream) {
us_gpio_set_stream_online(true); us_gpio_set_stream_online(true);
# endif # endif
us_capture_hwbuf_incref(hw); // JPEG # define QUEUE_HW(x_ctx) if (x_ctx != NULL) { \
us_queue_put(jpeg_ctx.queue, hw, 0); us_capture_hwbuf_incref(hw); \
if (run->h264 != NULL) { us_queue_put(x_ctx->queue, hw, 0); \
us_capture_hwbuf_incref(hw); // H264 }
us_queue_put(h264_ctx.queue, hw, 0); QUEUE_HW(jpeg_ctx);
} QUEUE_HW(h264_ctx);
if (stream->raw_sink != NULL) { QUEUE_HW(raw_ctx);
us_capture_hwbuf_incref(hw); // RAW
us_queue_put(raw_ctx.queue, hw, 0);
}
# ifdef WITH_V4P # ifdef WITH_V4P
if (run->drm != NULL) { QUEUE_HW(drm_ctx);
us_capture_hwbuf_incref(hw); // DRM
us_queue_put(drm_ctx.queue, hw, 0);
}
# endif # endif
# undef QUEUE_HW
us_queue_put(releasers[hw->buf.index].queue, hw, 0); // Plan to release us_queue_put(releasers[hw->buf.index].queue, hw, 0); // Plan to release
// Мы не обновляем здесь состояние синков, потому что это происходит внутри обслуживающих их потоков // Мы не обновляем здесь состояние синков, потому что это происходит внутри обслуживающих их потоков
@@ -258,25 +237,18 @@ void us_stream_loop(us_stream_s *stream) {
close: close:
atomic_store(&threads_stop, true); atomic_store(&threads_stop, true);
# define DELETE_WORKER(x_ctx) if (x_ctx != NULL) { \
US_THREAD_JOIN(x_ctx->tid); \
us_queue_destroy(x_ctx->queue); \
free(x_ctx); \
}
# ifdef WITH_V4P # ifdef WITH_V4P
if (run->drm != NULL) { DELETE_WORKER(drm_ctx);
US_THREAD_JOIN(drm_ctx.tid);
us_queue_destroy(drm_ctx.queue);
}
# endif # endif
DELETE_WORKER(raw_ctx);
if (stream->raw_sink != NULL) { DELETE_WORKER(h264_ctx);
US_THREAD_JOIN(raw_ctx.tid); DELETE_WORKER(jpeg_ctx);
us_queue_destroy(raw_ctx.queue); # undef DELETE_WORKER
}
if (run->h264 != NULL) {
US_THREAD_JOIN(h264_ctx.tid);
us_queue_destroy(h264_ctx.queue);
}
US_THREAD_JOIN(jpeg_ctx.tid);
us_queue_destroy(jpeg_ctx.queue);
for (uint index = 0; index < n_releasers; ++index) { for (uint index = 0; index < n_releasers; ++index) {
US_THREAD_JOIN(releasers[index].tid); US_THREAD_JOIN(releasers[index].tid);
@@ -430,15 +402,12 @@ static void *_h264_thread(void *v_ctx) {
} }
if (!us_memsink_server_check(h264->sink, NULL)) { if (!us_memsink_server_check(h264->sink, NULL)) {
us_capture_hwbuf_decref(hw);
US_LOG_VERBOSE("H264: Passed encoding because nobody is watching"); US_LOG_VERBOSE("H264: Passed encoding because nobody is watching");
continue; goto decref;
} }
if (hw->raw.grab_ts < grab_after_ts) { if (hw->raw.grab_ts < grab_after_ts) {
us_capture_hwbuf_decref(hw);
US_LOG_VERBOSE("H264: Passed encoding for FPS limit: %u", h264->enc->run->fps_limit); US_LOG_VERBOSE("H264: Passed encoding for FPS limit: %u", h264->enc->run->fps_limit);
continue; goto decref;
} }
// Форсим кейфрейм, если от захвата давно не было фреймов // Форсим кейфрейм, если от захвата давно не было фреймов
@@ -454,6 +423,7 @@ static void *_h264_thread(void *v_ctx) {
const ldf frame_interval = (ldf)1 / h264->enc->run->fps_limit; const ldf frame_interval = (ldf)1 / h264->enc->run->fps_limit;
grab_after_ts = hw->raw.grab_ts + frame_interval - 0.01; grab_after_ts = hw->raw.grab_ts + frame_interval - 0.01;
decref:
us_capture_hwbuf_decref(hw); us_capture_hwbuf_decref(hw);
} }
return NULL; return NULL;
@@ -469,13 +439,11 @@ static void *_raw_thread(void *v_ctx) {
continue; continue;
} }
if (!us_memsink_server_check(ctx->stream->raw_sink, NULL)) { if (us_memsink_server_check(ctx->stream->raw_sink, NULL)) {
us_capture_hwbuf_decref(hw); us_memsink_server_put(ctx->stream->raw_sink, &hw->raw, false);
} else {
US_LOG_VERBOSE("RAW: Passed publishing because nobody is watching"); US_LOG_VERBOSE("RAW: Passed publishing because nobody is watching");
continue;
} }
us_memsink_server_put(ctx->stream->raw_sink, &hw->raw, false);
us_capture_hwbuf_decref(hw); us_capture_hwbuf_decref(hw);
} }
return NULL; return NULL;