diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2002-03-27 21:25:22 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2002-03-27 21:25:22 +0000 |
| commit | ba6802debf8167f8b9259e83f820dfb53c15a227 (patch) | |
| tree | 7b2026be763be17427d263c2f74d9a818e5154eb /libavcodec/dsputil.h | |
| parent | 52075cdeaa0cfd5fede7eddf7d037c226783de4b (diff) | |
| download | ffmpeg-ba6802debf8167f8b9259e83f820dfb53c15a227.tar.gz | |
4MV motion estimation (not finished yet)
SAD functions rewritten (8x8 support & MMX2 optimizations)
HQ inter/intra decission
msmpeg4 encoding bugfix (MV where too long)
Originally committed as revision 362 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/dsputil.h')
| -rw-r--r-- | libavcodec/dsputil.h | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/libavcodec/dsputil.h b/libavcodec/dsputil.h index 8730d69be7..45c1a695a7 100644 --- a/libavcodec/dsputil.h +++ b/libavcodec/dsputil.h @@ -66,17 +66,21 @@ extern void (*sub_pixels_tab[4])(DCTELEM *block, const UINT8 *pixels, int line_s /* motion estimation */ -typedef int (*op_pixels_abs_func)(UINT8 *blk1, UINT8 *blk2, int line_size, int h); +typedef int (*op_pixels_abs_func)(UINT8 *blk1, UINT8 *blk2, int line_size); extern op_pixels_abs_func pix_abs16x16; extern op_pixels_abs_func pix_abs16x16_x2; extern op_pixels_abs_func pix_abs16x16_y2; extern op_pixels_abs_func pix_abs16x16_xy2; - -int pix_abs16x16_c(UINT8 *blk1, UINT8 *blk2, int lx, int h); -int pix_abs16x16_x2_c(UINT8 *blk1, UINT8 *blk2, int lx, int h); -int pix_abs16x16_y2_c(UINT8 *blk1, UINT8 *blk2, int lx, int h); -int pix_abs16x16_xy2_c(UINT8 *blk1, UINT8 *blk2, int lx, int h); +extern op_pixels_abs_func pix_abs8x8; +extern op_pixels_abs_func pix_abs8x8_x2; +extern op_pixels_abs_func pix_abs8x8_y2; +extern op_pixels_abs_func pix_abs8x8_xy2; + +int pix_abs16x16_c(UINT8 *blk1, UINT8 *blk2, int lx); +int pix_abs16x16_x2_c(UINT8 *blk1, UINT8 *blk2, int lx); +int pix_abs16x16_y2_c(UINT8 *blk1, UINT8 *blk2, int lx); +int pix_abs16x16_xy2_c(UINT8 *blk1, UINT8 *blk2, int lx); static inline int block_permute_op(int j) { |