[FFmpeg-cvslog] avfilter/vf_blend: add 9bit support

Paul B Mahol git at videolan.org
Sun Jul 14 18:16:11 EEST 2019


ffmpeg | branch: master | Paul B Mahol <onemda at gmail.com> | Sun Jul 14 17:00:58 2019 +0200| [37e69b40dfd1bdb862c9432ba619f54bd8883ad8] | committer: Paul B Mahol

avfilter/vf_blend: add 9bit support

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=37e69b40dfd1bdb862c9432ba619f54bd8883ad8
---

 libavfilter/vf_blend.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)

diff --git a/libavfilter/vf_blend.c b/libavfilter/vf_blend.c
index 2f53cfa22a..d6036c10e2 100644
--- a/libavfilter/vf_blend.c
+++ b/libavfilter/vf_blend.c
@@ -400,6 +400,49 @@ 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)
+
 #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,    \
@@ -526,6 +569,8 @@ 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,
@@ -595,6 +640,7 @@ static av_cold void init_blend_func_##depth##_##nbits##bit(FilterParams *param)
     }                                                                                     \
 }
 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);
@@ -605,6 +651,9 @@ void ff_blend_init(FilterParams *param, int depth)
     case 8:
         init_blend_func_8_8bit(param);
         break;
+    case 9:
+        init_blend_func_9_16bit(param);
+        break;
     case 10:
         init_blend_func_10_16bit(param);
         break;



More information about the ffmpeg-cvslog mailing list