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

3 files changed, 38 insertions, 38 deletions

diff --git a/tests/ffmpeg.regression.ref b/tests/ffmpeg.regression.ref
index 8b19733c87..bbb1947e8b 100644
--- a/tests/ffmpeg.regression.ref
+++ b/tests/ffmpeg.regression.ref
@@ -141,12 +141,12 @@ f8f51fa737add17f7fecaefa118b57ed *./tests/data/a-ffv1.avi
 2654678 ./tests/data/a-ffv1.avi
 799d3db687f6cdd7a837ec156efc171f *./tests/data/out.yuv
 stddev:  0.00 PSNR:99.99 bytes:7602176
-0356b219110f391044352547360377a8 *./tests/data/a-snow.avi
-156586 ./tests/data/a-snow.avi
-c038bc896a435796588ca3b96f38bbb5 *./tests/data/out.yuv
+3b419d4e700466fed31bdbdb7fd032ea *./tests/data/a-snow.avi
+156682 ./tests/data/a-snow.avi
+3de2b39f90fd8331f27e627e68e076f7 *./tests/data/out.yuv
 stddev: 23.15 PSNR:20.83 bytes:7602176
-ba999e86070aa971376e7f317a022c37 *./tests/data/a-snow53.avi
-3519486 ./tests/data/a-snow53.avi
+336d769a694cf92e21962879fea05331 *./tests/data/a-snow53.avi
+3520654 ./tests/data/a-snow53.avi
 799d3db687f6cdd7a837ec156efc171f *./tests/data/out.yuv
 stddev:  0.00 PSNR:99.99 bytes:7602176
 c299f64c3e85b928c5bfe71629cee006 *./tests/data/a-dv.dv
diff --git a/tests/rotozoom.regression.ref b/tests/rotozoom.regression.ref
index 98eef05796..f4b374cd74 100644
--- a/tests/rotozoom.regression.ref
+++ b/tests/rotozoom.regression.ref
@@ -141,12 +141,12 @@ d72b0960e162d4998b9acbabb07e99ab *./tests/data/a-ffv1.avi
 3525804 ./tests/data/a-ffv1.avi
 dde5895817ad9d219f79a52d0bdfb001 *./tests/data/out.yuv
 stddev:  0.00 PSNR:99.99 bytes:7602176
-ae64e5ff9b5684c46e74e48381e6a132 *./tests/data/a-snow.avi
-68900 ./tests/data/a-snow.avi
-5f5b97b726f97d3514b3c2b8e635175c *./tests/data/out.yuv
+7e658570df22365c9dbbaa2038468f3c *./tests/data/a-snow.avi
+69026 ./tests/data/a-snow.avi
+63ea1d2fe1693be57d3ab7d351af7c55 *./tests/data/out.yuv
 stddev: 10.87 PSNR:27.39 bytes:7602176
-3d0da6aeec9b80c6ee0ff4b747bdd0f0 *./tests/data/a-snow53.avi
-2721980 ./tests/data/a-snow53.avi
+d33395ea1de6b801142be556d7699263 *./tests/data/a-snow53.avi
+2721708 ./tests/data/a-snow53.avi
 dde5895817ad9d219f79a52d0bdfb001 *./tests/data/out.yuv
 stddev:  0.00 PSNR:99.99 bytes:7602176
 54cdeaee32d1007666a1e487e739daf6 *./tests/data/a-dv.dv
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