diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2010-04-02 01:07:03 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2010-04-02 01:07:03 +0000 |
| commit | 919e749772d09900b41877e21ccb994fab0013ab (patch) | |
| tree | 73f95c0985bf94cb051beacb5e71c8a2b3e30a83 /libavcodec/motion_est_template.c | |
| parent | 4ed39eedca0eaee0b0dea9ea5de7506bd3dc8842 (diff) | |
| download | ffmpeg-919e749772d09900b41877e21ccb994fab0013ab.tar.gz | |
slice dice, inline and outline cmp()
motion_est.o is now less than half its previous size.
No speedchange meassureable.
Originally committed as revision 22771 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/motion_est_template.c')
| -rw-r--r-- | libavcodec/motion_est_template.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/motion_est_template.c b/libavcodec/motion_est_template.c index 37f15c8aba..61f113e5cb 100644 --- a/libavcodec/motion_est_template.c +++ b/libavcodec/motion_est_template.c @@ -39,7 +39,7 @@ {\ const int hx= 2*(x)+(dx);\ const int hy= 2*(y)+(dy);\ - d= cmp(s, x, y, dx, dy, size, h, ref_index, src_index, cmp_sub, chroma_cmp_sub, flags);\ + d= cmp_hpel(s, x, y, dx, dy, size, h, ref_index, src_index, cmp_sub, chroma_cmp_sub, flags);\ d += (mv_penalty[hx - pred_x] + mv_penalty[hy - pred_y])*penalty_factor;\ COPY3_IF_LT(dmin, d, bx, hx, by, hy)\ } @@ -266,7 +266,7 @@ inline int ff_get_mb_score(MpegEncContext * s, int mx, int my, int src_index, {\ const int hx= 4*(x)+(dx);\ const int hy= 4*(y)+(dy);\ - d= cmp(s, x, y, dx, dy, size, h, ref_index, src_index, cmpf, chroma_cmpf, flags);\ + d= cmp_qpel(s, x, y, dx, dy, size, h, ref_index, src_index, cmpf, chroma_cmpf, flags);\ d += (mv_penalty[hx - pred_x] + mv_penalty[hy - pred_y])*penalty_factor;\ COPY3_IF_LT(dmin, d, bx, hx, by, hy)\ } |