ffmpeg/tests/ref/fate/sub2video

187 lines
10 KiB
Plaintext
Raw Normal View History

#extradata 1: 150, 0x7c99258b
2013-01-01 17:51:38 +00:00
#tb 0: 1/5
#media_type 0: video
#codec_id 0: rawvideo
#dimensions 0: 720x480
#sar 0: 0/1
2013-01-01 17:51:38 +00:00
#tb 1: 1/1000
#media_type 1: subtitle
#codec_id 1: dvd_subtitle
0, 0, 0, 1, 518400, 0x83c27b82
0, 1, 1, 1, 518400, 0x4051c7f9
0, 2, 2, 1, 518400, 0xfb00e17e
2013-01-01 17:51:38 +00:00
1, 499, 499, 4960, 1015, 0x19e092d2, F=0x0
0, 3, 3, 1, 518400, 0x192abb74
0, 4, 4, 1, 518400, 0x4669a88b
0, 5, 5, 1, 518400, 0xaababe00
0, 6, 6, 1, 518400, 0x98a211a5
0, 7, 7, 1, 518400, 0x440e7547
0, 8, 8, 1, 518400, 0xca5bb496
0, 9, 9, 1, 518400, 0xf86e0b0a
0, 10, 10, 1, 518400, 0xb80fa020
0, 11, 11, 1, 518400, 0x41c2a54b
0, 12, 12, 1, 518400, 0x51baf353
0, 13, 13, 1, 518400, 0x967ea7f3
0, 14, 14, 1, 518400, 0x819e7f89
0, 15, 15, 1, 518400, 0x192233e1
0, 16, 16, 1, 518400, 0xc80a0eb3
0, 17, 17, 1, 518400, 0x08260a23
0, 18, 18, 1, 518400, 0xc92e2caf
0, 19, 19, 1, 518400, 0x3fe36eea
0, 20, 20, 1, 518400, 0x0891e8d5
0, 21, 21, 1, 518400, 0x84655095
0, 22, 22, 1, 518400, 0x9c7fa014
0, 23, 23, 1, 518400, 0x9c43b656
0, 24, 24, 1, 518400, 0x2cf46221
0, 25, 25, 1, 518400, 0x7322e11c
0, 26, 26, 1, 518400, 0x45af1a84
0, 27, 27, 1, 518400, 0x7b781071
0, 28, 28, 1, 518400, 0x4f7c706c
0, 29, 29, 1, 518400, 0xb227603b
0, 30, 30, 1, 518400, 0x7b4b89c2
0, 31, 31, 1, 518400, 0x456da21e
0, 32, 32, 1, 518400, 0xb691979f
0, 33, 33, 1, 518400, 0x0dfaa66d
0, 34, 34, 1, 518400, 0x191a6f23
0, 35, 35, 1, 518400, 0xa03b2605
0, 36, 36, 1, 518400, 0xb36aff87
0, 37, 37, 1, 518400, 0xf5f0bc4a
0, 38, 38, 1, 518400, 0x863d701a
0, 39, 39, 1, 518400, 0xd11b4dce
0, 40, 40, 1, 518400, 0x969236bd
0, 41, 41, 1, 518400, 0xb60a485c
0, 42, 42, 1, 518400, 0xe9796621
0, 43, 43, 1, 518400, 0x3e8fc04b
0, 44, 44, 1, 518400, 0xac9944e3
0, 45, 45, 1, 518400, 0x01452b4d
0, 46, 46, 1, 518400, 0xb384f6d2
0, 47, 47, 1, 518400, 0xde69683f
0, 48, 48, 1, 518400, 0x7df08fba
0, 49, 49, 1, 518400, 0xbab197ea
2013-01-01 17:51:38 +00:00
1, 15355, 15355, 4733, 2094, 0x3c171425, F=0x0
0, 77, 77, 1, 518400, 0x902285d9
0, 100, 100, 1, 518400, 0xbab197ea
2013-01-01 17:51:38 +00:00
1, 48797, 48797, 2560, 2480, 0x7c0edf21, F=0x0
0, 244, 244, 1, 518400, 0x7a11c812
0, 257, 257, 1, 518400, 0xbab197ea
2013-01-01 17:51:38 +00:00
1, 51433, 51433, 2366, 3059, 0xc95b8a05, F=0x0
0, 258, 258, 1, 518400, 0x34cdddee
0, 269, 269, 1, 518400, 0xbab197ea
avformat/vobsub: fix several issues. Here is an extract of fate-samples/sub/vobsub.idx, with an additional text at the end of each line to better identify each bitmap: timestamp: 00:04:55:445, filepos: 00001b000 Ace! timestamp: 00:05:00:049, filepos: 00001b800 Wake up, honey! timestamp: 00:05:02:018, filepos: 00001c800 I gotta go to work. timestamp: 00:05:02:035, filepos: 00001d000 <???> timestamp: 00:05:04:203, filepos: 00001d800 Look after Clayton, okay? timestamp: 00:05:05:947, filepos: 00001e800 I'll be back tonight. timestamp: 00:05:07:957, filepos: 00001f800 Bye! Love you. timestamp: 00:05:21:295, filepos: 000020800 Hey, Ace! What's up? timestamp: 00:05:23:356, filepos: 000021800 Hey, how's it going? timestamp: 00:05:24:640, filepos: 000022800 Remember what today is? The 3rd! timestamp: 00:05:27:193, filepos: 000023800 Look over there! timestamp: 00:05:28:369, filepos: 000024800 Where are they going? timestamp: 00:05:28:361, filepos: 000025000 <???> timestamp: 00:05:29:946, filepos: 000025800 Let's go see. timestamp: 00:05:31:230, filepos: 000026000 I can't, man. I got Clayton. Note the two "<???>": they are basically split subtitles (with the previous one), which the dvdsub decoder is now supposed to reconstruct with a previous commit. But also note that while the first chunk has increasing timestamps, timestamp: 00:05:02:018, filepos: 00001c800 timestamp: 00:05:02:035, filepos: 00001d000 ...it's not the case of the second one (and this is not an exception in the original file): timestamp: 00:05:28:369, filepos: 000024800 timestamp: 00:05:28:361, filepos: 000025000 For the dvdsub decoder, they need to be "filepos'ed" ordered, but the FFDemuxSubtitlesQueue is timestamps ordered, which is the reason of the introduction of a sub sort method in the context, to allow giving priority to the position, and then the timestamps. With that change, the dvdsub decoder get fed with ordered packets. Now the packet size estimation was also broken: the filepos differences in the vobsub index defines the full data read between two subtitles chunks, and it is necessary to take into account what is read by the mpegps_read_pes_header() function since the length returned by that function doesn't count the size of the data it reads. This is fixed with the introduction of total_read, and {old,new}_pos. By doing this change, we can drop the unreliable len16 heuristic and simplify the whole loop. Note that mpegps_read_pes_header() often read more than one PES packet (typically in one call it can read 0x1ba and 0x1be chunk along with the relevant 0x1bd packet), which triggers the "total_read + pkt_size > psize" check. This is an expected behaviour, which could be avoided by having a more chunked version of mpegps_read_pes_header(). The latest change is the extraction of each stream into its own subtitles queue. If we don't do this, the maximum size for a subtitle chunk is broken, and the previous changes can not work. Having each stream in a different queue requires some little adjustments in the seek code of the demuxer. This commit is only meaningful as a whole change and can not be easily split. The FATE test changes because it uses the vobsub demuxer.
2013-09-29 20:05:14 +00:00
1, 53910, 53910, 2696, 2095, 0x61bb15ed, F=0x0
0, 270, 270, 1, 518400, 0x4db4ce51
0, 283, 283, 1, 518400, 0xbab197ea
2013-01-01 17:51:38 +00:00
1, 56663, 56663, 1262, 1013, 0xc9ae89b7, F=0x0
0, 284, 284, 1, 518400, 0xe6bc0ea9
0, 290, 290, 1, 518400, 0xbab197ea
2013-01-01 17:51:38 +00:00
1, 58014, 58014, 1661, 969, 0xe01878f0, F=0x0
0, 291, 291, 1, 518400, 0xa8643af7
0, 298, 298, 1, 518400, 0xbab197ea
2013-01-01 17:51:38 +00:00
1, 67724, 67724, 1365, 844, 0xe7db4fc1, F=0x0
0, 339, 339, 1, 518400, 0xb1885c67
0, 345, 345, 1, 518400, 0xbab197ea
2013-01-01 17:51:38 +00:00
1, 69175, 69175, 1558, 802, 0xf48531ba, F=0x0
0, 346, 346, 1, 518400, 0x378e3fd0
0, 354, 354, 1, 518400, 0xbab197ea
2013-01-01 17:51:38 +00:00
1, 70819, 70819, 1865, 1709, 0xb4d5a1bd, F=0x0
0, 355, 355, 1, 518400, 0xa3782469
0, 363, 363, 1, 518400, 0xbab197ea
2013-01-01 17:51:38 +00:00
1, 72762, 72762, 1968, 2438, 0x99d7bc82, F=0x0
0, 364, 364, 1, 518400, 0xba23a0d5
0, 374, 374, 1, 518400, 0xbab197ea
2013-01-01 17:51:38 +00:00
1, 74806, 74806, 1831, 2116, 0x96514097, F=0x0
0, 375, 375, 1, 518400, 0x129de2f8
0, 383, 383, 1, 518400, 0xbab197ea
2013-01-01 17:51:38 +00:00
1, 76716, 76716, 1262, 1822, 0xefccc72e, F=0x0
0, 384, 384, 1, 518400, 0x19772f0f
0, 390, 390, 1, 518400, 0xbab197ea
2013-01-01 17:51:38 +00:00
1, 78051, 78051, 1524, 987, 0x7b927a27, F=0x0
0, 391, 391, 1, 518400, 0x56f54e73
0, 398, 398, 1, 518400, 0xbab197ea
2013-01-01 17:51:38 +00:00
1, 79644, 79644, 2662, 2956, 0x190778f7, F=0x0
0, 399, 399, 1, 518400, 0x300b5247
2013-01-01 17:51:38 +00:00
1, 82380, 82380, 2764, 3094, 0xc021b7d3, F=0x0
0, 412, 412, 1, 518400, 0xbab197ea
0, 413, 413, 1, 518400, 0x6fd028fa
0, 426, 426, 1, 518400, 0xbab197ea
2013-01-01 17:51:38 +00:00
1, 85225, 85225, 2366, 2585, 0x74d0048f, F=0x0
0, 427, 427, 1, 518400, 0x01f80e9d
0, 438, 438, 1, 518400, 0xbab197ea
2013-01-01 17:51:38 +00:00
1, 87652, 87652, 1831, 634, 0x8832fda1, F=0x0
0, 439, 439, 1, 518400, 0xb48d90c0
0, 447, 447, 1, 518400, 0xbab197ea
2013-01-01 17:51:38 +00:00
1, 91531, 91531, 2332, 2080, 0x97a1146f, F=0x0
0, 458, 458, 1, 518400, 0xcb5a0173
0, 469, 469, 1, 518400, 0xbab197ea
2013-01-01 17:51:38 +00:00
1, 95510, 95510, 3299, 2964, 0x8b8f6684, F=0x0
0, 478, 478, 1, 518400, 0xb8a323e4
0, 494, 494, 1, 518400, 0xbab197ea
2013-01-01 17:51:38 +00:00
1, 98872, 98872, 2161, 1875, 0x9002ef71, F=0x0
0, 495, 495, 1, 518400, 0xc43518ba
0, 505, 505, 1, 518400, 0xbab197ea
2013-01-01 17:51:38 +00:00
1, 101124, 101124, 4096, 3872, 0x20c6ed9c, F=0x0
0, 506, 506, 1, 518400, 0x04e38692
0, 526, 526, 1, 518400, 0xbab197ea
2013-01-01 17:51:38 +00:00
1, 105303, 105303, 2730, 3094, 0xf203a663, F=0x0
0, 527, 527, 1, 518400, 0x856b0ee5
0, 540, 540, 1, 518400, 0xbab197ea
2013-01-01 17:51:38 +00:00
1, 108106, 108106, 2059, 2404, 0x41a7b429, F=0x0
0, 541, 541, 1, 518400, 0x3e5beee2
0, 551, 551, 1, 518400, 0xbab197ea
2013-01-01 17:51:38 +00:00
1, 141556, 141556, 1661, 1088, 0xde20aa20, F=0x0
0, 708, 708, 1, 518400, 0xb8bc1365
0, 716, 716, 1, 518400, 0xbab197ea
0, 817, 817, 1, 518400, 0x83efa32d
2013-01-01 17:51:38 +00:00
1, 163445, 163445, 1331, 339, 0x8bd186ef, F=0x0
0, 824, 824, 1, 518400, 0xbab197ea
0, 840, 840, 1, 518400, 0x03ea0e90
2013-01-01 17:51:38 +00:00
1, 168049, 168049, 1900, 1312, 0x0bf20e8d, F=0x0
0, 850, 850, 1, 518400, 0xbab197ea
1, 170035, 170035, 1524, 1279, 0xb6c2dafe, F=0x0
0, 851, 851, 1, 518400, 0x8780239e
0, 858, 858, 1, 518400, 0xbab197ea
0, 861, 861, 1, 518400, 0x6eb72347
2013-01-01 17:51:38 +00:00
1, 172203, 172203, 1695, 1826, 0x9a1ac769, F=0x0
0, 869, 869, 1, 518400, 0xbab197ea
2013-01-01 17:51:38 +00:00
1, 173947, 173947, 1934, 1474, 0xa9b03cdc, F=0x0
0, 870, 870, 1, 518400, 0x9c4a3a3d
0, 879, 879, 1, 518400, 0xbab197ea
2013-01-01 17:51:38 +00:00
1, 175957, 175957, 1763, 1019, 0x20409355, F=0x0
0, 880, 880, 1, 518400, 0xc9ebfa89
0, 889, 889, 1, 518400, 0xbab197ea
0, 946, 946, 1, 518400, 0xbaf801ef
2013-01-01 17:51:38 +00:00
1, 189295, 189295, 1968, 1596, 0x408c726e, F=0x0
0, 956, 956, 1, 518400, 0xbab197ea
2013-01-01 17:51:38 +00:00
1, 191356, 191356, 1228, 1517, 0xae8c5c2b, F=0x0
0, 957, 957, 1, 518400, 0x59f4e72f
0, 963, 963, 1, 518400, 0xbab197ea
2013-01-01 17:51:38 +00:00
1, 192640, 192640, 1763, 2506, 0xa458d6d4, F=0x0
0, 964, 964, 1, 518400, 0x9d5b9d69
0, 972, 972, 1, 518400, 0xbab197ea
2013-01-01 17:51:38 +00:00
1, 195193, 195193, 1092, 1074, 0x397ba9a8, F=0x0
0, 976, 976, 1, 518400, 0x923d1ce7
0, 981, 981, 1, 518400, 0xbab197ea
avformat/vobsub: fix several issues. Here is an extract of fate-samples/sub/vobsub.idx, with an additional text at the end of each line to better identify each bitmap: timestamp: 00:04:55:445, filepos: 00001b000 Ace! timestamp: 00:05:00:049, filepos: 00001b800 Wake up, honey! timestamp: 00:05:02:018, filepos: 00001c800 I gotta go to work. timestamp: 00:05:02:035, filepos: 00001d000 <???> timestamp: 00:05:04:203, filepos: 00001d800 Look after Clayton, okay? timestamp: 00:05:05:947, filepos: 00001e800 I'll be back tonight. timestamp: 00:05:07:957, filepos: 00001f800 Bye! Love you. timestamp: 00:05:21:295, filepos: 000020800 Hey, Ace! What's up? timestamp: 00:05:23:356, filepos: 000021800 Hey, how's it going? timestamp: 00:05:24:640, filepos: 000022800 Remember what today is? The 3rd! timestamp: 00:05:27:193, filepos: 000023800 Look over there! timestamp: 00:05:28:369, filepos: 000024800 Where are they going? timestamp: 00:05:28:361, filepos: 000025000 <???> timestamp: 00:05:29:946, filepos: 000025800 Let's go see. timestamp: 00:05:31:230, filepos: 000026000 I can't, man. I got Clayton. Note the two "<???>": they are basically split subtitles (with the previous one), which the dvdsub decoder is now supposed to reconstruct with a previous commit. But also note that while the first chunk has increasing timestamps, timestamp: 00:05:02:018, filepos: 00001c800 timestamp: 00:05:02:035, filepos: 00001d000 ...it's not the case of the second one (and this is not an exception in the original file): timestamp: 00:05:28:369, filepos: 000024800 timestamp: 00:05:28:361, filepos: 000025000 For the dvdsub decoder, they need to be "filepos'ed" ordered, but the FFDemuxSubtitlesQueue is timestamps ordered, which is the reason of the introduction of a sub sort method in the context, to allow giving priority to the position, and then the timestamps. With that change, the dvdsub decoder get fed with ordered packets. Now the packet size estimation was also broken: the filepos differences in the vobsub index defines the full data read between two subtitles chunks, and it is necessary to take into account what is read by the mpegps_read_pes_header() function since the length returned by that function doesn't count the size of the data it reads. This is fixed with the introduction of total_read, and {old,new}_pos. By doing this change, we can drop the unreliable len16 heuristic and simplify the whole loop. Note that mpegps_read_pes_header() often read more than one PES packet (typically in one call it can read 0x1ba and 0x1be chunk along with the relevant 0x1bd packet), which triggers the "total_read + pkt_size > psize" check. This is an expected behaviour, which could be avoided by having a more chunked version of mpegps_read_pes_header(). The latest change is the extraction of each stream into its own subtitles queue. If we don't do this, the maximum size for a subtitle chunk is broken, and the previous changes can not work. Having each stream in a different queue requires some little adjustments in the seek code of the demuxer. This commit is only meaningful as a whole change and can not be easily split. The FATE test changes because it uses the vobsub demuxer.
2013-09-29 20:05:14 +00:00
1, 196361, 196361, 1524, 1715, 0x695ca41e, F=0x0
0, 982, 982, 1, 518400, 0x6e652cd2
0, 989, 989, 1, 518400, 0xbab197ea
2013-01-01 17:51:38 +00:00
1, 197946, 197946, 1160, 789, 0xc63a189e, F=0x0
0, 990, 990, 1, 518400, 0x25113966
0, 996, 996, 1, 518400, 0xbab197ea
2013-01-01 17:51:38 +00:00
1, 199230, 199230, 1627, 1846, 0xeea8c599, F=0x0
0, 997, 997, 1, 518400, 0x2dc83609
0, 1004, 1004, 1, 518400, 0xbab197ea
2013-01-01 17:51:38 +00:00
1, 200924, 200924, 1763, 922, 0xd4a87222, F=0x0
0, 1005, 1005, 1, 518400, 0x90483bc6
0, 1013, 1013, 1, 518400, 0xbab197ea
0, 1053, 1053, 1, 518400, 0x3de86ab7
2013-01-01 17:51:38 +00:00
1, 210600, 210600, 1831, 665, 0x55580135, F=0x0
0, 1062, 1062, 1, 518400, 0xbab197ea
2013-01-01 17:51:38 +00:00
1, 214771, 214771, 1558, 1216, 0x50d1f6c5, F=0x0
0, 1074, 1074, 1, 518400, 0x8c320e68
0, 1082, 1082, 1, 518400, 0xbab197ea
0, 1128, 1128, 1, 518400, 0x81e977b2
2013-01-01 17:51:38 +00:00
1, 225640, 225640, 2127, 2133, 0x670c11a5, F=0x0
0, 1139, 1139, 1, 518400, 0xbab197ea
1, 227834, 227834, 1262, 1264, 0xc1d9fc57, F=0x0
0, 1140, 1140, 1, 518400, 0xb046dd30
0, 1145, 1145, 1, 518400, 0xbab197ea