History

avfilter/vf_blend: add 9bit support

Paul B Mahol committed 7 years ago

Commit 37e69b41 parent f86f2131 file · +49 −0Browse files

Unified · Split

libavfilter/vf_blend.c+49−0
@@ -400,6 +400,49 @@ DEFINE_BLEND16(xor, A ^ B, 12) · 399 unmodified lines
400400 DEFINE_BLEND16(vividlight, (A < 2048) ? BURN(2 * A, B) : DODGE(2 * (A - 2048), B), 12)
401401 DEFINE_BLEND16(linearlight,(int)av_clip_uintp2((B < 2048) ? B + 2 * A - 4095 : B + 2 * (A - 2048), 12), 12)
402402
403+#undef MULTIPLY
404+#undef SCREEN
405+#undef BURN
406+#undef DODGE
407+
408+#define MULTIPLY(x, a, b) ((x) * (((a) * (b)) / 511))
409+#define SCREEN(x, a, b) (511 - (x) * ((511 - (a)) * (511 - (b)) / 511))
410+#define BURN(a, b) (((a) == 0) ? (a) : FFMAX(0, 511 - ((511 - (b)) << 9) / (a)))
411+#define DODGE(a, b) (((a) == 511) ? (a) : FFMIN(511, (((b) << 9) / (511 - (a)))))
412+
413+DEFINE_BLEND16(addition, FFMIN(511, A + B), 9)
414+DEFINE_BLEND16(grainmerge, (int)av_clip_uintp2(A + B - 256, 9), 9)
415+DEFINE_BLEND16(average, (A + B) / 2, 9)
416+DEFINE_BLEND16(subtract, FFMAX(0, A - B), 9)
417+DEFINE_BLEND16(multiply, MULTIPLY(1, A, B), 9)
418+DEFINE_BLEND16(multiply128, (int)av_clip_uintp2((A - 256) * B / 64. + 256, 9), 9)
419+DEFINE_BLEND16(negation, 511 - FFABS(511 - A - B), 9)
420+DEFINE_BLEND16(extremity, FFABS(511 - A - B), 9)
421+DEFINE_BLEND16(difference, FFABS(A - B), 9)
422+DEFINE_BLEND16(grainextract, (int)av_clip_uintp2(256 + A - B, 9), 9)
423+DEFINE_BLEND16(screen, SCREEN(1, A, B), 9)
424+DEFINE_BLEND16(overlay, (A < 256) ? MULTIPLY(2, A, B) : SCREEN(2, A, B), 9)
425+DEFINE_BLEND16(hardlight, (B < 256) ? MULTIPLY(2, B, A) : SCREEN(2, B, A), 9)
426+DEFINE_BLEND16(hardmix, (A < (511 - B)) ? 0: 511, 9)
427+DEFINE_BLEND16(heat, (A == 0) ? 0 : 511 - FFMIN(((511 - B) * (511 - B)) / A, 511), 9)
428+DEFINE_BLEND16(freeze, (B == 0) ? 0 : 511 - FFMIN(((511 - A) * (511 - A)) / B, 511), 9)
429+DEFINE_BLEND16(darken, FFMIN(A, B), 9)
430+DEFINE_BLEND16(lighten, FFMAX(A, B), 9)
431+DEFINE_BLEND16(divide, (int)av_clip_uintp2(B == 0 ? 511 : 511 * A / B, 9), 9)
432+DEFINE_BLEND16(dodge, DODGE(A, B), 9)
433+DEFINE_BLEND16(burn, BURN(A, B), 9)
434+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)
435+DEFINE_BLEND16(exclusion, A + B - 2 * A * B / 511, 9)
436+DEFINE_BLEND16(pinlight, (B < 256) ? FFMIN(A, 2 * B) : FFMAX(A, 2 * (B - 256)), 9)
437+DEFINE_BLEND16(phoenix, FFMIN(A, B) - FFMAX(A, B) + 511, 9)
438+DEFINE_BLEND16(reflect, (B == 511) ? B : FFMIN(511, (A * A / (511 - B))), 9)
439+DEFINE_BLEND16(glow, (A == 511) ? A : FFMIN(511, (B * B / (511 - A))), 9)
440+DEFINE_BLEND16(and, A & B, 9)
441+DEFINE_BLEND16(or, A | B, 9)
442+DEFINE_BLEND16(xor, A ^ B, 9)
443+DEFINE_BLEND16(vividlight, (A < 256) ? BURN(2 * A, B) : DODGE(2 * (A - 256), B), 9)
444+DEFINE_BLEND16(linearlight,(int)av_clip_uintp2((B < 256) ? B + 2 * A - 511 : B + 2 * (A - 256), 9), 9)
445+
403446 #define DEFINE_BLEND_EXPR(type, name, div) \
404447 static void blend_expr_## name(const uint8_t *_top, ptrdiff_t top_linesize, \
405448 const uint8_t *_bottom, ptrdiff_t bottom_linesize, \
@@ -526,6 +569,8 @@ static int query_formats(AVFilterContext *ctx) · 120 unmodified lines
526569 AV_PIX_FMT_YUVJ444P, AV_PIX_FMT_YUVJ440P, AV_PIX_FMT_YUVJ422P,AV_PIX_FMT_YUVJ420P, AV_PIX_FMT_YUVJ411P,
527570 AV_PIX_FMT_YUV444P, AV_PIX_FMT_YUV440P, AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV411P, AV_PIX_FMT_YUV410P,
528571 AV_PIX_FMT_GBRP, AV_PIX_FMT_GBRAP, AV_PIX_FMT_GRAY8,
572+ AV_PIX_FMT_YUV420P9, AV_PIX_FMT_YUV422P9, AV_PIX_FMT_YUV444P9,
573+ AV_PIX_FMT_YUVA420P9, AV_PIX_FMT_YUVA422P9, AV_PIX_FMT_YUVA444P9, AV_PIX_FMT_GBRP9,
529574 AV_PIX_FMT_YUV420P10, AV_PIX_FMT_YUV422P10, AV_PIX_FMT_YUV444P10, AV_PIX_FMT_YUV440P10,
530575 AV_PIX_FMT_YUVA420P10, AV_PIX_FMT_YUVA422P10, AV_PIX_FMT_YUVA444P10,
531576 AV_PIX_FMT_GBRP10, AV_PIX_FMT_GBRAP10, AV_PIX_FMT_GRAY10,
@@ -595,6 +640,7 @@ static av_cold void init_blend_func_##depth##_##nbits##bit(FilterParams *param) · 63 unmodified lines
595640 } \
596641 }
597642 DEFINE_INIT_BLEND_FUNC(8, 8);
643+DEFINE_INIT_BLEND_FUNC(9, 16);
598644 DEFINE_INIT_BLEND_FUNC(10, 16);
599645 DEFINE_INIT_BLEND_FUNC(12, 16);
600646 DEFINE_INIT_BLEND_FUNC(16, 16);
@@ -605,6 +651,9 @@ void ff_blend_init(FilterParams *param, int depth) · 4 unmodified lines
605651 case 8:
606652 init_blend_func_8_8bit(param);
607653 break;
654+ case 9:
655+ init_blend_func_9_16bit(param);
656+ break;
608657 case 10:
609658 init_blend_func_10_16bit(param);
610659 break;

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