diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2003-04-10 13:18:38 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2003-04-10 13:18:38 +0000 |
| commit | 7bc9090a4176de2bc834e2a7df131047b944f3b5 (patch) | |
| tree | 1d57ac078ac227d652202cc1077ac565b8e36122 /libavcodec/motion_est_template.c | |
| parent | 84876d36774b6633c2950291fbfb3db5922273fb (diff) | |
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
more direct use of the new mb_type stuff instead of codec specific stuff
runtime mb_type debug output h264/h263 variants/mpeg1/2/4
error concealment /resilience for mpeg1/2
various minor optimizations
Originally committed as revision 1746 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/motion_est_template.c')
| -rw-r--r-- | libavcodec/motion_est_template.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/motion_est_template.c b/libavcodec/motion_est_template.c index 31a42d607b..2d403993cd 100644 --- a/libavcodec/motion_est_template.c +++ b/libavcodec/motion_est_template.c @@ -897,8 +897,8 @@ static int RENAME(epzs_motion_search)(MpegEncContext * s, int block, int map_generation; const int penalty_factor= s->me.penalty_factor; const int size=0; - const int ref_mv_stride= s->mb_width+2; - const int ref_mv_xy= 1 + s->mb_x + (s->mb_y + 1)*ref_mv_stride; + const int ref_mv_stride= s->mb_stride; + const int ref_mv_xy= s->mb_x + s->mb_y*ref_mv_stride; me_cmp_func cmp, chroma_cmp; LOAD_COMMON(s->mb_x*16, s->mb_y*16); @@ -1009,8 +1009,8 @@ static int RENAME(epzs_motion_search4)(MpegEncContext * s, int block, int map_generation; const int penalty_factor= s->me.penalty_factor; const int size=1; - const int ref_mv_stride= s->mb_width+2; - const int ref_mv_xy= 1 + s->mb_x + (s->mb_y + 1)*ref_mv_stride; + const int ref_mv_stride= s->mb_stride; + const int ref_mv_xy= s->mb_x + s->mb_y *ref_mv_stride; me_cmp_func cmp, chroma_cmp; LOAD_COMMON((s->mb_x*2 + (block&1))*8, (s->mb_y*2 + (block>>1))*8); |