virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Code Issues Releases Activity

faster and simpler vp6 bilinear mc

Browse Source 
Originally committed as revision 8907 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Loren Merritt 2007-05-06 06:43:33 +00:00
parent 0d02cacda9
commit 6ec4818525
1 changed files with 4 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
libavcodec/vp6.c
View File

@ -380,14 +380,6 @@ static int vp6_block_variance(uint8_t *src, int stride)
return (16*square_sum - sum*sum) >> 8;
}
static void vp6_filter_hv2(vp56_context_t *s, uint8_t *dst, uint8_t *src,
int stride, int delta, int16_t weight)
{
s->dsp.put_pixels_tab[1][0](dst, src, stride, 8);
s->dsp.biweight_h264_pixels_tab[3](dst, src+delta, stride, 2,
8-weight, weight, 0);
}
static void vp6_filter_hv4(uint8_t *dst, uint8_t *src, int stride,
int delta, const int16_t *weights)
{
@ -409,18 +401,8 @@ static void vp6_filter_diag2(vp56_context_t *s, uint8_t *dst, uint8_t *src,
int stride, int h_weight, int v_weight)
{
uint8_t *tmp = s->edge_emu_buffer+16;
int x, xmax;
s->dsp.put_pixels_tab[1][0](tmp, src, stride, 8);
s->dsp.biweight_h264_pixels_tab[3](tmp, src+1, stride, 2,
8-h_weight, h_weight, 0);
/* we need a 8x9 block to do vertical filter, so compute one more line */
for (x=8*stride, xmax=x+8; x<xmax; x++)
tmp[x] = (src[x]*(8-h_weight) + src[x+1]*h_weight + 4) >> 3;
s->dsp.put_pixels_tab[1][0](dst, tmp, stride, 8);
s->dsp.biweight_h264_pixels_tab[3](dst, tmp+stride, stride, 2,
8-v_weight, v_weight, 0);
s->dsp.put_h264_chroma_pixels_tab[0](tmp, src, stride, 9, h_weight, 0);
s->dsp.put_h264_chroma_pixels_tab[0](dst, tmp, stride, 8, 0, v_weight);
}
static void vp6_filter_diag4(uint8_t *dst, uint8_t *src, int stride,
@ -502,10 +484,8 @@ static void vp6_filter(vp56_context_t *s, uint8_t *dst, uint8_t *src,
vp6_block_copy_filter[select][y8]);
}
} else {
if (!y8) { /* left or right combine */
vp6_filter_hv2(s, dst, src+offset1, stride, 1, x8);
} else if (!x8) { /* above or below combine */
vp6_filter_hv2(s, dst, src+offset1, stride, stride, y8);
if (!x8 || !y8) {
s->dsp.put_h264_chroma_pixels_tab[0](dst, src+offset1, stride, 8, x8, y8);
} else if ((mv.x^mv.y) >> 31) { /* lower-left or upper-right combine */
vp6_filter_diag2(s, dst, src+offset1-1, stride, x8, y8);
} else { /* lower-right or upper-left combine */