cleanup mc_block()

perform interpolation steps in such an order that halfpel interpolation
could be done per picture
this also makes mc_block() match h.264 for the 1/4 pel cases so that the
use of the h264 functions for some cases does not introduce a fantastic mess

Originally committed as revision 10433 to svn://svn.ffmpeg.org/ffmpeg/trunk

1 files changed, 28 insertions, 28 deletions

diff --git a/tests/seek.regression.ref b/tests/seek.regression.ref
index 732950099e..21708088e1 100644
--- a/tests/seek.regression.ref
+++ b/tests/seek.regression.ref
@@ -2050,47 +2050,47 @@ ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:5660 size:2987 flags:1
 ret: 0 st:-1 ts:-1.000000 flags:0
 ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:5660 size:2987 flags:1
 ret: 0 st:-1 ts:1.894167 flags:1
-ret: 0 st: 0 dts:1.440000 pts:1.440000 pos:46890 size:3663 flags:1
+ret: 0 st: 0 dts:1.440000 pts:1.440000 pos:46978 size:3663 flags:1
 ret: 0 st: 0 ts:0.800000 flags:0
-ret: 0 st: 0 dts:0.960000 pts:0.960000 pos:31696 size:3478 flags:1
+ret: 0 st: 0 dts:0.960000 pts:0.960000 pos:31750 size:3478 flags:1
 ret:-1 st: 0 ts:-0.320000 flags:1
 ret:-1 st:-1 ts:2.576668 flags:0
 ret: 0 st:-1 ts:1.470835 flags:1
-ret: 0 st: 0 dts:1.440000 pts:1.440000 pos:46890 size:3663 flags:1
+ret: 0 st: 0 dts:1.440000 pts:1.440000 pos:46978 size:3663 flags:1
 ret: 0 st: 0 ts:0.360000 flags:0
-ret: 0 st: 0 dts:0.480000 pts:0.480000 pos:17984 size:3229 flags:1
+ret: 0 st: 0 dts:0.480000 pts:0.480000 pos:18006 size:3229 flags:1
 ret:-1 st: 0 ts:-0.760000 flags:1
 ret:-1 st:-1 ts:2.153336 flags:0
 ret: 0 st:-1 ts:1.047503 flags:1
-ret: 0 st: 0 dts:0.960000 pts:0.960000 pos:31696 size:3478 flags:1
+ret: 0 st: 0 dts:0.960000 pts:0.960000 pos:31750 size:3478 flags:1
 ret: 0 st: 0 ts:-0.040000 flags:0
 ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:5660 size:2987 flags:1
 ret: 0 st: 0 ts:2.840000 flags:1
-ret: 0 st: 0 dts:1.920000 pts:1.920000 pos:63380 size:3635 flags:1
+ret: 0 st: 0 dts:1.920000 pts:1.920000 pos:63506 size:3635 flags:1
 ret: 0 st:-1 ts:1.730004 flags:0
-ret: 0 st: 0 dts:1.920000 pts:1.920000 pos:63380 size:3635 flags:1
+ret: 0 st: 0 dts:1.920000 pts:1.920000 pos:63506 size:3635 flags:1
 ret: 0 st:-1 ts:0.624171 flags:1
-ret: 0 st: 0 dts:0.480000 pts:0.480000 pos:17984 size:3229 flags:1
+ret: 0 st: 0 dts:0.480000 pts:0.480000 pos:18006 size:3229 flags:1
 ret: 0 st: 0 ts:-0.480000 flags:0
 ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:5660 size:2987 flags:1
 ret: 0 st: 0 ts:2.400000 flags:1
-ret: 0 st: 0 dts:1.920000 pts:1.920000 pos:63380 size:3635 flags:1
+ret: 0 st: 0 dts:1.920000 pts:1.920000 pos:63506 size:3635 flags:1
 ret: 0 st:-1 ts:1.306672 flags:0
-ret: 0 st: 0 dts:1.440000 pts:1.440000 pos:46890 size:3663 flags:1
+ret: 0 st: 0 dts:1.440000 pts:1.440000 pos:46978 size:3663 flags:1
 ret: 0 st:-1 ts:0.200839 flags:1
 ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:5660 size:2987 flags:1
 ret: 0 st: 0 ts:-0.920000 flags:0
 ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:5660 size:2987 flags:1
 ret: 0 st: 0 ts:2.000000 flags:1
-ret: 0 st: 0 dts:1.920000 pts:1.920000 pos:63380 size:3635 flags:1
+ret: 0 st: 0 dts:1.920000 pts:1.920000 pos:63506 size:3635 flags:1
 ret: 0 st:-1 ts:0.883340 flags:0
-ret: 0 st: 0 dts:0.960000 pts:0.960000 pos:31696 size:3478 flags:1
+ret: 0 st: 0 dts:0.960000 pts:0.960000 pos:31750 size:3478 flags:1
 ret:-1 st:-1 ts:-0.222493 flags:1
 ret:-1 st: 0 ts:2.680000 flags:0
 ret: 0 st: 0 ts:1.560000 flags:1
-ret: 0 st: 0 dts:1.440000 pts:1.440000 pos:46890 size:3663 flags:1
+ret: 0 st: 0 dts:1.440000 pts:1.440000 pos:46978 size:3663 flags:1
 ret: 0 st:-1 ts:0.460008 flags:0
