mirrors/vlc
0
0
Fork 0
mirror of https://github.com/videolan/vlc.git synced 2024-11-23 18:03:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

vpx_alpha: early-return during merging

Browse Source 
Early return to avoid mixing the allocation path and the re-use path,
making two level of indentation useless.

Indentation is changed in the follow-up commit.
This commit is contained in:
Alexandre Janniaux 2024-09-10 13:30:12 +02:00 committed by Felix Paul Kühne
parent a3054e86ba
commit e3cad49115
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
modules/codec/vpx_alpha.c
View File

@ -128,17 +128,26 @@ static picture_t *CombinePicturesCPU(decoder_t *bdec, picture_t *opaque, picture
for (int i=0; i<opaque->i_planes; i++)
out->p[i] = opaque->p[i];
if (alpha)
{
out->p[opaque->i_planes] = alpha->p[0];
else
return out;
}
{
// use the dummy opaque plane attached in the picture context
struct pic_alpha_plane *p = alpha_ctx->plane;
if (out->p_sys == NULL)
if (p == NULL)
{
int plane_size = bdec->fmt_out.video.i_width * bdec->fmt_out.video.i_height;
p = malloc(sizeof(*p) + plane_size);
if (likely(p != NULL))
if (unlikely(p == NULL))
{
picture_Release(out);
return NULL;
}
{
p->p.i_lines = bdec->fmt_out.video.i_height;
p->p.i_visible_lines = bdec->fmt_out.video.i_y_offset + bdec->fmt_out.video.i_visible_height;
@ -152,11 +161,6 @@ static picture_t *CombinePicturesCPU(decoder_t *bdec, picture_t *opaque, picture
alpha_ctx->plane = p;
}
}
if (unlikely(p == NULL))
{
picture_Release(out);
return NULL;
}
out->p[opaque->i_planes] = p->p;
}
return out;