[FFmpeg-cvslog] r17135 - in trunk/libavcodec: cavsdec.c cavsdsp.c x86/cavsdsp_mmx.c

[stefang]

Author: stefang
Date: Tue Feb 10 17:45:02 2009
New Revision: 17135

Log:
avoid duplicating dsputil's clear_block

Modified:
   trunk/libavcodec/cavsdec.c
   trunk/libavcodec/cavsdsp.c
   trunk/libavcodec/x86/cavsdsp_mmx.c

Modified: trunk/libavcodec/cavsdec.c
==============================================================================
--- trunk/libavcodec/cavsdec.c	Tue Feb 10 17:36:01 2009	(r17134)
+++ trunk/libavcodec/cavsdec.c	Tue Feb 10 17:45:02 2009	(r17135)
@@ -144,6 +144,7 @@ static int decode_residual_block(AVSCont
                ff_cavs_dequant_shift[qp], i))
         return -1;
     h->s.dsp.cavs_idct8_add(dst,block,stride);
+    h->s.dsp.clear_block(block);
     return 0;
 }
 

Modified: trunk/libavcodec/cavsdsp.c
==============================================================================
--- trunk/libavcodec/cavsdsp.c	Tue Feb 10 17:36:01 2009	(r17134)
+++ trunk/libavcodec/cavsdsp.c	Tue Feb 10 17:45:02 2009	(r17135)
@@ -248,7 +248,6 @@ static void cavs_idct8_add_c(uint8_t *ds
         dst[i + 6*stride] = cm[ dst[i + 6*stride] + ((b1 - b5) >> 7)];
         dst[i + 7*stride] = cm[ dst[i + 7*stride] + ((b0 - b4) >> 7)];
     }
-    memset(block,0,64*sizeof(DCTELEM));
 }
 
 /*****************************************************************************

Modified: trunk/libavcodec/x86/cavsdsp_mmx.c
==============================================================================
--- trunk/libavcodec/x86/cavsdsp_mmx.c	Tue Feb 10 17:36:01 2009	(r17134)
+++ trunk/libavcodec/x86/cavsdsp_mmx.c	Tue Feb 10 17:45:02 2009	(r17135)
@@ -173,28 +173,6 @@ static void cavs_idct8_add_mmx(uint8_t *
     }
 
     add_pixels_clamped_mmx(b2, dst, stride);
-
-    /* clear block */
-    __asm__ volatile(
-            "pxor %%mm7, %%mm7   \n\t"
-            "movq %%mm7, (%0)    \n\t"
-            "movq %%mm7, 8(%0)   \n\t"
-            "movq %%mm7, 16(%0)  \n\t"
-            "movq %%mm7, 24(%0)  \n\t"
-            "movq %%mm7, 32(%0)  \n\t"
-            "movq %%mm7, 40(%0)  \n\t"
-            "movq %%mm7, 48(%0)  \n\t"
-            "movq %%mm7, 56(%0)  \n\t"
-            "movq %%mm7, 64(%0)  \n\t"
-            "movq %%mm7, 72(%0)  \n\t"
-            "movq %%mm7, 80(%0)  \n\t"
-            "movq %%mm7, 88(%0)  \n\t"
-            "movq %%mm7, 96(%0)  \n\t"
-            "movq %%mm7, 104(%0) \n\t"
-            "movq %%mm7, 112(%0) \n\t"
-            "movq %%mm7, 120(%0) \n\t"
-            :: "r" (block)
-    );
 }
 
 /*****************************************************************************