nutenc: choose for non audio streams a timebase with finer resolution.

While a 25 fps stream can in general store frame durations in 1/25
units, this is not true for the timestamps. For example a 25fps
and a 25000/1001 fps stream when they are stored together might have
a matching 0 timestamp point but when for example a chapter from
this is cut the new start is no longer aligned. The issue gets
MUCH worse when the streams are lower fps, like 1 or 2 fps.

This commit thus makes the muxer choose a multiple of the
framerate as timebase that is at least about 20 micro seconds precise

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

1 files changed, 83 insertions, 83 deletions

diff --git a/tests/ref/fate/ffprobe_ini b/tests/ref/fate/ffprobe_ini
index dad636b63f..fd01c7c4f3 100644
--- a/tests/ref/fate/ffprobe_ini
+++ b/tests/ref/fate/ffprobe_ini
@@ -12,7 +12,7 @@ duration_time=0.023220
 convergence_duration=N/A
 convergence_duration_time=N/A
 size=2048
-pos=477
+pos=487
 flags=K
 
 [packets_and_frames.frame.0]
@@ -24,7 +24,7 @@ pkt_dts=0
 pkt_dts_time=0.000000
 pkt_duration=1024
 pkt_duration_time=0.023220
-pkt_pos=477
+pkt_pos=487
 sample_fmt=s16
 nb_samples=1024
 channels=1
@@ -37,12 +37,12 @@ pts=0
 pts_time=0.000000
 dts=0
 dts_time=0.000000
-duration=1
+duration=2048
 duration_time=0.040000
 convergence_duration=N/A
 convergence_duration_time=N/A
 size=230400
-pos=2552
+pos=2562
 flags=K
 
 [packets_and_frames.frame.1]
@@ -52,9 +52,9 @@ pkt_pts=0
 pkt_pts_time=0.000000
 pkt_dts=0
 pkt_dts_time=0.000000
-pkt_duration=1
+pkt_duration=2048
 pkt_duration_time=0.040000
-pkt_pos=2552
+pkt_pos=2562
 width=320
 height=240
 pix_fmt=rgb24
@@ -74,12 +74,12 @@ pts=0
 pts_time=0.000000
 dts=0
 dts_time=0.000000
-duration=1
+duration=2048
 duration_time=0.040000
 convergence_duration=N/A
 convergence_duration_time=N/A
 size=30000
-pos=232973
+pos=232983
 flags=K
 
 [packets_and_frames.frame.2]
@@ -89,9 +89,9 @@ pkt_pts=0
 pkt_pts_time=0.000000
 pkt_dts=0
 pkt_dts_time=0.000000
-pkt_duration=1
+pkt_duration=2048
 pkt_duration_time=0.040000
-pkt_pos=232973
+pkt_pos=232983
 width=100
 height=100
 pix_fmt=rgb24
@@ -116,7 +116,7 @@ duration_time=0.023220
 convergence_duration=N/A
 convergence_duration_time=N/A
 size=2048
-pos=262978
+pos=262988
 flags=K
 
 [packets_and_frames.frame.3]
@@ -128,7 +128,7 @@ pkt_dts=1024
 pkt_dts_time=0.023220
 pkt_duration=1024
 pkt_duration_time=0.023220
-pkt_pos=262978
+pkt_pos=262988
 sample_fmt=s16
 nb_samples=1024
 channels=1
@@ -137,28 +137,28 @@ channel_layout=unknown
 [packets_and_frames.packet.4]
 codec_type=video
 stream_index=1
-pts=1
+pts=2048
 pts_time=0.040000
-dts=1
+dts=2048
 dts_time=0.040000
-duration=1
+duration=2048
 duration_time=0.040000
 convergence_duration=N/A
 convergence_duration_time=N/A
 size=230400
-pos=265054
+pos=265066
 flags=K
 
 [packets_and_frames.frame.4]
 media_type=video
 key_frame=1
-pkt_pts=1
+pkt_pts=2048
 pkt_pts_time=0.040000
-pkt_dts=1
+pkt_dts=2048
 pkt_dts_time=0.040000
-pkt_duration=1
+pkt_duration=2048
 pkt_duration_time=0.040000
-pkt_pos=265054
+pkt_pos=265066
 width=320
 height=240
 pix_fmt=rgb24
@@ -174,28 +174,28 @@ reference=0
 [packets_and_frames.packet.5]
 codec_type=video
 stream_index=2
