diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-01 23:51:35 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-02 01:09:12 +0200 |
commit | 4abc411b97d72080fe9628650f5c1a1d272e7a3d (patch) | |
tree | 58c40571503b17bb7ab5d9fb327676297b7b0894 /tests/ref/fate/ffprobe_csv | |
parent | e3fb5bc1472c600af628df10e1472a4319781640 (diff) | |
download | ffmpeg-4abc411b97d72080fe9628650f5c1a1d272e7a3d.tar.gz |
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>
Diffstat (limited to 'tests/ref/fate/ffprobe_csv')
-rw-r--r-- | tests/ref/fate/ffprobe_csv | 64 |
1 files changed, 32 insertions, 32 deletions
diff --git a/tests/ref/fate/ffprobe_csv b/tests/ref/fate/ffprobe_csv index 075e056be5..23183fc5ef 100644 --- a/tests/ref/fate/ffprobe_csv +++ b/tests/ref/fate/ffprobe_csv @@ -1,32 +1,32 @@ -packet,audio,0,0,0.000000,0,0.000000,1024,0.023220,N/A,N/A,2048,477,K -frame,audio,1,0,0.000000,0,0.000000,1024,0.023220,477,s16,1024,1,unknown -packet,video,1,0,0.000000,0,0.000000,1,0.040000,N/A,N/A,230400,2552,K -frame,video,1,0,0.000000,0,0.000000,1,0.040000,2552,320,240,rgb24,1:1,I,0,0,0,0,0,0 -packet,video,2,0,0.000000,0,0.000000,1,0.040000,N/A,N/A,30000,232973,K -frame,video,1,0,0.000000,0,0.000000,1,0.040000,232973,100,100,rgb24,1:1,I,0,0,0,0,0,0 -packet,audio,0,1024,0.023220,1024,0.023220,1024,0.023220,N/A,N/A,2048,262978,K -frame,audio,1,1024,0.023220,1024,0.023220,1024,0.023220,262978,s16,1024,1,unknown -packet,video,1,1,0.040000,1,0.040000,1,0.040000,N/A,N/A,230400,265054,K -frame,video,1,1,0.040000,1,0.040000,1,0.040000,265054,320,240,rgb24,1:1,I,0,0,0,0,0,0 -packet,video,2,1,0.040000,1,0.040000,1,0.040000,N/A,N/A,30000,495476,K -frame,video,1,1,0.040000,1,0.040000,1,0.040000,495476,100,100,rgb24,1:1,I,0,0,0,0,0,0 -packet,audio,0,2048,0.046440,2048,0.046440,1024,0.023220,N/A,N/A,2048,525481,K -frame,audio,1,2048,0.046440,2048,0.046440,1024,0.023220,525481,s16,1024,1,unknown -packet,audio,0,3072,0.069660,3072,0.069660,1024,0.023220,N/A,N/A,2048,527552,K -frame,audio,1,3072,0.069660,3072,0.069660,1024,0.023220,527552,s16,1024,1,unknown -packet,video,1,2,0.080000,2,0.080000,1,0.040000,N/A,N/A,230400,529628,K -frame,video,1,2,0.080000,2,0.080000,1,0.040000,529628,320,240,rgb24,1:1,I,0,0,0,0,0,0 -packet,video,2,2,0.080000,2,0.080000,1,0.040000,N/A,N/A,30000,760050,K -frame,video,1,2,0.080000,2,0.080000,1,0.040000,760050,100,100,rgb24,1:1,I,0,0,0,0,0,0 -packet,audio,0,4096,0.092880,4096,0.092880,1024,0.023220,N/A,N/A,2048,790055,K -frame,audio,1,4096,0.092880,4096,0.092880,1024,0.023220,790055,s16,1024,1,unknown -packet,audio,0,5120,0.116100,5120,0.116100,1024,0.023220,N/A,N/A,2048,792126,K -frame,audio,1,5120,0.116100,5120,0.116100,1024,0.023220,792126,s16,1024,1,unknown -packet,video,1,3,0.120000,3,0.120000,1,0.040000,N/A,N/A,230400,794202,K -frame,video,1,3,0.120000,3,0.120000,1,0.040000,794202,320,240,rgb24,1:1,I,0,0,0,0,0,0 -packet,video,2,3,0.120000,3,0.120000,1,0.040000,N/A,N/A,30000,1024624,K -frame,video,1,3,0.120000,3,0.120000,1,0.040000,1024624,100,100,rgb24,1:1,I,0,0,0,0,0,0 -stream,0,pcm_s16le,unknown,audio,1/44100,[1][0][0][0],0x0001,s16,44100,1,16,N/A,0/0,0/0,1/44100,0,0.000000,527350,11.958050,705600,N/A,6,6,0,0,0,0,0,0,0,0,0,0,0 -stream,1,rawvideo,unknown,video,1/25,RGB[24],0x18424752,320,240,0,1:1,4:3,rgb24,-99,N/A,N/A,25/1,0/0,1/25,0,0.000000,299,11.960000,N/A,N/A,4,4,0,0,0,0,0,0,0,0,0,0,0 -stream,2,rawvideo,unknown,video,1/25,RGB[24],0x18424752,100,100,0,1:1,1:1,rgb24,-99,N/A,N/A,25/1,0/0,1/25,0,0.000000,299,11.960000,N/A,N/A,4,4,0,0,0,0,0,0,0,0,0,0,0 -format,tests/data/ffprobe-test.nut,3,nut,0.000000,11.960000,1054699,705484,ffprobe test file,"'A comment with CSV, XML & JSON special chars': <tag value=""x"">",I ♥ Üñîçød€ +packet,audio,0,0,0.000000,0,0.000000,1024,0.023220,N/A,N/A,2048,487,K +frame,audio,1,0,0.000000,0,0.000000,1024,0.023220,487,s16,1024,1,unknown +packet,video,1,0,0.000000,0,0.000000,2048,0.040000,N/A,N/A,230400,2562,K +frame,video,1,0,0.000000,0,0.000000,2048,0.040000,2562,320,240,rgb24,1:1,I,0,0,0,0,0,0 +packet,video,2,0,0.000000,0,0.000000,2048,0.040000,N/A,N/A,30000,232983,K +frame,video,1,0,0.000000,0,0.000000,2048,0.040000,232983,100,100,rgb24,1:1,I,0,0,0,0,0,0 +packet,audio,0,1024,0.023220,1024,0.023220,1024,0.023220,N/A,N/A,2048,262988,K +frame,audio,1,1024,0.023220,1024,0.023220,1024,0.023220,262988,s16,1024,1,unknown +packet,video,1,2048,0.040000,2048,0.040000,2048,0.040000,N/A,N/A,230400,265066,K +frame,video,1,2048,0.040000,2048,0.040000,2048,0.040000,265066,320,240,rgb24,1:1,I,0,0,0,0,0,0 +packet,video,2,2048,0.040000,2048,0.040000,2048,0.040000,N/A,N/A,30000,495490,K +frame,video,1,2048,0.040000,2048,0.040000,2048,0.040000,495490,100,100,rgb24,1:1,I,0,0,0,0,0,0 +packet,audio,0,2048,0.046440,2048,0.046440,1024,0.023220,N/A,N/A,2048,525495,K +frame,audio,1,2048,0.046440,2048,0.046440,1024,0.023220,525495,s16,1024,1,unknown +packet,audio,0,3072,0.069660,3072,0.069660,1024,0.023220,N/A,N/A,2048,527566,K +frame,audio,1,3072,0.069660,3072,0.069660,1024,0.023220,527566,s16,1024,1,unknown +packet,video,1,4096,0.080000,4096,0.080000,2048,0.040000,N/A,N/A,230400,529644,K +frame,video,1,4096,0.080000,4096,0.080000,2048,0.040000,529644,320,240,rgb24,1:1,I,0,0,0,0,0,0 +packet,video,2,4096,0.080000,4096,0.080000,2048,0.040000,N/A,N/A,30000,760068,K +frame,video,1,4096,0.080000,4096,0.080000,2048,0.040000,760068,100,100,rgb24,1:1,I,0,0,0,0,0,0 +packet,audio,0,4096,0.092880,4096,0.092880,1024,0.023220,N/A,N/A,2048,790073,K +frame,audio,1,4096,0.092880,4096,0.092880,1024,0.023220,790073,s16,1024,1,unknown +packet,audio,0,5120,0.116100,5120,0.116100,1024,0.023220,N/A,N/A,2048,792144,K +frame,audio,1,5120,0.116100,5120,0.116100,1024,0.023220,792144,s16,1024,1,unknown +packet,video,1,6144,0.120000,6144,0.120000,2048,0.040000,N/A,N/A,230400,794222,K +frame,video,1,6144,0.120000,6144,0.120000,2048,0.040000,794222,320,240,rgb24,1:1,I,0,0,0,0,0,0 +packet,video,2,6144,0.120000,6144,0.120000,2048,0.040000,N/A,N/A,30000,1024646,K +frame,video,1,6144,0.120000,6144,0.120000,2048,0.040000,1024646,100,100,rgb24,1:1,I,0,0,0,0,0,0 +stream,0,pcm_s16le,unknown,audio,1/44100,[1][0][0][0],0x0001,s16,44100,1,16,N/A,0/0,0/0,1/44100,0,0.000000,527364,11.958367,705600,N/A,6,6,0,0,0,0,0,0,0,0,0,0,0 +stream,1,rawvideo,unknown,video,1/51200,RGB[24],0x18424752,320,240,0,1:1,4:3,rgb24,-99,N/A,N/A,25/1,25/1,1/51200,0,0.000000,612268,11.958359,N/A,N/A,4,4,0,0,0,0,0,0,0,0,0,0,0 +stream,2,rawvideo,unknown,video,1/51200,RGB[24],0x18424752,100,100,0,1:1,1:1,rgb24,-99,N/A,N/A,25/1,25/1,1/51200,0,0.000000,612268,11.958359,N/A,N/A,4,4,0,0,0,0,0,0,0,0,0,0,0 +format,tests/data/ffprobe-test.nut,3,nut,0.000000,11.958367,1054727,705599,ffprobe test file,"'A comment with CSV, XML & JSON special chars': <tag value=""x"">",I ♥ Üñîçød€ |