vpx_alpha: reindent after last changes

This commit is contained in:
Alexandre Janniaux 2024-09-11 16:11:54 +02:00 committed by Felix Paul Kühne
parent e3cad49115
commit b132d09580

View File

@ -135,34 +135,30 @@ static picture_t *CombinePicturesCPU(decoder_t *bdec, picture_t *opaque, picture
return out; return out;
} }
// use the dummy opaque plane attached in the picture context
struct pic_alpha_plane *p = alpha_ctx->plane;
if (p == NULL)
{ {
// use the dummy opaque plane attached in the picture context int plane_size = bdec->fmt_out.video.i_width * bdec->fmt_out.video.i_height;
struct pic_alpha_plane *p = alpha_ctx->plane; p = malloc(sizeof(*p) + plane_size);
if (p == NULL) if (unlikely(p == NULL))
{ {
int plane_size = bdec->fmt_out.video.i_width * bdec->fmt_out.video.i_height; picture_Release(out);
p = malloc(sizeof(*p) + plane_size); return 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;
p->p.i_pitch = bdec->fmt_out.video.i_width;
p->p.i_visible_pitch = bdec->fmt_out.video.i_x_offset + bdec->fmt_out.video.i_visible_width;
p->p.i_pixel_pitch = 1;
p->p.p_pixels = p->buffer;
memset(p->p.p_pixels, 0xFF, plane_size);
alpha_ctx->plane = p;
}
} }
out->p[opaque->i_planes] = p->p;
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;
p->p.i_pitch = bdec->fmt_out.video.i_width;
p->p.i_visible_pitch = bdec->fmt_out.video.i_x_offset + bdec->fmt_out.video.i_visible_width;
p->p.i_pixel_pitch = 1;
p->p.p_pixels = p->buffer;
memset(p->p.p_pixels, 0xFF, plane_size);
alpha_ctx->plane = p;
} }
out->p[opaque->i_planes] = p->p;
return out; return out;
} }