-pts=1
+pts=2048
 pts_time=0.040000
-dts=1
+dts=2048
 dts_time=0.040000
-duration=1
+duration=2048
 duration_time=0.040000
 convergence_duration=N/A
 convergence_duration_time=N/A
 size=30000
-pos=495476
+pos=495490
 flags=K
 
 [packets_and_frames.frame.5]
 media_type=video
 key_frame=1
-pkt_pts=1
+pkt_pts=2048
 pkt_pts_time=0.040000
-pkt_dts=1
+pkt_dts=2048
 pkt_dts_time=0.040000
-pkt_duration=1
+pkt_duration=2048
 pkt_duration_time=0.040000
-pkt_pos=495476
+pkt_pos=495490
 width=100
 height=100
 pix_fmt=rgb24
@@ -220,7 +220,7 @@ duration_time=0.023220
 convergence_duration=N/A
 convergence_duration_time=N/A
 size=2048
-pos=525481
+pos=525495
 flags=K
 
 [packets_and_frames.frame.6]
@@ -232,7 +232,7 @@ pkt_dts=2048
 pkt_dts_time=0.046440
 pkt_duration=1024
 pkt_duration_time=0.023220
-pkt_pos=525481
+pkt_pos=525495
 sample_fmt=s16
 nb_samples=1024
 channels=1
@@ -250,7 +250,7 @@ duration_time=0.023220
 convergence_duration=N/A
 convergence_duration_time=N/A
 size=2048
-pos=527552
+pos=527566
 flags=K
 
 [packets_and_frames.frame.7]
@@ -262,7 +262,7 @@ pkt_dts=3072
 pkt_dts_time=0.069660
 pkt_duration=1024
 pkt_duration_time=0.023220
-pkt_pos=527552
+pkt_pos=527566
 sample_fmt=s16
 nb_samples=1024
 channels=1
@@ -271,28 +271,28 @@ channel_layout=unknown
 [packets_and_frames.packet.8]
 codec_type=video
 stream_index=1
-pts=2
+pts=4096
 pts_time=0.080000
-dts=2
+dts=4096
 dts_time=0.080000
-duration=1
+duration=2048
 duration_time=0.040000
 convergence_duration=N/A
 convergence_duration_time=N/A
 size=230400
-pos=529628
+pos=529644
 flags=K
 
 [packets_and_frames.frame.8]
 media_type=video
 key_frame=1
-pkt_pts=2
+pkt_pts=4096
 pkt_pts_time=0.080000
-pkt_dts=2
+pkt_dts=4096
 pkt_dts_time=0.080000
-pkt_duration=1
+pkt_duration=2048
 pkt_duration_time=0.040000
-pkt_pos=529628
+pkt_pos=529644
 width=320
 height=240
 pix_fmt=rgb24
@@ -308,28 +308,28 @@ reference=0
 [packets_and_frames.packet.9]
 codec_type=video
 stream_index=2
-pts=2
+pts=4096
 pts_time=0.080000
-dts=2
+dts=4096
 dts_time=0.080000
-duration=1
+duration=2048
 duration_time=0.040000
 convergence_duration=N/A
 convergence_duration_time=N/A
 size=30000
-pos=760050
+pos=760068
 flags=K
 
 [packets_and_frames.frame.9]
 media_type=video
 key_frame=1
-pkt_pts=2
+pkt_pts=4096
 pkt_pts_time=0.080000
-pkt_dts=2
+pkt_dts=4096
 pkt_dts_time=0.080000
-pkt_duration=1
+pkt_duration=2048
 pkt_duration_time=0.040000
-pkt_pos=760050
+pkt_pos=760068
 width=100
 height=100
 pix_fmt=rgb24
@@ -354,7 +354,7 @@ duration_time=0.023220
 convergence_duration=N/A
 convergence_duration_time=N/A
 size=2048
-pos=790055
+pos=790073
 flags=K
 
 [packets_and_frames.frame.10]
@@ -366,7 +366,7 @@ pkt_dts=4096
 pkt_dts_time=0.092880
 pkt_duration=1024
 pkt_duration_time=0.023220
-pkt_pos=790055
+pkt_pos=790073
 sample_fmt=s16
 nb_samples=1024
 channels=1
@@ -384,7 +384,7 @@ duration_time=0.023220
 convergence_duration=N/A
 convergence_duration_time=N/A
 size=2048
