* [FFmpeg-devel] [PATCH 1/5] fftools: Add support for dictionary options
@ 2022-08-16 13:30 Thilo Borgmann
2022-08-16 13:30 ` [FFmpeg-devel] [PATCH 2/5] ffmpeg: Add display_matrix option Thilo Borgmann
` (4 more replies)
0 siblings, 5 replies; 11+ messages in thread
From: Thilo Borgmann @ 2022-08-16 13:30 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Jan Ekström
From: Jan Ekström <jeebjp@gmail.com>
---
fftools/cmdutils.c | 18 ++++++++++++++++++
fftools/cmdutils.h | 2 ++
fftools/ffmpeg_opt.c | 11 +++++++++--
3 files changed, 29 insertions(+), 2 deletions(-)
diff --git a/fftools/cmdutils.c b/fftools/cmdutils.c
index 18e768b386..22ba654bb0 100644
--- a/fftools/cmdutils.c
+++ b/fftools/cmdutils.c
@@ -131,6 +131,22 @@ int64_t parse_time_or_die(const char *context, const char *timestr,
return us;
}
+static AVDictionary *parse_dict_or_die(const char *context,
+ const char *dict_str)
+{
+ AVDictionary *dict = NULL;
+ int ret = av_dict_parse_string(&dict, dict_str, "=", ",", 0);
+ if (ret < 0) {
+ av_log(NULL, AV_LOG_FATAL,
+ "Failed to create a dictionary from '%s': %s!\n",
+ dict_str, av_err2str(ret));
+ exit_program(1);
+ }
+
+
+ return dict;
+}
+
void show_help_options(const OptionDef *options, const char *msg, int req_flags,
int rej_flags, int alt_flags)
{
@@ -288,6 +304,8 @@ static int write_option(void *optctx, const OptionDef *po, const char *opt,
*(float *)dst = parse_number_or_die(opt, arg, OPT_FLOAT, -INFINITY, INFINITY);
} else if (po->flags & OPT_DOUBLE) {
*(double *)dst = parse_number_or_die(opt, arg, OPT_DOUBLE, -INFINITY, INFINITY);
+ } else if (po->flags & OPT_DICT) {
+ *(AVDictionary **)dst = parse_dict_or_die(opt, arg);
} else if (po->u.func_arg) {
int ret = po->u.func_arg(optctx, opt, arg);
if (ret < 0) {
diff --git a/fftools/cmdutils.h b/fftools/cmdutils.h
index d87e162ccd..6a519c6546 100644
--- a/fftools/cmdutils.h
+++ b/fftools/cmdutils.h
@@ -129,6 +129,7 @@ typedef struct SpecifierOpt {
uint64_t ui64;
float f;
double dbl;
+ AVDictionary *dict;
} u;
} SpecifierOpt;
@@ -157,6 +158,7 @@ typedef struct OptionDef {
#define OPT_DOUBLE 0x20000
#define OPT_INPUT 0x40000
#define OPT_OUTPUT 0x80000
+#define OPT_DICT 0x100000
union {
void *dst_ptr;
int (*func_arg)(void *, const char *, const char *);
diff --git a/fftools/ffmpeg_opt.c b/fftools/ffmpeg_opt.c
index 97f14b2a5b..cc038aae6b 100644
--- a/fftools/ffmpeg_opt.c
+++ b/fftools/ffmpeg_opt.c
@@ -62,6 +62,7 @@
#define SPECIFIER_OPT_FMT_ui64 "%"PRIu64
#define SPECIFIER_OPT_FMT_f "%f"
#define SPECIFIER_OPT_FMT_dbl "%lf"
+#define SPECIFIER_OPT_FMT_dict "%p"
static const char *const opt_name_codec_names[] = {"c", "codec", "acodec", "vcodec", "scodec", "dcodec", NULL};
static const char *const opt_name_audio_channels[] = {"ac", NULL};
@@ -208,11 +209,17 @@ static void uninit_options(OptionsContext *o)
av_freep(&(*so)[i].specifier);
if (po->flags & OPT_STRING)
av_freep(&(*so)[i].u.str);
+ else if (po->flags & OPT_DICT)
+ av_dict_free(&(*so)[i].u.dict);
}
av_freep(so);
*count = 0;
- } else if (po->flags & OPT_OFFSET && po->flags & OPT_STRING)
- av_freep(dst);
+ } else if (po->flags & OPT_OFFSET) {
+ if (po->flags & OPT_STRING)
+ av_freep(dst);
+ else if (po->flags & OPT_DICT)
+ av_dict_free((AVDictionary **)&dst);
+ }
po++;
}
--
2.20.1 (Apple Git-117)
_______________________________________________
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".
^ permalink raw reply [flat|nested] 11+ messages in thread
* [FFmpeg-devel] [PATCH 2/5] ffmpeg: Add display_matrix option
2022-08-16 13:30 [FFmpeg-devel] [PATCH 1/5] fftools: Add support for dictionary options Thilo Borgmann
@ 2022-08-16 13:30 ` Thilo Borgmann
2022-08-16 14:53 ` Andreas Rheinhardt
2022-08-16 15:29 ` Andreas Rheinhardt
2022-08-16 13:30 ` [FFmpeg-devel] [PATCH 3/5] ffmpeg: Deprecate display rotation override with a metadata key Thilo Borgmann
` (3 subsequent siblings)
4 siblings, 2 replies; 11+ messages in thread
From: Thilo Borgmann @ 2022-08-16 13:30 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Jan Ekström
From: Jan Ekström <jeebjp@gmail.com>
This enables overriding the rotation as well as horizontal/vertical
flip state of a specific video stream on the input side.
Additionally, switch the singular test that was utilizing the rotation
metadata to instead override the input display rotation, thus leading
to the same result.
---
doc/ffmpeg.texi | 13 +++++
fftools/cmdutils.h | 1 +
fftools/ffmpeg.h | 2 +
fftools/ffmpeg_opt.c | 107 ++++++++++++++++++++++++++++++++++++
tests/fate/filter-video.mak | 2 +-
5 files changed, 124 insertions(+), 1 deletion(-)
diff --git a/doc/ffmpeg.texi b/doc/ffmpeg.texi
index 42440d93b4..5d3e3b3052 100644
--- a/doc/ffmpeg.texi
+++ b/doc/ffmpeg.texi
@@ -912,6 +912,19 @@ If used together with @option{-vcodec copy}, it will affect the aspect ratio
stored at container level, but not the aspect ratio stored in encoded
frames, if it exists.
+@item -display_matrix[:@var{stream_specifier}] @var{opt1=val1[,opt2=val2]...} (@emph{input,per-stream})
+Set the video display matrix according to given options.
+
+@table @option
+@item rotation=@var{number}
+Set the rotation using a floating point number that describes a pure
+counter-clockwise rotation in degrees.
+The @code{-autorotate} logic will be affected.
+@item hflip=@var{[0,1]}
+@item vflip=@var{[0,1]}
+Set a horizontal or vertical flip.
+@end table
+
@item -vn (@emph{input/output})
As an input option, blocks all video streams of a file from being filtered or
being automatically selected or mapped for any output. See @code{-discard}
diff --git a/fftools/cmdutils.h b/fftools/cmdutils.h
index 6a519c6546..df90cc6958 100644
--- a/fftools/cmdutils.h
+++ b/fftools/cmdutils.h
@@ -166,6 +166,7 @@ typedef struct OptionDef {
} u;
const char *help;
const char *argname;
+ const AVClass *args;
} OptionDef;
/**
diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h
index 6991ba7632..0ea730fd42 100644
--- a/fftools/ffmpeg.h
+++ b/fftools/ffmpeg.h
@@ -193,6 +193,8 @@ typedef struct OptionsContext {
int nb_force_fps;
SpecifierOpt *frame_aspect_ratios;
int nb_frame_aspect_ratios;
+ SpecifierOpt *display_matrixes;
+ int nb_display_matrixes;
SpecifierOpt *rc_overrides;
int nb_rc_overrides;
SpecifierOpt *intra_matrices;
diff --git a/fftools/ffmpeg_opt.c b/fftools/ffmpeg_opt.c
index cc038aae6b..e184b4239c 100644
--- a/fftools/ffmpeg_opt.c
+++ b/fftools/ffmpeg_opt.c
@@ -20,6 +20,7 @@
#include "config.h"
+#include <float.h>
#include <stdint.h>
#if HAVE_SYS_RESOURCE_H
@@ -45,6 +46,7 @@
#include "libavutil/avutil.h"
#include "libavutil/bprint.h"
#include "libavutil/channel_layout.h"
+#include "libavutil/display.h"
#include "libavutil/getenv_utf8.h"
#include "libavutil/intreadwrite.h"
#include "libavutil/fifo.h"
@@ -87,6 +89,7 @@ static const char *const opt_name_forced_key_frames[] = {"forced_key_fra
static const char *const opt_name_fps_mode[] = {"fps_mode", NULL};
static const char *const opt_name_force_fps[] = {"force_fps", NULL};
static const char *const opt_name_frame_aspect_ratios[] = {"aspect", NULL};
+static const char *const opt_name_display_matrixes[] = {"display_matrix", NULL};
static const char *const opt_name_rc_overrides[] = {"rc_override", NULL};
static const char *const opt_name_intra_matrices[] = {"intra_matrix", NULL};
static const char *const opt_name_inter_matrices[] = {"inter_matrix", NULL};
@@ -112,6 +115,32 @@ static const char *const opt_name_time_bases[] = {"time_base", NU
static const char *const opt_name_enc_time_bases[] = {"enc_time_base", NULL};
static const char *const opt_name_bits_per_raw_sample[] = {"bits_per_raw_sample", NULL};
+// XXX this should probably go into a seperate file <name>_args.c and #included here
+ struct display_matrix_s {
+ const AVClass *class;
+ double rotation;
+ int hflip;
+ int vflip;
+ };
+#define OFFSET(x) offsetof(struct display_matrix_s, x)
+ static const AVOption display_matrix_args[] = {
+ { "rotation", "set rotation", OFFSET(rotation), AV_OPT_TYPE_DOUBLE,
+ { .dbl = DBL_MAX }, -(DBL_MAX), DBL_MAX - 1.0f, AV_OPT_FLAG_ARGUMENT},
+ { "hflip", "set hflip", OFFSET(hflip), AV_OPT_TYPE_BOOL,
+ { .i64 = -1 }, 0, 1, AV_OPT_FLAG_ARGUMENT},
+ { "vflip", "set vflip", OFFSET(vflip), AV_OPT_TYPE_BOOL,
+ { .i64 = -1 }, 0, 1, AV_OPT_FLAG_ARGUMENT},
+ { NULL },
+ };
+ static const AVClass class_display_matrix_args = {
+ .class_name = "display_matrix_args",
+ .item_name = av_default_item_name,
+ .option = display_matrix_args,
+ .version = LIBAVUTIL_VERSION_INT,
+ };
+#undef OFFSET
+// XXX
+
#define WARN_MULTIPLE_OPT_USAGE(name, type, so, st)\
{\
char namestr[128] = "";\
@@ -808,6 +837,75 @@ static int opt_recording_timestamp(void *optctx, const char *opt, const char *ar
return 0;
}
+static void add_display_matrix_to_stream(OptionsContext *o,
+ AVFormatContext *ctx, AVStream *st)
+{
+ int hflip_set = 0, vflip_set = 0, display_rotation_set = 0;
+ uint8_t *buf = NULL;
+
+ static struct display_matrix_s test_args = {
+ .class = &class_display_matrix_args,
+ .rotation = DBL_MAX,
+ .hflip = -1,
+ .vflip = -1,
+ };
+
+ AVDictionary *global_args = NULL;
+ AVDictionary *local_args = NULL;
+ AVDictionaryEntry *en = NULL;
+
+ MATCH_PER_STREAM_OPT(display_matrixes, dict, global_args, ctx, st);
+
+ if (!global_args)
+ return;
+
+ // make a copy of the dict so it doesn't get freed from underneath us
+ if (av_dict_copy(&local_args, global_args, 0) < 0) {
+ av_log(NULL, AV_LOG_FATAL,
+ "Failed to copy argument dict for display matrix!\n");
+ }
+
+ if (av_opt_set_dict2(&test_args, &local_args, 0) < 0) {
+ av_log(NULL, AV_LOG_FATAL,
+ "Failed to set options for a display matrix!\n");
+ exit_program(1);
+ }
+
+ while ((en = av_dict_get(local_args, "", en, AV_DICT_IGNORE_SUFFIX))) {
+ av_log(NULL, AV_LOG_FATAL,
+ "Unknown option=value pair for display matrix: "
+ "key: '%s', value: '%s'!\n",
+ en->key, en->value);
+ }
+
+ if (av_dict_count(local_args)) {
+ exit_program(1);
+ }
+
+ av_dict_free(&local_args);
+
+ display_rotation_set = test_args.rotation != DBL_MAX;
+ hflip_set = test_args.hflip != -1;
+ vflip_set = test_args.vflip != -1;
+
+ if (!display_rotation_set && !hflip_set && !vflip_set)
+ return;
+
+ if (!(buf = av_stream_new_side_data(st, AV_PKT_DATA_DISPLAYMATRIX,
+ sizeof(int32_t) * 9))) {
+ av_log(NULL, AV_LOG_FATAL, "Failed to generate a display matrix!\n");
+ exit_program(1);
+ }
+
+ av_display_rotation_set((int32_t *)buf,
+ display_rotation_set ? -(test_args.rotation) :
+ -0.0f);
+ av_display_matrix_flip((int32_t *)buf,
+ hflip_set ? test_args.hflip : 0,
+ vflip_set ? test_args.vflip : 0);
+}
+
+
static const AVCodec *find_codec_or_die(const char *name, enum AVMediaType type, int encoder)
{
const AVCodecDescriptor *desc;
@@ -942,6 +1040,8 @@ static void add_input_streams(OptionsContext *o, AVFormatContext *ic)
}
if (st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO) {
+ add_display_matrix_to_stream(o, ic, st);
+
MATCH_PER_STREAM_OPT(hwaccels, str, hwaccel, ic, st);
MATCH_PER_STREAM_OPT(hwaccel_output_formats, str,
hwaccel_output_format, ic, st);
@@ -1865,6 +1965,8 @@ static OutputStream *new_video_stream(OptionsContext *o, AVFormatContext *oc, in
ost->frame_aspect_ratio = q;
}
+ add_display_matrix_to_stream(o, oc, st);
+
MATCH_PER_STREAM_OPT(filter_scripts, str, ost->filters_script, oc, st);
MATCH_PER_STREAM_OPT(filters, str, ost->filters, oc, st);
@@ -3992,6 +4094,11 @@ const OptionDef options[] = {
{ "aspect", OPT_VIDEO | HAS_ARG | OPT_STRING | OPT_SPEC |
OPT_OUTPUT, { .off = OFFSET(frame_aspect_ratios) },
"set aspect ratio (4:3, 16:9 or 1.3333, 1.7777)", "aspect" },
+ { "display_matrix", OPT_VIDEO | HAS_ARG | OPT_DICT | OPT_SPEC |
+ OPT_INPUT, { .off = OFFSET(display_matrixes) },
+ "define a display matrix with rotation and/or horizontal/vertical "
+ "flip for stream(s)",
+ "arguments", &class_display_matrix_args },
{ "pix_fmt", OPT_VIDEO | HAS_ARG | OPT_EXPERT | OPT_STRING | OPT_SPEC |
OPT_INPUT | OPT_OUTPUT, { .off = OFFSET(frame_pix_fmts) },
"set pixel format", "format" },
diff --git a/tests/fate/filter-video.mak b/tests/fate/filter-video.mak
index 372c70bba7..763390ea51 100644
--- a/tests/fate/filter-video.mak
+++ b/tests/fate/filter-video.mak
@@ -691,7 +691,7 @@ fate-filter-metadata-avf-aphase-meter-out-of-phase: SRC = $(TARGET_SAMPLES)/filt
fate-filter-metadata-avf-aphase-meter-out-of-phase: CMD = run $(FILTER_METADATA_COMMAND) "amovie='$(SRC)',aphasemeter=video=0"
FATE_FILTER_SAMPLES-$(call TRANSCODE, RAWVIDEO H264, MOV, ARESAMPLE_FILTER AAC_FIXED_DECODER) += fate-filter-meta-4560-rotate0
-fate-filter-meta-4560-rotate0: CMD = transcode mov $(TARGET_SAMPLES)/filter/sample-in-issue-505.mov mov "-c copy -metadata:s:v:0 rotate=0" "-af aresample" "" "" "-flags +bitexact -c:a aac_fixed"
+fate-filter-meta-4560-rotate0: CMD = transcode "mov -display_matrix:v:0 rotation=0" $(TARGET_SAMPLES)/filter/sample-in-issue-505.mov mov "-c copy" "-af aresample" "" "" "-flags +bitexact -c:a aac_fixed"
FATE_FILTER_CMP_METADATA-$(CONFIG_BLOCKDETECT_FILTER) += fate-filter-refcmp-blockdetect-yuv
fate-filter-refcmp-blockdetect-yuv: CMD = cmp_metadata blockdetect yuv420p 0.015
--
2.20.1 (Apple Git-117)
_______________________________________________
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".
^ permalink raw reply [flat|nested] 11+ messages in thread
* [FFmpeg-devel] [PATCH 3/5] ffmpeg: Deprecate display rotation override with a metadata key
2022-08-16 13:30 [FFmpeg-devel] [PATCH 1/5] fftools: Add support for dictionary options Thilo Borgmann
2022-08-16 13:30 ` [FFmpeg-devel] [PATCH 2/5] ffmpeg: Add display_matrix option Thilo Borgmann
@ 2022-08-16 13:30 ` Thilo Borgmann
2022-08-16 13:30 ` [FFmpeg-devel] [PATCH 4/5] ffmpeg: Allow printing of option arguments in help output Thilo Borgmann
` (2 subsequent siblings)
4 siblings, 0 replies; 11+ messages in thread
From: Thilo Borgmann @ 2022-08-16 13:30 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Jan Ekström
From: Jan Ekström <jeebjp@gmail.com>
Now that we have proper options for defining display matrix
overrides, this should no longer be required.
fftools does not have its own versioning, so for now the define is
just set to 1 and disables the functionality if set to zero.
---
fftools/ffmpeg.c | 2 ++
fftools/ffmpeg.h | 5 +++++
fftools/ffmpeg_opt.c | 10 ++++++++++
3 files changed, 17 insertions(+)
diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c
index 8eb7759392..b0a8839129 100644
--- a/fftools/ffmpeg.c
+++ b/fftools/ffmpeg.c
@@ -2824,12 +2824,14 @@ static int init_output_stream_streamcopy(OutputStream *ost)
}
}
+#if FFMPEG_ROTATION_METADATA
if (ost->rotate_overridden) {
uint8_t *sd = av_stream_new_side_data(ost->st, AV_PKT_DATA_DISPLAYMATRIX,
sizeof(int32_t) * 9);
if (sd)
av_display_rotation_set((int32_t *)sd, -ost->rotate_override_value);
}
+#endif
switch (par->codec_type) {
case AVMEDIA_TYPE_AUDIO:
diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h
index 0ea730fd42..12125ac006 100644
--- a/fftools/ffmpeg.h
+++ b/fftools/ffmpeg.h
@@ -53,6 +53,7 @@
#define FFMPEG_OPT_PSNR 1
#define FFMPEG_OPT_MAP_CHANNEL 1
#define FFMPEG_OPT_MAP_SYNC 1
+#define FFMPEG_ROTATION_METADATA 1
enum VideoSyncMethod {
VSYNC_AUTO = -1,
@@ -520,11 +521,15 @@ typedef struct OutputStream {
const char *fps_mode;
int force_fps;
int top_field_first;
+#if FFMPEG_ROTATION_METADATA
int rotate_overridden;
+#endif
int autoscale;
int bitexact;
int bits_per_raw_sample;
+#if FFMPEG_ROTATION_METADATA
double rotate_override_value;
+#endif
AVRational frame_aspect_ratio;
diff --git a/fftools/ffmpeg_opt.c b/fftools/ffmpeg_opt.c
index e184b4239c..f6551621c3 100644
--- a/fftools/ffmpeg_opt.c
+++ b/fftools/ffmpeg_opt.c
@@ -2930,16 +2930,26 @@ static void of_add_metadata(AVFormatContext *oc, const OptionsContext *o)
for (int j = 0; j < oc->nb_streams; j++) {
OutputStream *ost = output_streams[nb_output_streams - oc->nb_streams + j];
if ((ret = check_stream_specifier(oc, oc->streams[j], stream_spec)) > 0) {
+#if FFMPEG_ROTATION_METADATA
if (!strcmp(o->metadata[i].u.str, "rotate")) {
char *tail;
double theta = av_strtod(val, &tail);
if (!*tail) {
ost->rotate_overridden = 1;
ost->rotate_override_value = theta;
+
+ av_log(NULL, AV_LOG_WARNING,
+ "Conversion of a 'rotate' metadata key to a "
+ "proper display matrix rotation is deprecated. "
+ "See -display_matrix for setting rotation "
+ "instead.");
}
} else {
+#endif
av_dict_set(&oc->streams[j]->metadata, o->metadata[i].u.str, *val ? val : NULL, 0);
+#if FFMPEG_ROTATION_METADATA
}
+#endif
} else if (ret < 0)
exit_program(1);
}
--
2.20.1 (Apple Git-117)
_______________________________________________
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".
^ permalink raw reply [flat|nested] 11+ messages in thread
* [FFmpeg-devel] [PATCH 4/5] ffmpeg: Allow printing of option arguments in help output
2022-08-16 13:30 [FFmpeg-devel] [PATCH 1/5] fftools: Add support for dictionary options Thilo Borgmann
2022-08-16 13:30 ` [FFmpeg-devel] [PATCH 2/5] ffmpeg: Add display_matrix option Thilo Borgmann
2022-08-16 13:30 ` [FFmpeg-devel] [PATCH 3/5] ffmpeg: Deprecate display rotation override with a metadata key Thilo Borgmann
@ 2022-08-16 13:30 ` Thilo Borgmann
2022-08-16 15:34 ` Andreas Rheinhardt
2022-08-16 13:30 ` [FFmpeg-devel] [PATCH 5/5] ffmpeg: Add {h, v}scale argument to display_matrix option to allow for scaling via the display matrix Thilo Borgmann
2022-08-16 14:31 ` [FFmpeg-devel] [PATCH 1/5] fftools: Add support for dictionary options Andreas Rheinhardt
4 siblings, 1 reply; 11+ messages in thread
From: Thilo Borgmann @ 2022-08-16 13:30 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Thilo Borgmann
---
fftools/cmdutils.c | 5 +++++
libavutil/opt.c | 14 +++++++++++++-
libavutil/opt.h | 8 ++++++++
3 files changed, 26 insertions(+), 1 deletion(-)
diff --git a/fftools/cmdutils.c b/fftools/cmdutils.c
index 22ba654bb0..dae018f83a 100644
--- a/fftools/cmdutils.c
+++ b/fftools/cmdutils.c
@@ -172,6 +172,11 @@ void show_help_options(const OptionDef *options, const char *msg, int req_flags,
av_strlcat(buf, po->argname, sizeof(buf));
}
printf("-%-17s %s\n", buf, po->help);
+
+ if (po->args) {
+ const AVClass *p = po->args;
+ av_arg_show(&p, NULL);
+ }
}
printf("\n");
}
diff --git a/libavutil/opt.c b/libavutil/opt.c
index a3940f47fb..89ef111690 100644
--- a/libavutil/opt.c
+++ b/libavutil/opt.c
@@ -1256,7 +1256,7 @@ static void opt_list(void *obj, void *av_log_obj, const char *unit,
av_log(av_log_obj, AV_LOG_INFO, " %-15s ", opt->name);
else
av_log(av_log_obj, AV_LOG_INFO, " %s%-17s ",
- (opt->flags & AV_OPT_FLAG_FILTERING_PARAM) ? " " : "-",
+ (opt->flags & (AV_OPT_FLAG_FILTERING_PARAM | AV_OPT_FLAG_ARGUMENT)) ? " " : "-",
opt->name);
switch (opt->type) {
@@ -1329,6 +1329,7 @@ FF_ENABLE_DEPRECATION_WARNINGS
av_log(av_log_obj, AV_LOG_INFO, "%-12s ", "");
break;
}
+ if (!(opt->flags & AV_OPT_FLAG_ARGUMENT)) {
av_log(av_log_obj, AV_LOG_INFO, "%c%c%c%c%c%c%c%c%c%c%c",
(opt->flags & AV_OPT_FLAG_ENCODING_PARAM) ? 'E' : '.',
(opt->flags & AV_OPT_FLAG_DECODING_PARAM) ? 'D' : '.',
@@ -1341,6 +1342,7 @@ FF_ENABLE_DEPRECATION_WARNINGS
(opt->flags & AV_OPT_FLAG_BSF_PARAM) ? 'B' : '.',
(opt->flags & AV_OPT_FLAG_RUNTIME_PARAM) ? 'T' : '.',
(opt->flags & AV_OPT_FLAG_DEPRECATED) ? 'P' : '.');
+ }
if (opt->help)
av_log(av_log_obj, AV_LOG_INFO, " %s", opt->help);
@@ -1456,6 +1458,16 @@ int av_opt_show2(void *obj, void *av_log_obj, int req_flags, int rej_flags)
return 0;
}
+int av_arg_show(void *obj, void *av_log_obj)
+{
+ if (!obj)
+ return -1;
+
+ opt_list(obj, av_log_obj, NULL, AV_OPT_FLAG_ARGUMENT, 0, -1);
+
+ return 0;
+}
+
void av_opt_set_defaults(void *s)
{
av_opt_set_defaults2(s, 0, 0);
diff --git a/libavutil/opt.h b/libavutil/opt.h
index 461b5d3b6b..dce3483237 100644
--- a/libavutil/opt.h
+++ b/libavutil/opt.h
@@ -297,6 +297,7 @@ typedef struct AVOption {
#define AV_OPT_FLAG_FILTERING_PARAM (1<<16) ///< a generic parameter which can be set by the user for filtering
#define AV_OPT_FLAG_DEPRECATED (1<<17) ///< set if option is deprecated, users should refer to AVOption.help text for more information
#define AV_OPT_FLAG_CHILD_CONSTS (1<<18) ///< set if option constants can also reside in child objects
+#define AV_OPT_FLAG_ARGUMENT (1<<19) ///< set if option is an argument to another option
//FIXME think about enc-audio, ... style flags
/**
@@ -386,6 +387,13 @@ typedef struct AVOptionRanges {
*/
int av_opt_show2(void *obj, void *av_log_obj, int req_flags, int rej_flags);
+/**
+ * Show the obj arguments.
+ *
+ * @param av_log_obj log context to use for showing the options
+ */
+int av_arg_show(void *obj, void *av_log_obj);
+
/**
* Set the values of all AVOption fields to their default values.
*
--
2.20.1 (Apple Git-117)
_______________________________________________
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".
^ permalink raw reply [flat|nested] 11+ messages in thread
* [FFmpeg-devel] [PATCH 5/5] ffmpeg: Add {h, v}scale argument to display_matrix option to allow for scaling via the display matrix
2022-08-16 13:30 [FFmpeg-devel] [PATCH 1/5] fftools: Add support for dictionary options Thilo Borgmann
` (2 preceding siblings ...)
2022-08-16 13:30 ` [FFmpeg-devel] [PATCH 4/5] ffmpeg: Allow printing of option arguments in help output Thilo Borgmann
@ 2022-08-16 13:30 ` Thilo Borgmann
2022-08-16 13:43 ` Thilo Borgmann
2022-08-16 17:26 ` Andreas Rheinhardt
2022-08-16 14:31 ` [FFmpeg-devel] [PATCH 1/5] fftools: Add support for dictionary options Andreas Rheinhardt
4 siblings, 2 replies; 11+ messages in thread
From: Thilo Borgmann @ 2022-08-16 13:30 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Thilo Borgmann
---
doc/ffmpeg.texi | 4 ++++
fftools/ffmpeg_filter.c | 15 +++++++++++++++
fftools/ffmpeg_opt.c | 10 ++++++++++
libavutil/display.c | 21 +++++++++++++++++++++
libavutil/display.h | 28 ++++++++++++++++++++++++++++
5 files changed, 78 insertions(+)
diff --git a/doc/ffmpeg.texi b/doc/ffmpeg.texi
index 5d3e3b3052..52cca7a407 100644
--- a/doc/ffmpeg.texi
+++ b/doc/ffmpeg.texi
@@ -923,6 +923,10 @@ The @code{-autorotate} logic will be affected.
@item hflip=@var{[0,1]}
@item vflip=@var{[0,1]}
Set a horizontal or vertical flip.
+@item hscale=@var{[0,2]}
+Set a horizontal scaling by factor of the given floating-point value.
+@item vscale=@var{[0,2]}
+Set a vertical scaling by factor of the given floating-point value.
@end table
@item -vn (@emph{input/output})
diff --git a/fftools/ffmpeg_filter.c b/fftools/ffmpeg_filter.c
index f9ae76f76d..0759c08687 100644
--- a/fftools/ffmpeg_filter.c
+++ b/fftools/ffmpeg_filter.c
@@ -778,9 +778,24 @@ static int configure_input_video_filter(FilterGraph *fg, InputFilter *ifilter,
if (ist->autorotate && !(desc->flags & AV_PIX_FMT_FLAG_HWACCEL)) {
int32_t *displaymatrix = ifilter->displaymatrix;
double theta;
+ double hscale = 1.0f;
+ double vscale = 1.0f;
if (!displaymatrix)
displaymatrix = (int32_t *)av_stream_get_side_data(ist->st, AV_PKT_DATA_DISPLAYMATRIX, NULL);
+
+ if (displaymatrix) {
+ hscale = av_display_hscale_get(displaymatrix);
+ vscale = av_display_vscale_get(displaymatrix);
+
+ if (hscale != 1.0f || vscale != 1.0f) {
+ char scale_buf[128];
+ snprintf(scale_buf, sizeof(scale_buf), "%f*iw:%f*ih", hscale, vscale);
+ ret = insert_filter(&last_filter, &pad_idx, "scale", scale_buf);
+ }
+ }
+
+
theta = get_rotation(displaymatrix);
if (fabs(theta - 90) < 1.0) {
diff --git a/fftools/ffmpeg_opt.c b/fftools/ffmpeg_opt.c
index f6551621c3..4fae6cbfbf 100644
--- a/fftools/ffmpeg_opt.c
+++ b/fftools/ffmpeg_opt.c
@@ -121,6 +121,8 @@ static const char *const opt_name_bits_per_raw_sample[] = {"bits_per_raw_s
double rotation;
int hflip;
int vflip;
+ double hscale;
+ double vscale;
};
#define OFFSET(x) offsetof(struct display_matrix_s, x)
static const AVOption display_matrix_args[] = {
@@ -130,6 +132,10 @@ static const char *const opt_name_bits_per_raw_sample[] = {"bits_per_raw_s
{ .i64 = -1 }, 0, 1, AV_OPT_FLAG_ARGUMENT},
{ "vflip", "set vflip", OFFSET(vflip), AV_OPT_TYPE_BOOL,
{ .i64 = -1 }, 0, 1, AV_OPT_FLAG_ARGUMENT},
+ { "hscale", "set scale factor", OFFSET(hscale), AV_OPT_TYPE_DOUBLE,
+ { .dbl = 1.0f }, 0.0f, 2.0f, AV_OPT_FLAG_ARGUMENT},
+ { "vscale", "set scale factor", OFFSET(vscale), AV_OPT_TYPE_DOUBLE,
+ { .dbl = 1.0f }, 0.0f, 2.0f, AV_OPT_FLAG_ARGUMENT},
{ NULL },
};
static const AVClass class_display_matrix_args = {
@@ -848,6 +854,8 @@ static void add_display_matrix_to_stream(OptionsContext *o,
.rotation = DBL_MAX,
.hflip = -1,
.vflip = -1,
+ .hscale = 1.0f,
+ .vscale = 1.0f,
};
AVDictionary *global_args = NULL;
@@ -903,6 +911,8 @@ static void add_display_matrix_to_stream(OptionsContext *o,
av_display_matrix_flip((int32_t *)buf,
hflip_set ? test_args.hflip : 0,
vflip_set ? test_args.vflip : 0);
+
+ av_display_matrix_scale((int32_t *)buf, test_args.hscale, test_args.vscale);
}
diff --git a/libavutil/display.c b/libavutil/display.c
index d31061283c..b89763ff48 100644
--- a/libavutil/display.c
+++ b/libavutil/display.c
@@ -28,9 +28,11 @@
// fixed point to double
#define CONV_FP(x) ((double) (x)) / (1 << 16)
+#define CONV_FP2(x) ((double) (x)) / (1 << 30)
// double to fixed point
#define CONV_DB(x) (int32_t) ((x) * (1 << 16))
+#define CONV_DB2(x) (int32_t) ((x) * (1 << 30))
double av_display_rotation_get(const int32_t matrix[9])
{
@@ -48,6 +50,17 @@ double av_display_rotation_get(const int32_t matrix[9])
return -rotation;
}
+double av_display_hscale_get(const int32_t matrix[9])
+{
+ return fabs(CONV_FP2(matrix[2]));
+}
+
+double av_display_vscale_get(const int32_t matrix[9])
+{
+ return fabs(CONV_FP2(matrix[5]));
+}
+
+#include <stdio.h>
void av_display_rotation_set(int32_t matrix[9], double angle)
{
double radians = -angle * M_PI / 180.0f;
@@ -60,6 +73,8 @@ void av_display_rotation_set(int32_t matrix[9], double angle)
matrix[1] = CONV_DB(-s);
matrix[3] = CONV_DB(s);
matrix[4] = CONV_DB(c);
+ matrix[2] = 1 << 30;
+ matrix[5] = 1 << 30;
matrix[8] = 1 << 30;
}
@@ -72,3 +87,9 @@ void av_display_matrix_flip(int32_t matrix[9], int hflip, int vflip)
for (i = 0; i < 9; i++)
matrix[i] *= flip[i % 3];
}
+
+void av_display_matrix_scale(int32_t matrix[9], double hscale, double vscale)
+{
+ matrix[2] = CONV_DB2(CONV_FP2(matrix[2]) * hscale);
+ matrix[5] = CONV_DB2(CONV_FP2(matrix[5]) * vscale);
+}
diff --git a/libavutil/display.h b/libavutil/display.h
index 31d8bef361..b875e1cfdd 100644
--- a/libavutil/display.h
+++ b/libavutil/display.h
@@ -86,6 +86,26 @@
*/
double av_display_rotation_get(const int32_t matrix[9]);
+/**
+ * Extract the horizontal scaling component of the transformation matrix.
+ *
+ * @param matrix the transformation matrix
+ * @return the horizontal scaling by which the transformation matrix scales the frame
+ * in the horizontal direction. The scaling factor will be in the range
+ * [0.0, 2.0].
+ */
+double av_display_hscale_get(const int32_t matrix[9]);
+
+/**
+ * Extract the vertical scaling component of the transformation matrix.
+ *
+ * @param matrix the transformation matrix
+ * @return the vertical scaling by which the transformation matrix scales the frame
+ * in the vertical direction. The scaling factor will be in the range
+ * [0.0, 2.0].
+ */
+double av_display_vscale_get(const int32_t matrix[9]);
+
/**
* Initialize a transformation matrix describing a pure clockwise
* rotation by the specified angle (in degrees).
@@ -105,6 +125,14 @@ void av_display_rotation_set(int32_t matrix[9], double angle);
*/
void av_display_matrix_flip(int32_t matrix[9], int hflip, int vflip);
+/**
+ * Scale the input matrix horizontally and/or vertically.
+ *
+ * @param matrix an allocated transformation matrix
+ * @param hscale whether the matrix should be scaled horizontally
+ * @param vscale whether the matrix should be scaled vertically
+ */
+void av_display_matrix_scale(int32_t matrix[9], double hscale, double vscale);
/**
* @}
* @}
--
2.20.1 (Apple Git-117)
_______________________________________________
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".
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [FFmpeg-devel] [PATCH 5/5] ffmpeg: Add {h, v}scale argument to display_matrix option to allow for scaling via the display matrix
2022-08-16 13:30 ` [FFmpeg-devel] [PATCH 5/5] ffmpeg: Add {h, v}scale argument to display_matrix option to allow for scaling via the display matrix Thilo Borgmann
@ 2022-08-16 13:43 ` Thilo Borgmann
2022-08-16 17:26 ` Andreas Rheinhardt
1 sibling, 0 replies; 11+ messages in thread
From: Thilo Borgmann @ 2022-08-16 13:43 UTC (permalink / raw)
To: ffmpeg-devel
Am 16.08.22 um 15:30 schrieb Thilo Borgmann:
> ---
> doc/ffmpeg.texi | 4 ++++
> fftools/ffmpeg_filter.c | 15 +++++++++++++++
> fftools/ffmpeg_opt.c | 10 ++++++++++
> libavutil/display.c | 21 +++++++++++++++++++++
> libavutil/display.h | 28 ++++++++++++++++++++++++++++
> 5 files changed, 78 insertions(+)
>
> [...]
> diff --git a/libavutil/display.c b/libavutil/display.c
> index d31061283c..b89763ff48 100644
> --- a/libavutil/display.c
> +++ b/libavutil/display.c
> @@ -28,9 +28,11 @@
>
> // fixed point to double
> #define CONV_FP(x) ((double) (x)) / (1 << 16)
> +#define CONV_FP2(x) ((double) (x)) / (1 << 30)
>
> // double to fixed point
> #define CONV_DB(x) (int32_t) ((x) * (1 << 16))
> +#define CONV_DB2(x) (int32_t) ((x) * (1 << 30))
>
> double av_display_rotation_get(const int32_t matrix[9])
> {
> @@ -48,6 +50,17 @@ double av_display_rotation_get(const int32_t matrix[9])
> return -rotation;
> }
>
> +double av_display_hscale_get(const int32_t matrix[9])
> +{
> + return fabs(CONV_FP2(matrix[2]));
> +}
> +
> +double av_display_vscale_get(const int32_t matrix[9])
> +{
> + return fabs(CONV_FP2(matrix[5]));
> +}
> +
> +#include <stdio.h>
obviously wrong and missed to remove... will be fixed locally.
-Thilo
_______________________________________________
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".
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [FFmpeg-devel] [PATCH 1/5] fftools: Add support for dictionary options
2022-08-16 13:30 [FFmpeg-devel] [PATCH 1/5] fftools: Add support for dictionary options Thilo Borgmann
` (3 preceding siblings ...)
2022-08-16 13:30 ` [FFmpeg-devel] [PATCH 5/5] ffmpeg: Add {h, v}scale argument to display_matrix option to allow for scaling via the display matrix Thilo Borgmann
@ 2022-08-16 14:31 ` Andreas Rheinhardt
4 siblings, 0 replies; 11+ messages in thread
From: Andreas Rheinhardt @ 2022-08-16 14:31 UTC (permalink / raw)
To: ffmpeg-devel
Thilo Borgmann:
> From: Jan Ekström <jeebjp@gmail.com>
>
> ---
> fftools/cmdutils.c | 18 ++++++++++++++++++
> fftools/cmdutils.h | 2 ++
> fftools/ffmpeg_opt.c | 11 +++++++++--
> 3 files changed, 29 insertions(+), 2 deletions(-)
>
> diff --git a/fftools/cmdutils.c b/fftools/cmdutils.c
> index 18e768b386..22ba654bb0 100644
> --- a/fftools/cmdutils.c
> +++ b/fftools/cmdutils.c
> @@ -131,6 +131,22 @@ int64_t parse_time_or_die(const char *context, const char *timestr,
> return us;
> }
>
> +static AVDictionary *parse_dict_or_die(const char *context,
> + const char *dict_str)
> +{
> + AVDictionary *dict = NULL;
> + int ret = av_dict_parse_string(&dict, dict_str, "=", ",", 0);
> + if (ret < 0) {
> + av_log(NULL, AV_LOG_FATAL,
> + "Failed to create a dictionary from '%s': %s!\n",
> + dict_str, av_err2str(ret));
> + exit_program(1);
> + }
> +
> +
> + return dict;
> +}
> +
> void show_help_options(const OptionDef *options, const char *msg, int req_flags,
> int rej_flags, int alt_flags)
> {
> @@ -288,6 +304,8 @@ static int write_option(void *optctx, const OptionDef *po, const char *opt,
> *(float *)dst = parse_number_or_die(opt, arg, OPT_FLOAT, -INFINITY, INFINITY);
> } else if (po->flags & OPT_DOUBLE) {
> *(double *)dst = parse_number_or_die(opt, arg, OPT_DOUBLE, -INFINITY, INFINITY);
> + } else if (po->flags & OPT_DICT) {
> + *(AVDictionary **)dst = parse_dict_or_die(opt, arg);
> } else if (po->u.func_arg) {
> int ret = po->u.func_arg(optctx, opt, arg);
> if (ret < 0) {
> diff --git a/fftools/cmdutils.h b/fftools/cmdutils.h
> index d87e162ccd..6a519c6546 100644
> --- a/fftools/cmdutils.h
> +++ b/fftools/cmdutils.h
> @@ -129,6 +129,7 @@ typedef struct SpecifierOpt {
> uint64_t ui64;
> float f;
> double dbl;
> + AVDictionary *dict;
> } u;
> } SpecifierOpt;
>
> @@ -157,6 +158,7 @@ typedef struct OptionDef {
> #define OPT_DOUBLE 0x20000
> #define OPT_INPUT 0x40000
> #define OPT_OUTPUT 0x80000
> +#define OPT_DICT 0x100000
> union {
> void *dst_ptr;
> int (*func_arg)(void *, const char *, const char *);
> diff --git a/fftools/ffmpeg_opt.c b/fftools/ffmpeg_opt.c
> index 97f14b2a5b..cc038aae6b 100644
> --- a/fftools/ffmpeg_opt.c
> +++ b/fftools/ffmpeg_opt.c
> @@ -62,6 +62,7 @@
> #define SPECIFIER_OPT_FMT_ui64 "%"PRIu64
> #define SPECIFIER_OPT_FMT_f "%f"
> #define SPECIFIER_OPT_FMT_dbl "%lf"
> +#define SPECIFIER_OPT_FMT_dict "%p"
>
> static const char *const opt_name_codec_names[] = {"c", "codec", "acodec", "vcodec", "scodec", "dcodec", NULL};
> static const char *const opt_name_audio_channels[] = {"ac", NULL};
> @@ -208,11 +209,17 @@ static void uninit_options(OptionsContext *o)
> av_freep(&(*so)[i].specifier);
> if (po->flags & OPT_STRING)
> av_freep(&(*so)[i].u.str);
> + else if (po->flags & OPT_DICT)
> + av_dict_free(&(*so)[i].u.dict);
> }
> av_freep(so);
> *count = 0;
> - } else if (po->flags & OPT_OFFSET && po->flags & OPT_STRING)
> - av_freep(dst);
> + } else if (po->flags & OPT_OFFSET) {
> + if (po->flags & OPT_STRING)
> + av_freep(dst);
> + else if (po->flags & OPT_DICT)
> + av_dict_free((AVDictionary **)&dst);
Did you test this (your patchset doesn't)? It shouldn't work: It should
be av_dict_free((AVDictionary**)dst).
> + }
> po++;
> }
>
_______________________________________________
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".
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [FFmpeg-devel] [PATCH 2/5] ffmpeg: Add display_matrix option
2022-08-16 13:30 ` [FFmpeg-devel] [PATCH 2/5] ffmpeg: Add display_matrix option Thilo Borgmann
@ 2022-08-16 14:53 ` Andreas Rheinhardt
2022-08-16 15:29 ` Andreas Rheinhardt
1 sibling, 0 replies; 11+ messages in thread
From: Andreas Rheinhardt @ 2022-08-16 14:53 UTC (permalink / raw)
To: ffmpeg-devel
Thilo Borgmann:
> From: Jan Ekström <jeebjp@gmail.com>
>
> This enables overriding the rotation as well as horizontal/vertical
> flip state of a specific video stream on the input side.
>
> Additionally, switch the singular test that was utilizing the rotation
> metadata to instead override the input display rotation, thus leading
> to the same result.
> ---
> doc/ffmpeg.texi | 13 +++++
> fftools/cmdutils.h | 1 +
> fftools/ffmpeg.h | 2 +
> fftools/ffmpeg_opt.c | 107 ++++++++++++++++++++++++++++++++++++
> tests/fate/filter-video.mak | 2 +-
> 5 files changed, 124 insertions(+), 1 deletion(-)
>
> diff --git a/doc/ffmpeg.texi b/doc/ffmpeg.texi
> index 42440d93b4..5d3e3b3052 100644
> --- a/doc/ffmpeg.texi
> +++ b/doc/ffmpeg.texi
> @@ -912,6 +912,19 @@ If used together with @option{-vcodec copy}, it will affect the aspect ratio
> stored at container level, but not the aspect ratio stored in encoded
> frames, if it exists.
>
> +@item -display_matrix[:@var{stream_specifier}] @var{opt1=val1[,opt2=val2]...} (@emph{input,per-stream})
> +Set the video display matrix according to given options.
> +
> +@table @option
> +@item rotation=@var{number}
> +Set the rotation using a floating point number that describes a pure
> +counter-clockwise rotation in degrees.
> +The @code{-autorotate} logic will be affected.
> +@item hflip=@var{[0,1]}
> +@item vflip=@var{[0,1]}
> +Set a horizontal or vertical flip.
This documentation does not specify the order in which rotation and
flipping will be applied.
> +@end table
> +
> @item -vn (@emph{input/output})
> As an input option, blocks all video streams of a file from being filtered or
> being automatically selected or mapped for any output. See @code{-discard}
> diff --git a/fftools/cmdutils.h b/fftools/cmdutils.h
> index 6a519c6546..df90cc6958 100644
> --- a/fftools/cmdutils.h
> +++ b/fftools/cmdutils.h
> @@ -166,6 +166,7 @@ typedef struct OptionDef {
> } u;
> const char *help;
> const char *argname;
> + const AVClass *args;
Never used(?)
> } OptionDef;
>
> /**
> diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h
> index 6991ba7632..0ea730fd42 100644
> --- a/fftools/ffmpeg.h
> +++ b/fftools/ffmpeg.h
> @@ -193,6 +193,8 @@ typedef struct OptionsContext {
> int nb_force_fps;
> SpecifierOpt *frame_aspect_ratios;
> int nb_frame_aspect_ratios;
> + SpecifierOpt *display_matrixes;
> + int nb_display_matrixes;
> SpecifierOpt *rc_overrides;
> int nb_rc_overrides;
> SpecifierOpt *intra_matrices;
> diff --git a/fftools/ffmpeg_opt.c b/fftools/ffmpeg_opt.c
> index cc038aae6b..e184b4239c 100644
> --- a/fftools/ffmpeg_opt.c
> +++ b/fftools/ffmpeg_opt.c
> @@ -20,6 +20,7 @@
>
> #include "config.h"
>
> +#include <float.h>
> #include <stdint.h>
>
> #if HAVE_SYS_RESOURCE_H
> @@ -45,6 +46,7 @@
> #include "libavutil/avutil.h"
> #include "libavutil/bprint.h"
> #include "libavutil/channel_layout.h"
> +#include "libavutil/display.h"
> #include "libavutil/getenv_utf8.h"
> #include "libavutil/intreadwrite.h"
> #include "libavutil/fifo.h"
> @@ -87,6 +89,7 @@ static const char *const opt_name_forced_key_frames[] = {"forced_key_fra
> static const char *const opt_name_fps_mode[] = {"fps_mode", NULL};
> static const char *const opt_name_force_fps[] = {"force_fps", NULL};
> static const char *const opt_name_frame_aspect_ratios[] = {"aspect", NULL};
> +static const char *const opt_name_display_matrixes[] = {"display_matrix", NULL};
> static const char *const opt_name_rc_overrides[] = {"rc_override", NULL};
> static const char *const opt_name_intra_matrices[] = {"intra_matrix", NULL};
> static const char *const opt_name_inter_matrices[] = {"inter_matrix", NULL};
> @@ -112,6 +115,32 @@ static const char *const opt_name_time_bases[] = {"time_base", NU
> static const char *const opt_name_enc_time_bases[] = {"enc_time_base", NULL};
> static const char *const opt_name_bits_per_raw_sample[] = {"bits_per_raw_sample", NULL};
>
> +// XXX this should probably go into a seperate file <name>_args.c and #included here
> + struct display_matrix_s {
We actually use CamelCase for struct tags and typedefs.
> + const AVClass *class;
> + double rotation;
> + int hflip;
> + int vflip;
> + };
> +#define OFFSET(x) offsetof(struct display_matrix_s, x)
> + static const AVOption display_matrix_args[] = {
> + { "rotation", "set rotation", OFFSET(rotation), AV_OPT_TYPE_DOUBLE,
> + { .dbl = DBL_MAX }, -(DBL_MAX), DBL_MAX - 1.0f, AV_OPT_FLAG_ARGUMENT},
> + { "hflip", "set hflip", OFFSET(hflip), AV_OPT_TYPE_BOOL,
> + { .i64 = -1 }, 0, 1, AV_OPT_FLAG_ARGUMENT},
> + { "vflip", "set vflip", OFFSET(vflip), AV_OPT_TYPE_BOOL,
> + { .i64 = -1 }, 0, 1, AV_OPT_FLAG_ARGUMENT},
> + { NULL },
> + };
> + static const AVClass class_display_matrix_args = {
> + .class_name = "display_matrix_args",
> + .item_name = av_default_item_name,
> + .option = display_matrix_args,
> + .version = LIBAVUTIL_VERSION_INT,
> + };
> +#undef OFFSET
> +// XXX
> +
> #define WARN_MULTIPLE_OPT_USAGE(name, type, so, st)\
> {\
> char namestr[128] = "";\
> @@ -808,6 +837,75 @@ static int opt_recording_timestamp(void *optctx, const char *opt, const char *ar
> return 0;
> }
>
> +static void add_display_matrix_to_stream(OptionsContext *o,
> + AVFormatContext *ctx, AVStream *st)
> +{
> + int hflip_set = 0, vflip_set = 0, display_rotation_set = 0;
> + uint8_t *buf = NULL;
> +
> + static struct display_matrix_s test_args = {
Why static?
> + .class = &class_display_matrix_args,
> + .rotation = DBL_MAX,
> + .hflip = -1,
> + .vflip = -1,
> + };
> +
> + AVDictionary *global_args = NULL;
> + AVDictionary *local_args = NULL;
> + AVDictionaryEntry *en = NULL;
> +
> + MATCH_PER_STREAM_OPT(display_matrixes, dict, global_args, ctx, st);
> +
> + if (!global_args)
> + return;
> +
> + // make a copy of the dict so it doesn't get freed from underneath us
> + if (av_dict_copy(&local_args, global_args, 0) < 0) {
> + av_log(NULL, AV_LOG_FATAL,
> + "Failed to copy argument dict for display matrix!\n");
No exit_program here?
> + }
> +
> + if (av_opt_set_dict2(&test_args, &local_args, 0) < 0) {
> + av_log(NULL, AV_LOG_FATAL,
> + "Failed to set options for a display matrix!\n");
> + exit_program(1);
> + }
> +
> + while ((en = av_dict_get(local_args, "", en, AV_DICT_IGNORE_SUFFIX))) {
> + av_log(NULL, AV_LOG_FATAL,
> + "Unknown option=value pair for display matrix: "
> + "key: '%s', value: '%s'!\n",
> + en->key, en->value);
> + }
> +
> + if (av_dict_count(local_args)) {
> + exit_program(1);
> + }
> +
> + av_dict_free(&local_args);
> +
> + display_rotation_set = test_args.rotation != DBL_MAX;
> + hflip_set = test_args.hflip != -1;
> + vflip_set = test_args.vflip != -1;
> +
> + if (!display_rotation_set && !hflip_set && !vflip_set)
> + return;
> +
> + if (!(buf = av_stream_new_side_data(st, AV_PKT_DATA_DISPLAYMATRIX,
> + sizeof(int32_t) * 9))) {
> + av_log(NULL, AV_LOG_FATAL, "Failed to generate a display matrix!\n");
> + exit_program(1);
> + }
> +
> + av_display_rotation_set((int32_t *)buf,
> + display_rotation_set ? -(test_args.rotation) :
> + -0.0f);
> + av_display_matrix_flip((int32_t *)buf,
> + hflip_set ? test_args.hflip : 0,
> + vflip_set ? test_args.vflip : 0);
> +}
> +
> +
> static const AVCodec *find_codec_or_die(const char *name, enum AVMediaType type, int encoder)
> {
> const AVCodecDescriptor *desc;
> @@ -942,6 +1040,8 @@ static void add_input_streams(OptionsContext *o, AVFormatContext *ic)
> }
>
> if (st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO) {
> + add_display_matrix_to_stream(o, ic, st);
> +
> MATCH_PER_STREAM_OPT(hwaccels, str, hwaccel, ic, st);
> MATCH_PER_STREAM_OPT(hwaccel_output_formats, str,
> hwaccel_output_format, ic, st);
> @@ -1865,6 +1965,8 @@ static OutputStream *new_video_stream(OptionsContext *o, AVFormatContext *oc, in
> ost->frame_aspect_ratio = q;
> }
>
> + add_display_matrix_to_stream(o, oc, st);
> +
> MATCH_PER_STREAM_OPT(filter_scripts, str, ost->filters_script, oc, st);
> MATCH_PER_STREAM_OPT(filters, str, ost->filters, oc, st);
>
> @@ -3992,6 +4094,11 @@ const OptionDef options[] = {
> { "aspect", OPT_VIDEO | HAS_ARG | OPT_STRING | OPT_SPEC |
> OPT_OUTPUT, { .off = OFFSET(frame_aspect_ratios) },
> "set aspect ratio (4:3, 16:9 or 1.3333, 1.7777)", "aspect" },
> + { "display_matrix", OPT_VIDEO | HAS_ARG | OPT_DICT | OPT_SPEC |
> + OPT_INPUT, { .off = OFFSET(display_matrixes) },
> + "define a display matrix with rotation and/or horizontal/vertical "
> + "flip for stream(s)",
> + "arguments", &class_display_matrix_args },
> { "pix_fmt", OPT_VIDEO | HAS_ARG | OPT_EXPERT | OPT_STRING | OPT_SPEC |
> OPT_INPUT | OPT_OUTPUT, { .off = OFFSET(frame_pix_fmts) },
> "set pixel format", "format" },
> diff --git a/tests/fate/filter-video.mak b/tests/fate/filter-video.mak
> index 372c70bba7..763390ea51 100644
> --- a/tests/fate/filter-video.mak
> +++ b/tests/fate/filter-video.mak
> @@ -691,7 +691,7 @@ fate-filter-metadata-avf-aphase-meter-out-of-phase: SRC = $(TARGET_SAMPLES)/filt
> fate-filter-metadata-avf-aphase-meter-out-of-phase: CMD = run $(FILTER_METADATA_COMMAND) "amovie='$(SRC)',aphasemeter=video=0"
>
> FATE_FILTER_SAMPLES-$(call TRANSCODE, RAWVIDEO H264, MOV, ARESAMPLE_FILTER AAC_FIXED_DECODER) += fate-filter-meta-4560-rotate0
> -fate-filter-meta-4560-rotate0: CMD = transcode mov $(TARGET_SAMPLES)/filter/sample-in-issue-505.mov mov "-c copy -metadata:s:v:0 rotate=0" "-af aresample" "" "" "-flags +bitexact -c:a aac_fixed"
> +fate-filter-meta-4560-rotate0: CMD = transcode "mov -display_matrix:v:0 rotation=0" $(TARGET_SAMPLES)/filter/sample-in-issue-505.mov mov "-c copy" "-af aresample" "" "" "-flags +bitexact -c:a aac_fixed"
>
> FATE_FILTER_CMP_METADATA-$(CONFIG_BLOCKDETECT_FILTER) += fate-filter-refcmp-blockdetect-yuv
> fate-filter-refcmp-blockdetect-yuv: CMD = cmp_metadata blockdetect yuv420p 0.015
_______________________________________________
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".
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [FFmpeg-devel] [PATCH 2/5] ffmpeg: Add display_matrix option
2022-08-16 13:30 ` [FFmpeg-devel] [PATCH 2/5] ffmpeg: Add display_matrix option Thilo Borgmann
2022-08-16 14:53 ` Andreas Rheinhardt
@ 2022-08-16 15:29 ` Andreas Rheinhardt
1 sibling, 0 replies; 11+ messages in thread
From: Andreas Rheinhardt @ 2022-08-16 15:29 UTC (permalink / raw)
To: ffmpeg-devel
Thilo Borgmann:
> From: Jan Ekström <jeebjp@gmail.com>
>
> This enables overriding the rotation as well as horizontal/vertical
> flip state of a specific video stream on the input side.
>
> Additionally, switch the singular test that was utilizing the rotation
> metadata to instead override the input display rotation, thus leading
> to the same result.
> ---
> doc/ffmpeg.texi | 13 +++++
> fftools/cmdutils.h | 1 +
> fftools/ffmpeg.h | 2 +
> fftools/ffmpeg_opt.c | 107 ++++++++++++++++++++++++++++++++++++
> tests/fate/filter-video.mak | 2 +-
> 5 files changed, 124 insertions(+), 1 deletion(-)
>
> diff --git a/doc/ffmpeg.texi b/doc/ffmpeg.texi
> index 42440d93b4..5d3e3b3052 100644
> --- a/doc/ffmpeg.texi
> +++ b/doc/ffmpeg.texi
> @@ -912,6 +912,19 @@ If used together with @option{-vcodec copy}, it will affect the aspect ratio
> stored at container level, but not the aspect ratio stored in encoded
> frames, if it exists.
>
> +@item -display_matrix[:@var{stream_specifier}] @var{opt1=val1[,opt2=val2]...} (@emph{input,per-stream})
> +Set the video display matrix according to given options.
> +
> +@table @option
> +@item rotation=@var{number}
> +Set the rotation using a floating point number that describes a pure
> +counter-clockwise rotation in degrees.
> +The @code{-autorotate} logic will be affected.
> +@item hflip=@var{[0,1]}
> +@item vflip=@var{[0,1]}
> +Set a horizontal or vertical flip.
> +@end table
> +
> @item -vn (@emph{input/output})
> As an input option, blocks all video streams of a file from being filtered or
> being automatically selected or mapped for any output. See @code{-discard}
> diff --git a/fftools/cmdutils.h b/fftools/cmdutils.h
> index 6a519c6546..df90cc6958 100644
> --- a/fftools/cmdutils.h
> +++ b/fftools/cmdutils.h
> @@ -166,6 +166,7 @@ typedef struct OptionDef {
> } u;
> const char *help;
> const char *argname;
> + const AVClass *args;
> } OptionDef;
>
> /**
> diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h
> index 6991ba7632..0ea730fd42 100644
> --- a/fftools/ffmpeg.h
> +++ b/fftools/ffmpeg.h
> @@ -193,6 +193,8 @@ typedef struct OptionsContext {
> int nb_force_fps;
> SpecifierOpt *frame_aspect_ratios;
> int nb_frame_aspect_ratios;
> + SpecifierOpt *display_matrixes;
> + int nb_display_matrixes;
> SpecifierOpt *rc_overrides;
> int nb_rc_overrides;
> SpecifierOpt *intra_matrices;
> diff --git a/fftools/ffmpeg_opt.c b/fftools/ffmpeg_opt.c
> index cc038aae6b..e184b4239c 100644
> --- a/fftools/ffmpeg_opt.c
> +++ b/fftools/ffmpeg_opt.c
> @@ -20,6 +20,7 @@
>
> #include "config.h"
>
> +#include <float.h>
> #include <stdint.h>
>
> #if HAVE_SYS_RESOURCE_H
> @@ -45,6 +46,7 @@
> #include "libavutil/avutil.h"
> #include "libavutil/bprint.h"
> #include "libavutil/channel_layout.h"
> +#include "libavutil/display.h"
> #include "libavutil/getenv_utf8.h"
> #include "libavutil/intreadwrite.h"
> #include "libavutil/fifo.h"
> @@ -87,6 +89,7 @@ static const char *const opt_name_forced_key_frames[] = {"forced_key_fra
> static const char *const opt_name_fps_mode[] = {"fps_mode", NULL};
> static const char *const opt_name_force_fps[] = {"force_fps", NULL};
> static const char *const opt_name_frame_aspect_ratios[] = {"aspect", NULL};
> +static const char *const opt_name_display_matrixes[] = {"display_matrix", NULL};
> static const char *const opt_name_rc_overrides[] = {"rc_override", NULL};
> static const char *const opt_name_intra_matrices[] = {"intra_matrix", NULL};
> static const char *const opt_name_inter_matrices[] = {"inter_matrix", NULL};
> @@ -112,6 +115,32 @@ static const char *const opt_name_time_bases[] = {"time_base", NU
> static const char *const opt_name_enc_time_bases[] = {"enc_time_base", NULL};
> static const char *const opt_name_bits_per_raw_sample[] = {"bits_per_raw_sample", NULL};
>
> +// XXX this should probably go into a seperate file <name>_args.c and #included here
> + struct display_matrix_s {
> + const AVClass *class;
> + double rotation;
> + int hflip;
> + int vflip;
> + };
> +#define OFFSET(x) offsetof(struct display_matrix_s, x)
> + static const AVOption display_matrix_args[] = {
> + { "rotation", "set rotation", OFFSET(rotation), AV_OPT_TYPE_DOUBLE,
> + { .dbl = DBL_MAX }, -(DBL_MAX), DBL_MAX - 1.0f, AV_OPT_FLAG_ARGUMENT},
AV_OPT_FLAG_ARGUMENT is only added in 4/5. This commit will not compile
at all.
> + { "hflip", "set hflip", OFFSET(hflip), AV_OPT_TYPE_BOOL,
> + { .i64 = -1 }, 0, 1, AV_OPT_FLAG_ARGUMENT},
> + { "vflip", "set vflip", OFFSET(vflip), AV_OPT_TYPE_BOOL,
> + { .i64 = -1 }, 0, 1, AV_OPT_FLAG_ARGUMENT},
> + { NULL },
> + };
> + static const AVClass class_display_matrix_args = {
> + .class_name = "display_matrix_args",
> + .item_name = av_default_item_name,
> + .option = display_matrix_args,
> + .version = LIBAVUTIL_VERSION_INT,
> + };
> +#undef OFFSET
> +// XXX
> +
> #define WARN_MULTIPLE_OPT_USAGE(name, type, so, st)\
> {\
> char namestr[128] = "";\
> @@ -808,6 +837,75 @@ static int opt_recording_timestamp(void *optctx, const char *opt, const char *ar
> return 0;
> }
>
> +static void add_display_matrix_to_stream(OptionsContext *o,
> + AVFormatContext *ctx, AVStream *st)
> +{
> + int hflip_set = 0, vflip_set = 0, display_rotation_set = 0;
> + uint8_t *buf = NULL;
> +
> + static struct display_matrix_s test_args = {
> + .class = &class_display_matrix_args,
> + .rotation = DBL_MAX,
> + .hflip = -1,
> + .vflip = -1,
> + };
> +
> + AVDictionary *global_args = NULL;
> + AVDictionary *local_args = NULL;
> + AVDictionaryEntry *en = NULL;
> +
> + MATCH_PER_STREAM_OPT(display_matrixes, dict, global_args, ctx, st);
> +
> + if (!global_args)
> + return;
> +
> + // make a copy of the dict so it doesn't get freed from underneath us
> + if (av_dict_copy(&local_args, global_args, 0) < 0) {
> + av_log(NULL, AV_LOG_FATAL,
> + "Failed to copy argument dict for display matrix!\n");
> + }
> +
> + if (av_opt_set_dict2(&test_args, &local_args, 0) < 0) {
> + av_log(NULL, AV_LOG_FATAL,
> + "Failed to set options for a display matrix!\n");
> + exit_program(1);
> + }
> +
> + while ((en = av_dict_get(local_args, "", en, AV_DICT_IGNORE_SUFFIX))) {
> + av_log(NULL, AV_LOG_FATAL,
> + "Unknown option=value pair for display matrix: "
> + "key: '%s', value: '%s'!\n",
> + en->key, en->value);
> + }
> +
> + if (av_dict_count(local_args)) {
> + exit_program(1);
> + }
> +
> + av_dict_free(&local_args);
> +
> + display_rotation_set = test_args.rotation != DBL_MAX;
> + hflip_set = test_args.hflip != -1;
> + vflip_set = test_args.vflip != -1;
> +
> + if (!display_rotation_set && !hflip_set && !vflip_set)
> + return;
> +
> + if (!(buf = av_stream_new_side_data(st, AV_PKT_DATA_DISPLAYMATRIX,
> + sizeof(int32_t) * 9))) {
> + av_log(NULL, AV_LOG_FATAL, "Failed to generate a display matrix!\n");
> + exit_program(1);
> + }
> +
> + av_display_rotation_set((int32_t *)buf,
> + display_rotation_set ? -(test_args.rotation) :
> + -0.0f);
> + av_display_matrix_flip((int32_t *)buf,
> + hflip_set ? test_args.hflip : 0,
> + vflip_set ? test_args.vflip : 0);
> +}
> +
> +
> static const AVCodec *find_codec_or_die(const char *name, enum AVMediaType type, int encoder)
> {
> const AVCodecDescriptor *desc;
> @@ -942,6 +1040,8 @@ static void add_input_streams(OptionsContext *o, AVFormatContext *ic)
> }
>
> if (st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO) {
> + add_display_matrix_to_stream(o, ic, st);
> +
> MATCH_PER_STREAM_OPT(hwaccels, str, hwaccel, ic, st);
> MATCH_PER_STREAM_OPT(hwaccel_output_formats, str,
> hwaccel_output_format, ic, st);
> @@ -1865,6 +1965,8 @@ static OutputStream *new_video_stream(OptionsContext *o, AVFormatContext *oc, in
> ost->frame_aspect_ratio = q;
> }
>
> + add_display_matrix_to_stream(o, oc, st);
> +
> MATCH_PER_STREAM_OPT(filter_scripts, str, ost->filters_script, oc, st);
> MATCH_PER_STREAM_OPT(filters, str, ost->filters, oc, st);
>
> @@ -3992,6 +4094,11 @@ const OptionDef options[] = {
> { "aspect", OPT_VIDEO | HAS_ARG | OPT_STRING | OPT_SPEC |
> OPT_OUTPUT, { .off = OFFSET(frame_aspect_ratios) },
> "set aspect ratio (4:3, 16:9 or 1.3333, 1.7777)", "aspect" },
> + { "display_matrix", OPT_VIDEO | HAS_ARG | OPT_DICT | OPT_SPEC |
> + OPT_INPUT, { .off = OFFSET(display_matrixes) },
> + "define a display matrix with rotation and/or horizontal/vertical "
> + "flip for stream(s)",
> + "arguments", &class_display_matrix_args },
> { "pix_fmt", OPT_VIDEO | HAS_ARG | OPT_EXPERT | OPT_STRING | OPT_SPEC |
> OPT_INPUT | OPT_OUTPUT, { .off = OFFSET(frame_pix_fmts) },
> "set pixel format", "format" },
> diff --git a/tests/fate/filter-video.mak b/tests/fate/filter-video.mak
> index 372c70bba7..763390ea51 100644
> --- a/tests/fate/filter-video.mak
> +++ b/tests/fate/filter-video.mak
> @@ -691,7 +691,7 @@ fate-filter-metadata-avf-aphase-meter-out-of-phase: SRC = $(TARGET_SAMPLES)/filt
> fate-filter-metadata-avf-aphase-meter-out-of-phase: CMD = run $(FILTER_METADATA_COMMAND) "amovie='$(SRC)',aphasemeter=video=0"
>
> FATE_FILTER_SAMPLES-$(call TRANSCODE, RAWVIDEO H264, MOV, ARESAMPLE_FILTER AAC_FIXED_DECODER) += fate-filter-meta-4560-rotate0
> -fate-filter-meta-4560-rotate0: CMD = transcode mov $(TARGET_SAMPLES)/filter/sample-in-issue-505.mov mov "-c copy -metadata:s:v:0 rotate=0" "-af aresample" "" "" "-flags +bitexact -c:a aac_fixed"
> +fate-filter-meta-4560-rotate0: CMD = transcode "mov -display_matrix:v:0 rotation=0" $(TARGET_SAMPLES)/filter/sample-in-issue-505.mov mov "-c copy" "-af aresample" "" "" "-flags +bitexact -c:a aac_fixed"
>
> FATE_FILTER_CMP_METADATA-$(CONFIG_BLOCKDETECT_FILTER) += fate-filter-refcmp-blockdetect-yuv
> fate-filter-refcmp-blockdetect-yuv: CMD = cmp_metadata blockdetect yuv420p 0.015
_______________________________________________
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".
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [FFmpeg-devel] [PATCH 4/5] ffmpeg: Allow printing of option arguments in help output
2022-08-16 13:30 ` [FFmpeg-devel] [PATCH 4/5] ffmpeg: Allow printing of option arguments in help output Thilo Borgmann
@ 2022-08-16 15:34 ` Andreas Rheinhardt
0 siblings, 0 replies; 11+ messages in thread
From: Andreas Rheinhardt @ 2022-08-16 15:34 UTC (permalink / raw)
To: ffmpeg-devel
Thilo Borgmann:
> ---
> fftools/cmdutils.c | 5 +++++
> libavutil/opt.c | 14 +++++++++++++-
> libavutil/opt.h | 8 ++++++++
> 3 files changed, 26 insertions(+), 1 deletion(-)
>
> diff --git a/fftools/cmdutils.c b/fftools/cmdutils.c
> index 22ba654bb0..dae018f83a 100644
> --- a/fftools/cmdutils.c
> +++ b/fftools/cmdutils.c
> @@ -172,6 +172,11 @@ void show_help_options(const OptionDef *options, const char *msg, int req_flags,
> av_strlcat(buf, po->argname, sizeof(buf));
> }
> printf("-%-17s %s\n", buf, po->help);
> +
> + if (po->args) {
> + const AVClass *p = po->args;
> + av_arg_show(&p, NULL);
> + }
> }
> printf("\n");
> }
> diff --git a/libavutil/opt.c b/libavutil/opt.c
> index a3940f47fb..89ef111690 100644
> --- a/libavutil/opt.c
> +++ b/libavutil/opt.c
> @@ -1256,7 +1256,7 @@ static void opt_list(void *obj, void *av_log_obj, const char *unit,
> av_log(av_log_obj, AV_LOG_INFO, " %-15s ", opt->name);
> else
> av_log(av_log_obj, AV_LOG_INFO, " %s%-17s ",
> - (opt->flags & AV_OPT_FLAG_FILTERING_PARAM) ? " " : "-",
> + (opt->flags & (AV_OPT_FLAG_FILTERING_PARAM | AV_OPT_FLAG_ARGUMENT)) ? " " : "-",
> opt->name);
>
> switch (opt->type) {
> @@ -1329,6 +1329,7 @@ FF_ENABLE_DEPRECATION_WARNINGS
> av_log(av_log_obj, AV_LOG_INFO, "%-12s ", "");
> break;
> }
> + if (!(opt->flags & AV_OPT_FLAG_ARGUMENT)) {
> av_log(av_log_obj, AV_LOG_INFO, "%c%c%c%c%c%c%c%c%c%c%c",
> (opt->flags & AV_OPT_FLAG_ENCODING_PARAM) ? 'E' : '.',
> (opt->flags & AV_OPT_FLAG_DECODING_PARAM) ? 'D' : '.',
> @@ -1341,6 +1342,7 @@ FF_ENABLE_DEPRECATION_WARNINGS
> (opt->flags & AV_OPT_FLAG_BSF_PARAM) ? 'B' : '.',
> (opt->flags & AV_OPT_FLAG_RUNTIME_PARAM) ? 'T' : '.',
> (opt->flags & AV_OPT_FLAG_DEPRECATED) ? 'P' : '.');
> + }
>
> if (opt->help)
> av_log(av_log_obj, AV_LOG_INFO, " %s", opt->help);
> @@ -1456,6 +1458,16 @@ int av_opt_show2(void *obj, void *av_log_obj, int req_flags, int rej_flags)
> return 0;
> }
>
> +int av_arg_show(void *obj, void *av_log_obj)
> +{
> + if (!obj)
> + return -1;
> +
> + opt_list(obj, av_log_obj, NULL, AV_OPT_FLAG_ARGUMENT, 0, -1);
> +
> + return 0;
> +}
> +
> void av_opt_set_defaults(void *s)
> {
> av_opt_set_defaults2(s, 0, 0);
> diff --git a/libavutil/opt.h b/libavutil/opt.h
> index 461b5d3b6b..dce3483237 100644
> --- a/libavutil/opt.h
> +++ b/libavutil/opt.h
> @@ -297,6 +297,7 @@ typedef struct AVOption {
> #define AV_OPT_FLAG_FILTERING_PARAM (1<<16) ///< a generic parameter which can be set by the user for filtering
> #define AV_OPT_FLAG_DEPRECATED (1<<17) ///< set if option is deprecated, users should refer to AVOption.help text for more information
> #define AV_OPT_FLAG_CHILD_CONSTS (1<<18) ///< set if option constants can also reside in child objects
> +#define AV_OPT_FLAG_ARGUMENT (1<<19) ///< set if option is an argument to another option
> //FIXME think about enc-audio, ... style flags
>
> /**
> @@ -386,6 +387,13 @@ typedef struct AVOptionRanges {
> */
> int av_opt_show2(void *obj, void *av_log_obj, int req_flags, int rej_flags);
>
> +/**
> + * Show the obj arguments.
> + *
> + * @param av_log_obj log context to use for showing the options
> + */
> +int av_arg_show(void *obj, void *av_log_obj);
> +
> /**
> * Set the values of all AVOption fields to their default values.
> *
1. Changes to the tools and the libraries should be in separate patches.
E.g. judging by the commit message one would not think that this would
change libavutil by adding a public function; but it does!
2. I don't really get what the documentation of AV_OPT_FLAG_ARGUMENT
means. It seems to be some magic parameter which allows one to
request/reject AVOptions in av_opt_show2().
3. av_arg_show(obj, av_log_obj) is equivalent to av_opt_show2(obj,
av_log_obj, AV_OPT_FLAG_ARGUMENT, 0).
- Andreas
_______________________________________________
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".
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [FFmpeg-devel] [PATCH 5/5] ffmpeg: Add {h, v}scale argument to display_matrix option to allow for scaling via the display matrix
2022-08-16 13:30 ` [FFmpeg-devel] [PATCH 5/5] ffmpeg: Add {h, v}scale argument to display_matrix option to allow for scaling via the display matrix Thilo Borgmann
2022-08-16 13:43 ` Thilo Borgmann
@ 2022-08-16 17:26 ` Andreas Rheinhardt
1 sibling, 0 replies; 11+ messages in thread
From: Andreas Rheinhardt @ 2022-08-16 17:26 UTC (permalink / raw)
To: ffmpeg-devel
Thilo Borgmann:
> ---
> doc/ffmpeg.texi | 4 ++++
> fftools/ffmpeg_filter.c | 15 +++++++++++++++
> fftools/ffmpeg_opt.c | 10 ++++++++++
> libavutil/display.c | 21 +++++++++++++++++++++
> libavutil/display.h | 28 ++++++++++++++++++++++++++++
> 5 files changed, 78 insertions(+)
>
> diff --git a/doc/ffmpeg.texi b/doc/ffmpeg.texi
> index 5d3e3b3052..52cca7a407 100644
> --- a/doc/ffmpeg.texi
> +++ b/doc/ffmpeg.texi
> @@ -923,6 +923,10 @@ The @code{-autorotate} logic will be affected.
> @item hflip=@var{[0,1]}
> @item vflip=@var{[0,1]}
> Set a horizontal or vertical flip.
> +@item hscale=@var{[0,2]}
> +Set a horizontal scaling by factor of the given floating-point value.
> +@item vscale=@var{[0,2]}
> +Set a vertical scaling by factor of the given floating-point value.
> @end table
>
> @item -vn (@emph{input/output})
> diff --git a/fftools/ffmpeg_filter.c b/fftools/ffmpeg_filter.c
> index f9ae76f76d..0759c08687 100644
> --- a/fftools/ffmpeg_filter.c
> +++ b/fftools/ffmpeg_filter.c
> @@ -778,9 +778,24 @@ static int configure_input_video_filter(FilterGraph *fg, InputFilter *ifilter,
> if (ist->autorotate && !(desc->flags & AV_PIX_FMT_FLAG_HWACCEL)) {
> int32_t *displaymatrix = ifilter->displaymatrix;
> double theta;
> + double hscale = 1.0f;
> + double vscale = 1.0f;
>
> if (!displaymatrix)
> displaymatrix = (int32_t *)av_stream_get_side_data(ist->st, AV_PKT_DATA_DISPLAYMATRIX, NULL);
> +
> + if (displaymatrix) {
> + hscale = av_display_hscale_get(displaymatrix);
> + vscale = av_display_vscale_get(displaymatrix);
> +
> + if (hscale != 1.0f || vscale != 1.0f) {
> + char scale_buf[128];
> + snprintf(scale_buf, sizeof(scale_buf), "%f*iw:%f*ih", hscale, vscale);
> + ret = insert_filter(&last_filter, &pad_idx, "scale", scale_buf);
> + }
> + }
> +
> +
> theta = get_rotation(displaymatrix);
>
> if (fabs(theta - 90) < 1.0) {
> diff --git a/fftools/ffmpeg_opt.c b/fftools/ffmpeg_opt.c
> index f6551621c3..4fae6cbfbf 100644
> --- a/fftools/ffmpeg_opt.c
> +++ b/fftools/ffmpeg_opt.c
> @@ -121,6 +121,8 @@ static const char *const opt_name_bits_per_raw_sample[] = {"bits_per_raw_s
> double rotation;
> int hflip;
> int vflip;
> + double hscale;
> + double vscale;
> };
> #define OFFSET(x) offsetof(struct display_matrix_s, x)
> static const AVOption display_matrix_args[] = {
> @@ -130,6 +132,10 @@ static const char *const opt_name_bits_per_raw_sample[] = {"bits_per_raw_s
> { .i64 = -1 }, 0, 1, AV_OPT_FLAG_ARGUMENT},
> { "vflip", "set vflip", OFFSET(vflip), AV_OPT_TYPE_BOOL,
> { .i64 = -1 }, 0, 1, AV_OPT_FLAG_ARGUMENT},
> + { "hscale", "set scale factor", OFFSET(hscale), AV_OPT_TYPE_DOUBLE,
> + { .dbl = 1.0f }, 0.0f, 2.0f, AV_OPT_FLAG_ARGUMENT},
> + { "vscale", "set scale factor", OFFSET(vscale), AV_OPT_TYPE_DOUBLE,
> + { .dbl = 1.0f }, 0.0f, 2.0f, AV_OPT_FLAG_ARGUMENT},
> { NULL },
> };
> static const AVClass class_display_matrix_args = {
> @@ -848,6 +854,8 @@ static void add_display_matrix_to_stream(OptionsContext *o,
> .rotation = DBL_MAX,
> .hflip = -1,
> .vflip = -1,
> + .hscale = 1.0f,
> + .vscale = 1.0f,
> };
>
> AVDictionary *global_args = NULL;
> @@ -903,6 +911,8 @@ static void add_display_matrix_to_stream(OptionsContext *o,
> av_display_matrix_flip((int32_t *)buf,
> hflip_set ? test_args.hflip : 0,
> vflip_set ? test_args.vflip : 0);
> +
> + av_display_matrix_scale((int32_t *)buf, test_args.hscale, test_args.vscale);
> }
>
>
> diff --git a/libavutil/display.c b/libavutil/display.c
> index d31061283c..b89763ff48 100644
> --- a/libavutil/display.c
> +++ b/libavutil/display.c
> @@ -28,9 +28,11 @@
>
> // fixed point to double
> #define CONV_FP(x) ((double) (x)) / (1 << 16)
> +#define CONV_FP2(x) ((double) (x)) / (1 << 30)
>
> // double to fixed point
> #define CONV_DB(x) (int32_t) ((x) * (1 << 16))
> +#define CONV_DB2(x) (int32_t) ((x) * (1 << 30))
>
> double av_display_rotation_get(const int32_t matrix[9])
> {
> @@ -48,6 +50,17 @@ double av_display_rotation_get(const int32_t matrix[9])
> return -rotation;
> }
>
> +double av_display_hscale_get(const int32_t matrix[9])
> +{
> + return fabs(CONV_FP2(matrix[2]));
> +}
> +
> +double av_display_vscale_get(const int32_t matrix[9])
> +{
> + return fabs(CONV_FP2(matrix[5]));
> +}
> +
> +#include <stdio.h>
> void av_display_rotation_set(int32_t matrix[9], double angle)
> {
> double radians = -angle * M_PI / 180.0f;
> @@ -60,6 +73,8 @@ void av_display_rotation_set(int32_t matrix[9], double angle)
> matrix[1] = CONV_DB(-s);
> matrix[3] = CONV_DB(s);
> matrix[4] = CONV_DB(c);
> + matrix[2] = 1 << 30;
> + matrix[5] = 1 << 30;
?
> matrix[8] = 1 << 30;
> }
>
> @@ -72,3 +87,9 @@ void av_display_matrix_flip(int32_t matrix[9], int hflip, int vflip)
> for (i = 0; i < 9; i++)
> matrix[i] *= flip[i % 3];
> }
> +
> +void av_display_matrix_scale(int32_t matrix[9], double hscale, double vscale)
> +{
> + matrix[2] = CONV_DB2(CONV_FP2(matrix[2]) * hscale);
> + matrix[5] = CONV_DB2(CONV_FP2(matrix[5]) * vscale);
matrix[2] and matrix[5] correspond to u and v in the matrix in
display.h. These values need to be zero or you don't have an affine, but
a projective transformation.
> +}
> diff --git a/libavutil/display.h b/libavutil/display.h
> index 31d8bef361..b875e1cfdd 100644
> --- a/libavutil/display.h
> +++ b/libavutil/display.h
> @@ -86,6 +86,26 @@
> */
> double av_display_rotation_get(const int32_t matrix[9]);
>
> +/**
> + * Extract the horizontal scaling component of the transformation matrix.
> + *
> + * @param matrix the transformation matrix
> + * @return the horizontal scaling by which the transformation matrix scales the frame
> + * in the horizontal direction. The scaling factor will be in the range
> + * [0.0, 2.0].
> + */
> +double av_display_hscale_get(const int32_t matrix[9]);
> +
> +/**
> + * Extract the vertical scaling component of the transformation matrix.
> + *
> + * @param matrix the transformation matrix
> + * @return the vertical scaling by which the transformation matrix scales the frame
> + * in the vertical direction. The scaling factor will be in the range
> + * [0.0, 2.0].
> + */
> +double av_display_vscale_get(const int32_t matrix[9]);
> +
> /**
> * Initialize a transformation matrix describing a pure clockwise
> * rotation by the specified angle (in degrees).
> @@ -105,6 +125,14 @@ void av_display_rotation_set(int32_t matrix[9], double angle);
> */
> void av_display_matrix_flip(int32_t matrix[9], int hflip, int vflip);
>
> +/**
> + * Scale the input matrix horizontally and/or vertically.
> + *
> + * @param matrix an allocated transformation matrix
> + * @param hscale whether the matrix should be scaled horizontally
> + * @param vscale whether the matrix should be scaled vertically
> + */
> +void av_display_matrix_scale(int32_t matrix[9], double hscale, double vscale);
> /**
> * @}
> * @}
1. Once again: Separate lavu patches from fftools patches.
2. What makes you believe that every matrix has something like a
horizontal scaling factor? What about rotations by 90°?
3. What makes you believe that 2 and 5 are the right elements? They are
not. These elements must be zero or you have a projective
transformation. If you made an off-by-one error and thought 1 and 4
(i.e. b and d in the notation of display.h), it is still wrong, as
scaling in one direction needs to scale two matrix elements.
4. Even if one restricts oneself to simple diagonal matrices (i.e. b = c
= u = v = 0), your formulae for av_display_[hv]scale_get are wrong,
because they use the wrong matrix elements and because you completely
ignore w, i.e. matrix[8]. And of course the scaling range can be much
greater than just [0, 2].
5. Finally, missing APIchanges and version entry stuff.
- Andreas
_______________________________________________
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".
^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2022-08-16 17:27 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-08-16 13:30 [FFmpeg-devel] [PATCH 1/5] fftools: Add support for dictionary options Thilo Borgmann
2022-08-16 13:30 ` [FFmpeg-devel] [PATCH 2/5] ffmpeg: Add display_matrix option Thilo Borgmann
2022-08-16 14:53 ` Andreas Rheinhardt
2022-08-16 15:29 ` Andreas Rheinhardt
2022-08-16 13:30 ` [FFmpeg-devel] [PATCH 3/5] ffmpeg: Deprecate display rotation override with a metadata key Thilo Borgmann
2022-08-16 13:30 ` [FFmpeg-devel] [PATCH 4/5] ffmpeg: Allow printing of option arguments in help output Thilo Borgmann
2022-08-16 15:34 ` Andreas Rheinhardt
2022-08-16 13:30 ` [FFmpeg-devel] [PATCH 5/5] ffmpeg: Add {h, v}scale argument to display_matrix option to allow for scaling via the display matrix Thilo Borgmann
2022-08-16 13:43 ` Thilo Borgmann
2022-08-16 17:26 ` Andreas Rheinhardt
2022-08-16 14:31 ` [FFmpeg-devel] [PATCH 1/5] fftools: Add support for dictionary options Andreas Rheinhardt
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