aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorChristophe Gisquet <christophe.gisquet@free.fr>2007-07-08 13:34:02 +0000
committerKostya Shishkov <kostya.shishkov@gmail.com>2007-07-08 13:34:02 +0000
commitccef714035011e8397e89629185a04c6aaf09370 (patch)
tree285e4da2084d7fb93f8d071b5e58b7db3e5f2239 /libavcodec
parent803b09044963734ecee76eb4d8313072d4045173 (diff)
downloadffmpeg-ccef714035011e8397e89629185a04c6aaf09370.tar.gz
Pass modes as parameters instead of calculating them inplace.
Patch by by Christophe GISQUET ( echo $name| awk '//{sub(" ",".");print tolower($0) "@free.fr";}') Thread: [PATCH] Clean up in C VC-1 DSP functions Originally committed as revision 9537 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/vc1dsp.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/libavcodec/vc1dsp.c b/libavcodec/vc1dsp.c
index 51403e6aae..4b1d4850e2 100644
--- a/libavcodec/vc1dsp.c
+++ b/libavcodec/vc1dsp.c
@@ -342,29 +342,27 @@ static av_always_inline int vc1_mspel_filter(const uint8_t *src, int stride, int
/** Function used to do motion compensation with bicubic interpolation
*/
-static void vc1_mspel_mc(uint8_t *dst, const uint8_t *src, int stride, int mode, int rnd)
+static void vc1_mspel_mc(uint8_t *dst, const uint8_t *src, int stride, int hmode, int vmode, int rnd)
{
int i, j;
uint8_t tmp[8*11], *tptr;
- int m, r;
+ int r;
- m = (mode & 3);
r = rnd;
src -= stride;
tptr = tmp;
for(j = 0; j < 11; j++) {
for(i = 0; i < 8; i++)
- tptr[i] = av_clip_uint8(vc1_mspel_filter(src + i, 1, m, r));
+ tptr[i] = av_clip_uint8(vc1_mspel_filter(src + i, 1, hmode, r));
src += stride;
tptr += 8;
}
r = 1 - rnd;
- m = (mode >> 2) & 3;
tptr = tmp + 8;
for(j = 0; j < 8; j++) {
for(i = 0; i < 8; i++)
- dst[i] = av_clip_uint8(vc1_mspel_filter(tptr + i, 8, m, r));
+ dst[i] = av_clip_uint8(vc1_mspel_filter(tptr + i, 8, vmode, r));
dst += stride;
tptr += 8;
}
@@ -377,7 +375,7 @@ void ff_put_vc1_mspel_mc00_c(uint8_t *dst, const uint8_t *src, int stride, int r
#define PUT_VC1_MSPEL(a, b)\
static void put_vc1_mspel_mc ## a ## b ##_c(uint8_t *dst, const uint8_t *src, int stride, int rnd) { \
- vc1_mspel_mc(dst, src, stride, (a)&((b<<2)), rnd); \
+ vc1_mspel_mc(dst, src, stride, a, b, rnd); \
}
PUT_VC1_MSPEL(1, 0)