From: Niklas Haas <ffmpeg@haasn.xyz>
To: ffmpeg-devel@ffmpeg.org
Cc: Niklas Haas <git@haasn.dev>
Subject: [FFmpeg-devel] [PATCH 2/6] avfilter/vf_setparams: allow setting chroma location
Date: Thu, 4 Jul 2024 13:51:58 +0200
Message-ID: <20240704115202.1235954-2-ffmpeg@haasn.xyz> (raw)
In-Reply-To: <20240704115202.1235954-1-ffmpeg@haasn.xyz>
From: Niklas Haas <git@haasn.dev>
Shockingly, there isn't currently _any_ filter for overriding this.
---
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 c9c4f7cf6b..ca8f6e461a 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
+
+@item chroma_location
+Set the chroma sample location.
+Available values are:
+
+@table @samp
+@item auto
+Keep the same chroma location (default).
+
+@item unspecified, unknown
+@item left
+@item center
+@item topleft
+@item top
+@item bottomleft
+@item bottom
+@end table
@end table
@section sharpen_npp
diff --git a/libavfilter/vf_setparams.c b/libavfilter/vf_setparams.c
index b7da8eb54b..ba32a6699c 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}, INT_MIN, INT_MAX, FLAGS, .unit = "chroma_location"},
+ {"unspecified", NULL, 0, AV_OPT_TYPE_CONST, {.i64=AVCHROMA_LOC_UNSPECIFIED}, INT_MIN, INT_MAX, FLAGS, .unit = "chroma_location"},
+ {"unknown", NULL, 0, AV_OPT_TYPE_CONST, {.i64=AVCHROMA_LOC_UNSPECIFIED}, INT_MIN, INT_MAX, FLAGS, .unit = "chroma_location"},
+ {"left", NULL, 0, AV_OPT_TYPE_CONST, {.i64=AVCHROMA_LOC_LEFT}, INT_MIN, INT_MAX, FLAGS, .unit = "chroma_location"},
+ {"center", NULL, 0, AV_OPT_TYPE_CONST, {.i64=AVCHROMA_LOC_CENTER}, INT_MIN, INT_MAX, FLAGS, .unit = "chroma_location"},
+ {"topleft", NULL, 0, AV_OPT_TYPE_CONST, {.i64=AVCHROMA_LOC_TOPLEFT}, INT_MIN, INT_MAX, FLAGS, .unit = "chroma_location"},
+ {"top", NULL, 0, AV_OPT_TYPE_CONST, {.i64=AVCHROMA_LOC_TOP}, INT_MIN, INT_MAX, FLAGS, .unit = "chroma_location"},
+ {"bottomleft", NULL, 0, AV_OPT_TYPE_CONST, {.i64=AVCHROMA_LOC_BOTTOMLEFT}, INT_MIN, INT_MAX, FLAGS, .unit = "chroma_location"},
+ {"bottom", NULL, 0, AV_OPT_TYPE_CONST, {.i64=AVCHROMA_LOC_BOTTOM}, INT_MIN, INT_MAX, 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);
}
--
2.45.2
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
next prev parent reply other threads:[~2024-07-04 11:54 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-07-04 11:51 [FFmpeg-devel] [PATCH 1/6] swscale: document SWS_FULL_CHR_H_* flags Niklas Haas
2024-07-04 11:51 ` Niklas Haas [this message]
2024-07-04 15:09 ` [FFmpeg-devel] [PATCH 2/6] avfilter/vf_setparams: allow setting chroma location Paul B Mahol
2024-07-04 11:51 ` [FFmpeg-devel] [PATCH 3/6] avfilter/swscale: always fix interlaced " Niklas Haas
2024-07-04 11:52 ` [FFmpeg-devel] [PATCH 4/6] avfilter/vf_scale: add in/out_chroma_loc Niklas Haas
2024-07-04 12:52 ` Niklas Haas
2024-07-04 11:52 ` [FFmpeg-devel] [PATCH 5/6] avfilter/vf_zscale: remove unused fields Niklas Haas
2024-07-04 11:52 ` [FFmpeg-devel] [PATCH 6/6] fate/scalechroma: switch to standard chroma location Niklas Haas
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240704115202.1235954-2-ffmpeg@haasn.xyz \
--to=ffmpeg@haasn.xyz \
--cc=ffmpeg-devel@ffmpeg.org \
--cc=git@haasn.dev \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
This inbox may be cloned and mirrored by anyone:
git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
ffmpegdev@gitmailbox.com
public-inbox-index ffmpegdev
Example config snippet for mirrors.
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git