[FFmpeg-cvslog] avcodec/snowenc: set dia_size for the first pass of motion estimation too
Michael Niedermayer
git at videolan.org
Sun May 10 14:30:10 CEST 2015
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun May 10 04:43:39 2015 +0200| [729108515dc1255e9581926c3c8895314b26edc7] | committer: Michael Niedermayer
avcodec/snowenc: set dia_size for the first pass of motion estimation too
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=729108515dc1255e9581926c3c8895314b26edc7
---
libavcodec/snowenc.c | 1 +
tests/ref/fate/filter-mcdeint-medium | 58 ++++++++++++++++----------------
tests/ref/seek/vsynth_lena-snow | 20 +++++------
tests/ref/vsynth/vsynth1-snow | 8 ++---
tests/ref/vsynth/vsynth1-snow-hpel | 8 ++---
tests/ref/vsynth/vsynth2-snow | 8 ++---
tests/ref/vsynth/vsynth_lena-snow | 8 ++---
tests/ref/vsynth/vsynth_lena-snow-hpel | 6 ++--
8 files changed, 59 insertions(+), 58 deletions(-)
diff --git a/libavcodec/snowenc.c b/libavcodec/snowenc.c
index 1f04609..a7de16a 100644
--- a/libavcodec/snowenc.c
+++ b/libavcodec/snowenc.c
@@ -1654,6 +1654,7 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt,
s->m.pict_type = pic->pict_type;
s->m.me_method= s->avctx->me_method;
s->m.me.scene_change_score=0;
+ s->m.me.dia_size = avctx->dia_size;
s->m.flags= s->avctx->flags;
s->m.quarter_sample= (s->avctx->flags & CODEC_FLAG_QPEL)!=0;
s->m.out_format= FMT_H263;
diff --git a/tests/ref/fate/filter-mcdeint-medium b/tests/ref/fate/filter-mcdeint-medium
index 80ba484..cfd504f 100644
--- a/tests/ref/fate/filter-mcdeint-medium
+++ b/tests/ref/fate/filter-mcdeint-medium
@@ -1,31 +1,31 @@
#tb 0: 1/25
0, 9, 9, 1, 622080, 0xb3b66c5c
-0, 10, 10, 1, 622080, 0xc69368eb
-0, 11, 11, 1, 622080, 0x76bdde33
-0, 12, 12, 1, 622080, 0x5a04d7a6
-0, 13, 13, 1, 622080, 0x68eacaec
-0, 14, 14, 1, 622080, 0x1e888865
-0, 15, 15, 1, 622080, 0x188ad805
-0, 16, 16, 1, 622080, 0x268e94ce
-0, 17, 17, 1, 622080, 0x89da806c
-0, 18, 18, 1, 622080, 0x507ec6c9
-0, 19, 19, 1, 622080, 0xf20ba69b
-0, 20, 20, 1, 622080, 0x5786a96e
-0, 21, 21, 1, 622080, 0xf9d2fd6e
-0, 22, 22, 1, 622080, 0x4b69ef51
-0, 23, 23, 1, 622080, 0x19a22b06
-0, 24, 24, 1, 622080, 0x13a30e94
-0, 25, 25, 1, 622080, 0x02435f86
-0, 26, 26, 1, 622080, 0x06794a00
-0, 27, 27, 1, 622080, 0x289e8aea
-0, 28, 28, 1, 622080, 0x494ab1a4
-0, 29, 29, 1, 622080, 0xc1c6f5da
-0, 30, 30, 1, 622080, 0x1f6d6764
-0, 31, 31, 1, 622080, 0xaa898832
-0, 32, 32, 1, 622080, 0x6935c412
-0, 33, 33, 1, 622080, 0x825e2a67
-0, 34, 34, 1, 622080, 0xd8ee113a
-0, 35, 35, 1, 622080, 0x9ffc7f17
-0, 36, 36, 1, 622080, 0xa7819ac8
-0, 37, 37, 1, 622080, 0xa412377d
-0, 38, 38, 1, 622080, 0x538376bc
+0, 10, 10, 1, 622080, 0x26a29152
+0, 11, 11, 1, 622080, 0x787adddc
+0, 12, 12, 1, 622080, 0xcc52df08
+0, 13, 13, 1, 622080, 0x53dad126
+0, 14, 14, 1, 622080, 0xe1448652
+0, 15, 15, 1, 622080, 0x159fd353
+0, 16, 16, 1, 622080, 0xcbe893a0
+0, 17, 17, 1, 622080, 0x43a67c6b
+0, 18, 18, 1, 622080, 0xef30caf9
+0, 19, 19, 1, 622080, 0xa9cea62b
+0, 20, 20, 1, 622080, 0x4c4cada1
+0, 21, 21, 1, 622080, 0x8e91f6de
+0, 22, 22, 1, 622080, 0xb03ef044
+0, 23, 23, 1, 622080, 0x6b54262b
+0, 24, 24, 1, 622080, 0x911e0cea
+0, 25, 25, 1, 622080, 0x8320632c
+0, 26, 26, 1, 622080, 0x2bde42b2
+0, 27, 27, 1, 622080, 0xe9d988c3
+0, 28, 28, 1, 622080, 0xa9f0b1db
+0, 29, 29, 1, 622080, 0xb5bcf186
+0, 30, 30, 1, 622080, 0x469c6717
+0, 31, 31, 1, 622080, 0x2ca883e6
+0, 32, 32, 1, 622080, 0x4f5fba72
+0, 33, 33, 1, 622080, 0xa2e423ca
+0, 34, 34, 1, 622080, 0xc1fb0aaf
+0, 35, 35, 1, 622080, 0x96a879b8
+0, 36, 36, 1, 622080, 0x212e92e6
+0, 37, 37, 1, 622080, 0x9f26378a
+0, 38, 38, 1, 622080, 0xdeaf77ab
diff --git a/tests/ref/seek/vsynth_lena-snow b/tests/ref/seek/vsynth_lena-snow
index 9d4ada6..33d6c27 100644
--- a/tests/ref/seek/vsynth_lena-snow
+++ b/tests/ref/seek/vsynth_lena-snow
@@ -2,19 +2,19 @@ ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 5652 size: 3035
ret: 0 st:-1 flags:0 ts:-1.000000
ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 5652 size: 3035
ret: 0 st:-1 flags:1 ts: 1.894167
-ret: 0 st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 39718 size: 3640
+ret: 0 st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 39806 size: 3640
ret: 0 st: 0 flags:0 ts: 0.800000
-ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 27438 size: 3494
+ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 27442 size: 3494
ret:-1 st: 0 flags:1 ts:-0.320000
ret:-1 st:-1 flags:0 ts: 2.576668
ret: 0 st:-1 flags:1 ts: 1.470835
-ret: 0 st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 39718 size: 3640
+ret: 0 st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 39806 size: 3640
ret: 0 st: 0 flags:0 ts: 0.360000
-ret: 0 st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 16128 size: 3244
+ret: 0 st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 16134 size: 3244
ret:-1 st: 0 flags:1 ts:-0.760000
ret:-1 st:-1 flags:0 ts: 2.153336
ret: 0 st:-1 flags:1 ts: 1.047503
-ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 27438 size: 3494
+ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 27442 size: 3494
ret: 0 st: 0 flags:0 ts:-0.040000
ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 5652 size: 3035
ret: 0 st: 0 flags:1 ts: 2.840000
@@ -22,13 +22,13 @@ ret: 0 st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 52608 size: 3582
ret: 0 st:-1 flags:0 ts: 1.730004
ret: 0 st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 52608 size: 3582
ret: 0 st:-1 flags:1 ts: 0.624171
-ret: 0 st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 16128 size: 3244
+ret: 0 st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 16134 size: 3244
ret: 0 st: 0 flags:0 ts:-0.480000
ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 5652 size: 3035
ret: 0 st: 0 flags:1 ts: 2.400000
ret: 0 st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 52608 size: 3582
ret: 0 st:-1 flags:0 ts: 1.306672
-ret: 0 st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 39718 size: 3640
+ret: 0 st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 39806 size: 3640
ret: 0 st:-1 flags:1 ts: 0.200839
ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 5652 size: 3035
ret: 0 st: 0 flags:0 ts:-0.920000
@@ -36,11 +36,11 @@ ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 5652 size: 3035
ret: 0 st: 0 flags:1 ts: 2.000000
ret: 0 st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 52608 size: 3582
ret: 0 st:-1 flags:0 ts: 0.883340
-ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 27438 size: 3494
+ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 27442 size: 3494
ret:-1 st:-1 flags:1 ts:-0.222493
ret:-1 st: 0 flags:0 ts: 2.680000
ret: 0 st: 0 flags:1 ts: 1.560000
-ret: 0 st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 39718 size: 3640
+ret: 0 st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 39806 size: 3640
ret: 0 st:-1 flags:0 ts: 0.460008
-ret: 0 st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 16128 size: 3244
+ret: 0 st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 16134 size: 3244
ret:-1 st:-1 flags:1 ts:-0.645825
diff --git a/tests/ref/vsynth/vsynth1-snow b/tests/ref/vsynth/vsynth1-snow
index bd29a3b..f20abd2 100644
--- a/tests/ref/vsynth/vsynth1-snow
+++ b/tests/ref/vsynth/vsynth1-snow
@@ -1,4 +1,4 @@
-09e7402e7a86a1b88c2470ce7b7c5479 *tests/data/fate/vsynth1-snow.avi
-136222 tests/data/fate/vsynth1-snow.avi
-1b666c20aab90bca35d45732ae6f539f *tests/data/fate/vsynth1-snow.out.rawvideo
-stddev: 22.77 PSNR: 20.98 MAXDIFF: 173 bytes: 7603200/ 7603200
+67c10f8d52fcd1103caa675a1408bf6e *tests/data/fate/vsynth1-snow.avi
+136088 tests/data/fate/vsynth1-snow.avi
+bfc0bcc4bc7b956933aa58acc587018d *tests/data/fate/vsynth1-snow.out.rawvideo
+stddev: 22.77 PSNR: 20.98 MAXDIFF: 175 bytes: 7603200/ 7603200
diff --git a/tests/ref/vsynth/vsynth1-snow-hpel b/tests/ref/vsynth/vsynth1-snow-hpel
index e12ca4e..39780ad 100644
--- a/tests/ref/vsynth/vsynth1-snow-hpel
+++ b/tests/ref/vsynth/vsynth1-snow-hpel
@@ -1,4 +1,4 @@
-a7fcc538cb09bd0d9096690ebc0e12c3 *tests/data/fate/vsynth1-snow-hpel.avi
-138572 tests/data/fate/vsynth1-snow-hpel.avi
-654064845979137a336aa27cb9605f69 *tests/data/fate/vsynth1-snow-hpel.out.rawvideo
-stddev: 22.74 PSNR: 20.99 MAXDIFF: 175 bytes: 7603200/ 7603200
+e62ae25d5040d04622a965bcb27fdb1e *tests/data/fate/vsynth1-snow-hpel.avi
+138446 tests/data/fate/vsynth1-snow-hpel.avi
+57c914cd150f8fc260b5989ce3e5884c *tests/data/fate/vsynth1-snow-hpel.out.rawvideo
+stddev: 22.74 PSNR: 20.99 MAXDIFF: 172 bytes: 7603200/ 7603200
diff --git a/tests/ref/vsynth/vsynth2-snow b/tests/ref/vsynth/vsynth2-snow
index bedb194..e9607bb 100644
--- a/tests/ref/vsynth/vsynth2-snow
+++ b/tests/ref/vsynth/vsynth2-snow
@@ -1,4 +1,4 @@
-f80a52dad2fd125df9dd6fcb0313eba9 *tests/data/fate/vsynth2-snow.avi
-72806 tests/data/fate/vsynth2-snow.avi
-fb1944b90011ff997e4762eebe3d5ad3 *tests/data/fate/vsynth2-snow.out.rawvideo
-stddev: 13.72 PSNR: 25.38 MAXDIFF: 162 bytes: 7603200/ 7603200
+0a41e73ddd2f54936490655b46dad4a3 *tests/data/fate/vsynth2-snow.avi
+72868 tests/data/fate/vsynth2-snow.avi
+34a75f5cf8a71159f1a572d9cedcfef9 *tests/data/fate/vsynth2-snow.out.rawvideo
+stddev: 13.73 PSNR: 25.37 MAXDIFF: 162 bytes: 7603200/ 7603200
diff --git a/tests/ref/vsynth/vsynth_lena-snow b/tests/ref/vsynth/vsynth_lena-snow
index 580d5c7..ec29a78 100644
--- a/tests/ref/vsynth/vsynth_lena-snow
+++ b/tests/ref/vsynth/vsynth_lena-snow
@@ -1,4 +1,4 @@
-ca3ca23811d77e8d6b438116675c5550 *tests/data/fate/vsynth_lena-snow.avi
-57692 tests/data/fate/vsynth_lena-snow.avi
-8890189af71a0dd3447c4e8424c9a76b *tests/data/fate/vsynth_lena-snow.out.rawvideo
-stddev: 10.47 PSNR: 27.72 MAXDIFF: 119 bytes: 7603200/ 7603200
+8e96f337e8f4ccac7d72ef517e1d2208 *tests/data/fate/vsynth_lena-snow.avi
+57680 tests/data/fate/vsynth_lena-snow.avi
+90963cfd2359d460001c94d94256dc2b *tests/data/fate/vsynth_lena-snow.out.rawvideo
+stddev: 10.48 PSNR: 27.72 MAXDIFF: 119 bytes: 7603200/ 7603200
diff --git a/tests/ref/vsynth/vsynth_lena-snow-hpel b/tests/ref/vsynth/vsynth_lena-snow-hpel
index df073b8..2d6edd8 100644
--- a/tests/ref/vsynth/vsynth_lena-snow-hpel
+++ b/tests/ref/vsynth/vsynth_lena-snow-hpel
@@ -1,4 +1,4 @@
-189b98a51f6d9f4fe8cc6c08a77e5b46 *tests/data/fate/vsynth_lena-snow-hpel.avi
+56b14cb1cbb637536233982e87f7ac3e *tests/data/fate/vsynth_lena-snow-hpel.avi
61764 tests/data/fate/vsynth_lena-snow-hpel.avi
-8680d40905f423999d65b996c4dcb984 *tests/data/fate/vsynth_lena-snow-hpel.out.rawvideo
-stddev: 10.45 PSNR: 27.74 MAXDIFF: 123 bytes: 7603200/ 7603200
+244b0266127fa354d8485234b2c388e4 *tests/data/fate/vsynth_lena-snow-hpel.out.rawvideo
+stddev: 10.45 PSNR: 27.74 MAXDIFF: 119 bytes: 7603200/ 7603200
More information about the ffmpeg-cvslog
mailing list