diff options
Diffstat (limited to 'libavcodec/ps2')
| -rw-r--r-- | libavcodec/ps2/dsputil_mmi.c | 2 | ||||
| -rw-r--r-- | libavcodec/ps2/idct_mmi.c | 34 | ||||
| -rw-r--r-- | libavcodec/ps2/mpegvideo_mmi.c | 22 |
3 files changed, 29 insertions, 29 deletions
diff --git a/libavcodec/ps2/dsputil_mmi.c b/libavcodec/ps2/dsputil_mmi.c index 8d1bf4ba78..456e5b2c9c 100644 --- a/libavcodec/ps2/dsputil_mmi.c +++ b/libavcodec/ps2/dsputil_mmi.c @@ -150,7 +150,7 @@ void dsputil_init_mmi(DSPContext* c, AVCodecContext *avctx) c->put_no_rnd_pixels_tab[0][0] = put_pixels16_mmi; c->get_pixels = get_pixels_mmi; - + if(idct_algo==FF_IDCT_AUTO || idct_algo==FF_IDCT_PS2){ c->idct_put= ff_mmi_idct_put; c->idct_add= ff_mmi_idct_add; diff --git a/libavcodec/ps2/idct_mmi.c b/libavcodec/ps2/idct_mmi.c index 1d2c7e9374..9376df6a8a 100644 --- a/libavcodec/ps2/idct_mmi.c +++ b/libavcodec/ps2/idct_mmi.c @@ -10,7 +10,7 @@ Rounding trick Copyright (c) 2000 Michel Lespinasse <walken@zoy.org> MMI port by Leon van Stuivenberg -*/ +*/ #include "../common.h" #include "../dsputil.h" #include "mmi.h" @@ -45,24 +45,24 @@ static short consttable[] align16 = { /* rounder 1*/ 0x3ff, 0, 0x3ff, 0, 0x3ff, 0, 0x3ff, 0, /* row 0/4*/ - 16384, 21407, -16384, -21407, 22725, 19266, -22725, -12873, - 8867, 16384, 8867, 16384, 4520, 12873, -4520, 19266, - 16384, -8867, 16384, -8867, 12873, -22725, 19266, -22725, - 21407, -16384, -21407, 16384, 19266, 4520, -12873, 4520, + 16384, 21407, -16384, -21407, 22725, 19266, -22725, -12873, + 8867, 16384, 8867, 16384, 4520, 12873, -4520, 19266, + 16384, -8867, 16384, -8867, 12873, -22725, 19266, -22725, + 21407, -16384, -21407, 16384, 19266, 4520, -12873, 4520, /* row 1/7*/ - 22725, 29692, -22725, -29692, 31521, 26722, -31521, -17855, - 12299, 22725, 12299, 22725, 6270, 17855, -6270, 26722, - 22725, -12299, 22725, -12299, 17855, -31521, 26722, -31521, - 29692, -22725, -29692, 22725, 26722, 6270, -17855, 6270, + 22725, 29692, -22725, -29692, 31521, 26722, -31521, -17855, + 12299, 22725, 12299, 22725, 6270, 17855, -6270, 26722, + 22725, -12299, 22725, -12299, 17855, -31521, 26722, -31521, + 29692, -22725, -29692, 22725, 26722, 6270, -17855, 6270, /* row 2/6*/ - 21407, 27969, -21407, -27969, 29692, 25172, -29692, -16819, - 11585, 21407, 11585, 21407, 5906, 16819, -5906, 25172, - 21407, -11585, 21407, -11585, 16819, -29692, 25172, -29692, - 27969, -21407, -27969, 21407, 25172, 5906, -16819, 5906, + 21407, 27969, -21407, -27969, 29692, 25172, -29692, -16819, + 11585, 21407, 11585, 21407, 5906, 16819, -5906, 25172, + 21407, -11585, 21407, -11585, 16819, -29692, 25172, -29692, + 27969, -21407, -27969, 21407, 25172, 5906, -16819, 5906, /*row 3/5*/ - 19266, 25172, -19266, -25172, 26722, 22654, -26722, -15137, - 10426, 19266, 10426, 19266, 5315, 15137, -5315, 22654, - 19266, -10426, 19266, -10426, 15137, -26722, 22654, -26722, + 19266, 25172, -19266, -25172, 26722, 22654, -26722, -15137, + 10426, 19266, 10426, 19266, 5315, 15137, -5315, 22654, + 19266, -10426, 19266, -10426, 15137, -26722, 22654, -26722, 25172, -19266, -25172, 19266, 22654, 5315, -15137, 5315, /*column constants*/ TG1, TG1, TG1, TG1, TG1, TG1, TG1, TG1, @@ -293,7 +293,7 @@ void ff_mmi_idct(int16_t * block) DCT_8_INV_ROW1($4, 112, TAB_i_17, $7, $15); DCT_8_INV_COL8(); DCT_8_INV_COL8_STORE($4); - + //let savedtemp regs be saved __asm__ __volatile__(" ":::"$16", "$17", "$18", "$19", "$20", "$21", "$22", "$23"); } diff --git a/libavcodec/ps2/mpegvideo_mmi.c b/libavcodec/ps2/mpegvideo_mmi.c index 2d706b8229..d37dcb6525 100644 --- a/libavcodec/ps2/mpegvideo_mmi.c +++ b/libavcodec/ps2/mpegvideo_mmi.c @@ -17,25 +17,25 @@ * * MMI optimization by Leon van Stuivenberg */ - + #include "../dsputil.h" #include "../mpegvideo.h" #include "../avcodec.h" -static void dct_unquantize_h263_mmi(MpegEncContext *s, +static void dct_unquantize_h263_mmi(MpegEncContext *s, DCTELEM *block, int n, int qscale) { int level=0, qmul, qadd; int nCoeffs; - + assert(s->block_last_index[n]>=0); - + qadd = (qscale - 1) | 1; qmul = qscale << 1; - + if (s->mb_intra) { if (!s->h263_aic) { - if (n < 4) + if (n < 4) level = block[0] * s->y_dc_scale; else level = block[0] * s->c_dc_scale; @@ -43,16 +43,16 @@ static void dct_unquantize_h263_mmi(MpegEncContext *s, qadd = 0; level = block[0]; } - nCoeffs= 63; //does not allways use zigzag table + nCoeffs= 63; //does not allways use zigzag table } else { nCoeffs= s->intra_scantable.raster_end[ s->block_last_index[n] ]; } asm volatile( "add $14, $0, %3 \n\t" - "pcpyld $8, %0, %0 \n\t" + "pcpyld $8, %0, %0 \n\t" "pcpyh $8, $8 \n\t" //r8 = qmul - "pcpyld $9, %1, %1 \n\t" + "pcpyld $9, %1, %1 \n\t" "pcpyh $9, $9 \n\t" //r9 = qadd ".p2align 2 \n\t" "1: \n\t" @@ -62,7 +62,7 @@ static void dct_unquantize_h263_mmi(MpegEncContext *s, "pcgth $11, $0, $10 \n\t" //r11 = level < 0 ? -1 : 0 "pcgth $12, $10, $0 \n\t" //r12 = level > 0 ? -1 : 0 "por $12, $11, $12 \n\t" - "pmulth $10, $10, $8 \n\t" + "pmulth $10, $10, $8 \n\t" "paddh $13, $9, $11 \n\t" "pxor $13, $13, $11 \n\t" //r13 = level < 0 ? -qadd : qadd "pmfhl.uw $11 \n\t" @@ -80,7 +80,7 @@ static void dct_unquantize_h263_mmi(MpegEncContext *s, void MPV_common_init_mmi(MpegEncContext *s) { - s->dct_unquantize_h263_intra = + s->dct_unquantize_h263_intra = s->dct_unquantize_h263_inter = dct_unquantize_h263_mmi; } |