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_default b/tests/ref/fate/ffprobe_default
index 3c8a89ed30..a8ddaea87e 100644
--- a/tests/ref/fate/ffprobe_default
+++ b/tests/ref/fate/ffprobe_default
@@ -10,7 +10,7 @@ duration_time=0.023220
 convergence_duration=N/A
 convergence_duration_time=N/A
 size=2048
-pos=477
+pos=487
 flags=K
 [/PACKET]
 [FRAME]
@@ -22,7 +22,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
@@ -35,12 +35,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
 [/PACKET]
 [FRAME]
@@ -50,9 +50,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
@@ -72,12 +72,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
 [/PACKET]
 [FRAME]
@@ -87,9 +87,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
@@ -114,7 +114,7 @@ duration_time=0.023220
 convergence_duration=N/A
 convergence_duration_time=N/A
 size=2048
-pos=262978
+pos=262988
 flags=K
 [/PACKET]
 [FRAME]
@@ -126,7 +126,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
@@ -135,28 +135,28 @@ channel_layout=unknown
 [PACKET]
 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
 [/PACKET]
 [FRAME]
 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
@@ -172,28 +172,28 @@ reference=0
 [PACKET]
 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
 [/PACKET]
 [FRAME]
 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
@@ -218,7 +218,7 @@ duration_time=0.023220
 convergence_duration=N/A
 convergence_duration_time=N/A
 size=2048
-pos=525481
+pos=525495
 flags=K
 [/PACKET]
 [FRAME]
@@ -230,7 +230,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
@@ -248,7 +248,7 @@ duration_time=0.023220
 convergence_duration=N/A
 convergence_duration_time=N/A
 size=2048
-pos=527552
+pos=527566
 flags=K
 [/PACKET]
 [FRAME]
@@ -260,7 +260,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
@@ -269,28 +269,28 @@ channel_layout=unknown
 [PACKET]
 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
 [/PACKET]
 [FRAME]
 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
@@ -306,28 +306,28 @@ reference=0
 [PACKET]
 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
 [/PACKET]
 [FRAME]
 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
@@ -352,7 +352,7 @@ duration_time=0.023220
 convergence_duration=N/A
 convergence_duration_time=N/A
 size=2048
-pos=790055
+pos=790073
 flags=K
 [/PACKET]
 [FRAME]
@@ -364,7 +364,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
@@ -382,7 +382,7 @@ duration_time=0.023220
 convergence_duration=N/A
 convergence_duration_time=N/A
 size=2048
-pos=792126
+pos=792144
 flags=K
 [/PACKET]
 [FRAME]
@@ -394,7 +394,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
@@ -403,28 +403,28 @@ channel_layout=unknown
 [PACKET]
 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
 [/PACKET]
 [FRAME]
 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
@@ -440,28 +440,28 @@ reference=0
 [PACKET]
 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
 [/PACKET]
 [FRAME]
 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
@@ -492,8 +492,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
@@ -515,7 +515,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
@@ -528,12 +528,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
@@ -555,7 +555,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
@@ -568,12 +568,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
@@ -595,9 +595,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
 TAG:title=ffprobe test file
 TAG:comment='A comment with CSV, XML & JSON special chars': <tag value="x">
 TAG:comment2=I ♥ Üñîçød€