[Ffmpeg-cvslog] CVS: ffmpeg/libavcodec/ps2 dsputil_mmi.c, 1.10, 1.11 idct_mmi.c, 1.5, 1.6 mpegvideo_mmi.c, 1.6, 1.7
Diego Biurrun CVS
diego
Sat Dec 17 19:15:09 CET 2005
- Previous message: [Ffmpeg-cvslog] CVS: ffmpeg/libavcodec/alpha asm.h, 1.8, 1.9 dsputil_alpha.c, 1.22, 1.23 dsputil_alpha_asm.S, 1.5, 1.6 motion_est_alpha.c, 1.3, 1.4 motion_est_mvi_asm.S, 1.2, 1.3 mpegvideo_alpha.c, 1.12, 1.13 simple_idct_alpha.c, 1.4, 1.5
- Next message: [Ffmpeg-cvslog] CVS: ffmpeg/libavcodec/sh4 dsputil_align.c, 1.2, 1.3 dsputil_sh4.c, 1.3, 1.4 idct_sh4.c, 1.2, 1.3 qpel.c, 1.2, 1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/ffmpeg/ffmpeg/libavcodec/ps2
In directory mail:/var2/tmp/cvs-serv18206/libavcodec/ps2
Modified Files:
dsputil_mmi.c idct_mmi.c mpegvideo_mmi.c
Log Message:
COSMETICS: Remove all trailing whitespace.
Index: dsputil_mmi.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/ps2/dsputil_mmi.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- dsputil_mmi.c 13 Mar 2004 19:21:58 -0000 1.10
+++ dsputil_mmi.c 17 Dec 2005 18:14:35 -0000 1.11
@@ -150,7 +150,7 @@
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;
Index: idct_mmi.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/ps2/idct_mmi.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- idct_mmi.c 13 Mar 2004 19:21:58 -0000 1.5
+++ idct_mmi.c 17 Dec 2005 18:14:35 -0000 1.6
@@ -10,7 +10,7 @@
Rounding trick Copyright (c) 2000 Michel Lespinasse <walken at zoy.org>
MMI port by Leon van Stuivenberg
-*/
+*/
#include "../common.h"
#include "../dsputil.h"
#include "mmi.h"
@@ -45,24 +45,24 @@
/* 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 @@
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");
}
Index: mpegvideo_mmi.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/ps2/mpegvideo_mmi.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- mpegvideo_mmi.c 13 Mar 2004 19:21:58 -0000 1.6
+++ mpegvideo_mmi.c 17 Dec 2005 18:14:35 -0000 1.7
@@ -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 @@
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 @@
"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 @@
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;
}
- Previous message: [Ffmpeg-cvslog] CVS: ffmpeg/libavcodec/alpha asm.h, 1.8, 1.9 dsputil_alpha.c, 1.22, 1.23 dsputil_alpha_asm.S, 1.5, 1.6 motion_est_alpha.c, 1.3, 1.4 motion_est_mvi_asm.S, 1.2, 1.3 mpegvideo_alpha.c, 1.12, 1.13 simple_idct_alpha.c, 1.4, 1.5
- Next message: [Ffmpeg-cvslog] CVS: ffmpeg/libavcodec/sh4 dsputil_align.c, 1.2, 1.3 dsputil_sh4.c, 1.3, 1.4 idct_sh4.c, 1.2, 1.3 qpel.c, 1.2, 1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the ffmpeg-cvslog
mailing list