[FFmpeg-devel] [PATCH 3/5] lavfi/gradfun: fix dithering in MMX code.

[Clément Bœsch]

On Tue, Dec 11, 2012 at 08:13:52AM +0100, Michael Niedermayer wrote:
> On Tue, Dec 11, 2012 at 01:21:58AM +0100, Clément Bœsch wrote:
> > On Fri, Dec 07, 2012 at 08:50:48AM +0100, Reimar Döffinger wrote:
> > > "Clément Bœsch" <ubitux at gmail.com> wrote:
> > > 
> > > >Current dithering only use the first 4w instead of the whole 8 random
> > > >values.
> > > 
> > > I think you should benchmark it, I suspect leaving the comparison in the middle instead of having the C version handle more pixels might be faster.
> > 
> > Yes indeed, with a width=719 it's indeed a little faster to add a
> > comparison in the middle.
> > 
> > Note: the dithers+4 is a little ugly, any suggestion welcome (and a later
> > commit to at least make it close to *dithers might be a good idea)
> 
> "r"(dithers)
> and address based on that
> the 2 as its now after the patch might also cause problems for some
> gcc on x86-32
> 

OK, thanks, new patch attached.

-- 
Clément B.
-------------- next part --------------
From b633360ecd13f8ad89f382d9d844bc352413b56b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20B=C5=93sch?= <ubitux at gmail.com>
Date: Fri, 7 Dec 2012 00:39:31 +0100
Subject: [PATCH 3/5] lavfi/gradfun: fix dithering in MMX code.

Current dithering only use the first 4w instead of the whole 8 random values.
---
 libavfilter/x86/gradfun.c | 31 +++++++++++++++++++++++++++++--
 1 file changed, 29 insertions(+), 2 deletions(-)

diff --git a/libavfilter/x86/gradfun.c b/libavfilter/x86/gradfun.c
index 1ca5928..be3e6a9 100644
--- a/libavfilter/x86/gradfun.c
+++ b/libavfilter/x86/gradfun.c
@@ -46,7 +46,9 @@ static void gradfun_filter_line_mmxext(uint8_t *dst, const uint8_t *src, const u
         "pxor       %%mm7, %%mm7 \n"
         "pshufw $0, %%mm5, %%mm5 \n"
         "movq          %6, %%mm6 \n"
-        "movq          %5, %%mm4 \n"
+        "movq          (%5), %%mm3 \n"
+        "movq         8(%5), %%mm4 \n"
+
         "1: \n"
         "movd     (%2,%0), %%mm0 \n"
         "movd     (%3,%0), %%mm1 \n"
@@ -61,6 +63,29 @@ static void gradfun_filter_line_mmxext(uint8_t *dst, const uint8_t *src, const u
         "psubw      %%mm6, %%mm2 \n"
         "pminsw     %%mm7, %%mm2 \n" // m = -max(0, 127-m)
         "pmullw     %%mm2, %%mm2 \n"
+        "paddw      %%mm3, %%mm0 \n" // pix += dither
+        "psllw         $2, %%mm1 \n" // m = m*m*delta >> 14
+        "pmulhw     %%mm2, %%mm1 \n"
+        "paddw      %%mm1, %%mm0 \n" // pix += m
+        "psraw         $7, %%mm0 \n"
+        "packuswb   %%mm0, %%mm0 \n"
+        "movd       %%mm0, (%1,%0) \n" // dst = clip(pix>>7)
+        "add           $4, %0 \n"
+        "jnl 2f \n"
+
+        "movd     (%2,%0), %%mm0 \n"
+        "movd     (%3,%0), %%mm1 \n"
+        "punpcklbw  %%mm7, %%mm0 \n"
+        "punpcklwd  %%mm1, %%mm1 \n"
+        "psllw         $7, %%mm0 \n"
+        "pxor       %%mm2, %%mm2 \n"
+        "psubw      %%mm0, %%mm1 \n" // delta = dc - pix
+        "psubw      %%mm1, %%mm2 \n"
+        "pmaxsw     %%mm1, %%mm2 \n"
+        "pmulhuw    %%mm5, %%mm2 \n" // m = abs(delta) * thresh >> 16
+        "psubw      %%mm6, %%mm2 \n"
+        "pminsw     %%mm7, %%mm2 \n" // m = -max(0, 127-m)
+        "pmullw     %%mm2, %%mm2 \n"
         "paddw      %%mm4, %%mm0 \n" // pix += dither
         "psllw         $2, %%mm1 \n" // m = m*m*delta >> 14
         "pmulhw     %%mm2, %%mm1 \n"
@@ -70,10 +95,12 @@ static void gradfun_filter_line_mmxext(uint8_t *dst, const uint8_t *src, const u
         "movd       %%mm0, (%1,%0) \n" // dst = clip(pix>>7)
         "add           $4, %0 \n"
         "jl 1b \n"
+
+        "2: \n"
         "emms \n"
         :"+r"(x)
         :"r"(dst+width), "r"(src+width), "r"(dc+width/2),
-         "rm"(thresh), "m"(*dithers), "m"(*pw_7f)
+         "rm"(thresh), "r"(dithers), "m"(*pw_7f)
         :"memory"
     );
 }
-- 
1.8.0.2

-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 490 bytes
Desc: not available
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20121216/c11676d9/attachment.asc>