annotate libmpeg2/motion_comp.c @ 10730:67449e5936f3

fix 10l (computation based on uninitialized data which led to incorrect field matching) and greatly improve selection logic. the pullup core should be very accurate now, so try throwing tough samples at it and report any failures! :)
author rfelker
date Sun, 31 Aug 2003 17:46:32 +0000
parents 2c0b6ec77d39
children d0a8810e155c
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1 /*
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2 * motion_comp.c
10303
2c0b6ec77d39 sync with libmpeg2 cvs
alex
parents: 10269
diff changeset
3 * Copyright (C) 2000-2003 Michel Lespinasse <walken@zoy.org>
9852
47984e3f54ce Importing libmpeg2 from mpeg2dec-0.3.1
arpi
parents: 1216
diff changeset
4 * Copyright (C) 1999-2000 Aaron Holtzman <aholtzma@ess.engr.uvic.ca>
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
5 *
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
6 * This file is part of mpeg2dec, a free MPEG-2 video stream decoder.
9852
47984e3f54ce Importing libmpeg2 from mpeg2dec-0.3.1
arpi
parents: 1216
diff changeset
7 * See http://libmpeg2.sourceforge.net/ for updates.
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
8 *
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
9 * mpeg2dec is free software; you can redistribute it and/or modify
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
10 * it under the terms of the GNU General Public License as published by
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
11 * the Free Software Foundation; either version 2 of the License, or
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
12 * (at your option) any later version.
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
13 *
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
14 * mpeg2dec is distributed in the hope that it will be useful,
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
15 * but WITHOUT ANY WARRANTY; without even the implied warranty of
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
17 * GNU General Public License for more details.
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
18 *
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
19 * You should have received a copy of the GNU General Public License
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
20 * along with this program; if not, write to the Free Software
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
21 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
22 */
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
23
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
24 #include "config.h"
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
25
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
26 #include <inttypes.h>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
27
9852
47984e3f54ce Importing libmpeg2 from mpeg2dec-0.3.1
arpi
parents: 1216
diff changeset
28 #include "mpeg2.h"
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
29 #include "mpeg2_internal.h"
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
30
9852
47984e3f54ce Importing libmpeg2 from mpeg2dec-0.3.1
arpi
parents: 1216
diff changeset
31 mpeg2_mc_t mpeg2_mc;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
32
9852
47984e3f54ce Importing libmpeg2 from mpeg2dec-0.3.1
arpi
parents: 1216
diff changeset
33 void mpeg2_mc_init (uint32_t accel)
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
34 {
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
35 #ifdef ARCH_X86
9852
47984e3f54ce Importing libmpeg2 from mpeg2dec-0.3.1
arpi
parents: 1216
diff changeset
36 if (accel & MPEG2_ACCEL_X86_MMXEXT)
47984e3f54ce Importing libmpeg2 from mpeg2dec-0.3.1
arpi
parents: 1216
diff changeset
37 mpeg2_mc = mpeg2_mc_mmxext;
47984e3f54ce Importing libmpeg2 from mpeg2dec-0.3.1
arpi
parents: 1216
diff changeset
38 else if (accel & MPEG2_ACCEL_X86_3DNOW)
47984e3f54ce Importing libmpeg2 from mpeg2dec-0.3.1
arpi
parents: 1216
diff changeset
39 mpeg2_mc = mpeg2_mc_3dnow;
47984e3f54ce Importing libmpeg2 from mpeg2dec-0.3.1
arpi
parents: 1216
diff changeset
40 else if (accel & MPEG2_ACCEL_X86_MMX)
47984e3f54ce Importing libmpeg2 from mpeg2dec-0.3.1
arpi
parents: 1216
diff changeset
41 mpeg2_mc = mpeg2_mc_mmx;
47984e3f54ce Importing libmpeg2 from mpeg2dec-0.3.1
arpi
parents: 1216
diff changeset
42 else
47984e3f54ce Importing libmpeg2 from mpeg2dec-0.3.1
arpi
parents: 1216
diff changeset
43 #endif
47984e3f54ce Importing libmpeg2 from mpeg2dec-0.3.1
arpi
parents: 1216
diff changeset
44 #ifdef ARCH_PPC
10269
217eb10b2f2d libmpeg2-altivec patch by Magnus Damm <damm@opensource.se>:
arpi
parents: 9852
diff changeset
45 #ifdef HAVE_ALTIVEC
9852
47984e3f54ce Importing libmpeg2 from mpeg2dec-0.3.1
arpi
parents: 1216
diff changeset
46 if (accel & MPEG2_ACCEL_PPC_ALTIVEC)
47984e3f54ce Importing libmpeg2 from mpeg2dec-0.3.1
arpi
parents: 1216
diff changeset
47 mpeg2_mc = mpeg2_mc_altivec;
47984e3f54ce Importing libmpeg2 from mpeg2dec-0.3.1
arpi
parents: 1216
diff changeset
48 else
47984e3f54ce Importing libmpeg2 from mpeg2dec-0.3.1
arpi
parents: 1216
diff changeset
49 #endif
10269
217eb10b2f2d libmpeg2-altivec patch by Magnus Damm <damm@opensource.se>:
arpi
parents: 9852
diff changeset
50 #endif
9852
47984e3f54ce Importing libmpeg2 from mpeg2dec-0.3.1
arpi
parents: 1216
diff changeset
51 #ifdef ARCH_ALPHA
47984e3f54ce Importing libmpeg2 from mpeg2dec-0.3.1
arpi
parents: 1216
diff changeset
52 if (accel & MPEG2_ACCEL_ALPHA)
47984e3f54ce Importing libmpeg2 from mpeg2dec-0.3.1
arpi
parents: 1216
diff changeset
53 mpeg2_mc = mpeg2_mc_alpha;
47984e3f54ce Importing libmpeg2 from mpeg2dec-0.3.1
arpi
parents: 1216
diff changeset
54 else
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
55 #endif
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
56 #ifdef LIBMPEG2_MLIB
9852
47984e3f54ce Importing libmpeg2 from mpeg2dec-0.3.1
arpi
parents: 1216
diff changeset
57 if (accel & MPEG2_ACCEL_MLIB)
47984e3f54ce Importing libmpeg2 from mpeg2dec-0.3.1
arpi
parents: 1216
diff changeset
58 mpeg2_mc = mpeg2_mc_mlib;
47984e3f54ce Importing libmpeg2 from mpeg2dec-0.3.1
arpi
parents: 1216
diff changeset
59 else
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
60 #endif
9852
47984e3f54ce Importing libmpeg2 from mpeg2dec-0.3.1
arpi
parents: 1216
diff changeset
61 mpeg2_mc = mpeg2_mc_c;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
62 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
63
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
64 #define avg2(a,b) ((a+b+1)>>1)
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
65 #define avg4(a,b,c,d) ((a+b+c+d+2)>>2)
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
66
9852
47984e3f54ce Importing libmpeg2 from mpeg2dec-0.3.1
arpi
parents: 1216
diff changeset
67 #define predict_o(i) (ref[i])
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
68 #define predict_x(i) (avg2 (ref[i], ref[i+1]))
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
69 #define predict_y(i) (avg2 (ref[i], (ref+stride)[i]))
9852
47984e3f54ce Importing libmpeg2 from mpeg2dec-0.3.1
arpi
parents: 1216
diff changeset
70 #define predict_xy(i) (avg4 (ref[i], ref[i+1], \
47984e3f54ce Importing libmpeg2 from mpeg2dec-0.3.1
arpi
parents: 1216
diff changeset
71 (ref+stride)[i], (ref+stride)[i+1]))
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
72
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
73 #define put(predictor,i) dest[i] = predictor (i)
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
74 #define avg(predictor,i) dest[i] = avg2 (predictor (i), dest[i])
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
75
36
846535ace7a2 libmpeg2-0.2.0 merge
arpi_esp
parents: 1
diff changeset
76 /* mc function template */
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
77
9852
47984e3f54ce Importing libmpeg2 from mpeg2dec-0.3.1
arpi
parents: 1216
diff changeset
78 #define MC_FUNC(op,xy) \
47984e3f54ce Importing libmpeg2 from mpeg2dec-0.3.1
arpi
parents: 1216
diff changeset
79 static void MC_##op##_##xy##_16_c (uint8_t * dest, const uint8_t * ref, \
47984e3f54ce Importing libmpeg2 from mpeg2dec-0.3.1
arpi
parents: 1216
diff changeset
80 const int stride, int height) \
47984e3f54ce Importing libmpeg2 from mpeg2dec-0.3.1
arpi
parents: 1216
diff changeset
81 { \
47984e3f54ce Importing libmpeg2 from mpeg2dec-0.3.1
arpi
parents: 1216
diff changeset
82 do { \
47984e3f54ce Importing libmpeg2 from mpeg2dec-0.3.1
arpi
parents: 1216
diff changeset
83 op (predict_##xy, 0); \
47984e3f54ce Importing libmpeg2 from mpeg2dec-0.3.1
arpi
parents: 1216
diff changeset
84 op (predict_##xy, 1); \
47984e3f54ce Importing libmpeg2 from mpeg2dec-0.3.1
arpi
parents: 1216
diff changeset
85 op (predict_##xy, 2); \
47984e3f54ce Importing libmpeg2 from mpeg2dec-0.3.1
arpi
parents: 1216
diff changeset
86 op (predict_##xy, 3); \
47984e3f54ce Importing libmpeg2 from mpeg2dec-0.3.1
arpi
parents: 1216
diff changeset
87 op (predict_##xy, 4); \
47984e3f54ce Importing libmpeg2 from mpeg2dec-0.3.1
arpi
parents: 1216
diff changeset
88 op (predict_##xy, 5); \
47984e3f54ce Importing libmpeg2 from mpeg2dec-0.3.1
arpi
parents: 1216
diff changeset
89 op (predict_##xy, 6); \
47984e3f54ce Importing libmpeg2 from mpeg2dec-0.3.1
arpi
parents: 1216
diff changeset
90 op (predict_##xy, 7); \
47984e3f54ce Importing libmpeg2 from mpeg2dec-0.3.1
arpi
parents: 1216
diff changeset
91 op (predict_##xy, 8); \
47984e3f54ce Importing libmpeg2 from mpeg2dec-0.3.1
arpi
parents: 1216
diff changeset
92 op (predict_##xy, 9); \
47984e3f54ce Importing libmpeg2 from mpeg2dec-0.3.1
arpi
parents: 1216
diff changeset
93 op (predict_##xy, 10); \
47984e3f54ce Importing libmpeg2 from mpeg2dec-0.3.1
arpi
parents: 1216
diff changeset
94 op (predict_##xy, 11); \
47984e3f54ce Importing libmpeg2 from mpeg2dec-0.3.1
arpi
parents: 1216
diff changeset
95 op (predict_##xy, 12); \
47984e3f54ce Importing libmpeg2 from mpeg2dec-0.3.1
arpi
parents: 1216
diff changeset
96 op (predict_##xy, 13); \
47984e3f54ce Importing libmpeg2 from mpeg2dec-0.3.1
arpi
parents: 1216
diff changeset
97 op (predict_##xy, 14); \
47984e3f54ce Importing libmpeg2 from mpeg2dec-0.3.1
arpi
parents: 1216
diff changeset
98 op (predict_##xy, 15); \
47984e3f54ce Importing libmpeg2 from mpeg2dec-0.3.1
arpi
parents: 1216
diff changeset
99 ref += stride; \
47984e3f54ce Importing libmpeg2 from mpeg2dec-0.3.1
arpi
parents: 1216
diff changeset
100 dest += stride; \
47984e3f54ce Importing libmpeg2 from mpeg2dec-0.3.1
arpi
parents: 1216
diff changeset
101 } while (--height); \
47984e3f54ce Importing libmpeg2 from mpeg2dec-0.3.1
arpi
parents: 1216
diff changeset
102 } \
47984e3f54ce Importing libmpeg2 from mpeg2dec-0.3.1
arpi
parents: 1216
diff changeset
103 static void MC_##op##_##xy##_8_c (uint8_t * dest, const uint8_t * ref, \
47984e3f54ce Importing libmpeg2 from mpeg2dec-0.3.1
arpi
parents: 1216
diff changeset
104 const int stride, int height) \
47984e3f54ce Importing libmpeg2 from mpeg2dec-0.3.1
arpi
parents: 1216
diff changeset
105 { \
47984e3f54ce Importing libmpeg2 from mpeg2dec-0.3.1
arpi
parents: 1216
diff changeset
106 do { \
47984e3f54ce Importing libmpeg2 from mpeg2dec-0.3.1
arpi
parents: 1216
diff changeset
107 op (predict_##xy, 0); \
47984e3f54ce Importing libmpeg2 from mpeg2dec-0.3.1
arpi
parents: 1216
diff changeset
108 op (predict_##xy, 1); \
47984e3f54ce Importing libmpeg2 from mpeg2dec-0.3.1
arpi
parents: 1216
diff changeset
109 op (predict_##xy, 2); \
47984e3f54ce Importing libmpeg2 from mpeg2dec-0.3.1
arpi
parents: 1216
diff changeset
110 op (predict_##xy, 3); \
47984e3f54ce Importing libmpeg2 from mpeg2dec-0.3.1
arpi
parents: 1216
diff changeset
111 op (predict_##xy, 4); \
47984e3f54ce Importing libmpeg2 from mpeg2dec-0.3.1
arpi
parents: 1216
diff changeset
112 op (predict_##xy, 5); \
47984e3f54ce Importing libmpeg2 from mpeg2dec-0.3.1
arpi
parents: 1216
diff changeset
113 op (predict_##xy, 6); \
47984e3f54ce Importing libmpeg2 from mpeg2dec-0.3.1
arpi
parents: 1216
diff changeset
114 op (predict_##xy, 7); \
47984e3f54ce Importing libmpeg2 from mpeg2dec-0.3.1
arpi
parents: 1216
diff changeset
115 ref += stride; \
47984e3f54ce Importing libmpeg2 from mpeg2dec-0.3.1
arpi
parents: 1216
diff changeset
116 dest += stride; \
47984e3f54ce Importing libmpeg2 from mpeg2dec-0.3.1
arpi
parents: 1216
diff changeset
117 } while (--height); \
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
118 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
119
36
846535ace7a2 libmpeg2-0.2.0 merge
arpi_esp
parents: 1
diff changeset
120 /* definitions of the actual mc functions */
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
121
9852
47984e3f54ce Importing libmpeg2 from mpeg2dec-0.3.1
arpi
parents: 1216
diff changeset
122 MC_FUNC (put,o)
47984e3f54ce Importing libmpeg2 from mpeg2dec-0.3.1
arpi
parents: 1216
diff changeset
123 MC_FUNC (avg,o)
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
124 MC_FUNC (put,x)
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
125 MC_FUNC (avg,x)
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
126 MC_FUNC (put,y)
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
127 MC_FUNC (avg,y)
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
128 MC_FUNC (put,xy)
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
129 MC_FUNC (avg,xy)
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
130
9852
47984e3f54ce Importing libmpeg2 from mpeg2dec-0.3.1
arpi
parents: 1216
diff changeset
131 MPEG2_MC_EXTERN (c)