mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
96e5e6abb9
The patch will make audio and subtitle packets be marked as AV_PKT_FLAG_KEY. For audio, it'll caused the audio sample to be sync sample. To verify ref/fate/movenc results: 1. Get the movenc test data [lmwang@vpn ffmpeg]$ libavformat/tests/movenc -w && mkdir -p audio_old && mv *.mp4 audio_old_ After applied the patch: [lmwang@vpn ffmpeg]$ make fate-movenc SAMPLES=../fate-suite [lmwang@vpn ffmpeg]$ libavformat/tests/movenc -w && mkdir -p audio_key && mv *.mp4 audio_key 2. Get l-smash and build boxdumper https://github.com/l-smash/l-smash.git 3. dump the box of crc change mp4 and diff -u [lmwang@vpn ffmpeg]$ ../l-smash/cli/boxdumper --box audio_key/non-empty-moov-no-elst.mp4 > audio_key/non-empty-moov-no-elst.log [lmwang@vpn ffmpeg]$ ../l-smash/cli/boxdumper --box audio_old/non-empty-moov-no-elst.mp4 > audio_old/non-empty-moov-no-elst.log [lmwang@vpn ffmpeg]$ diff -u audio_key/non-empty-moov-no-elst.log audio_old/non-empty-moov-no-elst.log - default_sample_flags = 0x02000000 - independent - sync sample + default_sample_flags = 0x01010000 + dependent + non-sync sample 4. have checked the change of crc are caused by default_sample_flags non-empty-moov.mp4, non-empty-moov-elst.mp4, non-empty-moov-no-elst.mp4, empty-moov.mp4, delay-moov-content.mp4, empty-moov-second-frag.mp4, empty-moov-second-frag-discont.mp4, delay-moov-second-frag-discont.mp4, delay-moov-elst-second-frag.mp4 etc 5 For subtitle, it'll effect for tests/ref/fate/binsub-movtextenc and tests/ref/fate/sub2video, that's expecting result for the subtitle is marked as keyframe. Below is the checking result of binsub-movtextenc: [lmwang@vpn ffmpeg]$ ./ffmpeg -i ../fate-suite/sub/MovText_capability_tester.mp4 -map 0 -scodec mov_text -f mp4 -flags +bitexact -fflags +bitexact -movflags frag_keyframe+empty_moov audio_key/binsub-movtextenc.mp4 [lmwang@vpn ffmpeg]$ ./ffmpeg -i ../fate-suite/sub/MovText_capability_tester.mp4 -map 0 -scodec mov_text -f mp4 -flags +bitexact -fflags +bitexact -movflags frag_keyframe+empty_moov audio_old/binsub-movtextenc.mp4 [lmwang@vpn ffmpeg]$../l-smash/cli/boxdumper audio_key/binsub-movtextenc.mp4 > audio_key/binsub-movtextenc.log [lmwang@vpn ffmpeg]$../l-smash/cli/boxdumper audio_old/binsub-movtextenc.mp4 > audio_old/binsub-movtextenc.log [lmwang@vpn ffmpeg]$ diff -u audio_key/binsub-movtextenc.log audio_old/binsub-movtextenc.log .... // the key difference is the flag for sync sample - flags = 0x000701 + flags = 0x000301 data-offset-present sample-duration-present sample-size-present - sample-flags-present sample_count = 6 - data_offset = 188 + data_offset = 164 sample[0] sample_duration = 1570000 sample_size = 21 - sample_flags = 0x02000000 - independent - sync sample - degradation_priority = 0 sample[1] sample_duration = 510000 sample_size = 2 - sample_flags = 0x01010000 - dependent - non-sync sample - degradation_priority = 0 sample[2] sample_duration = 1690000 sample_size = 9 - sample_flags = 0x02000000 - independent - sync sample - degradation_priority = 0 Suggested-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com> Suggested-by: Nicolas George <george@nsup.org> Signed-off-by: Limin Wang <lance.lmwang@gmail.com>
187 lines
10 KiB
Plaintext
187 lines
10 KiB
Plaintext
#extradata 1: 150, 0x7c99258b
|
|
#tb 0: 1/5
|
|
#media_type 0: video
|
|
#codec_id 0: rawvideo
|
|
#dimensions 0: 720x480
|
|
#sar 0: 0/1
|
|
#tb 1: 1/1000000
|
|
#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
|
|
1, 499000, 499000, 4960000, 1015, 0x19e092d2
|
|
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
|
|
1, 15355000, 15355000, 4733000, 2094, 0x3c171425
|
|
0, 77, 77, 1, 518400, 0x902285d9
|
|
0, 100, 100, 1, 518400, 0xbab197ea
|
|
1, 48797000, 48797000, 2560000, 2480, 0x7c0edf21
|
|
0, 244, 244, 1, 518400, 0x7a11c812
|
|
0, 257, 257, 1, 518400, 0xbab197ea
|
|
1, 51433000, 51433000, 2366000, 3059, 0xc95b8a05
|
|
0, 258, 258, 1, 518400, 0x34cdddee
|
|
0, 269, 269, 1, 518400, 0xbab197ea
|
|
1, 53910000, 53910000, 2696000, 2095, 0x61bb15ed
|
|
0, 270, 270, 1, 518400, 0x4db4ce51
|
|
0, 283, 283, 1, 518400, 0xbab197ea
|
|
1, 56663000, 56663000, 1262000, 1013, 0xc9ae89b7
|
|
0, 284, 284, 1, 518400, 0xe6bc0ea9
|
|
0, 290, 290, 1, 518400, 0xbab197ea
|
|
1, 58014000, 58014000, 1661000, 969, 0xe01878f0
|
|
0, 291, 291, 1, 518400, 0xa8643af7
|
|
0, 298, 298, 1, 518400, 0xbab197ea
|
|
1, 67724000, 67724000, 1365000, 844, 0xe7db4fc1
|
|
0, 339, 339, 1, 518400, 0xb1885c67
|
|
0, 345, 345, 1, 518400, 0xbab197ea
|
|
1, 69175000, 69175000, 1558000, 802, 0xf48531ba
|
|
0, 346, 346, 1, 518400, 0x378e3fd0
|
|
0, 354, 354, 1, 518400, 0xbab197ea
|
|
1, 70819000, 70819000, 1865000, 1709, 0xb4d5a1bd
|
|
0, 355, 355, 1, 518400, 0xa3782469
|
|
0, 363, 363, 1, 518400, 0xbab197ea
|
|
1, 72762000, 72762000, 1968000, 2438, 0x99d7bc82
|
|
0, 364, 364, 1, 518400, 0xba23a0d5
|
|
0, 374, 374, 1, 518400, 0xbab197ea
|
|
1, 74806000, 74806000, 1831000, 2116, 0x96514097
|
|
0, 375, 375, 1, 518400, 0x129de2f8
|
|
0, 383, 383, 1, 518400, 0xbab197ea
|
|
1, 76716000, 76716000, 1262000, 1822, 0xefccc72e
|
|
0, 384, 384, 1, 518400, 0x19772f0f
|
|
0, 390, 390, 1, 518400, 0xbab197ea
|
|
1, 78051000, 78051000, 1524000, 987, 0x7b927a27
|
|
0, 391, 391, 1, 518400, 0x56f54e73
|
|
0, 398, 398, 1, 518400, 0xbab197ea
|
|
1, 79644000, 79644000, 2662000, 2956, 0x190778f7
|
|
0, 399, 399, 1, 518400, 0x300b5247
|
|
1, 82380000, 82380000, 2764000, 3094, 0xc021b7d3
|
|
0, 412, 412, 1, 518400, 0xbab197ea
|
|
0, 413, 413, 1, 518400, 0x6fd028fa
|
|
0, 426, 426, 1, 518400, 0xbab197ea
|
|
1, 85225000, 85225000, 2366000, 2585, 0x74d0048f
|
|
0, 427, 427, 1, 518400, 0x01f80e9d
|
|
0, 438, 438, 1, 518400, 0xbab197ea
|
|
1, 87652000, 87652000, 1831000, 634, 0x8832fda1
|
|
0, 439, 439, 1, 518400, 0xb48d90c0
|
|
0, 447, 447, 1, 518400, 0xbab197ea
|
|
1, 91531000, 91531000, 2332000, 2080, 0x97a1146f
|
|
0, 458, 458, 1, 518400, 0xcb5a0173
|
|
0, 469, 469, 1, 518400, 0xbab197ea
|
|
1, 95510000, 95510000, 3299000, 2964, 0x8b8f6684
|
|
0, 478, 478, 1, 518400, 0xb8a323e4
|
|
0, 494, 494, 1, 518400, 0xbab197ea
|
|
1, 98872000, 98872000, 2161000, 1875, 0x9002ef71
|
|
0, 495, 495, 1, 518400, 0xc43518ba
|
|
0, 505, 505, 1, 518400, 0xbab197ea
|
|
1, 101124000, 101124000, 4096000, 3872, 0x20c6ed9c
|
|
0, 506, 506, 1, 518400, 0x04e38692
|
|
0, 526, 526, 1, 518400, 0xbab197ea
|
|
1, 105303000, 105303000, 2730000, 3094, 0xf203a663
|
|
0, 527, 527, 1, 518400, 0x856b0ee5
|
|
0, 540, 540, 1, 518400, 0xbab197ea
|
|
1, 108106000, 108106000, 2059000, 2404, 0x41a7b429
|
|
0, 541, 541, 1, 518400, 0x3e5beee2
|
|
0, 551, 551, 1, 518400, 0xbab197ea
|
|
1, 141556000, 141556000, 1661000, 1088, 0xde20aa20
|
|
0, 708, 708, 1, 518400, 0xb8bc1365
|
|
0, 716, 716, 1, 518400, 0xbab197ea
|
|
0, 817, 817, 1, 518400, 0x83efa32d
|
|
1, 163445000, 163445000, 1331000, 339, 0x8bd186ef
|
|
0, 824, 824, 1, 518400, 0xbab197ea
|
|
0, 840, 840, 1, 518400, 0x03ea0e90
|
|
1, 168049000, 168049000, 1900000, 1312, 0x0bf20e8d
|
|
0, 850, 850, 1, 518400, 0xbab197ea
|
|
1, 170035000, 170035000, 1524000, 1279, 0xb6c2dafe
|
|
0, 851, 851, 1, 518400, 0x8780239e
|
|
0, 858, 858, 1, 518400, 0xbab197ea
|
|
0, 861, 861, 1, 518400, 0x6eb72347
|
|
1, 172203000, 172203000, 1695000, 1826, 0x9a1ac769
|
|
0, 869, 869, 1, 518400, 0xbab197ea
|
|
1, 173947000, 173947000, 1934000, 1474, 0xa9b03cdc
|
|
0, 870, 870, 1, 518400, 0x9c4a3a3d
|
|
0, 879, 879, 1, 518400, 0xbab197ea
|
|
1, 175957000, 175957000, 1763000, 1019, 0x20409355
|
|
0, 880, 880, 1, 518400, 0xc9ebfa89
|
|
0, 889, 889, 1, 518400, 0xbab197ea
|
|
0, 946, 946, 1, 518400, 0xbaf801ef
|
|
1, 189295000, 189295000, 1968000, 1596, 0x408c726e
|
|
0, 956, 956, 1, 518400, 0xbab197ea
|
|
1, 191356000, 191356000, 1228000, 1517, 0xae8c5c2b
|
|
0, 957, 957, 1, 518400, 0x59f4e72f
|
|
0, 963, 963, 1, 518400, 0xbab197ea
|
|
1, 192640000, 192640000, 1763000, 2506, 0xa458d6d4
|
|
0, 964, 964, 1, 518400, 0x9d5b9d69
|
|
0, 972, 972, 1, 518400, 0xbab197ea
|
|
1, 195193000, 195193000, 1092000, 1074, 0x397ba9a8
|
|
0, 976, 976, 1, 518400, 0x923d1ce7
|
|
0, 981, 981, 1, 518400, 0xbab197ea
|
|
1, 196361000, 196361000, 1524000, 1715, 0x695ca41e
|
|
0, 982, 982, 1, 518400, 0x6e652cd2
|
|
0, 989, 989, 1, 518400, 0xbab197ea
|
|
1, 197946000, 197946000, 1160000, 789, 0xc63a189e
|
|
0, 990, 990, 1, 518400, 0x25113966
|
|
0, 996, 996, 1, 518400, 0xbab197ea
|
|
1, 199230000, 199230000, 1627000, 1846, 0xeea8c599
|
|
0, 997, 997, 1, 518400, 0x2dc83609
|
|
0, 1004, 1004, 1, 518400, 0xbab197ea
|
|
1, 200924000, 200924000, 1763000, 922, 0xd4a87222
|
|
0, 1005, 1005, 1, 518400, 0x90483bc6
|
|
0, 1013, 1013, 1, 518400, 0xbab197ea
|
|
0, 1053, 1053, 1, 518400, 0x3de86ab7
|
|
1, 210600000, 210600000, 1831000, 665, 0x55580135
|
|
0, 1062, 1062, 1, 518400, 0xbab197ea
|
|
1, 214771000, 214771000, 1558000, 1216, 0x50d1f6c5
|
|
0, 1074, 1074, 1, 518400, 0x8c320e68
|
|
0, 1082, 1082, 1, 518400, 0xbab197ea
|
|
0, 1128, 1128, 1, 518400, 0x81e977b2
|
|
1, 225640000, 225640000, 2127000, 2133, 0x670c11a5
|
|
0, 1139, 1139, 1, 518400, 0xbab197ea
|
|
1, 227834000, 227834000, 1262000, 1264, 0xc1d9fc57
|
|
0, 1140, 1140, 1, 518400, 0xb046dd30
|
|
0, 1145, 1145, 1, 518400, 0xbab197ea
|