scottk/UltraGrid
1
0
Fork 0
mirror of https://github.com/outbackdingo/UltraGrid.git synced 2026-03-21 09:40:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

vcomp/jpegxs: fix exitting when no frame sent

Browse Source 
eg. `uv -c jpegxs` (only)

broken since 942a76725 (2026-02-24)

The `stop` var was actually needed this so revert this occurence but
improve to push to the encoder just if configured.
This commit is contained in:
Martin Pulec
2026-03-03 09:01:43 +01:00
parent fa313a75b6
commit fb964ae47e
1 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/video_compress/jpegxs.cpp
View File

@@ -100,6 +100,7 @@ struct state_video_compress_jpegxs {
bool configured = 0;
bool reconfiguring = 0;
bool stop = false;
video_desc saved_desc;
@@ -160,15 +161,18 @@ while (true) {
auto frame = s->in_queue.pop();
if (!frame) {
{
unique_lock<mutex> lock(s->mtx);
svt_jpeg_xs_frame_t enc_input;
svt_jpeg_xs_frame_pool_get(s->frame_pool, &enc_input, /*blocking*/ 1);
enc_input.user_prv_ctx_ptr = JXS_POISON_PILL;
svt_jpeg_xs_encoder_send_picture(&s->encoder, &enc_input, /*blocking*/ 1);
s->frames_sent++;
}
s->cv_configured.notify_one();
if (s->configured) {
svt_jpeg_xs_frame_t enc_input;
svt_jpeg_xs_frame_pool_get(s->frame_pool, &enc_input, /*blocking*/ 1);
enc_input.user_prv_ctx_ptr = JXS_POISON_PILL;
svt_jpeg_xs_encoder_send_picture(&s->encoder, &enc_input, /*blocking*/ 1);
s->frames_sent++;
} else {
s->stop = true;
lock.unlock();
s->cv_configured.notify_one();
}
break;
}
@@ -227,10 +231,11 @@ static void jpegxs_worker_get(state_video_compress_jpegxs *s) {
{
unique_lock<mutex> lock(s->mtx);
s->cv_configured.wait(lock, [&]{
return s->configured;
return s->configured || s->stop;
});
if (!s->configured) {
if (s->stop) {
s->out_queue.push({});
return;
}
}