mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2025-12-05 14:30:00 +01:00
3d96d83a0a
Commit ba4b73c977 caused a regression in
the usage of avg_frame_rate to detect the frame rate of raw h264/hevc
bitstreams: after the commit, avg_frame_rate is always the value of the
-framerate option (which is set to 25 by default) instead of the actual
frame rate derived from the bitstream SPS/VPS NALUs.
This commit fixes the regression by setting the framerate codec
parameter to the value of the framerate option instead. After this
change, bitstreams without timing information will derive avg_frame_rate
from the -framerate option, while bitstreams with timing information
will derive avg_frame_rate from the bitstream itself.
The h264-bsf-dts2pts test now returns the correct frame durations for a
bitstream with a mix of single-field and double-field frames.
Signed-off-by: Gavin Li <git@thegavinli.com>
Signed-off-by: James Almer <jamrial@gmail.com>
89 lines
5.3 KiB
Plaintext
89 lines
5.3 KiB
Plaintext
f6102684fbf13aa624e6edece38c83f2 *tests/data/fate/hevc-bsf-dts2pts-cra.mov
|
|
102971 tests/data/fate/hevc-bsf-dts2pts-cra.mov
|
|
#extradata 0: 118, 0x25f51994
|
|
#tb 0: 1/1200000
|
|
#media_type 0: video
|
|
#codec_id 0: hevc
|
|
#dimensions 0: 416x240
|
|
#sar 0: 0/1
|
|
0, -144000, 336000, 48000, 7990, 0xc6026e64
|
|
0, -96000, 144000, 48000, 1765, 0xc816635b, F=0x0
|
|
0, -48000, 48000, 48000, 894, 0x428fbdff, F=0x0
|
|
0, 0, 0, 48000, 297, 0x9dd28986, F=0x0
|
|
0, 48000, 96000, 48000, 246, 0x3b5878bd, F=0x0
|
|
0, 96000, 240000, 48000, 972, 0xf1dbe630, F=0x0
|
|
0, 144000, 192000, 48000, 238, 0xbdda7a15, F=0x0
|
|
0, 192000, 288000, 48000, 326, 0x85fa9eb7, F=0x0
|
|
0, 240000, 720000, 48000, 5269, 0x02a83809, F=0x0
|
|
0, 288000, 528000, 48000, 1857, 0xe9f8a77e, F=0x0
|
|
0, 336000, 432000, 48000, 1054, 0x10b70755, F=0x0
|
|
0, 384000, 384000, 48000, 360, 0xe04cbda9, F=0x0
|
|
0, 432000, 480000, 48000, 361, 0x4e05aff5, F=0x0
|
|
0, 480000, 624000, 48000, 1015, 0x3da8ec98, F=0x0
|
|
0, 528000, 576000, 48000, 349, 0x27daadf4, F=0x0
|
|
0, 576000, 672000, 48000, 319, 0x672c9699, F=0x0
|
|
0, 624000, 1104000, 48000, 4491, 0x32eca7c6, F=0x0
|
|
0, 672000, 912000, 48000, 1858, 0x3039994f, F=0x0
|
|
0, 720000, 816000, 48000, 1016, 0xe6010553, F=0x0
|
|
0, 768000, 768000, 48000, 356, 0x5344a6ca, F=0x0
|
|
0, 816000, 864000, 48000, 323, 0xf76d9d30, F=0x0
|
|
0, 864000, 1008000, 48000, 1019, 0x4c8c06d2, F=0x0
|
|
0, 912000, 960000, 48000, 301, 0x0f1d8f43, F=0x0
|
|
0, 960000, 1056000, 48000, 307, 0x341897cb, F=0x0
|
|
0, 1008000, 1488000, 48000, 4275, 0x77a96a7d, F=0x0
|
|
0, 1056000, 1296000, 48000, 1644, 0xc86d3753, F=0x0
|
|
0, 1104000, 1200000, 48000, 853, 0xb3a1a7f4, F=0x0
|
|
0, 1152000, 1152000, 48000, 309, 0x5e4a9840, F=0x0
|
|
0, 1200000, 1248000, 48000, 242, 0x30db7905, F=0x0
|
|
0, 1248000, 1392000, 48000, 960, 0x6b42e74d, F=0x0
|
|
0, 1296000, 1344000, 48000, 279, 0x3ed281a7, F=0x0
|
|
0, 1344000, 1440000, 48000, 261, 0xb6698462, F=0x0
|
|
0, 1392000, 1872000, 48000, 6940, 0x7ab8531d
|
|
0, 1440000, 1680000, 48000, 1904, 0x7eb9c679, F=0x0
|
|
0, 1488000, 1584000, 48000, 993, 0x11d9e429, F=0x0
|
|
0, 1536000, 1536000, 48000, 253, 0x08417a25, F=0x0
|
|
0, 1584000, 1632000, 48000, 329, 0x136ca4a1, F=0x0
|
|
0, 1632000, 1776000, 48000, 949, 0xdfaed80a, F=0x0
|
|
0, 1680000, 1728000, 48000, 283, 0x81f686c2, F=0x0
|
|
0, 1728000, 1824000, 48000, 274, 0x81138813, F=0x0
|
|
0, 1776000, 2256000, 48000, 4940, 0x92098d44, F=0x0
|
|
0, 1824000, 2064000, 48000, 1583, 0x25a61e94, F=0x0
|
|
0, 1872000, 1968000, 48000, 909, 0x41fdb7da, F=0x0
|
|
0, 1920000, 1920000, 48000, 251, 0xe68f7697, F=0x0
|
|
0, 1968000, 2016000, 48000, 205, 0xfe4461bd, F=0x0
|
|
0, 2016000, 2160000, 48000, 892, 0x0d2ab3bc, F=0x0
|
|
0, 2064000, 2112000, 48000, 238, 0x45827561, F=0x0
|
|
0, 2112000, 2208000, 48000, 281, 0x2a3a8e61, F=0x0
|
|
0, 2160000, 2640000, 48000, 4629, 0xf2e0fb0f, F=0x0
|
|
0, 2208000, 2448000, 48000, 1453, 0x6ae5dc98, F=0x0
|
|
0, 2256000, 2352000, 48000, 869, 0x3982ae69, F=0x0
|
|
0, 2304000, 2304000, 48000, 282, 0xd9e28960, F=0x0
|
|
0, 2352000, 2400000, 48000, 259, 0x253a809d, F=0x0
|
|
0, 2400000, 2544000, 48000, 835, 0x83499f30, F=0x0
|
|
0, 2448000, 2496000, 48000, 255, 0xa77b7690, F=0x0
|
|
0, 2496000, 2592000, 48000, 242, 0x83977ccf, F=0x0
|
|
0, 2544000, 3024000, 48000, 5082, 0xba55ee51, F=0x0
|
|
0, 2592000, 2832000, 48000, 1393, 0xc998b442, F=0x0
|
|
0, 2640000, 2736000, 48000, 742, 0x91ab75d2, F=0x0
|
|
0, 2688000, 2688000, 48000, 229, 0xfa326d98, F=0x0
|
|
0, 2736000, 2784000, 48000, 275, 0x49c38226, F=0x0
|
|
0, 2784000, 2928000, 48000, 869, 0xdd05acc4, F=0x0
|
|
0, 2832000, 2880000, 48000, 293, 0xcc9e904f, F=0x0
|
|
0, 2880000, 2976000, 48000, 334, 0x212aa4b1, F=0x0
|
|
0, 2928000, 3408000, 48000, 8539, 0xcccc9eb1
|
|
0, 2976000, 3216000, 48000, 1593, 0x5a351a68, F=0x0
|
|
0, 3024000, 3120000, 48000, 1042, 0xb77d00cc, F=0x0
|
|
0, 3072000, 3072000, 48000, 302, 0xbcdb9750, F=0x0
|
|
0, 3120000, 3168000, 48000, 336, 0xc7b0a55d, F=0x0
|
|
0, 3168000, 3312000, 48000, 875, 0x7e31b046, F=0x0
|
|
0, 3216000, 3264000, 48000, 401, 0xb473bca8, F=0x0
|
|
0, 3264000, 3360000, 48000, 246, 0x43357263, F=0x0
|
|
0, 3312000, 3792000, 48000, 3254, 0x8be44a2d, F=0x0
|
|
0, 3360000, 3600000, 48000, 1151, 0x29d52d14, F=0x0
|
|
0, 3408000, 3504000, 48000, 733, 0x33606982, F=0x0
|
|
0, 3456000, 3456000, 48000, 234, 0xb70a79ff, F=0x0
|
|
0, 3504000, 3552000, 48000, 228, 0x86916848, F=0x0
|
|
0, 3552000, 3696000, 48000, 689, 0xcca34b40, F=0x0
|
|
0, 3600000, 3648000, 48000, 223, 0xa96f6e31, F=0x0
|
|
0, 3648000, 3744000, 48000, 241, 0x7ac17531, F=0x0
|