History

avfilter/vf_lut3d: lut3d, haldclut: add support for commands

Paul B Mahol committed 5 years ago

Commit 89f78dd1 parent 5f592132 files · +28 −6Browse files

Unified · Split

2 files
  1. doc/filters.texi +8 −0
  2. libavfilter/vf_lut3d.c +20 −6
doc/filters.texi+8−0
@@ -12814,6 +12814,10 @@ This filter also supports the @ref{framesync} options. · 12813 unmodified lines
1281412814 More information about the Hald CLUT can be found on Eskil Steenberg's website
1281512815 (Hald CLUT author) at @url{http://www.quelsolaar.com/technology/clut.html}.
1281612816
12817+@subsection Commands
12818+
12819+This filter supports the @code{interp} option as @ref{commands}.
12820+
1281712821 @subsection Workflow examples
1281812822
1281912823 @subsubsection Hald CLUT video stream
@@ -13992,6 +13996,10 @@ Interpolate values using a prism. · 1172 unmodified lines
1399213996 @end table
1399313997 @end table
1399413998
13999+@subsection Commands
14000+
14001+This filter supports the @code{interp} option as @ref{commands}.
14002+
1399514003 @section lumakey
1399614004
1399714005 Turn certain luma values into transparency.
libavfilter/vf_lut3d.c+20−6
@@ -102,12 +102,12 @@ typedef struct ThreadData { · 101 unmodified lines
102102 #define FLAGS AV_OPT_FLAG_FILTERING_PARAM|AV_OPT_FLAG_VIDEO_PARAM
103103 #define TFLAGS AV_OPT_FLAG_FILTERING_PARAM|AV_OPT_FLAG_VIDEO_PARAM|AV_OPT_FLAG_RUNTIME_PARAM
104104 #define COMMON_OPTIONS \
105− { "interp", "select interpolation mode", OFFSET(interpolation), AV_OPT_TYPE_INT, {.i64=INTERPOLATE_TETRAHEDRAL}, 0, NB_INTERP_MODE-1, FLAGS, "interp_mode" }, \
106− { "nearest", "use values from the nearest defined points", 0, AV_OPT_TYPE_CONST, {.i64=INTERPOLATE_NEAREST}, INT_MIN, INT_MAX, FLAGS, "interp_mode" }, \
107− { "trilinear", "interpolate values using the 8 points defining a cube", 0, AV_OPT_TYPE_CONST, {.i64=INTERPOLATE_TRILINEAR}, INT_MIN, INT_MAX, FLAGS, "interp_mode" }, \
108− { "tetrahedral", "interpolate values using a tetrahedron", 0, AV_OPT_TYPE_CONST, {.i64=INTERPOLATE_TETRAHEDRAL}, INT_MIN, INT_MAX, FLAGS, "interp_mode" }, \
109− { "pyramid", "interpolate values using a pyramid", 0, AV_OPT_TYPE_CONST, {.i64=INTERPOLATE_PYRAMID}, INT_MIN, INT_MAX, FLAGS, "interp_mode" }, \
110− { "prism", "interpolate values using a prism", 0, AV_OPT_TYPE_CONST, {.i64=INTERPOLATE_PRISM}, INT_MIN, INT_MAX, FLAGS, "interp_mode" }, \
105+ { "interp", "select interpolation mode", OFFSET(interpolation), AV_OPT_TYPE_INT, {.i64=INTERPOLATE_TETRAHEDRAL}, 0, NB_INTERP_MODE-1, TFLAGS, "interp_mode" }, \
106+ { "nearest", "use values from the nearest defined points", 0, AV_OPT_TYPE_CONST, {.i64=INTERPOLATE_NEAREST}, 0, 0, TFLAGS, "interp_mode" }, \
107+ { "trilinear", "interpolate values using the 8 points defining a cube", 0, AV_OPT_TYPE_CONST, {.i64=INTERPOLATE_TRILINEAR}, 0, 0, TFLAGS, "interp_mode" }, \
108+ { "tetrahedral", "interpolate values using a tetrahedron", 0, AV_OPT_TYPE_CONST, {.i64=INTERPOLATE_TETRAHEDRAL}, 0, 0, TFLAGS, "interp_mode" }, \
109+ { "pyramid", "interpolate values using a pyramid", 0, AV_OPT_TYPE_CONST, {.i64=INTERPOLATE_PYRAMID}, 0, 0, TFLAGS, "interp_mode" }, \
110+ { "prism", "interpolate values using a prism", 0, AV_OPT_TYPE_CONST, {.i64=INTERPOLATE_PRISM}, 0, 0, TFLAGS, "interp_mode" }, \
111111 { NULL }
112112
113113 #define EXPONENT_MASK 0x7F800000
@@ -1251,6 +1251,18 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) · 1137 unmodified lines
12511251 return ff_filter_frame(outlink, out);
12521252 }
12531253
1254+static int process_command(AVFilterContext *ctx, const char *cmd, const char *args,
1255+ char *res, int res_len, int flags)
1256+{
1257+ int ret;
1258+
1259+ ret = ff_filter_process_command(ctx, cmd, args, res, res_len, flags);
1260+ if (ret < 0)
1261+ return ret;
1262+
1263+ return config_input(ctx->inputs[0]);
1264+}
1265+
12541266 #if CONFIG_LUT3D_FILTER
12551267 static const AVOption lut3d_options[] = {
12561268 { "file", "set 3D LUT file name", OFFSET(file), AV_OPT_TYPE_STRING, {.str=NULL}, .flags = FLAGS },
@@ -1352,6 +1364,7 @@ AVFilter ff_vf_lut3d = { · 95 unmodified lines
13521364 .outputs = lut3d_outputs,
13531365 .priv_class = &lut3d_class,
13541366 .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS,
1367+ .process_command = process_command,
13551368 };
13561369 #endif
13571370
@@ -1620,6 +1633,7 @@ AVFilter ff_vf_haldclut = { · 262 unmodified lines
16201633 .outputs = haldclut_outputs,
16211634 .priv_class = &haldclut_class,
16221635 .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL | AVFILTER_FLAG_SLICE_THREADS,
1636+ .process_command = process_command,
16231637 };
16241638 #endif
16251639

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t