From 9280fc7da1fcb09f6466a925e0d4f95618ea9db3 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Tue, 9 Apr 2013 23:04:24 +0200 Subject: vf_curves: add option to set all curves at once Reviewed-by: ubitux Signed-off-by: Michael Niedermayer --- libavfilter/vf_curves.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'libavfilter/vf_curves.c') diff --git a/libavfilter/vf_curves.c b/libavfilter/vf_curves.c index 360dc72c44..1f4e733c3d 100644 --- a/libavfilter/vf_curves.c +++ b/libavfilter/vf_curves.c @@ -52,6 +52,7 @@ typedef struct { const AVClass *class; enum preset preset; char *comp_points_str[NB_COMP]; + char *comp_points_str_all; uint8_t graph[NB_COMP][256]; } CurvesContext; @@ -64,6 +65,7 @@ static const AVOption curves_options[] = { { "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" }, @@ -318,9 +320,18 @@ static av_cold int init(AVFilterContext *ctx, const char *args) 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"); -- cgit v1.2.3