* implemented remaing avg_ pixel functions (these are not used offen)

Originally committed as revision 656 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/i386/dsputil_mmx_rnd.h b/libavcodec/i386/dsputil_mmx_rnd.h
index 585fdb0..dc70c9c 100644 (file)
--- a/libavcodec/i386/dsputil_mmx_rnd.h
+++ b/libavcodec/i386/dsputil_mmx_rnd.h
@@ -65,8 +65,8 @@ static void DEF(put, pixels_y2)(UINT8 *block, const UINT8 *pixels, int line_size
        "movq   (%1, %3), %%mm1         \n\t"
        "movq   (%1, %%eax),%%mm2       \n\t"
        PAVGBP(%%mm1, %%mm0, %%mm4,   %%mm2, %%mm1, %%mm5)
-        "movq  %%mm4, (%2)             \n\t"
-        "movq  %%mm5, (%2, %3)         \n\t"
+       "movq   %%mm4, (%2)             \n\t"
+       "movq   %%mm5, (%2, %3)         \n\t"
        "addl   %%eax, %1               \n\t"
        "addl   %%eax, %2               \n\t"
        "movq   (%1, %3), %%mm1         \n\t"
@@ -100,7 +100,7 @@ static void DEF(put, pixels_xy2)(UINT8 *block, const UINT8 *pixels, int line_siz
        "paddusw %%mm1, %%mm5           \n\t"
        "xorl   %%eax, %%eax            \n\t"
        "addl   %3, %1                  \n\t"
-       ".balign 4                      \n\t"
+       ".balign 8                      \n\t"
        "1:                             \n\t"
        "movq   (%1, %%eax), %%mm0      \n\t"
        "movq   1(%1, %%eax), %%mm2     \n\t"
@@ -150,3 +150,156 @@ static void DEF(put, pixels_xy2)(UINT8 *block, const UINT8 *pixels, int line_siz
 }
 
 // avg_pixels
+// in case more speed is needed - unroling would certainly help
+static void DEF(avg, pixels)(UINT8 *block, const UINT8 *pixels, int line_size, int h)
+{
+    MOVQ_BFE(mm6);
+    JUMPALIGN();
+    do {
+       __asm __volatile(
+            "movq  %0, %%mm0           \n\t"
+            "movq  %1, %%mm1           \n\t"
+            PAVGB(%%mm0, %%mm1, %%mm2, %%mm6)
+            "movq  %%mm2, %0           \n\t"
+            :"+m"(*block)
+            :"m"(*pixels)
+            :"memory");
+       pixels += line_size;
+       block += line_size;
+    }
+    while (--h);
+}
+
+static void DEF(avg, pixels_x2)(UINT8 *block, const UINT8 *pixels, int line_size, int h)
+{
+    MOVQ_BFE(mm6);
+    JUMPALIGN();
+    do {
+       __asm __volatile(
+           "movq  %1, %%mm0            \n\t"
+           "movq  1%1, %%mm1           \n\t"
+           "movq  %0, %%mm3            \n\t"
+           PAVGB(%%mm0, %%mm1, %%mm2, %%mm6)
+           PAVGB(%%mm3, %%mm2, %%mm0, %%mm6)
+           "movq  %%mm0, %0            \n\t"
+           :"+m"(*block)
+           :"m"(*pixels)
+           :"memory");
+       pixels += line_size;
+       block += line_size;
+    } while (--h);
+}
+
+static void DEF(avg, pixels_y2)(UINT8 *block, const UINT8 *pixels, int line_size, int h)
+{
+    MOVQ_BFE(mm6);
+    __asm __volatile(
+       "lea    (%3, %3), %%eax         \n\t"
+       "movq   (%1), %%mm0             \n\t"
+       ".balign 8                      \n\t"
+       "1:                             \n\t"
+       "movq   (%1, %3), %%mm1         \n\t"
+       "movq   (%1, %%eax), %%mm2      \n\t"
+       PAVGBP(%%mm1, %%mm0, %%mm4,   %%mm2, %%mm1, %%mm5)
+       "movq   (%2), %%mm3             \n\t"
+       PAVGB(%%mm3, %%mm4, %%mm0, %%mm6)
+       "movq   (%2, %3), %%mm3         \n\t"
+       PAVGB(%%mm3, %%mm5, %%mm1, %%mm6)
+       "movq   %%mm0, (%2)             \n\t"
+       "movq   %%mm1, (%2, %3)         \n\t"
+       "addl   %%eax, %1               \n\t"
+       "addl   %%eax, %2               \n\t"
+
+       "movq   (%1, %3), %%mm1         \n\t"
+       "movq   (%1, %%eax), %%mm0      \n\t"
+       PAVGBP(%%mm1, %%mm2, %%mm4,   %%mm0, %%mm1, %%mm5)
+       "movq   (%2), %%mm3             \n\t"
+       PAVGB(%%mm3, %%mm4, %%mm0, %%mm6)
+       "movq   (%2, %3), %%mm3         \n\t"
+       PAVGB(%%mm3, %%mm5, %%mm1, %%mm6)
+       "movq   %%mm0, (%2)             \n\t"
+       "movq   %%mm1, (%2, %3)         \n\t"
+       "addl   %%eax, %1               \n\t"
+       "addl   %%eax, %2               \n\t"
+
+       "subl   $4, %0                  \n\t"
+       "jnz    1b                      \n\t"
+       :"+g"(h), "+S"(pixels), "+D"(block)
+       :"r"(line_size)
+       :"eax", "memory");
+}
+
+// this routine is 'slightly' suboptimal but mostly unused
+static void DEF(avg, pixels_xy2)(UINT8 *block, const UINT8 *pixels, int line_size, int h)
+{
+    MOVQ_ZERO(mm7);
+    SET_RND(mm6); // =2 for rnd  and  =1 for no_rnd version
+    __asm __volatile(
+       "movq   (%1), %%mm0             \n\t"
+       "movq   1(%1), %%mm4            \n\t"
+       "movq   %%mm0, %%mm1            \n\t"
+       "movq   %%mm4, %%mm5            \n\t"
+       "punpcklbw %%mm7, %%mm0         \n\t"
+       "punpcklbw %%mm7, %%mm4         \n\t"
+       "punpckhbw %%mm7, %%mm1         \n\t"
+       "punpckhbw %%mm7, %%mm5         \n\t"
+       "paddusw %%mm0, %%mm4           \n\t"
+       "paddusw %%mm1, %%mm5           \n\t"
+       "xorl   %%eax, %%eax            \n\t"
+       "addl   %3, %1                  \n\t"
+       ".balign 8                      \n\t"
+       "1:                             \n\t"
+       "movq   (%1, %%eax), %%mm0      \n\t"
+       "movq   1(%1, %%eax), %%mm2     \n\t"
+       "movq   %%mm0, %%mm1            \n\t"
+       "movq   %%mm2, %%mm3            \n\t"
+       "punpcklbw %%mm7, %%mm0         \n\t"
+       "punpcklbw %%mm7, %%mm2         \n\t"
+       "punpckhbw %%mm7, %%mm1         \n\t"
+       "punpckhbw %%mm7, %%mm3         \n\t"
+       "paddusw %%mm2, %%mm0           \n\t"
+       "paddusw %%mm3, %%mm1           \n\t"
+       "paddusw %%mm6, %%mm4           \n\t"
+       "paddusw %%mm6, %%mm5           \n\t"
+       "paddusw %%mm0, %%mm4           \n\t"
+       "paddusw %%mm1, %%mm5           \n\t"
+       "psrlw  $2, %%mm4               \n\t"
+       "psrlw  $2, %%mm5               \n\t"
+               "movq   (%2, %%eax), %%mm3      \n\t"
+       "packuswb  %%mm5, %%mm4         \n\t"
+               "pcmpeqd %%mm2, %%mm2   \n\t"
+               "paddb %%mm2, %%mm2     \n\t"
+               PAVGB(%%mm3, %%mm4, %%mm5, %%mm2)
+               "movq   %%mm5, (%2, %%eax)      \n\t"
+       "addl   %3, %%eax               \n\t"
+
+       "movq   (%1, %%eax), %%mm2      \n\t" // 0 <-> 2   1 <-> 3
+       "movq   1(%1, %%eax), %%mm4     \n\t"
+       "movq   %%mm2, %%mm3            \n\t"
+       "movq   %%mm4, %%mm5            \n\t"
+       "punpcklbw %%mm7, %%mm2         \n\t"
+       "punpcklbw %%mm7, %%mm4         \n\t"
+       "punpckhbw %%mm7, %%mm3         \n\t"
+       "punpckhbw %%mm7, %%mm5         \n\t"
+       "paddusw %%mm2, %%mm4           \n\t"
+       "paddusw %%mm3, %%mm5           \n\t"
+       "paddusw %%mm6, %%mm0           \n\t"
+       "paddusw %%mm6, %%mm1           \n\t"
+       "paddusw %%mm4, %%mm0           \n\t"
+       "paddusw %%mm5, %%mm1           \n\t"
+       "psrlw  $2, %%mm0               \n\t"
+       "psrlw  $2, %%mm1               \n\t"
+               "movq   (%2, %%eax), %%mm3      \n\t"
+       "packuswb  %%mm1, %%mm0         \n\t"
+               "pcmpeqd %%mm2, %%mm2   \n\t"
+               "paddb %%mm2, %%mm2     \n\t"
+               PAVGB(%%mm3, %%mm0, %%mm1, %%mm2)
+               "movq   %%mm1, (%2, %%eax)      \n\t"
+       "addl   %3, %%eax               \n\t"
+
+       "subl   $2, %0                  \n\t"
+       "jnz    1b                      \n\t"
+       :"+g"(h), "+S"(pixels)
+       :"D"(block), "r"(line_size)
+       :"eax", "memory");
+}