[FFmpeg-cvslog] Merge commit 'b39ab8549a53e2fc7978ab9db50e5c2ba6a6602d'
Derek Buitenhuis
git at videolan.org
Wed Apr 13 15:50:56 CEST 2016
ffmpeg | branch: master | Derek Buitenhuis <derek.buitenhuis at gmail.com> | Wed Apr 13 14:39:15 2016 +0100| [622f18a2bf467623e6f68c4f8276c2efefda206f] | committer: Derek Buitenhuis
Merge commit 'b39ab8549a53e2fc7978ab9db50e5c2ba6a6602d'
* commit 'b39ab8549a53e2fc7978ab9db50e5c2ba6a6602d':
fate: Add test for indeo2 with delta frames
Merged-by: Derek Buitenhuis <derek.buitenhuis at gmail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=622f18a2bf467623e6f68c4f8276c2efefda206f
---
tests/fate/indeo.mak | 12 +++-
tests/ref/fate/indeo2-delta | 115 +++++++++++++++++++++++++++++++
tests/ref/fate/{indeo2 => indeo2-intra} | 0
3 files changed, 124 insertions(+), 3 deletions(-)
diff --git a/tests/fate/indeo.mak b/tests/fate/indeo.mak
index e725a6b..6beb1f0 100644
--- a/tests/fate/indeo.mak
+++ b/tests/fate/indeo.mak
@@ -1,5 +1,11 @@
-FATE_INDEO-$(call DEMDEC, AVI, INDEO2) += fate-indeo2
-fate-indeo2: CMD = framecrc -i $(TARGET_SAMPLES)/rt21/VPAR0026.AVI
+FATE_INDEO2 += fate-indeo2-delta
+fate-indeo2-delta: CMD = framecrc -i $(TARGET_SAMPLES)/rt21/ISKATE.AVI -an
+
+FATE_INDEO2 += fate-indeo2-intra
+fate-indeo2-intra: CMD = framecrc -i $(TARGET_SAMPLES)/rt21/VPAR0026.AVI
+
+FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, INDEO2) += $(FATE_INDEO2)
+fate-indeo2: $(FATE_INDEO2)
FATE_INDEO-$(call DEMDEC, MOV, INDEO3) += fate-indeo3
fate-indeo3: CMD = framecrc -i $(TARGET_SAMPLES)/iv32/cubes.mov
@@ -14,4 +20,4 @@ FATE_INDEO-$(call DEMDEC, AVI, INDEO5) += fate-indeo5
fate-indeo5: CMD = framecrc -i $(TARGET_SAMPLES)/iv50/Educ_Movie_DeadlyForce.avi -an
FATE_SAMPLES_AVCONV += $(FATE_INDEO-yes)
-fate-indeo: $(FATE_INDEO-yes)
+fate-indeo: $(FATE_INDEO2) $(FATE_INDEO-yes)
diff --git a/tests/ref/fate/indeo2-delta b/tests/ref/fate/indeo2-delta
new file mode 100644
index 0000000..c197dcc
--- /dev/null
+++ b/tests/ref/fate/indeo2-delta
@@ -0,0 +1,115 @@
+#tb 0: 16567/250000
+0, 0, 0, 1, 21600, 0xa3e914dd
+0, 1, 1, 1, 21600, 0x367eb420
+0, 2, 2, 1, 21600, 0x527488e2
+0, 3, 3, 1, 21600, 0x5e704dcb
+0, 4, 4, 1, 21600, 0xfbfb35d4
+0, 5, 5, 1, 21600, 0xf6e168de
+0, 6, 6, 1, 21600, 0x0b589818
+0, 7, 7, 1, 21600, 0xc67b2dbd
+0, 8, 8, 1, 21600, 0x002f4994
+0, 9, 9, 1, 21600, 0xe3a476f2
+0, 10, 10, 1, 21600, 0xbc5f0f39
+0, 11, 11, 1, 21600, 0xef095e3a
+0, 12, 12, 1, 21600, 0x6bb4f515
+0, 13, 13, 1, 21600, 0x1be1f0fa
+0, 14, 14, 1, 21600, 0x0d855464
+0, 15, 15, 1, 21600, 0x6711b47d
+0, 16, 16, 1, 21600, 0x14cb2640
+0, 17, 17, 1, 21600, 0x5b794027
+0, 18, 18, 1, 21600, 0xf8cfab3c
+0, 19, 19, 1, 21600, 0xe639b0c2
+0, 20, 20, 1, 21600, 0x403b3d7b
+0, 21, 21, 1, 21600, 0x364cbb6f
+0, 22, 22, 1, 21600, 0xadff6c72
+0, 23, 23, 1, 21600, 0x76c85b52
+0, 24, 24, 1, 21600, 0xbe85ec80
+0, 25, 25, 1, 21600, 0x1e9f9e50
+0, 26, 26, 1, 21600, 0xbd31bd82
+0, 27, 27, 1, 21600, 0x4445a12a
+0, 28, 28, 1, 21600, 0x08f25888
+0, 29, 29, 1, 21600, 0x73d45696
+0, 30, 30, 1, 21600, 0xbc681a10
+0, 31, 31, 1, 21600, 0x03f502be
+0, 32, 32, 1, 21600, 0x9206a757
+0, 33, 33, 1, 21600, 0x3ed5e1be
+0, 34, 34, 1, 21600, 0x76b636a9
+0, 35, 35, 1, 21600, 0x7d40ccb0
+0, 36, 36, 1, 21600, 0xa2955499
+0, 37, 37, 1, 21600, 0xf4b20c86
+0, 38, 38, 1, 21600, 0xe497d681
+0, 39, 39, 1, 21600, 0x831ef973
+0, 40, 40, 1, 21600, 0x43aa78e6
+0, 41, 41, 1, 21600, 0x26e4bdb6
+0, 42, 42, 1, 21600, 0xd04e9feb
+0, 43, 43, 1, 21600, 0x08ef4b58
+0, 44, 44, 1, 21600, 0x30b84cc3
+0, 45, 45, 1, 21600, 0x04e1dec0
+0, 46, 46, 1, 21600, 0xed4f24d5
+0, 47, 47, 1, 21600, 0xcc9f8d4c
+0, 48, 48, 1, 21600, 0x402ff69a
+0, 49, 49, 1, 21600, 0xd77a4e7b
+0, 50, 50, 1, 21600, 0xe614de71
+0, 51, 51, 1, 21600, 0x18daccbd
+0, 52, 52, 1, 21600, 0x87e896d1
+0, 53, 53, 1, 21600, 0x51d76264
+0, 54, 54, 1, 21600, 0x9b910304
+0, 55, 55, 1, 21600, 0xd3a7aa30
+0, 56, 56, 1, 21600, 0x40e4e926
+0, 57, 57, 1, 21600, 0x9bb5d703
+0, 58, 58, 1, 21600, 0x63fb1ac0
+0, 59, 59, 1, 21600, 0x1b9d851e
+0, 60, 60, 1, 21600, 0x36e4c0e6
+0, 61, 61, 1, 21600, 0x1f14b386
+0, 62, 62, 1, 21600, 0x01016e93
+0, 63, 63, 1, 21600, 0x8f192cc7
+0, 64, 64, 1, 21600, 0xa9caaeb0
+0, 65, 65, 1, 21600, 0xe9948a3d
+0, 66, 66, 1, 21600, 0xe870fa18
+0, 67, 67, 1, 21600, 0xc083eff5
+0, 68, 68, 1, 21600, 0x2f070225
+0, 69, 69, 1, 21600, 0x89cbd954
+0, 70, 70, 1, 21600, 0x448c4fbb
+0, 71, 71, 1, 21600, 0xe1ecfdbe
+0, 72, 72, 1, 21600, 0x20b3749b
+0, 73, 73, 1, 21600, 0x8ba8a3c6
+0, 74, 74, 1, 21600, 0x90c06421
+0, 75, 75, 1, 21600, 0x0e6bd5fc
+0, 76, 76, 1, 21600, 0x194425aa
+0, 77, 77, 1, 21600, 0x4038043a
+0, 78, 78, 1, 21600, 0x21545ede
+0, 79, 79, 1, 21600, 0x2ade8d52
+0, 80, 80, 1, 21600, 0xf504ad7e
+0, 81, 81, 1, 21600, 0xc58fcf10
+0, 82, 82, 1, 21600, 0x4b0af230
+0, 83, 83, 1, 21600, 0x3ff76b0b
+0, 84, 84, 1, 21600, 0x6d051bee
+0, 85, 85, 1, 21600, 0xc5d59208
+0, 86, 86, 1, 21600, 0xed5f81cf
+0, 87, 87, 1, 21600, 0x2c9976f9
+0, 88, 88, 1, 21600, 0xdd5b5f55
+0, 89, 89, 1, 21600, 0xcec73bc3
+0, 90, 90, 1, 21600, 0x46033a02
+0, 91, 91, 1, 21600, 0x00c6aade
+0, 92, 92, 1, 21600, 0x336049b3
+0, 93, 93, 1, 21600, 0xe1939479
+0, 94, 94, 1, 21600, 0xc77ca7e7
+0, 95, 95, 1, 21600, 0x40153489
+0, 96, 96, 1, 21600, 0x33253501
+0, 97, 97, 1, 21600, 0x10a321c1
+0, 98, 98, 1, 21600, 0x8720db67
+0, 99, 99, 1, 21600, 0x185b772e
+0, 100, 100, 1, 21600, 0xf4ce1986
+0, 101, 101, 1, 21600, 0x7234af91
+0, 102, 102, 1, 21600, 0x1cb75367
+0, 103, 103, 1, 21600, 0x7bc29377
+0, 104, 104, 1, 21600, 0xc3c047a1
+0, 105, 105, 1, 21600, 0xe6fb938c
+0, 106, 106, 1, 21600, 0x97ca5ab5
+0, 107, 107, 1, 21600, 0x7a9fe9bf
+0, 108, 108, 1, 21600, 0x53f892e4
+0, 109, 109, 1, 21600, 0x608a0bf6
+0, 110, 110, 1, 21600, 0x6052b96f
+0, 111, 111, 1, 21600, 0x61f689e7
+0, 112, 112, 1, 21600, 0x02a52e81
+0, 113, 113, 1, 21600, 0x43f01ae2
diff --git a/tests/ref/fate/indeo2 b/tests/ref/fate/indeo2-intra
similarity index 100%
rename from tests/ref/fate/indeo2
rename to tests/ref/fate/indeo2-intra
======================================================================
More information about the ffmpeg-cvslog
mailing list