X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavfilter%2Fvf_blend.c;h=d12bfffbedf446d320a76fc88dc7235b313c8d23;hb=e5af9203098a889f36b759652615046254d45102;hp=80d3e24699d1720b8c10b1321e39d913105b5c20;hpb=f32d2939555706365ad1d39aadd5ee7ce1d9fa4f;p=ffmpeg diff --git a/libavfilter/vf_blend.c b/libavfilter/vf_blend.c index 80d3e24699d..d12bfffbedf 100644 --- a/libavfilter/vf_blend.c +++ b/libavfilter/vf_blend.c @@ -19,11 +19,11 @@ */ #include "libavutil/imgutils.h" +#include "libavutil/intfloat.h" #include "libavutil/eval.h" #include "libavutil/opt.h" #include "libavutil/pixfmt.h" #include "avfilter.h" -#include "bufferqueue.h" #include "formats.h" #include "framesync.h" #include "internal.h" @@ -60,63 +60,60 @@ typedef struct ThreadData { FilterParams *param; } ThreadData; -#define COMMON_OPTIONS \ - { "c0_mode", "set component #0 blend mode", OFFSET(params[0].mode), AV_OPT_TYPE_INT, {.i64=0}, 0, BLEND_NB-1, FLAGS, "mode"},\ - { "c1_mode", "set component #1 blend mode", OFFSET(params[1].mode), AV_OPT_TYPE_INT, {.i64=0}, 0, BLEND_NB-1, FLAGS, "mode"},\ - { "c2_mode", "set component #2 blend mode", OFFSET(params[2].mode), AV_OPT_TYPE_INT, {.i64=0}, 0, BLEND_NB-1, FLAGS, "mode"},\ - { "c3_mode", "set component #3 blend mode", OFFSET(params[3].mode), AV_OPT_TYPE_INT, {.i64=0}, 0, BLEND_NB-1, FLAGS, "mode"},\ - { "all_mode", "set blend mode for all components", OFFSET(all_mode), AV_OPT_TYPE_INT, {.i64=-1},-1, BLEND_NB-1, FLAGS, "mode"},\ - { "addition", "", 0, AV_OPT_TYPE_CONST, {.i64=BLEND_ADDITION}, 0, 0, FLAGS, "mode" },\ - { "addition128","", 0, AV_OPT_TYPE_CONST, {.i64=BLEND_GRAINMERGE}, 0, 0, FLAGS, "mode" },\ - { "grainmerge", "", 0, AV_OPT_TYPE_CONST, {.i64=BLEND_GRAINMERGE}, 0, 0, FLAGS, "mode" },\ - { "and", "", 0, AV_OPT_TYPE_CONST, {.i64=BLEND_AND}, 0, 0, FLAGS, "mode" },\ - { "average", "", 0, AV_OPT_TYPE_CONST, {.i64=BLEND_AVERAGE}, 0, 0, FLAGS, "mode" },\ - { "burn", "", 0, AV_OPT_TYPE_CONST, {.i64=BLEND_BURN}, 0, 0, FLAGS, "mode" },\ - { "darken", "", 0, AV_OPT_TYPE_CONST, {.i64=BLEND_DARKEN}, 0, 0, FLAGS, "mode" },\ - { "difference", "", 0, AV_OPT_TYPE_CONST, {.i64=BLEND_DIFFERENCE}, 0, 0, FLAGS, "mode" },\ - { "difference128", "", 0, AV_OPT_TYPE_CONST, {.i64=BLEND_GRAINEXTRACT}, 0, 0, FLAGS, "mode" },\ - { "grainextract", "", 0, AV_OPT_TYPE_CONST, {.i64=BLEND_GRAINEXTRACT}, 0, 0, FLAGS, "mode" },\ - { "divide", "", 0, AV_OPT_TYPE_CONST, {.i64=BLEND_DIVIDE}, 0, 0, FLAGS, "mode" },\ - { "dodge", "", 0, AV_OPT_TYPE_CONST, {.i64=BLEND_DODGE}, 0, 0, FLAGS, "mode" },\ - { "exclusion", "", 0, AV_OPT_TYPE_CONST, {.i64=BLEND_EXCLUSION}, 0, 0, FLAGS, "mode" },\ - { "extremity", "", 0, AV_OPT_TYPE_CONST, {.i64=BLEND_EXTREMITY}, 0, 0, FLAGS, "mode" },\ - { "freeze", "", 0, AV_OPT_TYPE_CONST, {.i64=BLEND_FREEZE}, 0, 0, FLAGS, "mode" },\ - { "glow", "", 0, AV_OPT_TYPE_CONST, {.i64=BLEND_GLOW}, 0, 0, FLAGS, "mode" },\ - { "hardlight", "", 0, AV_OPT_TYPE_CONST, {.i64=BLEND_HARDLIGHT}, 0, 0, FLAGS, "mode" },\ - { "hardmix", "", 0, AV_OPT_TYPE_CONST, {.i64=BLEND_HARDMIX}, 0, 0, FLAGS, "mode" },\ - { "heat", "", 0, AV_OPT_TYPE_CONST, {.i64=BLEND_HEAT}, 0, 0, FLAGS, "mode" },\ - { "lighten", "", 0, AV_OPT_TYPE_CONST, {.i64=BLEND_LIGHTEN}, 0, 0, FLAGS, "mode" },\ - { "linearlight","", 0, AV_OPT_TYPE_CONST, {.i64=BLEND_LINEARLIGHT},0, 0, FLAGS, "mode" },\ - { "multiply", "", 0, AV_OPT_TYPE_CONST, {.i64=BLEND_MULTIPLY}, 0, 0, FLAGS, "mode" },\ - { "multiply128","", 0, AV_OPT_TYPE_CONST, {.i64=BLEND_MULTIPLY128},0, 0, FLAGS, "mode" },\ - { "negation", "", 0, AV_OPT_TYPE_CONST, {.i64=BLEND_NEGATION}, 0, 0, FLAGS, "mode" },\ - { "normal", "", 0, AV_OPT_TYPE_CONST, {.i64=BLEND_NORMAL}, 0, 0, FLAGS, "mode" },\ - { "or", "", 0, AV_OPT_TYPE_CONST, {.i64=BLEND_OR}, 0, 0, FLAGS, "mode" },\ - { "overlay", "", 0, AV_OPT_TYPE_CONST, {.i64=BLEND_OVERLAY}, 0, 0, FLAGS, "mode" },\ - { "phoenix", "", 0, AV_OPT_TYPE_CONST, {.i64=BLEND_PHOENIX}, 0, 0, FLAGS, "mode" },\ - { "pinlight", "", 0, AV_OPT_TYPE_CONST, {.i64=BLEND_PINLIGHT}, 0, 0, FLAGS, "mode" },\ - { "reflect", "", 0, AV_OPT_TYPE_CONST, {.i64=BLEND_REFLECT}, 0, 0, FLAGS, "mode" },\ - { "screen", "", 0, AV_OPT_TYPE_CONST, {.i64=BLEND_SCREEN}, 0, 0, FLAGS, "mode" },\ - { "softlight", "", 0, AV_OPT_TYPE_CONST, {.i64=BLEND_SOFTLIGHT}, 0, 0, FLAGS, "mode" },\ - { "subtract", "", 0, AV_OPT_TYPE_CONST, {.i64=BLEND_SUBTRACT}, 0, 0, FLAGS, "mode" },\ - { "vividlight", "", 0, AV_OPT_TYPE_CONST, {.i64=BLEND_VIVIDLIGHT}, 0, 0, FLAGS, "mode" },\ - { "xor", "", 0, AV_OPT_TYPE_CONST, {.i64=BLEND_XOR}, 0, 0, FLAGS, "mode" },\ - { "c0_expr", "set color component #0 expression", OFFSET(params[0].expr_str), AV_OPT_TYPE_STRING, {.str=NULL}, CHAR_MIN, CHAR_MAX, FLAGS },\ - { "c1_expr", "set color component #1 expression", OFFSET(params[1].expr_str), AV_OPT_TYPE_STRING, {.str=NULL}, CHAR_MIN, CHAR_MAX, FLAGS },\ - { "c2_expr", "set color component #2 expression", OFFSET(params[2].expr_str), AV_OPT_TYPE_STRING, {.str=NULL}, CHAR_MIN, CHAR_MAX, FLAGS },\ - { "c3_expr", "set color component #3 expression", OFFSET(params[3].expr_str), AV_OPT_TYPE_STRING, {.str=NULL}, CHAR_MIN, CHAR_MAX, FLAGS },\ - { "all_expr", "set expression for all color components", OFFSET(all_expr), AV_OPT_TYPE_STRING, {.str=NULL}, CHAR_MIN, CHAR_MAX, FLAGS },\ - { "c0_opacity", "set color component #0 opacity", OFFSET(params[0].opacity), AV_OPT_TYPE_DOUBLE, {.dbl=1}, 0, 1, FLAGS },\ - { "c1_opacity", "set color component #1 opacity", OFFSET(params[1].opacity), AV_OPT_TYPE_DOUBLE, {.dbl=1}, 0, 1, FLAGS },\ - { "c2_opacity", "set color component #2 opacity", OFFSET(params[2].opacity), AV_OPT_TYPE_DOUBLE, {.dbl=1}, 0, 1, FLAGS },\ - { "c3_opacity", "set color component #3 opacity", OFFSET(params[3].opacity), AV_OPT_TYPE_DOUBLE, {.dbl=1}, 0, 1, FLAGS },\ - { "all_opacity", "set opacity for all color components", OFFSET(all_opacity), AV_OPT_TYPE_DOUBLE, {.dbl=1}, 0, 1, FLAGS} - #define OFFSET(x) offsetof(BlendContext, x) -#define FLAGS AV_OPT_FLAG_FILTERING_PARAM|AV_OPT_FLAG_VIDEO_PARAM +#define FLAGS AV_OPT_FLAG_FILTERING_PARAM|AV_OPT_FLAG_VIDEO_PARAM|AV_OPT_FLAG_RUNTIME_PARAM static const AVOption blend_options[] = { - COMMON_OPTIONS, + { "c0_mode", "set component #0 blend mode", OFFSET(params[0].mode), AV_OPT_TYPE_INT, {.i64=0}, 0, BLEND_NB-1, FLAGS, "mode" }, + { "c1_mode", "set component #1 blend mode", OFFSET(params[1].mode), AV_OPT_TYPE_INT, {.i64=0}, 0, BLEND_NB-1, FLAGS, "mode" }, + { "c2_mode", "set component #2 blend mode", OFFSET(params[2].mode), AV_OPT_TYPE_INT, {.i64=0}, 0, BLEND_NB-1, FLAGS, "mode" }, + { "c3_mode", "set component #3 blend mode", OFFSET(params[3].mode), AV_OPT_TYPE_INT, {.i64=0}, 0, BLEND_NB-1, FLAGS, "mode" }, + { "all_mode", "set blend mode for all components", OFFSET(all_mode), AV_OPT_TYPE_INT, {.i64=-1},-1, BLEND_NB-1, FLAGS, "mode" }, + { "addition", "", 0, AV_OPT_TYPE_CONST, {.i64=BLEND_ADDITION}, 0, 0, FLAGS, "mode" }, + { "addition128","", 0, AV_OPT_TYPE_CONST, {.i64=BLEND_GRAINMERGE}, 0, 0, FLAGS, "mode" }, + { "grainmerge", "", 0, AV_OPT_TYPE_CONST, {.i64=BLEND_GRAINMERGE}, 0, 0, FLAGS, "mode" }, + { "and", "", 0, AV_OPT_TYPE_CONST, {.i64=BLEND_AND}, 0, 0, FLAGS, "mode" }, + { "average", "", 0, AV_OPT_TYPE_CONST, {.i64=BLEND_AVERAGE}, 0, 0, FLAGS, "mode" }, + { "burn", "", 0, AV_OPT_TYPE_CONST, {.i64=BLEND_BURN}, 0, 0, FLAGS, "mode" }, + { "darken", "", 0, AV_OPT_TYPE_CONST, {.i64=BLEND_DARKEN}, 0, 0, FLAGS, "mode" }, + { "difference", "", 0, AV_OPT_TYPE_CONST, {.i64=BLEND_DIFFERENCE}, 0, 0, FLAGS, "mode" }, + { "difference128", "", 0, AV_OPT_TYPE_CONST, {.i64=BLEND_GRAINEXTRACT}, 0, 0, FLAGS, "mode" }, + { "grainextract", "", 0, AV_OPT_TYPE_CONST, {.i64=BLEND_GRAINEXTRACT}, 0, 0, FLAGS, "mode" }, + { "divide", "", 0, AV_OPT_TYPE_CONST, {.i64=BLEND_DIVIDE}, 0, 0, FLAGS, "mode" }, + { "dodge", "", 0, AV_OPT_TYPE_CONST, {.i64=BLEND_DODGE}, 0, 0, FLAGS, "mode" }, + { "exclusion", "", 0, AV_OPT_TYPE_CONST, {.i64=BLEND_EXCLUSION}, 0, 0, FLAGS, "mode" }, + { "extremity", "", 0, AV_OPT_TYPE_CONST, {.i64=BLEND_EXTREMITY}, 0, 0, FLAGS, "mode" }, + { "freeze", "", 0, AV_OPT_TYPE_CONST, {.i64=BLEND_FREEZE}, 0, 0, FLAGS, "mode" }, + { "glow", "", 0, AV_OPT_TYPE_CONST, {.i64=BLEND_GLOW}, 0, 0, FLAGS, "mode" }, + { "hardlight", "", 0, AV_OPT_TYPE_CONST, {.i64=BLEND_HARDLIGHT}, 0, 0, FLAGS, "mode" }, + { "hardmix", "", 0, AV_OPT_TYPE_CONST, {.i64=BLEND_HARDMIX}, 0, 0, FLAGS, "mode" }, + { "heat", "", 0, AV_OPT_TYPE_CONST, {.i64=BLEND_HEAT}, 0, 0, FLAGS, "mode" }, + { "lighten", "", 0, AV_OPT_TYPE_CONST, {.i64=BLEND_LIGHTEN}, 0, 0, FLAGS, "mode" }, + { "linearlight","", 0, AV_OPT_TYPE_CONST, {.i64=BLEND_LINEARLIGHT},0, 0, FLAGS, "mode" }, + { "multiply", "", 0, AV_OPT_TYPE_CONST, {.i64=BLEND_MULTIPLY}, 0, 0, FLAGS, "mode" }, + { "multiply128","", 0, AV_OPT_TYPE_CONST, {.i64=BLEND_MULTIPLY128},0, 0, FLAGS, "mode" }, + { "negation", "", 0, AV_OPT_TYPE_CONST, {.i64=BLEND_NEGATION}, 0, 0, FLAGS, "mode" }, + { "normal", "", 0, AV_OPT_TYPE_CONST, {.i64=BLEND_NORMAL}, 0, 0, FLAGS, "mode" }, + { "or", "", 0, AV_OPT_TYPE_CONST, {.i64=BLEND_OR}, 0, 0, FLAGS, "mode" }, + { "overlay", "", 0, AV_OPT_TYPE_CONST, {.i64=BLEND_OVERLAY}, 0, 0, FLAGS, "mode" }, + { "phoenix", "", 0, AV_OPT_TYPE_CONST, {.i64=BLEND_PHOENIX}, 0, 0, FLAGS, "mode" }, + { "pinlight", "", 0, AV_OPT_TYPE_CONST, {.i64=BLEND_PINLIGHT}, 0, 0, FLAGS, "mode" }, + { "reflect", "", 0, AV_OPT_TYPE_CONST, {.i64=BLEND_REFLECT}, 0, 0, FLAGS, "mode" }, + { "screen", "", 0, AV_OPT_TYPE_CONST, {.i64=BLEND_SCREEN}, 0, 0, FLAGS, "mode" }, + { "softlight", "", 0, AV_OPT_TYPE_CONST, {.i64=BLEND_SOFTLIGHT}, 0, 0, FLAGS, "mode" }, + { "subtract", "", 0, AV_OPT_TYPE_CONST, {.i64=BLEND_SUBTRACT}, 0, 0, FLAGS, "mode" }, + { "vividlight", "", 0, AV_OPT_TYPE_CONST, {.i64=BLEND_VIVIDLIGHT}, 0, 0, FLAGS, "mode" }, + { "xor", "", 0, AV_OPT_TYPE_CONST, {.i64=BLEND_XOR}, 0, 0, FLAGS, "mode" }, + { "c0_expr", "set color component #0 expression", OFFSET(params[0].expr_str), AV_OPT_TYPE_STRING, {.str=NULL}, 0, 0, FLAGS }, + { "c1_expr", "set color component #1 expression", OFFSET(params[1].expr_str), AV_OPT_TYPE_STRING, {.str=NULL}, 0, 0, FLAGS }, + { "c2_expr", "set color component #2 expression", OFFSET(params[2].expr_str), AV_OPT_TYPE_STRING, {.str=NULL}, 0, 0, FLAGS }, + { "c3_expr", "set color component #3 expression", OFFSET(params[3].expr_str), AV_OPT_TYPE_STRING, {.str=NULL}, 0, 0, FLAGS }, + { "all_expr", "set expression for all color components", OFFSET(all_expr), AV_OPT_TYPE_STRING, {.str=NULL}, 0, 0, FLAGS }, + { "c0_opacity", "set color component #0 opacity", OFFSET(params[0].opacity), AV_OPT_TYPE_DOUBLE, {.dbl=1}, 0, 1, FLAGS }, + { "c1_opacity", "set color component #1 opacity", OFFSET(params[1].opacity), AV_OPT_TYPE_DOUBLE, {.dbl=1}, 0, 1, FLAGS }, + { "c2_opacity", "set color component #2 opacity", OFFSET(params[2].opacity), AV_OPT_TYPE_DOUBLE, {.dbl=1}, 0, 1, FLAGS }, + { "c3_opacity", "set color component #3 opacity", OFFSET(params[3].opacity), AV_OPT_TYPE_DOUBLE, {.dbl=1}, 0, 1, FLAGS }, + { "all_opacity", "set opacity for all color components", OFFSET(all_opacity), AV_OPT_TYPE_DOUBLE, {.dbl=1}, 0, 1, FLAGS }, { NULL } }; @@ -139,6 +136,9 @@ COPY(bottom, 8) COPY(top, 16) COPY(bottom, 16) +COPY(top, 32) +COPY(bottom, 32) + #undef COPY static void blend_normal_8bit(const uint8_t *top, ptrdiff_t top_linesize, @@ -185,6 +185,31 @@ static void blend_normal_16bit(const uint8_t *_top, ptrdiff_t top_linesize, } } +static void blend_normal_32bit(const uint8_t *_top, ptrdiff_t top_linesize, + const uint8_t *_bottom, ptrdiff_t bottom_linesize, + uint8_t *_dst, ptrdiff_t dst_linesize, + ptrdiff_t width, ptrdiff_t height, + FilterParams *param, double *values, int starty) +{ + const float *top = (float*)_top; + const float *bottom = (float*)_bottom; + float *dst = (float*)_dst; + const double opacity = param->opacity; + int i, j; + dst_linesize /= 4; + top_linesize /= 4; + bottom_linesize /= 4; + + for (i = 0; i < height; i++) { + for (j = 0; j < width; j++) { + dst[j] = top[j] * opacity + bottom[j] * (1. - opacity); + } + dst += dst_linesize; + top += top_linesize; + bottom += bottom_linesize; + } +} + #define DEFINE_BLEND8(name, expr) \ static void blend_## name##_8bit(const uint8_t *top, ptrdiff_t top_linesize, \ const uint8_t *bottom, ptrdiff_t bottom_linesize, \ @@ -231,6 +256,32 @@ static void blend_## name##_##depth##bit(const uint8_t *_top, ptrdiff_t top_line } \ } +#define DEFINE_BLEND32(name, expr, depth) \ +static void blend_## name##_##depth##bit(const uint8_t *_top, ptrdiff_t top_linesize,\ + const uint8_t *_bottom, ptrdiff_t bottom_linesize, \ + uint8_t *_dst, ptrdiff_t dst_linesize, \ + ptrdiff_t width, ptrdiff_t height, \ + FilterParams *param, double *values, int starty) \ +{ \ + const float *top = (const float*)_top; \ + const float *bottom = (const float*)_bottom; \ + float *dst = (float*)_dst; \ + double opacity = param->opacity; \ + int i, j; \ + dst_linesize /= 4; \ + top_linesize /= 4; \ + bottom_linesize /= 4; \ + \ + for (i = 0; i < height; i++) { \ + for (j = 0; j < width; j++) { \ + dst[j] = top[j] + ((expr) - top[j]) * opacity; \ + } \ + dst += dst_linesize; \ + top += top_linesize; \ + bottom += bottom_linesize; \ + } \ +} + #define A top[j] #define B bottom[j] @@ -401,6 +452,92 @@ DEFINE_BLEND16(xor, A ^ B, 12) DEFINE_BLEND16(vividlight, (A < 2048) ? BURN(2 * A, B) : DODGE(2 * (A - 2048), B), 12) DEFINE_BLEND16(linearlight,(int)av_clip_uintp2((B < 2048) ? B + 2 * A - 4095 : B + 2 * (A - 2048), 12), 12) +#undef MULTIPLY +#undef SCREEN +#undef BURN +#undef DODGE + +#define MULTIPLY(x, a, b) ((x) * (((a) * (b)) / 511)) +#define SCREEN(x, a, b) (511 - (x) * ((511 - (a)) * (511 - (b)) / 511)) +#define BURN(a, b) (((a) == 0) ? (a) : FFMAX(0, 511 - ((511 - (b)) << 9) / (a))) +#define DODGE(a, b) (((a) == 511) ? (a) : FFMIN(511, (((b) << 9) / (511 - (a))))) + +DEFINE_BLEND16(addition, FFMIN(511, A + B), 9) +DEFINE_BLEND16(grainmerge, (int)av_clip_uintp2(A + B - 256, 9), 9) +DEFINE_BLEND16(average, (A + B) / 2, 9) +DEFINE_BLEND16(subtract, FFMAX(0, A - B), 9) +DEFINE_BLEND16(multiply, MULTIPLY(1, A, B), 9) +DEFINE_BLEND16(multiply128, (int)av_clip_uintp2((A - 256) * B / 64. + 256, 9), 9) +DEFINE_BLEND16(negation, 511 - FFABS(511 - A - B), 9) +DEFINE_BLEND16(extremity, FFABS(511 - A - B), 9) +DEFINE_BLEND16(difference, FFABS(A - B), 9) +DEFINE_BLEND16(grainextract, (int)av_clip_uintp2(256 + A - B, 9), 9) +DEFINE_BLEND16(screen, SCREEN(1, A, B), 9) +DEFINE_BLEND16(overlay, (A < 256) ? MULTIPLY(2, A, B) : SCREEN(2, A, B), 9) +DEFINE_BLEND16(hardlight, (B < 256) ? MULTIPLY(2, B, A) : SCREEN(2, B, A), 9) +DEFINE_BLEND16(hardmix, (A < (511 - B)) ? 0: 511, 9) +DEFINE_BLEND16(heat, (A == 0) ? 0 : 511 - FFMIN(((511 - B) * (511 - B)) / A, 511), 9) +DEFINE_BLEND16(freeze, (B == 0) ? 0 : 511 - FFMIN(((511 - A) * (511 - A)) / B, 511), 9) +DEFINE_BLEND16(darken, FFMIN(A, B), 9) +DEFINE_BLEND16(lighten, FFMAX(A, B), 9) +DEFINE_BLEND16(divide, (int)av_clip_uintp2(B == 0 ? 511 : 511 * A / B, 9), 9) +DEFINE_BLEND16(dodge, DODGE(A, B), 9) +DEFINE_BLEND16(burn, BURN(A, B), 9) +DEFINE_BLEND16(softlight, (A > 511) ? B + (511 - B) * (A - 511.5) / 511.5 * (0.5 - fabs(B - 511.5) / 511): B - B * ((511.5 - A) / 511.5) * (0.5 - fabs(B - 511.5)/511), 9) +DEFINE_BLEND16(exclusion, A + B - 2 * A * B / 511, 9) +DEFINE_BLEND16(pinlight, (B < 256) ? FFMIN(A, 2 * B) : FFMAX(A, 2 * (B - 256)), 9) +DEFINE_BLEND16(phoenix, FFMIN(A, B) - FFMAX(A, B) + 511, 9) +DEFINE_BLEND16(reflect, (B == 511) ? B : FFMIN(511, (A * A / (511 - B))), 9) +DEFINE_BLEND16(glow, (A == 511) ? A : FFMIN(511, (B * B / (511 - A))), 9) +DEFINE_BLEND16(and, A & B, 9) +DEFINE_BLEND16(or, A | B, 9) +DEFINE_BLEND16(xor, A ^ B, 9) +DEFINE_BLEND16(vividlight, (A < 256) ? BURN(2 * A, B) : DODGE(2 * (A - 256), B), 9) +DEFINE_BLEND16(linearlight,(int)av_clip_uintp2((B < 256) ? B + 2 * A - 511 : B + 2 * (A - 256), 9), 9) + +#undef MULTIPLY +#undef SCREEN +#undef BURN +#undef DODGE + +#define MULTIPLY(x, a, b) ((x) * (((a) * (b)) / 1.0)) +#define SCREEN(x, a, b) (1.0 - (x) * ((1.0 - (a)) * (1.0 - (b)) / 1.0)) +#define BURN(a, b) (((a) <= 0.0) ? (a) : FFMAX(0.0, 1.0 - (1.0 - (b)) / (a))) +#define DODGE(a, b) (((a) >= 1.0) ? (a) : FFMIN(1.0, ((b) / (1.0 - (a))))) + +DEFINE_BLEND32(addition, A + B, 32) +DEFINE_BLEND32(grainmerge, A + B - 0.5, 32) +DEFINE_BLEND32(average, (A + B) / 2, 32) +DEFINE_BLEND32(subtract, A - B, 32) +DEFINE_BLEND32(multiply, A * B, 32) +DEFINE_BLEND32(multiply128, (A - 0.5) * B / 0.125 + 0.5, 32) +DEFINE_BLEND32(negation, 1.0 - FFABS(1.0 - A - B), 32) +DEFINE_BLEND32(extremity, FFABS(1.0 - A - B), 32) +DEFINE_BLEND32(difference, FFABS(A - B), 32) +DEFINE_BLEND32(grainextract, 0.5 + A - B, 32) +DEFINE_BLEND32(screen, SCREEN(1, A, B), 32) +DEFINE_BLEND32(overlay, (A < 0.5) ? MULTIPLY(2, A, B) : SCREEN(2, A, B), 32) +DEFINE_BLEND32(hardlight, (B < 0.5) ? MULTIPLY(2, B, A) : SCREEN(2, B, A), 32) +DEFINE_BLEND32(hardmix, (A < (1.0 - B)) ? 0: 1.0, 32) +DEFINE_BLEND32(heat, (A == 0) ? 0 : 1.0 - FFMIN(((1.0 - B) * (1.0 - B)) / A, 1.0), 32) +DEFINE_BLEND32(freeze, (B == 0) ? 0 : 1.0 - FFMIN(((1.0 - A) * (1.0 - A)) / B, 1.0), 32) +DEFINE_BLEND32(darken, FFMIN(A, B), 32) +DEFINE_BLEND32(lighten, FFMAX(A, B), 32) +DEFINE_BLEND32(divide, B == 0 ? 1.0 : 1.0 * A / B, 32) +DEFINE_BLEND32(dodge, DODGE(A, B), 32) +DEFINE_BLEND32(burn, BURN(A, B), 32) +DEFINE_BLEND32(softlight, (A > 0.5) ? B + (1.0 - B) * (A - 0.5) / 0.5 * (0.5 - fabs(B - 0.5) / 1.0): B - B * ((0.5 - A) / 0.5) * (0.5 - fabs(B - 0.5)/1.0), 32) +DEFINE_BLEND32(exclusion, A + B - 2 * A * B / 1.0, 32) +DEFINE_BLEND32(pinlight, (B < 0.5) ? FFMIN(A, 2 * B) : FFMAX(A, 2 * (B - 0.5)), 32) +DEFINE_BLEND32(phoenix, FFMIN(A, B) - FFMAX(A, B) + 1.0, 32) +DEFINE_BLEND32(reflect, (B == 1.0) ? B : FFMIN(1.0, (A * A / (1.0 - B))), 32) +DEFINE_BLEND32(glow, (A == 1.0) ? A : FFMIN(1.0, (B * B / (1.0 - A))), 32) +DEFINE_BLEND32(and, av_int2float(av_float2int(A) & av_float2int(B)), 32) +DEFINE_BLEND32(or, av_int2float(av_float2int(A) | av_float2int(B)), 32) +DEFINE_BLEND32(xor, av_int2float(av_float2int(A) ^ av_float2int(B)), 32) +DEFINE_BLEND32(vividlight, (A < 0.5) ? BURN(2 * A, B) : DODGE(2 * (A - 0.5), B), 32) +DEFINE_BLEND32(linearlight,(B < 0.5) ? B + 2 * A - 1.0 : B + 2 * (A - 0.5), 32) + #define DEFINE_BLEND_EXPR(type, name, div) \ static void blend_expr_## name(const uint8_t *_top, ptrdiff_t top_linesize, \ const uint8_t *_bottom, ptrdiff_t bottom_linesize, \ @@ -433,6 +570,7 @@ static void blend_expr_## name(const uint8_t *_top, ptrdiff_t top_linesize, DEFINE_BLEND_EXPR(uint8_t, 8bit, 1) DEFINE_BLEND_EXPR(uint16_t, 16bit, 2) +DEFINE_BLEND_EXPR(float, 32bit, 4) static int filter_slice(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs) { @@ -527,14 +665,18 @@ static int query_formats(AVFilterContext *ctx) AV_PIX_FMT_YUVJ444P, AV_PIX_FMT_YUVJ440P, AV_PIX_FMT_YUVJ422P,AV_PIX_FMT_YUVJ420P, AV_PIX_FMT_YUVJ411P, AV_PIX_FMT_YUV444P, AV_PIX_FMT_YUV440P, AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV411P, AV_PIX_FMT_YUV410P, AV_PIX_FMT_GBRP, AV_PIX_FMT_GBRAP, AV_PIX_FMT_GRAY8, + AV_PIX_FMT_YUV420P9, AV_PIX_FMT_YUV422P9, AV_PIX_FMT_YUV444P9, + AV_PIX_FMT_YUVA420P9, AV_PIX_FMT_YUVA422P9, AV_PIX_FMT_YUVA444P9, AV_PIX_FMT_GBRP9, AV_PIX_FMT_YUV420P10, AV_PIX_FMT_YUV422P10, AV_PIX_FMT_YUV444P10, AV_PIX_FMT_YUV440P10, AV_PIX_FMT_YUVA420P10, AV_PIX_FMT_YUVA422P10, AV_PIX_FMT_YUVA444P10, AV_PIX_FMT_GBRP10, AV_PIX_FMT_GBRAP10, AV_PIX_FMT_GRAY10, AV_PIX_FMT_YUV420P12, AV_PIX_FMT_YUV422P12, AV_PIX_FMT_YUV444P12, AV_PIX_FMT_YUV440P12, + AV_PIX_FMT_YUVA422P12, AV_PIX_FMT_YUVA444P12, AV_PIX_FMT_GBRP12, AV_PIX_FMT_GBRAP12, AV_PIX_FMT_GRAY12, AV_PIX_FMT_YUV420P16, AV_PIX_FMT_YUV422P16, AV_PIX_FMT_YUV444P16, AV_PIX_FMT_YUVA420P16, AV_PIX_FMT_YUVA422P16, AV_PIX_FMT_YUVA444P16, AV_PIX_FMT_GBRP16, AV_PIX_FMT_GBRAP16, AV_PIX_FMT_GRAY16, + AV_PIX_FMT_GBRPF32, AV_PIX_FMT_GBRAPF32, AV_PIX_FMT_GRAYF32, AV_PIX_FMT_NONE }; @@ -556,182 +698,127 @@ static av_cold void uninit(AVFilterContext *ctx) av_expr_free(s->params[i].e); } +#define DEFINE_INIT_BLEND_FUNC(depth, nbits) \ +static av_cold void init_blend_func_##depth##_##nbits##bit(FilterParams *param) \ +{ \ + switch (param->mode) { \ + case BLEND_ADDITION: param->blend = blend_addition_##depth##bit; break; \ + case BLEND_GRAINMERGE: param->blend = blend_grainmerge_##depth##bit; break; \ + case BLEND_AND: param->blend = blend_and_##depth##bit; break; \ + case BLEND_AVERAGE: param->blend = blend_average_##depth##bit; break; \ + case BLEND_BURN: param->blend = blend_burn_##depth##bit; break; \ + case BLEND_DARKEN: param->blend = blend_darken_##depth##bit; break; \ + case BLEND_DIFFERENCE: param->blend = blend_difference_##depth##bit; break; \ + case BLEND_GRAINEXTRACT: param->blend = blend_grainextract_##depth##bit; break; \ + case BLEND_DIVIDE: param->blend = blend_divide_##depth##bit; break; \ + case BLEND_DODGE: param->blend = blend_dodge_##depth##bit; break; \ + case BLEND_EXCLUSION: param->blend = blend_exclusion_##depth##bit; break; \ + case BLEND_EXTREMITY: param->blend = blend_extremity_##depth##bit; break; \ + case BLEND_FREEZE: param->blend = blend_freeze_##depth##bit; break; \ + case BLEND_GLOW: param->blend = blend_glow_##depth##bit; break; \ + case BLEND_HARDLIGHT: param->blend = blend_hardlight_##depth##bit; break; \ + case BLEND_HARDMIX: param->blend = blend_hardmix_##depth##bit; break; \ + case BLEND_HEAT: param->blend = blend_heat_##depth##bit; break; \ + case BLEND_LIGHTEN: param->blend = blend_lighten_##depth##bit; break; \ + case BLEND_LINEARLIGHT: param->blend = blend_linearlight_##depth##bit; break; \ + case BLEND_MULTIPLY: param->blend = blend_multiply_##depth##bit; break; \ + case BLEND_MULTIPLY128: param->blend = blend_multiply128_##depth##bit; break; \ + case BLEND_NEGATION: param->blend = blend_negation_##depth##bit; break; \ + case BLEND_NORMAL: param->blend = blend_normal_##nbits##bit; break; \ + case BLEND_OR: param->blend = blend_or_##depth##bit; break; \ + case BLEND_OVERLAY: param->blend = blend_overlay_##depth##bit; break; \ + case BLEND_PHOENIX: param->blend = blend_phoenix_##depth##bit; break; \ + case BLEND_PINLIGHT: param->blend = blend_pinlight_##depth##bit; break; \ + case BLEND_REFLECT: param->blend = blend_reflect_##depth##bit; break; \ + case BLEND_SCREEN: param->blend = blend_screen_##depth##bit; break; \ + case BLEND_SOFTLIGHT: param->blend = blend_softlight_##depth##bit; break; \ + case BLEND_SUBTRACT: param->blend = blend_subtract_##depth##bit; break; \ + case BLEND_VIVIDLIGHT: param->blend = blend_vividlight_##depth##bit; break; \ + case BLEND_XOR: param->blend = blend_xor_##depth##bit; break; \ + } \ +} +DEFINE_INIT_BLEND_FUNC(8, 8) +DEFINE_INIT_BLEND_FUNC(9, 16) +DEFINE_INIT_BLEND_FUNC(10, 16) +DEFINE_INIT_BLEND_FUNC(12, 16) +DEFINE_INIT_BLEND_FUNC(16, 16) +DEFINE_INIT_BLEND_FUNC(32, 32) + void ff_blend_init(FilterParams *param, int depth) { switch (depth) { case 8: - switch (param->mode) { - case BLEND_ADDITION: param->blend = blend_addition_8bit; break; - case BLEND_GRAINMERGE: param->blend = blend_grainmerge_8bit; break; - case BLEND_AND: param->blend = blend_and_8bit; break; - case BLEND_AVERAGE: param->blend = blend_average_8bit; break; - case BLEND_BURN: param->blend = blend_burn_8bit; break; - case BLEND_DARKEN: param->blend = blend_darken_8bit; break; - case BLEND_DIFFERENCE: param->blend = blend_difference_8bit; break; - case BLEND_GRAINEXTRACT: param->blend = blend_grainextract_8bit; break; - case BLEND_DIVIDE: param->blend = blend_divide_8bit; break; - case BLEND_DODGE: param->blend = blend_dodge_8bit; break; - case BLEND_EXCLUSION: param->blend = blend_exclusion_8bit; break; - case BLEND_EXTREMITY: param->blend = blend_extremity_8bit; break; - case BLEND_FREEZE: param->blend = blend_freeze_8bit; break; - case BLEND_GLOW: param->blend = blend_glow_8bit; break; - case BLEND_HARDLIGHT: param->blend = blend_hardlight_8bit; break; - case BLEND_HARDMIX: param->blend = blend_hardmix_8bit; break; - case BLEND_HEAT: param->blend = blend_heat_8bit; break; - case BLEND_LIGHTEN: param->blend = blend_lighten_8bit; break; - case BLEND_LINEARLIGHT:param->blend = blend_linearlight_8bit;break; - case BLEND_MULTIPLY: param->blend = blend_multiply_8bit; break; - case BLEND_MULTIPLY128:param->blend = blend_multiply128_8bit;break; - case BLEND_NEGATION: param->blend = blend_negation_8bit; break; - case BLEND_NORMAL: param->blend = param->opacity == 1 ? blend_copytop_8 : - param->opacity == 0 ? blend_copybottom_8 : - blend_normal_8bit; break; - case BLEND_OR: param->blend = blend_or_8bit; break; - case BLEND_OVERLAY: param->blend = blend_overlay_8bit; break; - case BLEND_PHOENIX: param->blend = blend_phoenix_8bit; break; - case BLEND_PINLIGHT: param->blend = blend_pinlight_8bit; break; - case BLEND_REFLECT: param->blend = blend_reflect_8bit; break; - case BLEND_SCREEN: param->blend = blend_screen_8bit; break; - case BLEND_SOFTLIGHT: param->blend = blend_softlight_8bit; break; - case BLEND_SUBTRACT: param->blend = blend_subtract_8bit; break; - case BLEND_VIVIDLIGHT: param->blend = blend_vividlight_8bit; break; - case BLEND_XOR: param->blend = blend_xor_8bit; break; - } + init_blend_func_8_8bit(param); + break; + case 9: + init_blend_func_9_16bit(param); break; case 10: - switch (param->mode) { - case BLEND_ADDITION: param->blend = blend_addition_10bit; break; - case BLEND_GRAINMERGE: param->blend = blend_grainmerge_10bit; break; - case BLEND_AND: param->blend = blend_and_10bit; break; - case BLEND_AVERAGE: param->blend = blend_average_10bit; break; - case BLEND_BURN: param->blend = blend_burn_10bit; break; - case BLEND_DARKEN: param->blend = blend_darken_10bit; break; - case BLEND_DIFFERENCE: param->blend = blend_difference_10bit; break; - case BLEND_GRAINEXTRACT: param->blend = blend_grainextract_10bit; break; - case BLEND_DIVIDE: param->blend = blend_divide_10bit; break; - case BLEND_DODGE: param->blend = blend_dodge_10bit; break; - case BLEND_EXCLUSION: param->blend = blend_exclusion_10bit; break; - case BLEND_EXTREMITY: param->blend = blend_extremity_10bit; break; - case BLEND_FREEZE: param->blend = blend_freeze_10bit; break; - case BLEND_GLOW: param->blend = blend_glow_10bit; break; - case BLEND_HARDLIGHT: param->blend = blend_hardlight_10bit; break; - case BLEND_HARDMIX: param->blend = blend_hardmix_10bit; break; - case BLEND_HEAT: param->blend = blend_heat_10bit; break; - case BLEND_LIGHTEN: param->blend = blend_lighten_10bit; break; - case BLEND_LINEARLIGHT:param->blend = blend_linearlight_10bit;break; - case BLEND_MULTIPLY: param->blend = blend_multiply_10bit; break; - case BLEND_MULTIPLY128:param->blend = blend_multiply128_10bit;break; - case BLEND_NEGATION: param->blend = blend_negation_10bit; break; - case BLEND_NORMAL: param->blend = param->opacity == 1 ? blend_copytop_16 : - param->opacity == 0 ? blend_copybottom_16 : - blend_normal_16bit; break; - case BLEND_OR: param->blend = blend_or_10bit; break; - case BLEND_OVERLAY: param->blend = blend_overlay_10bit; break; - case BLEND_PHOENIX: param->blend = blend_phoenix_10bit; break; - case BLEND_PINLIGHT: param->blend = blend_pinlight_10bit; break; - case BLEND_REFLECT: param->blend = blend_reflect_10bit; break; - case BLEND_SCREEN: param->blend = blend_screen_10bit; break; - case BLEND_SOFTLIGHT: param->blend = blend_softlight_10bit; break; - case BLEND_SUBTRACT: param->blend = blend_subtract_10bit; break; - case BLEND_VIVIDLIGHT: param->blend = blend_vividlight_10bit;break; - case BLEND_XOR: param->blend = blend_xor_10bit; break; - } + init_blend_func_10_16bit(param); break; case 12: - switch (param->mode) { - case BLEND_ADDITION: param->blend = blend_addition_12bit; break; - case BLEND_GRAINMERGE: param->blend = blend_grainmerge_12bit; break; - case BLEND_AND: param->blend = blend_and_12bit; break; - case BLEND_AVERAGE: param->blend = blend_average_12bit; break; - case BLEND_BURN: param->blend = blend_burn_12bit; break; - case BLEND_DARKEN: param->blend = blend_darken_12bit; break; - case BLEND_DIFFERENCE: param->blend = blend_difference_12bit; break; - case BLEND_GRAINEXTRACT: param->blend = blend_grainextract_12bit; break; - case BLEND_DIVIDE: param->blend = blend_divide_12bit; break; - case BLEND_DODGE: param->blend = blend_dodge_12bit; break; - case BLEND_EXCLUSION: param->blend = blend_exclusion_12bit; break; - case BLEND_EXTREMITY: param->blend = blend_extremity_12bit; break; - case BLEND_FREEZE: param->blend = blend_freeze_12bit; break; - case BLEND_GLOW: param->blend = blend_glow_12bit; break; - case BLEND_HARDLIGHT: param->blend = blend_hardlight_12bit; break; - case BLEND_HARDMIX: param->blend = blend_hardmix_12bit; break; - case BLEND_HEAT: param->blend = blend_heat_12bit; break; - case BLEND_LIGHTEN: param->blend = blend_lighten_12bit; break; - case BLEND_LINEARLIGHT:param->blend = blend_linearlight_12bit;break; - case BLEND_MULTIPLY: param->blend = blend_multiply_12bit; break; - case BLEND_MULTIPLY128:param->blend = blend_multiply128_12bit;break; - case BLEND_NEGATION: param->blend = blend_negation_12bit; break; - case BLEND_NORMAL: param->blend = param->opacity == 1 ? blend_copytop_16 : - param->opacity == 0 ? blend_copybottom_16 : - blend_normal_16bit; break; - case BLEND_OR: param->blend = blend_or_12bit; break; - case BLEND_OVERLAY: param->blend = blend_overlay_12bit; break; - case BLEND_PHOENIX: param->blend = blend_phoenix_12bit; break; - case BLEND_PINLIGHT: param->blend = blend_pinlight_12bit; break; - case BLEND_REFLECT: param->blend = blend_reflect_12bit; break; - case BLEND_SCREEN: param->blend = blend_screen_12bit; break; - case BLEND_SOFTLIGHT: param->blend = blend_softlight_12bit; break; - case BLEND_SUBTRACT: param->blend = blend_subtract_12bit; break; - case BLEND_VIVIDLIGHT: param->blend = blend_vividlight_12bit;break; - case BLEND_XOR: param->blend = blend_xor_12bit; break; - } + init_blend_func_12_16bit(param); break; case 16: - switch (param->mode) { - case BLEND_ADDITION: param->blend = blend_addition_16bit; break; - case BLEND_GRAINMERGE: param->blend = blend_grainmerge_16bit; break; - case BLEND_AND: param->blend = blend_and_16bit; break; - case BLEND_AVERAGE: param->blend = blend_average_16bit; break; - case BLEND_BURN: param->blend = blend_burn_16bit; break; - case BLEND_DARKEN: param->blend = blend_darken_16bit; break; - case BLEND_DIFFERENCE: param->blend = blend_difference_16bit; break; - case BLEND_GRAINEXTRACT: param->blend = blend_grainextract_16bit; break; - case BLEND_DIVIDE: param->blend = blend_divide_16bit; break; - case BLEND_DODGE: param->blend = blend_dodge_16bit; break; - case BLEND_EXCLUSION: param->blend = blend_exclusion_16bit; break; - case BLEND_EXTREMITY: param->blend = blend_extremity_16bit; break; - case BLEND_FREEZE: param->blend = blend_freeze_16bit; break; - case BLEND_GLOW: param->blend = blend_glow_16bit; break; - case BLEND_HARDLIGHT: param->blend = blend_hardlight_16bit; break; - case BLEND_HARDMIX: param->blend = blend_hardmix_16bit; break; - case BLEND_HEAT: param->blend = blend_heat_16bit; break; - case BLEND_LIGHTEN: param->blend = blend_lighten_16bit; break; - case BLEND_LINEARLIGHT:param->blend = blend_linearlight_16bit;break; - case BLEND_MULTIPLY: param->blend = blend_multiply_16bit; break; - case BLEND_MULTIPLY128:param->blend = blend_multiply128_16bit;break; - case BLEND_NEGATION: param->blend = blend_negation_16bit; break; - case BLEND_NORMAL: param->blend = param->opacity == 1 ? blend_copytop_16 : - param->opacity == 0 ? blend_copybottom_16 : - blend_normal_16bit; break; - case BLEND_OR: param->blend = blend_or_16bit; break; - case BLEND_OVERLAY: param->blend = blend_overlay_16bit; break; - case BLEND_PHOENIX: param->blend = blend_phoenix_16bit; break; - case BLEND_PINLIGHT: param->blend = blend_pinlight_16bit; break; - case BLEND_REFLECT: param->blend = blend_reflect_16bit; break; - case BLEND_SCREEN: param->blend = blend_screen_16bit; break; - case BLEND_SOFTLIGHT: param->blend = blend_softlight_16bit; break; - case BLEND_SUBTRACT: param->blend = blend_subtract_16bit; break; - case BLEND_VIVIDLIGHT: param->blend = blend_vividlight_16bit;break; - case BLEND_XOR: param->blend = blend_xor_16bit; break; - } + init_blend_func_16_16bit(param); + break; + case 32: + init_blend_func_32_32bit(param); break; } if (param->opacity == 0 && param->mode != BLEND_NORMAL) { - param->blend = depth > 8 ? blend_copytop_16 : blend_copytop_8; + param->blend = depth > 8 ? depth > 16 ? blend_copytop_32 : blend_copytop_16 : blend_copytop_8; + } else if (param->mode == BLEND_NORMAL) { + if (param->opacity == 1) + param->blend = depth > 8 ? depth > 16 ? blend_copytop_32 : blend_copytop_16 : blend_copytop_8; + else if (param->opacity == 0) + param->blend = depth > 8 ? depth > 16 ? blend_copybottom_32 : blend_copybottom_16 : blend_copybottom_8; } if (ARCH_X86) ff_blend_init_x86(param, depth); } +static int config_params(AVFilterContext *ctx) +{ + BlendContext *s = ctx->priv; + int ret; + + for (int plane = 0; plane < FF_ARRAY_ELEMS(s->params); plane++) { + FilterParams *param = &s->params[plane]; + + if (s->all_mode >= 0) + param->mode = s->all_mode; + if (s->all_opacity < 1) + param->opacity = s->all_opacity; + + ff_blend_init(param, s->depth); + + if (s->all_expr && !param->expr_str) { + param->expr_str = av_strdup(s->all_expr); + if (!param->expr_str) + return AVERROR(ENOMEM); + } + if (param->expr_str) { + ret = av_expr_parse(¶m->e, param->expr_str, var_names, + NULL, NULL, NULL, NULL, 0, ctx); + if (ret < 0) + return ret; + param->blend = s->depth > 8 ? s->depth > 16 ? blend_expr_32bit : blend_expr_16bit : blend_expr_8bit; + } + } + + return 0; +} + static int config_output(AVFilterLink *outlink) { AVFilterContext *ctx = outlink->src; AVFilterLink *toplink = ctx->inputs[TOP]; BlendContext *s = ctx->priv; const AVPixFmtDescriptor *pix_desc = av_pix_fmt_desc_get(toplink->format); - int ret, plane; + int ret; if (!s->tblend) { AVFilterLink *bottomlink = ctx->inputs[BOTTOM]; @@ -766,31 +853,29 @@ static int config_output(AVFilterLink *outlink) if ((ret = ff_framesync_init_dualinput(&s->fs, ctx)) < 0) return ret; - for (plane = 0; plane < FF_ARRAY_ELEMS(s->params); plane++) { - FilterParams *param = &s->params[plane]; + ret = config_params(ctx); + if (ret < 0) + return ret; - if (s->all_mode >= 0) - param->mode = s->all_mode; - if (s->all_opacity < 1) - param->opacity = s->all_opacity; + if (s->tblend) + return 0; - ff_blend_init(param, s->depth); + ret = ff_framesync_configure(&s->fs); + outlink->time_base = s->fs.time_base; - if (s->all_expr && !param->expr_str) { - param->expr_str = av_strdup(s->all_expr); - if (!param->expr_str) - return AVERROR(ENOMEM); - } - if (param->expr_str) { - ret = av_expr_parse(¶m->e, param->expr_str, var_names, - NULL, NULL, NULL, NULL, 0, ctx); - if (ret < 0) - return ret; - param->blend = s->depth > 8 ? blend_expr_16bit : blend_expr_8bit; - } - } + return ret; +} + +static int process_command(AVFilterContext *ctx, const char *cmd, const char *args, + char *res, int res_len, int flags) +{ + int ret; + + ret = ff_filter_process_command(ctx, cmd, args, res, res_len, flags); + if (ret < 0) + return ret; - return s->tblend ? 0 : ff_framesync_configure(&s->fs); + return config_params(ctx); } #if CONFIG_BLEND_FILTER @@ -834,6 +919,7 @@ AVFilter ff_vf_blend = { .outputs = blend_outputs, .priv_class = &blend_class, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL | AVFILTER_FLAG_SLICE_THREADS, + .process_command = process_command, }; #endif @@ -861,11 +947,7 @@ static int tblend_filter_frame(AVFilterLink *inlink, AVFrame *frame) return 0; } -static const AVOption tblend_options[] = { - COMMON_OPTIONS, - { NULL } -}; - +#define tblend_options blend_options AVFILTER_DEFINE_CLASS(tblend); static const AVFilterPad tblend_inputs[] = { @@ -897,6 +979,7 @@ AVFilter ff_vf_tblend = { .inputs = tblend_inputs, .outputs = tblend_outputs, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL | AVFILTER_FLAG_SLICE_THREADS, + .process_command = process_command, }; #endif