diff --git a/tests/Makefile b/tests/Makefile index c5cd3a7706..9bb914eed3 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -119,6 +119,7 @@ FATE-$(CONFIG_FFMPEG) += $(FATE_FFMPEG) FATE-$(CONFIG_FFPROBE) += $(FATE_FFPROBE) FATE_SAMPLES_AVCONV += $(FATE_SAMPLES_AVCONV-yes) +FATE_SAMPLES_FFMPEG += $(FATE_SAMPLES_FFMPEG-yes) FATE_EXTERN-$(CONFIG_FFMPEG) += $(FATE_SAMPLES_AVCONV) $(FATE_SAMPLES_FFMPEG) $(FATE_SAMPLES_FFPROBE) FATE_EXTERN += $(FATE_EXTERN-yes) diff --git a/tests/fate/ffmpeg.mak b/tests/fate/ffmpeg.mak index eb8666f9ea..69b97459a3 100644 --- a/tests/fate/ffmpeg.mak +++ b/tests/fate/ffmpeg.mak @@ -19,3 +19,11 @@ fate-force_key_frames: CMD = enc_dec \ "rawvideo -s 352x288 -pix_fmt yuv420p" tests/data/vsynth2.yuv \ avi "-c mpeg4 -g 240 -qscale 10 -force_key_frames 0.5,0:00:01.5" \ framecrc "" "" "-skip_frame nokey" + +FATE_SAMPLES_FFMPEG-$(call ALLYES, VOBSUB_DEMUXER DVDSUB_DECODER AVFILTER OVERLAY_FILTER DVDSUB_ENCODER) += fate-sub2video +fate-sub2video: tests/data/vsynth2.yuv +fate-sub2video: CMD = framecrc \ + -f rawvideo -r 5 -s 352x288 -pix_fmt yuv420p -i tests/data/vsynth2.yuv \ + -ss 132 -i $(SAMPLES)/sub/vobsub.idx \ + -filter_complex "[0:0]scale=720:480[v];[v][1:0]overlay[v2]" \ + -map "[v2]" -c:v rawvideo -map 1:s -c:s dvdsub diff --git a/tests/ref/fate/sub2video b/tests/ref/fate/sub2video new file mode 100644 index 0000000000..4a67220931 --- /dev/null +++ b/tests/ref/fate/sub2video @@ -0,0 +1,94 @@ +#tb 0: 1/5 +#tb 1: 1/1000 +0, 0, 0, 1, 518400, 0x23b70a16 +0, 1, 1, 1, 518400, 0xed20570d +0, 2, 2, 1, 518400, 0x00e76dc2 +1, 499, 499, 4960, 1015, 0x19e092d2, F=0x0 +0, 3, 3, 1, 518400, 0xba0b4762 +0, 4, 4, 1, 518400, 0x2d6d35bc +0, 5, 5, 1, 518400, 0x0fa54d0c +0, 6, 6, 1, 518400, 0x521a9dd0 +0, 7, 7, 1, 518400, 0x84af02ec +0, 8, 8, 1, 518400, 0xe7564371 +0, 9, 9, 1, 518400, 0x9e819780 +0, 10, 10, 1, 518400, 0x5ed22da5 +0, 11, 11, 1, 518400, 0x37ba3524 +0, 12, 12, 1, 518400, 0xe30886e2 +0, 13, 13, 1, 518400, 0xbbc83457 +0, 14, 14, 1, 518400, 0xda250e00 +0, 15, 15, 1, 518400, 0x1bc8c0fd +0, 16, 16, 1, 518400, 0x96639efd +0, 17, 17, 1, 518400, 0xfb6c9749 +0, 18, 18, 1, 518400, 0x5010bad1 +0, 19, 19, 1, 518400, 0x981cfc5c +0, 20, 20, 1, 518400, 0x061577e5 +0, 21, 21, 1, 518400, 0x29c5df75 +0, 22, 22, 1, 518400, 0x89253145 +0, 23, 23, 1, 518400, 0x8ad4464e +0, 24, 24, 1, 518400, 0xf166efc2 +0, 25, 25, 1, 518400, 0x96056fd5 +0, 26, 26, 1, 518400, 0x7773a79b +0, 27, 27, 1, 518400, 0xfbb79f94 +0, 28, 28, 1, 518400, 0x878ff9ef +0, 29, 29, 1, 518400, 0x3020e868 +0, 30, 30, 1, 518400, 0x5f6f177e +0, 31, 31, 1, 518400, 0xad552c0a +0, 32, 32, 1, 518400, 0xd5f92274 +0, 33, 33, 1, 518400, 0x5ebb31d6 +0, 34, 34, 1, 518400, 0x638af636 +0, 35, 35, 1, 518400, 0x86ceb15a +0, 36, 36, 1, 518400, 0x5e048608 +0, 37, 37, 1, 518400, 0xda374344 +0, 38, 38, 1, 518400, 0x7b85fac3 +0, 39, 39, 1, 518400, 0x0182d5a9 +0, 40, 40, 1, 518400, 0x7029c28e +0, 41, 41, 1, 518400, 0xd4d5d1f6 +0, 42, 42, 1, 518400, 0x5b8def5e +0, 43, 43, 1, 518400, 0x99f44d8b +0, 44, 44, 1, 518400, 0xfa81cc49 +0, 45, 45, 1, 518400, 0x67dab5d5 +0, 46, 46, 1, 518400, 0xe0748529 +0, 47, 47, 1, 518400, 0x48e3f42b +0, 48, 48, 1, 518400, 0x37d818a4 +0, 49, 49, 1, 518400, 0x9f202407 +1, 15355, 15355, 4733, 2094, 0x3c171425, F=0x0 +1, 48797, 48797, 2560, 2480, 0x7c0edf21, F=0x0 +1, 51433, 51433, 2366, 3059, 0xc95b8a05, F=0x0 +1, 53919, 53919, 2696, 2095, 0x61bb15ed, F=0x0 +1, 56663, 56663, 1262, 1013, 0xc9ae89b7, F=0x0 +1, 58014, 58014, 1661, 969, 0xe01878f0, F=0x0 +1, 67724, 67724, 1365, 844, 0xe7db4fc1, F=0x0 +1, 69175, 69175, 1558, 802, 0xf48531ba, F=0x0 +1, 70819, 70819, 1865, 1709, 0xb4d5a1bd, F=0x0 +1, 72762, 72762, 1968, 2438, 0x99d7bc82, F=0x0 +1, 74806, 74806, 1831, 2116, 0x96514097, F=0x0 +1, 76716, 76716, 1262, 1822, 0xefccc72e, F=0x0 +1, 78051, 78051, 1524, 987, 0x7b927a27, F=0x0 +1, 79644, 79644, 2662, 2956, 0x190778f7, F=0x0 +1, 82380, 82380, 2764, 3094, 0xc021b7d3, F=0x0 +1, 85225, 85225, 2366, 2585, 0x74d0048f, F=0x0 +1, 87652, 87652, 1831, 634, 0x8832fda1, F=0x0 +1, 91531, 91531, 2332, 2080, 0x97a1146f, F=0x0 +1, 95510, 95510, 3299, 2964, 0x8b8f6684, F=0x0 +1, 98872, 98872, 2161, 1875, 0x9002ef71, F=0x0 +1, 101124, 101124, 4096, 3872, 0x20c6ed9c, F=0x0 +1, 105303, 105303, 2730, 3094, 0xf203a663, F=0x0 +1, 108106, 108106, 2059, 2404, 0x41a7b429, F=0x0 +1, 141556, 141556, 1661, 1088, 0xde20aa20, F=0x0 +1, 163445, 163445, 1331, 339, 0x8bd186ef, F=0x0 +1, 168049, 168049, 1900, 1312, 0x0bf20e8d, F=0x0 +1, 172203, 172203, 1695, 1826, 0x9a1ac769, F=0x0 +1, 173947, 173947, 1934, 1474, 0xa9b03cdc, F=0x0 +1, 175957, 175957, 1763, 1019, 0x20409355, F=0x0 +1, 189295, 189295, 1968, 1596, 0x408c726e, F=0x0 +1, 191356, 191356, 1228, 1517, 0xae8c5c2b, F=0x0 +1, 192640, 192640, 1763, 2506, 0xa458d6d4, F=0x0 +1, 195193, 195193, 1092, 1074, 0x397ba9a8, F=0x0 +1, 196369, 196369, 1524, 1715, 0x695ca41e, F=0x0 +1, 197946, 197946, 1160, 789, 0xc63a189e, F=0x0 +1, 199230, 199230, 1627, 1846, 0xeea8c599, F=0x0 +1, 200924, 200924, 1763, 922, 0xd4a87222, F=0x0 +1, 210600, 210600, 1831, 665, 0x55580135, F=0x0 +1, 214771, 214771, 1558, 1216, 0x50d1f6c5, F=0x0 +1, 225640, 225640, 2127, 2133, 0x670c11a5, F=0x0 +1, 227834, 227834, 1262, 1264, 0xc1d9fc57, F=0x0