# HG changeset patch # User kostya # Date 1157173131 0 # Node ID 9d942506b1f21b83f8dedb95eb2f10e156a91079 # Parent de842f00038427a3d14e182fe59be8f871fe73bf Drop put_vc1_qpel_pixels_tab as they won't be needed anymore. diff -r de842f000384 -r 9d942506b1f2 dsputil.c --- a/dsputil.c Sat Sep 02 04:53:49 2006 +0000 +++ b/dsputil.c Sat Sep 02 04:58:51 2006 +0000 @@ -2622,10 +2622,6 @@ void ff_put_vc1_mspel_mc00_c(uint8_t *dst, uint8_t *src, int stride, int rnd) { put_pixels8_c(dst, src, stride, 8); } - -void ff_put_vc1_qpel_mc00_c(uint8_t *dst, uint8_t *src, int stride, int rnd) { - put_pixels8_c(dst, src, stride, 8); -} #endif /* CONFIG_VC1_DECODER||CONFIG_WMV3_DECODER */ static void wmv2_mspel8_v_lowpass(uint8_t *dst, uint8_t *src, int dstStride, int srcStride, int w){ diff -r de842f000384 -r 9d942506b1f2 dsputil.h --- a/dsputil.h Sat Sep 02 04:53:49 2006 +0000 +++ b/dsputil.h Sat Sep 02 04:58:51 2006 +0000 @@ -398,7 +398,6 @@ * last argument is actually round value instead of height */ op_pixels_func put_vc1_mspel_pixels_tab[16]; - op_pixels_func put_vc1_qpel_pixels_tab[16]; } DSPContext; void dsputil_static_init(void); diff -r de842f000384 -r 9d942506b1f2 vc1dsp.c --- a/vc1dsp.c Sat Sep 02 04:53:49 2006 +0000 +++ b/vc1dsp.c Sat Sep 02 04:58:51 2006 +0000 @@ -424,169 +424,6 @@ vc1_mspel_mc(dst, src, stride, 0xF, rnd); } -/** Filter used to interpolate fractional pel values - * except for half-pel cases for _mcXY: - * A = (4-X)*(4-Y) - * B = X *(4-Y) - * C = (4-X)* Y - * D = X * Y - */ -#define VC1_QPEL_FILTER(src, i, stride, rnd, A, B, C, D) \ - clip_uint8((A*src[i] + B*src[i+1] + C*src[i+stride] + D*src[i+stride+1] + 8 - rnd) >> 4) - -/* this one is defined in dsputil.c */ -void ff_put_vc1_qpel_mc00_c(uint8_t *dst, const uint8_t *src, int stride, int rnd); - -static void ff_put_vc1_qpel_mc10_c(uint8_t *dst, const uint8_t *src, int stride, int rnd) { - int i, j; - for(j = 0; j < 8; j++) { - for(i = 0; i < 8; i++) - dst[i] = VC1_QPEL_FILTER(src, i, stride, rnd, 12, 4, 0, 0); - dst += stride; - src += stride; - } -} - -static void ff_put_vc1_qpel_mc20_c(uint8_t *dst, const uint8_t *src, int stride, int rnd) { - int i, j; - for(j = 0; j < 8; j++) { - for(i = 0; i < 8; i++) - dst[i] = clip_uint8((src[i] + src[i + 1] + 1 - rnd) >> 1); - dst += stride; - src += stride; - } -} - -static void ff_put_vc1_qpel_mc30_c(uint8_t *dst, const uint8_t *src, int stride, int rnd) { - int i, j; - for(j = 0; j < 8; j++) { - for(i = 0; i < 8; i++) - dst[i] = VC1_QPEL_FILTER(src, i, stride, rnd, 4, 12, 0, 0); - dst += stride; - src += stride; - } -} - -static void ff_put_vc1_qpel_mc01_c(uint8_t *dst, const uint8_t *src, int stride, int rnd) { - int i, j; - for(j = 0; j < 8; j++) { - for(i = 0; i < 8; i++) - dst[i] = VC1_QPEL_FILTER(src, i, stride, rnd, 12, 0, 4, 0); - dst += stride; - src += stride; - } -} - -static void ff_put_vc1_qpel_mc11_c(uint8_t *dst, const uint8_t *src, int stride, int rnd) { - int i, j; - for(j = 0; j < 8; j++) { - for(i = 0; i < 8; i++) - dst[i] = VC1_QPEL_FILTER(src, i, stride, rnd, 9, 3, 3, 1); - dst += stride; - src += stride; - } -} - -static void ff_put_vc1_qpel_mc21_c(uint8_t *dst, const uint8_t *src, int stride, int rnd) { - int i, j; - for(j = 0; j < 8; j++) { - for(i = 0; i < 8; i++) - dst[i] = VC1_QPEL_FILTER(src, i, stride, rnd, 6, 6, 2, 2); - dst += stride; - src += stride; - } -} - -static void ff_put_vc1_qpel_mc31_c(uint8_t *dst, const uint8_t *src, int stride, int rnd) { - int i, j; - for(j = 0; j < 8; j++) { - for(i = 0; i < 8; i++) - dst[i] = VC1_QPEL_FILTER(src, i, stride, rnd, 3, 9, 1, 3); - dst += stride; - src += stride; - } -} - -static void ff_put_vc1_qpel_mc02_c(uint8_t *dst, const uint8_t *src, int stride, int rnd) { - int i, j; - for(j = 0; j < 8; j++) { - for(i = 0; i < 8; i++) - dst[i] = clip_uint8((src[i] + src[i + stride] + 1 - rnd) >> 1); - dst += stride; - src += stride; - } -} - -static void ff_put_vc1_qpel_mc12_c(uint8_t *dst, const uint8_t *src, int stride, int rnd) { - int i, j; - for(j = 0; j < 8; j++) { - for(i = 0; i < 8; i++) - dst[i] = VC1_QPEL_FILTER(src, i, stride, rnd, 6, 2, 6, 2); - dst += stride; - src += stride; - } -} - -static void ff_put_vc1_qpel_mc22_c(uint8_t *dst, const uint8_t *src, int stride, int rnd) { - int i, j; - for(j = 0; j < 8; j++) { - for(i = 0; i < 8; i++) - dst[i] = clip_uint8((src[i] + src[i + 1] + src[i + stride] + src[i + stride + 1] + 2 - rnd) >> 2); - dst += stride; - src += stride; - } -} - -static void ff_put_vc1_qpel_mc32_c(uint8_t *dst, const uint8_t *src, int stride, int rnd) { - int i, j; - for(j = 0; j < 8; j++) { - for(i = 0; i < 8; i++) - dst[i] = VC1_QPEL_FILTER(src, i, stride, rnd, 2, 6, 2, 6); - dst += stride; - src += stride; - } -} - -static void ff_put_vc1_qpel_mc03_c(uint8_t *dst, const uint8_t *src, int stride, int rnd) { - int i, j; - for(j = 0; j < 8; j++) { - for(i = 0; i < 8; i++) - dst[i] = VC1_QPEL_FILTER(src, i, stride, rnd, 4, 0, 12, 0); - dst += stride; - src += stride; - } -} - -static void ff_put_vc1_qpel_mc13_c(uint8_t *dst, const uint8_t *src, int stride, int rnd) { - int i, j; - for(j = 0; j < 8; j++) { - for(i = 0; i < 8; i++) - dst[i] = VC1_QPEL_FILTER(src, i, stride, rnd, 3, 1, 9, 3); - dst += stride; - src += stride; - } -} - -static void ff_put_vc1_qpel_mc23_c(uint8_t *dst, const uint8_t *src, int stride, int rnd) { - int i, j; - for(j = 0; j < 8; j++) { - for(i = 0; i < 8; i++) - dst[i] = VC1_QPEL_FILTER(src, i, stride, rnd, 2, 2, 6, 6); - dst += stride; - src += stride; - } -} - -static void ff_put_vc1_qpel_mc33_c(uint8_t *dst, const uint8_t *src, int stride, int rnd) { - int i, j; - for(j = 0; j < 8; j++) { - for(i = 0; i < 8; i++) - dst[i] = VC1_QPEL_FILTER(src, i, stride, rnd, 1, 3, 3, 9); - dst += stride; - src += stride; - } -} - void ff_vc1dsp_init(DSPContext* dsp, AVCodecContext *avctx) { dsp->vc1_inv_trans_8x8 = vc1_inv_trans_8x8_c; dsp->vc1_inv_trans_4x8 = vc1_inv_trans_4x8_c; @@ -611,21 +448,4 @@ dsp->put_vc1_mspel_pixels_tab[13] = ff_put_vc1_mspel_mc13_c; dsp->put_vc1_mspel_pixels_tab[14] = ff_put_vc1_mspel_mc23_c; dsp->put_vc1_mspel_pixels_tab[15] = ff_put_vc1_mspel_mc33_c; - - dsp->put_vc1_qpel_pixels_tab[ 0] = ff_put_vc1_qpel_mc00_c; - dsp->put_vc1_qpel_pixels_tab[ 1] = ff_put_vc1_qpel_mc10_c; - dsp->put_vc1_qpel_pixels_tab[ 2] = ff_put_vc1_qpel_mc20_c; - dsp->put_vc1_qpel_pixels_tab[ 3] = ff_put_vc1_qpel_mc30_c; - dsp->put_vc1_qpel_pixels_tab[ 4] = ff_put_vc1_qpel_mc01_c; - dsp->put_vc1_qpel_pixels_tab[ 5] = ff_put_vc1_qpel_mc11_c; - dsp->put_vc1_qpel_pixels_tab[ 6] = ff_put_vc1_qpel_mc21_c; - dsp->put_vc1_qpel_pixels_tab[ 7] = ff_put_vc1_qpel_mc31_c; - dsp->put_vc1_qpel_pixels_tab[ 8] = ff_put_vc1_qpel_mc02_c; - dsp->put_vc1_qpel_pixels_tab[ 9] = ff_put_vc1_qpel_mc12_c; - dsp->put_vc1_qpel_pixels_tab[10] = ff_put_vc1_qpel_mc22_c; - dsp->put_vc1_qpel_pixels_tab[11] = ff_put_vc1_qpel_mc32_c; - dsp->put_vc1_qpel_pixels_tab[12] = ff_put_vc1_qpel_mc03_c; - dsp->put_vc1_qpel_pixels_tab[13] = ff_put_vc1_qpel_mc13_c; - dsp->put_vc1_qpel_pixels_tab[14] = ff_put_vc1_qpel_mc23_c; - dsp->put_vc1_qpel_pixels_tab[15] = ff_put_vc1_qpel_mc33_c; }