-pos=792126
+pos=792144
 flags=K
 
 [packets_and_frames.frame.11]
@@ -396,7 +396,7 @@ pkt_dts=5120
 pkt_dts_time=0.116100
 pkt_duration=1024
 pkt_duration_time=0.023220
-pkt_pos=792126
+pkt_pos=792144
 sample_fmt=s16
 nb_samples=1024
 channels=1
@@ -405,28 +405,28 @@ channel_layout=unknown
 [packets_and_frames.packet.12]
 codec_type=video
 stream_index=1
-pts=3
+pts=6144
 pts_time=0.120000
-dts=3
+dts=6144
 dts_time=0.120000
-duration=1
+duration=2048
 duration_time=0.040000
 convergence_duration=N/A
 convergence_duration_time=N/A
 size=230400
-pos=794202
+pos=794222
 flags=K
 
 [packets_and_frames.frame.12]
 media_type=video
 key_frame=1
-pkt_pts=3
+pkt_pts=6144
 pkt_pts_time=0.120000
-pkt_dts=3
+pkt_dts=6144
 pkt_dts_time=0.120000
-pkt_duration=1
+pkt_duration=2048
 pkt_duration_time=0.040000
-pkt_pos=794202
+pkt_pos=794222
 width=320
 height=240
 pix_fmt=rgb24
@@ -442,28 +442,28 @@ reference=0
 [packets_and_frames.packet.13]
 codec_type=video
 stream_index=2
-pts=3
+pts=6144
 pts_time=0.120000
-dts=3
+dts=6144
 dts_time=0.120000
-duration=1
+duration=2048
 duration_time=0.040000
 convergence_duration=N/A
 convergence_duration_time=N/A
 size=30000
-pos=1024624
+pos=1024646
 flags=K
 
 [packets_and_frames.frame.13]
 media_type=video
 key_frame=1
-pkt_pts=3
+pkt_pts=6144
 pkt_pts_time=0.120000
-pkt_dts=3
+pkt_dts=6144
 pkt_dts_time=0.120000
-pkt_duration=1
+pkt_duration=2048
 pkt_duration_time=0.040000
-pkt_pos=1024624
+pkt_pos=1024646
 width=100
 height=100
 pix_fmt=rgb24
@@ -494,8 +494,8 @@ avg_frame_rate=0/0
 time_base=1/44100
 start_pts=0
 start_time=0.000000
-duration_ts=527350
-duration=11.958050
+duration_ts=527364
+duration=11.958367
 bit_rate=705600
 nb_frames=N/A
 nb_read_frames=6
@@ -519,7 +519,7 @@ index=1
 codec_name=rawvideo
 profile=unknown
 codec_type=video
-codec_time_base=1/25
+codec_time_base=1/51200
 codec_tag_string=RGB[24]
 codec_tag=0x18424752
 width=320
@@ -532,12 +532,12 @@ level=-99
 timecode=N/A
 id=N/A
 r_frame_rate=25/1
-avg_frame_rate=0/0
-time_base=1/25
+avg_frame_rate=25/1
+time_base=1/51200
 start_pts=0
 start_time=0.000000
-duration_ts=299
-duration=11.960000
+duration_ts=612268
+duration=11.958359
 bit_rate=N/A
 nb_frames=N/A
 nb_read_frames=4
@@ -561,7 +561,7 @@ index=2
 codec_name=rawvideo
 profile=unknown
 codec_type=video
-codec_time_base=1/25
+codec_time_base=1/51200
 codec_tag_string=RGB[24]
 codec_tag=0x18424752
 width=100
@@ -574,12 +574,12 @@ level=-99
 timecode=N/A
 id=N/A
 r_frame_rate=25/1
-avg_frame_rate=0/0
-time_base=1/25
+avg_frame_rate=25/1
+time_base=1/51200
 start_pts=0
 start_time=0.000000
-duration_ts=299
-duration=11.960000
+duration_ts=612268
+duration=11.958359
 bit_rate=N/A
 nb_frames=N/A
 nb_read_frames=4
@@ -603,9 +603,9 @@ filename=tests/data/ffprobe-test.nut
 nb_streams=3
 format_name=nut
 start_time=0.000000
-duration=11.960000
-size=1054699
-bit_rate=705484
+duration=11.958367
+size=1054727
+bit_rate=705599
 
 [format.tags]
 title=ffprobe test file