[FFmpeg-cvslog] Merge commit '8e4d4efc67e154fdffd65964a7cfeef740320827'
James Almer
git at videolan.org
Tue Oct 3 00:32:00 EEST 2017
ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Mon Oct 2 18:23:48 2017 -0300| [b591329c3afe445c45eaecadd5fe3b80a837ee2f] | committer: James Almer
Merge commit '8e4d4efc67e154fdffd65964a7cfeef740320827'
* commit '8e4d4efc67e154fdffd65964a7cfeef740320827':
fate: Add another SVQ3 test to increase coverage
Also included a fix from da8093f712d625db7ce4a2526fb52994e01921ec.
The demuxer option "-ignore_editlist 1 " is temporarily added to the
test as well, to workaround a regression in the edit list mov parsing
code.
Merged-by: James Almer <jamrial at gmail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b591329c3afe445c45eaecadd5fe3b80a837ee2f
---
tests/fate/qt.mak | 12 ++++++++++--
tests/ref/fate/{svq3 => svq3-1} | 0
tests/ref/fate/svq3-2 | 24 ++++++++++++++++++++++++
3 files changed, 34 insertions(+), 2 deletions(-)
diff --git a/tests/fate/qt.mak b/tests/fate/qt.mak
index 335ec44dc2..2a7fc2e0fa 100644
--- a/tests/fate/qt.mak
+++ b/tests/fate/qt.mak
@@ -49,10 +49,18 @@ fate-svq1: CMD = framecrc -i $(TARGET_SAMPLES)/svq1/marymary-shackles.mov -an -t
FATE_QT-$(call DEMDEC, MOV, SVQ1) += fate-svq1-headerswap
fate-svq1-headerswap: CMD = framecrc -i $(TARGET_SAMPLES)/svq1/ct_ending_cut.mov -frames 4
-FATE_QT-$(call ALLYES, MOV_DEMUXER SVQ3_DECODER ZLIB) += fate-svq3 fate-svq3-watermark
-fate-svq3: CMD = framecrc -i $(TARGET_SAMPLES)/svq3/Vertical400kbit.sorenson3.mov -t 6 -an
+FATE_SVQ3 += fate-svq3-1
+fate-svq3-1: CMD = framecrc -i $(TARGET_SAMPLES)/svq3/Vertical400kbit.sorenson3.mov -t 6 -an
+
+FATE_SVQ3 += fate-svq3-2
+fate-svq3-2: CMD = framecrc -flags +bitexact -ignore_editlist 1 -i $(TARGET_SAMPLES)/svq3/svq3_decoding_regression.mov -an
+
+FATE_SVQ3 += fate-svq3-watermark
fate-svq3-watermark: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/svq3/svq3_watermark.mov
+FATE_QT-$(call ALLYES, MOV_DEMUXER SVQ3_DECODER ZLIB) += $(FATE_SVQ3)
+fate-svq3: $(FATE_SVQ3)
+
FATE_QT += $(FATE_QT-yes)
FATE_SAMPLES_FFMPEG += $(FATE_QT)
diff --git a/tests/ref/fate/svq3 b/tests/ref/fate/svq3-1
similarity index 100%
rename from tests/ref/fate/svq3
rename to tests/ref/fate/svq3-1
diff --git a/tests/ref/fate/svq3-2 b/tests/ref/fate/svq3-2
new file mode 100644
index 0000000000..1d89c05971
--- /dev/null
+++ b/tests/ref/fate/svq3-2
@@ -0,0 +1,24 @@
+#tb 0: 1/24
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 480x257
+#sar 0: 0/1
+0, 1, 1, 1, 185280, 0x044209c4
+0, 2, 2, 1, 185280, 0x427ef9a7
+0, 3, 3, 1, 185280, 0x8f771cc8
+0, 4, 4, 1, 185280, 0xb40d0e52
+0, 5, 5, 1, 185280, 0x2e6ee461
+0, 6, 6, 1, 185280, 0x681ba513
+0, 7, 7, 1, 185280, 0x998c5676
+0, 8, 8, 1, 185280, 0xf91003ec
+0, 9, 9, 1, 185280, 0x322ed3de
+0, 10, 10, 1, 185280, 0xb1c9370a
+0, 11, 11, 1, 185280, 0x41423b36
+0, 12, 12, 1, 185280, 0x0b9284e4
+0, 13, 13, 1, 185280, 0x185789b2
+0, 14, 14, 1, 185280, 0x8f0bece0
+0, 15, 15, 1, 185280, 0xfcd9450e
+0, 16, 16, 1, 185280, 0x509d868b
+0, 17, 17, 1, 185280, 0x71fd9ae3
+0, 18, 18, 1, 185280, 0x3dad1b3c
+0, 19, 19, 1, 185280, 0x69ba37dd
======================================================================
diff --cc tests/fate/qt.mak
index 335ec44dc2,761db8d234..2a7fc2e0fa
--- a/tests/fate/qt.mak
+++ b/tests/fate/qt.mak
@@@ -7,53 -7,53 +7,61 @@@ fate-qdm2: CMP = oneof
fate-qdm2: REF = $(SAMPLES)/qt-surge-suite/surge-2-16-B-QDM2.pcm
fate-qdm2: FUZZ = 2
-FATE_SAMPLES_AVCONV-$(call DEMDEC, MOV, PCM_ALAW) += fate-qt-alaw-mono
+FATE_QT-$(call DEMDEC, MOV, PCM_ALAW) += fate-qt-alaw-mono
fate-qt-alaw-mono: CMD = md5 -i $(TARGET_SAMPLES)/qt-surge-suite/surge-1-16-B-alaw.mov -f s16le
-FATE_SAMPLES_AVCONV-$(call DEMDEC, MOV, PCM_ALAW) += fate-qt-alaw-stereo
+FATE_QT-$(call DEMDEC, MOV, PCM_ALAW) += fate-qt-alaw-stereo
fate-qt-alaw-stereo: CMD = md5 -i $(TARGET_SAMPLES)/qt-surge-suite/surge-2-16-B-alaw.mov -f s16le
-FATE_SAMPLES_AVCONV-$(call DEMDEC, MOV, ADPCM_IMA_QT) += fate-qt-ima4-mono
+FATE_QT-$(call DEMDEC, MOV, ADPCM_IMA_QT) += fate-qt-ima4-mono
fate-qt-ima4-mono: CMD = md5 -i $(TARGET_SAMPLES)/qt-surge-suite/surge-1-16-B-ima4.mov -f s16le
-FATE_SAMPLES_AVCONV-$(call DEMDEC, MOV, ADPCM_IMA_QT) += fate-qt-ima4-stereo
+FATE_QT-$(call DEMDEC, MOV, ADPCM_IMA_QT) += fate-qt-ima4-stereo
fate-qt-ima4-stereo: CMD = md5 -i $(TARGET_SAMPLES)/qt-surge-suite/surge-2-16-B-ima4.mov -f s16le
-FATE_SAMPLES_AVCONV-$(call DEMDEC, MOV, MACE3) += fate-qt-mac3-mono
+FATE_QT-$(call DEMDEC, MOV, MACE3) += fate-qt-mac3-mono
fate-qt-mac3-mono: CMD = md5 -i $(TARGET_SAMPLES)/qt-surge-suite/surge-1-8-MAC3.mov -f s16le
-FATE_SAMPLES_AVCONV-$(call DEMDEC, MOV, MACE3) += fate-qt-mac3-stereo
+FATE_QT-$(call DEMDEC, MOV, MACE3) += fate-qt-mac3-stereo
fate-qt-mac3-stereo: CMD = md5 -i $(TARGET_SAMPLES)/qt-surge-suite/surge-2-8-MAC3.mov -f s16le
-FATE_SAMPLES_AVCONV-$(call DEMDEC, MOV, MACE6) += fate-qt-mac6-mono
+FATE_QT-$(call DEMDEC, MOV, MACE6) += fate-qt-mac6-mono
fate-qt-mac6-mono: CMD = md5 -i $(TARGET_SAMPLES)/qt-surge-suite/surge-1-8-MAC6.mov -f s16le
-FATE_SAMPLES_AVCONV-$(call DEMDEC, MOV, MACE6) += fate-qt-mac6-stereo
+FATE_QT-$(call DEMDEC, MOV, MACE6) += fate-qt-mac6-stereo
fate-qt-mac6-stereo: CMD = md5 -i $(TARGET_SAMPLES)/qt-surge-suite/surge-2-8-MAC6.mov -f s16le
-FATE_SAMPLES_AVCONV-$(call DEMDEC, MOV, PCM_MULAW) += fate-qt-ulaw-mono
+FATE_QT-$(call DEMDEC, MOV, PCM_MULAW) += fate-qt-ulaw-mono
fate-qt-ulaw-mono: CMD = md5 -i $(TARGET_SAMPLES)/qt-surge-suite/surge-1-16-B-ulaw.mov -f s16le
-FATE_SAMPLES_AVCONV-$(call DEMDEC, MOV, PCM_MULAW) += fate-qt-ulaw-stereo
+FATE_QT-$(call DEMDEC, MOV, PCM_MULAW) += fate-qt-ulaw-stereo
fate-qt-ulaw-stereo: CMD = md5 -i $(TARGET_SAMPLES)/qt-surge-suite/surge-2-16-B-ulaw.mov -f s16le
-FATE_SAMPLES_AVCONV-$(call DEMDEC, MOV, QDRAW) += fate-quickdraw
+FATE_QT-$(call DEMDEC, MOV, QDRAW) += fate-quickdraw
fate-quickdraw: CMD = framecrc -i $(TARGET_SAMPLES)/quickdraw/Airplane.mov -pix_fmt rgb24
-FATE_SAMPLES_AVCONV-$(call DEMDEC, MOV, RPZA) += fate-rpza
+FATE_QT-$(call DEMDEC, MOV, RPZA) += fate-rpza
fate-rpza: CMD = framecrc -i $(TARGET_SAMPLES)/rpza/rpza2.mov -t 2 -pix_fmt rgb24
-FATE_SAMPLES_AVCONV-$(call DEMDEC, MOV, SVQ1) += fate-svq1
+FATE_QT-$(call DEMDEC, MOV, SVQ1) += fate-svq1
fate-svq1: CMD = framecrc -i $(TARGET_SAMPLES)/svq1/marymary-shackles.mov -an -t 10
-FATE_SAMPLES_AVCONV-$(call DEMDEC, MOV, SVQ1) += fate-svq1-headerswap
+FATE_QT-$(call DEMDEC, MOV, SVQ1) += fate-svq1-headerswap
fate-svq1-headerswap: CMD = framecrc -i $(TARGET_SAMPLES)/svq1/ct_ending_cut.mov -frames 4
- FATE_QT-$(call ALLYES, MOV_DEMUXER SVQ3_DECODER ZLIB) += fate-svq3 fate-svq3-watermark
- fate-svq3: CMD = framecrc -i $(TARGET_SAMPLES)/svq3/Vertical400kbit.sorenson3.mov -t 6 -an
+ FATE_SVQ3 += fate-svq3-1
+ fate-svq3-1: CMD = framecrc -i $(TARGET_SAMPLES)/svq3/Vertical400kbit.sorenson3.mov -t 6 -an
+
+ FATE_SVQ3 += fate-svq3-2
-fate-svq3-2: CMD = framecrc -i $(TARGET_SAMPLES)/svq3/svq3_decoding_regression.mov -an
++fate-svq3-2: CMD = framecrc -flags +bitexact -ignore_editlist 1 -i $(TARGET_SAMPLES)/svq3/svq3_decoding_regression.mov -an
+
-FATE_SAMPLES_AVCONV-$(call ALLYES, MOV_DEMUXER SVQ3_DECODER ZLIB) += $(FATE_SVQ3)
++FATE_SVQ3 += fate-svq3-watermark
+fate-svq3-watermark: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/svq3/svq3_watermark.mov
+
++FATE_QT-$(call ALLYES, MOV_DEMUXER SVQ3_DECODER ZLIB) += $(FATE_SVQ3)
+ fate-svq3: $(FATE_SVQ3)
++
+FATE_QT += $(FATE_QT-yes)
+
+FATE_SAMPLES_FFMPEG += $(FATE_QT)
+fate-qt: $(FATE_QT)
diff --cc tests/ref/fate/svq3-2
index 0000000000,7e69b31b01..1d89c05971
mode 000000,100644..100644
--- a/tests/ref/fate/svq3-2
+++ b/tests/ref/fate/svq3-2
@@@ -1,0 -1,20 +1,24 @@@
-#tb 0: 1/19200
-0, -20000, -20000, 0, 185280, 0x061c0d85
-0, -19200, -19200, 0, 185280, 0x427ef9a7
-0, -18400, -18400, 0, 185280, 0x8f495d37
-0, -17600, -17600, 0, 185280, 0x5bfd0e5b
-0, -16800, -16800, 0, 185280, 0x60d12d25
-0, -16000, -16000, 0, 185280, 0x25aaa51b
-0, -15200, -15200, 0, 185280, 0x9cf58bf0
-0, -14400, -14400, 0, 185280, 0xd9bd03ea
-0, -13600, -13600, 0, 185280, 0xd18be732
-0, -12800, -12800, 0, 185280, 0x92763708
-0, -12000, -12000, 0, 185280, 0x94b5784a
-0, -11200, -11200, 0, 185280, 0x32b184c9
-0, -10400, -10400, 0, 185280, 0xe316fec3
-0, -9600, -9600, 0, 185280, 0x6344ec88
-0, -8800, -8800, 0, 185280, 0xe0aa6de4
-0, -8000, -8000, 0, 185280, 0x6cfc8687
-0, -7200, -7200, 0, 185280, 0x26ddc189
-0, -6400, -6400, 0, 185280, 0x5a0c1b38
-0, -5600, -5600, 0, 185280, 0x79a88cb9
++#tb 0: 1/24
++#media_type 0: video
++#codec_id 0: rawvideo
++#dimensions 0: 480x257
++#sar 0: 0/1
++0, 1, 1, 1, 185280, 0x044209c4
++0, 2, 2, 1, 185280, 0x427ef9a7
++0, 3, 3, 1, 185280, 0x8f771cc8
++0, 4, 4, 1, 185280, 0xb40d0e52
++0, 5, 5, 1, 185280, 0x2e6ee461
++0, 6, 6, 1, 185280, 0x681ba513
++0, 7, 7, 1, 185280, 0x998c5676
++0, 8, 8, 1, 185280, 0xf91003ec
++0, 9, 9, 1, 185280, 0x322ed3de
++0, 10, 10, 1, 185280, 0xb1c9370a
++0, 11, 11, 1, 185280, 0x41423b36
++0, 12, 12, 1, 185280, 0x0b9284e4
++0, 13, 13, 1, 185280, 0x185789b2
++0, 14, 14, 1, 185280, 0x8f0bece0
++0, 15, 15, 1, 185280, 0xfcd9450e
++0, 16, 16, 1, 185280, 0x509d868b
++0, 17, 17, 1, 185280, 0x71fd9ae3
++0, 18, 18, 1, 185280, 0x3dad1b3c
++0, 19, 19, 1, 185280, 0x69ba37dd
More information about the ffmpeg-cvslog
mailing list