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_json b/tests/ref/fate/ffprobe_json
index beaff81ce2..286e8ee4f4 100644
--- a/tests/ref/fate/ffprobe_json
+++ b/tests/ref/fate/ffprobe_json
@@ -11,7 +11,7 @@
             "duration": 1024,
             "duration_time": "0.023220",
             "size": "2048",
-            "pos": "477",
+            "pos": "487",
             "flags": "K"
         },
         {
@@ -24,7 +24,7 @@
             "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,10 +37,10 @@
             "pts_time": "0.000000",
             "dts": 0,
             "dts_time": "0.000000",
-            "duration": 1,
+            "duration": 2048,
             "duration_time": "0.040000",
             "size": "230400",
-            "pos": "2552",
+            "pos": "2562",
             "flags": "K"
         },
         {
@@ -51,9 +51,9 @@
             "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,10 +74,10 @@
             "pts_time": "0.000000",
             "dts": 0,
             "dts_time": "0.000000",
-            "duration": 1,
+            "duration": 2048,
             "duration_time": "0.040000",
             "size": "30000",
-            "pos": "232973",
+            "pos": "232983",
             "flags": "K"
         },
         {
@@ -88,9 +88,9 @@
             "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": 1024,
             "duration_time": "0.023220",
             "size": "2048",
-            "pos": "262978",
+            "pos": "262988",
             "flags": "K"
         },
         {
@@ -127,7 +127,7 @@
             "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
@@ -136,27 +136,27 @@
             "type": "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",
             "size": "230400",
-            "pos": "265054",
+            "pos": "265066",
             "flags": "K"
         },
         {
             "type": "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",
@@ -173,27 +173,27 @@
             "type": "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",
             "size": "30000",
-            "pos": "495476",
+            "pos": "495490",
             "flags": "K"
         },
         {
             "type": "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",
@@ -217,7 +217,7 @@
             "duration": 1024,
             "duration_time": "0.023220",
             "size": "2048",
-            "pos": "525481",
+            "pos": "525495",
             "flags": "K"
         },
         {
@@ -230,7 +230,7 @@
             "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
@@ -246,7 +246,7 @@
             "duration": 1024,
             "duration_time": "0.023220",
             "size": "2048",
-            "pos": "527552",
+            "pos": "527566",
             "flags": "K"
         },
         {
@@ -259,7 +259,7 @@
             "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
@@ -268,27 +268,27 @@
             "type": "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",
             "size": "230400",
-            "pos": "529628",
+            "pos": "529644",
             "flags": "K"
         },
         {
             "type": "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",
@@ -305,27 +305,27 @@
             "type": "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",
             "size": "30000",
-            "pos": "760050",
+            "pos": "760068",
             "flags": "K"
         },
         {
             "type": "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",
@@ -349,7 +349,7 @@
             "duration": 1024,
             "duration_time": "0.023220",
             "size": "2048",
-            "pos": "790055",
+            "pos": "790073",
             "flags": "K"
         },
         {
@@ -362,7 +362,7 @@
             "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
@@ -378,7 +378,7 @@
             "duration": 1024,
             "duration_time": "0.023220",
             "size": "2048",
-            "pos": "792126",
+            "pos": "792144",
             "flags": "K"
         },
         {
@@ -391,7 +391,7 @@
             "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
@@ -400,27 +400,27 @@
             "type": "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",
             "size": "230400",
-            "pos": "794202",
+            "pos": "794222",
             "flags": "K"
         },
         {
             "type": "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",
@@ -437,27 +437,27 @@
             "type": "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",
             "size": "30000",
-            "pos": "1024624",
+            "pos": "1024646",
             "flags": "K"
         },
         {
             "type": "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",
@@ -488,8 +488,8 @@
             "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_read_frames": "6",
             "nb_read_packets": "6",
@@ -511,7 +511,7 @@
             "index": 1,
             "codec_name": "rawvideo",
             "codec_type": "video",
-            "codec_time_base": "1/25",
+            "codec_time_base": "1/51200",
             "codec_tag_string": "RGB[24]",
             "codec_tag": "0x18424752",
             "width": 320,
@@ -522,12 +522,12 @@
             "pix_fmt": "rgb24",
             "level": -99,
             "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",
             "nb_read_frames": "4",
             "nb_read_packets": "4",
             "disposition": {
@@ -548,7 +548,7 @@
             "index": 2,
             "codec_name": "rawvideo",
             "codec_type": "video",
-            "codec_time_base": "1/25",
+            "codec_time_base": "1/51200",
             "codec_tag_string": "RGB[24]",
             "codec_tag": "0x18424752",
             "width": 100,
@@ -559,12 +559,12 @@
             "pix_fmt": "rgb24",
             "level": -99,
             "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",
             "nb_read_frames": "4",
             "nb_read_packets": "4",
             "disposition": {
@@ -587,9 +587,9 @@
         "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",
         "tags": {
             "title": "ffprobe test file",
             "comment": "'A comment with CSV, XML & JSON special chars': <tag value=\"x\">",