1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00

remove pretty much useless skiping of some predictors

this has pretty much no quality or speed effect except very small random changes

Originally committed as revision 7202 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2006-12-01 20:38:54 +00:00
parent 1a1c53856f
commit ed1dfc4970
4 changed files with 98 additions and 104 deletions

View File

@ -976,13 +976,11 @@ static always_inline int epzs_motion_search_internal(MpegEncContext * s, int *mx
CHECK_CLIPED_MV((P_MEDIAN[0]>>shift) , (P_MEDIAN[1]>>shift)+1)
CHECK_CLIPED_MV((P_MEDIAN[0]>>shift)-1, (P_MEDIAN[1]>>shift) )
CHECK_CLIPED_MV((P_MEDIAN[0]>>shift)+1, (P_MEDIAN[1]>>shift) )
if(dmin>h*h*2){
CHECK_CLIPED_MV((last_mv[ref_mv_xy][0]*ref_mv_scale + (1<<15))>>16,
(last_mv[ref_mv_xy][1]*ref_mv_scale + (1<<15))>>16)
CHECK_MV(P_LEFT[0] >>shift, P_LEFT[1] >>shift)
CHECK_MV(P_TOP[0] >>shift, P_TOP[1] >>shift)
CHECK_MV(P_TOPRIGHT[0]>>shift, P_TOPRIGHT[1]>>shift)
}
}
if(dmin>h*h*4){
if(c->pre_pass){
@ -1083,14 +1081,12 @@ static int epzs_motion_search4(MpegEncContext * s,
}else{
CHECK_MV(P_MV1[0]>>shift, P_MV1[1]>>shift)
//FIXME try some early stop
if(dmin>64*2){
CHECK_MV(P_MEDIAN[0]>>shift, P_MEDIAN[1]>>shift)
CHECK_MV(P_LEFT[0]>>shift, P_LEFT[1]>>shift)
CHECK_MV(P_TOP[0]>>shift, P_TOP[1]>>shift)
CHECK_MV(P_TOPRIGHT[0]>>shift, P_TOPRIGHT[1]>>shift)
CHECK_CLIPED_MV((last_mv[ref_mv_xy][0]*ref_mv_scale + (1<<15))>>16,
(last_mv[ref_mv_xy][1]*ref_mv_scale + (1<<15))>>16)
}
}
if(dmin>64*4){
CHECK_CLIPED_MV((last_mv[ref_mv_xy+1][0]*ref_mv_scale + (1<<15))>>16,
@ -1145,14 +1141,12 @@ static int epzs_motion_search2(MpegEncContext * s,
}else{
CHECK_MV(P_MV1[0]>>shift, P_MV1[1]>>shift)
//FIXME try some early stop
if(dmin>64*2){
CHECK_MV(P_MEDIAN[0]>>shift, P_MEDIAN[1]>>shift)
CHECK_MV(P_LEFT[0]>>shift, P_LEFT[1]>>shift)
CHECK_MV(P_TOP[0]>>shift, P_TOP[1]>>shift)
CHECK_MV(P_TOPRIGHT[0]>>shift, P_TOPRIGHT[1]>>shift)
CHECK_CLIPED_MV((last_mv[ref_mv_xy][0]*ref_mv_scale + (1<<15))>>16,
(last_mv[ref_mv_xy][1]*ref_mv_scale + (1<<15))>>16)
}
}
if(dmin>64*4){
CHECK_CLIPED_MV((last_mv[ref_mv_xy+1][0]*ref_mv_scale + (1<<15))>>16,

View File

@ -55,9 +55,9 @@ stddev: 9.13 PSNR:28.90 bytes:7602176
673694 ./data/a-h263.avi
d507be4253a9c8211a3738c58ba28118 *./data/out.yuv
stddev: 8.06 PSNR:29.99 bytes:7602176
1a48f1c50c6fcddb49f4e3a78947165a *./data/a-h263p.avi
2389296 ./data/a-h263p.avi
9623019b41640f3e72adc4e21de588e9 *./data/out.yuv
e9e884a7c6b77d1aeeb4cb56ac150f92 *./data/a-h263p.avi
2389564 ./data/a-h263p.avi
0bb16a352798c997cb36e167f4fa8f3c *./data/out.yuv
stddev: 2.07 PSNR:41.77 bytes:7602176
3ee2dd25f141d520f61e5c01d08bdef1 *./data/a-odivx.mp4
550787 ./data/a-odivx.mp4
@ -67,9 +67,9 @@ stddev: 7.99 PSNR:30.06 bytes:7602176
7933744 ./data/a-huffyuv.avi
799d3db687f6cdd7a837ec156efc171f *./data/out.yuv
stddev: 0.00 PSNR:99.99 bytes:7602176
b1d4a379b518b647b2bf60588af97b51 *./data/a-mpeg4-rc.avi
814162 ./data/a-mpeg4-rc.avi
36b334706165fdf21355e9be83aea59a *./data/out.yuv
5f35533ff4357e405971466ee06375db *./data/a-mpeg4-rc.avi
814102 ./data/a-mpeg4-rc.avi
2cc2a0b6699d861b4cffad28a704067b *./data/out.yuv
stddev: 10.41 PSNR:27.76 bytes:7602176
85e2456a673041d528b242d78318fb65 *./data/a-mpeg4-adv.avi
600188 ./data/a-mpeg4-adv.avi
@ -83,8 +83,8 @@ stddev: 12.31 PSNR:26.31 bytes:7602176
878910 ./data/a-mpeg4-Q.avi
83b3cef07c91a397c63bc4bc45df667f *./data/out.yuv
stddev: 5.61 PSNR:33.13 bytes:7602176
b32eb820d8fe8f1d0e715296ff8a1aee *./data/a-mpeg4-PSP.mp4
406443 ./data/a-mpeg4-PSP.mp4
c1dae02bddd79790266bc0a9f7d6eb0e *./data/a-mpeg4-PSP.mp4
406449 ./data/a-mpeg4-PSP.mp4
7315281e07830456208dff61337c982b *./data/a-error-mpeg4-adv.avi
731526 ./data/a-error-mpeg4-adv.avi
6ce2c82a0a9cf67a6991694473e9a306 *./data/out.yuv
@ -137,8 +137,8 @@ b12ff53580cd8a9ce92ab7a0649e99f9 *./data/a-snow.avi
155948 ./data/a-snow.avi
b3feb1bf17bb4e720da1f1e8b4da4c03 *./data/out.yuv
stddev: 23.19 PSNR:20.81 bytes:7602176
cc7e274327a2699a453db29b94eac0f6 *./data/a-snow53.avi
3524264 ./data/a-snow53.avi
265c4e0c45b2313817fa4d86dccbe6ba *./data/a-snow53.avi
3519574 ./data/a-snow53.avi
799d3db687f6cdd7a837ec156efc171f *./data/out.yuv
stddev: 0.00 PSNR:99.99 bytes:7602176
2fcbcdc63816e1321bf4b6b5380338d2 *./data/a-dv.dv
@ -149,9 +149,9 @@ stddev: 8.86 PSNR:29.17 bytes:7602176
14400000 ./data/a-dv.dv
fc866b8879a34f5b440647e5135e4bfb *./data/out.yuv
stddev: 8.45 PSNR:29.58 bytes:7602176
2b5eb22793cc97b85fb36592e3f01d3c *./data/a-svq1.mov
1366363 ./data/a-svq1.mov
f5958f4510878e3c0afe0b1e4aeb34d4 *./data/out.yuv
6860534864cad0de4b1af9f987aaf9bf *./data/a-svq1.mov
1365791 ./data/a-svq1.mov
fb0a97094a89d6f379535f615783d00c *./data/out.yuv
stddev: 10.98 PSNR:27.30 bytes:7602176
21f8ff9f1daacd9133683bb4ea0f50a4 *./data/a-mp2.mp2
95712 ./data/a-mp2.mp2

View File

@ -28,9 +28,9 @@ bdb7484c68db722f66ba1630cf79844c *./data/b-libav.mpg
26c41db318d9aacfd6b9e734c0ea4d94 *./data/b-libav.dv
3600000 ./data/b-libav.dv
./data/b-libav.dv CRC=0xa6b8b635
002bb6d522748f81d4f785e64ede608b *./data/b-libav.gxf
815224 ./data/b-libav.gxf
./data/b-libav.gxf CRC=0x8da7e19c
2b3f921fb7a01bb126cab5ee21ae3f8d *./data/b-libav.gxf
815700 ./data/b-libav.gxf
./data/b-libav.gxf CRC=0x238a01b0
9a9da315747599f7718cc9a9a09c21ff *./data/b-libav.pbm
317075 ./data/b-libav.pbm
./data/b-libav.pbm CRC=0xb92906cb

View File

@ -1,101 +1,101 @@
ffmpeg regression test
13f3526e10f3e61758fd35e0d74631ca *./data/a-mpeg1.mpg
192726 ./data/a-mpeg1.mpg
2b593ccfcd5a35f00805663bb34f9144 *./data/out.yuv
73ca6f1deab02d1d67a0e8495c026a9e *./data/a-mpeg1.mpg
192783 ./data/a-mpeg1.mpg
56147e94b12f08df7213e610e177823d *./data/out.yuv
stddev: 4.95 PSNR:34.21 bytes:7602176
d5beac21c30ab17ad05555d9ba8a9cbd *./data/a-mpeg2.mpg
198768 ./data/a-mpeg2.mpg
280dbdb05ada82b2cdf03afabc88952d *./data/out.yuv
stddev: 4.97 PSNR:34.19 bytes:7602176
6a29938a6189595e8826a17e9c00f70a *./data/a-mpeg2ivlc.mpg
197973 ./data/a-mpeg2ivlc.mpg
280dbdb05ada82b2cdf03afabc88952d *./data/out.yuv
stddev: 4.97 PSNR:34.19 bytes:7602176
c51027e0021301cc94692726fea9c1ed *./data/a-mpeg2.mpg
198001 ./data/a-mpeg2.mpg
527bdb78f1bc55469ba852babdd05793 *./data/out.yuv
2d55ce623a7be4e8136f80266e487678 *./data/a-mpeg2.mpg
198667 ./data/a-mpeg2.mpg
b7cae8a1f751b821cddcbe4d5dbc518c *./data/out.yuv
stddev: 4.96 PSNR:34.19 bytes:7602176
6dc412b7972918b0c3be5b448c76cdbb *./data/a-mpeg2ivlc.mpg
197869 ./data/a-mpeg2ivlc.mpg
b7cae8a1f751b821cddcbe4d5dbc518c *./data/out.yuv
stddev: 4.96 PSNR:34.19 bytes:7602176
f979bcca866e6e4cad5dc6cb06e56cfb *./data/a-mpeg2.mpg
198041 ./data/a-mpeg2.mpg
f6d9bf24ff8676a7f6076c05cd2c81a3 *./data/out.yuv
stddev: 4.97 PSNR:34.18 bytes:7602176
a3d88483a0012970017b226a137d8a10 *./data/a-mpeg2i.mpg
204660 ./data/a-mpeg2i.mpg
584677e4af5d7162e80fc11699ceea24 *./data/out.yuv
f90197a8b6e62ae25f82625337f27240 *./data/a-mpeg2i.mpg
204579 ./data/a-mpeg2i.mpg
ea5057b60146c06d40449cdfc686bf13 *./data/out.yuv
stddev: 4.98 PSNR:34.17 bytes:7602176
79ae25a01733a0d221cd768f4c15cead *./data/a-mpeg2thread.mpg
183311 ./data/a-mpeg2thread.mpg
e92ef755c008e8640a021b363f8758d2 *./data/out.yuv
dc359097986fc04df7541f720fa5da14 *./data/a-mpeg2thread.mpg
183314 ./data/a-mpeg2thread.mpg
354eb621a217e50252dbed937f9eab18 *./data/out.yuv
stddev: 4.76 PSNR:34.57 bytes:7602176
bae9d04f67e584b8404c3bd140e3440e *./data/a-mpeg2threadivlc.mpg
182455 ./data/a-mpeg2threadivlc.mpg
e92ef755c008e8640a021b363f8758d2 *./data/out.yuv
fb02afb5a0c79c7e99a32e60e19a86bc *./data/a-mpeg2threadivlc.mpg
182460 ./data/a-mpeg2threadivlc.mpg
354eb621a217e50252dbed937f9eab18 *./data/out.yuv
stddev: 4.76 PSNR:34.57 bytes:7602176
0f8c4bf5bd07f53e98d43caea8b6fb2b *./data/a-mpeg2reuse.mpg
b567ce695c24fb1e08ff1c137a805e1a *./data/a-mpeg2reuse.mpg
394759 ./data/a-mpeg2reuse.mpg
1c51026a35fae071ab1a627e53c7a17e *./data/out.yuv
stddev: 4.76 PSNR:34.55 bytes:7602176
f5882da87ee7b6d05b3ff5cc78522569 *./data/a-msmpeg4v2.avi
129942 ./data/a-msmpeg4v2.avi
83746a4954925753732ae7c5a488e05a *./data/out.yuv
c3a86762e97a8869ed3c969ee2e084b8 *./data/out.yuv
stddev: 4.76 PSNR:34.56 bytes:7602176
c09815e40a9d260628e1ebad8b2b3774 *./data/a-msmpeg4v2.avi
129918 ./data/a-msmpeg4v2.avi
8920194f8bf8f9cdd6c65b3df9e1a292 *./data/out.yuv
stddev: 5.33 PSNR:33.58 bytes:7602176
07d1ab166eae53a79e4f946c01900c79 *./data/a-msmpeg4.avi
127690 ./data/a-msmpeg4.avi
77a58e6bb536d89d768f86aaac40b25c *./data/out.yuv
3069f95f2ffca1f20c8ea36e2625fabc *./data/a-msmpeg4.avi
127680 ./data/a-msmpeg4.avi
0e1c6e25c71c6a8fa8e506e3d97ca4c9 *./data/out.yuv
stddev: 5.33 PSNR:33.58 bytes:7602176
5dce6255b18d04cfc8d587e9adf2c2f2 *./data/a-wmv1.avi
6896c9bdf765953d272c25e34795b934 *./data/a-wmv1.avi
129548 ./data/a-wmv1.avi
e0f560d2ceb2212e99b7695953c485a9 *./data/out.yuv
81eee429b665254d19a06607463c0b5e *./data/out.yuv
stddev: 5.33 PSNR:33.59 bytes:7602176
7df3075a4823ddea4fc435ed050ebdcf *./data/a-wmv2.avi
34b40c67036c8e09740f7acfe3d43df6 *./data/a-wmv2.avi
129864 ./data/a-wmv2.avi
e0f560d2ceb2212e99b7695953c485a9 *./data/out.yuv
81eee429b665254d19a06607463c0b5e *./data/out.yuv
stddev: 5.33 PSNR:33.59 bytes:7602176
62a9246a6cdafc7197b08f0423fc9650 *./data/a-h261.avi
191080 ./data/a-h261.avi
cd47962207e5d846d4c48f76d201c688 *./data/out.yuv
dfd005d4c9030a0dc889c828a6408b9c *./data/a-h261.avi
191086 ./data/a-h261.avi
db7ceff174823b98834faa2320ca89ac *./data/out.yuv
stddev: 6.38 PSNR:32.02 bytes:7602176
44addeb0c2dcded59a4126d5f3ebfcd4 *./data/a-h263.avi
160110 ./data/a-h263.avi
4cbaab01992441ef827eeb52f87c7089 *./data/out.yuv
9a368687ab34c48079f11a202839a6bc *./data/a-h263.avi
160106 ./data/a-h263.avi
61213b91b359697ebcefb9e0a53ac54a *./data/out.yuv
stddev: 5.43 PSNR:33.41 bytes:7602176
bd7a056430483d092c72f5a0cea4722a *./data/a-h263p.avi
868248 ./data/a-h263p.avi
cc9e7a671f0529cb9ab9953fca1566af *./data/out.yuv
c7644d40e9f40bbd98e5a978f9f94bb4 *./data/a-h263p.avi
868018 ./data/a-h263p.avi
4b0ee791f280029dc03c528f76f195d4 *./data/out.yuv
stddev: 1.91 PSNR:42.49 bytes:7602176
e2ff2428390448148e89f136b2bb8cf1 *./data/a-odivx.mp4
119838 ./data/a-odivx.mp4
3a56233169cd9d89e0f5bfa99b27f58f *./data/out.yuv
f15f07988bfdb2851f88ebe3036b72d3 *./data/a-odivx.mp4
119797 ./data/a-odivx.mp4
90a3577850239083a9042bef33c50e85 *./data/out.yuv
stddev: 5.34 PSNR:33.56 bytes:7602176
a1323da0c8b437cd6961f8c90451880b *./data/a-huffyuv.avi
6455232 ./data/a-huffyuv.avi
dde5895817ad9d219f79a52d0bdfb001 *./data/out.yuv
stddev: 0.00 PSNR:99.99 bytes:7602176
cccc9b7c4585052503f7347ddddbb860 *./data/a-mpeg4-rc.avi
a418db8cc1410a50a154e8418d78e3d7 *./data/a-mpeg4-rc.avi
227918 ./data/a-mpeg4-rc.avi
b5a5e3252da6f38be2b36d23425b7fa4 *./data/out.yuv
56b327651c526538576fbc104f696dde *./data/out.yuv
stddev: 4.24 PSNR:35.55 bytes:7602176
5244e1d668f692b401a1ce54a2200892 *./data/a-mpeg4-adv.avi
173584 ./data/a-mpeg4-adv.avi
072c36ae50d8847abd1bd1e68e18941f *./data/out.yuv
9001cf571eb7f26fa5592bdec6538583 *./data/a-mpeg4-adv.avi
173590 ./data/a-mpeg4-adv.avi
699edf05648fdc42196b7bebef9be269 *./data/out.yuv
stddev: 4.84 PSNR:34.41 bytes:7602176
26a5e8ebd3279d0786cad42dcf0330d9 *./data/a-mpeg4-thread.avi
254272 ./data/a-mpeg4-thread.avi
db13a52cb0ca377437252020dcb77070 *./data/out.yuv
5d94ca237bd1ba1a6cdab6796485c6dc *./data/a-mpeg4-thread.avi
254248 ./data/a-mpeg4-thread.avi
1cb815783ab9dc787add51cdbc97e156 *./data/out.yuv
stddev: 4.03 PSNR:36.01 bytes:7602176
59e682efe457070d21170fdb117c1961 *./data/a-mpeg4-Q.avi
165840 ./data/a-mpeg4-Q.avi
f5838ffcf1dd6c538e27dbe906e5eadd *./data/out.yuv
stddev: 4.00 PSNR:36.08 bytes:7602176
637276f7d050939943201b36a84f4a63 *./data/a-mpeg4-PSP.mp4
325126 ./data/a-mpeg4-PSP.mp4
66366267ec7669cd49cc761c02a3b9db *./data/a-error-mpeg4-adv.avi
180442 ./data/a-error-mpeg4-adv.avi
15bb31699dd69be8a35f641cae0d1079 *./data/out.yuv
stddev: 8.38 PSNR:29.65 bytes:7602176
4e7c820df5386b62b857c9c6a0fde646 *./data/a-mpeg4-nr.avi
155066 ./data/a-mpeg4-nr.avi
460ce46a8e22a3305ad28640e5d39d08 *./data/out.yuv
5b5b88ce610114e346a5df4f46995bb9 *./data/a-mpeg4-PSP.mp4
325006 ./data/a-mpeg4-PSP.mp4
90e65096aa9ebafa3fe3f44a5a47cdc4 *./data/a-error-mpeg4-adv.avi
176588 ./data/a-error-mpeg4-adv.avi
113defd3f8daf878e0b3fc03fafb4c09 *./data/out.yuv
stddev: 9.02 PSNR:29.01 bytes:7602176
c41187c99588fb7229ad330b2f80d28b *./data/a-mpeg4-nr.avi
155044 ./data/a-mpeg4-nr.avi
f7fc191308679f709405e62271f5c65f *./data/out.yuv
stddev: 4.73 PSNR:34.62 bytes:7602176
ca07f03ee7235ad1f91cf5f4d9f70a87 *./data/a-mpeg1b.mpg
229976 ./data/a-mpeg1b.mpg
05ea55f7a0c243672c3d64bdfda288ee *./data/out.yuv
1244f602a39b255ca676ca1e47617afd *./data/a-mpeg1b.mpg
230033 ./data/a-mpeg1b.mpg
df02ed235141aa229b47b91b28f71da5 *./data/out.yuv
stddev: 4.13 PSNR:35.79 bytes:7602176
b179402bba391073b5f5f9324a834061 *./data/a-mjpeg.avi
703564 ./data/a-mjpeg.avi
@ -109,13 +109,13 @@ stddev: 0.00 PSNR:99.99 bytes:7602176
8334508 ./data/a-jpegls.avi
a63d4e3ea1f0b0c0d44821da9e09b8f4 *./data/out.yuv
stddev: 0.67 PSNR:51.57 bytes:7602176
1f2b4b2b0f678f3f771daaaf79ad56da *./data/a-rv10.rm
154332 ./data/a-rv10.rm
4cbaab01992441ef827eeb52f87c7089 *./data/out.yuv
989a42671603dc1a7e6b156dccf0e820 *./data/a-rv10.rm
154330 ./data/a-rv10.rm
61213b91b359697ebcefb9e0a53ac54a *./data/out.yuv
stddev: 5.43 PSNR:33.41 bytes:7602176
b0d8ca3f359689eab810f3cf689cbcde *./data/a-rv20.rm
132745 ./data/a-rv20.rm
0bdc9ece25480278095ba4eda2f22d0a *./data/out.yuv
1b1cbff8e78602de498b4314cb991e72 *./data/a-rv20.rm
132754 ./data/a-rv20.rm
c66afdcc0daac2f1b4167b9811968877 *./data/out.yuv
stddev: 5.42 PSNR:33.44 bytes:7602176
4eb34d2de25f67a2706456e999338fe9 *./data/a-asv1.avi
832512 ./data/a-asv1.avi
@ -125,9 +125,9 @@ stddev: 10.47 PSNR:27.72 bytes:7602176
789072 ./data/a-asv2.avi
74a78015b64b2cf8cb9da2e44f508a69 *./data/out.yuv
stddev: 10.28 PSNR:27.88 bytes:7602176
c5f91672f147b43f903fa90b2b6b631c *./data/a-flv.flv
131356 ./data/a-flv.flv
68ba2ed47bd361a3df673fa445e9adc2 *./data/out.yuv
bd76377d9e167caff10ebaf381f01a82 *./data/a-flv.flv
131337 ./data/a-flv.flv
8999c8264fb0941561f64c4a736e9d88 *./data/out.yuv
stddev: 5.33 PSNR:33.58 bytes:7602176
d72b0960e162d4998b9acbabb07e99ab *./data/a-ffv1.avi
3525804 ./data/a-ffv1.avi
@ -137,8 +137,8 @@ stddev: 0.00 PSNR:99.99 bytes:7602176
68526 ./data/a-snow.avi
d2914543504345fad6e5593f66f072bc *./data/out.yuv
stddev: 10.93 PSNR:27.34 bytes:7602176
eea9dcade6a999ea217d4952d79c4741 *./data/a-snow53.avi
2723150 ./data/a-snow53.avi
892221ef4c1debf694a481a5e23e1136 *./data/a-snow53.avi
2722066 ./data/a-snow53.avi
dde5895817ad9d219f79a52d0bdfb001 *./data/out.yuv
stddev: 0.00 PSNR:99.99 bytes:7602176
af9f474238c9c68cb32e389659ee25ab *./data/a-dv.dv
@ -149,9 +149,9 @@ stddev: 2.99 PSNR:38.59 bytes:7602176
14400000 ./data/a-dv.dv
74b01209bb5e096d570dd4df112bb82d *./data/out.yuv
stddev: 2.98 PSNR:38.61 bytes:7602176
6e310a8dab12bd1e0f9df39d220ac36f *./data/a-svq1.mov
768347 ./data/a-svq1.mov
0ec9c7ce4159024312aa9682b16f0444 *./data/out.yuv
7ba9292d663819a9a1d1cdecc6f1b079 *./data/a-svq1.mov
768407 ./data/a-svq1.mov
6bc10518bc387c3bdf117997713ee69a *./data/out.yuv
stddev: 3.44 PSNR:37.39 bytes:7602176
21f8ff9f1daacd9133683bb4ea0f50a4 *./data/a-mp2.mp2
95712 ./data/a-mp2.mp2