@@ -1,5 +1,10 @@
FATE_FLVENC_FFMPEG_FFPROBE-$(call TRANSCODE, FLV, FLV, RAWVIDEO_DECODER SCALE_FILTER TESTSRC_FILTER LAVFI_INDEV) += fate-flv-add_keyframe_index
fate-flv-add_keyframe_index: CMD = transcode "lavfi -graph testsrc=r=7:n=2:d=20" "foo" flv "-vf scale -c:v flv1 -dct int -g 7 -flvflags add_keyframe_index" "-c copy -t 0.1" "-show_entries format_tags"
+FATE_ENHANCED_FLVENC_FFMPEG-$(call REMUX, FLV MOV, FLV_DEMUXER HEVC_PARSER) += fate-enhanced-flv-hevc
+fate-enhanced-flv-hevc: CMD = transcode mov $(TARGET_SAMPLES)/hevc/dv84.mov\
+ flv "-c copy" "-c copy"
+
FATE_FFMPEG_FFPROBE += $(FATE_FLVENC_FFMPEG_FFPROBE-yes)
-fate-flvenc: $(FATE_FLVENC_FFMPEG_FFPROBE-yes)
+FATE_SAMPLES_FFMPEG += $(FATE_ENHANCED_FLVENC_FFMPEG-yes)
+fate-flvenc: $(FATE_FLVENC_FFMPEG_FFPROBE-yes) $(FATE_ENHANCED_FLVENC_FFMPEG-yes)
new file mode 100644
@@ -0,0 +1,258 @@
+25fb1fcdcfde498ab86a3387f1a7f833 *tests/data/fate/enhanced-flv-hevc.flv
+3602897 tests/data/fate/enhanced-flv-hevc.flv
+#extradata 0: 551, 0xa18acf66
+#extradata 1: 2, 0x00340022
+#tb 0: 1/1000
+#media_type 0: video
+#codec_id 0: hevc
+#dimensions 0: 1920x1080
+#sar 0: 0/1
+#tb 1: 1/1000
+#media_type 1: audio
+#codec_id 1: aac
+#sample_rate 1: 44100
+#channel_layout_name 1: stereo
+0, -68, 0, 33, 63375, 0xc76606ab
+0, -35, 133, 33, 46706, 0x0e08a7e5, F=0x0
+0, -2, 67, 33, 29766, 0x753c031a, F=0x0
+1, 0, 0, 23, 6, 0x031e0108
+1, 23, 23, 23, 251, 0x6b4a7cbd
+0, 32, 33, 33, 19409, 0x4b948b6c, F=0x0
+1, 46, 46, 23, 389, 0x6673c205
+0, 65, 100, 33, 21086, 0x1b9412ce, F=0x0
+1, 70, 70, 23, 356, 0x8c71a316
+1, 93, 93, 23, 339, 0x3018a45a
+0, 98, 267, 33, 62043, 0xc2356b56, F=0x0
+1, 116, 116, 23, 405, 0xc89ebe05
+0, 132, 200, 33, 36175, 0x0a7df38c, F=0x0
+1, 139, 139, 23, 449, 0x42eadf96
+1, 163, 163, 23, 416, 0x28a7c9b9
+0, 165, 167, 33, 16028, 0xa57fcbe9, F=0x0
+1, 186, 186, 23, 426, 0x9a74d4ec
+0, 198, 233, 33, 15428, 0x9a91f357, F=0x0
+1, 209, 209, 23, 419, 0xbe3dc54b
+0, 232, 400, 33, 66072, 0xa542b6d7, F=0x0
+1, 232, 232, 23, 424, 0x5102d50e
+1, 255, 255, 23, 402, 0xb11cc14c
+0, 265, 333, 33, 34985, 0xbfd8ff45, F=0x0
+1, 279, 279, 23, 401, 0x3820b8f9
+0, 298, 300, 33, 16036, 0xfc39c6ea, F=0x0
+1, 302, 302, 23, 400, 0xe5c4c168
+1, 325, 325, 23, 435, 0x6dbecc33
+0, 332, 367, 33, 19893, 0x7e746f4e, F=0x0
+1, 348, 348, 23, 441, 0x0ad3d199
+0, 365, 533, 33, 77576, 0xeba2e5c8, F=0x0
+1, 372, 372, 23, 479, 0x44dce967
+1, 395, 395, 23, 439, 0x7d85e4c9
+0, 398, 467, 33, 35400, 0xbe179462, F=0x0
+1, 418, 418, 23, 461, 0xca18e36b
+0, 432, 433, 33, 15962, 0x7703dcd8, F=0x0
+1, 441, 441, 23, 498, 0xf73befd7
+1, 464, 464, 23, 469, 0x0119e958
+0, 465, 500, 33, 16136, 0x78a74880, F=0x0
+1, 488, 488, 23, 472, 0x4980e108
+0, 498, 667, 33, 74990, 0xb6fc1da7, F=0x0
+1, 511, 511, 23, 488, 0x42baeb77
+0, 532, 600, 33, 36594, 0xc3c61c3e, F=0x0
+1, 534, 534, 23, 458, 0x2198dde8
+1, 557, 557, 23, 430, 0x0858cc8f
+0, 565, 567, 33, 16524, 0xb297a886, F=0x0
+1, 580, 580, 23, 464, 0x9590e068
+0, 598, 633, 33, 17033, 0x31b3dd63, F=0x0
+1, 604, 604, 23, 415, 0xf926cf5f
+1, 627, 627, 23, 429, 0xf4a4d6c3
+0, 632, 800, 33, 66745, 0x5edee4b1, F=0x0
+1, 650, 650, 23, 420, 0xb64ac826
+0, 665, 733, 33, 37648, 0x540b100f, F=0x0
+1, 673, 673, 23, 442, 0xae2fd0ef
+1, 697, 697, 23, 426, 0xf1b7ccff
+0, 698, 700, 33, 16363, 0x569798e5, F=0x0
+1, 720, 720, 23, 435, 0xd3a1cb35
+0, 732, 767, 33, 17112, 0x9f04002b, F=0x0
+1, 743, 743, 23, 424, 0xc204c05d
+0, 765, 933, 33, 69462, 0x6ed4d0a2, F=0x0
+1, 766, 766, 23, 448, 0x3a3adc76
+1, 789, 789, 23, 451, 0x6a1bd675
+0, 798, 867, 33, 34772, 0x2baa0683, F=0x0
+1, 813, 813, 23, 440, 0x6219d30d
+0, 832, 833, 33, 14301, 0x8d69c797, F=0x0
+1, 836, 836, 23, 438, 0xb55dd535
+1, 859, 859, 23, 412, 0xd591ccfd
+0, 865, 900, 33, 16355, 0x1ebb9962, F=0x0
+1, 882, 882, 23, 419, 0x1069d097
+0, 898, 1067, 33, 107788, 0xcf28b065
+1, 906, 906, 23, 407, 0x1a3ec967
+1, 929, 929, 23, 400, 0x4ca1c7e9
+0, 932, 1000, 33, 35514, 0xa824dec0, F=0x0
+1, 952, 952, 23, 465, 0x8dbbdfa5
+0, 965, 967, 33, 15937, 0x8c06a068, F=0x0
+1, 975, 975, 23, 444, 0xed1cd498
+0, 998, 1033, 33, 15936, 0x1a01f3e9, F=0x0
+1, 998, 998, 23, 414, 0xada6c395
+1, 1022, 1022, 23, 419, 0x7d64d269
+0, 1032, 1202, 33, 79014, 0xef4c241e, F=0x0
+1, 1045, 1045, 23, 415, 0xf2e5c75d
+0, 1065, 1133, 33, 37293, 0xb32c9665, F=0x0
+1, 1068, 1068, 23, 431, 0xeae2d257
+1, 1091, 1091, 23, 437, 0x10c1cfa6
+0, 1100, 1100, 33, 12826, 0xddc8ba8d, F=0x0
+1, 1115, 1115, 23, 428, 0x9b18ce7e
+0, 1133, 1168, 33, 13376, 0x76fbc02f, F=0x0
+1, 1138, 1138, 23, 426, 0xec1bce70
+1, 1161, 1161, 23, 433, 0xad18d26f
+0, 1167, 1335, 33, 68959, 0x5fdeaeac, F=0x0
+1, 1184, 1184, 23, 419, 0x99beccaf
+0, 1200, 1268, 33, 35503, 0x15dbf810, F=0x0
+1, 1207, 1207, 23, 422, 0x38add249
+1, 1231, 1231, 23, 335, 0x243499db
+0, 1233, 1235, 33, 12298, 0xbc12d96e, F=0x0
+1, 1254, 1254, 23, 427, 0x614fccd2
+0, 1267, 1302, 33, 16357, 0x3bb3e5c9, F=0x0
+1, 1277, 1277, 23, 434, 0xd97acebe
+0, 1300, 1468, 33, 69872, 0x643e0e8a, F=0x0
+1, 1300, 1300, 23, 427, 0x0a24cf66
+1, 1324, 1324, 23, 406, 0x868bc306
+0, 1333, 1402, 33, 35059, 0xab5881c4, F=0x0
+1, 1347, 1347, 23, 410, 0x32c4cd52
+0, 1367, 1368, 33, 17718, 0xe78b5150, F=0x0
+1, 1370, 1370, 23, 416, 0xbd3dcaa5
+1, 1393, 1393, 23, 420, 0x42c5ccf6
+0, 1400, 1435, 33, 17264, 0xd5297233, F=0x0
+1, 1416, 1416, 23, 437, 0xe302cd64
+0, 1433, 1602, 33, 68258, 0xea19d5bb, F=0x0
+1, 1440, 1440, 23, 444, 0xdc1ad47f
+1, 1463, 1463, 23, 472, 0xc314e301
+0, 1467, 1535, 33, 34019, 0x1c25277c, F=0x0
+1, 1486, 1486, 23, 466, 0xdb51e992
+0, 1500, 1502, 33, 16085, 0xfc5f1909, F=0x0
+1, 1509, 1509, 23, 425, 0x35b6c4be
+0, 1533, 1568, 33, 17133, 0xccd80c32, F=0x0
+1, 1533, 1533, 23, 429, 0xd479cc89
+1, 1556, 1556, 23, 424, 0x0994cbfa
+0, 1567, 1735, 33, 65478, 0x92adbcf5, F=0x0
+1, 1579, 1579, 23, 424, 0x1145cad4
+0, 1600, 1668, 33, 35702, 0x85da366e, F=0x0
+1, 1602, 1602, 23, 417, 0x0cb5c9d6
+1, 1625, 1625, 23, 425, 0xd316c722
+0, 1633, 1635, 33, 17729, 0x7c6037dd, F=0x0
+1, 1649, 1649, 23, 412, 0x97d8c424
+0, 1667, 1702, 33, 16400, 0x07509624, F=0x0
+1, 1672, 1672, 23, 422, 0x444ad135
+1, 1695, 1695, 23, 436, 0x0575c48b
+0, 1700, 1868, 33, 65450, 0xc93a8591, F=0x0
+1, 1718, 1718, 23, 418, 0xdd73c42f
+0, 1733, 1802, 33, 30572, 0xe4892d21, F=0x0
+1, 1741, 1741, 23, 412, 0x64d0c0cd
+1, 1765, 1765, 23, 417, 0xf7e3cc8d
+0, 1767, 1768, 33, 16836, 0x34466a29, F=0x0
+1, 1788, 1788, 23, 414, 0xef17ca47
+0, 1800, 1835, 33, 16615, 0x06f42746, F=0x0
+1, 1811, 1811, 23, 420, 0x86f5d28f
+0, 1833, 2002, 33, 61621, 0x455e8141, F=0x0
+1, 1834, 1834, 23, 415, 0x73dec27c
+1, 1858, 1858, 23, 451, 0x62abdbfb
+0, 1867, 1935, 33, 35393, 0x91e3f353, F=0x0
+1, 1881, 1881, 23, 511, 0xbb42f40b
+0, 1900, 1902, 33, 16421, 0xb5a4a3fd, F=0x0
+1, 1904, 1904, 23, 470, 0xe422df11
+1, 1927, 1927, 23, 459, 0x7c24e067
+0, 1933, 1968, 33, 15874, 0x8a12e636, F=0x0
+1, 1950, 1950, 23, 464, 0xb1a5ebf6
+0, 1967, 2135, 33, 108249, 0x74b9d9a5
+1, 1974, 1974, 23, 435, 0x7acbd073
+1, 1997, 1997, 23, 475, 0x9498e6ff
+0, 2000, 2068, 33, 32427, 0x1b4e36e9, F=0x0
+1, 2020, 2020, 23, 473, 0xf42ddcb4
+0, 2033, 2035, 33, 15263, 0xc96d6375, F=0x0
+1, 2043, 2043, 23, 439, 0x898ad0ed
+0, 2067, 2102, 33, 15124, 0x24bf4865, F=0x0
+1, 2067, 2067, 23, 483, 0x94f5e826
+1, 2090, 2090, 23, 474, 0x80b8f7ad
+0, 2100, 2268, 33, 66156, 0x9536eb3a, F=0x0
+1, 2113, 2113, 23, 495, 0xd027e373
+0, 2133, 2202, 33, 33590, 0x12693d54, F=0x0
+1, 2136, 2136, 23, 479, 0x4841ea3d
+1, 2159, 2159, 23, 446, 0x0b64d3e2
+0, 2167, 2168, 33, 15633, 0xa1f67306, F=0x0
+1, 2183, 2183, 23, 464, 0xc939de26
+0, 2200, 2235, 33, 16075, 0x1ee82b38, F=0x0
+1, 2206, 2206, 23, 457, 0xc069e099
+1, 2229, 2229, 23, 451, 0x2f22d7a1
+0, 2233, 2402, 33, 63442, 0xb508621f, F=0x0
+1, 2252, 2252, 23, 475, 0x4de7e675
+0, 2267, 2335, 33, 35773, 0xa79485e3, F=0x0
+1, 2276, 2276, 23, 464, 0x430de113
+1, 2299, 2299, 23, 428, 0x6546c66d
+0, 2300, 2302, 33, 16970, 0x6fcf7d2c, F=0x0
+1, 2322, 2322, 23, 455, 0xb5e5db4f
+0, 2333, 2368, 33, 17773, 0x3a10880d, F=0x0
+1, 2345, 2345, 23, 493, 0xae57eafd
+0, 2367, 2535, 33, 66942, 0x91535a55, F=0x0
+1, 2368, 2368, 23, 448, 0xa170db5e
+1, 2392, 2392, 23, 419, 0x0bfec67f
+0, 2400, 2468, 33, 36289, 0xd1337338, F=0x0
+1, 2415, 2415, 23, 406, 0x2e33d13b
+0, 2433, 2435, 33, 16878, 0x0c83a101, F=0x0
+1, 2438, 2438, 23, 395, 0x0ef7c208
+1, 2461, 2461, 23, 397, 0x736fc48d
+0, 2467, 2502, 33, 17452, 0x8c3cb218, F=0x0
+1, 2485, 2485, 23, 463, 0x6397def2
+0, 2500, 2668, 33, 64256, 0x2243ae19, F=0x0
+1, 2508, 2508, 23, 414, 0x4c5fc473
+1, 2531, 2531, 23, 426, 0x7028d53d
+0, 2533, 2602, 33, 33995, 0x3634ef46, F=0x0
+1, 2554, 2554, 23, 382, 0x7344b178
+0, 2567, 2568, 33, 17505, 0xb70bdaef, F=0x0
+1, 2577, 2577, 23, 400, 0x17ecb9e3
+0, 2600, 2635, 33, 17420, 0x0a39d08d, F=0x0
+1, 2601, 2601, 23, 384, 0x40cfba37
+1, 2624, 2624, 23, 420, 0xb01cce29
+0, 2633, 2802, 33, 64814, 0x52eba8da, F=0x0
+1, 2647, 2647, 23, 443, 0x2b15dd89
+0, 2667, 2735, 33, 35168, 0x3bae1145, F=0x0
+1, 2670, 2670, 23, 456, 0xf875e323
+1, 2694, 2694, 23, 448, 0x190fd804
+0, 2700, 2702, 33, 18363, 0x5aac8d0b, F=0x0
+1, 2717, 2717, 23, 408, 0x54f8c9ae
+0, 2733, 2768, 33, 18577, 0x3ef410e2, F=0x0
+1, 2740, 2740, 23, 404, 0x6812c0cc
+1, 2763, 2763, 23, 457, 0x9618e228
+0, 2767, 2935, 33, 65960, 0xd928efea, F=0x0
+1, 2786, 2786, 23, 470, 0x3371e47e
+0, 2800, 2868, 33, 35750, 0x1e6b3528, F=0x0
+1, 2810, 2810, 23, 476, 0x3e0dea61
+0, 2833, 2835, 33, 18109, 0x04a60f42, F=0x0
+1, 2833, 2833, 23, 438, 0x7e1aca04
+1, 2856, 2856, 23, 468, 0xe22de588
+0, 2867, 2902, 33, 18965, 0xce88b8c2, F=0x0
+1, 2879, 2879, 23, 448, 0xf820d2df
+0, 2900, 3068, 33, 64413, 0x0e2a7b8d, F=0x0
+1, 2902, 2902, 23, 446, 0x4346da55
+1, 2926, 2926, 23, 413, 0x8091c5e5
+0, 2933, 3002, 33, 36536, 0x1b69fcc7, F=0x0
+1, 2949, 2949, 23, 447, 0x799cdff9
+0, 2967, 2968, 33, 16823, 0xc226cdd8, F=0x0
+1, 2972, 2972, 23, 485, 0x61f0e3ee
+1, 2995, 2995, 23, 446, 0x09aad595
+0, 3000, 3035, 33, 18254, 0xe28d2b32, F=0x0
+1, 3019, 3019, 23, 503, 0x5ff6f1bd
+0, 3033, 3202, 33, 108398, 0x04e8955a
+1, 3042, 3042, 23, 481, 0x680bf2ff
+1, 3065, 3065, 23, 481, 0x77e1e3eb
+0, 3067, 3135, 33, 39214, 0xc82d25cc, F=0x0
+1, 3088, 3088, 23, 500, 0xf446f43a
+0, 3100, 3102, 33, 17093, 0x81e01006, F=0x0
+1, 3111, 3111, 23, 503, 0x5a21f932
+0, 3133, 3168, 33, 16220, 0xb8b86777, F=0x0
+1, 3135, 3135, 23, 443, 0x503bd45b
+1, 3158, 3158, 23, 443, 0xb652e056
+0, 3167, 3302, 33, 60533, 0xc63d4419, F=0x0
+1, 3181, 3181, 23, 441, 0xb0bbdc3e
+0, 3200, 3268, 33, 27638, 0xcd9cb6d0, F=0x0
+1, 3204, 3204, 23, 410, 0xa2aeb940
+1, 3228, 3228, 23, 430, 0x9b32d228
+0, 3233, 3235, 33, 16528, 0x5e9dc6fd, F=0x0
+1, 3251, 3251, 23, 406, 0xd3ccc550
+1, 3274, 3274, 23, 397, 0xcf2bc6d6
+1, 3297, 3297, 23, 411, 0xecf7bf70
+1, 3320, 3320, 23, 403, 0x4a35c58a
Signed-off-by: Steven Liu <lq@chinaffmpeg.org> --- tests/fate/flvenc.mak | 7 +- tests/ref/fate/enhanced-flv-hevc | 258 +++++++++++++++++++++++++++++++ 2 files changed, 264 insertions(+), 1 deletion(-) create mode 100644 tests/ref/fate/enhanced-flv-hevc