Skip to content

F
ffmpeg.wasm-core
Commit 14a69ae6 authored by Derek Buitenhuis's avatar Derek Buitenhuis
Browse files
Options

Merge commit 'dc6527ed' 

FATE tests have been updated to patch. They do not differ in
any meaningful way.

* commit 'dc6527ed':
  nutenc: do not use AVCodecContext.frame_size
Merged-by: 's avatarDerek Buitenhuis <derek.buitenhuis@gmail.com>
parents 8c509291 dc6527ed
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 238 additions and 231 deletions
libavformat/nutenc.c
View file @ 14a69ae6
......@@ -201,9 +201,16 @@ static void build_frame_code(AVFormatContext *s)
key_frame = intra_only;
#if 1
if (is_audio) {
int frame_bytes = codec->frame_size * (int64_t)codec->bit_rate /
(8 * codec->sample_rate);
int frame_bytes;
int pts;
if (codec->block_align > 0) {
frame_bytes = codec->block_align;
} else {
int frame_size = av_get_audio_frame_duration(codec, 0);
frame_bytes = frame_size * (int64_t)codec->bit_rate / (8 * codec->sample_rate);
}
for (pts = 0; pts < 2; pts++) {
for (pred = 0; pred < 2; pred++) {
FrameCode *ft = &nut->frame_code[start2];
......
tests/ref/acodec/pcm-s16be_planar
View file @ 14a69ae6
a2d4da448a83dac7cbe11eea96e679fb *tests/data/fate/acodec-pcm-s16be_planar.nut
1060722 tests/data/fate/acodec-pcm-s16be_planar.nut
b2acc0309be76b5f6200b525281a9037 *tests/data/fate/acodec-pcm-s16be_planar.nut
1060727 tests/data/fate/acodec-pcm-s16be_planar.nut
95e54b261530a1bcf6de6fe3b21dc5f6 *tests/data/fate/acodec-pcm-s16be_planar.out.wav
stddev: 0.00 PSNR:999.99 MAXDIFF: 0 bytes: 1058400/ 1058400
tests/ref/acodec/pcm-s16le_planar
View file @ 14a69ae6
761404c11c5b4b0a8bba0061704f70a4 *tests/data/fate/acodec-pcm-s16le_planar.nut
1060722 tests/data/fate/acodec-pcm-s16le_planar.nut
15aa8f9d8ca30a17c7821acfcd9d87f9 *tests/data/fate/acodec-pcm-s16le_planar.nut
1060727 tests/data/fate/acodec-pcm-s16le_planar.nut
95e54b261530a1bcf6de6fe3b21dc5f6 *tests/data/fate/acodec-pcm-s16le_planar.out.wav
stddev: 0.00 PSNR:999.99 MAXDIFF: 0 bytes: 1058400/ 1058400
tests/ref/acodec/pcm-s24le_planar
View file @ 14a69ae6
aa9f8ca95de20b2e83f66dcbb15cc307 *tests/data/fate/acodec-pcm-s24le_planar.nut
1590251 tests/data/fate/acodec-pcm-s24le_planar.nut
1c746862c9d79c57e275266f63822b29 *tests/data/fate/acodec-pcm-s24le_planar.nut
1590256 tests/data/fate/acodec-pcm-s24le_planar.nut
95e54b261530a1bcf6de6fe3b21dc5f6 *tests/data/fate/acodec-pcm-s24le_planar.out.wav
stddev: 0.00 PSNR:999.99 MAXDIFF: 0 bytes: 1058400/ 1058400
tests/ref/acodec/pcm-s32le_planar
View file @ 14a69ae6
d2a712fe08b1792bc65f255f54bb980e *tests/data/fate/acodec-pcm-s32le_planar.nut
2120197 tests/data/fate/acodec-pcm-s32le_planar.nut
d142973733ff4d61644b704438a4ba32 *tests/data/fate/acodec-pcm-s32le_planar.nut
2120202 tests/data/fate/acodec-pcm-s32le_planar.nut
95e54b261530a1bcf6de6fe3b21dc5f6 *tests/data/fate/acodec-pcm-s32le_planar.out.wav
stddev: 0.00 PSNR:999.99 MAXDIFF: 0 bytes: 1058400/ 1058400
tests/ref/acodec/pcm-s8_planar
View file @ 14a69ae6
c0e10e4a5106137082131807b6674a71 *tests/data/fate/acodec-pcm-s8_planar.nut
531100 tests/data/fate/acodec-pcm-s8_planar.nut
f04f79b2e90921a513f2d22fdab0dc47 *tests/data/fate/acodec-pcm-s8_planar.nut
531105 tests/data/fate/acodec-pcm-s8_planar.nut
652edf30f35ad89bf27bcc9d2f9c7b53 *tests/data/fate/acodec-pcm-s8_planar.out.wav
stddev: 147.89 PSNR: 52.93 MAXDIFF: 255 bytes: 1058400/ 1058400
tests/ref/acodec/pcm-u16be
View file @ 14a69ae6
753d5bfdc38d314fa3b1a2eb34449aea *tests/data/fate/acodec-pcm-u16be.nut
1060715 tests/data/fate/acodec-pcm-u16be.nut
abc31c722aee72f21b5f858731c28fb9 *tests/data/fate/acodec-pcm-u16be.nut
1060720 tests/data/fate/acodec-pcm-u16be.nut
95e54b261530a1bcf6de6fe3b21dc5f6 *tests/data/fate/acodec-pcm-u16be.out.wav
stddev: 0.00 PSNR:999.99 MAXDIFF: 0 bytes: 1058400/ 1058400
tests/ref/acodec/pcm-u16le
View file @ 14a69ae6
cee38dc471b6b72d97e44d1667591362 *tests/data/fate/acodec-pcm-u16le.nut
1060715 tests/data/fate/acodec-pcm-u16le.nut
80cf805a16a6b4f02f46ff9008ca16f7 *tests/data/fate/acodec-pcm-u16le.nut
1060720 tests/data/fate/acodec-pcm-u16le.nut
95e54b261530a1bcf6de6fe3b21dc5f6 *tests/data/fate/acodec-pcm-u16le.out.wav
stddev: 0.00 PSNR:999.99 MAXDIFF: 0 bytes: 1058400/ 1058400
tests/ref/acodec/pcm-u24be
View file @ 14a69ae6
84c2b6f7197840e40c5f646efd8a43a4 *tests/data/fate/acodec-pcm-u24be.nut
1590244 tests/data/fate/acodec-pcm-u24be.nut
c5b7d1898d8f5d6675ba543d2830bbaf *tests/data/fate/acodec-pcm-u24be.nut
1590249 tests/data/fate/acodec-pcm-u24be.nut
95e54b261530a1bcf6de6fe3b21dc5f6 *tests/data/fate/acodec-pcm-u24be.out.wav
stddev: 0.00 PSNR:999.99 MAXDIFF: 0 bytes: 1058400/ 1058400
tests/ref/acodec/pcm-u24le
View file @ 14a69ae6
5afea1f1b1d0590dbae2ac2e0092f434 *tests/data/fate/acodec-pcm-u24le.nut
1590244 tests/data/fate/acodec-pcm-u24le.nut
884a3a562a8005084fde088fc3a74283 *tests/data/fate/acodec-pcm-u24le.nut
1590249 tests/data/fate/acodec-pcm-u24le.nut
95e54b261530a1bcf6de6fe3b21dc5f6 *tests/data/fate/acodec-pcm-u24le.out.wav
stddev: 0.00 PSNR:999.99 MAXDIFF: 0 bytes: 1058400/ 1058400
tests/ref/acodec/pcm-u32be
View file @ 14a69ae6
529f523fcd04002791fce9cee797783b *tests/data/fate/acodec-pcm-u32be.nut
2120190 tests/data/fate/acodec-pcm-u32be.nut
88d1f0b98e2878f0a45abde7ad73e9f1 *tests/data/fate/acodec-pcm-u32be.nut
2120195 tests/data/fate/acodec-pcm-u32be.nut
95e54b261530a1bcf6de6fe3b21dc5f6 *tests/data/fate/acodec-pcm-u32be.out.wav
stddev: 0.00 PSNR:999.99 MAXDIFF: 0 bytes: 1058400/ 1058400
tests/ref/acodec/pcm-u32le
View file @ 14a69ae6
87f75abd86f84571bafc656e06b63038 *tests/data/fate/acodec-pcm-u32le.nut
2120190 tests/data/fate/acodec-pcm-u32le.nut
7257d6251524479c563c9f17a2642222 *tests/data/fate/acodec-pcm-u32le.nut
2120195 tests/data/fate/acodec-pcm-u32le.nut
95e54b261530a1bcf6de6fe3b21dc5f6 *tests/data/fate/acodec-pcm-u32le.out.wav
stddev: 0.00 PSNR:999.99 MAXDIFF: 0 bytes: 1058400/ 1058400
tests/ref/fate/ffprobe_compact
View file @ 14a69ae6
This diff is collapsed.
tests/ref/fate/ffprobe_csv
View file @ 14a69ae6
packet,audio,0,0,0.000000,0,0.000000,1024,0.023220,N/A,N/A,2048,642,K
frame,audio,0,1,0,0.000000,0,0.000000,0,0.000000,1024,0.023220,642,2048,s16,1024,1,unknown
packet,video,1,0,0.000000,0,0.000000,2048,0.040000,N/A,N/A,230400,2717,K
frame,video,1,1,0,0.000000,0,0.000000,0,0.000000,2048,0.040000,2717,230400,320,240,rgb24,1:1,I,0,0,0,0,0
packet,video,2,0,0.000000,0,0.000000,2048,0.040000,N/A,N/A,30000,233138,K
frame,video,2,1,0,0.000000,0,0.000000,0,0.000000,2048,0.040000,233138,30000,100,100,rgb24,1:1,I,0,0,0,0,0
packet,audio,0,1024,0.023220,1024,0.023220,1024,0.023220,N/A,N/A,2048,263143,K
frame,audio,0,1,1024,0.023220,1024,0.023220,1024,0.023220,1024,0.023220,263143,2048,s16,1024,1,unknown
packet,video,1,2048,0.040000,2048,0.040000,2048,0.040000,N/A,N/A,230400,265221,K
frame,video,1,1,2048,0.040000,2048,0.040000,2048,0.040000,2048,0.040000,265221,230400,320,240,rgb24,1:1,I,0,0,0,0,0
packet,video,2,2048,0.040000,2048,0.040000,2048,0.040000,N/A,N/A,30000,495645,K
frame,video,2,1,2048,0.040000,2048,0.040000,2048,0.040000,2048,0.040000,495645,30000,100,100,rgb24,1:1,I,0,0,0,0,0
packet,audio,0,2048,0.046440,2048,0.046440,1024,0.023220,N/A,N/A,2048,525650,K
frame,audio,0,1,2048,0.046440,2048,0.046440,2048,0.046440,1024,0.023220,525650,2048,s16,1024,1,unknown
packet,audio,0,3072,0.069660,3072,0.069660,1024,0.023220,N/A,N/A,2048,527721,K
frame,audio,0,1,3072,0.069660,3072,0.069660,3072,0.069660,1024,0.023220,527721,2048,s16,1024,1,unknown
packet,video,1,4096,0.080000,4096,0.080000,2048,0.040000,N/A,N/A,230400,529799,K
frame,video,1,1,4096,0.080000,4096,0.080000,4096,0.080000,2048,0.040000,529799,230400,320,240,rgb24,1:1,I,0,0,0,0,0
packet,video,2,4096,0.080000,4096,0.080000,2048,0.040000,N/A,N/A,30000,760223,K
frame,video,2,1,4096,0.080000,4096,0.080000,4096,0.080000,2048,0.040000,760223,30000,100,100,rgb24,1:1,I,0,0,0,0,0
packet,audio,0,4096,0.092880,4096,0.092880,1024,0.023220,N/A,N/A,2048,790228,K
frame,audio,0,1,4096,0.092880,4096,0.092880,4096,0.092880,1024,0.023220,790228,2048,s16,1024,1,unknown
packet,audio,0,5120,0.116100,5120,0.116100,1024,0.023220,N/A,N/A,2048,792299,K
frame,audio,0,1,5120,0.116100,5120,0.116100,5120,0.116100,1024,0.023220,792299,2048,s16,1024,1,unknown
packet,video,1,6144,0.120000,6144,0.120000,2048,0.040000,N/A,N/A,230400,794377,K
frame,video,1,1,6144,0.120000,6144,0.120000,6144,0.120000,2048,0.040000,794377,230400,320,240,rgb24,1:1,I,0,0,0,0,0
packet,video,2,6144,0.120000,6144,0.120000,2048,0.040000,N/A,N/A,30000,1024801,K
frame,video,2,1,6144,0.120000,6144,0.120000,6144,0.120000,2048,0.040000,1024801,30000,100,100,rgb24,1:1,I,0,0,0,0,0
packet,audio,0,0,0.000000,0,0.000000,1024,0.023220,N/A,N/A,2048,647,K
frame,audio,0,1,0,0.000000,0,0.000000,0,0.000000,1024,0.023220,647,2048,s16,1024,1,unknown
packet,video,1,0,0.000000,0,0.000000,2048,0.040000,N/A,N/A,230400,2722,K
frame,video,1,1,0,0.000000,0,0.000000,0,0.000000,2048,0.040000,2722,230400,320,240,rgb24,1:1,I,0,0,0,0,0
packet,video,2,0,0.000000,0,0.000000,2048,0.040000,N/A,N/A,30000,233143,K
frame,video,2,1,0,0.000000,0,0.000000,0,0.000000,2048,0.040000,233143,30000,100,100,rgb24,1:1,I,0,0,0,0,0
packet,audio,0,1024,0.023220,1024,0.023220,1024,0.023220,N/A,N/A,2048,263148,K
frame,audio,0,1,1024,0.023220,1024,0.023220,1024,0.023220,1024,0.023220,263148,2048,s16,1024,1,unknown
packet,video,1,2048,0.040000,2048,0.040000,2048,0.040000,N/A,N/A,230400,265226,K
frame,video,1,1,2048,0.040000,2048,0.040000,2048,0.040000,2048,0.040000,265226,230400,320,240,rgb24,1:1,I,0,0,0,0,0
packet,video,2,2048,0.040000,2048,0.040000,2048,0.040000,N/A,N/A,30000,495650,K
frame,video,2,1,2048,0.040000,2048,0.040000,2048,0.040000,2048,0.040000,495650,30000,100,100,rgb24,1:1,I,0,0,0,0,0
packet,audio,0,2048,0.046440,2048,0.046440,1024,0.023220,N/A,N/A,2048,525655,K
frame,audio,0,1,2048,0.046440,2048,0.046440,2048,0.046440,1024,0.023220,525655,2048,s16,1024,1,unknown
packet,audio,0,3072,0.069660,3072,0.069660,1024,0.023220,N/A,N/A,2048,527726,K
frame,audio,0,1,3072,0.069660,3072,0.069660,3072,0.069660,1024,0.023220,527726,2048,s16,1024,1,unknown
packet,video,1,4096,0.080000,4096,0.080000,2048,0.040000,N/A,N/A,230400,529804,K
frame,video,1,1,4096,0.080000,4096,0.080000,4096,0.080000,2048,0.040000,529804,230400,320,240,rgb24,1:1,I,0,0,0,0,0
packet,video,2,4096,0.080000,4096,0.080000,2048,0.040000,N/A,N/A,30000,760228,K
frame,video,2,1,4096,0.080000,4096,0.080000,4096,0.080000,2048,0.040000,760228,30000,100,100,rgb24,1:1,I,0,0,0,0,0
packet,audio,0,4096,0.092880,4096,0.092880,1024,0.023220,N/A,N/A,2048,790233,K
frame,audio,0,1,4096,0.092880,4096,0.092880,4096,0.092880,1024,0.023220,790233,2048,s16,1024,1,unknown
packet,audio,0,5120,0.116100,5120,0.116100,1024,0.023220,N/A,N/A,2048,792304,K
frame,audio,0,1,5120,0.116100,5120,0.116100,5120,0.116100,1024,0.023220,792304,2048,s16,1024,1,unknown
packet,video,1,6144,0.120000,6144,0.120000,2048,0.040000,N/A,N/A,230400,794382,K
frame,video,1,1,6144,0.120000,6144,0.120000,6144,0.120000,2048,0.040000,794382,230400,320,240,rgb24,1:1,I,0,0,0,0,0
packet,video,2,6144,0.120000,6144,0.120000,2048,0.040000,N/A,N/A,30000,1024806,K
frame,video,2,1,6144,0.120000,6144,0.120000,6144,0.120000,2048,0.040000,1024806,30000,100,100,rgb24,1:1,I,0,0,0,0,0
stream,0,pcm_s16le,unknown,audio,1/44100,PSD[16],0x10445350,s16,44100,1,unknown,16,N/A,0/0,0/0,1/44100,0,0.000000,N/A,N/A,705600,N/A,N/A,N/A,6,6,0,0,0,0,0,0,0,0,0,0,0,mc²,Lavc pcm_s16le
stream,1,rawvideo,unknown,video,1/51200,RGB[24],0x18424752,320,240,320,240,0,1:1,4:3,rgb24,-99,N/A,unknown,unknown,unknown,unspecified,N/A,1,N/A,25/1,25/1,1/51200,0,0.000000,N/A,N/A,N/A,N/A,N/A,N/A,4,4,0,0,0,0,0,0,0,0,0,0,0,foobar,field-and-tags-conflict-attempt,Lavc rawvideo
stream,2,rawvideo,unknown,video,1/51200,RGB[24],0x18424752,100,100,100,100,0,1:1,1:1,rgb24,-99,N/A,unknown,unknown,unknown,unspecified,N/A,1,N/A,25/1,25/1,1/51200,0,0.000000,N/A,N/A,N/A,N/A,N/A,N/A,4,4,0,0,0,0,0,0,0,0,0,0,0,Lavc rawvideo
format,tests/data/ffprobe-test.nut,3,0,nut,0.000000,0.120000,1054882,70325466,100,ffprobe test file,"'A comment with CSV, XML & JSON special chars': <tag value=""x"">",I ♥ Üñîçød€
format,tests/data/ffprobe-test.nut,3,0,nut,0.000000,0.120000,1054887,70325800,100,ffprobe test file,"'A comment with CSV, XML & JSON special chars': <tag value=""x"">",I ♥ Üñîçød€
tests/ref/fate/ffprobe_default
View file @ 14a69ae6
......@@ -10,7 +10,7 @@ duration_time=0.023220
convergence_duration=N/A
convergence_duration_time=N/A
size=2048
pos=642
pos=647
flags=K
[/PACKET]
[FRAME]
......@@ -25,7 +25,7 @@ best_effort_timestamp=0
best_effort_timestamp_time=0.000000
pkt_duration=1024
pkt_duration_time=0.023220
pkt_pos=642
pkt_pos=647
pkt_size=2048
sample_fmt=s16
nb_samples=1024
......@@ -44,7 +44,7 @@ duration_time=0.040000
convergence_duration=N/A
convergence_duration_time=N/A
size=230400
pos=2717
pos=2722
flags=K
[/PACKET]
[FRAME]
......@@ -59,7 +59,7 @@ best_effort_timestamp=0
best_effort_timestamp_time=0.000000
pkt_duration=2048
pkt_duration_time=0.040000
pkt_pos=2717
pkt_pos=2722
pkt_size=230400
width=320
height=240
......@@ -84,7 +84,7 @@ duration_time=0.040000
convergence_duration=N/A
convergence_duration_time=N/A
size=30000
pos=233138
pos=233143
flags=K
[/PACKET]
[FRAME]
......@@ -99,7 +99,7 @@ best_effort_timestamp=0
best_effort_timestamp_time=0.000000
pkt_duration=2048
pkt_duration_time=0.040000
pkt_pos=233138
pkt_pos=233143
pkt_size=30000
width=100
height=100
......@@ -124,7 +124,7 @@ duration_time=0.023220
convergence_duration=N/A
convergence_duration_time=N/A
size=2048
pos=263143
pos=263148
flags=K
[/PACKET]
[FRAME]
......@@ -139,7 +139,7 @@ best_effort_timestamp=1024
best_effort_timestamp_time=0.023220
pkt_duration=1024
pkt_duration_time=0.023220
pkt_pos=263143
pkt_pos=263148
pkt_size=2048
sample_fmt=s16
nb_samples=1024
......@@ -158,7 +158,7 @@ duration_time=0.040000
convergence_duration=N/A
convergence_duration_time=N/A
size=230400
pos=265221
pos=265226
flags=K
[/PACKET]
[FRAME]
......@@ -173,7 +173,7 @@ best_effort_timestamp=2048
best_effort_timestamp_time=0.040000
pkt_duration=2048
pkt_duration_time=0.040000
pkt_pos=265221
pkt_pos=265226
pkt_size=230400
width=320
height=240
......@@ -198,7 +198,7 @@ duration_time=0.040000
convergence_duration=N/A
convergence_duration_time=N/A
size=30000
pos=495645
pos=495650
flags=K
[/PACKET]
[FRAME]
......@@ -213,7 +213,7 @@ best_effort_timestamp=2048
best_effort_timestamp_time=0.040000
pkt_duration=2048
pkt_duration_time=0.040000
pkt_pos=495645
pkt_pos=495650
pkt_size=30000
width=100
height=100
......@@ -238,7 +238,7 @@ duration_time=0.023220
convergence_duration=N/A
convergence_duration_time=N/A
size=2048
pos=525650
pos=525655
flags=K
[/PACKET]
[FRAME]
......@@ -253,7 +253,7 @@ best_effort_timestamp=2048
best_effort_timestamp_time=0.046440
pkt_duration=1024
pkt_duration_time=0.023220
pkt_pos=525650
pkt_pos=525655
pkt_size=2048
sample_fmt=s16
nb_samples=1024
......@@ -272,7 +272,7 @@ duration_time=0.023220
convergence_duration=N/A
convergence_duration_time=N/A
size=2048
pos=527721
pos=527726
flags=K
[/PACKET]
[FRAME]
......@@ -287,7 +287,7 @@ best_effort_timestamp=3072
best_effort_timestamp_time=0.069660
pkt_duration=1024
pkt_duration_time=0.023220
pkt_pos=527721
pkt_pos=527726
pkt_size=2048
sample_fmt=s16
nb_samples=1024
......@@ -306,7 +306,7 @@ duration_time=0.040000
convergence_duration=N/A
convergence_duration_time=N/A
size=230400
pos=529799
pos=529804
flags=K
[/PACKET]
[FRAME]
......@@ -321,7 +321,7 @@ best_effort_timestamp=4096
best_effort_timestamp_time=0.080000
pkt_duration=2048
pkt_duration_time=0.040000
pkt_pos=529799
pkt_pos=529804
pkt_size=230400
width=320
height=240
......@@ -346,7 +346,7 @@ duration_time=0.040000
convergence_duration=N/A
convergence_duration_time=N/A
size=30000
pos=760223
pos=760228
flags=K
[/PACKET]
[FRAME]
......@@ -361,7 +361,7 @@ best_effort_timestamp=4096
best_effort_timestamp_time=0.080000
pkt_duration=2048
pkt_duration_time=0.040000
pkt_pos=760223
pkt_pos=760228
pkt_size=30000
width=100
height=100
......@@ -386,7 +386,7 @@ duration_time=0.023220
convergence_duration=N/A
convergence_duration_time=N/A
size=2048
pos=790228
pos=790233
flags=K
[/PACKET]
[FRAME]
......@@ -401,7 +401,7 @@ best_effort_timestamp=4096
best_effort_timestamp_time=0.092880
pkt_duration=1024
pkt_duration_time=0.023220
pkt_pos=790228
pkt_pos=790233
pkt_size=2048
sample_fmt=s16
nb_samples=1024
......@@ -420,7 +420,7 @@ duration_time=0.023220
convergence_duration=N/A
convergence_duration_time=N/A
size=2048
pos=792299
pos=792304
flags=K
[/PACKET]
[FRAME]
......@@ -435,7 +435,7 @@ best_effort_timestamp=5120
best_effort_timestamp_time=0.116100
pkt_duration=1024
pkt_duration_time=0.023220
pkt_pos=792299
pkt_pos=792304
pkt_size=2048
sample_fmt=s16
nb_samples=1024
......@@ -454,7 +454,7 @@ duration_time=0.040000
convergence_duration=N/A
convergence_duration_time=N/A
size=230400
pos=794377
pos=794382
flags=K
[/PACKET]
[FRAME]
......@@ -469,7 +469,7 @@ best_effort_timestamp=6144
best_effort_timestamp_time=0.120000
pkt_duration=2048
pkt_duration_time=0.040000
pkt_pos=794377
pkt_pos=794382
pkt_size=230400
width=320
height=240
......@@ -494,7 +494,7 @@ duration_time=0.040000
convergence_duration=N/A
convergence_duration_time=N/A
size=30000
pos=1024801
pos=1024806
flags=K
[/PACKET]
[FRAME]
......@@ -509,7 +509,7 @@ best_effort_timestamp=6144
best_effort_timestamp_time=0.120000
pkt_duration=2048
pkt_duration_time=0.040000
pkt_pos=1024801
pkt_pos=1024806
pkt_size=30000
width=100
height=100
......@@ -674,8 +674,8 @@ nb_programs=0
format_name=nut
start_time=0.000000
duration=0.120000
size=1054882
bit_rate=70325466
size=1054887
bit_rate=70325800
probe_score=100
TAG:title=ffprobe test file
TAG:comment='A comment with CSV, XML & JSON special chars': <tag value="x">
......
tests/ref/fate/ffprobe_flat
View file @ 14a69ae6
This diff is collapsed.
tests/ref/fate/ffprobe_ini
View file @ 14a69ae6
......@@ -12,7 +12,7 @@ duration_time=0.023220
convergence_duration=N/A
convergence_duration_time=N/A
size=2048
pos=642
pos=647
flags=K
[packets_and_frames.frame.0]
......@@ -27,7 +27,7 @@ best_effort_timestamp=0
best_effort_timestamp_time=0.000000
pkt_duration=1024
pkt_duration_time=0.023220
pkt_pos=642
pkt_pos=647
pkt_size=2048
sample_fmt=s16
nb_samples=1024
......@@ -46,7 +46,7 @@ duration_time=0.040000
convergence_duration=N/A
convergence_duration_time=N/A
size=230400
pos=2717
pos=2722
flags=K
[packets_and_frames.frame.1]
......@@ -61,7 +61,7 @@ best_effort_timestamp=0
best_effort_timestamp_time=0.000000
pkt_duration=2048
pkt_duration_time=0.040000
pkt_pos=2717
pkt_pos=2722
pkt_size=230400
width=320
height=240
......@@ -86,7 +86,7 @@ duration_time=0.040000
convergence_duration=N/A
convergence_duration_time=N/A
size=30000
pos=233138
pos=233143
flags=K
[packets_and_frames.frame.2]
......@@ -101,7 +101,7 @@ best_effort_timestamp=0
best_effort_timestamp_time=0.000000
pkt_duration=2048
pkt_duration_time=0.040000
pkt_pos=233138
pkt_pos=233143
pkt_size=30000
width=100
height=100
......@@ -126,7 +126,7 @@ duration_time=0.023220
convergence_duration=N/A
convergence_duration_time=N/A
size=2048
pos=263143
pos=263148
flags=K
[packets_and_frames.frame.3]
......@@ -141,7 +141,7 @@ best_effort_timestamp=1024
best_effort_timestamp_time=0.023220
pkt_duration=1024
pkt_duration_time=0.023220
pkt_pos=263143
pkt_pos=263148
pkt_size=2048
sample_fmt=s16
nb_samples=1024
......@@ -160,7 +160,7 @@ duration_time=0.040000
convergence_duration=N/A
convergence_duration_time=N/A
size=230400
pos=265221
pos=265226
flags=K
[packets_and_frames.frame.4]
......@@ -175,7 +175,7 @@ best_effort_timestamp=2048
best_effort_timestamp_time=0.040000
pkt_duration=2048
pkt_duration_time=0.040000
pkt_pos=265221
pkt_pos=265226
pkt_size=230400
width=320
height=240
......@@ -200,7 +200,7 @@ duration_time=0.040000
convergence_duration=N/A
convergence_duration_time=N/A
size=30000
pos=495645
pos=495650
flags=K
[packets_and_frames.frame.5]
......@@ -215,7 +215,7 @@ best_effort_timestamp=2048
best_effort_timestamp_time=0.040000
pkt_duration=2048
pkt_duration_time=0.040000
pkt_pos=495645
pkt_pos=495650
pkt_size=30000
width=100
height=100
......@@ -240,7 +240,7 @@ duration_time=0.023220
convergence_duration=N/A
convergence_duration_time=N/A
size=2048
pos=525650
pos=525655
flags=K
[packets_and_frames.frame.6]
......@@ -255,7 +255,7 @@ best_effort_timestamp=2048
best_effort_timestamp_time=0.046440
pkt_duration=1024
pkt_duration_time=0.023220
pkt_pos=525650
pkt_pos=525655
pkt_size=2048
sample_fmt=s16
nb_samples=1024
......@@ -274,7 +274,7 @@ duration_time=0.023220
convergence_duration=N/A
convergence_duration_time=N/A
size=2048
pos=527721
pos=527726
flags=K
[packets_and_frames.frame.7]
......@@ -289,7 +289,7 @@ best_effort_timestamp=3072
best_effort_timestamp_time=0.069660
pkt_duration=1024
pkt_duration_time=0.023220
pkt_pos=527721
pkt_pos=527726
pkt_size=2048
sample_fmt=s16
nb_samples=1024
......@@ -308,7 +308,7 @@ duration_time=0.040000
convergence_duration=N/A
convergence_duration_time=N/A
size=230400
pos=529799
pos=529804
flags=K
[packets_and_frames.frame.8]
......@@ -323,7 +323,7 @@ best_effort_timestamp=4096
best_effort_timestamp_time=0.080000
pkt_duration=2048
pkt_duration_time=0.040000
pkt_pos=529799
pkt_pos=529804
pkt_size=230400
width=320
height=240
......@@ -348,7 +348,7 @@ duration_time=0.040000
convergence_duration=N/A
convergence_duration_time=N/A
size=30000
pos=760223
pos=760228
flags=K
[packets_and_frames.frame.9]
......@@ -363,7 +363,7 @@ best_effort_timestamp=4096
best_effort_timestamp_time=0.080000
pkt_duration=2048
pkt_duration_time=0.040000
pkt_pos=760223
pkt_pos=760228
pkt_size=30000
width=100
height=100
......@@ -388,7 +388,7 @@ duration_time=0.023220
convergence_duration=N/A
convergence_duration_time=N/A
size=2048
pos=790228
pos=790233
flags=K
[packets_and_frames.frame.10]
......@@ -403,7 +403,7 @@ best_effort_timestamp=4096
best_effort_timestamp_time=0.092880
pkt_duration=1024
pkt_duration_time=0.023220
pkt_pos=790228
pkt_pos=790233
pkt_size=2048
sample_fmt=s16
nb_samples=1024
......@@ -422,7 +422,7 @@ duration_time=0.023220
convergence_duration=N/A
convergence_duration_time=N/A
size=2048
pos=792299
pos=792304
flags=K
[packets_and_frames.frame.11]
......@@ -437,7 +437,7 @@ best_effort_timestamp=5120
best_effort_timestamp_time=0.116100
pkt_duration=1024
pkt_duration_time=0.023220
pkt_pos=792299
pkt_pos=792304
pkt_size=2048
sample_fmt=s16
nb_samples=1024
......@@ -456,7 +456,7 @@ duration_time=0.040000
convergence_duration=N/A
convergence_duration_time=N/A
size=230400
pos=794377
pos=794382
flags=K
[packets_and_frames.frame.12]
......@@ -471,7 +471,7 @@ best_effort_timestamp=6144
best_effort_timestamp_time=0.120000
pkt_duration=2048
pkt_duration_time=0.040000
pkt_pos=794377
pkt_pos=794382
pkt_size=230400
width=320
height=240
......@@ -496,7 +496,7 @@ duration_time=0.040000
convergence_duration=N/A
convergence_duration_time=N/A
size=30000
pos=1024801
pos=1024806
flags=K
[packets_and_frames.frame.13]
......@@ -511,7 +511,7 @@ best_effort_timestamp=6144
best_effort_timestamp_time=0.120000
pkt_duration=2048
pkt_duration_time=0.040000
pkt_pos=1024801
pkt_pos=1024806
pkt_size=30000
width=100
height=100
......@@ -688,8 +688,8 @@ nb_programs=0
format_name=nut
start_time=0.000000
duration=0.120000
size=1054882
bit_rate=70325466
size=1054887
bit_rate=70325800
probe_score=100
[format.tags]
......
tests/ref/fate/ffprobe_json
View file @ 14a69ae6
......@@ -11,7 +11,7 @@
"duration": 1024,
"duration_time": "0.023220",
"size": "2048",
"pos": "642",
"pos": "647",
"flags": "K"
},
{
......@@ -27,7 +27,7 @@
"best_effort_timestamp_time": "0.000000",
"pkt_duration": 1024,
"pkt_duration_time": "0.023220",
"pkt_pos": "642",
"pkt_pos": "647",
"pkt_size": "2048",
"sample_fmt": "s16",
"nb_samples": 1024,
......@@ -44,7 +44,7 @@
"duration": 2048,
"duration_time": "0.040000",
"size": "230400",
"pos": "2717",
"pos": "2722",
"flags": "K"
},
{
......@@ -60,7 +60,7 @@
"best_effort_timestamp_time": "0.000000",
"pkt_duration": 2048,
"pkt_duration_time": "0.040000",
"pkt_pos": "2717",
"pkt_pos": "2722",
"pkt_size": "230400",
"width": 320,
"height": 240,
......@@ -84,7 +84,7 @@
"duration": 2048,
"duration_time": "0.040000",
"size": "30000",
"pos": "233138",
"pos": "233143",
"flags": "K"
},
{
......@@ -100,7 +100,7 @@
"best_effort_timestamp_time": "0.000000",
"pkt_duration": 2048,
"pkt_duration_time": "0.040000",
"pkt_pos": "233138",
"pkt_pos": "233143",
"pkt_size": "30000",
"width": 100,
"height": 100,
......@@ -124,7 +124,7 @@
"duration": 1024,
"duration_time": "0.023220",
"size": "2048",
"pos": "263143",
"pos": "263148",
"flags": "K"
},
{
......@@ -140,7 +140,7 @@
"best_effort_timestamp_time": "0.023220",
"pkt_duration": 1024,
"pkt_duration_time": "0.023220",
"pkt_pos": "263143",
"pkt_pos": "263148",
"pkt_size": "2048",
"sample_fmt": "s16",
"nb_samples": 1024,
......@@ -157,7 +157,7 @@
"duration": 2048,
"duration_time": "0.040000",
"size": "230400",
"pos": "265221",
"pos": "265226",
"flags": "K"
},
{
......@@ -173,7 +173,7 @@
"best_effort_timestamp_time": "0.040000",
"pkt_duration": 2048,
"pkt_duration_time": "0.040000",
"pkt_pos": "265221",
"pkt_pos": "265226",
"pkt_size": "230400",
"width": 320,
"height": 240,
......@@ -197,7 +197,7 @@
"duration": 2048,
"duration_time": "0.040000",
"size": "30000",
"pos": "495645",
"pos": "495650",
"flags": "K"
},
{
......@@ -213,7 +213,7 @@
"best_effort_timestamp_time": "0.040000",
"pkt_duration": 2048,
"pkt_duration_time": "0.040000",
"pkt_pos": "495645",
"pkt_pos": "495650",
"pkt_size": "30000",
"width": 100,
"height": 100,
......@@ -237,7 +237,7 @@
"duration": 1024,
"duration_time": "0.023220",
"size": "2048",
"pos": "525650",
"pos": "525655",
"flags": "K"
},
{
......@@ -253,7 +253,7 @@
"best_effort_timestamp_time": "0.046440",
"pkt_duration": 1024,
"pkt_duration_time": "0.023220",
"pkt_pos": "525650",
"pkt_pos": "525655",
"pkt_size": "2048",
"sample_fmt": "s16",
"nb_samples": 1024,
......@@ -270,7 +270,7 @@
"duration": 1024,
"duration_time": "0.023220",
"size": "2048",
"pos": "527721",
"pos": "527726",
"flags": "K"
},
{
......@@ -286,7 +286,7 @@
"best_effort_timestamp_time": "0.069660",
"pkt_duration": 1024,
"pkt_duration_time": "0.023220",
"pkt_pos": "527721",
"pkt_pos": "527726",
"pkt_size": "2048",
"sample_fmt": "s16",
"nb_samples": 1024,
......@@ -303,7 +303,7 @@
"duration": 2048,
"duration_time": "0.040000",
"size": "230400",
"pos": "529799",
"pos": "529804",
"flags": "K"
},
{
......@@ -319,7 +319,7 @@
"best_effort_timestamp_time": "0.080000",
"pkt_duration": 2048,
"pkt_duration_time": "0.040000",
"pkt_pos": "529799",
"pkt_pos": "529804",
"pkt_size": "230400",
"width": 320,
"height": 240,
......@@ -343,7 +343,7 @@
"duration": 2048,
"duration_time": "0.040000",
"size": "30000",
"pos": "760223",
"pos": "760228",
"flags": "K"
},
{
......@@ -359,7 +359,7 @@
"best_effort_timestamp_time": "0.080000",
"pkt_duration": 2048,
"pkt_duration_time": "0.040000",
"pkt_pos": "760223",
"pkt_pos": "760228",
"pkt_size": "30000",
"width": 100,
"height": 100,
......@@ -383,7 +383,7 @@
"duration": 1024,
"duration_time": "0.023220",
"size": "2048",
"pos": "790228",
"pos": "790233",
"flags": "K"
},
{
......@@ -399,7 +399,7 @@
"best_effort_timestamp_time": "0.092880",
"pkt_duration": 1024,
"pkt_duration_time": "0.023220",
"pkt_pos": "790228",
"pkt_pos": "790233",
"pkt_size": "2048",
"sample_fmt": "s16",
"nb_samples": 1024,
......@@ -416,7 +416,7 @@
"duration": 1024,
"duration_time": "0.023220",
"size": "2048",
"pos": "792299",
"pos": "792304",
"flags": "K"
},
{
......@@ -432,7 +432,7 @@
"best_effort_timestamp_time": "0.116100",
"pkt_duration": 1024,
"pkt_duration_time": "0.023220",
"pkt_pos": "792299",
"pkt_pos": "792304",
"pkt_size": "2048",
"sample_fmt": "s16",
"nb_samples": 1024,
......@@ -449,7 +449,7 @@
"duration": 2048,
"duration_time": "0.040000",
"size": "230400",
"pos": "794377",
"pos": "794382",
"flags": "K"
},
{
......@@ -465,7 +465,7 @@
"best_effort_timestamp_time": "0.120000",
"pkt_duration": 2048,
"pkt_duration_time": "0.040000",
"pkt_pos": "794377",
"pkt_pos": "794382",
"pkt_size": "230400",
"width": 320,
"height": 240,
......@@ -489,7 +489,7 @@
"duration": 2048,
"duration_time": "0.040000",
"size": "30000",
"pos": "1024801",
"pos": "1024806",
"flags": "K"
},
{
......@@ -505,7 +505,7 @@
"best_effort_timestamp_time": "0.120000",
"pkt_duration": 2048,
"pkt_duration_time": "0.040000",
"pkt_pos": "1024801",
"pkt_pos": "1024806",
"pkt_size": "30000",
"width": 100,
"height": 100,
......@@ -649,8 +649,8 @@
"format_name": "nut",
"start_time": "0.000000",
"duration": "0.120000",
"size": "1054882",
"bit_rate": "70325466",
"size": "1054887",
"bit_rate": "70325800",
"probe_score": 100,
"tags": {
"title": "ffprobe test file",
......
tests/ref/fate/ffprobe_xml
View file @ 14a69ae6
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment