From f836ea0dcb181417b38a75302c1c5ffdeaa0fb4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Kr=C3=BCger?= Date: Tue, 3 Mar 2015 18:11:54 +0100 Subject: [PATCH 1/2] mov: make writing colr the default (based on a patch by derek buitenhuis) --- libavformat/movenc.c | 6 ++---- libavformat/movenc.h | 2 +- libavformat/version.h | 4 ++-- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/libavformat/movenc.c b/libavformat/movenc.c index e496ba4..b7d5e0b 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -64,7 +64,7 @@ static const AVOption options[] = { { "dash", "Write DASH compatible fragmented MP4", 0, AV_OPT_TYPE_CONST, {.i64 = FF_MOV_FLAG_DASH}, INT_MIN, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM, "movflags" }, { "frag_discont", "Signal that the next fragment is discontinuous from earlier ones", 0, AV_OPT_TYPE_CONST, {.i64 = FF_MOV_FLAG_FRAG_DISCONT}, INT_MIN, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM, "movflags" }, { "delay_moov", "Delay writing the initial moov until the first fragment is cut, or until the first fragment flush", 0, AV_OPT_TYPE_CONST, {.i64 = FF_MOV_FLAG_DELAY_MOOV}, INT_MIN, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM, "movflags" }, - { "write_colr", "Write colr atom", 0, AV_OPT_TYPE_CONST, {.i64 = FF_MOV_FLAG_WRITE_COLR}, INT_MIN, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM, "movflags" }, + { "no_colr", "Do not write colr atom", 0, AV_OPT_TYPE_CONST, {.i64 = FF_MOV_FLAG_NO_COLR}, INT_MIN, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM, "movflags" }, FF_RTP_FLAG_OPTS(MOVMuxContext, rtp_flags), { "skip_iods", "Skip writing iods atom.", offsetof(MOVMuxContext, iods_skip), AV_OPT_TYPE_INT, {.i64 = 1}, 0, 1, AV_OPT_FLAG_ENCODING_PARAM}, { "iods_audio_profile", "iods audio profile atom.", offsetof(MOVMuxContext, iods_audio_profile), AV_OPT_TYPE_INT, {.i64 = -1}, -1, 255, AV_OPT_FLAG_ENCODING_PARAM}, @@ -1700,11 +1700,9 @@ static int mov_write_video_tag(AVIOContext *pb, MOVMuxContext *mov, MOVTrack *tr if (track->enc->field_order != AV_FIELD_UNKNOWN) mov_write_fiel_tag(pb, track); - if (mov->flags & FF_MOV_FLAG_WRITE_COLR) { + if (!(mov->flags & FF_MOV_FLAG_NO_COLR)) { if (track->mode == MODE_MOV || track->mode == MODE_MP4) mov_write_colr_tag(pb, track); - else - av_log(mov->fc, AV_LOG_WARNING, "Not writing 'colr' atom. Format is not MOV or MP4.\n"); } if (track->enc->sample_aspect_ratio.den && track->enc->sample_aspect_ratio.num && diff --git a/libavformat/movenc.h b/libavformat/movenc.h index 3a72937..f80514a 100644 --- a/libavformat/movenc.h +++ b/libavformat/movenc.h @@ -201,7 +201,7 @@ typedef struct MOVMuxContext { #define FF_MOV_FLAG_DASH (1 << 11) #define FF_MOV_FLAG_FRAG_DISCONT (1 << 12) #define FF_MOV_FLAG_DELAY_MOOV (1 << 13) -#define FF_MOV_FLAG_WRITE_COLR (1 << 14) +#define FF_MOV_FLAG_NO_COLR (1 << 14) int ff_mov_write_packet(AVFormatContext *s, AVPacket *pkt); diff --git a/libavformat/version.h b/libavformat/version.h index 248cd3c..08ab50b 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -30,8 +30,8 @@ #include "libavutil/version.h" #define LIBAVFORMAT_VERSION_MAJOR 56 -#define LIBAVFORMAT_VERSION_MINOR 23 -#define LIBAVFORMAT_VERSION_MICRO 106 +#define LIBAVFORMAT_VERSION_MINOR 24 +#define LIBAVFORMAT_VERSION_MICRO 100 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ LIBAVFORMAT_VERSION_MINOR, \ -- 1.9.3 (Apple Git-50) From db0f18e3f9c73c487e0be7385455444b3ace9531 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Kr=C3=BCger?= Date: Wed, 4 Mar 2015 15:35:04 +0100 Subject: [PATCH 2/2] update fate checksums after changing default to write colr if not opted out --- tests/fate/vcodec.mak | 8 ++--- tests/ref/lavf/mov | 16 ++++----- tests/ref/seek/lavf-mov | 44 ++++++++++++------------- tests/ref/vsynth/vsynth1-avui | 4 +-- tests/ref/vsynth/vsynth1-dnxhd-1080i | 8 ++--- tests/ref/vsynth/vsynth1-dnxhd-1080i-colr | 4 --- tests/ref/vsynth/vsynth1-dnxhd-1080i-nocolr | 4 +++ tests/ref/vsynth/vsynth1-mpeg4 | 4 +-- tests/ref/vsynth/vsynth1-prores | 4 +-- tests/ref/vsynth/vsynth1-prores_ks | 4 +-- tests/ref/vsynth/vsynth1-qtrle | 4 +-- tests/ref/vsynth/vsynth1-qtrlegray | 4 +-- tests/ref/vsynth/vsynth1-svq1 | 4 +-- tests/ref/vsynth/vsynth2-avui | 4 +-- tests/ref/vsynth/vsynth2-dnxhd-1080i | 8 ++--- tests/ref/vsynth/vsynth2-dnxhd-1080i-colr | 4 --- tests/ref/vsynth/vsynth2-dnxhd-1080i-nocolr | 4 +++ tests/ref/vsynth/vsynth2-mpeg4 | 4 +-- tests/ref/vsynth/vsynth2-prores | 4 +-- tests/ref/vsynth/vsynth2-prores_ks | 4 +-- tests/ref/vsynth/vsynth2-qtrle | 4 +-- tests/ref/vsynth/vsynth2-qtrlegray | 4 +-- tests/ref/vsynth/vsynth2-svq1 | 4 +-- tests/ref/vsynth/vsynth3-dnxhd-1080i-colr | 4 --- tests/ref/vsynth/vsynth3-dnxhd-1080i-nocolr | 4 +++ tests/ref/vsynth/vsynth3-mpeg4 | 4 +-- tests/ref/vsynth/vsynth3-prores | 4 +-- tests/ref/vsynth/vsynth3-prores_ks | 4 +-- tests/ref/vsynth/vsynth3-qtrle | 4 +-- tests/ref/vsynth/vsynth3-svq1 | 4 +-- tests/ref/vsynth/vsynth_lena-dnxhd-1080i-colr | 4 --- tests/ref/vsynth/vsynth_lena-dnxhd-1080i-nocolr | 4 +++ 32 files changed, 96 insertions(+), 96 deletions(-) delete mode 100644 tests/ref/vsynth/vsynth1-dnxhd-1080i-colr create mode 100644 tests/ref/vsynth/vsynth1-dnxhd-1080i-nocolr delete mode 100644 tests/ref/vsynth/vsynth2-dnxhd-1080i-colr create mode 100644 tests/ref/vsynth/vsynth2-dnxhd-1080i-nocolr delete mode 100644 tests/ref/vsynth/vsynth3-dnxhd-1080i-colr create mode 100644 tests/ref/vsynth/vsynth3-dnxhd-1080i-nocolr delete mode 100644 tests/ref/vsynth/vsynth_lena-dnxhd-1080i-colr create mode 100644 tests/ref/vsynth/vsynth_lena-dnxhd-1080i-nocolr diff --git a/tests/fate/vcodec.mak b/tests/fate/vcodec.mak index 0aba87b..02ee2e1 100644 --- a/tests/fate/vcodec.mak +++ b/tests/fate/vcodec.mak @@ -37,15 +37,15 @@ fate-vsynth%-dnxhd-720p-10bit: ENCOPTS = -s hd720 -b 90M \ -pix_fmt yuv422p10 -frames 5 -qmax 8 fate-vsynth%-dnxhd-720p-10bit: FMT = dnxhd -FATE_VCODEC-$(call ENCDEC, DNXHD, MOV) += dnxhd-1080i dnxhd-1080i-colr +FATE_VCODEC-$(call ENCDEC, DNXHD, MOV) += dnxhd-1080i dnxhd-1080i-nocolr fate-vsynth%-dnxhd-1080i: ENCOPTS = -s hd1080 -b 120M -flags +ildct \ -pix_fmt yuv422p -frames 5 -qmax 8 +fate-vsynth%-dnxhd-1080i: DECOPTS = -sws_flags area+accurate_rnd+bitexact fate-vsynth%-dnxhd-1080i: FMT = mov -fate-vsynth%-dnxhd-1080i-colr: ENCOPTS = -s hd1080 -b 120M -flags +ildct -movflags write_colr \ +fate-vsynth%-dnxhd-1080i-nocolr: ENCOPTS = -s hd1080 -b 120M -flags +ildct -movflags no_colr \ -pix_fmt yuv422p -frames 5 -qmax 8 -fate-vsynth%-dnxhd-1080i-colr: DECOPTS = -sws_flags area+accurate_rnd+bitexact -fate-vsynth%-dnxhd-1080i-colr: FMT = mov +fate-vsynth%-dnxhd-1080i-nocolr: FMT = mov FATE_VCODEC-$(call ENCDEC, DVVIDEO, DV) += dv dv-411 dv-50 fate-vsynth%-dv: CODEC = dvvideo diff --git a/tests/ref/lavf/mov b/tests/ref/lavf/mov index 72d962a..9e10b1a 100644 --- a/tests/ref/lavf/mov +++ b/tests/ref/lavf/mov @@ -1,12 +1,12 @@ -a10d50f2679df92264e1fc21cb8be630 *./tests/data/lavf/lavf.mov -366449 ./tests/data/lavf/lavf.mov +2cbbb7c06a0c6e478c0546d6631e70c4 *./tests/data/lavf/lavf.mov +366467 ./tests/data/lavf/lavf.mov ./tests/data/lavf/lavf.mov CRC=0xbb2b949b -6258f70f974e3c802e01d02ac33c7bbd *./tests/data/lavf/lavf.mov -357539 ./tests/data/lavf/lavf.mov +98d2d33f0f358a19c7823f3b2779f2cb *./tests/data/lavf/lavf.mov +357557 ./tests/data/lavf/lavf.mov ./tests/data/lavf/lavf.mov CRC=0xbb2b949b -ba3b8b49e420510a0d417400dbedfc2d *./tests/data/lavf/lavf.mov -366621 ./tests/data/lavf/lavf.mov +6793a66f4eb2166ce64936ca689b7371 *./tests/data/lavf/lavf.mov +366639 ./tests/data/lavf/lavf.mov ./tests/data/lavf/lavf.mov CRC=0xa9793231 -fd0e4de8e7f6d0c8c0681d7020f00f50 *./tests/data/lavf/lavf.mov -356921 ./tests/data/lavf/lavf.mov +50b3e14fd835aa41903eac444da4f404 *./tests/data/lavf/lavf.mov +356939 ./tests/data/lavf/lavf.mov ./tests/data/lavf/lavf.mov CRC=0xbb2b949b diff --git a/tests/ref/seek/lavf-mov b/tests/ref/seek/lavf-mov index 27ea7c7..178f282 100644 --- a/tests/ref/seek/lavf-mov +++ b/tests/ref/seek/lavf-mov @@ -1,48 +1,48 @@ -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 1767 size: 27837 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 1785 size: 27837 ret: 0 st:-1 flags:0 ts:-1.000000 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 1767 size: 27837 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 1785 size: 27837 ret: 0 st:-1 flags:1 ts: 1.894167 -ret: 0 st: 1 flags:1 dts: 0.952018 pts: 0.952018 pos: 326971 size: 1024 +ret: 0 st: 1 flags:1 dts: 0.952018 pts: 0.952018 pos: 326989 size: 1024 ret: 0 st: 0 flags:0 ts: 0.788359 -ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 327995 size: 27834 +ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 328013 size: 27834 ret: 0 st: 0 flags:1 ts:-0.317500 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 1767 size: 27837 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 1785 size: 27837 ret:-1 st: 1 flags:0 ts: 2.576667 ret: 0 st: 1 flags:1 ts: 1.470839 -ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 327995 size: 27834 +ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 328013 size: 27834 ret: 0 st:-1 flags:0 ts: 0.365002 -ret: 0 st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 165249 size: 27925 +ret: 0 st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 165267 size: 27925 ret: 0 st:-1 flags:1 ts:-0.740831 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 1767 size: 27837 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 1785 size: 27837 ret:-1 st: 0 flags:0 ts: 2.153359 ret: 0 st: 0 flags:1 ts: 1.047500 -ret: 0 st: 1 flags:1 dts: 0.952018 pts: 0.952018 pos: 326971 size: 1024 +ret: 0 st: 1 flags:1 dts: 0.952018 pts: 0.952018 pos: 326989 size: 1024 ret: 0 st: 1 flags:0 ts:-0.058322 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 1767 size: 27837 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 1785 size: 27837 ret: 0 st: 1 flags:1 ts: 2.835828 -ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 327995 size: 27834 +ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 328013 size: 27834 ret:-1 st:-1 flags:0 ts: 1.730004 ret: 0 st:-1 flags:1 ts: 0.624171 -ret: 0 st: 1 flags:1 dts: 0.464399 pts: 0.464399 pos: 164225 size: 1024 +ret: 0 st: 1 flags:1 dts: 0.464399 pts: 0.464399 pos: 164243 size: 1024 ret: 0 st: 0 flags:0 ts:-0.481641 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 1767 size: 27837 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 1785 size: 27837 ret: 0 st: 0 flags:1 ts: 2.412500 -ret: 0 st: 1 flags:1 dts: 0.952018 pts: 0.952018 pos: 326971 size: 1024 +ret: 0 st: 1 flags:1 dts: 0.952018 pts: 0.952018 pos: 326989 size: 1024 ret:-1 st: 1 flags:0 ts: 1.306667 ret: 0 st: 1 flags:1 ts: 0.200839 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 1767 size: 27837 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 1785 size: 27837 ret: 0 st:-1 flags:0 ts:-0.904994 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 1767 size: 27837 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 1785 size: 27837 ret: 0 st:-1 flags:1 ts: 1.989173 -ret: 0 st: 1 flags:1 dts: 0.952018 pts: 0.952018 pos: 326971 size: 1024 +ret: 0 st: 1 flags:1 dts: 0.952018 pts: 0.952018 pos: 326989 size: 1024 ret: 0 st: 0 flags:0 ts: 0.883359 -ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 327995 size: 27834 +ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 328013 size: 27834 ret: 0 st: 0 flags:1 ts:-0.222500 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 1767 size: 27837 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 1785 size: 27837 ret:-1 st: 1 flags:0 ts: 2.671678 ret: 0 st: 1 flags:1 ts: 1.565850 -ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 327995 size: 27834 +ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 328013 size: 27834 ret: 0 st:-1 flags:0 ts: 0.460008 -ret: 0 st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 165249 size: 27925 +ret: 0 st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 165267 size: 27925 ret: 0 st:-1 flags:1 ts:-0.645825 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 1767 size: 27837 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 1785 size: 27837 diff --git a/tests/ref/vsynth/vsynth1-avui b/tests/ref/vsynth/vsynth1-avui index 1f08053..ba960f5 100644 --- a/tests/ref/vsynth/vsynth1-avui +++ b/tests/ref/vsynth/vsynth1-avui @@ -1,4 +1,4 @@ -25ef49e1aee0b20d4feee89b8dc093b4 *tests/data/fate/vsynth1-avui.mov -42625037 tests/data/fate/vsynth1-avui.mov +c6654a20a8785ea4f47fffa2d33ca74c *tests/data/fate/vsynth1-avui.mov +42625055 tests/data/fate/vsynth1-avui.mov c5ccac874dbf808e9088bc3107860042 *tests/data/fate/vsynth1-avui.out.rawvideo stddev: 0.00 PSNR:999.99 MAXDIFF: 0 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth/vsynth1-dnxhd-1080i b/tests/ref/vsynth/vsynth1-dnxhd-1080i index 28d55b6..134c169 100644 --- a/tests/ref/vsynth/vsynth1-dnxhd-1080i +++ b/tests/ref/vsynth/vsynth1-dnxhd-1080i @@ -1,4 +1,4 @@ -a0234e0a8516d958f423b119aa9e35c4 *tests/data/fate/vsynth1-dnxhd-1080i.mov -3031911 tests/data/fate/vsynth1-dnxhd-1080i.mov -a09132c6db44f415e831dcaa630a351b *tests/data/fate/vsynth1-dnxhd-1080i.out.rawvideo -stddev: 6.29 PSNR: 32.15 MAXDIFF: 64 bytes: 7603200/ 760320 +5fccdb16c0f14dea1b6b603bac90b97e *tests/data/fate/vsynth1-dnxhd-1080i.mov +3031929 tests/data/fate/vsynth1-dnxhd-1080i.mov +5835dff88cb84e83bbe70b5ed5edd5ab *tests/data/fate/vsynth1-dnxhd-1080i.out.rawvideo +stddev: 5.79 PSNR: 32.87 MAXDIFF: 56 bytes: 7603200/ 760320 diff --git a/tests/ref/vsynth/vsynth1-dnxhd-1080i-colr b/tests/ref/vsynth/vsynth1-dnxhd-1080i-colr deleted file mode 100644 index 16d8953..0000000 --- a/tests/ref/vsynth/vsynth1-dnxhd-1080i-colr +++ /dev/null @@ -1,4 +0,0 @@ -5fccdb16c0f14dea1b6b603bac90b97e *tests/data/fate/vsynth1-dnxhd-1080i-colr.mov -3031929 tests/data/fate/vsynth1-dnxhd-1080i-colr.mov -5835dff88cb84e83bbe70b5ed5edd5ab *tests/data/fate/vsynth1-dnxhd-1080i-colr.out.rawvideo -stddev: 5.79 PSNR: 32.87 MAXDIFF: 56 bytes: 7603200/ 760320 diff --git a/tests/ref/vsynth/vsynth1-dnxhd-1080i-nocolr b/tests/ref/vsynth/vsynth1-dnxhd-1080i-nocolr new file mode 100644 index 0000000..46b55ec --- /dev/null +++ b/tests/ref/vsynth/vsynth1-dnxhd-1080i-nocolr @@ -0,0 +1,4 @@ +a0234e0a8516d958f423b119aa9e35c4 *tests/data/fate/vsynth1-dnxhd-1080i-nocolr.mov +3031911 tests/data/fate/vsynth1-dnxhd-1080i-nocolr.mov +a09132c6db44f415e831dcaa630a351b *tests/data/fate/vsynth1-dnxhd-1080i-nocolr.out.rawvideo +stddev: 6.29 PSNR: 32.15 MAXDIFF: 64 bytes: 7603200/ 760320 diff --git a/tests/ref/vsynth/vsynth1-mpeg4 b/tests/ref/vsynth/vsynth1-mpeg4 index 4e9b4bd..28ade57 100644 --- a/tests/ref/vsynth/vsynth1-mpeg4 +++ b/tests/ref/vsynth/vsynth1-mpeg4 @@ -1,4 +1,4 @@ -b4e8871c504a22c8c874c7e845b73da7 *tests/data/fate/vsynth1-mpeg4.mp4 -540085 tests/data/fate/vsynth1-mpeg4.mp4 +60186258e6ba36c889c69ca457955235 *tests/data/fate/vsynth1-mpeg4.mp4 +540104 tests/data/fate/vsynth1-mpeg4.mp4 f80ec173d37f2f91add031e95579a220 *tests/data/fate/vsynth1-mpeg4.out.rawvideo stddev: 7.97 PSNR: 30.10 MAXDIFF: 105 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth/vsynth1-prores b/tests/ref/vsynth/vsynth1-prores index 14de8b9..58edb40 100644 --- a/tests/ref/vsynth/vsynth1-prores +++ b/tests/ref/vsynth/vsynth1-prores @@ -1,4 +1,4 @@ -7ca7d2f9f5d8ac2ead691b1b6a70d409 *tests/data/fate/vsynth1-prores.mov -5022821 tests/data/fate/vsynth1-prores.mov +ec51349d38ef43645fca4109f635af9f *tests/data/fate/vsynth1-prores.mov +5022839 tests/data/fate/vsynth1-prores.mov fb4a9e025d12afc0dbbca8d82831858f *tests/data/fate/vsynth1-prores.out.rawvideo stddev: 2.47 PSNR: 40.27 MAXDIFF: 31 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth/vsynth1-prores_ks b/tests/ref/vsynth/vsynth1-prores_ks index 6e5ed17..0671b09 100644 --- a/tests/ref/vsynth/vsynth1-prores_ks +++ b/tests/ref/vsynth/vsynth1-prores_ks @@ -1,4 +1,4 @@ -fe41a284da97ea5ec8866ca9a55b84da *tests/data/fate/vsynth1-prores_ks.mov -3858911 tests/data/fate/vsynth1-prores_ks.mov +9e3f7046dd98577fe8d7bb8982096d50 *tests/data/fate/vsynth1-prores_ks.mov +3858929 tests/data/fate/vsynth1-prores_ks.mov 100eb002413fe7a632d440dfbdf7e3ff *tests/data/fate/vsynth1-prores_ks.out.rawvideo stddev: 3.17 PSNR: 38.09 MAXDIFF: 39 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth/vsynth1-qtrle b/tests/ref/vsynth/vsynth1-qtrle index 4b92081..d73af45 100644 --- a/tests/ref/vsynth/vsynth1-qtrle +++ b/tests/ref/vsynth/vsynth1-qtrle @@ -1,4 +1,4 @@ -35d8a1446d886fadcdffae192bed7e4e *tests/data/fate/vsynth1-qtrle.mov -15263158 tests/data/fate/vsynth1-qtrle.mov +5a020ae40bf8b08f22b7cefadc564f26 *tests/data/fate/vsynth1-qtrle.mov +15263176 tests/data/fate/vsynth1-qtrle.mov 93695a27c24a61105076ca7b1f010bbd *tests/data/fate/vsynth1-qtrle.out.rawvideo stddev: 3.42 PSNR: 37.44 MAXDIFF: 48 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth/vsynth1-qtrlegray b/tests/ref/vsynth/vsynth1-qtrlegray index c3d571d..40b8706 100644 --- a/tests/ref/vsynth/vsynth1-qtrlegray +++ b/tests/ref/vsynth/vsynth1-qtrlegray @@ -1,4 +1,4 @@ -651b745a37a06ddd52adfe8e0a45b115 *tests/data/fate/vsynth1-qtrlegray.mov -5113293 tests/data/fate/vsynth1-qtrlegray.mov +626c4bc14136961103f25e8420d4e7a7 *tests/data/fate/vsynth1-qtrlegray.mov +5113311 tests/data/fate/vsynth1-qtrlegray.mov cb20af0e5a65aad7cf47002fcb52288e *tests/data/fate/vsynth1-qtrlegray.out.rawvideo stddev: 25.34 PSNR: 20.05 MAXDIFF: 122 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth/vsynth1-svq1 b/tests/ref/vsynth/vsynth1-svq1 index 9c1b6ff..86df0bf 100644 --- a/tests/ref/vsynth/vsynth1-svq1 +++ b/tests/ref/vsynth/vsynth1-svq1 @@ -1,4 +1,4 @@ -a3206831d34197a2d236d82dd0248646 *tests/data/fate/vsynth1-svq1.mov -1334233 tests/data/fate/vsynth1-svq1.mov +8ab3128e744f97c04184d5e9df09eb97 *tests/data/fate/vsynth1-svq1.mov +1334251 tests/data/fate/vsynth1-svq1.mov 9cc35c54b2c77d36bd7e308b393c1f81 *tests/data/fate/vsynth1-svq1.out.rawvideo stddev: 9.58 PSNR: 28.50 MAXDIFF: 210 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth/vsynth2-avui b/tests/ref/vsynth/vsynth2-avui index 2423916..4e191f0 100644 --- a/tests/ref/vsynth/vsynth2-avui +++ b/tests/ref/vsynth/vsynth2-avui @@ -1,4 +1,4 @@ -8f6ab410bb6b5dc4599e12968dbd0366 *tests/data/fate/vsynth2-avui.mov -42625037 tests/data/fate/vsynth2-avui.mov +aa7cf840863c6f1295232b59b44ec3a2 *tests/data/fate/vsynth2-avui.mov +42625055 tests/data/fate/vsynth2-avui.mov 36d7ca943916e1743cefa609eba0205c *tests/data/fate/vsynth2-avui.out.rawvideo stddev: 0.00 PSNR:999.99 MAXDIFF: 0 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth/vsynth2-dnxhd-1080i b/tests/ref/vsynth/vsynth2-dnxhd-1080i index c3a5073..a1b9571 100644 --- a/tests/ref/vsynth/vsynth2-dnxhd-1080i +++ b/tests/ref/vsynth/vsynth2-dnxhd-1080i @@ -1,4 +1,4 @@ -2b75889122f8d918e1b068d128b618ca *tests/data/fate/vsynth2-dnxhd-1080i.mov -3031911 tests/data/fate/vsynth2-dnxhd-1080i.mov -099001db73036eeb9545c463cf90f0ba *tests/data/fate/vsynth2-dnxhd-1080i.out.rawvideo -stddev: 1.53 PSNR: 44.43 MAXDIFF: 31 bytes: 7603200/ 760320 +f9827e9867b0ea4f7585d8e362a58413 *tests/data/fate/vsynth2-dnxhd-1080i.mov +3031929 tests/data/fate/vsynth2-dnxhd-1080i.mov +e4cf5528c993b5e7d57a9d0a4d2cd0c6 *tests/data/fate/vsynth2-dnxhd-1080i.out.rawvideo +stddev: 1.58 PSNR: 44.15 MAXDIFF: 33 bytes: 7603200/ 760320 diff --git a/tests/ref/vsynth/vsynth2-dnxhd-1080i-colr b/tests/ref/vsynth/vsynth2-dnxhd-1080i-colr deleted file mode 100644 index ba5e6a1..0000000 --- a/tests/ref/vsynth/vsynth2-dnxhd-1080i-colr +++ /dev/null @@ -1,4 +0,0 @@ -f9827e9867b0ea4f7585d8e362a58413 *tests/data/fate/vsynth2-dnxhd-1080i-colr.mov -3031929 tests/data/fate/vsynth2-dnxhd-1080i-colr.mov -e4cf5528c993b5e7d57a9d0a4d2cd0c6 *tests/data/fate/vsynth2-dnxhd-1080i-colr.out.rawvideo -stddev: 1.58 PSNR: 44.15 MAXDIFF: 33 bytes: 7603200/ 760320 diff --git a/tests/ref/vsynth/vsynth2-dnxhd-1080i-nocolr b/tests/ref/vsynth/vsynth2-dnxhd-1080i-nocolr new file mode 100644 index 0000000..db66f66 --- /dev/null +++ b/tests/ref/vsynth/vsynth2-dnxhd-1080i-nocolr @@ -0,0 +1,4 @@ +2b75889122f8d918e1b068d128b618ca *tests/data/fate/vsynth2-dnxhd-1080i-nocolr.mov +3031911 tests/data/fate/vsynth2-dnxhd-1080i-nocolr.mov +099001db73036eeb9545c463cf90f0ba *tests/data/fate/vsynth2-dnxhd-1080i-nocolr.out.rawvideo +stddev: 1.53 PSNR: 44.43 MAXDIFF: 31 bytes: 7603200/ 760320 diff --git a/tests/ref/vsynth/vsynth2-mpeg4 b/tests/ref/vsynth/vsynth2-mpeg4 index 85899ff..e3d6bfe 100644 --- a/tests/ref/vsynth/vsynth2-mpeg4 +++ b/tests/ref/vsynth/vsynth2-mpeg4 @@ -1,4 +1,4 @@ -adbd883d1701beabd04522d003dafab6 *tests/data/fate/vsynth2-mpeg4.mp4 -159310 tests/data/fate/vsynth2-mpeg4.mp4 +8e551d5b88f3b0494732796d628debb5 *tests/data/fate/vsynth2-mpeg4.mp4 +159329 tests/data/fate/vsynth2-mpeg4.mp4 2645405bc5350acc85ad72f3352f5135 *tests/data/fate/vsynth2-mpeg4.out.rawvideo stddev: 6.02 PSNR: 32.53 MAXDIFF: 89 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth/vsynth2-prores b/tests/ref/vsynth/vsynth2-prores index a1b4bb7..5f10d8c 100644 --- a/tests/ref/vsynth/vsynth2-prores +++ b/tests/ref/vsynth/vsynth2-prores @@ -1,4 +1,4 @@ -aa57fd1221b7eefaf1f34f9d57d6a7cb *tests/data/fate/vsynth2-prores.mov -3265056 tests/data/fate/vsynth2-prores.mov +6ae8bb8d1b170ecb38cf9fff1b00f7f9 *tests/data/fate/vsynth2-prores.mov +3265074 tests/data/fate/vsynth2-prores.mov 537b0ff66d7c8c3c12faa89d042e6a49 *tests/data/fate/vsynth2-prores.out.rawvideo stddev: 1.38 PSNR: 45.29 MAXDIFF: 12 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth/vsynth2-prores_ks b/tests/ref/vsynth/vsynth2-prores_ks index b42e7b3..9c7ddd9 100644 --- a/tests/ref/vsynth/vsynth2-prores_ks +++ b/tests/ref/vsynth/vsynth2-prores_ks @@ -1,4 +1,4 @@ -00c75fc738859e41c48cbe36ad60c2e2 *tests/data/fate/vsynth2-prores_ks.mov -3868162 tests/data/fate/vsynth2-prores_ks.mov +85a936bd0bc694382668e40ab083a141 *tests/data/fate/vsynth2-prores_ks.mov +3868180 tests/data/fate/vsynth2-prores_ks.mov fe7ad707205c6100e9a3956d4e1c300e *tests/data/fate/vsynth2-prores_ks.out.rawvideo stddev: 1.17 PSNR: 46.72 MAXDIFF: 14 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth/vsynth2-qtrle b/tests/ref/vsynth/vsynth2-qtrle index 4adf913..f236e49 100644 --- a/tests/ref/vsynth/vsynth2-qtrle +++ b/tests/ref/vsynth/vsynth2-qtrle @@ -1,4 +1,4 @@ -b44d1cd0bb4c1e7c57d668bd9c1d319a *tests/data/fate/vsynth2-qtrle.mov -14035926 tests/data/fate/vsynth2-qtrle.mov +55c54a59ec87da47fb783f5af6acf954 *tests/data/fate/vsynth2-qtrle.mov +14035944 tests/data/fate/vsynth2-qtrle.mov 32fae3e665407bb4317b3f90fedb903c *tests/data/fate/vsynth2-qtrle.out.rawvideo stddev: 1.54 PSNR: 44.37 MAXDIFF: 17 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth/vsynth2-qtrlegray b/tests/ref/vsynth/vsynth2-qtrlegray index 824e64b..8cb3874 100644 --- a/tests/ref/vsynth/vsynth2-qtrlegray +++ b/tests/ref/vsynth/vsynth2-qtrlegray @@ -1,4 +1,4 @@ -4910471607743da624ef7339637a33e2 *tests/data/fate/vsynth2-qtrlegray.mov -4988372 tests/data/fate/vsynth2-qtrlegray.mov +6693d3ba4965802190d61d3b49ada5de *tests/data/fate/vsynth2-qtrlegray.mov +4988390 tests/data/fate/vsynth2-qtrlegray.mov 510a92a21b552c51fcafab8188982f4d *tests/data/fate/vsynth2-qtrlegray.out.rawvideo stddev: 16.31 PSNR: 23.88 MAXDIFF: 89 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth/vsynth2-svq1 b/tests/ref/vsynth/vsynth2-svq1 index 9c7db7f..1e0700a 100644 --- a/tests/ref/vsynth/vsynth2-svq1 +++ b/tests/ref/vsynth/vsynth2-svq1 @@ -1,4 +1,4 @@ -c767386f0f6f36b554d278592bc6e9a4 *tests/data/fate/vsynth2-svq1.mov -940289 tests/data/fate/vsynth2-svq1.mov +6937b302ceb272255bd0258bca61296d *tests/data/fate/vsynth2-svq1.mov +940307 tests/data/fate/vsynth2-svq1.mov a8cd3b833cd7f570ddbf1e6b3eb125b6 *tests/data/fate/vsynth2-svq1.out.rawvideo stddev: 3.71 PSNR: 36.72 MAXDIFF: 210 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth/vsynth3-dnxhd-1080i-colr b/tests/ref/vsynth/vsynth3-dnxhd-1080i-colr deleted file mode 100644 index 7cc2298..0000000 --- a/tests/ref/vsynth/vsynth3-dnxhd-1080i-colr +++ /dev/null @@ -1,4 +0,0 @@ -ee7a70832f37793b62642f770d988bdb *tests/data/fate/vsynth3-dnxhd-1080i-colr.mov -3031929 tests/data/fate/vsynth3-dnxhd-1080i-colr.mov -7dd6b261e439cda21df4f01b45336b41 *tests/data/fate/vsynth3-dnxhd-1080i-colr.out.rawvideo -stddev: 6.92 PSNR: 31.32 MAXDIFF: 50 bytes: 86700/ 8670 diff --git a/tests/ref/vsynth/vsynth3-dnxhd-1080i-nocolr b/tests/ref/vsynth/vsynth3-dnxhd-1080i-nocolr new file mode 100644 index 0000000..7ba1216 --- /dev/null +++ b/tests/ref/vsynth/vsynth3-dnxhd-1080i-nocolr @@ -0,0 +1,4 @@ +aaed55622ffd609d6b6114ee3da7f585 *tests/data/fate/vsynth3-dnxhd-1080i-nocolr.mov +3031911 tests/data/fate/vsynth3-dnxhd-1080i-nocolr.mov +382fc519604abb5d87071bdce013cef9 *tests/data/fate/vsynth3-dnxhd-1080i-nocolr.out.rawvideo +stddev: 7.81 PSNR: 30.28 MAXDIFF: 61 bytes: 86700/ 8670 diff --git a/tests/ref/vsynth/vsynth3-mpeg4 b/tests/ref/vsynth/vsynth3-mpeg4 index 02cf68d..0329d1b 100644 --- a/tests/ref/vsynth/vsynth3-mpeg4 +++ b/tests/ref/vsynth/vsynth3-mpeg4 @@ -1,4 +1,4 @@ -ddcff996543900496f0b374a2d5cae74 *tests/data/fate/vsynth3-mpeg4.mp4 -26017 tests/data/fate/vsynth3-mpeg4.mp4 +18dadf586e6dba14c4cd201eaeeaa54d *tests/data/fate/vsynth3-mpeg4.mp4 +26036 tests/data/fate/vsynth3-mpeg4.mp4 fc0d8c1e58d254031e6207dfcae8f867 *tests/data/fate/vsynth3-mpeg4.out.rawvideo stddev: 9.66 PSNR: 28.43 MAXDIFF: 79 bytes: 86700/ 86700 diff --git a/tests/ref/vsynth/vsynth3-prores b/tests/ref/vsynth/vsynth3-prores index f63a7a7..9c7131c 100644 --- a/tests/ref/vsynth/vsynth3-prores +++ b/tests/ref/vsynth/vsynth3-prores @@ -1,4 +1,4 @@ -b060c59be88b4b089ece5ee8dc4f1c58 *tests/data/fate/vsynth3-prores.mov -105367 tests/data/fate/vsynth3-prores.mov +cbff04f588d578bfbece6bb7d68c52ff *tests/data/fate/vsynth3-prores.mov +105385 tests/data/fate/vsynth3-prores.mov fff5e7ad21d78501c8fa4749bf4bf289 *tests/data/fate/vsynth3-prores.out.rawvideo stddev: 2.80 PSNR: 39.17 MAXDIFF: 27 bytes: 86700/ 86700 diff --git a/tests/ref/vsynth/vsynth3-prores_ks b/tests/ref/vsynth/vsynth3-prores_ks index 99cfc13..612e171 100644 --- a/tests/ref/vsynth/vsynth3-prores_ks +++ b/tests/ref/vsynth/vsynth3-prores_ks @@ -1,4 +1,4 @@ -7ceff8c9cffca766f8a167ba73dad0e2 *tests/data/fate/vsynth3-prores_ks.mov -95053 tests/data/fate/vsynth3-prores_ks.mov +666e9986884b19ab7c57f362ccea7634 *tests/data/fate/vsynth3-prores_ks.mov +95071 tests/data/fate/vsynth3-prores_ks.mov 9ab6d3e3cc7749796cd9fa984c60d890 *tests/data/fate/vsynth3-prores_ks.out.rawvideo stddev: 4.09 PSNR: 35.88 MAXDIFF: 35 bytes: 86700/ 86700 diff --git a/tests/ref/vsynth/vsynth3-qtrle b/tests/ref/vsynth/vsynth3-qtrle index 6f93232..bcbbe5f 100644 --- a/tests/ref/vsynth/vsynth3-qtrle +++ b/tests/ref/vsynth/vsynth3-qtrle @@ -1,4 +1,4 @@ -33ec7d4f0a18fcf6da3bdacb494e2035 *tests/data/fate/vsynth3-qtrle.mov -179656 tests/data/fate/vsynth3-qtrle.mov +9d117c323b1b0b33f45aff9ed8c91da9 *tests/data/fate/vsynth3-qtrle.mov +179674 tests/data/fate/vsynth3-qtrle.mov 693aff10c094f8bd31693f74cf79d2b2 *tests/data/fate/vsynth3-qtrle.out.rawvideo stddev: 3.67 PSNR: 36.82 MAXDIFF: 43 bytes: 86700/ 86700 diff --git a/tests/ref/vsynth/vsynth3-svq1 b/tests/ref/vsynth/vsynth3-svq1 index b51fa03..b2978b1 100644 --- a/tests/ref/vsynth/vsynth3-svq1 +++ b/tests/ref/vsynth/vsynth3-svq1 @@ -1,4 +1,4 @@ -1eaf318269afd7426406d73397c39a48 *tests/data/fate/vsynth3-svq1.mov -40773 tests/data/fate/vsynth3-svq1.mov +0aa195c665322391851dc183885a800a *tests/data/fate/vsynth3-svq1.mov +40791 tests/data/fate/vsynth3-svq1.mov a1e5334cf67649bf8c7d95dc4d1bf148 *tests/data/fate/vsynth3-svq1.out.rawvideo stddev: 14.49 PSNR: 24.91 MAXDIFF: 183 bytes: 86700/ 86700 diff --git a/tests/ref/vsynth/vsynth_lena-dnxhd-1080i-colr b/tests/ref/vsynth/vsynth_lena-dnxhd-1080i-colr deleted file mode 100644 index 1889786..0000000 --- a/tests/ref/vsynth/vsynth_lena-dnxhd-1080i-colr +++ /dev/null @@ -1,4 +0,0 @@ -5ba3ddb58b10e5f0069cb4f82d594695 *tests/data/fate/vsynth_lena-dnxhd-1080i-colr.mov -3031929 tests/data/fate/vsynth_lena-dnxhd-1080i-colr.mov -864c3d5f49d9edf66ce8f82a2a6725f6 *tests/data/fate/vsynth_lena-dnxhd-1080i-colr.out.rawvideo -stddev: 1.36 PSNR: 45.45 MAXDIFF: 22 bytes: 7603200/ 760320 diff --git a/tests/ref/vsynth/vsynth_lena-dnxhd-1080i-nocolr b/tests/ref/vsynth/vsynth_lena-dnxhd-1080i-nocolr new file mode 100644 index 0000000..3a3ef09 --- /dev/null +++ b/tests/ref/vsynth/vsynth_lena-dnxhd-1080i-nocolr @@ -0,0 +1,4 @@ +f7412afbcb4454692f7492f6710189e3 *tests/data/fate/vsynth_lena-dnxhd-1080i-nocolr.mov +3031911 tests/data/fate/vsynth_lena-dnxhd-1080i-nocolr.mov +744ba46da5d4c19a28562ea31061d170 *tests/data/fate/vsynth_lena-dnxhd-1080i-nocolr.out.rawvideo +stddev: 1.31 PSNR: 45.77 MAXDIFF: 23 bytes: 7603200/ 760320 -- 1.9.3 (Apple Git-50)