On 2/15/16, Paul B Mahol <one...@gmail.com> wrote:
> Hi,
>
> patch attached.
>
> I couldn't get blend functions to work correctly.
>
Now with blend properly working.
But now I have issues with fate ref update, it mess up terminal here
so one needs to use reset.
From 2633eb9cdb93031b23f119b12ee543c443686c02 Mon Sep 17 00:00:00 2001
From: Paul B Mahol <one...@gmail.com>
Date: Mon, 15 Feb 2016 17:07:33 +0100
Subject: [PATCH] avfilter/drawutils: >8 bit support
Signed-off-by: Paul B Mahol <one...@gmail.com>
---
libavfilter/drawutils.c | 235 +++++++++++++++++++++++++++++++++++++++---------
libavfilter/drawutils.h | 6 +-
2 files changed, 198 insertions(+), 43 deletions(-)
diff --git a/libavfilter/drawutils.c b/libavfilter/drawutils.c
index 23a0eb5..261dec6 100644
--- a/libavfilter/drawutils.c
+++ b/libavfilter/drawutils.c
@@ -175,8 +175,8 @@ int ff_draw_init(FFDrawContext *draw, enum AVPixelFormat format, unsigned flags)
return AVERROR(ENOSYS);
for (i = 0; i < desc->nb_components; i++) {
c = &desc->comp[i];
- /* for now, only 8-bits formats */
- if (c->depth != 8)
+ /* for now, only 8-16 bits formats */
+ if (c->depth < 8 || c->depth > 16)
return AVERROR(ENOSYS);
if (c->plane >= MAX_PLANES)
return AVERROR(ENOSYS);
@@ -184,6 +184,9 @@ int ff_draw_init(FFDrawContext *draw, enum AVPixelFormat format, unsigned flags)
if (pixelstep[c->plane] != 0 &&
pixelstep[c->plane] != c->step)
return AVERROR(ENOSYS);
+ if (pixelstep[c->plane] == 6 &&
+ c->depth == 16)
+ return AVERROR(ENOSYS);
pixelstep[c->plane] = c->step;
if (pixelstep[c->plane] >= 8)
return AVERROR(ENOSYS);
@@ -214,11 +217,18 @@ void ff_draw_color(FFDrawContext *draw, FFDrawColor *color, const uint8_t rgba[4
if ((draw->desc->flags & AV_PIX_FMT_FLAG_RGB) &&
ff_fill_rgba_map(rgba_map, draw->format) >= 0) {
if (draw->nb_planes == 1) {
- for (i = 0; i < 4; i++)
+ for (i = 0; i < 4; i++) {
color->comp[0].u8[rgba_map[i]] = rgba[i];
+ if (draw->desc->comp[rgba_map[i]].depth > 8) {
+ color->comp[0].u16[rgba_map[i]] = color->comp[0].u8[rgba_map[i]] << 8;
+ }
+ }
} else {
- for (i = 0; i < 4; i++)
+ for (i = 0; i < 4; i++) {
color->comp[rgba_map[i]].u8[0] = rgba[i];
+ if (draw->desc->comp[rgba_map[i]].depth > 8)
+ color->comp[rgba_map[i]].u16[0] = color->comp[rgba_map[i]].u8[0] << (draw->desc->comp[rgba_map[i]].depth - 8);
+ }
}
} else if (draw->nb_planes == 3 || draw->nb_planes == 4) {
/* assume YUV */
@@ -226,9 +236,22 @@ void ff_draw_color(FFDrawContext *draw, FFDrawColor *color, const uint8_t rgba[4
color->comp[1].u8[0] = RGB_TO_U_CCIR(rgba[0], rgba[1], rgba[2], 0);
color->comp[2].u8[0] = RGB_TO_V_CCIR(rgba[0], rgba[1], rgba[2], 0);
color->comp[3].u8[0] = rgba[3];
+ if (draw->desc->comp[0].depth > 8)
+ color->comp[0].u16[0] = color->comp[0].u8[0] << (draw->desc->comp[0].depth - 8);
+ if (draw->desc->comp[1].depth > 8)
+ color->comp[1].u16[0] = color->comp[1].u8[0] << (draw->desc->comp[1].depth - 8);
+ if (draw->desc->comp[2].depth > 8)
+ color->comp[2].u16[0] = color->comp[2].u8[0] << (draw->desc->comp[2].depth - 8);
+ if (draw->desc->comp[3].depth > 8)
+ color->comp[3].u16[0] = color->comp[3].u8[0] << (draw->desc->comp[3].depth - 8);
} else if (draw->format == AV_PIX_FMT_GRAY8 || draw->format == AV_PIX_FMT_GRAY8A) {
color->comp[0].u8[0] = RGB_TO_Y_CCIR(rgba[0], rgba[1], rgba[2]);
color->comp[1].u8[0] = rgba[3];
+ } else if (draw->format == AV_PIX_FMT_GRAY16 || draw->format == AV_PIX_FMT_YA16) {
+ color->comp[0].u8[0] = RGB_TO_Y_CCIR(rgba[0], rgba[1], rgba[2]);
+ color->comp[0].u16[0] = color->comp[0].u8[0] << 8;
+ color->comp[1].u8[0] = rgba[3];
+ color->comp[1].u16[0] = color->comp[1].u8[0] << 8;
} else {
av_log(NULL, AV_LOG_WARNING,
"Color conversion not implemented for %s\n", draw->desc->name);
@@ -361,6 +384,29 @@ static void blend_line(uint8_t *dst, unsigned src, unsigned alpha,
}
}
+static void blend_line16(uint8_t *ddst, unsigned src, unsigned alpha,
+ int dx, int w, unsigned hsub, int left, int right)
+{
+ uint16_t *dst = (uint16_t *)ddst;
+ unsigned asrc = alpha * src;
+ unsigned tau = 0x10001 - alpha;
+ int x;
+
+ if (left) {
+ unsigned suba = (left * alpha) >> hsub;
+ *dst = (*dst * (0x10001 - suba) + src * suba) >> 16;
+ dst += dx/2;
+ }
+ for (x = 0; x < w; x++) {
+ *dst = (*dst * tau + asrc) >> 16;
+ dst += dx/2;
+ }
+ if (right) {
+ unsigned suba = (right * alpha) >> hsub;
+ *dst = (*dst * (0x10001 - suba) + src * suba) >> 16;
+ }
+}
+
void ff_blend_rectangle(FFDrawContext *draw, FFDrawColor *color,
uint8_t *dst[], int dst_linesize[],
int dst_w, int dst_h,
@@ -375,8 +421,13 @@ void ff_blend_rectangle(FFDrawContext *draw, FFDrawColor *color,
clip_interval(dst_h, &y0, &h, NULL);
if (w <= 0 || h <= 0 || !color->rgba[3])
return;
- /* 0x10203 * alpha + 2 is in the [ 2 ; 0x1010101 - 2 ] range */
- alpha = 0x10203 * color->rgba[3] + 0x2;
+ if (draw->desc->comp[0].depth <= 8) {
+ /* 0x10203 * alpha + 2 is in the [ 2 ; 0x1010101 - 2 ] range */
+ alpha = 0x10203 * color->rgba[3] + 0x2;
+ } else {
+ /* 0x101 * alpha is in the [ 0 ; 0xffff] range */
+ alpha = 0x101 * color->rgba[3];
+ }
nb_planes = (draw->nb_planes - 1) | 1; /* eliminate alpha */
for (plane = 0; plane < nb_planes; plane++) {
nb_comp = draw->pixelstep[plane];
@@ -392,25 +443,71 @@ void ff_blend_rectangle(FFDrawContext *draw, FFDrawColor *color,
continue;
p = p0 + comp;
if (top) {
- blend_line(p, color->comp[plane].u8[comp], alpha >> 1,
- draw->pixelstep[plane], w_sub,
- draw->hsub[plane], left, right);
+ if (draw->desc->comp[comp].depth <= 8) {
+ blend_line(p, color->comp[plane].u8[comp], alpha >> 1,
+ draw->pixelstep[plane], w_sub,
+ draw->hsub[plane], left, right);
+ } else {
+ blend_line16(p, color->comp[plane].u16[comp], alpha >> 1,
+ draw->pixelstep[plane], w_sub,
+ draw->hsub[plane], left, right);
+ }
p += dst_linesize[plane];
}
- for (y = 0; y < h_sub; y++) {
- blend_line(p, color->comp[plane].u8[comp], alpha,
- draw->pixelstep[plane], w_sub,
- draw->hsub[plane], left, right);
- p += dst_linesize[plane];
+ if (draw->desc->comp[comp].depth <= 8) {
+ for (y = 0; y < h_sub; y++) {
+ blend_line(p, color->comp[plane].u8[comp], alpha,
+ draw->pixelstep[plane], w_sub,
+ draw->hsub[plane], left, right);
+ p += dst_linesize[plane];
+ }
+ } else {
+ for (y = 0; y < h_sub; y++) {
+ blend_line16(p, color->comp[plane].u16[comp], alpha,
+ draw->pixelstep[plane], w_sub,
+ draw->hsub[plane], left, right);
+ p += dst_linesize[plane];
+ }
+ }
+ if (bottom) {
+ if (draw->desc->comp[comp].depth <= 8) {
+ blend_line(p, color->comp[plane].u8[comp], alpha >> 1,
+ draw->pixelstep[plane], w_sub,
+ draw->hsub[plane], left, right);
+ } else {
+ blend_line16(p, color->comp[plane].u16[comp], alpha >> 1,
+ draw->pixelstep[plane], w_sub,
+ draw->hsub[plane], left, right);
+ }
}
- if (bottom)
- blend_line(p, color->comp[plane].u8[comp], alpha >> 1,
- draw->pixelstep[plane], w_sub,
- draw->hsub[plane], left, right);
}
}
}
+static void blend_pixel16(uint8_t *ddst, unsigned src, unsigned alpha,
+ const uint8_t *mask, int mask_linesize, int l2depth,
+ unsigned w, unsigned h, unsigned shift, unsigned xm0)
+{
+ unsigned xm, x, y, t = 0;
+ unsigned xmshf = 3 - l2depth;
+ unsigned xmmod = 7 >> l2depth;
+ unsigned mbits = (1 << (1 << l2depth)) - 1;
+ unsigned mmult = 255 / mbits;
+ uint16_t *dst = (uint16_t *)ddst;
+
+ for (y = 0; y < h; y++) {
+ xm = xm0;
+ for (x = 0; x < w; x++) {
+ t += ((mask[xm >> xmshf] >> ((~xm & xmmod) << l2depth)) & mbits)
+ * mmult;
+ xm++;
+ }
+ mask += mask_linesize;
+ }
+ alpha = (t >> shift) * alpha;
+ *dst = ((0x10001 - alpha) * *dst + alpha * src) >> 16;
+}
+
static void blend_pixel(uint8_t *dst, unsigned src, unsigned alpha,
const uint8_t *mask, int mask_linesize, int l2depth,
unsigned w, unsigned h, unsigned shift, unsigned xm0)
@@ -434,6 +531,31 @@ static void blend_pixel(uint8_t *dst, unsigned src, unsigned alpha,
*dst = ((0x1010101 - alpha) * *dst + alpha * src) >> 24;
}
+static void blend_line_hv16(uint8_t *dst, int dst_delta,
+ unsigned src, unsigned alpha,
+ const uint8_t *mask, int mask_linesize, int l2depth, int w,
+ unsigned hsub, unsigned vsub,
+ int xm, int left, int right, int hband)
+{
+ int x;
+
+ if (left) {
+ blend_pixel16(dst, src, alpha, mask, mask_linesize, l2depth,
+ left, hband, hsub + vsub, xm);
+ dst += dst_delta;
+ xm += left;
+ }
+ for (x = 0; x < w; x++) {
+ blend_pixel16(dst, src, alpha, mask, mask_linesize, l2depth,
+ 1 << hsub, hband, hsub + vsub, xm);
+ dst += dst_delta;
+ xm += 1 << hsub;
+ }
+ if (right)
+ blend_pixel16(dst, src, alpha, mask, mask_linesize, l2depth,
+ right, hband, hsub + vsub, xm);
+}
+
static void blend_line_hv(uint8_t *dst, int dst_delta,
unsigned src, unsigned alpha,
const uint8_t *mask, int mask_linesize, int l2depth, int w,
@@ -474,9 +596,13 @@ void ff_blend_mask(FFDrawContext *draw, FFDrawColor *color,
mask += ym0 * mask_linesize;
if (mask_w <= 0 || mask_h <= 0 || !color->rgba[3])
return;
- /* alpha is in the [ 0 ; 0x10203 ] range,
- alpha * mask is in the [ 0 ; 0x1010101 - 4 ] range */
- alpha = (0x10307 * color->rgba[3] + 0x3) >> 8;
+ if (draw->desc->comp[0].depth <= 8) {
+ /* alpha is in the [ 0 ; 0x10203 ] range,
+ alpha * mask is in the [ 0 ; 0x1010101 - 4 ] range */
+ alpha = (0x10307 * color->rgba[3] + 0x3) >> 8;
+ } else {
+ alpha = (0x101 * color->rgba[3] + 0x2) >> 8;
+ }
nb_planes = (draw->nb_planes - 1) | 1; /* eliminate alpha */
for (plane = 0; plane < nb_planes; plane++) {
nb_comp = draw->pixelstep[plane];
@@ -493,29 +619,58 @@ void ff_blend_mask(FFDrawContext *draw, FFDrawColor *color,
p = p0 + comp;
m = mask;
if (top) {
- blend_line_hv(p, draw->pixelstep[plane],
- color->comp[plane].u8[comp], alpha,
- m, mask_linesize, l2depth, w_sub,
- draw->hsub[plane], draw->vsub[plane],
- xm0, left, right, top);
+ if (draw->desc->comp[comp].depth <= 8) {
+ blend_line_hv(p, draw->pixelstep[plane],
+ color->comp[plane].u8[comp], alpha,
+ m, mask_linesize, l2depth, w_sub,
+ draw->hsub[plane], draw->vsub[plane],
+ xm0, left, right, top);
+ } else {
+ blend_line_hv16(p, draw->pixelstep[plane],
+ color->comp[plane].u16[comp], alpha,
+ m, mask_linesize, l2depth, w_sub,
+ draw->hsub[plane], draw->vsub[plane],
+ xm0, left, right, top);
+ }
p += dst_linesize[plane];
m += top * mask_linesize;
}
- for (y = 0; y < h_sub; y++) {
- blend_line_hv(p, draw->pixelstep[plane],
- color->comp[plane].u8[comp], alpha,
- m, mask_linesize, l2depth, w_sub,
- draw->hsub[plane], draw->vsub[plane],
- xm0, left, right, 1 << draw->vsub[plane]);
- p += dst_linesize[plane];
- m += mask_linesize << draw->vsub[plane];
+ if (draw->desc->comp[comp].depth <= 8) {
+ for (y = 0; y < h_sub; y++) {
+ blend_line_hv(p, draw->pixelstep[plane],
+ color->comp[plane].u8[comp], alpha,
+ m, mask_linesize, l2depth, w_sub,
+ draw->hsub[plane], draw->vsub[plane],
+ xm0, left, right, 1 << draw->vsub[plane]);
+ p += dst_linesize[plane];
+ m += mask_linesize << draw->vsub[plane];
+ }
+ } else {
+ for (y = 0; y < h_sub; y++) {
+ blend_line_hv16(p, draw->pixelstep[plane],
+ color->comp[plane].u16[comp], alpha,
+ m, mask_linesize, l2depth, w_sub,
+ draw->hsub[plane], draw->vsub[plane],
+ xm0, left, right, 1 << draw->vsub[plane]);
+ p += dst_linesize[plane];
+ m += mask_linesize << draw->vsub[plane];
+ }
+ }
+ if (bottom) {
+ if (draw->desc->comp[comp].depth <= 8) {
+ blend_line_hv(p, draw->pixelstep[plane],
+ color->comp[plane].u8[comp], alpha,
+ m, mask_linesize, l2depth, w_sub,
+ draw->hsub[plane], draw->vsub[plane],
+ xm0, left, right, bottom);
+ } else {
+ blend_line_hv16(p, draw->pixelstep[plane],
+ color->comp[plane].u16[comp], alpha,
+ m, mask_linesize, l2depth, w_sub,
+ draw->hsub[plane], draw->vsub[plane],
+ xm0, left, right, bottom);
+ }
}
- if (bottom)
- blend_line_hv(p, draw->pixelstep[plane],
- color->comp[plane].u8[comp], alpha,
- m, mask_linesize, l2depth, w_sub,
- draw->hsub[plane], draw->vsub[plane],
- xm0, left, right, bottom);
}
}
}
diff --git a/libavfilter/drawutils.h b/libavfilter/drawutils.h
index e247dd6..1fb3e4f 100644
--- a/libavfilter/drawutils.h
+++ b/libavfilter/drawutils.h
@@ -60,9 +60,9 @@ typedef struct FFDrawContext {
typedef struct FFDrawColor {
uint8_t rgba[4];
union {
- uint32_t u32;
- uint16_t u16;
- uint8_t u8[4];
+ uint32_t u32[4];
+ uint16_t u16[8];
+ uint8_t u8[16];
} comp[MAX_PLANES];
} FFDrawColor;
--
1.9.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
