[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
Diego Biurrun CVS
diego
Sat Dec 17 19:15:09 CET 2005
Update of /cvsroot/ffmpeg/ffmpeg/libavcodec/sh4
In directory mail:/var2/tmp/cvs-serv18206/libavcodec/sh4
Modified Files:
dsputil_align.c dsputil_sh4.c idct_sh4.c qpel.c
Log Message:
COSMETICS: Remove all trailing whitespace.
Index: dsputil_align.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/sh4/dsputil_align.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- dsputil_align.c 14 May 2003 23:08:01 -0000 1.2
+++ dsputil_align.c 17 Dec 2005 18:14:36 -0000 1.3
@@ -1,5 +1,5 @@
/*
- * aligned/packed access motion
+ * aligned/packed access motion
*
* Copyright (c) 2001-2003 BERO <bero at geocities.co.jp>
*
Index: dsputil_sh4.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/sh4/dsputil_sh4.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- dsputil_sh4.c 21 Jun 2003 01:11:31 -0000 1.3
+++ dsputil_sh4.c 17 Dec 2005 18:14:36 -0000 1.4
@@ -59,7 +59,7 @@
static void clear_blocks_sh4(DCTELEM *blocks)
{
-// if (((int)blocks&7)==0)
+// if (((int)blocks&7)==0)
memzero_align8(blocks,sizeof(DCTELEM)*6*64);
}
@@ -109,7 +109,7 @@
dsputil_init_align(c,avctx);
c->clear_blocks = clear_blocks_sh4;
- if(idct_algo==FF_IDCT_AUTO || idct_algo==FF_IDCT_SH4){
+ if(idct_algo==FF_IDCT_AUTO || idct_algo==FF_IDCT_SH4){
c->idct_put = idct_put;
c->idct_add = idct_add;
c->idct = idct_sh4;
Index: idct_sh4.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/sh4/idct_sh4.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- idct_sh4.c 14 May 2003 23:08:01 -0000 1.2
+++ idct_sh4.c 17 Dec 2005 18:14:36 -0000 1.3
@@ -125,7 +125,7 @@
#if 1
-//optimized
+//optimized
void idct_sh4(DCTELEM *block)
{
Index: qpel.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/sh4/qpel.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- qpel.c 14 May 2003 23:08:01 -0000 1.2
+++ qpel.c 17 Dec 2005 18:14:36 -0000 1.3
@@ -1,4 +1,4 @@
-/*
+/*
this is optimized for sh, which have post increment addressing (*p++)
some cpu may be index (p[n]) faster than post increment (*p++)
*/
@@ -398,12 +398,12 @@
}while(--h);
}
-static void gmc_c(uint8_t *dst, uint8_t *src, int stride, int h, int ox, int oy,
+static void gmc_c(uint8_t *dst, uint8_t *src, int stride, int h, int ox, int oy,
int dxx, int dxy, int dyx, int dyy, int shift, int r, int width, int height)
{
int y, vx, vy;
const int s= 1<<shift;
-
+
width--;
height--;
@@ -421,7 +421,7 @@
frac_y= src_y&(s-1);
src_x>>=shift;
src_y>>=shift;
-
+
if((unsigned)src_x < width){
if((unsigned)src_y < height){
index= src_x + src_y*stride;
@@ -431,23 +431,23 @@
+ src[index+stride+1]* frac_x )* frac_y
+ r)>>(shift*2);
}else{
- index= src_x + clip(src_y, 0, height)*stride;
- dst[y*stride + x]= ( ( src[index ]*(s-frac_x)
+ index= src_x + clip(src_y, 0, height)*stride;
+ dst[y*stride + x]= ( ( src[index ]*(s-frac_x)
+ src[index +1]* frac_x )*s
+ r)>>(shift*2);
}
}else{
if((unsigned)src_y < height){
- index= clip(src_x, 0, width) + src_y*stride;
- dst[y*stride + x]= ( ( src[index ]*(s-frac_y)
+ index= clip(src_x, 0, width) + src_y*stride;
+ dst[y*stride + x]= ( ( src[index ]*(s-frac_y)
+ src[index+stride ]* frac_y )*s
+ r)>>(shift*2);
}else{
- index= clip(src_x, 0, width) + clip(src_y, 0, height)*stride;
+ index= clip(src_x, 0, width) + clip(src_y, 0, height)*stride;
dst[y*stride + x]= src[index ];
}
}
-
+
vx+= dxx;
vy+= dyx;
}
@@ -1566,7 +1566,7 @@
src9 = *s++;
dst[7]= cm[(9*(src7 + src8) - (src6 + src9) + 8)>>4];
dst+=dstStride;
- src+=srcStride;
+ src+=srcStride;
}while(--h);
}
More information about the ffmpeg-cvslog
mailing list