-ret: 0 st: 0 dts:0.480000 pts:0.480000 pos:17984 size:3229 flags:1
+ret: 0 st: 0 dts:0.480000 pts:0.480000 pos:18006 size:3229 flags:1
 ret:-1 st:-1 ts:-0.645825 flags:1
 ----------------
 tests/data/a-snow53.avi
@@ -2098,47 +2098,47 @@ ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:5660 size:72476 flags:1
 ret: 0 st:-1 ts:-1.000000 flags:0
 ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:5660 size:72476 flags:1
 ret: 0 st:-1 ts:1.894167 flags:1
-ret: 0 st: 0 dts:1.440000 pts:1.440000 pos:1902900 size:78837 flags:1
+ret: 0 st: 0 dts:1.440000 pts:1.440000 pos:1902764 size:78837 flags:1
 ret: 0 st: 0 ts:0.800000 flags:0
-ret: 0 st: 0 dts:0.960000 pts:0.960000 pos:1239314 size:74994 flags:1
+ret: 0 st: 0 dts:0.960000 pts:0.960000 pos:1239078 size:74994 flags:1
 ret:-1 st: 0 ts:-0.320000 flags:1
 ret:-1 st:-1 ts:2.576668 flags:0
 ret: 0 st:-1 ts:1.470835 flags:1
-ret: 0 st: 0 dts:1.440000 pts:1.440000 pos:1902900 size:78837 flags:1
+ret: 0 st: 0 dts:1.440000 pts:1.440000 pos:1902764 size:78837 flags:1
 ret: 0 st: 0 ts:0.360000 flags:0
-ret: 0 st: 0 dts:0.480000 pts:0.480000 pos:605698 size:71059 flags:1
+ret: 0 st: 0 dts:0.480000 pts:0.480000 pos:605628 size:71059 flags:1
 ret:-1 st: 0 ts:-0.760000 flags:1
 ret:-1 st:-1 ts:2.153336 flags:0
 ret: 0 st:-1 ts:1.047503 flags:1
-ret: 0 st: 0 dts:0.960000 pts:0.960000 pos:1239314 size:74994 flags:1
+ret: 0 st: 0 dts:0.960000 pts:0.960000 pos:1239078 size:74994 flags:1
 ret: 0 st: 0 ts:-0.040000 flags:0
 ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:5660 size:72476 flags:1
 ret: 0 st: 0 ts:2.840000 flags:1
-ret: 0 st: 0 dts:1.920000 pts:1.920000 pos:2585846 size:79731 flags:1
+ret: 0 st: 0 dts:1.920000 pts:1.920000 pos:2585580 size:79731 flags:1
 ret: 0 st:-1 ts:1.730004 flags:0
-ret: 0 st: 0 dts:1.920000 pts:1.920000 pos:2585846 size:79731 flags:1
+ret: 0 st: 0 dts:1.920000 pts:1.920000 pos:2585580 size:79731 flags:1
 ret: 0 st:-1 ts:0.624171 flags:1
-ret: 0 st: 0 dts:0.480000 pts:0.480000 pos:605698 size:71059 flags:1
+ret: 0 st: 0 dts:0.480000 pts:0.480000 pos:605628 size:71059 flags:1
 ret: 0 st: 0 ts:-0.480000 flags:0
 ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:5660 size:72476 flags:1
 ret: 0 st: 0 ts:2.400000 flags:1
-ret: 0 st: 0 dts:1.920000 pts:1.920000 pos:2585846 size:79731 flags:1
+ret: 0 st: 0 dts:1.920000 pts:1.920000 pos:2585580 size:79731 flags:1
 ret: 0 st:-1 ts:1.306672 flags:0
-ret: 0 st: 0 dts:1.440000 pts:1.440000 pos:1902900 size:78837 flags:1
+ret: 0 st: 0 dts:1.440000 pts:1.440000 pos:1902764 size:78837 flags:1
 ret: 0 st:-1 ts:0.200839 flags:1
 ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:5660 size:72476 flags:1
 ret: 0 st: 0 ts:-0.920000 flags:0
 ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:5660 size:72476 flags:1
 ret: 0 st: 0 ts:2.000000 flags:1
-ret: 0 st: 0 dts:1.920000 pts:1.920000 pos:2585846 size:79731 flags:1
+ret: 0 st: 0 dts:1.920000 pts:1.920000 pos:2585580 size:79731 flags:1
 ret: 0 st:-1 ts:0.883340 flags:0
-ret: 0 st: 0 dts:0.960000 pts:0.960000 pos:1239314 size:74994 flags:1
+ret: 0 st: 0 dts:0.960000 pts:0.960000 pos:1239078 size:74994 flags:1
 ret:-1 st:-1 ts:-0.222493 flags:1
 ret:-1 st: 0 ts:2.680000 flags:0
 ret: 0 st: 0 ts:1.560000 flags:1
-ret: 0 st: 0 dts:1.440000 pts:1.440000 pos:1902900 size:78837 flags:1
+ret: 0 st: 0 dts:1.440000 pts:1.440000 pos:1902764 size:78837 flags:1
 ret: 0 st:-1 ts:0.460008 flags:0
-ret: 0 st: 0 dts:0.480000 pts:0.480000 pos:605698 size:71059 flags:1
+ret: 0 st: 0 dts:0.480000 pts:0.480000 pos:605628 size:71059 flags:1
 ret:-1 st:-1 ts:-0.645825 flags:1
 ----------------
 tests/data/a-svq1.mov