diff options
| author | Fabrice Bellard <fabrice@bellard.org> | 2002-05-20 16:37:58 +0000 |
|---|---|---|
| committer | Fabrice Bellard <fabrice@bellard.org> | 2002-05-20 16:37:58 +0000 |
| commit | 57060b1ec737c7a4e9d432947c5c255821d6f471 (patch) | |
| tree | ba29b393efed54a43e685a8fff35a764c265e24a /libavcodec | |
| parent | 4c41db9adf0f2e377b9752394e3895cf7434b7f1 (diff) | |
| download | ffmpeg-57060b1ec737c7a4e9d432947c5c255821d6f471.tar.gz | |
removed unused stuff - added dsputil_set_bit_exact() support for easier testing
Originally committed as revision 551 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/dsputil.c | 14 | ||||
| -rw-r--r-- | libavcodec/dsputil.h | 8 |
2 files changed, 12 insertions, 10 deletions
diff --git a/libavcodec/dsputil.c b/libavcodec/dsputil.c index 51aaa28975..307cae24ee 100644 --- a/libavcodec/dsputil.c +++ b/libavcodec/dsputil.c @@ -599,6 +599,7 @@ PIXOP2(put, op_put) #undef op_avg #undef op_put +#if 0 /* FIXME this stuff could be removed as its ot really used anymore */ #define PIXOP(BTYPE, OPNAME, OP, INCR) \ \ @@ -699,7 +700,6 @@ void (*OPNAME ## _pixels_tab[4])(BTYPE *block, const UINT8 *pixels, int line_siz OPNAME ## _pixels_xy2, \ }; - /* rounding primitives */ #define avg2(a,b) ((a+b+1)>>1) #define avg4(a,b,c,d) ((a+b+c+d+2)>>2) @@ -719,11 +719,11 @@ PIXOP(DCTELEM, sub, op_sub, 8) #undef avg2 #undef avg4 +#endif + #define avg2(a,b) ((a+b+1)>>1) #define avg4(a,b,c,d) ((a+b+c+d+2)>>2) -/* end of removeale stuff */ - static void gmc1_c(UINT8 *dst, UINT8 *src, int srcStride, int h, int x16, int y16, int rounder) { const int A=(16-x16)*(16-y16); @@ -1332,6 +1332,14 @@ void dsputil_init(void) build_zigzag_end(); } +/* remove any non bit exact operation (testing purpose) */ +void avcodec_set_bit_exact(void) +{ +#ifdef HAVE_MMX + dsputil_set_bit_exact_mmx(); +#endif +} + void get_psnr(UINT8 *orig_image[3], UINT8 *coded_image[3], int orig_linesize[3], int coded_linesize, AVCodecContext *avctx) diff --git a/libavcodec/dsputil.h b/libavcodec/dsputil.h index 982fab5f54..7ca00bc66d 100644 --- a/libavcodec/dsputil.h +++ b/libavcodec/dsputil.h @@ -61,13 +61,6 @@ extern op_pixels_func avg_no_rnd_pixels_tab[4]; extern qpel_mc_func qpel_mc_rnd_tab[16]; extern qpel_mc_func qpel_mc_no_rnd_tab[16]; - -/* sub pixel (encoding) */ -extern void (*sub_pixels_tab[4])(DCTELEM *block, const UINT8 *pixels, int line_size, int h); - -#define sub_pixels_2(block, pixels, line_size, dxy) \ - sub_pixels_tab[dxy](block, pixels, line_size, 8) - /* motion estimation */ typedef int (*op_pixels_abs_func)(UINT8 *blk1, UINT8 *blk2, int line_size); @@ -119,6 +112,7 @@ static inline void emms(void) #define __align8 __attribute__ ((aligned (8))) void dsputil_init_mmx(void); +void dsputil_set_bit_exact_mmx(void); #elif defined(ARCH_ARMV4L) |