Skip to content

F
ffmpeg.wasm-core
Commit bbee02ed authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files
Options

ffmpeg: Skip writing the version when -flags bitexact is used 

Alternatively every fate test could be changed to pass both fflags and flags +bitexact
Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 1e49439f
Expand all Show whitespace changes
Inline Side-by-side
Showing with 237 additions and 229 deletions
ffmpeg.c
View file @ bbee02ed
...@@ -2370,6 +2370,7 @@ static void set_encoder_id(OutputFile *of, OutputStream *ost) ...@@ -2370,6 +2370,7 @@ static void set_encoder_id(OutputFile *of, OutputStream *ost)
uint8_t *encoder_string; uint8_t *encoder_string;
int encoder_string_len; int encoder_string_len;
int format_flags = 0; int format_flags = 0;
int codec_flags = 0;
e = av_dict_get(of->opts, "fflags", NULL, 0); e = av_dict_get(of->opts, "fflags", NULL, 0);
if (e) { if (e) {
...@@ -2378,13 +2379,20 @@ static void set_encoder_id(OutputFile *of, OutputStream *ost) ...@@ -2378,13 +2379,20 @@ static void set_encoder_id(OutputFile *of, OutputStream *ost)
return; return;
av_opt_eval_flags(of->ctx, o, e->value, &format_flags); av_opt_eval_flags(of->ctx, o, e->value, &format_flags);
} }
e = av_dict_get(ost->encoder_opts, "flags", NULL, 0);
if (e) {
const AVOption *o = av_opt_find(ost->st->codec, "flags", NULL, 0, 0);
if (!o)
return;
av_opt_eval_flags(ost->st->codec, o, e->value, &codec_flags);
}
encoder_string_len = sizeof(LIBAVCODEC_IDENT) + strlen(ost->enc->name) + 2; encoder_string_len = sizeof(LIBAVCODEC_IDENT) + strlen(ost->enc->name) + 2;
encoder_string = av_mallocz(encoder_string_len); encoder_string = av_mallocz(encoder_string_len);
if (!encoder_string) if (!encoder_string)
exit_program(1); exit_program(1);
if (!(format_flags & AVFMT_FLAG_BITEXACT)) if (!(format_flags & AVFMT_FLAG_BITEXACT) && !(codec_flags & CODEC_FLAG_BITEXACT))
av_strlcpy(encoder_string, LIBAVCODEC_IDENT " ", encoder_string_len); av_strlcpy(encoder_string, LIBAVCODEC_IDENT " ", encoder_string_len);
av_strlcat(encoder_string, ost->enc->name, encoder_string_len); av_strlcat(encoder_string, ost->enc->name, encoder_string_len);
av_dict_set(&ost->st->metadata, "encoder", encoder_string, av_dict_set(&ost->st->metadata, "encoder", encoder_string,
......
tests/ref/fate/ffprobe_compact
View file @ bbee02ed
This diff is collapsed.
tests/ref/fate/ffprobe_csv
View file @ bbee02ed
packet,audio,0,0,0.000000,0,0.000000,1024,0.023220,N/A,N/A,2048,669,K packet,audio,0,0,0.000000,0,0.000000,1024,0.023220,N/A,N/A,2048,627,K
frame,audio,1,0,0.000000,0,0.000000,0,0.000000,1024,0.023220,669,2048,s16,1024,1,unknown frame,audio,1,0,0.000000,0,0.000000,0,0.000000,1024,0.023220,627,2048,s16,1024,1,unknown
packet,video,1,0,0.000000,0,0.000000,2048,0.040000,N/A,N/A,230400,2744,K packet,video,1,0,0.000000,0,0.000000,2048,0.040000,N/A,N/A,230400,2702,K
frame,video,1,0,0.000000,0,0.000000,0,0.000000,2048,0.040000,2744,230400,320,240,rgb24,1:1,I,0,0,0,0,0 frame,video,1,0,0.000000,0,0.000000,0,0.000000,2048,0.040000,2702,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,233165,K packet,video,2,0,0.000000,0,0.000000,2048,0.040000,N/A,N/A,30000,233123,K
frame,video,1,0,0.000000,0,0.000000,0,0.000000,2048,0.040000,233165,30000,100,100,rgb24,1:1,I,0,0,0,0,0 frame,video,1,0,0.000000,0,0.000000,0,0.000000,2048,0.040000,233123,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,263170,K packet,audio,0,1024,0.023220,1024,0.023220,1024,0.023220,N/A,N/A,2048,263128,K
frame,audio,1,1024,0.023220,1024,0.023220,1024,0.023220,1024,0.023220,263170,2048,s16,1024,1,unknown frame,audio,1,1024,0.023220,1024,0.023220,1024,0.023220,1024,0.023220,263128,2048,s16,1024,1,unknown
packet,video,1,2048,0.040000,2048,0.040000,2048,0.040000,N/A,N/A,230400,265248,K packet,video,1,2048,0.040000,2048,0.040000,2048,0.040000,N/A,N/A,230400,265206,K
frame,video,1,2048,0.040000,2048,0.040000,2048,0.040000,2048,0.040000,265248,230400,320,240,rgb24,1:1,I,0,0,0,0,0 frame,video,1,2048,0.040000,2048,0.040000,2048,0.040000,2048,0.040000,265206,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,495672,K packet,video,2,2048,0.040000,2048,0.040000,2048,0.040000,N/A,N/A,30000,495630,K
frame,video,1,2048,0.040000,2048,0.040000,2048,0.040000,2048,0.040000,495672,30000,100,100,rgb24,1:1,I,0,0,0,0,0 frame,video,1,2048,0.040000,2048,0.040000,2048,0.040000,2048,0.040000,495630,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,525677,K packet,audio,0,2048,0.046440,2048,0.046440,1024,0.023220,N/A,N/A,2048,525635,K
frame,audio,1,2048,0.046440,2048,0.046440,2048,0.046440,1024,0.023220,525677,2048,s16,1024,1,unknown frame,audio,1,2048,0.046440,2048,0.046440,2048,0.046440,1024,0.023220,525635,2048,s16,1024,1,unknown
packet,audio,0,3072,0.069660,3072,0.069660,1024,0.023220,N/A,N/A,2048,527748,K packet,audio,0,3072,0.069660,3072,0.069660,1024,0.023220,N/A,N/A,2048,527706,K
frame,audio,1,3072,0.069660,3072,0.069660,3072,0.069660,1024,0.023220,527748,2048,s16,1024,1,unknown frame,audio,1,3072,0.069660,3072,0.069660,3072,0.069660,1024,0.023220,527706,2048,s16,1024,1,unknown
packet,video,1,4096,0.080000,4096,0.080000,2048,0.040000,N/A,N/A,230400,529826,K packet,video,1,4096,0.080000,4096,0.080000,2048,0.040000,N/A,N/A,230400,529784,K
frame,video,1,4096,0.080000,4096,0.080000,4096,0.080000,2048,0.040000,529826,230400,320,240,rgb24,1:1,I,0,0,0,0,0 frame,video,1,4096,0.080000,4096,0.080000,4096,0.080000,2048,0.040000,529784,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,760250,K packet,video,2,4096,0.080000,4096,0.080000,2048,0.040000,N/A,N/A,30000,760208,K
frame,video,1,4096,0.080000,4096,0.080000,4096,0.080000,2048,0.040000,760250,30000,100,100,rgb24,1:1,I,0,0,0,0,0 frame,video,1,4096,0.080000,4096,0.080000,4096,0.080000,2048,0.040000,760208,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,790255,K packet,audio,0,4096,0.092880,4096,0.092880,1024,0.023220,N/A,N/A,2048,790213,K
frame,audio,1,4096,0.092880,4096,0.092880,4096,0.092880,1024,0.023220,790255,2048,s16,1024,1,unknown frame,audio,1,4096,0.092880,4096,0.092880,4096,0.092880,1024,0.023220,790213,2048,s16,1024,1,unknown
packet,audio,0,5120,0.116100,5120,0.116100,1024,0.023220,N/A,N/A,2048,792326,K packet,audio,0,5120,0.116100,5120,0.116100,1024,0.023220,N/A,N/A,2048,792284,K
frame,audio,1,5120,0.116100,5120,0.116100,5120,0.116100,1024,0.023220,792326,2048,s16,1024,1,unknown frame,audio,1,5120,0.116100,5120,0.116100,5120,0.116100,1024,0.023220,792284,2048,s16,1024,1,unknown
packet,video,1,6144,0.120000,6144,0.120000,2048,0.040000,N/A,N/A,230400,794404,K packet,video,1,6144,0.120000,6144,0.120000,2048,0.040000,N/A,N/A,230400,794362,K
frame,video,1,6144,0.120000,6144,0.120000,6144,0.120000,2048,0.040000,794404,230400,320,240,rgb24,1:1,I,0,0,0,0,0 frame,video,1,6144,0.120000,6144,0.120000,6144,0.120000,2048,0.040000,794362,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,1024828,K packet,video,2,6144,0.120000,6144,0.120000,2048,0.040000,N/A,N/A,30000,1024786,K
frame,video,1,6144,0.120000,6144,0.120000,6144,0.120000,2048,0.040000,1024828,30000,100,100,rgb24,1:1,I,0,0,0,0,0 frame,video,1,6144,0.120000,6144,0.120000,6144,0.120000,2048,0.040000,1024786,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,6,6,0,0,0,0,0,0,0,0,0,0,0,mc²,Lavc55.63.100 pcm_s16le 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,6,6,0,0,0,0,0,0,0,0,0,0,0,mc²,pcm_s16le
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,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,Lavc55.63.100 rawvideo 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,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,rawvideo
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,N/A,N/A,N/A,N/A,4,4,0,0,0,0,0,0,0,0,0,0,0,Lavc55.63.100 rawvideo 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,N/A,N/A,N/A,N/A,4,4,0,0,0,0,0,0,0,0,0,0,0,rawvideo
format,tests/data/ffprobe-test.nut,3,0,nut,0.000000,0.120000,1054909,70327266,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,1054867,70324466,100,ffprobe test file,"'A comment with CSV, XML & JSON special chars': <tag value=""x"">",I ♥ Üñîçød€
tests/ref/fate/ffprobe_default
View file @ bbee02ed
...@@ -10,7 +10,7 @@ duration_time=0.023220 ...@@ -10,7 +10,7 @@ duration_time=0.023220
convergence_duration=N/A convergence_duration=N/A
convergence_duration_time=N/A convergence_duration_time=N/A
size=2048 size=2048
pos=669 pos=627
flags=K flags=K
[/PACKET] [/PACKET]
[FRAME] [FRAME]
...@@ -24,7 +24,7 @@ best_effort_timestamp=0 ...@@ -24,7 +24,7 @@ best_effort_timestamp=0
best_effort_timestamp_time=0.000000 best_effort_timestamp_time=0.000000
pkt_duration=1024 pkt_duration=1024
pkt_duration_time=0.023220 pkt_duration_time=0.023220
pkt_pos=669 pkt_pos=627
pkt_size=2048 pkt_size=2048
sample_fmt=s16 sample_fmt=s16
nb_samples=1024 nb_samples=1024
...@@ -43,7 +43,7 @@ duration_time=0.040000 ...@@ -43,7 +43,7 @@ duration_time=0.040000
convergence_duration=N/A convergence_duration=N/A
convergence_duration_time=N/A convergence_duration_time=N/A
size=230400 size=230400
pos=2744 pos=2702
flags=K flags=K
[/PACKET] [/PACKET]
[FRAME] [FRAME]
...@@ -57,7 +57,7 @@ best_effort_timestamp=0 ...@@ -57,7 +57,7 @@ best_effort_timestamp=0
best_effort_timestamp_time=0.000000 best_effort_timestamp_time=0.000000
pkt_duration=2048 pkt_duration=2048
pkt_duration_time=0.040000 pkt_duration_time=0.040000
pkt_pos=2744 pkt_pos=2702
pkt_size=230400 pkt_size=230400
width=320 width=320
height=240 height=240
...@@ -82,7 +82,7 @@ duration_time=0.040000 ...@@ -82,7 +82,7 @@ duration_time=0.040000
convergence_duration=N/A convergence_duration=N/A
convergence_duration_time=N/A convergence_duration_time=N/A
size=30000 size=30000
pos=233165 pos=233123
flags=K flags=K
[/PACKET] [/PACKET]
[FRAME] [FRAME]
...@@ -96,7 +96,7 @@ best_effort_timestamp=0 ...@@ -96,7 +96,7 @@ best_effort_timestamp=0
best_effort_timestamp_time=0.000000 best_effort_timestamp_time=0.000000
pkt_duration=2048 pkt_duration=2048
pkt_duration_time=0.040000 pkt_duration_time=0.040000
pkt_pos=233165 pkt_pos=233123
pkt_size=30000 pkt_size=30000
width=100 width=100
height=100 height=100
...@@ -121,7 +121,7 @@ duration_time=0.023220 ...@@ -121,7 +121,7 @@ duration_time=0.023220
convergence_duration=N/A convergence_duration=N/A
convergence_duration_time=N/A convergence_duration_time=N/A
size=2048 size=2048
pos=263170 pos=263128
flags=K flags=K
[/PACKET] [/PACKET]
[FRAME] [FRAME]
...@@ -135,7 +135,7 @@ best_effort_timestamp=1024 ...@@ -135,7 +135,7 @@ best_effort_timestamp=1024
best_effort_timestamp_time=0.023220 best_effort_timestamp_time=0.023220
pkt_duration=1024 pkt_duration=1024
pkt_duration_time=0.023220 pkt_duration_time=0.023220
pkt_pos=263170 pkt_pos=263128
pkt_size=2048 pkt_size=2048
sample_fmt=s16 sample_fmt=s16
nb_samples=1024 nb_samples=1024
...@@ -154,7 +154,7 @@ duration_time=0.040000 ...@@ -154,7 +154,7 @@ duration_time=0.040000
convergence_duration=N/A convergence_duration=N/A
convergence_duration_time=N/A convergence_duration_time=N/A
size=230400 size=230400
pos=265248 pos=265206
flags=K flags=K
[/PACKET] [/PACKET]
[FRAME] [FRAME]
...@@ -168,7 +168,7 @@ best_effort_timestamp=2048 ...@@ -168,7 +168,7 @@ best_effort_timestamp=2048
best_effort_timestamp_time=0.040000 best_effort_timestamp_time=0.040000
pkt_duration=2048 pkt_duration=2048
pkt_duration_time=0.040000 pkt_duration_time=0.040000
pkt_pos=265248 pkt_pos=265206
pkt_size=230400 pkt_size=230400
width=320 width=320
height=240 height=240
...@@ -193,7 +193,7 @@ duration_time=0.040000 ...@@ -193,7 +193,7 @@ duration_time=0.040000
convergence_duration=N/A convergence_duration=N/A
convergence_duration_time=N/A convergence_duration_time=N/A
size=30000 size=30000
pos=495672 pos=495630
flags=K flags=K
[/PACKET] [/PACKET]
[FRAME] [FRAME]
...@@ -207,7 +207,7 @@ best_effort_timestamp=2048 ...@@ -207,7 +207,7 @@ best_effort_timestamp=2048
best_effort_timestamp_time=0.040000 best_effort_timestamp_time=0.040000
pkt_duration=2048 pkt_duration=2048
pkt_duration_time=0.040000 pkt_duration_time=0.040000
pkt_pos=495672 pkt_pos=495630
pkt_size=30000 pkt_size=30000
width=100 width=100
height=100 height=100
...@@ -232,7 +232,7 @@ duration_time=0.023220 ...@@ -232,7 +232,7 @@ duration_time=0.023220
convergence_duration=N/A convergence_duration=N/A
convergence_duration_time=N/A convergence_duration_time=N/A
size=2048 size=2048
pos=525677 pos=525635
flags=K flags=K
[/PACKET] [/PACKET]
[FRAME] [FRAME]
...@@ -246,7 +246,7 @@ best_effort_timestamp=2048 ...@@ -246,7 +246,7 @@ best_effort_timestamp=2048
best_effort_timestamp_time=0.046440 best_effort_timestamp_time=0.046440
pkt_duration=1024 pkt_duration=1024
pkt_duration_time=0.023220 pkt_duration_time=0.023220
pkt_pos=525677 pkt_pos=525635
pkt_size=2048 pkt_size=2048
sample_fmt=s16 sample_fmt=s16
nb_samples=1024 nb_samples=1024
...@@ -265,7 +265,7 @@ duration_time=0.023220 ...@@ -265,7 +265,7 @@ duration_time=0.023220
convergence_duration=N/A convergence_duration=N/A
convergence_duration_time=N/A convergence_duration_time=N/A
size=2048 size=2048
pos=527748 pos=527706
flags=K flags=K
[/PACKET] [/PACKET]
[FRAME] [FRAME]
...@@ -279,7 +279,7 @@ best_effort_timestamp=3072 ...@@ -279,7 +279,7 @@ best_effort_timestamp=3072
best_effort_timestamp_time=0.069660 best_effort_timestamp_time=0.069660
pkt_duration=1024 pkt_duration=1024
pkt_duration_time=0.023220 pkt_duration_time=0.023220
pkt_pos=527748 pkt_pos=527706
pkt_size=2048 pkt_size=2048
sample_fmt=s16 sample_fmt=s16
nb_samples=1024 nb_samples=1024
...@@ -298,7 +298,7 @@ duration_time=0.040000 ...@@ -298,7 +298,7 @@ duration_time=0.040000
convergence_duration=N/A convergence_duration=N/A
convergence_duration_time=N/A convergence_duration_time=N/A
size=230400 size=230400
pos=529826 pos=529784
flags=K flags=K
[/PACKET] [/PACKET]
[FRAME] [FRAME]
...@@ -312,7 +312,7 @@ best_effort_timestamp=4096 ...@@ -312,7 +312,7 @@ best_effort_timestamp=4096
best_effort_timestamp_time=0.080000 best_effort_timestamp_time=0.080000
pkt_duration=2048 pkt_duration=2048
pkt_duration_time=0.040000 pkt_duration_time=0.040000
pkt_pos=529826 pkt_pos=529784
pkt_size=230400 pkt_size=230400
width=320 width=320
height=240 height=240
...@@ -337,7 +337,7 @@ duration_time=0.040000 ...@@ -337,7 +337,7 @@ duration_time=0.040000
convergence_duration=N/A convergence_duration=N/A
convergence_duration_time=N/A convergence_duration_time=N/A
size=30000 size=30000
pos=760250 pos=760208
flags=K flags=K
[/PACKET] [/PACKET]
[FRAME] [FRAME]
...@@ -351,7 +351,7 @@ best_effort_timestamp=4096 ...@@ -351,7 +351,7 @@ best_effort_timestamp=4096
best_effort_timestamp_time=0.080000 best_effort_timestamp_time=0.080000
pkt_duration=2048 pkt_duration=2048
pkt_duration_time=0.040000 pkt_duration_time=0.040000
pkt_pos=760250 pkt_pos=760208
pkt_size=30000 pkt_size=30000
width=100 width=100
height=100 height=100
...@@ -376,7 +376,7 @@ duration_time=0.023220 ...@@ -376,7 +376,7 @@ duration_time=0.023220
convergence_duration=N/A convergence_duration=N/A
convergence_duration_time=N/A convergence_duration_time=N/A
size=2048 size=2048
pos=790255 pos=790213
flags=K flags=K
[/PACKET] [/PACKET]
[FRAME] [FRAME]
...@@ -390,7 +390,7 @@ best_effort_timestamp=4096 ...@@ -390,7 +390,7 @@ best_effort_timestamp=4096
best_effort_timestamp_time=0.092880 best_effort_timestamp_time=0.092880
pkt_duration=1024 pkt_duration=1024
pkt_duration_time=0.023220 pkt_duration_time=0.023220
pkt_pos=790255 pkt_pos=790213
pkt_size=2048 pkt_size=2048
sample_fmt=s16 sample_fmt=s16
nb_samples=1024 nb_samples=1024
...@@ -409,7 +409,7 @@ duration_time=0.023220 ...@@ -409,7 +409,7 @@ duration_time=0.023220
convergence_duration=N/A convergence_duration=N/A
convergence_duration_time=N/A convergence_duration_time=N/A
size=2048 size=2048
pos=792326 pos=792284
flags=K flags=K
[/PACKET] [/PACKET]
[FRAME] [FRAME]
...@@ -423,7 +423,7 @@ best_effort_timestamp=5120 ...@@ -423,7 +423,7 @@ best_effort_timestamp=5120
best_effort_timestamp_time=0.116100 best_effort_timestamp_time=0.116100
pkt_duration=1024 pkt_duration=1024
pkt_duration_time=0.023220 pkt_duration_time=0.023220
pkt_pos=792326 pkt_pos=792284
pkt_size=2048 pkt_size=2048
sample_fmt=s16 sample_fmt=s16
nb_samples=1024 nb_samples=1024
...@@ -442,7 +442,7 @@ duration_time=0.040000 ...@@ -442,7 +442,7 @@ duration_time=0.040000
convergence_duration=N/A convergence_duration=N/A
convergence_duration_time=N/A convergence_duration_time=N/A
size=230400 size=230400
pos=794404 pos=794362
flags=K flags=K
[/PACKET] [/PACKET]
[FRAME] [FRAME]
...@@ -456,7 +456,7 @@ best_effort_timestamp=6144 ...@@ -456,7 +456,7 @@ best_effort_timestamp=6144
best_effort_timestamp_time=0.120000 best_effort_timestamp_time=0.120000
pkt_duration=2048 pkt_duration=2048
pkt_duration_time=0.040000 pkt_duration_time=0.040000
pkt_pos=794404 pkt_pos=794362
pkt_size=230400 pkt_size=230400
width=320 width=320
height=240 height=240
...@@ -481,7 +481,7 @@ duration_time=0.040000 ...@@ -481,7 +481,7 @@ duration_time=0.040000
convergence_duration=N/A convergence_duration=N/A
convergence_duration_time=N/A convergence_duration_time=N/A
size=30000 size=30000
pos=1024828 pos=1024786
flags=K flags=K
[/PACKET] [/PACKET]
[FRAME] [FRAME]
...@@ -495,7 +495,7 @@ best_effort_timestamp=6144 ...@@ -495,7 +495,7 @@ best_effort_timestamp=6144
best_effort_timestamp_time=0.120000 best_effort_timestamp_time=0.120000
pkt_duration=2048 pkt_duration=2048
pkt_duration_time=0.040000 pkt_duration_time=0.040000
pkt_pos=1024828 pkt_pos=1024786
pkt_size=30000 pkt_size=30000
width=100 width=100
height=100 height=100
...@@ -545,7 +545,7 @@ DISPOSITION:visual_impaired=0 ...@@ -545,7 +545,7 @@ DISPOSITION:visual_impaired=0
DISPOSITION:clean_effects=0 DISPOSITION:clean_effects=0
DISPOSITION:attached_pic=0 DISPOSITION:attached_pic=0
TAG:E=mc² TAG:E=mc²
TAG:encoder=Lavc55.63.100 pcm_s16le TAG:encoder=pcm_s16le
[/STREAM] [/STREAM]
[STREAM] [STREAM]
index=1 index=1
...@@ -588,7 +588,7 @@ DISPOSITION:clean_effects=0 ...@@ -588,7 +588,7 @@ DISPOSITION:clean_effects=0
DISPOSITION:attached_pic=0 DISPOSITION:attached_pic=0
TAG:title=foobar TAG:title=foobar
TAG:duration_ts=field-and-tags-conflict-attempt TAG:duration_ts=field-and-tags-conflict-attempt
TAG:encoder=Lavc55.63.100 rawvideo TAG:encoder=rawvideo
[/STREAM] [/STREAM]
[STREAM] [STREAM]
index=2 index=2
...@@ -629,7 +629,7 @@ DISPOSITION:hearing_impaired=0 ...@@ -629,7 +629,7 @@ DISPOSITION:hearing_impaired=0
DISPOSITION:visual_impaired=0 DISPOSITION:visual_impaired=0
DISPOSITION:clean_effects=0 DISPOSITION:clean_effects=0
DISPOSITION:attached_pic=0 DISPOSITION:attached_pic=0
TAG:encoder=Lavc55.63.100 rawvideo TAG:encoder=rawvideo
[/STREAM] [/STREAM]
[FORMAT] [FORMAT]
filename=tests/data/ffprobe-test.nut filename=tests/data/ffprobe-test.nut
...@@ -638,8 +638,8 @@ nb_programs=0 ...@@ -638,8 +638,8 @@ nb_programs=0
format_name=nut format_name=nut
start_time=0.000000 start_time=0.000000
duration=0.120000 duration=0.120000
size=1054909 size=1054867
bit_rate=70327266 bit_rate=70324466
probe_score=100 probe_score=100
TAG:title=ffprobe test file TAG:title=ffprobe test file
TAG:comment='A comment with CSV, XML & JSON special chars': <tag value="x"> TAG:comment='A comment with CSV, XML & JSON special chars': <tag value="x">
......
tests/ref/fate/ffprobe_flat
View file @ bbee02ed
This diff is collapsed.
tests/ref/fate/ffprobe_ini
View file @ bbee02ed
...@@ -12,7 +12,7 @@ duration_time=0.023220 ...@@ -12,7 +12,7 @@ duration_time=0.023220
convergence_duration=N/A convergence_duration=N/A
convergence_duration_time=N/A convergence_duration_time=N/A
size=2048 size=2048
pos=669 pos=627
flags=K flags=K
[packets_and_frames.frame.0] [packets_and_frames.frame.0]
...@@ -26,7 +26,7 @@ best_effort_timestamp=0 ...@@ -26,7 +26,7 @@ best_effort_timestamp=0
best_effort_timestamp_time=0.000000 best_effort_timestamp_time=0.000000
pkt_duration=1024 pkt_duration=1024
pkt_duration_time=0.023220 pkt_duration_time=0.023220
pkt_pos=669 pkt_pos=627
pkt_size=2048 pkt_size=2048
sample_fmt=s16 sample_fmt=s16
nb_samples=1024 nb_samples=1024
...@@ -45,7 +45,7 @@ duration_time=0.040000 ...@@ -45,7 +45,7 @@ duration_time=0.040000
convergence_duration=N/A convergence_duration=N/A
convergence_duration_time=N/A convergence_duration_time=N/A
size=230400 size=230400
pos=2744 pos=2702
flags=K flags=K
[packets_and_frames.frame.1] [packets_and_frames.frame.1]
...@@ -59,7 +59,7 @@ best_effort_timestamp=0 ...@@ -59,7 +59,7 @@ best_effort_timestamp=0
best_effort_timestamp_time=0.000000 best_effort_timestamp_time=0.000000
pkt_duration=2048 pkt_duration=2048
pkt_duration_time=0.040000 pkt_duration_time=0.040000
pkt_pos=2744 pkt_pos=2702
pkt_size=230400 pkt_size=230400
width=320 width=320
height=240 height=240
...@@ -84,7 +84,7 @@ duration_time=0.040000 ...@@ -84,7 +84,7 @@ duration_time=0.040000
convergence_duration=N/A convergence_duration=N/A
convergence_duration_time=N/A convergence_duration_time=N/A
size=30000 size=30000
pos=233165 pos=233123
flags=K flags=K
[packets_and_frames.frame.2] [packets_and_frames.frame.2]
...@@ -98,7 +98,7 @@ best_effort_timestamp=0 ...@@ -98,7 +98,7 @@ best_effort_timestamp=0
best_effort_timestamp_time=0.000000 best_effort_timestamp_time=0.000000
pkt_duration=2048 pkt_duration=2048
pkt_duration_time=0.040000 pkt_duration_time=0.040000
pkt_pos=233165 pkt_pos=233123
pkt_size=30000 pkt_size=30000
width=100 width=100
height=100 height=100
...@@ -123,7 +123,7 @@ duration_time=0.023220 ...@@ -123,7 +123,7 @@ duration_time=0.023220
convergence_duration=N/A convergence_duration=N/A
convergence_duration_time=N/A convergence_duration_time=N/A
size=2048 size=2048
pos=263170 pos=263128
flags=K flags=K
[packets_and_frames.frame.3] [packets_and_frames.frame.3]
...@@ -137,7 +137,7 @@ best_effort_timestamp=1024 ...@@ -137,7 +137,7 @@ best_effort_timestamp=1024
best_effort_timestamp_time=0.023220 best_effort_timestamp_time=0.023220
pkt_duration=1024 pkt_duration=1024
pkt_duration_time=0.023220 pkt_duration_time=0.023220
pkt_pos=263170 pkt_pos=263128
pkt_size=2048 pkt_size=2048
sample_fmt=s16 sample_fmt=s16
nb_samples=1024 nb_samples=1024
...@@ -156,7 +156,7 @@ duration_time=0.040000 ...@@ -156,7 +156,7 @@ duration_time=0.040000
convergence_duration=N/A convergence_duration=N/A
convergence_duration_time=N/A convergence_duration_time=N/A
size=230400 size=230400
pos=265248 pos=265206
flags=K flags=K
[packets_and_frames.frame.4] [packets_and_frames.frame.4]
...@@ -170,7 +170,7 @@ best_effort_timestamp=2048 ...@@ -170,7 +170,7 @@ best_effort_timestamp=2048
best_effort_timestamp_time=0.040000 best_effort_timestamp_time=0.040000
pkt_duration=2048 pkt_duration=2048
pkt_duration_time=0.040000 pkt_duration_time=0.040000
pkt_pos=265248 pkt_pos=265206
pkt_size=230400 pkt_size=230400
width=320 width=320
height=240 height=240
...@@ -195,7 +195,7 @@ duration_time=0.040000 ...@@ -195,7 +195,7 @@ duration_time=0.040000
convergence_duration=N/A convergence_duration=N/A
convergence_duration_time=N/A convergence_duration_time=N/A
size=30000 size=30000
pos=495672 pos=495630
flags=K flags=K
[packets_and_frames.frame.5] [packets_and_frames.frame.5]
...@@ -209,7 +209,7 @@ best_effort_timestamp=2048 ...@@ -209,7 +209,7 @@ best_effort_timestamp=2048
best_effort_timestamp_time=0.040000 best_effort_timestamp_time=0.040000
pkt_duration=2048 pkt_duration=2048
pkt_duration_time=0.040000 pkt_duration_time=0.040000
pkt_pos=495672 pkt_pos=495630
pkt_size=30000 pkt_size=30000
width=100 width=100
height=100 height=100
...@@ -234,7 +234,7 @@ duration_time=0.023220 ...@@ -234,7 +234,7 @@ duration_time=0.023220
convergence_duration=N/A convergence_duration=N/A
convergence_duration_time=N/A convergence_duration_time=N/A
size=2048 size=2048
pos=525677 pos=525635
flags=K flags=K
[packets_and_frames.frame.6] [packets_and_frames.frame.6]
...@@ -248,7 +248,7 @@ best_effort_timestamp=2048 ...@@ -248,7 +248,7 @@ best_effort_timestamp=2048
best_effort_timestamp_time=0.046440 best_effort_timestamp_time=0.046440
pkt_duration=1024 pkt_duration=1024
pkt_duration_time=0.023220 pkt_duration_time=0.023220
pkt_pos=525677 pkt_pos=525635
pkt_size=2048 pkt_size=2048
sample_fmt=s16 sample_fmt=s16
nb_samples=1024 nb_samples=1024
...@@ -267,7 +267,7 @@ duration_time=0.023220 ...@@ -267,7 +267,7 @@ duration_time=0.023220
convergence_duration=N/A convergence_duration=N/A
convergence_duration_time=N/A convergence_duration_time=N/A
size=2048 size=2048
pos=527748 pos=527706
flags=K flags=K
[packets_and_frames.frame.7] [packets_and_frames.frame.7]
...@@ -281,7 +281,7 @@ best_effort_timestamp=3072 ...@@ -281,7 +281,7 @@ best_effort_timestamp=3072
best_effort_timestamp_time=0.069660 best_effort_timestamp_time=0.069660
pkt_duration=1024 pkt_duration=1024
pkt_duration_time=0.023220 pkt_duration_time=0.023220
pkt_pos=527748 pkt_pos=527706
pkt_size=2048 pkt_size=2048
sample_fmt=s16 sample_fmt=s16
nb_samples=1024 nb_samples=1024
...@@ -300,7 +300,7 @@ duration_time=0.040000 ...@@ -300,7 +300,7 @@ duration_time=0.040000
convergence_duration=N/A convergence_duration=N/A
convergence_duration_time=N/A convergence_duration_time=N/A
size=230400 size=230400
pos=529826 pos=529784
flags=K flags=K
[packets_and_frames.frame.8] [packets_and_frames.frame.8]
...@@ -314,7 +314,7 @@ best_effort_timestamp=4096 ...@@ -314,7 +314,7 @@ best_effort_timestamp=4096
best_effort_timestamp_time=0.080000 best_effort_timestamp_time=0.080000
pkt_duration=2048 pkt_duration=2048
pkt_duration_time=0.040000 pkt_duration_time=0.040000
pkt_pos=529826 pkt_pos=529784
pkt_size=230400 pkt_size=230400
width=320 width=320
height=240 height=240
...@@ -339,7 +339,7 @@ duration_time=0.040000 ...@@ -339,7 +339,7 @@ duration_time=0.040000
convergence_duration=N/A convergence_duration=N/A
convergence_duration_time=N/A convergence_duration_time=N/A
size=30000 size=30000
pos=760250 pos=760208
flags=K flags=K
[packets_and_frames.frame.9] [packets_and_frames.frame.9]
...@@ -353,7 +353,7 @@ best_effort_timestamp=4096 ...@@ -353,7 +353,7 @@ best_effort_timestamp=4096
best_effort_timestamp_time=0.080000 best_effort_timestamp_time=0.080000
pkt_duration=2048 pkt_duration=2048
pkt_duration_time=0.040000 pkt_duration_time=0.040000
pkt_pos=760250 pkt_pos=760208
pkt_size=30000 pkt_size=30000
width=100 width=100
height=100 height=100
...@@ -378,7 +378,7 @@ duration_time=0.023220 ...@@ -378,7 +378,7 @@ duration_time=0.023220
convergence_duration=N/A convergence_duration=N/A
convergence_duration_time=N/A convergence_duration_time=N/A
size=2048 size=2048
pos=790255 pos=790213
flags=K flags=K
[packets_and_frames.frame.10] [packets_and_frames.frame.10]
...@@ -392,7 +392,7 @@ best_effort_timestamp=4096 ...@@ -392,7 +392,7 @@ best_effort_timestamp=4096
best_effort_timestamp_time=0.092880 best_effort_timestamp_time=0.092880
pkt_duration=1024 pkt_duration=1024
pkt_duration_time=0.023220 pkt_duration_time=0.023220
pkt_pos=790255 pkt_pos=790213
pkt_size=2048 pkt_size=2048
sample_fmt=s16 sample_fmt=s16
nb_samples=1024 nb_samples=1024
...@@ -411,7 +411,7 @@ duration_time=0.023220 ...@@ -411,7 +411,7 @@ duration_time=0.023220
convergence_duration=N/A convergence_duration=N/A
convergence_duration_time=N/A convergence_duration_time=N/A
size=2048 size=2048
pos=792326 pos=792284
flags=K flags=K
[packets_and_frames.frame.11] [packets_and_frames.frame.11]
...@@ -425,7 +425,7 @@ best_effort_timestamp=5120 ...@@ -425,7 +425,7 @@ best_effort_timestamp=5120
best_effort_timestamp_time=0.116100 best_effort_timestamp_time=0.116100
pkt_duration=1024 pkt_duration=1024
pkt_duration_time=0.023220 pkt_duration_time=0.023220
pkt_pos=792326 pkt_pos=792284
pkt_size=2048 pkt_size=2048
sample_fmt=s16 sample_fmt=s16
nb_samples=1024 nb_samples=1024
...@@ -444,7 +444,7 @@ duration_time=0.040000 ...@@ -444,7 +444,7 @@ duration_time=0.040000
convergence_duration=N/A convergence_duration=N/A
convergence_duration_time=N/A convergence_duration_time=N/A
size=230400 size=230400
pos=794404 pos=794362
flags=K flags=K
[packets_and_frames.frame.12] [packets_and_frames.frame.12]
...@@ -458,7 +458,7 @@ best_effort_timestamp=6144 ...@@ -458,7 +458,7 @@ best_effort_timestamp=6144
best_effort_timestamp_time=0.120000 best_effort_timestamp_time=0.120000
pkt_duration=2048 pkt_duration=2048
pkt_duration_time=0.040000 pkt_duration_time=0.040000
pkt_pos=794404 pkt_pos=794362
pkt_size=230400 pkt_size=230400
width=320 width=320
height=240 height=240
...@@ -483,7 +483,7 @@ duration_time=0.040000 ...@@ -483,7 +483,7 @@ duration_time=0.040000
convergence_duration=N/A convergence_duration=N/A
convergence_duration_time=N/A convergence_duration_time=N/A
size=30000 size=30000
pos=1024828 pos=1024786
flags=K flags=K
[packets_and_frames.frame.13] [packets_and_frames.frame.13]
...@@ -497,7 +497,7 @@ best_effort_timestamp=6144 ...@@ -497,7 +497,7 @@ best_effort_timestamp=6144
best_effort_timestamp_time=0.120000 best_effort_timestamp_time=0.120000
pkt_duration=2048 pkt_duration=2048
pkt_duration_time=0.040000 pkt_duration_time=0.040000
pkt_pos=1024828 pkt_pos=1024786
pkt_size=30000 pkt_size=30000
width=100 width=100
height=100 height=100
...@@ -551,7 +551,7 @@ attached_pic=0 ...@@ -551,7 +551,7 @@ attached_pic=0
[streams.stream.0.tags] [streams.stream.0.tags]
E=mc² E=mc²
encoder=Lavc55.63.100 pcm_s16le encoder=pcm_s16le
[streams.stream.1] [streams.stream.1]
index=1 index=1
...@@ -598,7 +598,7 @@ attached_pic=0 ...@@ -598,7 +598,7 @@ attached_pic=0
[streams.stream.1.tags] [streams.stream.1.tags]
title=foobar title=foobar
duration_ts=field-and-tags-conflict-attempt duration_ts=field-and-tags-conflict-attempt
encoder=Lavc55.63.100 rawvideo encoder=rawvideo
[streams.stream.2] [streams.stream.2]
index=2 index=2
...@@ -643,7 +643,7 @@ clean_effects=0 ...@@ -643,7 +643,7 @@ clean_effects=0
attached_pic=0 attached_pic=0
[streams.stream.2.tags] [streams.stream.2.tags]
encoder=Lavc55.63.100 rawvideo encoder=rawvideo
[format] [format]
filename=tests/data/ffprobe-test.nut filename=tests/data/ffprobe-test.nut
...@@ -652,8 +652,8 @@ nb_programs=0 ...@@ -652,8 +652,8 @@ nb_programs=0
format_name=nut format_name=nut
start_time=0.000000 start_time=0.000000
duration=0.120000 duration=0.120000
size=1054909 size=1054867
bit_rate=70327266 bit_rate=70324466
probe_score=100 probe_score=100
[format.tags] [format.tags]
......
tests/ref/fate/ffprobe_json
View file @ bbee02ed
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
"duration": 1024, "duration": 1024,
"duration_time": "0.023220", "duration_time": "0.023220",
"size": "2048", "size": "2048",
"pos": "669", "pos": "627",
"flags": "K" "flags": "K"
}, },
{ {
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
"best_effort_timestamp_time": "0.000000", "best_effort_timestamp_time": "0.000000",
"pkt_duration": 1024, "pkt_duration": 1024,
"pkt_duration_time": "0.023220", "pkt_duration_time": "0.023220",
"pkt_pos": "669", "pkt_pos": "627",
"pkt_size": "2048", "pkt_size": "2048",
"sample_fmt": "s16", "sample_fmt": "s16",
"nb_samples": 1024, "nb_samples": 1024,
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
"duration": 2048, "duration": 2048,
"duration_time": "0.040000", "duration_time": "0.040000",
"size": "230400", "size": "230400",
"pos": "2744", "pos": "2702",
"flags": "K" "flags": "K"
}, },
{ {
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
"best_effort_timestamp_time": "0.000000", "best_effort_timestamp_time": "0.000000",
"pkt_duration": 2048, "pkt_duration": 2048,
"pkt_duration_time": "0.040000", "pkt_duration_time": "0.040000",
"pkt_pos": "2744", "pkt_pos": "2702",
"pkt_size": "230400", "pkt_size": "230400",
"width": 320, "width": 320,
"height": 240, "height": 240,
...@@ -82,7 +82,7 @@ ...@@ -82,7 +82,7 @@
"duration": 2048, "duration": 2048,
"duration_time": "0.040000", "duration_time": "0.040000",
"size": "30000", "size": "30000",
"pos": "233165", "pos": "233123",
"flags": "K" "flags": "K"
}, },
{ {
...@@ -97,7 +97,7 @@ ...@@ -97,7 +97,7 @@
"best_effort_timestamp_time": "0.000000", "best_effort_timestamp_time": "0.000000",
"pkt_duration": 2048, "pkt_duration": 2048,
"pkt_duration_time": "0.040000", "pkt_duration_time": "0.040000",
"pkt_pos": "233165", "pkt_pos": "233123",
"pkt_size": "30000", "pkt_size": "30000",
"width": 100, "width": 100,
"height": 100, "height": 100,
...@@ -121,7 +121,7 @@ ...@@ -121,7 +121,7 @@
"duration": 1024, "duration": 1024,
"duration_time": "0.023220", "duration_time": "0.023220",
"size": "2048", "size": "2048",
"pos": "263170", "pos": "263128",
"flags": "K" "flags": "K"
}, },
{ {
...@@ -136,7 +136,7 @@ ...@@ -136,7 +136,7 @@
"best_effort_timestamp_time": "0.023220", "best_effort_timestamp_time": "0.023220",
"pkt_duration": 1024, "pkt_duration": 1024,
"pkt_duration_time": "0.023220", "pkt_duration_time": "0.023220",
"pkt_pos": "263170", "pkt_pos": "263128",
"pkt_size": "2048", "pkt_size": "2048",
"sample_fmt": "s16", "sample_fmt": "s16",
"nb_samples": 1024, "nb_samples": 1024,
...@@ -153,7 +153,7 @@ ...@@ -153,7 +153,7 @@
"duration": 2048, "duration": 2048,
"duration_time": "0.040000", "duration_time": "0.040000",
"size": "230400", "size": "230400",
"pos": "265248", "pos": "265206",
"flags": "K" "flags": "K"
}, },
{ {
...@@ -168,7 +168,7 @@ ...@@ -168,7 +168,7 @@
"best_effort_timestamp_time": "0.040000", "best_effort_timestamp_time": "0.040000",
"pkt_duration": 2048, "pkt_duration": 2048,
"pkt_duration_time": "0.040000", "pkt_duration_time": "0.040000",
"pkt_pos": "265248", "pkt_pos": "265206",
"pkt_size": "230400", "pkt_size": "230400",
"width": 320, "width": 320,
"height": 240, "height": 240,
...@@ -192,7 +192,7 @@ ...@@ -192,7 +192,7 @@
"duration": 2048, "duration": 2048,
"duration_time": "0.040000", "duration_time": "0.040000",
"size": "30000", "size": "30000",
"pos": "495672", "pos": "495630",
"flags": "K" "flags": "K"
}, },
{ {
...@@ -207,7 +207,7 @@ ...@@ -207,7 +207,7 @@
"best_effort_timestamp_time": "0.040000", "best_effort_timestamp_time": "0.040000",
"pkt_duration": 2048, "pkt_duration": 2048,
"pkt_duration_time": "0.040000", "pkt_duration_time": "0.040000",
"pkt_pos": "495672", "pkt_pos": "495630",
"pkt_size": "30000", "pkt_size": "30000",
"width": 100, "width": 100,
"height": 100, "height": 100,
...@@ -231,7 +231,7 @@ ...@@ -231,7 +231,7 @@
"duration": 1024, "duration": 1024,
"duration_time": "0.023220", "duration_time": "0.023220",
"size": "2048", "size": "2048",
"pos": "525677", "pos": "525635",
"flags": "K" "flags": "K"
}, },
{ {
...@@ -246,7 +246,7 @@ ...@@ -246,7 +246,7 @@
"best_effort_timestamp_time": "0.046440", "best_effort_timestamp_time": "0.046440",
"pkt_duration": 1024, "pkt_duration": 1024,
"pkt_duration_time": "0.023220", "pkt_duration_time": "0.023220",
"pkt_pos": "525677", "pkt_pos": "525635",
"pkt_size": "2048", "pkt_size": "2048",
"sample_fmt": "s16", "sample_fmt": "s16",
"nb_samples": 1024, "nb_samples": 1024,
...@@ -263,7 +263,7 @@ ...@@ -263,7 +263,7 @@
"duration": 1024, "duration": 1024,
"duration_time": "0.023220", "duration_time": "0.023220",
"size": "2048", "size": "2048",
"pos": "527748", "pos": "527706",
"flags": "K" "flags": "K"
}, },
{ {
...@@ -278,7 +278,7 @@ ...@@ -278,7 +278,7 @@
"best_effort_timestamp_time": "0.069660", "best_effort_timestamp_time": "0.069660",
"pkt_duration": 1024, "pkt_duration": 1024,
"pkt_duration_time": "0.023220", "pkt_duration_time": "0.023220",
"pkt_pos": "527748", "pkt_pos": "527706",
"pkt_size": "2048", "pkt_size": "2048",
"sample_fmt": "s16", "sample_fmt": "s16",
"nb_samples": 1024, "nb_samples": 1024,
...@@ -295,7 +295,7 @@ ...@@ -295,7 +295,7 @@
"duration": 2048, "duration": 2048,
"duration_time": "0.040000", "duration_time": "0.040000",
"size": "230400", "size": "230400",
"pos": "529826", "pos": "529784",
"flags": "K" "flags": "K"
}, },
{ {
...@@ -310,7 +310,7 @@ ...@@ -310,7 +310,7 @@
"best_effort_timestamp_time": "0.080000", "best_effort_timestamp_time": "0.080000",
"pkt_duration": 2048, "pkt_duration": 2048,
"pkt_duration_time": "0.040000", "pkt_duration_time": "0.040000",
"pkt_pos": "529826", "pkt_pos": "529784",
"pkt_size": "230400", "pkt_size": "230400",
"width": 320, "width": 320,
"height": 240, "height": 240,
...@@ -334,7 +334,7 @@ ...@@ -334,7 +334,7 @@
"duration": 2048, "duration": 2048,
"duration_time": "0.040000", "duration_time": "0.040000",
"size": "30000", "size": "30000",
"pos": "760250", "pos": "760208",
"flags": "K" "flags": "K"
}, },
{ {
...@@ -349,7 +349,7 @@ ...@@ -349,7 +349,7 @@
"best_effort_timestamp_time": "0.080000", "best_effort_timestamp_time": "0.080000",
"pkt_duration": 2048, "pkt_duration": 2048,
"pkt_duration_time": "0.040000", "pkt_duration_time": "0.040000",
"pkt_pos": "760250", "pkt_pos": "760208",
"pkt_size": "30000", "pkt_size": "30000",
"width": 100, "width": 100,
"height": 100, "height": 100,
...@@ -373,7 +373,7 @@ ...@@ -373,7 +373,7 @@
"duration": 1024, "duration": 1024,
"duration_time": "0.023220", "duration_time": "0.023220",
"size": "2048", "size": "2048",
"pos": "790255", "pos": "790213",
"flags": "K" "flags": "K"
}, },
{ {
...@@ -388,7 +388,7 @@ ...@@ -388,7 +388,7 @@
"best_effort_timestamp_time": "0.092880", "best_effort_timestamp_time": "0.092880",
"pkt_duration": 1024, "pkt_duration": 1024,
"pkt_duration_time": "0.023220", "pkt_duration_time": "0.023220",
"pkt_pos": "790255", "pkt_pos": "790213",
"pkt_size": "2048", "pkt_size": "2048",
"sample_fmt": "s16", "sample_fmt": "s16",
"nb_samples": 1024, "nb_samples": 1024,
...@@ -405,7 +405,7 @@ ...@@ -405,7 +405,7 @@
"duration": 1024, "duration": 1024,
"duration_time": "0.023220", "duration_time": "0.023220",
"size": "2048", "size": "2048",
"pos": "792326", "pos": "792284",
"flags": "K" "flags": "K"
}, },
{ {
...@@ -420,7 +420,7 @@ ...@@ -420,7 +420,7 @@
"best_effort_timestamp_time": "0.116100", "best_effort_timestamp_time": "0.116100",
"pkt_duration": 1024, "pkt_duration": 1024,
"pkt_duration_time": "0.023220", "pkt_duration_time": "0.023220",
"pkt_pos": "792326", "pkt_pos": "792284",
"pkt_size": "2048", "pkt_size": "2048",
"sample_fmt": "s16", "sample_fmt": "s16",
"nb_samples": 1024, "nb_samples": 1024,
...@@ -437,7 +437,7 @@ ...@@ -437,7 +437,7 @@
"duration": 2048, "duration": 2048,
"duration_time": "0.040000", "duration_time": "0.040000",
"size": "230400", "size": "230400",
"pos": "794404", "pos": "794362",
"flags": "K" "flags": "K"
}, },
{ {
...@@ -452,7 +452,7 @@ ...@@ -452,7 +452,7 @@
"best_effort_timestamp_time": "0.120000", "best_effort_timestamp_time": "0.120000",
"pkt_duration": 2048, "pkt_duration": 2048,
"pkt_duration_time": "0.040000", "pkt_duration_time": "0.040000",
"pkt_pos": "794404", "pkt_pos": "794362",
"pkt_size": "230400", "pkt_size": "230400",
"width": 320, "width": 320,
"height": 240, "height": 240,
...@@ -476,7 +476,7 @@ ...@@ -476,7 +476,7 @@
"duration": 2048, "duration": 2048,
"duration_time": "0.040000", "duration_time": "0.040000",
"size": "30000", "size": "30000",
"pos": "1024828", "pos": "1024786",
"flags": "K" "flags": "K"
}, },
{ {
...@@ -491,7 +491,7 @@ ...@@ -491,7 +491,7 @@
"best_effort_timestamp_time": "0.120000", "best_effort_timestamp_time": "0.120000",
"pkt_duration": 2048, "pkt_duration": 2048,
"pkt_duration_time": "0.040000", "pkt_duration_time": "0.040000",
"pkt_pos": "1024828", "pkt_pos": "1024786",
"pkt_size": "30000", "pkt_size": "30000",
"width": 100, "width": 100,
"height": 100, "height": 100,
...@@ -540,7 +540,7 @@ ...@@ -540,7 +540,7 @@
}, },
"tags": { "tags": {
"E": "mc²", "E": "mc²",
"encoder": "Lavc55.63.100 pcm_s16le" "encoder": "pcm_s16le"
} }
}, },
{ {
...@@ -580,7 +580,7 @@ ...@@ -580,7 +580,7 @@
"tags": { "tags": {
"title": "foobar", "title": "foobar",
"duration_ts": "field-and-tags-conflict-attempt", "duration_ts": "field-and-tags-conflict-attempt",
"encoder": "Lavc55.63.100 rawvideo" "encoder": "rawvideo"
} }
}, },
{ {
...@@ -618,7 +618,7 @@ ...@@ -618,7 +618,7 @@
"attached_pic": 0 "attached_pic": 0
}, },
"tags": { "tags": {
"encoder": "Lavc55.63.100 rawvideo" "encoder": "rawvideo"
} }
} }
], ],
...@@ -629,8 +629,8 @@ ...@@ -629,8 +629,8 @@
"format_name": "nut", "format_name": "nut",
"start_time": "0.000000", "start_time": "0.000000",
"duration": "0.120000", "duration": "0.120000",
"size": "1054909", "size": "1054867",
"bit_rate": "70327266", "bit_rate": "70324466",
"probe_score": 100, "probe_score": 100,
"tags": { "tags": {
"title": "ffprobe test file", "title": "ffprobe test file",
......
tests/ref/fate/ffprobe_xml
View file @ bbee02ed
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