[FFmpeg-cvslog] avfilter/vf_setparams: allow setting chroma location
Niklas Haas
git at videolan.org
Fri Aug 16 12:44:41 EEST 2024
ffmpeg | branch: master | Niklas Haas <git at haasn.dev> | Thu Jul 4 12:52:08 2024 +0200| [201f1cba150d44de6fedfeee4e8647170ed5fbca] | committer: Niklas Haas
avfilter/vf_setparams: allow setting chroma location
Shockingly, there isn't currently _any_ filter for overriding this.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=201f1cba150d44de6fedfeee4e8647170ed5fbca
---
doc/filters.texi | 17 +++++++++++++++++
libavfilter/vf_setparams.c | 19 ++++++++++++++++---
2 files changed, 33 insertions(+), 3 deletions(-)
diff --git a/doc/filters.texi b/doc/filters.texi
index 2585d818ff..3dbd7ac628 100644
--- a/doc/filters.texi
+++ b/doc/filters.texi
@@ -22073,6 +22073,23 @@ Keep the same colorspace property (default).
@item chroma-derived-c
@item ictcp
@end table
+
+ at item chroma_location
+Set the chroma sample location.
+Available values are:
+
+ at table @samp
+ at item auto
+Keep the same chroma location (default).
+
+ at item unspecified, unknown
+ at item left
+ at item center
+ at item topleft
+ at item top
+ at item bottomleft
+ at item bottom
+ at end table
@end table
@section sharpen_npp
diff --git a/libavfilter/vf_setparams.c b/libavfilter/vf_setparams.c
index b7da8eb54b..6666e465df 100644
--- a/libavfilter/vf_setparams.c
+++ b/libavfilter/vf_setparams.c
@@ -41,6 +41,7 @@ typedef struct SetParamsContext {
int color_primaries;
int color_trc;
int colorspace;
+ int chroma_location;
} SetParamsContext;
#define OFFSET(x) offsetof(SetParamsContext, x)
@@ -119,6 +120,17 @@ static const AVOption setparams_options[] = {
{"chroma-derived-c", NULL, 0, AV_OPT_TYPE_CONST, {.i64=AVCOL_SPC_CHROMA_DERIVED_CL}, INT_MIN, INT_MAX, FLAGS, .unit = "colorspace"},
{"ictcp", NULL, 0, AV_OPT_TYPE_CONST, {.i64=AVCOL_SPC_ICTCP}, INT_MIN, INT_MAX, FLAGS, .unit = "colorspace"},
{"ipt-c2", NULL, 0, AV_OPT_TYPE_CONST, {.i64=AVCOL_SPC_IPT_C2}, INT_MIN, INT_MAX, FLAGS, .unit = "colorspace"},
+
+ {"chroma_location", "select chroma sample location", OFFSET(chroma_location), AV_OPT_TYPE_INT, {.i64=-1}, -1, AVCHROMA_LOC_NB-1, FLAGS, .unit = "chroma_location"},
+ {"auto", "keep the same chroma location", 0, AV_OPT_TYPE_CONST, {.i64=-1}, 0, 0, FLAGS, .unit = "chroma_location"},
+ {"unspecified", NULL, 0, AV_OPT_TYPE_CONST, {.i64=AVCHROMA_LOC_UNSPECIFIED}, 0, 0, FLAGS, .unit = "chroma_location"},
+ {"unknown", NULL, 0, AV_OPT_TYPE_CONST, {.i64=AVCHROMA_LOC_UNSPECIFIED}, 0, 0, FLAGS, .unit = "chroma_location"},
+ {"left", NULL, 0, AV_OPT_TYPE_CONST, {.i64=AVCHROMA_LOC_LEFT}, 0, 0, FLAGS, .unit = "chroma_location"},
+ {"center", NULL, 0, AV_OPT_TYPE_CONST, {.i64=AVCHROMA_LOC_CENTER}, 0, 0, FLAGS, .unit = "chroma_location"},
+ {"topleft", NULL, 0, AV_OPT_TYPE_CONST, {.i64=AVCHROMA_LOC_TOPLEFT}, 0, 0, FLAGS, .unit = "chroma_location"},
+ {"top", NULL, 0, AV_OPT_TYPE_CONST, {.i64=AVCHROMA_LOC_TOP}, 0, 0, FLAGS, .unit = "chroma_location"},
+ {"bottomleft", NULL, 0, AV_OPT_TYPE_CONST, {.i64=AVCHROMA_LOC_BOTTOMLEFT}, 0, 0, FLAGS, .unit = "chroma_location"},
+ {"bottom", NULL, 0, AV_OPT_TYPE_CONST, {.i64=AVCHROMA_LOC_BOTTOM}, 0, 0, FLAGS, .unit = "chroma_location"},
{NULL}
};
@@ -174,17 +186,18 @@ FF_ENABLE_DEPRECATION_WARNINGS
frame->flags &= ~AV_FRAME_FLAG_TOP_FIELD_FIRST;
}
- /* set range */
+ /* set straightforward parameters */
if (s->color_range >= 0)
frame->color_range = s->color_range;
-
- /* set color prim, trc, space */
if (s->color_primaries >= 0)
frame->color_primaries = s->color_primaries;
if (s->color_trc >= 0)
frame->color_trc = s->color_trc;
if (s->colorspace >= 0)
frame->colorspace = s->colorspace;
+ if (s->chroma_location >= 0)
+ frame->chroma_location = s->chroma_location;
+
return ff_filter_frame(ctx->outputs[0], frame);
}
More information about the ffmpeg-cvslog
mailing list