generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit '6d98959c8a5a749592a878b9523b31eccea5d102'

Browse Source 
* commit '6d98959c8a5a749592a878b9523b31eccea5d102':
  vc1: Add avg_no_rnd_vc1_chroma_mc4_c()

Conflicts:
	libavcodec/vc1dsp.c

See: dd6e291e40
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-01-13 14:18:03 +01:00
parent 1df53ff22d 6d98959c8a
commit 58eb9b9299
1 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
libavcodec/vc1dsp.c
View File

@@ -771,7 +771,10 @@ 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 */,
uint8_t *src /* align 1 */,
int stride, int h, int x, int y)
{
const int A = (8 - x) * (8 - y); const int A = (8 - x) * (8 - y);
const int B = ( x) * (8 - y); const int B = ( x) * (8 - y);
const int C = (8 - x) * ( y); const int C = (8 - x) * ( y);
@@ -780,12 +783,11 @@ static void avg_no_rnd_vc1_chroma_mc4_c(uint8_t *dst/*align 8*/, uint8_t *src/*a
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;
} }