diff options
author | Darren Mo <fumoboy007@me.com> | 2024-11-20 22:27:02 -0300 |
---|---|---|
committer | James Almer <jamrial@gmail.com> | 2024-11-22 20:50:05 -0300 |
commit | 865c73c86f9d9d167be7e41ad6cef71eba92dadd (patch) | |
tree | 0584c905ad981a22e75600caabf19b430685a54e /tests | |
parent | b328bf8f7ed6f7794bc69b8a6304390527a6216a (diff) | |
download | ffmpeg-865c73c86f9d9d167be7e41ad6cef71eba92dadd.tar.gz |
avformat/mov: Populate packet duration using stts atom instead of guessing
Fixes tickets #7855 and #11312.
Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/ref/fate/copy-trac236 | 4 | ||||
-rw-r--r-- | tests/ref/fate/filter-fps | 1 | ||||
-rw-r--r-- | tests/ref/fate/filter-fps-cfr | 1 | ||||
-rw-r--r-- | tests/ref/fate/filter-meta-4560-rotate0 | 4 | ||||
-rw-r--r-- | tests/ref/fate/gaplessenc-itunes-to-ipod-aac | 2 | ||||
-rw-r--r-- | tests/ref/fate/matroska-dovi-write-config8 | 4 | ||||
-rw-r--r-- | tests/ref/fate/matroska-non-rotation-displaymatrix | 6 | ||||
-rw-r--r-- | tests/ref/fate/mov-aac-2048-priming | 2 | ||||
-rw-r--r-- | tests/ref/fate/mov-zombie | 4 |
9 files changed, 15 insertions, 13 deletions
diff --git a/tests/ref/fate/copy-trac236 b/tests/ref/fate/copy-trac236 index c89649e953..1f20e9ea7e 100644 --- a/tests/ref/fate/copy-trac236 +++ b/tests/ref/fate/copy-trac236 @@ -1,5 +1,5 @@ -ca4068319c6586de757c1f6a592b31e5 *tests/data/fate/copy-trac236.mov -630918 tests/data/fate/copy-trac236.mov +3e3497985d54991e09f82ca3dd7eda79 *tests/data/fate/copy-trac236.mov +630910 tests/data/fate/copy-trac236.mov #tb 0: 100/2997 #media_type 0: video #codec_id 0: rawvideo diff --git a/tests/ref/fate/filter-fps b/tests/ref/fate/filter-fps index 242fb04e85..fa71b59cd3 100644 --- a/tests/ref/fate/filter-fps +++ b/tests/ref/fate/filter-fps @@ -91,3 +91,4 @@ 0, 85, 85, 1, 30576, 0xd4150aad 0, 86, 86, 1, 30576, 0xd4150aad 0, 87, 87, 1, 30576, 0xd4150aad +0, 88, 88, 1, 30576, 0xd4150aad diff --git a/tests/ref/fate/filter-fps-cfr b/tests/ref/fate/filter-fps-cfr index 242fb04e85..fa71b59cd3 100644 --- a/tests/ref/fate/filter-fps-cfr +++ b/tests/ref/fate/filter-fps-cfr @@ -91,3 +91,4 @@ 0, 85, 85, 1, 30576, 0xd4150aad 0, 86, 86, 1, 30576, 0xd4150aad 0, 87, 87, 1, 30576, 0xd4150aad +0, 88, 88, 1, 30576, 0xd4150aad diff --git a/tests/ref/fate/filter-meta-4560-rotate0 b/tests/ref/fate/filter-meta-4560-rotate0 index c0f3b03710..b0f3d67f08 100644 --- a/tests/ref/fate/filter-meta-4560-rotate0 +++ b/tests/ref/fate/filter-meta-4560-rotate0 @@ -1,5 +1,5 @@ -dc213aee944a55af2f41950921fd62d7 *tests/data/fate/filter-meta-4560-rotate0.mov -347433 tests/data/fate/filter-meta-4560-rotate0.mov +6cd6b45a88881e85dfe7ad9582ffbeff *tests/data/fate/filter-meta-4560-rotate0.mov +347425 tests/data/fate/filter-meta-4560-rotate0.mov #tb 0: 1/30 #media_type 0: video #codec_id 0: rawvideo diff --git a/tests/ref/fate/gaplessenc-itunes-to-ipod-aac b/tests/ref/fate/gaplessenc-itunes-to-ipod-aac index 41c9f03b20..a8da904c32 100644 --- a/tests/ref/fate/gaplessenc-itunes-to-ipod-aac +++ b/tests/ref/fate/gaplessenc-itunes-to-ipod-aac @@ -22,7 +22,7 @@ packet|pts=98304|dts=98304|duration=1024|flags=K__ packet|pts=99328|dts=99328|duration=1024|flags=K__ packet|pts=100352|dts=100352|duration=1024|flags=K__ packet|pts=101376|dts=101376|duration=1024|flags=K__ -packet|pts=102400|dts=102400|duration=926|flags=K__ +packet|pts=102400|dts=102400|duration=960|flags=K__ stream|nb_read_packets=102 frame|pts=0|pkt_dts=0|best_effort_timestamp=0|nb_samples=1024 frame|pts=1024|pkt_dts=1024|best_effort_timestamp=1024|nb_samples=1024 diff --git a/tests/ref/fate/matroska-dovi-write-config8 b/tests/ref/fate/matroska-dovi-write-config8 index 85899d5f6d..d5704c7684 100644 --- a/tests/ref/fate/matroska-dovi-write-config8 +++ b/tests/ref/fate/matroska-dovi-write-config8 @@ -1,5 +1,5 @@ -3bd4b07d5af6153516e4c0e66a71c8c9 *tests/data/fate/matroska-dovi-write-config8.matroska -3600607 tests/data/fate/matroska-dovi-write-config8.matroska +593bb650a937b25b87de3079ee7d1517 *tests/data/fate/matroska-dovi-write-config8.matroska +3600617 tests/data/fate/matroska-dovi-write-config8.matroska #extradata 0: 551, 0xb1ddcd66 #extradata 1: 2, 0x00340022 #tb 0: 1/1000 diff --git a/tests/ref/fate/matroska-non-rotation-displaymatrix b/tests/ref/fate/matroska-non-rotation-displaymatrix index c48a4afa43..ad9d6e5b43 100644 --- a/tests/ref/fate/matroska-non-rotation-displaymatrix +++ b/tests/ref/fate/matroska-non-rotation-displaymatrix @@ -1,12 +1,12 @@ -3d9eac5b7551c5d644443a70451c809c *tests/data/fate/matroska-non-rotation-displaymatrix.matroska -7860 tests/data/fate/matroska-non-rotation-displaymatrix.matroska +7294b73bcb1cd5059b8f413e2a4dab5b *tests/data/fate/matroska-non-rotation-displaymatrix.matroska +7866 tests/data/fate/matroska-non-rotation-displaymatrix.matroska #extradata 0: 34, 0xc1d10b51 #tb 0: 1/1000 #media_type 0: video #codec_id 0: h264 #dimensions 0: 160x240 #sar 0: 1/2 -0, -33, 0, 33, 4133, 0xc48cf152 +0, -33, 0, 27, 4133, 0xc48cf152 0, 0, 60, 33, 1077, 0x15a71a8a, F=0x0 0, 27, 27, 33, 355, 0x1ee8b91a, F=0x0 0, 60, 127, 33, 1110, 0x4e1a2b12, F=0x0 diff --git a/tests/ref/fate/mov-aac-2048-priming b/tests/ref/fate/mov-aac-2048-priming index b3ab9e0d34..feea5e36eb 100644 --- a/tests/ref/fate/mov-aac-2048-priming +++ b/tests/ref/fate/mov-aac-2048-priming @@ -214,4 +214,4 @@ packet|codec_type=audio|stream_index=0|pts=215040|pts_time=4.876190|dts=215040|d packet|codec_type=audio|stream_index=0|pts=216064|pts_time=4.899410|dts=216064|dts_time=4.899410|duration=1024|duration_time=0.023220|size=203|pos=42900|flags=K__ packet|codec_type=audio|stream_index=0|pts=217088|pts_time=4.922630|dts=217088|dts_time=4.922630|duration=1024|duration_time=0.023220|size=198|pos=43103|flags=K__ packet|codec_type=audio|stream_index=0|pts=218112|pts_time=4.945850|dts=218112|dts_time=4.945850|duration=1024|duration_time=0.023220|size=284|pos=43301|flags=K__ -packet|codec_type=audio|stream_index=0|pts=219136|pts_time=4.969070|dts=219136|dts_time=4.969070|duration=1364|duration_time=0.030930|size=5|pos=43585|flags=K__ +packet|codec_type=audio|stream_index=0|pts=219136|pts_time=4.969070|dts=219136|dts_time=4.969070|duration=340|duration_time=0.007710|size=5|pos=43585|flags=K__ diff --git a/tests/ref/fate/mov-zombie b/tests/ref/fate/mov-zombie index 10476bc49f..ed20e635ad 100644 --- a/tests/ref/fate/mov-zombie +++ b/tests/ref/fate/mov-zombie @@ -1,6 +1,6 @@ -packet|codec_type=video|stream_index=0|pts=0|pts_time=0.000000|dts=-3004|dts_time=-0.033378|duration=3003|duration_time=0.033367|size=4133|pos=11309|flags=K__ +packet|codec_type=video|stream_index=0|pts=0|pts_time=0.000000|dts=-3004|dts_time=-0.033378|duration=2437|duration_time=0.027078|size=4133|pos=11309|flags=K__ packet|codec_type=video|stream_index=0|pts=5440|pts_time=0.060444|dts=-567|dts_time=-0.006300|duration=3003|duration_time=0.033367|size=1077|pos=15442|flags=___ -frame|media_type=video|stream_index=0|key_frame=1|pts=0|pts_time=0.000000|pkt_dts=-567|pkt_dts_time=-0.006300|best_effort_timestamp=0|best_effort_timestamp_time=0.000000|duration=3003|duration_time=0.033367|pkt_pos=11309|pkt_size=4133|width=160|height=240|crop_top=0|crop_bottom=0|crop_left=0|crop_right=0|pix_fmt=yuv420p|sample_aspect_ratio=2:1|pict_type=I|interlaced_frame=0|top_field_first=0|repeat_pict=0|color_range=tv|color_space=smpte170m|color_primaries=smpte170m|color_transfer=bt709|chroma_location=topleft|side_datum/3x3_displaymatrix:side_data_type=3x3 displaymatrix|side_datum/3x3_displaymatrix:displaymatrix=\n00000000: 131072 0 0\n00000001: 0 65536 0\n00000002: 0 0 1073741824\n|side_datum/3x3_displaymatrix:rotation=0|side_datum/h_26_45__user_data_unregistered_sei_message:side_data_type=H.26[45] User Data Unregistered SEI message +frame|media_type=video|stream_index=0|key_frame=1|pts=0|pts_time=0.000000|pkt_dts=-567|pkt_dts_time=-0.006300|best_effort_timestamp=0|best_effort_timestamp_time=0.000000|duration=2437|duration_time=0.027078|pkt_pos=11309|pkt_size=4133|width=160|height=240|crop_top=0|crop_bottom=0|crop_left=0|crop_right=0|pix_fmt=yuv420p|sample_aspect_ratio=2:1|pict_type=I|interlaced_frame=0|top_field_first=0|repeat_pict=0|color_range=tv|color_space=smpte170m|color_primaries=smpte170m|color_transfer=bt709|chroma_location=topleft|side_datum/3x3_displaymatrix:side_data_type=3x3 displaymatrix|side_datum/3x3_displaymatrix:displaymatrix=\n00000000: 131072 0 0\n00000001: 0 65536 0\n00000002: 0 0 1073741824\n|side_datum/3x3_displaymatrix:rotation=0|side_datum/h_26_45__user_data_unregistered_sei_message:side_data_type=H.26[45] User Data Unregistered SEI message packet|codec_type=video|stream_index=0|pts=2437|pts_time=0.027078|dts=2436|dts_time=0.027067|duration=3003|duration_time=0.033367|size=355|pos=16519|flags=___ frame|media_type=video|stream_index=0|key_frame=0|pts=2437|pts_time=0.027078|pkt_dts=2436|pkt_dts_time=0.027067|best_effort_timestamp=2437|best_effort_timestamp_time=0.027078|duration=3003|duration_time=0.033367|pkt_pos=16519|pkt_size=355|width=160|height=240|crop_top=0|crop_bottom=0|crop_left=0|crop_right=0|pix_fmt=yuv420p|sample_aspect_ratio=2:1|pict_type=B|interlaced_frame=0|top_field_first=0|repeat_pict=0|color_range=tv|color_space=smpte170m|color_primaries=smpte170m|color_transfer=bt709|chroma_location=topleft|side_datum/3x3_displaymatrix:side_data_type=3x3 displaymatrix|side_datum/3x3_displaymatrix:displaymatrix=\n00000000: 131072 0 0\n00000001: 0 65536 0\n00000002: 0 0 1073741824\n|side_datum/3x3_displaymatrix:rotation=0|side_datum/h_26_45__user_data_unregistered_sei_message:side_data_type=H.26[45] User Data Unregistered SEI message packet|codec_type=video|stream_index=0|pts=11446|pts_time=0.127178|dts=5439|dts_time=0.060433|duration=3003|duration_time=0.033367|size=1110|pos=16874|flags=___ |