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

fix

Browse Source
This commit is contained in:
Maxim Devaev
2024-03-29 02:24:36 +02:00
parent c8201df720
commit 94b1224456
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/ustreamer/stream.c
View File

@@ -189,7 +189,7 @@ void us_stream_loop(us_stream_s *stream) {
# ifdef WITH_V4P # ifdef WITH_V4P
_worker_context_s drm_ctx; _worker_context_s drm_ctx;
if (stream->v4p) { if (run->drm != NULL) {
drm_ctx.queue = us_queue_init(cap->run->n_bufs); drm_ctx.queue = us_queue_init(cap->run->n_bufs);
drm_ctx.stream = stream; drm_ctx.stream = stream;
drm_ctx.stop = &threads_stop; drm_ctx.stop = &threads_stop;
@@ -237,7 +237,7 @@ void us_stream_loop(us_stream_s *stream) {
us_queue_put(raw_ctx.queue, hw, 0); us_queue_put(raw_ctx.queue, hw, 0);
} }
# ifdef WITH_V4P # ifdef WITH_V4P
if (stream->v4p) { if (run->drm != NULL) {
us_capture_hwbuf_incref(hw); // DRM us_capture_hwbuf_incref(hw); // DRM
us_queue_put(drm_ctx.queue, hw, 0); us_queue_put(drm_ctx.queue, hw, 0);
} }
@@ -259,7 +259,7 @@ void us_stream_loop(us_stream_s *stream) {
atomic_store(&threads_stop, true); atomic_store(&threads_stop, true);
# ifdef WITH_V4P # ifdef WITH_V4P
if (stream->v4p) { if (run->drm != NULL) {
US_THREAD_JOIN(drm_ctx.tid); US_THREAD_JOIN(drm_ctx.tid);
us_queue_destroy(drm_ctx.queue); us_queue_destroy(drm_ctx.queue);
} }
@@ -564,12 +564,12 @@ static bool _stream_has_jpeg_clients_cached(us_stream_s *stream) {
static bool _stream_has_any_clients_cached(us_stream_s *stream) { static bool _stream_has_any_clients_cached(us_stream_s *stream) {
const us_stream_runtime_s *const run = stream->run; const us_stream_runtime_s *const run = stream->run;
return ( return (
# ifdef WITH_V4P
stream->v4p ||
# endif
_stream_has_jpeg_clients_cached(stream) _stream_has_jpeg_clients_cached(stream)
|| (run->h264 != NULL && atomic_load(&run->h264->sink->has_clients)) || (run->h264 != NULL && atomic_load(&run->h264->sink->has_clients))
|| (stream->raw_sink != NULL && atomic_load(&stream->raw_sink->has_clients)) || (stream->raw_sink != NULL && atomic_load(&stream->raw_sink->has_clients))
# ifdef WITH_V4P
|| (run->drm != NULL)
# endif
); );
} }
@@ -600,6 +600,7 @@ static int _stream_init_loop(us_stream_s *stream) {
stream->enc->type == US_ENCODER_TYPE_M2M_VIDEO stream->enc->type == US_ENCODER_TYPE_M2M_VIDEO
|| stream->enc->type == US_ENCODER_TYPE_M2M_IMAGE || stream->enc->type == US_ENCODER_TYPE_M2M_IMAGE
|| run->h264 != NULL || run->h264 != NULL
|| run->drm != NULL
); );
switch (us_capture_open(stream->cap)) { switch (us_capture_open(stream->cap)) {
case 0: break; case 0: break;
@@ -651,7 +652,7 @@ static int _stream_init_loop(us_stream_s *stream) {
static void _stream_drm_ensure_no_signal(us_stream_s *stream) { static void _stream_drm_ensure_no_signal(us_stream_s *stream) {
us_stream_runtime_s *const run = stream->run; us_stream_runtime_s *const run = stream->run;
if (!stream->v4p) { if (run->drm == NULL) {
return; return;
} }