Skip to content
Snippets Groups Projects
Commit 6da971f1 authored by Loren Merritt's avatar Loren Merritt
Browse files

h264_idct_add only needs mmx1

Originally committed as revision 5122 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 6e269594
Branches
Tags
No related merge requests found
...@@ -2732,6 +2732,9 @@ void dsputil_init_mmx(DSPContext* c, AVCodecContext *avctx) ...@@ -2732,6 +2732,9 @@ void dsputil_init_mmx(DSPContext* c, AVCodecContext *avctx)
c->put_h264_chroma_pixels_tab[0]= put_h264_chroma_mc8_mmx; c->put_h264_chroma_pixels_tab[0]= put_h264_chroma_mc8_mmx;
c->put_h264_chroma_pixels_tab[1]= put_h264_chroma_mc4_mmx; c->put_h264_chroma_pixels_tab[1]= put_h264_chroma_mc4_mmx;
c->h264_idct_dc_add=
c->h264_idct_add= ff_h264_idct_add_mmx;
if (mm_flags & MM_MMXEXT) { if (mm_flags & MM_MMXEXT) {
c->put_pixels_tab[0][1] = put_pixels16_x2_mmx2; c->put_pixels_tab[0][1] = put_pixels16_x2_mmx2;
c->put_pixels_tab[0][2] = put_pixels16_y2_mmx2; c->put_pixels_tab[0][2] = put_pixels16_y2_mmx2;
...@@ -2753,7 +2756,6 @@ void dsputil_init_mmx(DSPContext* c, AVCodecContext *avctx) ...@@ -2753,7 +2756,6 @@ void dsputil_init_mmx(DSPContext* c, AVCodecContext *avctx)
c->vsad[4]= vsad_intra16_mmx2; c->vsad[4]= vsad_intra16_mmx2;
#endif //CONFIG_ENCODERS #endif //CONFIG_ENCODERS
c->h264_idct_add= ff_h264_idct_add_mmx2;
c->h264_idct_dc_add= ff_h264_idct_dc_add_mmx2; c->h264_idct_dc_add= ff_h264_idct_dc_add_mmx2;
c->h264_idct8_dc_add= ff_h264_idct8_dc_add_mmx2; c->h264_idct8_dc_add= ff_h264_idct8_dc_add_mmx2;
......
...@@ -65,7 +65,7 @@ ...@@ -65,7 +65,7 @@
"packuswb "#z", "#p" \n\t"\ "packuswb "#z", "#p" \n\t"\
"movd "#p", (%0) \n\t" "movd "#p", (%0) \n\t"
void ff_h264_idct_add_mmx2(uint8_t *dst, int16_t *block, int stride) static void ff_h264_idct_add_mmx(uint8_t *dst, int16_t *block, int stride)
{ {
/* Load dct coeffs */ /* Load dct coeffs */
asm volatile( asm volatile(
...@@ -104,7 +104,7 @@ void ff_h264_idct_add_mmx2(uint8_t *dst, int16_t *block, int stride) ...@@ -104,7 +104,7 @@ void ff_h264_idct_add_mmx2(uint8_t *dst, int16_t *block, int stride)
); );
} }
void ff_h264_idct_dc_add_mmx2(uint8_t *dst, int16_t *block, int stride) static void ff_h264_idct_dc_add_mmx2(uint8_t *dst, int16_t *block, int stride)
{ {
int dc = (block[0] + 32) >> 6; int dc = (block[0] + 32) >> 6;
asm volatile( asm volatile(
...@@ -140,7 +140,7 @@ void ff_h264_idct_dc_add_mmx2(uint8_t *dst, int16_t *block, int stride) ...@@ -140,7 +140,7 @@ void ff_h264_idct_dc_add_mmx2(uint8_t *dst, int16_t *block, int stride)
); );
} }
void ff_h264_idct8_dc_add_mmx2(uint8_t *dst, int16_t *block, int stride) static void ff_h264_idct8_dc_add_mmx2(uint8_t *dst, int16_t *block, int stride)
{ {
int dc = (block[0] + 32) >> 6; int dc = (block[0] + 32) >> 6;
int y; int y;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment