vf_curves: add option to set all curves at once

Michael Niedermayer committed 13 years ago

Commit 9280fc71 parent 81c1ed72 files · +17 −1Browse files

Unified · Split

2 files

doc/filters.texi +5 −0
libavfilter/vf_curves.c +12 −1

@@ -2385,6 +2385,11 @@ Set the key points for the red component. · 2384 unmodified lines
2385	Set the key points for the green component.	2385	Set the key points for the green component.
2386	@item blue, b	2386	@item blue, b
2387	Set the key points for the blue component.	2387	Set the key points for the blue component.
		2388	@item all
		2389	Set the key points for all components.
		2390	Can be used in addition to the other key points component
		2391	options. In this case, the unset component(s) will fallback on this
		2392	@option{all} setting.
2388	@item preset	2393	@item preset
2389	Select one of the available color presets. This option can not be used in	2394	Select one of the available color presets. This option can not be used in
2390	addition to the @option{r}, @option{g}, @option{b} parameters.	2395	addition to the @option{r}, @option{g}, @option{b} parameters.

libavfilter/vf_curves.c+12−1

     const AVClass *class;
     enum preset preset;
     char *comp_points_str[NB_COMP];
+    char *comp_points_str_all;
     uint8_t graph[NB_COMP][256];
 } CurvesContext;
     { "g",     "set green points coordinates", OFFSET(comp_points_str[1]), AV_OPT_TYPE_STRING, {.str=NULL}, .flags = FLAGS },
     { "blue",  "set blue points coordinates",  OFFSET(comp_points_str[2]), AV_OPT_TYPE_STRING, {.str=NULL}, .flags = FLAGS },
     { "b",     "set blue points coordinates",  OFFSET(comp_points_str[2]), AV_OPT_TYPE_STRING, {.str=NULL}, .flags = FLAGS },
+    { "all",   "set points coordinates for all components",   OFFSET(comp_points_str_all),AV_OPT_TYPE_STRING, {.str=NULL}, .flags = FLAGS },
     { "preset", "select a color curves preset", OFFSET(preset), AV_OPT_TYPE_INT, {.i64=PRESET_NONE}, PRESET_NONE, NB_PRESETS-1, FLAGS, "preset_name" },
         { "color_negative",     NULL, 0, AV_OPT_TYPE_CONST, {.i64=PRESET_COLOR_NEGATIVE},       INT_MIN, INT_MAX, FLAGS, "preset_name" },
         { "cross_process",      NULL, 0, AV_OPT_TYPE_CONST, {.i64=PRESET_CROSS_PROCESS},        INT_MIN, INT_MAX, FLAGS, "preset_name" },
     int i, j, ret;
     CurvesContext *curves = ctx->priv;
     struct keypoint *comp_points[NB_COMP] = {0};
+    char **pts = curves->comp_points_str;
+    if (curves->comp_points_str_all) {
+        for (i = 0; i < NB_COMP; i++) {
+            if (!pts[i])
+                pts[i] = av_strdup(curves->comp_points_str_all);
+            if (!pts[i])
+                return AVERROR(ENOMEM);
+        }
+    }
     if (curves->preset != PRESET_NONE) {
-        char **pts = curves->comp_points_str;
         if (pts[0] || pts[1] || pts[2]) {
             av_log(ctx, AV_LOG_ERROR, "It is not possible to mix a preset "
                    "with explicit points placements\n");

vf_curves: add option to set all curves at once

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code