| Message ID | GV1P250MB073794934A91B13A62193B168F4A9@GV1P250MB0737.EURP250.PROD.OUTLOOK.COM |
|---|---|
| State | Accepted |
| Commit | 71364c54d418da142a3353db293dce91555f2c12 |
| Headers | show |
| Series | [FFmpeg-devel,1/6] fate/ffmpeg: Use transcode instead of enc_dec in shortest-sub test | expand |
| Context | Check | Description |
|---|---|---|
| yinshiyou/make_loongarch64 | success | Make finished |
| yinshiyou/make_fate_loongarch64 | success | Make fate finished |
| andriy/make_x86 | success | Make finished |
| andriy/make_fate_x86 | success | Make fate finished |
Andreas Rheinhardt: > enc_dec is designed for raw input and output and computes > the PSNR between these two. The input of the shortest-sub > test is the idx file of a vobsub sub+idx combination > and the output is the output of framecrc of said vobsub > subtitle muxed into Matroska together with a synthesized > video. Calculating the PSNR between these two files makes > no sense, therefore switch to a transcode test, where > the ref file file contains the output of framecrc directly, > making the interleavement better visible in the ref file > at the cost of a larger ref file (>400 lines). > > Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> > --- > tests/fate/ffmpeg.mak | 4 +- > tests/ref/fate/shortest-sub | 417 +++++++++++++++++++++++++++++++++++- > 2 files changed, 417 insertions(+), 4 deletions(-) > > diff --git a/tests/fate/ffmpeg.mak b/tests/fate/ffmpeg.mak > index 38a1ae7ed5..c14eaa4c8a 100644 > --- a/tests/fate/ffmpeg.mak > +++ b/tests/fate/ffmpeg.mak > @@ -102,10 +102,10 @@ fate-shortest: CMD = framecrc -auto_conversion_filters -f lavfi -i "sine=3000:d= > # test interleaving video with a sparse subtitle stream > FATE_SAMPLES_FFMPEG-$(call ALLYES, COLOR_FILTER, VOBSUB_DEMUXER, MATROSKA_DEMUXER,, \ > RAWVIDEO_ENCODER, MATROSKA_MUXER, FRAMECRC_MUXER) += fate-shortest-sub > -fate-shortest-sub: CMD = enc_dec \ > +fate-shortest-sub: CMD = transcode \ > vobsub $(TARGET_SAMPLES)/sub/vobsub.idx matroska \ > "-filter_complex 'color=s=1x1:rate=1:duration=400' -pix_fmt rgb24 -allow_raw_vfw 1 -c:s copy -c:v rawvideo" \ > - framecrc "-map 0 -c copy -shortest -shortest_buf_duration 40" > + "-map 0 -c copy -shortest -shortest_buf_duration 40" > > # Basic test for fix_sub_duration, which calculates duration based on the > # following subtitle's pts. > diff --git a/tests/ref/fate/shortest-sub b/tests/ref/fate/shortest-sub > index 0da4ba2e95..53f89925b9 100644 > --- a/tests/ref/fate/shortest-sub > +++ b/tests/ref/fate/shortest-sub > @@ -1,4 +1,417 @@ > 145b9b48d56f9c966bf41657f7569954 *tests/data/fate/shortest-sub.matroska > 139232 tests/data/fate/shortest-sub.matroska > -876ac3fa52e467050ab843969d4cf343 *tests/data/fate/shortest-sub.out.framecrc > -stddev:11541.12 PSNR: 15.08 MAXDIFF:22854 bytes: 2591/ 23735 > +#extradata 1: 167, 0xf7272d5f > +#tb 0: 1/1000 > +#media_type 0: video > +#codec_id 0: rawvideo > +#dimensions 0: 1x1 > +#sar 0: 1/1 > +#tb 1: 1/1000 > +#media_type 1: subtitle > +#codec_id 1: dvd_subtitle > +0, 0, 0, 1000, 3, 0x00000000 > +0, 1000, 1000, 1000, 3, 0x00000000 > +0, 2000, 2000, 1000, 3, 0x00000000 > +0, 3000, 3000, 1000, 3, 0x00000000 > +0, 4000, 4000, 1000, 3, 0x00000000 > +0, 5000, 5000, 1000, 3, 0x00000000 > +0, 6000, 6000, 1000, 3, 0x00000000 > +0, 7000, 7000, 1000, 3, 0x00000000 > +0, 8000, 8000, 1000, 3, 0x00000000 > +0, 9000, 9000, 1000, 3, 0x00000000 > +0, 10000, 10000, 1000, 3, 0x00000000 > +0, 11000, 11000, 1000, 3, 0x00000000 > +0, 12000, 12000, 1000, 3, 0x00000000 > +0, 13000, 13000, 1000, 3, 0x00000000 > +0, 14000, 14000, 1000, 3, 0x00000000 > +0, 15000, 15000, 1000, 3, 0x00000000 > +0, 16000, 16000, 1000, 3, 0x00000000 > +0, 17000, 17000, 1000, 3, 0x00000000 > +0, 18000, 18000, 1000, 3, 0x00000000 > +0, 19000, 19000, 1000, 3, 0x00000000 > +0, 20000, 20000, 1000, 3, 0x00000000 > +0, 21000, 21000, 1000, 3, 0x00000000 > +0, 22000, 22000, 1000, 3, 0x00000000 > +0, 23000, 23000, 1000, 3, 0x00000000 > +0, 24000, 24000, 1000, 3, 0x00000000 > +0, 25000, 25000, 1000, 3, 0x00000000 > +0, 26000, 26000, 1000, 3, 0x00000000 > +0, 27000, 27000, 1000, 3, 0x00000000 > +0, 28000, 28000, 1000, 3, 0x00000000 > +0, 29000, 29000, 1000, 3, 0x00000000 > +0, 30000, 30000, 1000, 3, 0x00000000 > +0, 31000, 31000, 1000, 3, 0x00000000 > +0, 32000, 32000, 1000, 3, 0x00000000 > +0, 33000, 33000, 1000, 3, 0x00000000 > +0, 34000, 34000, 1000, 3, 0x00000000 > +0, 35000, 35000, 1000, 3, 0x00000000 > +0, 36000, 36000, 1000, 3, 0x00000000 > +0, 37000, 37000, 1000, 3, 0x00000000 > +0, 38000, 38000, 1000, 3, 0x00000000 > +0, 39000, 39000, 1000, 3, 0x00000000 > +0, 40000, 40000, 1000, 3, 0x00000000 > +0, 41000, 41000, 1000, 3, 0x00000000 > +0, 42000, 42000, 1000, 3, 0x00000000 > +0, 43000, 43000, 1000, 3, 0x00000000 > +0, 44000, 44000, 1000, 3, 0x00000000 > +0, 45000, 45000, 1000, 3, 0x00000000 > +0, 46000, 46000, 1000, 3, 0x00000000 > +0, 47000, 47000, 1000, 3, 0x00000000 > +0, 48000, 48000, 1000, 3, 0x00000000 > +0, 49000, 49000, 1000, 3, 0x00000000 > +0, 50000, 50000, 1000, 3, 0x00000000 > +0, 51000, 51000, 1000, 3, 0x00000000 > +0, 52000, 52000, 1000, 3, 0x00000000 > +0, 53000, 53000, 1000, 3, 0x00000000 > +0, 54000, 54000, 1000, 3, 0x00000000 > +0, 55000, 55000, 1000, 3, 0x00000000 > +0, 56000, 56000, 1000, 3, 0x00000000 > +0, 57000, 57000, 1000, 3, 0x00000000 > +0, 58000, 58000, 1000, 3, 0x00000000 > +0, 59000, 59000, 1000, 3, 0x00000000 > +0, 60000, 60000, 1000, 3, 0x00000000 > +0, 61000, 61000, 1000, 3, 0x00000000 > +0, 62000, 62000, 1000, 3, 0x00000000 > +0, 63000, 63000, 1000, 3, 0x00000000 > +0, 64000, 64000, 1000, 3, 0x00000000 > +0, 65000, 65000, 1000, 3, 0x00000000 > +0, 66000, 66000, 1000, 3, 0x00000000 > +0, 67000, 67000, 1000, 3, 0x00000000 > +0, 68000, 68000, 1000, 3, 0x00000000 > +0, 69000, 69000, 1000, 3, 0x00000000 > +0, 70000, 70000, 1000, 3, 0x00000000 > +0, 71000, 71000, 1000, 3, 0x00000000 > +0, 72000, 72000, 1000, 3, 0x00000000 > +0, 73000, 73000, 1000, 3, 0x00000000 > +0, 74000, 74000, 1000, 3, 0x00000000 > +0, 75000, 75000, 1000, 3, 0x00000000 > +0, 76000, 76000, 1000, 3, 0x00000000 > +0, 77000, 77000, 1000, 3, 0x00000000 > +0, 78000, 78000, 1000, 3, 0x00000000 > +0, 79000, 79000, 1000, 3, 0x00000000 > +0, 80000, 80000, 1000, 3, 0x00000000 > +0, 81000, 81000, 1000, 3, 0x00000000 > +0, 82000, 82000, 1000, 3, 0x00000000 > +0, 83000, 83000, 1000, 3, 0x00000000 > +0, 84000, 84000, 1000, 3, 0x00000000 > +0, 85000, 85000, 1000, 3, 0x00000000 > +0, 86000, 86000, 1000, 3, 0x00000000 > +0, 87000, 87000, 1000, 3, 0x00000000 > +0, 88000, 88000, 1000, 3, 0x00000000 > +0, 89000, 89000, 1000, 3, 0x00000000 > +0, 90000, 90000, 1000, 3, 0x00000000 > +0, 91000, 91000, 1000, 3, 0x00000000 > +0, 92000, 92000, 1000, 3, 0x00000000 > +0, 93000, 93000, 1000, 3, 0x00000000 > +0, 94000, 94000, 1000, 3, 0x00000000 > +0, 95000, 95000, 1000, 3, 0x00000000 > +0, 96000, 96000, 1000, 3, 0x00000000 > +0, 97000, 97000, 1000, 3, 0x00000000 > +0, 98000, 98000, 1000, 3, 0x00000000 > +0, 99000, 99000, 1000, 3, 0x00000000 > +0, 100000, 100000, 1000, 3, 0x00000000 > +0, 101000, 101000, 1000, 3, 0x00000000 > +0, 102000, 102000, 1000, 3, 0x00000000 > +0, 103000, 103000, 1000, 3, 0x00000000 > +0, 104000, 104000, 1000, 3, 0x00000000 > +0, 105000, 105000, 1000, 3, 0x00000000 > +0, 106000, 106000, 1000, 3, 0x00000000 > +0, 107000, 107000, 1000, 3, 0x00000000 > +0, 108000, 108000, 1000, 3, 0x00000000 > +0, 109000, 109000, 1000, 3, 0x00000000 > +0, 110000, 110000, 1000, 3, 0x00000000 > +0, 111000, 111000, 1000, 3, 0x00000000 > +0, 112000, 112000, 1000, 3, 0x00000000 > +0, 113000, 113000, 1000, 3, 0x00000000 > +0, 114000, 114000, 1000, 3, 0x00000000 > +0, 115000, 115000, 1000, 3, 0x00000000 > +0, 116000, 116000, 1000, 3, 0x00000000 > +0, 117000, 117000, 1000, 3, 0x00000000 > +0, 118000, 118000, 1000, 3, 0x00000000 > +0, 119000, 119000, 1000, 3, 0x00000000 > +0, 120000, 120000, 1000, 3, 0x00000000 > +0, 121000, 121000, 1000, 3, 0x00000000 > +0, 122000, 122000, 1000, 3, 0x00000000 > +0, 123000, 123000, 1000, 3, 0x00000000 > +0, 124000, 124000, 1000, 3, 0x00000000 > +0, 125000, 125000, 1000, 3, 0x00000000 > +0, 126000, 126000, 1000, 3, 0x00000000 > +0, 127000, 127000, 1000, 3, 0x00000000 > +0, 128000, 128000, 1000, 3, 0x00000000 > +0, 129000, 129000, 1000, 3, 0x00000000 > +0, 130000, 130000, 1000, 3, 0x00000000 > +0, 131000, 131000, 1000, 3, 0x00000000 > +0, 132000, 132000, 1000, 3, 0x00000000 > +1, 132499, 132499, 0, 2238, 0xf8f81348 > +0, 133000, 133000, 1000, 3, 0x00000000 > +0, 134000, 134000, 1000, 3, 0x00000000 > +0, 135000, 135000, 1000, 3, 0x00000000 > +0, 136000, 136000, 1000, 3, 0x00000000 > +0, 137000, 137000, 1000, 3, 0x00000000 > +0, 138000, 138000, 1000, 3, 0x00000000 > +0, 139000, 139000, 1000, 3, 0x00000000 > +0, 140000, 140000, 1000, 3, 0x00000000 > +0, 141000, 141000, 1000, 3, 0x00000000 > +0, 142000, 142000, 1000, 3, 0x00000000 > +0, 143000, 143000, 1000, 3, 0x00000000 > +0, 144000, 144000, 1000, 3, 0x00000000 > +0, 145000, 145000, 1000, 3, 0x00000000 > +0, 146000, 146000, 1000, 3, 0x00000000 > +0, 147000, 147000, 1000, 3, 0x00000000 > +1, 147355, 147355, 0, 3320, 0x7091f477 > +0, 148000, 148000, 1000, 3, 0x00000000 > +0, 149000, 149000, 1000, 3, 0x00000000 > +0, 150000, 150000, 1000, 3, 0x00000000 > +0, 151000, 151000, 1000, 3, 0x00000000 > +0, 152000, 152000, 1000, 3, 0x00000000 > +0, 153000, 153000, 1000, 3, 0x00000000 > +0, 154000, 154000, 1000, 3, 0x00000000 > +0, 155000, 155000, 1000, 3, 0x00000000 > +0, 156000, 156000, 1000, 3, 0x00000000 > +0, 157000, 157000, 1000, 3, 0x00000000 > +0, 158000, 158000, 1000, 3, 0x00000000 > +0, 159000, 159000, 1000, 3, 0x00000000 > +0, 160000, 160000, 1000, 3, 0x00000000 > +0, 161000, 161000, 1000, 3, 0x00000000 > +0, 162000, 162000, 1000, 3, 0x00000000 > +0, 163000, 163000, 1000, 3, 0x00000000 > +0, 164000, 164000, 1000, 3, 0x00000000 > +0, 165000, 165000, 1000, 3, 0x00000000 > +0, 166000, 166000, 1000, 3, 0x00000000 > +0, 167000, 167000, 1000, 3, 0x00000000 > +0, 168000, 168000, 1000, 3, 0x00000000 > +0, 169000, 169000, 1000, 3, 0x00000000 > +0, 170000, 170000, 1000, 3, 0x00000000 > +0, 171000, 171000, 1000, 3, 0x00000000 > +0, 172000, 172000, 1000, 3, 0x00000000 > +0, 173000, 173000, 1000, 3, 0x00000000 > +0, 174000, 174000, 1000, 3, 0x00000000 > +0, 175000, 175000, 1000, 3, 0x00000000 > +0, 176000, 176000, 1000, 3, 0x00000000 > +0, 177000, 177000, 1000, 3, 0x00000000 > +0, 178000, 178000, 1000, 3, 0x00000000 > +0, 179000, 179000, 1000, 3, 0x00000000 > +0, 180000, 180000, 1000, 3, 0x00000000 > +1, 180797, 180797, 0, 3626, 0xe4ff6eab > +0, 181000, 181000, 1000, 3, 0x00000000 > +0, 182000, 182000, 1000, 3, 0x00000000 > +0, 183000, 183000, 1000, 3, 0x00000000 > +1, 183433, 183433, 0, 4156, 0xc73645fe > +0, 184000, 184000, 1000, 3, 0x00000000 > +0, 185000, 185000, 1000, 3, 0x00000000 > +1, 185919, 185919, 0, 2019, 0xe9a5f34f > +1, 185919, 185919, 0, 1213, 0x8a62d853 > +0, 186000, 186000, 1000, 3, 0x00000000 > +0, 187000, 187000, 1000, 3, 0x00000000 > +0, 188000, 188000, 1000, 3, 0x00000000 > +1, 188663, 188663, 0, 2184, 0xfdcd0323 > +0, 189000, 189000, 1000, 3, 0x00000000 > +0, 190000, 190000, 1000, 3, 0x00000000 > +1, 190014, 190014, 0, 2172, 0xb479f0a1 > +0, 191000, 191000, 1000, 3, 0x00000000 > +0, 192000, 192000, 1000, 3, 0x00000000 > +0, 193000, 193000, 1000, 3, 0x00000000 > +0, 194000, 194000, 1000, 3, 0x00000000 > +0, 195000, 195000, 1000, 3, 0x00000000 > +0, 196000, 196000, 1000, 3, 0x00000000 > +0, 197000, 197000, 1000, 3, 0x00000000 > +0, 198000, 198000, 1000, 3, 0x00000000 > +0, 199000, 199000, 1000, 3, 0x00000000 > +1, 199724, 199724, 0, 2080, 0xe8e7c3a2 > +0, 200000, 200000, 1000, 3, 0x00000000 > +0, 201000, 201000, 1000, 3, 0x00000000 > +1, 201175, 201175, 0, 1972, 0xd2c87cd0 > +0, 202000, 202000, 1000, 3, 0x00000000 > +1, 202819, 202819, 0, 2856, 0xc9a42a11 > +0, 203000, 203000, 1000, 3, 0x00000000 > +0, 204000, 204000, 1000, 3, 0x00000000 > +1, 204762, 204762, 0, 3570, 0x02035220 > +0, 205000, 205000, 1000, 3, 0x00000000 > +0, 206000, 206000, 1000, 3, 0x00000000 > +1, 206806, 206806, 0, 3270, 0x9a39c179 > +0, 207000, 207000, 1000, 3, 0x00000000 > +0, 208000, 208000, 1000, 3, 0x00000000 > +1, 208716, 208716, 0, 2968, 0x6c0b46de > +0, 209000, 209000, 1000, 3, 0x00000000 > +0, 210000, 210000, 1000, 3, 0x00000000 > +1, 210051, 210051, 0, 2142, 0x9e64e867 > +0, 211000, 211000, 1000, 3, 0x00000000 > +1, 211644, 211644, 0, 4060, 0x274516cc > +0, 212000, 212000, 1000, 3, 0x00000000 > +0, 213000, 213000, 1000, 3, 0x00000000 > +0, 214000, 214000, 1000, 3, 0x00000000 > +1, 214380, 214380, 0, 4214, 0xa6a068cb > +0, 215000, 215000, 1000, 3, 0x00000000 > +0, 216000, 216000, 1000, 3, 0x00000000 > +0, 217000, 217000, 1000, 3, 0x00000000 > +1, 217225, 217225, 0, 3770, 0x3d3aaf6c > +0, 218000, 218000, 1000, 3, 0x00000000 > +0, 219000, 219000, 1000, 3, 0x00000000 > +1, 219652, 219652, 0, 1862, 0xaa9a5a30 > +0, 220000, 220000, 1000, 3, 0x00000000 > +0, 221000, 221000, 1000, 3, 0x00000000 > +0, 222000, 222000, 1000, 3, 0x00000000 > +0, 223000, 223000, 1000, 3, 0x00000000 > +1, 223531, 223531, 0, 3222, 0x390690fb > +0, 224000, 224000, 1000, 3, 0x00000000 > +0, 225000, 225000, 1000, 3, 0x00000000 > +0, 226000, 226000, 1000, 3, 0x00000000 > +0, 227000, 227000, 1000, 3, 0x00000000 > +1, 227510, 227510, 0, 4064, 0x13e132a4 > +0, 228000, 228000, 1000, 3, 0x00000000 > +0, 229000, 229000, 1000, 3, 0x00000000 > +0, 230000, 230000, 1000, 3, 0x00000000 > +1, 230872, 230872, 0, 3010, 0xc4a07cbd > +0, 231000, 231000, 1000, 3, 0x00000000 > +0, 232000, 232000, 1000, 3, 0x00000000 > +0, 233000, 233000, 1000, 3, 0x00000000 > +1, 233124, 233124, 0, 4950, 0xd30b9b64 > +0, 234000, 234000, 1000, 3, 0x00000000 > +0, 235000, 235000, 1000, 3, 0x00000000 > +0, 236000, 236000, 1000, 3, 0x00000000 > +0, 237000, 237000, 1000, 3, 0x00000000 > +1, 237303, 237303, 0, 4184, 0x5115659c > +0, 238000, 238000, 1000, 3, 0x00000000 > +0, 239000, 239000, 1000, 3, 0x00000000 > +0, 240000, 240000, 1000, 3, 0x00000000 > +1, 240106, 240106, 0, 3554, 0x14804a6c > +0, 241000, 241000, 1000, 3, 0x00000000 > +0, 242000, 242000, 1000, 3, 0x00000000 > +0, 243000, 243000, 1000, 3, 0x00000000 > +0, 244000, 244000, 1000, 3, 0x00000000 > +0, 245000, 245000, 1000, 3, 0x00000000 > +0, 246000, 246000, 1000, 3, 0x00000000 > +0, 247000, 247000, 1000, 3, 0x00000000 > +0, 248000, 248000, 1000, 3, 0x00000000 > +0, 249000, 249000, 1000, 3, 0x00000000 > +0, 250000, 250000, 1000, 3, 0x00000000 > +0, 251000, 251000, 1000, 3, 0x00000000 > +0, 252000, 252000, 1000, 3, 0x00000000 > +0, 253000, 253000, 1000, 3, 0x00000000 > +0, 254000, 254000, 1000, 3, 0x00000000 > +0, 255000, 255000, 1000, 3, 0x00000000 > +0, 256000, 256000, 1000, 3, 0x00000000 > +0, 257000, 257000, 1000, 3, 0x00000000 > +0, 258000, 258000, 1000, 3, 0x00000000 > +0, 259000, 259000, 1000, 3, 0x00000000 > +0, 260000, 260000, 1000, 3, 0x00000000 > +0, 261000, 261000, 1000, 3, 0x00000000 > +0, 262000, 262000, 1000, 3, 0x00000000 > +0, 263000, 263000, 1000, 3, 0x00000000 > +0, 264000, 264000, 1000, 3, 0x00000000 > +0, 265000, 265000, 1000, 3, 0x00000000 > +0, 266000, 266000, 1000, 3, 0x00000000 > +0, 267000, 267000, 1000, 3, 0x00000000 > +0, 268000, 268000, 1000, 3, 0x00000000 > +0, 269000, 269000, 1000, 3, 0x00000000 > +0, 270000, 270000, 1000, 3, 0x00000000 > +0, 271000, 271000, 1000, 3, 0x00000000 > +0, 272000, 272000, 1000, 3, 0x00000000 > +0, 273000, 273000, 1000, 3, 0x00000000 > +1, 273556, 273556, 0, 2300, 0x53d23a41 > +0, 274000, 274000, 1000, 3, 0x00000000 > +0, 275000, 275000, 1000, 3, 0x00000000 > +0, 276000, 276000, 1000, 3, 0x00000000 > +0, 277000, 277000, 1000, 3, 0x00000000 > +0, 278000, 278000, 1000, 3, 0x00000000 > +0, 279000, 279000, 1000, 3, 0x00000000 > +0, 280000, 280000, 1000, 3, 0x00000000 > +0, 281000, 281000, 1000, 3, 0x00000000 > +0, 282000, 282000, 1000, 3, 0x00000000 > +0, 283000, 283000, 1000, 3, 0x00000000 > +0, 284000, 284000, 1000, 3, 0x00000000 > +0, 285000, 285000, 1000, 3, 0x00000000 > +0, 286000, 286000, 1000, 3, 0x00000000 > +0, 287000, 287000, 1000, 3, 0x00000000 > +0, 288000, 288000, 1000, 3, 0x00000000 > +0, 289000, 289000, 1000, 3, 0x00000000 > +0, 290000, 290000, 1000, 3, 0x00000000 > +0, 291000, 291000, 1000, 3, 0x00000000 > +0, 292000, 292000, 1000, 3, 0x00000000 > +0, 293000, 293000, 1000, 3, 0x00000000 > +0, 294000, 294000, 1000, 3, 0x00000000 > +0, 295000, 295000, 1000, 3, 0x00000000 > +1, 295445, 295445, 0, 1544, 0x4e4ed1a0 > +0, 296000, 296000, 1000, 3, 0x00000000 > +0, 297000, 297000, 1000, 3, 0x00000000 > +0, 298000, 298000, 1000, 3, 0x00000000 > +0, 299000, 299000, 1000, 3, 0x00000000 > +0, 300000, 300000, 1000, 3, 0x00000000 > +1, 300049, 300049, 0, 2478, 0x6e3e7b4d > +0, 301000, 301000, 1000, 3, 0x00000000 > +0, 302000, 302000, 1000, 3, 0x00000000 > +1, 302018, 302018, 0, 2019, 0x5eb7c3d9 > +1, 302035, 302035, 0, 405, 0x98a58922 > +0, 303000, 303000, 1000, 3, 0x00000000 > +0, 304000, 304000, 1000, 3, 0x00000000 > +1, 304203, 304203, 0, 2998, 0xee7c6a15 > +0, 305000, 305000, 1000, 3, 0x00000000 > +1, 305947, 305947, 0, 2640, 0xf426b974 > +0, 306000, 306000, 1000, 3, 0x00000000 > +0, 307000, 307000, 1000, 3, 0x00000000 > +1, 307957, 307957, 0, 2174, 0x40340514 > +0, 308000, 308000, 1000, 3, 0x00000000 > +0, 309000, 309000, 1000, 3, 0x00000000 > +0, 310000, 310000, 1000, 3, 0x00000000 > +0, 311000, 311000, 1000, 3, 0x00000000 > +0, 312000, 312000, 1000, 3, 0x00000000 > +0, 313000, 313000, 1000, 3, 0x00000000 > +0, 314000, 314000, 1000, 3, 0x00000000 > +0, 315000, 315000, 1000, 3, 0x00000000 > +0, 316000, 316000, 1000, 3, 0x00000000 > +0, 317000, 317000, 1000, 3, 0x00000000 > +0, 318000, 318000, 1000, 3, 0x00000000 > +0, 319000, 319000, 1000, 3, 0x00000000 > +0, 320000, 320000, 1000, 3, 0x00000000 > +0, 321000, 321000, 1000, 3, 0x00000000 > +1, 321295, 321295, 0, 2760, 0x4ae1e9ad > +0, 322000, 322000, 1000, 3, 0x00000000 > +0, 323000, 323000, 1000, 3, 0x00000000 > +1, 323356, 323356, 0, 2688, 0xdec1c1d6 > +0, 324000, 324000, 1000, 3, 0x00000000 > +1, 324640, 324640, 0, 3694, 0x3b5d80de > +0, 325000, 325000, 1000, 3, 0x00000000 > +0, 326000, 326000, 1000, 3, 0x00000000 > +0, 327000, 327000, 1000, 3, 0x00000000 > +1, 327193, 327193, 0, 2276, 0x0dae2c53 > +0, 328000, 328000, 1000, 3, 0x00000000 > +1, 328369, 328369, 0, 2019, 0x4d9cd2f2 > +1, 328369, 328369, 0, 847, 0x1d3f4a3d > +0, 329000, 329000, 1000, 3, 0x00000000 > +1, 329946, 329946, 0, 1974, 0xb63e71b1 > +0, 330000, 330000, 1000, 3, 0x00000000 > +0, 331000, 331000, 1000, 3, 0x00000000 > +1, 331230, 331230, 0, 3004, 0x69a86a37 > +0, 332000, 332000, 1000, 3, 0x00000000 > +1, 332924, 332924, 0, 2124, 0xf5c6dc9a > +0, 333000, 333000, 1000, 3, 0x00000000 > +0, 334000, 334000, 1000, 3, 0x00000000 > +0, 335000, 335000, 1000, 3, 0x00000000 > +0, 336000, 336000, 1000, 3, 0x00000000 > +0, 337000, 337000, 1000, 3, 0x00000000 > +0, 338000, 338000, 1000, 3, 0x00000000 > +0, 339000, 339000, 1000, 3, 0x00000000 > +0, 340000, 340000, 1000, 3, 0x00000000 > +0, 341000, 341000, 1000, 3, 0x00000000 > +0, 342000, 342000, 1000, 3, 0x00000000 > +1, 342600, 342600, 0, 1876, 0x3ed26066 > +0, 343000, 343000, 1000, 3, 0x00000000 > +0, 344000, 344000, 1000, 3, 0x00000000 > +0, 345000, 345000, 1000, 3, 0x00000000 > +0, 346000, 346000, 1000, 3, 0x00000000 > +1, 346771, 346771, 0, 2426, 0xccae6c39 > +0, 347000, 347000, 1000, 3, 0x00000000 > +0, 348000, 348000, 1000, 3, 0x00000000 > +0, 349000, 349000, 1000, 3, 0x00000000 > +0, 350000, 350000, 1000, 3, 0x00000000 > +0, 351000, 351000, 1000, 3, 0x00000000 > +0, 352000, 352000, 1000, 3, 0x00000000 > +0, 353000, 353000, 1000, 3, 0x00000000 > +0, 354000, 354000, 1000, 3, 0x00000000 > +0, 355000, 355000, 1000, 3, 0x00000000 > +0, 356000, 356000, 1000, 3, 0x00000000 > +0, 357000, 357000, 1000, 3, 0x00000000 > +1, 357640, 357640, 0, 3240, 0x90cb9fd1 > +0, 358000, 358000, 1000, 3, 0x00000000 > +0, 359000, 359000, 1000, 3, 0x00000000 > +1, 359834, 359834, 0, 2482, 0xc68e6a8a Will apply this patchset tonight unless there are objections. - Andreas
diff --git a/tests/fate/ffmpeg.mak b/tests/fate/ffmpeg.mak index 38a1ae7ed5..c14eaa4c8a 100644 --- a/tests/fate/ffmpeg.mak +++ b/tests/fate/ffmpeg.mak @@ -102,10 +102,10 @@ fate-shortest: CMD = framecrc -auto_conversion_filters -f lavfi -i "sine=3000:d= # test interleaving video with a sparse subtitle stream FATE_SAMPLES_FFMPEG-$(call ALLYES, COLOR_FILTER, VOBSUB_DEMUXER, MATROSKA_DEMUXER,, \ RAWVIDEO_ENCODER, MATROSKA_MUXER, FRAMECRC_MUXER) += fate-shortest-sub -fate-shortest-sub: CMD = enc_dec \ +fate-shortest-sub: CMD = transcode \ vobsub $(TARGET_SAMPLES)/sub/vobsub.idx matroska \ "-filter_complex 'color=s=1x1:rate=1:duration=400' -pix_fmt rgb24 -allow_raw_vfw 1 -c:s copy -c:v rawvideo" \ - framecrc "-map 0 -c copy -shortest -shortest_buf_duration 40" + "-map 0 -c copy -shortest -shortest_buf_duration 40" # Basic test for fix_sub_duration, which calculates duration based on the # following subtitle's pts. diff --git a/tests/ref/fate/shortest-sub b/tests/ref/fate/shortest-sub index 0da4ba2e95..53f89925b9 100644 --- a/tests/ref/fate/shortest-sub +++ b/tests/ref/fate/shortest-sub @@ -1,4 +1,417 @@ 145b9b48d56f9c966bf41657f7569954 *tests/data/fate/shortest-sub.matroska 139232 tests/data/fate/shortest-sub.matroska -876ac3fa52e467050ab843969d4cf343 *tests/data/fate/shortest-sub.out.framecrc -stddev:11541.12 PSNR: 15.08 MAXDIFF:22854 bytes: 2591/ 23735 +#extradata 1: 167, 0xf7272d5f +#tb 0: 1/1000 +#media_type 0: video +#codec_id 0: rawvideo +#dimensions 0: 1x1 +#sar 0: 1/1 +#tb 1: 1/1000 +#media_type 1: subtitle +#codec_id 1: dvd_subtitle +0, 0, 0, 1000, 3, 0x00000000 +0, 1000, 1000, 1000, 3, 0x00000000 +0, 2000, 2000, 1000, 3, 0x00000000 +0, 3000, 3000, 1000, 3, 0x00000000 +0, 4000, 4000, 1000, 3, 0x00000000 +0, 5000, 5000, 1000, 3, 0x00000000 +0, 6000, 6000, 1000, 3, 0x00000000 +0, 7000, 7000, 1000, 3, 0x00000000 +0, 8000, 8000, 1000, 3, 0x00000000 +0, 9000, 9000, 1000, 3, 0x00000000 +0, 10000, 10000, 1000, 3, 0x00000000 +0, 11000, 11000, 1000, 3, 0x00000000 +0, 12000, 12000, 1000, 3, 0x00000000 +0, 13000, 13000, 1000, 3, 0x00000000 +0, 14000, 14000, 1000, 3, 0x00000000 +0, 15000, 15000, 1000, 3, 0x00000000 +0, 16000, 16000, 1000, 3, 0x00000000 +0, 17000, 17000, 1000, 3, 0x00000000 +0, 18000, 18000, 1000, 3, 0x00000000 +0, 19000, 19000, 1000, 3, 0x00000000 +0, 20000, 20000, 1000, 3, 0x00000000 +0, 21000, 21000, 1000, 3, 0x00000000 +0, 22000, 22000, 1000, 3, 0x00000000 +0, 23000, 23000, 1000, 3, 0x00000000 +0, 24000, 24000, 1000, 3, 0x00000000 +0, 25000, 25000, 1000, 3, 0x00000000 +0, 26000, 26000, 1000, 3, 0x00000000 +0, 27000, 27000, 1000, 3, 0x00000000 +0, 28000, 28000, 1000, 3, 0x00000000 +0, 29000, 29000, 1000, 3, 0x00000000 +0, 30000, 30000, 1000, 3, 0x00000000 +0, 31000, 31000, 1000, 3, 0x00000000 +0, 32000, 32000, 1000, 3, 0x00000000 +0, 33000, 33000, 1000, 3, 0x00000000 +0, 34000, 34000, 1000, 3, 0x00000000 +0, 35000, 35000, 1000, 3, 0x00000000 +0, 36000, 36000, 1000, 3, 0x00000000 +0, 37000, 37000, 1000, 3, 0x00000000 +0, 38000, 38000, 1000, 3, 0x00000000 +0, 39000, 39000, 1000, 3, 0x00000000 +0, 40000, 40000, 1000, 3, 0x00000000 +0, 41000, 41000, 1000, 3, 0x00000000 +0, 42000, 42000, 1000, 3, 0x00000000 +0, 43000, 43000, 1000, 3, 0x00000000 +0, 44000, 44000, 1000, 3, 0x00000000 +0, 45000, 45000, 1000, 3, 0x00000000 +0, 46000, 46000, 1000, 3, 0x00000000 +0, 47000, 47000, 1000, 3, 0x00000000 +0, 48000, 48000, 1000, 3, 0x00000000 +0, 49000, 49000, 1000, 3, 0x00000000 +0, 50000, 50000, 1000, 3, 0x00000000 +0, 51000, 51000, 1000, 3, 0x00000000 +0, 52000, 52000, 1000, 3, 0x00000000 +0, 53000, 53000, 1000, 3, 0x00000000 +0, 54000, 54000, 1000, 3, 0x00000000 +0, 55000, 55000, 1000, 3, 0x00000000 +0, 56000, 56000, 1000, 3, 0x00000000 +0, 57000, 57000, 1000, 3, 0x00000000 +0, 58000, 58000, 1000, 3, 0x00000000 +0, 59000, 59000, 1000, 3, 0x00000000 +0, 60000, 60000, 1000, 3, 0x00000000 +0, 61000, 61000, 1000, 3, 0x00000000 +0, 62000, 62000, 1000, 3, 0x00000000 +0, 63000, 63000, 1000, 3, 0x00000000 +0, 64000, 64000, 1000, 3, 0x00000000 +0, 65000, 65000, 1000, 3, 0x00000000 +0, 66000, 66000, 1000, 3, 0x00000000 +0, 67000, 67000, 1000, 3, 0x00000000 +0, 68000, 68000, 1000, 3, 0x00000000 +0, 69000, 69000, 1000, 3, 0x00000000 +0, 70000, 70000, 1000, 3, 0x00000000 +0, 71000, 71000, 1000, 3, 0x00000000 +0, 72000, 72000, 1000, 3, 0x00000000 +0, 73000, 73000, 1000, 3, 0x00000000 +0, 74000, 74000, 1000, 3, 0x00000000 +0, 75000, 75000, 1000, 3, 0x00000000 +0, 76000, 76000, 1000, 3, 0x00000000 +0, 77000, 77000, 1000, 3, 0x00000000 +0, 78000, 78000, 1000, 3, 0x00000000 +0, 79000, 79000, 1000, 3, 0x00000000 +0, 80000, 80000, 1000, 3, 0x00000000 +0, 81000, 81000, 1000, 3, 0x00000000 +0, 82000, 82000, 1000, 3, 0x00000000 +0, 83000, 83000, 1000, 3, 0x00000000 +0, 84000, 84000, 1000, 3, 0x00000000 +0, 85000, 85000, 1000, 3, 0x00000000 +0, 86000, 86000, 1000, 3, 0x00000000 +0, 87000, 87000, 1000, 3, 0x00000000 +0, 88000, 88000, 1000, 3, 0x00000000 +0, 89000, 89000, 1000, 3, 0x00000000 +0, 90000, 90000, 1000, 3, 0x00000000 +0, 91000, 91000, 1000, 3, 0x00000000 +0, 92000, 92000, 1000, 3, 0x00000000 +0, 93000, 93000, 1000, 3, 0x00000000 +0, 94000, 94000, 1000, 3, 0x00000000 +0, 95000, 95000, 1000, 3, 0x00000000 +0, 96000, 96000, 1000, 3, 0x00000000 +0, 97000, 97000, 1000, 3, 0x00000000 +0, 98000, 98000, 1000, 3, 0x00000000 +0, 99000, 99000, 1000, 3, 0x00000000 +0, 100000, 100000, 1000, 3, 0x00000000 +0, 101000, 101000, 1000, 3, 0x00000000 +0, 102000, 102000, 1000, 3, 0x00000000 +0, 103000, 103000, 1000, 3, 0x00000000 +0, 104000, 104000, 1000, 3, 0x00000000 +0, 105000, 105000, 1000, 3, 0x00000000 +0, 106000, 106000, 1000, 3, 0x00000000 +0, 107000, 107000, 1000, 3, 0x00000000 +0, 108000, 108000, 1000, 3, 0x00000000 +0, 109000, 109000, 1000, 3, 0x00000000 +0, 110000, 110000, 1000, 3, 0x00000000 +0, 111000, 111000, 1000, 3, 0x00000000 +0, 112000, 112000, 1000, 3, 0x00000000 +0, 113000, 113000, 1000, 3, 0x00000000 +0, 114000, 114000, 1000, 3, 0x00000000 +0, 115000, 115000, 1000, 3, 0x00000000 +0, 116000, 116000, 1000, 3, 0x00000000 +0, 117000, 117000, 1000, 3, 0x00000000 +0, 118000, 118000, 1000, 3, 0x00000000 +0, 119000, 119000, 1000, 3, 0x00000000 +0, 120000, 120000, 1000, 3, 0x00000000 +0, 121000, 121000, 1000, 3, 0x00000000 +0, 122000, 122000, 1000, 3, 0x00000000 +0, 123000, 123000, 1000, 3, 0x00000000 +0, 124000, 124000, 1000, 3, 0x00000000 +0, 125000, 125000, 1000, 3, 0x00000000 +0, 126000, 126000, 1000, 3, 0x00000000 +0, 127000, 127000, 1000, 3, 0x00000000 +0, 128000, 128000, 1000, 3, 0x00000000 +0, 129000, 129000, 1000, 3, 0x00000000 +0, 130000, 130000, 1000, 3, 0x00000000 +0, 131000, 131000, 1000, 3, 0x00000000 +0, 132000, 132000, 1000, 3, 0x00000000 +1, 132499, 132499, 0, 2238, 0xf8f81348 +0, 133000, 133000, 1000, 3, 0x00000000 +0, 134000, 134000, 1000, 3, 0x00000000 +0, 135000, 135000, 1000, 3, 0x00000000 +0, 136000, 136000, 1000, 3, 0x00000000 +0, 137000, 137000, 1000, 3, 0x00000000 +0, 138000, 138000, 1000, 3, 0x00000000 +0, 139000, 139000, 1000, 3, 0x00000000 +0, 140000, 140000, 1000, 3, 0x00000000 +0, 141000, 141000, 1000, 3, 0x00000000 +0, 142000, 142000, 1000, 3, 0x00000000 +0, 143000, 143000, 1000, 3, 0x00000000 +0, 144000, 144000, 1000, 3, 0x00000000 +0, 145000, 145000, 1000, 3, 0x00000000 +0, 146000, 146000, 1000, 3, 0x00000000 +0, 147000, 147000, 1000, 3, 0x00000000 +1, 147355, 147355, 0, 3320, 0x7091f477 +0, 148000, 148000, 1000, 3, 0x00000000 +0, 149000, 149000, 1000, 3, 0x00000000 +0, 150000, 150000, 1000, 3, 0x00000000 +0, 151000, 151000, 1000, 3, 0x00000000 +0, 152000, 152000, 1000, 3, 0x00000000 +0, 153000, 153000, 1000, 3, 0x00000000 +0, 154000, 154000, 1000, 3, 0x00000000 +0, 155000, 155000, 1000, 3, 0x00000000 +0, 156000, 156000, 1000, 3, 0x00000000 +0, 157000, 157000, 1000, 3, 0x00000000 +0, 158000, 158000, 1000, 3, 0x00000000 +0, 159000, 159000, 1000, 3, 0x00000000 +0, 160000, 160000, 1000, 3, 0x00000000 +0, 161000, 161000, 1000, 3, 0x00000000 +0, 162000, 162000, 1000, 3, 0x00000000 +0, 163000, 163000, 1000, 3, 0x00000000 +0, 164000, 164000, 1000, 3, 0x00000000 +0, 165000, 165000, 1000, 3, 0x00000000 +0, 166000, 166000, 1000, 3, 0x00000000 +0, 167000, 167000, 1000, 3, 0x00000000 +0, 168000, 168000, 1000, 3, 0x00000000 +0, 169000, 169000, 1000, 3, 0x00000000 +0, 170000, 170000, 1000, 3, 0x00000000 +0, 171000, 171000, 1000, 3, 0x00000000 +0, 172000, 172000, 1000, 3, 0x00000000 +0, 173000, 173000, 1000, 3, 0x00000000 +0, 174000, 174000, 1000, 3, 0x00000000 +0, 175000, 175000, 1000, 3, 0x00000000 +0, 176000, 176000, 1000, 3, 0x00000000 +0, 177000, 177000, 1000, 3, 0x00000000 +0, 178000, 178000, 1000, 3, 0x00000000 +0, 179000, 179000, 1000, 3, 0x00000000 +0, 180000, 180000, 1000, 3, 0x00000000 +1, 180797, 180797, 0, 3626, 0xe4ff6eab +0, 181000, 181000, 1000, 3, 0x00000000 +0, 182000, 182000, 1000, 3, 0x00000000 +0, 183000, 183000, 1000, 3, 0x00000000 +1, 183433, 183433, 0, 4156, 0xc73645fe +0, 184000, 184000, 1000, 3, 0x00000000 +0, 185000, 185000, 1000, 3, 0x00000000 +1, 185919, 185919, 0, 2019, 0xe9a5f34f +1, 185919, 185919, 0, 1213, 0x8a62d853 +0, 186000, 186000, 1000, 3, 0x00000000 +0, 187000, 187000, 1000, 3, 0x00000000 +0, 188000, 188000, 1000, 3, 0x00000000 +1, 188663, 188663, 0, 2184, 0xfdcd0323 +0, 189000, 189000, 1000, 3, 0x00000000 +0, 190000, 190000, 1000, 3, 0x00000000 +1, 190014, 190014, 0, 2172, 0xb479f0a1 +0, 191000, 191000, 1000, 3, 0x00000000 +0, 192000, 192000, 1000, 3, 0x00000000 +0, 193000, 193000, 1000, 3, 0x00000000 +0, 194000, 194000, 1000, 3, 0x00000000 +0, 195000, 195000, 1000, 3, 0x00000000 +0, 196000, 196000, 1000, 3, 0x00000000 +0, 197000, 197000, 1000, 3, 0x00000000 +0, 198000, 198000, 1000, 3, 0x00000000 +0, 199000, 199000, 1000, 3, 0x00000000 +1, 199724, 199724, 0, 2080, 0xe8e7c3a2 +0, 200000, 200000, 1000, 3, 0x00000000 +0, 201000, 201000, 1000, 3, 0x00000000 +1, 201175, 201175, 0, 1972, 0xd2c87cd0 +0, 202000, 202000, 1000, 3, 0x00000000 +1, 202819, 202819, 0, 2856, 0xc9a42a11 +0, 203000, 203000, 1000, 3, 0x00000000 +0, 204000, 204000, 1000, 3, 0x00000000 +1, 204762, 204762, 0, 3570, 0x02035220 +0, 205000, 205000, 1000, 3, 0x00000000 +0, 206000, 206000, 1000, 3, 0x00000000 +1, 206806, 206806, 0, 3270, 0x9a39c179 +0, 207000, 207000, 1000, 3, 0x00000000 +0, 208000, 208000, 1000, 3, 0x00000000 +1, 208716, 208716, 0, 2968, 0x6c0b46de +0, 209000, 209000, 1000, 3, 0x00000000 +0, 210000, 210000, 1000, 3, 0x00000000 +1, 210051, 210051, 0, 2142, 0x9e64e867 +0, 211000, 211000, 1000, 3, 0x00000000 +1, 211644, 211644, 0, 4060, 0x274516cc +0, 212000, 212000, 1000, 3, 0x00000000 +0, 213000, 213000, 1000, 3, 0x00000000 +0, 214000, 214000, 1000, 3, 0x00000000 +1, 214380, 214380, 0, 4214, 0xa6a068cb +0, 215000, 215000, 1000, 3, 0x00000000 +0, 216000, 216000, 1000, 3, 0x00000000 +0, 217000, 217000, 1000, 3, 0x00000000 +1, 217225, 217225, 0, 3770, 0x3d3aaf6c +0, 218000, 218000, 1000, 3, 0x00000000 +0, 219000, 219000, 1000, 3, 0x00000000 +1, 219652, 219652, 0, 1862, 0xaa9a5a30 +0, 220000, 220000, 1000, 3, 0x00000000 +0, 221000, 221000, 1000, 3, 0x00000000 +0, 222000, 222000, 1000, 3, 0x00000000 +0, 223000, 223000, 1000, 3, 0x00000000 +1, 223531, 223531, 0, 3222, 0x390690fb +0, 224000, 224000, 1000, 3, 0x00000000 +0, 225000, 225000, 1000, 3, 0x00000000 +0, 226000, 226000, 1000, 3, 0x00000000 +0, 227000, 227000, 1000, 3, 0x00000000 +1, 227510, 227510, 0, 4064, 0x13e132a4 +0, 228000, 228000, 1000, 3, 0x00000000 +0, 229000, 229000, 1000, 3, 0x00000000 +0, 230000, 230000, 1000, 3, 0x00000000 +1, 230872, 230872, 0, 3010, 0xc4a07cbd +0, 231000, 231000, 1000, 3, 0x00000000 +0, 232000, 232000, 1000, 3, 0x00000000 +0, 233000, 233000, 1000, 3, 0x00000000 +1, 233124, 233124, 0, 4950, 0xd30b9b64 +0, 234000, 234000, 1000, 3, 0x00000000 +0, 235000, 235000, 1000, 3, 0x00000000 +0, 236000, 236000, 1000, 3, 0x00000000 +0, 237000, 237000, 1000, 3, 0x00000000 +1, 237303, 237303, 0, 4184, 0x5115659c +0, 238000, 238000, 1000, 3, 0x00000000 +0, 239000, 239000, 1000, 3, 0x00000000 +0, 240000, 240000, 1000, 3, 0x00000000 +1, 240106, 240106, 0, 3554, 0x14804a6c +0, 241000, 241000, 1000, 3, 0x00000000 +0, 242000, 242000, 1000, 3, 0x00000000 +0, 243000, 243000, 1000, 3, 0x00000000 +0, 244000, 244000, 1000, 3, 0x00000000 +0, 245000, 245000, 1000, 3, 0x00000000 +0, 246000, 246000, 1000, 3, 0x00000000 +0, 247000, 247000, 1000, 3, 0x00000000 +0, 248000, 248000, 1000, 3, 0x00000000 +0, 249000, 249000, 1000, 3, 0x00000000 +0, 250000, 250000, 1000, 3, 0x00000000 +0, 251000, 251000, 1000, 3, 0x00000000 +0, 252000, 252000, 1000, 3, 0x00000000 +0, 253000, 253000, 1000, 3, 0x00000000 +0, 254000, 254000, 1000, 3, 0x00000000 +0, 255000, 255000, 1000, 3, 0x00000000 +0, 256000, 256000, 1000, 3, 0x00000000 +0, 257000, 257000, 1000, 3, 0x00000000 +0, 258000, 258000, 1000, 3, 0x00000000 +0, 259000, 259000, 1000, 3, 0x00000000 +0, 260000, 260000, 1000, 3, 0x00000000 +0, 261000, 261000, 1000, 3, 0x00000000 +0, 262000, 262000, 1000, 3, 0x00000000 +0, 263000, 263000, 1000, 3, 0x00000000 +0, 264000, 264000, 1000, 3, 0x00000000 +0, 265000, 265000, 1000, 3, 0x00000000 +0, 266000, 266000, 1000, 3, 0x00000000 +0, 267000, 267000, 1000, 3, 0x00000000 +0, 268000, 268000, 1000, 3, 0x00000000 +0, 269000, 269000, 1000, 3, 0x00000000 +0, 270000, 270000, 1000, 3, 0x00000000 +0, 271000, 271000, 1000, 3, 0x00000000 +0, 272000, 272000, 1000, 3, 0x00000000 +0, 273000, 273000, 1000, 3, 0x00000000 +1, 273556, 273556, 0, 2300, 0x53d23a41 +0, 274000, 274000, 1000, 3, 0x00000000 +0, 275000, 275000, 1000, 3, 0x00000000 +0, 276000, 276000, 1000, 3, 0x00000000 +0, 277000, 277000, 1000, 3, 0x00000000 +0, 278000, 278000, 1000, 3, 0x00000000 +0, 279000, 279000, 1000, 3, 0x00000000 +0, 280000, 280000, 1000, 3, 0x00000000 +0, 281000, 281000, 1000, 3, 0x00000000 +0, 282000, 282000, 1000, 3, 0x00000000 +0, 283000, 283000, 1000, 3, 0x00000000 +0, 284000, 284000, 1000, 3, 0x00000000 +0, 285000, 285000, 1000, 3, 0x00000000 +0, 286000, 286000, 1000, 3, 0x00000000 +0, 287000, 287000, 1000, 3, 0x00000000 +0, 288000, 288000, 1000, 3, 0x00000000 +0, 289000, 289000, 1000, 3, 0x00000000 +0, 290000, 290000, 1000, 3, 0x00000000 +0, 291000, 291000, 1000, 3, 0x00000000 +0, 292000, 292000, 1000, 3, 0x00000000 +0, 293000, 293000, 1000, 3, 0x00000000 +0, 294000, 294000, 1000, 3, 0x00000000 +0, 295000, 295000, 1000, 3, 0x00000000 +1, 295445, 295445, 0, 1544, 0x4e4ed1a0 +0, 296000, 296000, 1000, 3, 0x00000000 +0, 297000, 297000, 1000, 3, 0x00000000 +0, 298000, 298000, 1000, 3, 0x00000000 +0, 299000, 299000, 1000, 3, 0x00000000 +0, 300000, 300000, 1000, 3, 0x00000000 +1, 300049, 300049, 0, 2478, 0x6e3e7b4d +0, 301000, 301000, 1000, 3, 0x00000000 +0, 302000, 302000, 1000, 3, 0x00000000 +1, 302018, 302018, 0, 2019, 0x5eb7c3d9 +1, 302035, 302035, 0, 405, 0x98a58922 +0, 303000, 303000, 1000, 3, 0x00000000 +0, 304000, 304000, 1000, 3, 0x00000000 +1, 304203, 304203, 0, 2998, 0xee7c6a15 +0, 305000, 305000, 1000, 3, 0x00000000 +1, 305947, 305947, 0, 2640, 0xf426b974 +0, 306000, 306000, 1000, 3, 0x00000000 +0, 307000, 307000, 1000, 3, 0x00000000 +1, 307957, 307957, 0, 2174, 0x40340514 +0, 308000, 308000, 1000, 3, 0x00000000 +0, 309000, 309000, 1000, 3, 0x00000000 +0, 310000, 310000, 1000, 3, 0x00000000 +0, 311000, 311000, 1000, 3, 0x00000000 +0, 312000, 312000, 1000, 3, 0x00000000 +0, 313000, 313000, 1000, 3, 0x00000000 +0, 314000, 314000, 1000, 3, 0x00000000 +0, 315000, 315000, 1000, 3, 0x00000000 +0, 316000, 316000, 1000, 3, 0x00000000 +0, 317000, 317000, 1000, 3, 0x00000000 +0, 318000, 318000, 1000, 3, 0x00000000 +0, 319000, 319000, 1000, 3, 0x00000000 +0, 320000, 320000, 1000, 3, 0x00000000 +0, 321000, 321000, 1000, 3, 0x00000000 +1, 321295, 321295, 0, 2760, 0x4ae1e9ad +0, 322000, 322000, 1000, 3, 0x00000000 +0, 323000, 323000, 1000, 3, 0x00000000 +1, 323356, 323356, 0, 2688, 0xdec1c1d6 +0, 324000, 324000, 1000, 3, 0x00000000 +1, 324640, 324640, 0, 3694, 0x3b5d80de +0, 325000, 325000, 1000, 3, 0x00000000 +0, 326000, 326000, 1000, 3, 0x00000000 +0, 327000, 327000, 1000, 3, 0x00000000 +1, 327193, 327193, 0, 2276, 0x0dae2c53 +0, 328000, 328000, 1000, 3, 0x00000000 +1, 328369, 328369, 0, 2019, 0x4d9cd2f2 +1, 328369, 328369, 0, 847, 0x1d3f4a3d +0, 329000, 329000, 1000, 3, 0x00000000 +1, 329946, 329946, 0, 1974, 0xb63e71b1 +0, 330000, 330000, 1000, 3, 0x00000000 +0, 331000, 331000, 1000, 3, 0x00000000 +1, 331230, 331230, 0, 3004, 0x69a86a37 +0, 332000, 332000, 1000, 3, 0x00000000 +1, 332924, 332924, 0, 2124, 0xf5c6dc9a +0, 333000, 333000, 1000, 3, 0x00000000 +0, 334000, 334000, 1000, 3, 0x00000000 +0, 335000, 335000, 1000, 3, 0x00000000 +0, 336000, 336000, 1000, 3, 0x00000000 +0, 337000, 337000, 1000, 3, 0x00000000 +0, 338000, 338000, 1000, 3, 0x00000000 +0, 339000, 339000, 1000, 3, 0x00000000 +0, 340000, 340000, 1000, 3, 0x00000000 +0, 341000, 341000, 1000, 3, 0x00000000 +0, 342000, 342000, 1000, 3, 0x00000000 +1, 342600, 342600, 0, 1876, 0x3ed26066 +0, 343000, 343000, 1000, 3, 0x00000000 +0, 344000, 344000, 1000, 3, 0x00000000 +0, 345000, 345000, 1000, 3, 0x00000000 +0, 346000, 346000, 1000, 3, 0x00000000 +1, 346771, 346771, 0, 2426, 0xccae6c39 +0, 347000, 347000, 1000, 3, 0x00000000 +0, 348000, 348000, 1000, 3, 0x00000000 +0, 349000, 349000, 1000, 3, 0x00000000 +0, 350000, 350000, 1000, 3, 0x00000000 +0, 351000, 351000, 1000, 3, 0x00000000 +0, 352000, 352000, 1000, 3, 0x00000000 +0, 353000, 353000, 1000, 3, 0x00000000 +0, 354000, 354000, 1000, 3, 0x00000000 +0, 355000, 355000, 1000, 3, 0x00000000 +0, 356000, 356000, 1000, 3, 0x00000000 +0, 357000, 357000, 1000, 3, 0x00000000 +1, 357640, 357640, 0, 3240, 0x90cb9fd1 +0, 358000, 358000, 1000, 3, 0x00000000 +0, 359000, 359000, 1000, 3, 0x00000000 +1, 359834, 359834, 0, 2482, 0xc68e6a8a
enc_dec is designed for raw input and output and computes the PSNR between these two. The input of the shortest-sub test is the idx file of a vobsub sub+idx combination and the output is the output of framecrc of said vobsub subtitle muxed into Matroska together with a synthesized video. Calculating the PSNR between these two files makes no sense, therefore switch to a transcode test, where the ref file file contains the output of framecrc directly, making the interleavement better visible in the ref file at the cost of a larger ref file (>400 lines). Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> --- tests/fate/ffmpeg.mak | 4 +- tests/ref/fate/shortest-sub | 417 +++++++++++++++++++++++++++++++++++- 2 files changed, 417 insertions(+), 4 deletions(-)