diff options
| author | Stefan Gehrer <stefan.gehrer@gmx.de> | 2009-02-10 16:45:02 +0000 |
|---|---|---|
| committer | Stefan Gehrer <stefan.gehrer@gmx.de> | 2009-02-10 16:45:02 +0000 |
| commit | e090c70f2f7e9c64696964517c2503e3ce7d274d (patch) | |
| tree | 2fd775cdd27f0124388542bcfe88aff079d37e8b | |
| parent | ae2d3e3b25a39328e878f67a63be006e4c8d5251 (diff) | |
avoid duplicating dsputil's clear_block
Originally committed as revision 17135 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/cavsdec.c | 1 | ||||
| -rw-r--r-- | libavcodec/cavsdsp.c | 1 | ||||
| -rw-r--r-- | libavcodec/x86/cavsdsp_mmx.c | 22 |
3 files changed, 1 insertions, 23 deletions
diff --git a/libavcodec/cavsdec.c b/libavcodec/cavsdec.c index a2c8a1ad91..b4d3e978ad 100644 --- a/libavcodec/cavsdec.c +++ b/libavcodec/cavsdec.c @@ -144,6 +144,7 @@ static int decode_residual_block(AVSContext *h, GetBitContext *gb, 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; } diff --git a/libavcodec/cavsdsp.c b/libavcodec/cavsdsp.c index fd744cc808..69d3bd2323 100644 --- a/libavcodec/cavsdsp.c +++ b/libavcodec/cavsdsp.c @@ -248,7 +248,6 @@ static void cavs_idct8_add_c(uint8_t *dst, DCTELEM *block, int stride) { 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)); } /***************************************************************************** diff --git a/libavcodec/x86/cavsdsp_mmx.c b/libavcodec/x86/cavsdsp_mmx.c index 2000ba524a..012e6c6ba0 100644 --- a/libavcodec/x86/cavsdsp_mmx.c +++ b/libavcodec/x86/cavsdsp_mmx.c @@ -173,28 +173,6 @@ static void cavs_idct8_add_mmx(uint8_t *dst, int16_t *block, int stride) } 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) - ); } /***************************************************************************** |