eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-01-06 22:25:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

avfilter/vf_premultiply: signal correct alpha mode

Browse Source 
Set the output link according to the chosen direction, and the input link
to its opposite (unless the input is not in-place, in which case there is no
alpha channel).

Also update the alpha mode on the output frame, since it may differ.
This commit is contained in:
Niklas Haas
2025-02-19 20:38:15 +01:00
parent eea99a77ed
commit 6bac13d20a
1 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
libavfilter/vf_premultiply.c
View File

@@ -68,6 +68,8 @@ static int query_formats(const AVFilterContext *ctx,
AVFilterFormatsConfig **cfg_out)
{
const PreMultiplyContext *s = ctx->priv;
AVFilterFormats *formats = NULL;
int ret;
static const enum AVPixelFormat no_alpha_pix_fmts[] = {
AV_PIX_FMT_YUV444P, AV_PIX_FMT_YUVJ444P,
@@ -88,8 +90,23 @@ static int query_formats(const AVFilterContext *ctx,
AV_PIX_FMT_NONE
};
return ff_set_common_formats_from_list2(ctx, cfg_in, cfg_out,
s->inplace ? alpha_pix_fmts : no_alpha_pix_fmts);
ret = ff_set_common_formats_from_list2(ctx, cfg_in, cfg_out,
s->inplace ? alpha_pix_fmts : no_alpha_pix_fmts);
if (ret < 0)
return ret;
/* Configure alpha mode corresponding to the chosen direction */
if (s->inplace) {
formats = ff_make_formats_list_singleton(s->inverse ? AVALPHA_MODE_PREMULTIPLIED
: AVALPHA_MODE_STRAIGHT);
ret = ff_formats_ref(formats, &cfg_in[0]->alpha_modes);
if (ret < 0)
return ret;
}
formats = ff_make_formats_list_singleton(s->inverse ? AVALPHA_MODE_STRAIGHT
: AVALPHA_MODE_PREMULTIPLIED);
return ff_formats_ref(formats, &cfg_out[0]->alpha_modes);
}
static void premultiply8(const uint8_t *msrc, const uint8_t *asrc,
@@ -525,6 +542,7 @@ static int filter_frame(AVFilterContext *ctx,
if (!*out)
return AVERROR(ENOMEM);
av_frame_copy_props(*out, base);
(*out)->alpha_mode = outlink->alpha_mode;
full = base->color_range == AVCOL_RANGE_JPEG;
limited = base->color_range == AVCOL_RANGE_MPEG;