virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

libavfilter: vf_scale: Properly take in->color_range into account

Browse Source 
While swscale can be reconfigured with sws_setColorspaceDetails,
the in/out ranges also need to be set before calling
sws_init_context, otherwise the initialization might choose
fastpaths that don't take the ranges into account.

Therefore, look at in->color_range too, when deciding on whether
the scaler needs to be reconfigured.

Add a new member variable for keeping track of this, for being
able to differentiate between whether the scale filter parameter
"in_range" has been set (which should override whatever the input
frame has set) or whether it has been configured based on the
latest frame (which should trigger reconfiguring the scaler if
the input frame ranges change).

Fixes: Ticket #9576

Signed-off-by: Martin Storsjö <martin@martin.st>
This commit is contained in:
Martin Storsjö 2022-02-23 22:48:40 +02:00
parent b9973b72c0
commit e645a1ddb9
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libavfilter/vf_scale.c
View File

@ -138,6 +138,7 @@ typedef struct ScaleContext {
char *out_color_matrix; char *out_color_matrix;
int in_range; int in_range;
int in_frame_range;
int out_range; int out_range;
int out_h_chr_pos; int out_h_chr_pos;
@ -322,6 +323,8 @@ static av_cold int init_dict(AVFilterContext *ctx, AVDictionary **opts)
scale->opts = *opts; scale->opts = *opts;
*opts = NULL; *opts = NULL;
scale->in_frame_range = AVCOL_RANGE_UNSPECIFIED;
return 0; return 0;
} }
@ -544,6 +547,9 @@ static int config_props(AVFilterLink *outlink)
if (scale->in_range != AVCOL_RANGE_UNSPECIFIED) if (scale->in_range != AVCOL_RANGE_UNSPECIFIED)
av_opt_set_int(s, "src_range", av_opt_set_int(s, "src_range",
scale->in_range == AVCOL_RANGE_JPEG, 0); scale->in_range == AVCOL_RANGE_JPEG, 0);
else if (scale->in_frame_range != AVCOL_RANGE_UNSPECIFIED)
av_opt_set_int(s, "src_range",
scale->in_frame_range == AVCOL_RANGE_JPEG, 0);
if (scale->out_range != AVCOL_RANGE_UNSPECIFIED) if (scale->out_range != AVCOL_RANGE_UNSPECIFIED)
av_opt_set_int(s, "dst_range", av_opt_set_int(s, "dst_range",
scale->out_range == AVCOL_RANGE_JPEG, 0); scale->out_range == AVCOL_RANGE_JPEG, 0);
@ -690,6 +696,13 @@ static int scale_frame(AVFilterLink *link, AVFrame *in, AVFrame **frame_out)
in->sample_aspect_ratio.den != link->sample_aspect_ratio.den || in->sample_aspect_ratio.den != link->sample_aspect_ratio.den ||
in->sample_aspect_ratio.num != link->sample_aspect_ratio.num; in->sample_aspect_ratio.num != link->sample_aspect_ratio.num;
if (in->color_range != AVCOL_RANGE_UNSPECIFIED &&
scale->in_range == AVCOL_RANGE_UNSPECIFIED &&
in->color_range != scale->in_frame_range) {
scale->in_frame_range = in->color_range;
frame_changed = 1;
}
if (scale->eval_mode == EVAL_MODE_FRAME || frame_changed) { if (scale->eval_mode == EVAL_MODE_FRAME || frame_changed) {
unsigned vars_w[VARS_NB] = { 0 }, vars_h[VARS_NB] = { 0 }; unsigned vars_w[VARS_NB] = { 0 }, vars_h[VARS_NB] = { 0 };