Commit 58eb9b92 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '6d98959c'

* commit '6d98959c':
  vc1: Add avg_no_rnd_vc1_chroma_mc4_c()

Conflicts:
	libavcodec/vc1dsp.c

See: dd6e291eMerged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 1df53ff2 6d98959c
...@@ -771,23 +771,25 @@ static void avg_no_rnd_vc1_chroma_mc8_c(uint8_t *dst /* align 8 */, ...@@ -771,23 +771,25 @@ static void avg_no_rnd_vc1_chroma_mc8_c(uint8_t *dst /* align 8 */,
} }
} }
static void avg_no_rnd_vc1_chroma_mc4_c(uint8_t *dst/*align 8*/, uint8_t *src/*align 1*/, int stride, int h, int x, int y){ static void avg_no_rnd_vc1_chroma_mc4_c(uint8_t *dst /* align 8 */,
const int A=(8-x)*(8-y); uint8_t *src /* align 1 */,
const int B=( x)*(8-y); int stride, int h, int x, int y)
const int C=(8-x)*( y); {
const int D=( x)*( y); const int A = (8 - x) * (8 - y);
const int B = ( x) * (8 - y);
const int C = (8 - x) * ( y);
const int D = ( x) * ( y);
int i; int i;
av_assert2(x<8 && y<8 && x>=0 && y>=0); av_assert2(x < 8 && y < 8 && x >= 0 && y >= 0);
for(i=0; i<h; i++) for (i = 0; i < h; i++) {
{ dst[0] = avg2(dst[0], chroma_mc(0));
dst[0] = avg2(dst[0], ((A*src[0] + B*src[1] + C*src[stride+0] + D*src[stride+1] + 32 - 4) >> 6)); dst[1] = avg2(dst[1], chroma_mc(1));
dst[1] = avg2(dst[1], ((A*src[1] + B*src[2] + C*src[stride+1] + D*src[stride+2] + 32 - 4) >> 6)); dst[2] = avg2(dst[2], chroma_mc(2));
dst[2] = avg2(dst[2], ((A*src[2] + B*src[3] + C*src[stride+2] + D*src[stride+3] + 32 - 4) >> 6)); dst[3] = avg2(dst[3], chroma_mc(3));
dst[3] = avg2(dst[3], ((A*src[3] + B*src[4] + C*src[stride+3] + D*src[stride+4] + 32 - 4) >> 6)); dst += stride;
dst+= stride; src += stride;
src+= stride;
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment