December 2023 - ffmpeg-cvslog

avfilter/vf_format: allow empty pix_fmts list
by Niklas Haas 31 Dec '23

31 Dec '23

ffmpeg | branch: master | Niklas Haas <git(a)haasn.dev> | Wed Oct 25 13:43:28 2023 +0200| [44a33fccd8b56478d87f7c62279a203d0a27e1f4] | committer: Niklas Haas avfilter/vf_format: allow empty pix_fmts list Which will impose no restriction. This makes sense when using e.g. `color_ranges=pc` to limit the color range, without also limiting the pixel format. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=44a33fccd8b56478d… --- libavfilter/vf_format.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/libavfilter/vf_format.c b/libavfilter/vf_format.c index d1bb9daa97..3a353bbb0d 100644 --- a/libavfilter/vf_format.c +++ b/libavfilter/vf_format.c @@ -91,11 +91,6 @@ static av_cold int init(AVFilterContext *ctx) enum AVPixelFormat pix_fmt; int ret; - if (!s->pix_fmts) { - av_log(ctx, AV_LOG_ERROR, "Empty output format string.\n"); - return AVERROR(EINVAL); - } - for (char *sep, *cur = s->pix_fmts; cur; cur = sep) { sep = strchr(cur, '|'); if (sep && *sep) @@ -131,7 +126,7 @@ static av_cold int init(AVFilterContext *ctx) } /* hold on to a ref for the lifetime of the filter */ - if ((ret = ff_formats_ref(s->formats, &s->formats)) < 0 || + if (s->formats && (ret = ff_formats_ref(s->formats, &s->formats)) < 0 || s->color_spaces && (ret = ff_formats_ref(s->color_spaces, &s->color_spaces)) < 0 || s->color_ranges && (ret = ff_formats_ref(s->color_ranges, &s->color_ranges)) < 0) return ret; @@ -144,7 +139,7 @@ static int query_formats(AVFilterContext *ctx) FormatContext *s = ctx->priv; int ret; - if ((ret = ff_set_common_formats(ctx, s->formats)) < 0 || + if (s->formats && (ret = ff_set_common_formats(ctx, s->formats)) < 0 || s->color_spaces && (ret = ff_set_common_color_spaces(ctx, s->color_spaces)) < 0 || s->color_ranges && (ret = ff_set_common_color_ranges(ctx, s->color_ranges)) < 0) return ret;

1 0

avfilter/vf_format: add color_ranges/spaces
by Niklas Haas 31 Dec '23

31 Dec '23

ffmpeg | branch: master | Niklas Haas <git(a)haasn.dev> | Wed Oct 25 13:42:24 2023 +0200| [796669d4834b490095ebad3e898bb90502bd02d4] | committer: Niklas Haas avfilter/vf_format: add color_ranges/spaces Needed for fftools/ffmpeg_filter to be able to force specific output formats via the filter chain. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=796669d4834b49009… --- doc/filters.texi | 8 ++++++++ libavfilter/vf_format.c | 42 +++++++++++++++++++++++++++++++++++++++--- 2 files changed, 47 insertions(+), 3 deletions(-) diff --git a/doc/filters.texi b/doc/filters.texi index 51bd20b137..a63a635ec8 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -14323,6 +14323,14 @@ It accepts the following parameters: A '|'-separated list of pixel format names, such as "pix_fmts=yuv420p|monow|rgb24". +@item color_spaces +A '|'-separated list of color space names, such as +"color_spaces=bt709|bt470bg|bt2020nc". + +@item color_ranges +A '|'-separated list of color range names, such as +"color_spaces=tv|pc". + @end table @subsection Examples diff --git a/libavfilter/vf_format.c b/libavfilter/vf_format.c index 59832b7768..d1bb9daa97 100644 --- a/libavfilter/vf_format.c +++ b/libavfilter/vf_format.c @@ -40,14 +40,20 @@ typedef struct FormatContext { const AVClass *class; char *pix_fmts; + char *csps; + char *ranges; AVFilterFormats *formats; ///< parsed from `pix_fmts` + AVFilterFormats *color_spaces; ///< parsed from `csps` + AVFilterFormats *color_ranges; ///< parsed from `ranges` } FormatContext; static av_cold void uninit(AVFilterContext *ctx) { FormatContext *s = ctx->priv; ff_formats_unref(&s->formats); + ff_formats_unref(&s->color_spaces); + ff_formats_unref(&s->color_ranges); } static av_cold int invert_formats(AVFilterFormats **fmts, @@ -99,13 +105,35 @@ static av_cold int init(AVFilterContext *ctx) return ret; } + for (char *sep, *cur = s->csps; cur; cur = sep) { + sep = strchr(cur, '|'); + if (sep && *sep) + *sep++ = 0; + if ((ret = av_color_space_from_name(cur)) < 0 || + (ret = ff_add_format(&s->color_spaces, ret)) < 0) + return ret; + } + + for (char *sep, *cur = s->ranges; cur; cur = sep) { + sep = strchr(cur, '|'); + if (sep && *sep) + *sep++ = 0; + if ((ret = av_color_range_from_name(cur)) < 0 || + (ret = ff_add_format(&s->color_ranges, ret)) < 0) + return ret; + } + if (!strcmp(ctx->filter->name, "noformat")) { - if ((ret = invert_formats(&s->formats, ff_all_formats(AVMEDIA_TYPE_VIDEO))) < 0) + if ((ret = invert_formats(&s->formats, ff_all_formats(AVMEDIA_TYPE_VIDEO))) < 0 || + (ret = invert_formats(&s->color_spaces, ff_all_color_spaces())) < 0 || + (ret = invert_formats(&s->color_ranges, ff_all_color_ranges())) < 0) return ret; } /* hold on to a ref for the lifetime of the filter */ - if ((ret = ff_formats_ref(s->formats, &s->formats)) < 0) + if ((ret = ff_formats_ref(s->formats, &s->formats)) < 0 || + s->color_spaces && (ret = ff_formats_ref(s->color_spaces, &s->color_spaces)) < 0 || + s->color_ranges && (ret = ff_formats_ref(s->color_ranges, &s->color_ranges)) < 0) return ret; return 0; @@ -114,14 +142,22 @@ static av_cold int init(AVFilterContext *ctx) static int query_formats(AVFilterContext *ctx) { FormatContext *s = ctx->priv; + int ret; + + if ((ret = ff_set_common_formats(ctx, s->formats)) < 0 || + s->color_spaces && (ret = ff_set_common_color_spaces(ctx, s->color_spaces)) < 0 || + s->color_ranges && (ret = ff_set_common_color_ranges(ctx, s->color_ranges)) < 0) + return ret; - return ff_set_common_formats(ctx, s->formats); + return 0; } #define OFFSET(x) offsetof(FormatContext, x) static const AVOption options[] = { { "pix_fmts", "A '|'-separated list of pixel formats", OFFSET(pix_fmts), AV_OPT_TYPE_STRING, .flags = AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_FILTERING_PARAM }, + { "color_spaces", "A '|'-separated list of color spaces", OFFSET(csps), AV_OPT_TYPE_STRING, .flags = AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_FILTERING_PARAM }, + { "color_ranges", "A '|'-separated list of color ranges", OFFSET(ranges), AV_OPT_TYPE_STRING, .flags = AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_FILTERING_PARAM }, { NULL } };

1 0

avfilter/vf_format: re-use AVFilterFormats for pix_fmt parsing
by Niklas Haas 31 Dec '23

31 Dec '23

ffmpeg | branch: master | Niklas Haas <git(a)haasn.dev> | Sat Oct 21 16:51:51 2023 +0200| [2a942b4b3a0719edb67faca6b5325591568f9409] | committer: Niklas Haas avfilter/vf_format: re-use AVFilterFormats for pix_fmt parsing Rewrite the format parsing code to make it more easily generalizable. In particular, `invert_formats` does not depend on the type of format list passed to it, which allows me to re-use this helper in an upcoming commit. Slightly shortens the code, at the sole cost of doing several malloc (ff_add_format) instead of a single malloc. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2a942b4b3a0719edb… --- libavfilter/vf_format.c | 103 ++++++++++++++++++++---------------------------- 1 file changed, 43 insertions(+), 60 deletions(-) diff --git a/libavfilter/vf_format.c b/libavfilter/vf_format.c index 1189bd61c2..59832b7768 100644 --- a/libavfilter/vf_format.c +++ b/libavfilter/vf_format.c @@ -41,25 +41,48 @@ typedef struct FormatContext { const AVClass *class; char *pix_fmts; - /** - * pix_fmts parsed into AVPixelFormats and terminated with - * AV_PIX_FMT_NONE - */ - enum AVPixelFormat *formats; + AVFilterFormats *formats; ///< parsed from `pix_fmts` } FormatContext; static av_cold void uninit(AVFilterContext *ctx) { FormatContext *s = ctx->priv; - av_freep(&s->formats); + ff_formats_unref(&s->formats); +} + +static av_cold int invert_formats(AVFilterFormats **fmts, + AVFilterFormats *allfmts) +{ + if (!allfmts) + return AVERROR(ENOMEM); + if (!*fmts) { + /* empty fmt list means no restriction, regardless of filter type */ + ff_formats_unref(&allfmts); + return 0; + } + + for (int i = 0; i < allfmts->nb_formats; i++) { + for (int j = 0; j < (*fmts)->nb_formats; j++) { + if (allfmts->formats[i] == (*fmts)->formats[j]) { + /* format is forbidden, remove it from allfmts list */ + memmove(&allfmts->formats[i], &allfmts->formats[i+1], + (allfmts->nb_formats - (i+1)) * sizeof(*allfmts->formats)); + allfmts->nb_formats--; + i--; /* repeat loop with same idx */ + break; + } + } + } + + ff_formats_unref(fmts); + *fmts = allfmts; + return 0; } static av_cold int init(AVFilterContext *ctx) { FormatContext *s = ctx->priv; - char *cur, *sep; - int nb_formats = 1; - int i; + enum AVPixelFormat pix_fmt; int ret; if (!s->pix_fmts) { @@ -67,64 +90,24 @@ static av_cold int init(AVFilterContext *ctx) return AVERROR(EINVAL); } - /* count the formats */ - cur = s->pix_fmts; - while ((cur = strchr(cur, '|'))) { - nb_formats++; - if (*cur) - cur++; - } - - s->formats = av_malloc_array(nb_formats + 1, sizeof(*s->formats)); - if (!s->formats) - return AVERROR(ENOMEM); - - /* parse the list of formats */ - cur = s->pix_fmts; - for (i = 0; i < nb_formats; i++) { + for (char *sep, *cur = s->pix_fmts; cur; cur = sep) { sep = strchr(cur, '|'); - if (sep) + if (sep && *sep) *sep++ = 0; - - if ((ret = ff_parse_pixel_format(&s->formats[i], cur, ctx)) < 0) + if ((ret = ff_parse_pixel_format(&pix_fmt, cur, ctx)) < 0 || + (ret = ff_add_format(&s->formats, pix_fmt)) < 0) return ret; - - cur = sep; } - s->formats[nb_formats] = AV_PIX_FMT_NONE; if (!strcmp(ctx->filter->name, "noformat")) { - const AVPixFmtDescriptor *desc = NULL; - enum AVPixelFormat *formats_allowed; - int nb_formats_lavu = 0, nb_formats_allowed = 0; - - /* count the formats known to lavu */ - while ((desc = av_pix_fmt_desc_next(desc))) - nb_formats_lavu++; - - formats_allowed = av_malloc_array(nb_formats_lavu + 1, sizeof(*formats_allowed)); - if (!formats_allowed) - return AVERROR(ENOMEM); - - /* for each format known to lavu, check if it's in the list of - * forbidden formats */ - while ((desc = av_pix_fmt_desc_next(desc))) { - enum AVPixelFormat pix_fmt = av_pix_fmt_desc_get_id(desc); - - for (i = 0; i < nb_formats; i++) { - if (s->formats[i] == pix_fmt) - break; - } - if (i < nb_formats) - continue; - - formats_allowed[nb_formats_allowed++] = pix_fmt; - } - formats_allowed[nb_formats_allowed] = AV_PIX_FMT_NONE; - av_freep(&s->formats); - s->formats = formats_allowed; + if ((ret = invert_formats(&s->formats, ff_all_formats(AVMEDIA_TYPE_VIDEO))) < 0) + return ret; } + /* hold on to a ref for the lifetime of the filter */ + if ((ret = ff_formats_ref(s->formats, &s->formats)) < 0) + return ret; + return 0; } @@ -132,7 +115,7 @@ static int query_formats(AVFilterContext *ctx) { FormatContext *s = ctx->priv; - return ff_set_common_formats_from_list(ctx, s->formats); + return ff_set_common_formats(ctx, s->formats); }

1 0

avfilter/buffersink: add color space/range accessors
by Niklas Haas 31 Dec '23

31 Dec '23

ffmpeg | branch: master | Niklas Haas <git(a)haasn.dev> | Sun Dec 31 13:36:12 2023 -0800| [475a99628d98cc690e6a578fb835022d8faa48fb] | committer: Niklas Haas avfilter/buffersink: add color space/range accessors Needed for fftools. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=475a99628d98cc690… --- doc/APIchanges | 3 +++ libavfilter/buffersink.c | 2 ++ libavfilter/buffersink.h | 2 ++ libavfilter/version.h | 2 +- 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/doc/APIchanges b/doc/APIchanges index b8895142ed..c944155cd7 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -2,6 +2,9 @@ The last version increases of all libraries were on 2023-02-09 API changes, most recent first: +2023-11-xx - xxxxxxxxxx - lavfi 58.16.100 - buffersink.h + Add av_buffersink_get_colorspace and av_buffersink_get_color_range. + 2023-11-xx - xxxxxxxxxx - lavfi 58.15.100 - avfilter.h Add AVFilterLink.colorspace, AVFilterLink.color_range diff --git a/libavfilter/buffersink.c b/libavfilter/buffersink.c index 3da3331159..6ba2970dd5 100644 --- a/libavfilter/buffersink.c +++ b/libavfilter/buffersink.c @@ -209,6 +209,8 @@ MAKE_AVFILTERLINK_ACCESSOR(AVRational , frame_rate ) MAKE_AVFILTERLINK_ACCESSOR(int , w ) MAKE_AVFILTERLINK_ACCESSOR(int , h ) MAKE_AVFILTERLINK_ACCESSOR(AVRational , sample_aspect_ratio) +MAKE_AVFILTERLINK_ACCESSOR(enum AVColorSpace, colorspace) +MAKE_AVFILTERLINK_ACCESSOR(enum AVColorRange, color_range) #if FF_API_OLD_CHANNEL_LAYOUT FF_DISABLE_DEPRECATION_WARNINGS diff --git a/libavfilter/buffersink.h b/libavfilter/buffersink.h index 64e08de53e..a9374b8b4f 100644 --- a/libavfilter/buffersink.h +++ b/libavfilter/buffersink.h @@ -117,6 +117,8 @@ AVRational av_buffersink_get_frame_rate (const AVFilterContext *c int av_buffersink_get_w (const AVFilterContext *ctx); int av_buffersink_get_h (const AVFilterContext *ctx); AVRational av_buffersink_get_sample_aspect_ratio (const AVFilterContext *ctx); +enum AVColorSpace av_buffersink_get_colorspace (const AVFilterContext *ctx); +enum AVColorRange av_buffersink_get_color_range (const AVFilterContext *ctx); int av_buffersink_get_channels (const AVFilterContext *ctx); #if FF_API_OLD_CHANNEL_LAYOUT diff --git a/libavfilter/version.h b/libavfilter/version.h index 59330858bd..d243558b77 100644 --- a/libavfilter/version.h +++ b/libavfilter/version.h @@ -31,7 +31,7 @@ #include "version_major.h" -#define LIBAVFILTER_VERSION_MINOR 15 +#define LIBAVFILTER_VERSION_MINOR 16 #define LIBAVFILTER_VERSION_MICRO 100

1 0

avfilter/vf_libplacebo: switch to colorspace negotiation API
by Niklas Haas 31 Dec '23

31 Dec '23

ffmpeg | branch: master | Niklas Haas <git(a)haasn.dev> | Mon Oct 30 14:05:53 2023 +0100| [e82277b54802365b3e6d7d524b63b3bebd3e8151] | committer: Niklas Haas avfilter/vf_libplacebo: switch to colorspace negotiation API > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e82277b54802365b3… --- libavfilter/vf_libplacebo.c | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/libavfilter/vf_libplacebo.c b/libavfilter/vf_libplacebo.c index b6e82a61e0..a9a3d884ce 100644 --- a/libavfilter/vf_libplacebo.c +++ b/libavfilter/vf_libplacebo.c @@ -882,6 +882,8 @@ static int output_frame(AVFilterContext *ctx, int64_t pts) out->pts = pts; out->width = outlink->w; out->height = outlink->h; + out->colorspace = outlink->colorspace; + out->color_range = outlink->color_range; if (s->fps.num) out->duration = 1; @@ -892,22 +894,11 @@ static int output_frame(AVFilterContext *ctx, int64_t pts) out->color_trc = AVCOL_TRC_SMPTE2084; } - if (s->colorspace >= 0) - out->colorspace = s->colorspace; - if (s->color_range >= 0) - out->color_range = s->color_range; if (s->color_trc >= 0) out->color_trc = s->color_trc; if (s->color_primaries >= 0) out->color_primaries = s->color_primaries; - /* Sanity colorspace overrides */ - if (outdesc->flags & AV_PIX_FMT_FLAG_RGB) { - out->colorspace = AVCOL_SPC_RGB; - } else if (out->colorspace == AVCOL_SPC_RGB) { - out->colorspace = AVCOL_SPC_UNSPECIFIED; - } - changed_csp = ref->colorspace != out->colorspace || ref->color_range != out->color_range || ref->color_trc != out->color_trc || @@ -1203,6 +1194,18 @@ static int libplacebo_query_format(AVFilterContext *ctx) for (int i = 0; i < s->nb_inputs; i++) RET(ff_formats_ref(infmts, &ctx->inputs[i]->outcfg.formats)); RET(ff_formats_ref(outfmts, &ctx->outputs[0]->incfg.formats)); + + /* Set colorspace properties */ + RET(ff_formats_ref(ff_all_color_spaces(), &ctx->inputs[0]->outcfg.color_spaces)); + RET(ff_formats_ref(ff_all_color_ranges(), &ctx->inputs[0]->outcfg.color_ranges)); + + outfmts = s->colorspace > 0 ? ff_make_formats_list_singleton(s->colorspace) + : ff_all_color_spaces(); + RET(ff_formats_ref(outfmts, &ctx->outputs[0]->incfg.color_spaces)); + + outfmts = s->color_range > 0 ? ff_make_formats_list_singleton(s->color_range) + : ff_all_color_ranges(); + RET(ff_formats_ref(outfmts, &ctx->outputs[0]->incfg.color_ranges)); return 0; fail:

1 0

avfilter/vf_libplacebo: don't force dovi frames to bt.2020-ncl
by Niklas Haas 31 Dec '23

31 Dec '23

ffmpeg | branch: master | Niklas Haas <git(a)haasn.dev> | Mon Oct 30 14:07:43 2023 +0100| [ff506b8d8f8a91c502360ccead5a967622326d23] | committer: Niklas Haas avfilter/vf_libplacebo: don't force dovi frames to bt.2020-ncl This is at odds with the YUV matrix negotiation API, in which such dynamic changes in YUV encoding are no longer easily possible. There is also no really strong motivating reason to do this, since the choice of YUV matrix is essentially arbitrary and not actually related to the Dolby Vision decoding process. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ff506b8d8f8a91c50… --- libavfilter/vf_libplacebo.c | 1 - 1 file changed, 1 deletion(-) diff --git a/libavfilter/vf_libplacebo.c b/libavfilter/vf_libplacebo.c index 8534945ba6..b6e82a61e0 100644 --- a/libavfilter/vf_libplacebo.c +++ b/libavfilter/vf_libplacebo.c @@ -888,7 +888,6 @@ static int output_frame(AVFilterContext *ctx, int64_t pts) if (s->apply_dovi && av_frame_get_side_data(ref, AV_FRAME_DATA_DOVI_METADATA)) { /* Output of dovi reshaping is always BT.2020+PQ, so infer the correct * output colorspace defaults */ - out->colorspace = AVCOL_SPC_BT2020_NCL; out->color_primaries = AVCOL_PRI_BT2020; out->color_trc = AVCOL_TRC_SMPTE2084; }

1 0

avfilter/vf_zscale: switch to colorspace negotiation API
by Niklas Haas 31 Dec '23

31 Dec '23

ffmpeg | branch: master | Niklas Haas <git(a)haasn.dev> | Mon Oct 30 13:51:18 2023 +0100| [2ebcbe97fc132214f9821c1a0298c4223657f69f] | committer: Niklas Haas avfilter/vf_zscale: switch to colorspace negotiation API Following the same design as vf_scale. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2ebcbe97fc132214f… --- libavfilter/vf_zscale.c | 44 ++++++++++++++++++++++++++++++++++---------- 1 file changed, 34 insertions(+), 10 deletions(-) diff --git a/libavfilter/vf_zscale.c b/libavfilter/vf_zscale.c index f76c9954cd..3b14ce4f33 100644 --- a/libavfilter/vf_zscale.c +++ b/libavfilter/vf_zscale.c @@ -187,8 +187,12 @@ static av_cold int init(AVFilterContext *ctx) return 0; } +static enum AVColorRange convert_range_from_zimg(enum zimg_pixel_range_e color_range); + static int query_formats(AVFilterContext *ctx) { + ZScaleContext *s = ctx->priv; + AVFilterFormats *formats; static const enum AVPixelFormat pixel_fmts[] = { AV_PIX_FMT_YUV410P, AV_PIX_FMT_YUV411P, AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV422P, @@ -217,7 +221,27 @@ static int query_formats(AVFilterContext *ctx) ret = ff_formats_ref(ff_make_format_list(pixel_fmts), &ctx->inputs[0]->outcfg.formats); if (ret < 0) return ret; - return ff_formats_ref(ff_make_format_list(pixel_fmts), &ctx->outputs[0]->incfg.formats); + ret = ff_formats_ref(ff_make_format_list(pixel_fmts), &ctx->outputs[0]->incfg.formats); + if (ret < 0) + return ret; + + if ((ret = ff_formats_ref(ff_all_color_spaces(), &ctx->inputs[0]->outcfg.formats)) < 0 || + (ret = ff_formats_ref(ff_all_color_ranges(), &ctx->inputs[0]->outcfg.formats)) < 0) + return ret; + + formats = s->colorspace != ZIMG_MATRIX_UNSPECIFIED && s->colorspace > 0 + ? ff_make_formats_list_singleton(s->colorspace) + : ff_all_color_spaces(); + if ((ret = ff_formats_ref(formats, &ctx->outputs[0]->incfg.formats)) < 0) + return ret; + + formats = s->range != -1 + ? ff_make_formats_list_singleton(convert_range_from_zimg(s->range)) + : ff_all_color_ranges(); + if ((ret = ff_formats_ref(formats, &ctx->outputs[0]->incfg.formats)) < 0) + return ret; + + return 0; } static void slice_params(ZScaleContext *s, int out_h, int in_h) @@ -678,15 +702,9 @@ fail: static void update_output_color_information(ZScaleContext *s, AVFrame *frame) { - if (s->colorspace != -1) - frame->colorspace = (int)s->dst_format.matrix_coefficients; - if (s->primaries != -1) frame->color_primaries = (int)s->dst_format.color_primaries; - if (s->range != -1) - frame->color_range = convert_range_from_zimg(s->dst_format.pixel_range); - if (s->trc != -1) frame->color_trc = (int)s->dst_format.transfer_characteristics; @@ -775,6 +793,8 @@ static int filter_frame(AVFilterLink *link, AVFrame *in) if ((link->format != outlink->format) || (link->w != outlink->w) || (link->h != outlink->h) || + (link->colorspace != outlink->colorspace) || + (link->color_range != outlink->color_range) || s->first_time || (s->src_format.chroma_location != s->dst_format.chroma_location) || (s->src_format.color_family !=s->dst_format.color_family) || @@ -796,6 +816,8 @@ static int filter_frame(AVFilterLink *link, AVFrame *in) goto fail; av_frame_copy_props(out, in); + out->colorspace = outlink->colorspace; + out->color_range = outlink->color_range; if ((ret = realign_frame(desc, &in, 1)) < 0) goto fail; @@ -805,9 +827,11 @@ static int filter_frame(AVFilterLink *link, AVFrame *in) snprintf(buf, sizeof(buf)-1, "%d", outlink->h); av_opt_set(s, "h", buf, 0); - link->dst->inputs[0]->format = in->format; - link->dst->inputs[0]->w = in->width; - link->dst->inputs[0]->h = in->height; + link->dst->inputs[0]->format = in->format; + link->dst->inputs[0]->w = in->width; + link->dst->inputs[0]->h = in->height; + link->dst->inputs[0]->colorspace = in->colorspace; + link->dst->inputs[0]->color_range = in->color_range; s->nb_threads = av_clip(FFMIN(ff_filter_get_nb_threads(ctx), FFMIN(link->h, outlink->h) / MIN_TILESIZE), 1, MAX_THREADS); slice_params(s, out->height, in->height);

1 0

avfilter/vf_zscale: remove unused variables
by Niklas Haas 31 Dec '23

31 Dec '23

ffmpeg | branch: master | Niklas Haas <git(a)haasn.dev> | Mon Oct 30 13:53:57 2023 +0100| [3f2c49acfb17a7d3bd1b200871a9f1dab255cb3b] | committer: Niklas Haas avfilter/vf_zscale: remove unused variables Only assigned, never read. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3f2c49acfb17a7d3b… --- libavfilter/vf_zscale.c | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/libavfilter/vf_zscale.c b/libavfilter/vf_zscale.c index 788870ffaf..f76c9954cd 100644 --- a/libavfilter/vf_zscale.c +++ b/libavfilter/vf_zscale.c @@ -132,12 +132,6 @@ typedef struct ZScaleContext { zimg_graph_builder_params alpha_params, params; zimg_graph_builder_params alpha_params_tmp, params_tmp; zimg_filter_graph *alpha_graph[MAX_THREADS], *graph[MAX_THREADS]; - - enum AVColorSpace in_colorspace, out_colorspace; - enum AVColorTransferCharacteristic in_trc, out_trc; - enum AVColorPrimaries in_primaries, out_primaries; - enum AVColorRange in_range, out_range; - enum AVChromaLocation in_chromal, out_chromal; } ZScaleContext; typedef struct ThreadData { @@ -816,15 +810,6 @@ static int filter_frame(AVFilterLink *link, AVFrame *in) link->dst->inputs[0]->h = in->height; s->nb_threads = av_clip(FFMIN(ff_filter_get_nb_threads(ctx), FFMIN(link->h, outlink->h) / MIN_TILESIZE), 1, MAX_THREADS); - s->in_colorspace = in->colorspace; - s->in_trc = in->color_trc; - s->in_primaries = in->color_primaries; - s->in_range = in->color_range; - s->out_colorspace = out->colorspace; - s->out_trc = out->color_trc; - s->out_primaries = out->color_primaries; - s->out_range = out->color_range; - slice_params(s, out->height, in->height); zimg_image_format_default(&s->src_format, ZIMG_API_VERSION);

1 0

vf_scale: use colorspace negotiation API
by Niklas Haas 31 Dec '23

31 Dec '23

ffmpeg | branch: master | Niklas Haas <git(a)haasn.dev> | Tue Oct 31 13:52:53 2023 +0100| [45e09a30419cc2a7251e72689142e021ecdfe6d9] | committer: Niklas Haas vf_scale: use colorspace negotiation API This filter will always accept any input format, even if the user sets a specific in_range/in_color_matrix. This is to preserve status quo with current behavior, where passing a specific in_color_matrix merely overrides the incoming frames' attributes. (Use `vf_format` to force a specific input range) Because changing colorspace and color_range now requires reconfiguring the link, we can lift sws_setColorspaceDetails out of scale_frame and into config_props. (This will also get re-called if the input frame properties change) > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=45e09a30419cc2a72… --- libavfilter/vf_scale.c | 188 +++++++++++++++++++++++++++---------------------- 1 file changed, 103 insertions(+), 85 deletions(-) diff --git a/libavfilter/vf_scale.c b/libavfilter/vf_scale.c index b51ae9a26a..7e5a6fead4 100644 --- a/libavfilter/vf_scale.c +++ b/libavfilter/vf_scale.c @@ -143,7 +143,6 @@ typedef struct ScaleContext { int out_color_matrix; int in_range; - int in_frame_range; int out_range; int out_h_chr_pos; @@ -292,6 +291,18 @@ static av_cold int preinit(AVFilterContext *ctx) return 0; } +static const int sws_colorspaces[] = { + AVCOL_SPC_UNSPECIFIED, + AVCOL_SPC_RGB, + AVCOL_SPC_BT709, + AVCOL_SPC_BT470BG, + AVCOL_SPC_SMPTE170M, + AVCOL_SPC_FCC, + AVCOL_SPC_SMPTE240M, + AVCOL_SPC_BT2020_NCL, + -1 +}; + static av_cold int init(AVFilterContext *ctx) { ScaleContext *scale = ctx->priv; @@ -332,6 +343,19 @@ static av_cold int init(AVFilterContext *ctx) if (ret < 0) return ret; + if (scale->in_color_matrix != -1 && + !ff_fmt_is_in(scale->in_color_matrix, sws_colorspaces)) { + av_log(ctx, AV_LOG_ERROR, "Unsupported input color matrix '%s'\n", + av_color_space_name(scale->in_color_matrix)); + return AVERROR(EINVAL); + } + + if (!ff_fmt_is_in(scale->out_color_matrix, sws_colorspaces)) { + av_log(ctx, AV_LOG_ERROR, "Unsupported output color matrix '%s'\n", + av_color_space_name(scale->out_color_matrix)); + return AVERROR(EINVAL); + } + av_log(ctx, AV_LOG_VERBOSE, "w:%s h:%s flags:'%s' interl:%d\n", scale->w_expr, scale->h_expr, (char *)av_x_if_null(scale->flags_str, ""), scale->interlaced); @@ -356,8 +380,6 @@ static av_cold int init(AVFilterContext *ctx) if (!threads) av_opt_set_int(scale->sws_opts, "threads", ff_filter_get_nb_threads(ctx), 0); - scale->in_frame_range = AVCOL_RANGE_UNSPECIFIED; - return 0; } @@ -376,6 +398,7 @@ static av_cold void uninit(AVFilterContext *ctx) static int query_formats(AVFilterContext *ctx) { + ScaleContext *scale = ctx->priv; AVFilterFormats *formats; const AVPixFmtDescriptor *desc; enum AVPixelFormat pix_fmt; @@ -407,6 +430,28 @@ static int query_formats(AVFilterContext *ctx) if ((ret = ff_formats_ref(formats, &ctx->outputs[0]->incfg.formats)) < 0) return ret; + /* accept all supported inputs, even if user overrides their properties */ + if ((ret = ff_formats_ref(ff_make_format_list(sws_colorspaces), + &ctx->inputs[0]->outcfg.color_spaces)) < 0) + return ret; + + if ((ret = ff_formats_ref(ff_all_color_ranges(), + &ctx->inputs[0]->outcfg.color_ranges)) < 0) + return ret; + + /* propagate output properties if overridden */ + formats = scale->out_color_matrix != AVCOL_SPC_UNSPECIFIED + ? ff_make_formats_list_singleton(scale->out_color_matrix) + : ff_make_format_list(sws_colorspaces); + if ((ret = ff_formats_ref(formats, &ctx->outputs[0]->incfg.color_spaces)) < 0) + return ret; + + formats = scale->out_range != AVCOL_RANGE_UNSPECIFIED + ? ff_make_formats_list_singleton(scale->out_range) + : ff_all_color_ranges(); + if ((ret = ff_formats_ref(formats, &ctx->outputs[0]->incfg.color_ranges)) < 0) + return ret; + return 0; } @@ -497,6 +542,7 @@ static int config_props(AVFilterLink *outlink) const AVPixFmtDescriptor *outdesc = av_pix_fmt_desc_get(outfmt); ScaleContext *scale = ctx->priv; uint8_t *flags_val = NULL; + int in_range, in_colorspace; int ret; if ((ret = scale_eval_dimensions(ctx)) < 0) @@ -521,6 +567,14 @@ static int config_props(AVFilterLink *outlink) if (outfmt == AV_PIX_FMT_PAL8) outfmt = AV_PIX_FMT_BGR8; scale->output_is_pal = av_pix_fmt_desc_get(outfmt)->flags & AV_PIX_FMT_FLAG_PAL; + in_range = scale->in_range; + if (in_range == AVCOL_RANGE_UNSPECIFIED) + in_range = inlink0->color_range; + + in_colorspace = scale->in_color_matrix; + if (in_colorspace == -1 /* auto */) + in_colorspace = inlink0->colorspace; + if (scale->sws) sws_freeContext(scale->sws); if (scale->isws[0]) @@ -530,8 +584,8 @@ static int config_props(AVFilterLink *outlink) scale->isws[0] = scale->isws[1] = scale->sws = NULL; if (inlink0->w == outlink->w && inlink0->h == outlink->h && - scale->out_color_matrix == AVCOL_SPC_UNSPECIFIED && - scale->in_range == scale->out_range && + in_range == outlink->color_range && + in_colorspace == outlink->colorspace && inlink0->format == outlink->format) ; else { @@ -540,6 +594,8 @@ static int config_props(AVFilterLink *outlink) for (i = 0; i < 3; i++) { int in_v_chr_pos = scale->in_v_chr_pos, out_v_chr_pos = scale->out_v_chr_pos; + int in_full, out_full, brightness, contrast, saturation; + const int *inv_table, *table; struct SwsContext *const s = sws_alloc_context(); if (!s) return AVERROR(ENOMEM); @@ -555,15 +611,12 @@ static int config_props(AVFilterLink *outlink) av_opt_set_int(s, "dstw", outlink->w, 0); av_opt_set_int(s, "dsth", outlink->h >> !!i, 0); av_opt_set_int(s, "dst_format", outfmt, 0); - if (scale->in_range != AVCOL_RANGE_UNSPECIFIED) - av_opt_set_int(s, "src_range", - scale->in_range == AVCOL_RANGE_JPEG, 0); - else if (scale->in_frame_range != AVCOL_RANGE_UNSPECIFIED) + if (in_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) + in_range == AVCOL_RANGE_JPEG, 0); + if (outlink->color_range != AVCOL_RANGE_UNSPECIFIED) av_opt_set_int(s, "dst_range", - scale->out_range == AVCOL_RANGE_JPEG, 0); + outlink->color_range == AVCOL_RANGE_JPEG, 0); /* Override chroma location default settings to have the correct * chroma positions. MPEG chroma positions are used by convention. @@ -584,6 +637,24 @@ static int config_props(AVFilterLink *outlink) if ((ret = sws_init_context(s, NULL, NULL)) < 0) return ret; + + sws_getColorspaceDetails(s, (int **)&inv_table, &in_full, + (int **)&table, &out_full, + &brightness, &contrast, &saturation); + + if (scale->in_color_matrix == -1 /* auto */) + inv_table = sws_getCoefficients(inlink0->colorspace); + else if (scale->in_color_matrix != AVCOL_SPC_UNSPECIFIED) + inv_table = sws_getCoefficients(scale->in_color_matrix); + if (outlink->colorspace != AVCOL_SPC_UNSPECIFIED) + table = sws_getCoefficients(outlink->colorspace); + else if (scale->in_color_matrix != AVCOL_SPC_UNSPECIFIED) + table = inv_table; + + sws_setColorspaceDetails(s, inv_table, in_full, + table, out_full, + brightness, contrast, saturation); + if (!scale->interlaced) break; } @@ -597,10 +668,12 @@ static int config_props(AVFilterLink *outlink) if (scale->sws) av_opt_get(scale->sws, "sws_flags", 0, &flags_val); - av_log(ctx, AV_LOG_VERBOSE, "w:%d h:%d fmt:%s sar:%d/%d -> w:%d h:%d fmt:%s sar:%d/%d flags:%s\n", + av_log(ctx, AV_LOG_VERBOSE, "w:%d h:%d fmt:%s csp:%s range:%s sar:%d/%d -> w:%d h:%d fmt:%s csp:%s range:%s sar:%d/%d flags:%s\n", inlink ->w, inlink ->h, av_get_pix_fmt_name( inlink->format), + av_color_space_name(inlink->colorspace), av_color_range_name(inlink->color_range), inlink->sample_aspect_ratio.num, inlink->sample_aspect_ratio.den, outlink->w, outlink->h, av_get_pix_fmt_name(outlink->format), + av_color_space_name(outlink->colorspace), av_color_range_name(outlink->color_range), outlink->sample_aspect_ratio.num, outlink->sample_aspect_ratio.den, flags_val); av_freep(&flags_val); @@ -620,6 +693,8 @@ static int config_props_ref(AVFilterLink *outlink) outlink->sample_aspect_ratio = inlink->sample_aspect_ratio; outlink->time_base = inlink->time_base; outlink->frame_rate = inlink->frame_rate; + outlink->colorspace = inlink->colorspace; + outlink->color_range = inlink->color_range; return 0; } @@ -693,7 +768,6 @@ static int scale_frame(AVFilterLink *link, AVFrame *in, AVFrame **frame_out) const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(link->format); char buf[32]; int ret; - int in_range; int frame_changed; *frame_out = NULL; @@ -704,14 +778,9 @@ static int scale_frame(AVFilterLink *link, AVFrame *in, AVFrame **frame_out) in->height != link->h || in->format != link->format || in->sample_aspect_ratio.den != link->sample_aspect_ratio.den || - 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; - } + in->sample_aspect_ratio.num != link->sample_aspect_ratio.num || + in->colorspace != link->colorspace || + in->color_range != link->color_range; if (scale->eval_mode == EVAL_MODE_FRAME || frame_changed) { unsigned vars_w[VARS_NB] = { 0 }, vars_h[VARS_NB] = { 0 }; @@ -768,9 +837,11 @@ FF_ENABLE_DEPRECATION_WARNINGS #endif } - link->dst->inputs[0]->format = in->format; - link->dst->inputs[0]->w = in->width; - link->dst->inputs[0]->h = in->height; + link->dst->inputs[0]->format = in->format; + link->dst->inputs[0]->w = in->width; + link->dst->inputs[0]->h = in->height; + link->dst->inputs[0]->colorspace = in->colorspace; + link->dst->inputs[0]->color_range = in->color_range; link->dst->inputs[0]->sample_aspect_ratio.den = in->sample_aspect_ratio.den; link->dst->inputs[0]->sample_aspect_ratio.num = in->sample_aspect_ratio.num; @@ -798,69 +869,12 @@ scale: av_frame_copy_props(out, in); out->width = outlink->w; out->height = outlink->h; + out->color_range = outlink->color_range; + out->colorspace = outlink->colorspace; if (scale->output_is_pal) avpriv_set_systematic_pal2((uint32_t*)out->data[1], outlink->format == AV_PIX_FMT_PAL8 ? AV_PIX_FMT_BGR8 : outlink->format); - in_range = in->color_range; - - if ( scale->in_color_matrix != AVCOL_SPC_UNSPECIFIED - || scale->out_color_matrix != AVCOL_SPC_UNSPECIFIED - || scale-> in_range != AVCOL_RANGE_UNSPECIFIED - || in_range != AVCOL_RANGE_UNSPECIFIED - || scale->out_range != AVCOL_RANGE_UNSPECIFIED) { - int in_full, out_full, brightness, contrast, saturation; - const int *inv_table, *table; - - sws_getColorspaceDetails(scale->sws, (int **)&inv_table, &in_full, - (int **)&table, &out_full, - &brightness, &contrast, &saturation); - - if (scale->in_color_matrix == -1 /* auto */) - inv_table = sws_getCoefficients(in->colorspace); - else if (scale->in_color_matrix != AVCOL_SPC_UNSPECIFIED) - inv_table = sws_getCoefficients(scale->in_color_matrix); - if (scale->out_color_matrix != AVCOL_SPC_UNSPECIFIED) - table = sws_getCoefficients(scale->out_color_matrix); - else if (scale->in_color_matrix != AVCOL_SPC_UNSPECIFIED) - table = inv_table; - - if (scale-> in_range != AVCOL_RANGE_UNSPECIFIED) - in_full = (scale-> in_range == AVCOL_RANGE_JPEG); - else if (in_range != AVCOL_RANGE_UNSPECIFIED) - in_full = (in_range == AVCOL_RANGE_JPEG); - if (scale->out_range != AVCOL_RANGE_UNSPECIFIED) - out_full = (scale->out_range == AVCOL_RANGE_JPEG); - - sws_setColorspaceDetails(scale->sws, inv_table, in_full, - table, out_full, - brightness, contrast, saturation); - if (scale->isws[0]) - sws_setColorspaceDetails(scale->isws[0], inv_table, in_full, - table, out_full, - brightness, contrast, saturation); - if (scale->isws[1]) - sws_setColorspaceDetails(scale->isws[1], inv_table, in_full, - table, out_full, - brightness, contrast, saturation); - - out->color_range = out_full ? AVCOL_RANGE_JPEG : AVCOL_RANGE_MPEG; - if (scale->out_color_matrix != AVCOL_SPC_UNSPECIFIED) - out->colorspace = scale->out_color_matrix; - } - - // Sanity checks: - // 1. If the output is RGB, set the matrix coefficients to RGB. - // 2. If the output is not RGB and we've got the RGB/XYZ (identity) - // matrix configured, unset the matrix. - // In theory these should be in swscale itself as the AVFrame - // based API gets in, so that not every swscale API user has - // to go through duplicating such sanity checks. - if (av_pix_fmt_desc_get(out->format)->flags & AV_PIX_FMT_FLAG_RGB) - out->colorspace = AVCOL_SPC_RGB; - else if (out->colorspace == AVCOL_SPC_RGB) - out->colorspace = AVCOL_SPC_UNSPECIFIED; - av_reduce(&out->sample_aspect_ratio.num, &out->sample_aspect_ratio.den, (int64_t)in->sample_aspect_ratio.num * outlink->h * link->w, (int64_t)in->sample_aspect_ratio.den * outlink->w * link->h, @@ -905,7 +919,9 @@ static int filter_frame_ref(AVFilterLink *link, AVFrame *in) in->height != link->h || in->format != link->format || 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 || + in->colorspace != link->colorspace || + in->color_range != link->color_range; if (frame_changed) { link->format = in->format; @@ -913,6 +929,8 @@ static int filter_frame_ref(AVFilterLink *link, AVFrame *in) link->h = in->height; link->sample_aspect_ratio.num = in->sample_aspect_ratio.num; link->sample_aspect_ratio.den = in->sample_aspect_ratio.den; + link->colorspace = in->colorspace; + link->color_range = in->color_range; config_props_ref(outlink); }

1 0

fftools/ffmpeg_filter: configure buffersrc with csp/range
by Niklas Haas 31 Dec '23

31 Dec '23

ffmpeg | branch: master | Niklas Haas <git(a)haasn.dev> | Fri Oct 20 17:14:20 2023 +0200| [9613ba95c11c242d0a52a98f00495627bc1cee42] | committer: Niklas Haas fftools/ffmpeg_filter: configure buffersrc with csp/range Propagates input metadata to the input filter graph. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9613ba95c11c242d0… --- fftools/ffmpeg_filter.c | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/fftools/ffmpeg_filter.c b/fftools/ffmpeg_filter.c index 3383f5a40a..7b8d6a5a38 100644 --- a/fftools/ffmpeg_filter.c +++ b/fftools/ffmpeg_filter.c @@ -129,6 +129,8 @@ typedef struct InputFilterPriv { int width, height; AVRational sample_aspect_ratio; + enum AVColorSpace color_space; + enum AVColorRange color_range; int sample_rate; AVChannelLayout ch_layout; @@ -149,6 +151,8 @@ typedef struct InputFilterPriv { int width; int height; AVRational sample_aspect_ratio; + enum AVColorSpace color_space; + enum AVColorRange color_range; int sample_rate; AVChannelLayout ch_layout; @@ -260,6 +264,8 @@ static int sub2video_get_blank_frame(InputFilterPriv *ifp) frame->width = ifp->width; frame->height = ifp->height; frame->format = ifp->format; + frame->colorspace = ifp->color_space; + frame->color_range = ifp->color_range; ret = av_frame_get_buffer(frame, 0); if (ret < 0) @@ -836,6 +842,8 @@ static InputFilter *ifilter_alloc(FilterGraph *fg) ifp->index = fg->nb_inputs - 1; ifp->format = -1; ifp->fallback.format = -1; + ifp->color_space = ifp->fallback.color_space = AVCOL_SPC_UNSPECIFIED; + ifp->color_range = ifp->fallback.color_range = AVCOL_RANGE_UNSPECIFIED; ifp->frame_queue = av_fifo_alloc2(8, sizeof(AVFrame*), AV_FIFO_FLAG_AUTO_GROW); if (!ifp->frame_queue) @@ -1489,9 +1497,11 @@ static int configure_input_video_filter(FilterGraph *fg, AVFilterGraph *graph, av_bprint_init(&args, 0, AV_BPRINT_SIZE_AUTOMATIC); av_bprintf(&args, "video_size=%dx%d:pix_fmt=%d:time_base=%d/%d:" - "pixel_aspect=%d/%d", + "pixel_aspect=%d/%d:colorspace=%s:range=%s", ifp->width, ifp->height, ifp->format, - ifp->time_base.num, ifp->time_base.den, sar.num, sar.den); + ifp->time_base.num, ifp->time_base.den, sar.num, sar.den, + av_color_space_name(ifp->color_space), + av_color_range_name(ifp->color_range)); if (fr.num && fr.den) av_bprintf(&args, ":frame_rate=%d/%d", fr.num, fr.den); snprintf(name, sizeof(name), "graph %d input from stream %d:%d", fg->index, @@ -1836,6 +1846,8 @@ int ifilter_parameters_from_dec(InputFilter *ifilter, const AVCodecContext *dec) ifp->fallback.width = dec->width; ifp->fallback.height = dec->height; ifp->fallback.sample_aspect_ratio = dec->sample_aspect_ratio; + ifp->fallback.color_space = dec->colorspace; + ifp->fallback.color_range = dec->color_range; } else if (dec->codec_type == AVMEDIA_TYPE_AUDIO) { int ret; @@ -1876,6 +1888,8 @@ static int ifilter_parameters_from_frame(InputFilter *ifilter, const AVFrame *fr ifp->width = frame->width; ifp->height = frame->height; ifp->sample_aspect_ratio = frame->sample_aspect_ratio; + ifp->color_space = frame->colorspace; + ifp->color_range = frame->color_range; ifp->sample_rate = frame->sample_rate; ret = av_channel_layout_copy(&ifp->ch_layout, &frame->ch_layout); @@ -2556,6 +2570,8 @@ static int send_eof(FilterGraphThread *fgt, InputFilter *ifilter, ifp->width = ifp->fallback.width; ifp->height = ifp->fallback.height; ifp->sample_aspect_ratio = ifp->fallback.sample_aspect_ratio; + ifp->color_space = ifp->fallback.color_space; + ifp->color_range = ifp->fallback.color_range; ret = av_channel_layout_copy(&ifp->ch_layout, &ifp->fallback.ch_layout); @@ -2600,7 +2616,9 @@ static int send_frame(FilterGraph *fg, FilterGraphThread *fgt, break; case AVMEDIA_TYPE_VIDEO: need_reinit |= ifp->width != frame->width || - ifp->height != frame->height; + ifp->height != frame->height || + ifp->color_space != frame->colorspace || + ifp->color_range != frame->color_range; break; }

1 0