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

vcomp/cmpto_j2k: if enc fails, free data

Browse Source 
We need to release the resources if encode fails - otherwise eg. the
pool will get exhausted because it has a limited capacity.

+ print enc image failure whether was in push or pop
This commit is contained in:
Martin Pulec
2024-08-26 15:16:41 +02:00
parent 9304717149
commit 9577372760
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/video_compress/cmpto_j2k.cpp
View File

@@ -270,10 +270,9 @@ start:
struct cmpto_j2k_enc_img *img;
int status;
CHECK_OK(cmpto_j2k_enc_ctx_get_encoded_img(
s->context,
1,
&img /* Set to NULL if encoder stopped */,
&status), "Encode image", HANDLE_ERROR_COMPRESS_POP);
s->context, 1, &img /* Set to NULL if encoder stopped */,
&status),
"Encode image pop", HANDLE_ERROR_COMPRESS_POP);
{
unique_lock<mutex> lk(s->lock);
s->in_frames--;
@@ -516,8 +515,14 @@ static void j2k_compress_push(struct module *state, std::shared_ptr<video_frame>
unique_lock<mutex> lk(s->lock);
s->frame_popped.wait(lk, [s]{return s->in_frames < s->max_in_frames;});
lk.unlock();
bool failed = false;
CHECK_OK(cmpto_j2k_enc_img_encode(img, s->enc_settings),
"Encode image", return);
"Encode image push", failed = true);
if (failed) {
udata->frame.~shared_ptr<video_frame>();
cmpto_j2k_enc_img_destroy(img);
return;
}
lk.lock();
s->in_frames++;
lk.unlock();