avfilter/vf_blend: add few more modes

Paul B Mahol committed 5 years ago

Commit a6737611 parent 1ad47824 files · +24 −4Browse files

Unified · Split

4 files

doc/filters.texi +7 −3
libavfilter/blend.h +4 −0
libavfilter/blend_modes.c +4 −0
libavfilter/vf_blend.c +9 −1

@@ -7531,24 +7531,27 @@ of @var{all_mode}. Default value is @code{normal}. · 7530 unmodified lines
7531	7531	Available values for component modes are:
7532	7532	@table @samp
7533	7533	@item addition
7534		−@item grainmerge
7535	7534	@item and
7536	7535	@item average
	7536	+@item bleach
7537	7537	@item burn
7538	7538	@item darken
7539	7539	@item difference
7540		−@item grainextract
7541	7540	@item divide
7542	7541	@item dodge
7543		−@item freeze
7544	7542	@item exclusion
7545	7543	@item extremity
	7544	+@item freeze
7546	7545	@item geometric
7547	7546	@item glow
	7547	+@item grainextract
	7548	+@item grainmerge
7548	7549	@item hardlight
7549	7550	@item hardmix
	7551	+@item hardoverlay
7550	7552	@item harmonic
7551	7553	@item heat
	7554	+@item interpolate
7552	7555	@item lighten
7553	7556	@item linearlight
7554	7557	@item multiply
@@ -7563,6 +7566,7 @@ Available values for component modes are: · 8 unmodified lines
7563	7566	@item screen
7564	7567	@item softdifference
7565	7568	@item softlight
	7569	+@item stain
7566	7570	@item subtract
7567	7571	@item vividlight
7568	7572	@item xor

libavfilter/blend.h+4−0

@@ -62,6 +62,10 @@ enum BlendMode { · 61 unmodified lines
62	62	BLEND_SOFTDIFFERENCE,
63	63	BLEND_GEOMETRIC,
64	64	BLEND_HARMONIC,
	65	+ BLEND_BLEACH,
	66	+ BLEND_STAIN,
	67	+ BLEND_INTERPOLATE,
	68	+ BLEND_HARDOVERLAY,
65	69	BLEND_NB
66	70	};
67	71

libavfilter/blend_modes.c+4−0

@@ -145,3 +145,7 @@ fn(linearlight,CLIP((B < HALF) ? B + 2 * A - MAX : B + 2 * (A - HALF))) · 144 unmodified lines
145	145	fn(softdifference,CLIP((A > B) ? (B == MAX) ? 0 : (A - B) * MAX / (MAX - B) : (B == 0) ? 0 : (B - A) * MAX / B))
146	146	fn(geometric, GEOMETRIC(A, B))
147	147	fn(harmonic, A == 0 && B == 0 ? 0 : 2LL * A * B / (A + B))
	148	+fn(bleach, (MAX - B) + (MAX - A) - MAX)
	149	+fn(stain, 2 * MAX - A - B)
	150	+fn(interpolate,lrintf(MAX * (2 - cosf(A * M_PI / MAX) - cosf(B * M_PI / MAX)) * 0.25f))
	151	+fn(hardoverlay,A == MAX ? MAX : FFMIN(MAX, MAX * B / (2 * MAX - 2 * A) * (A > HALF) + 2 * A * B / MAX * (A <= HALF)))

libavfilter/vf_blend.c+9−1

@@ -134,6 +134,10 @@ static const AVOption blend_options[] = { · 133 unmodified lines
134	134	{ "softdifference","", 0, AV_OPT_TYPE_CONST, {.i64=BLEND_SOFTDIFFERENCE}, 0, 0, FLAGS, "mode" },
135	135	{ "geometric", "", 0, AV_OPT_TYPE_CONST, {.i64=BLEND_GEOMETRIC}, 0, 0, FLAGS, "mode" },
136	136	{ "harmonic", "", 0, AV_OPT_TYPE_CONST, {.i64=BLEND_HARMONIC}, 0, 0, FLAGS, "mode" },
	137	+ { "bleach", "", 0, AV_OPT_TYPE_CONST, {.i64=BLEND_BLEACH}, 0, 0, FLAGS, "mode" },
	138	+ { "stain", "", 0, AV_OPT_TYPE_CONST, {.i64=BLEND_STAIN}, 0, 0, FLAGS, "mode" },
	139	+ { "interpolate","", 0, AV_OPT_TYPE_CONST, {.i64=BLEND_INTERPOLATE},0, 0, FLAGS, "mode" },
	140	+ { "hardoverlay","", 0, AV_OPT_TYPE_CONST, {.i64=BLEND_HARDOVERLAY},0, 0, FLAGS, "mode" },
137	141	{ "c0_expr", "set color component #0 expression", OFFSET(params[0].expr_str), AV_OPT_TYPE_STRING, {.str=NULL}, 0, 0, FLAGS },
138	142	{ "c1_expr", "set color component #1 expression", OFFSET(params[1].expr_str), AV_OPT_TYPE_STRING, {.str=NULL}, 0, 0, FLAGS },
139	143	{ "c2_expr", "set color component #2 expression", OFFSET(params[2].expr_str), AV_OPT_TYPE_STRING, {.str=NULL}, 0, 0, FLAGS },
@@ -397,9 +401,13 @@ static av_cold void init_blend_func_##depth##_##nbits##bit(FilterParams *param) · 257 unmodified lines
397	401	case BLEND_SUBTRACT: param->blend = blend_subtract_##depth##bit; break; \
398	402	case BLEND_VIVIDLIGHT: param->blend = blend_vividlight_##depth##bit; break; \
399	403	case BLEND_XOR: param->blend = blend_xor_##depth##bit; break; \
400		− case BLEND_SOFTDIFFERENCE:param->blend = blend_softdifference_##depth##bit; break;\
	404	+ case BLEND_SOFTDIFFERENCE:param->blend=blend_softdifference_##depth##bit;break; \
401	405	case BLEND_GEOMETRIC: param->blend = blend_geometric_##depth##bit; break; \
402	406	case BLEND_HARMONIC: param->blend = blend_harmonic_##depth##bit; break; \
	407	+ case BLEND_BLEACH: param->blend = blend_bleach_##depth##bit; break; \
	408	+ case BLEND_STAIN: param->blend = blend_stain_##depth##bit; break; \
	409	+ case BLEND_INTERPOLATE: param->blend = blend_interpolate_##depth##bit; break; \
	410	+ case BLEND_HARDOVERLAY: param->blend = blend_hardoverlay_##depth##bit; break; \
403	411	} \
404	412	}
405	413	DEFINE_INIT_BLEND_FUNC(8, 8)

avfilter/vf_blend: add few more modes

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code