Skip to content

F
ffmpeg.wasm-core
Commit 6a2cbf90 authored by Sasi Inguva's avatar Sasi Inguva Committed by Michael Niedermayer
Browse files
Options

ffprobe.c: Indicate decode-but-discard packets when doing -show_packets. 

Signed-off-by: 's avatarSasi Inguva <isasi@google.com>
Signed-off-by: 's avatarMichael Niedermayer <michael@niedermayer.cc>
parent 4a3b41be
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 442 additions and 441 deletions
ffprobe.c
View file @ 6a2cbf90
......@@ -1815,7 +1815,8 @@ static void show_packet(WriterContext *w, InputFile *ifile, AVPacket *pkt, int p
print_val("size", pkt->size, unit_byte_str);
if (pkt->pos != -1) print_fmt ("pos", "%"PRId64, pkt->pos);
else print_str_opt("pos", "N/A");
print_fmt("flags", "%c", pkt->flags & AV_PKT_FLAG_KEY ? 'K' : '_');
print_fmt("flags", "%c%c", pkt->flags & AV_PKT_FLAG_KEY ? 'K' : '_',
pkt->flags & AV_PKT_FLAG_DISCARD ? 'D' : '_');
if (pkt->side_data_elems) {
int size;
......
tests/ref/fate/concat-demuxer-extended-lavf-mxf
View file @ 6a2cbf90
0aa1ca6ff6e2e5aa926454d22fdaecd5 *tests/data/fate/concat-demuxer-extended-lavf-mxf.ffprobe
21eb3a629ff504b55c93a66879a31362 *tests/data/fate/concat-demuxer-extended-lavf-mxf.ffprobe
tests/ref/fate/concat-demuxer-extended-lavf-mxf_d10
View file @ 6a2cbf90
14c2b8d8f82f261c9627b33c481c0e8c *tests/data/fate/concat-demuxer-extended-lavf-mxf_d10.ffprobe
67a03ad49f1bd17131f751313639b61e *tests/data/fate/concat-demuxer-extended-lavf-mxf_d10.ffprobe
tests/ref/fate/ffprobe_compact
View file @ 6a2cbf90
This diff is collapsed.
tests/ref/fate/ffprobe_csv
View file @ 6a2cbf90
packet,audio,0,0,0.000000,0,0.000000,1024,0.023220,N/A,N/A,2048,647,K
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
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
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
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
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
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
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
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
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
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
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
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
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
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/25,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
......
tests/ref/fate/ffprobe_default
View file @ 6a2cbf90
......@@ -11,7 +11,7 @@ convergence_duration=N/A
convergence_duration_time=N/A
size=2048
pos=647
flags=K
flags=K_
[/PACKET]
[FRAME]
media_type=audio
......@@ -45,7 +45,7 @@ convergence_duration=N/A
convergence_duration_time=N/A
size=230400
pos=2722
flags=K
flags=K_
[/PACKET]
[FRAME]
media_type=video
......@@ -85,7 +85,7 @@ convergence_duration=N/A
convergence_duration_time=N/A
size=30000
pos=233143
flags=K
flags=K_
[/PACKET]
[FRAME]
media_type=video
......@@ -125,7 +125,7 @@ convergence_duration=N/A
convergence_duration_time=N/A
size=2048
pos=263148
flags=K
flags=K_
[/PACKET]
[FRAME]
media_type=audio
......@@ -159,7 +159,7 @@ convergence_duration=N/A
convergence_duration_time=N/A
size=230400
pos=265226
flags=K
flags=K_
[/PACKET]
[FRAME]
media_type=video
......@@ -199,7 +199,7 @@ convergence_duration=N/A
convergence_duration_time=N/A
size=30000
pos=495650
flags=K
flags=K_
[/PACKET]
[FRAME]
media_type=video
......@@ -239,7 +239,7 @@ convergence_duration=N/A
convergence_duration_time=N/A
size=2048
pos=525655
flags=K
flags=K_
[/PACKET]
[FRAME]
media_type=audio
......@@ -273,7 +273,7 @@ convergence_duration=N/A
convergence_duration_time=N/A
size=2048
pos=527726
flags=K
flags=K_
[/PACKET]
[FRAME]
media_type=audio
......@@ -307,7 +307,7 @@ convergence_duration=N/A
convergence_duration_time=N/A
size=230400
pos=529804
flags=K
flags=K_
[/PACKET]
[FRAME]
media_type=video
......@@ -347,7 +347,7 @@ convergence_duration=N/A
convergence_duration_time=N/A
size=30000
pos=760228
flags=K
flags=K_
[/PACKET]
[FRAME]
media_type=video
......@@ -387,7 +387,7 @@ convergence_duration=N/A
convergence_duration_time=N/A
size=2048
pos=790233
flags=K
flags=K_
[/PACKET]
[FRAME]
media_type=audio
......@@ -421,7 +421,7 @@ convergence_duration=N/A
convergence_duration_time=N/A
size=2048
pos=792304
flags=K
flags=K_
[/PACKET]
[FRAME]
media_type=audio
......@@ -455,7 +455,7 @@ convergence_duration=N/A
convergence_duration_time=N/A
size=230400
pos=794382
flags=K
flags=K_
[/PACKET]
[FRAME]
media_type=video
......@@ -495,7 +495,7 @@ convergence_duration=N/A
convergence_duration_time=N/A
size=30000
pos=1024806
flags=K
flags=K_
[/PACKET]
[FRAME]
media_type=video
......
tests/ref/fate/ffprobe_flat
View file @ 6a2cbf90
......@@ -10,7 +10,7 @@ packets_and_frames.packet.0.convergence_duration="N/A"
packets_and_frames.packet.0.convergence_duration_time="N/A"
packets_and_frames.packet.0.size="2048"
packets_and_frames.packet.0.pos="647"
packets_and_frames.packet.0.flags="K"
packets_and_frames.packet.0.flags="K_"
packets_and_frames.frame.0.media_type="audio"
packets_and_frames.frame.0.stream_index=0
packets_and_frames.frame.0.key_frame=1
......@@ -40,7 +40,7 @@ packets_and_frames.packet.1.convergence_duration="N/A"
packets_and_frames.packet.1.convergence_duration_time="N/A"
packets_and_frames.packet.1.size="230400"
packets_and_frames.packet.1.pos="2722"
packets_and_frames.packet.1.flags="K"
packets_and_frames.packet.1.flags="K_"
packets_and_frames.frame.1.media_type="video"
packets_and_frames.frame.1.stream_index=1
packets_and_frames.frame.1.key_frame=1
......@@ -76,7 +76,7 @@ packets_and_frames.packet.2.convergence_duration="N/A"
packets_and_frames.packet.2.convergence_duration_time="N/A"
packets_and_frames.packet.2.size="30000"
packets_and_frames.packet.2.pos="233143"
packets_and_frames.packet.2.flags="K"
packets_and_frames.packet.2.flags="K_"
packets_and_frames.frame.2.media_type="video"
packets_and_frames.frame.2.stream_index=2
packets_and_frames.frame.2.key_frame=1
......@@ -112,7 +112,7 @@ packets_and_frames.packet.3.convergence_duration="N/A"
packets_and_frames.packet.3.convergence_duration_time="N/A"
packets_and_frames.packet.3.size="2048"
packets_and_frames.packet.3.pos="263148"
packets_and_frames.packet.3.flags="K"
packets_and_frames.packet.3.flags="K_"
packets_and_frames.frame.3.media_type="audio"
packets_and_frames.frame.3.stream_index=0
packets_and_frames.frame.3.key_frame=1
......@@ -142,7 +142,7 @@ packets_and_frames.packet.4.convergence_duration="N/A"
packets_and_frames.packet.4.convergence_duration_time="N/A"
packets_and_frames.packet.4.size="230400"
packets_and_frames.packet.4.pos="265226"
packets_and_frames.packet.4.flags="K"
packets_and_frames.packet.4.flags="K_"
packets_and_frames.frame.4.media_type="video"
packets_and_frames.frame.4.stream_index=1
packets_and_frames.frame.4.key_frame=1
......@@ -178,7 +178,7 @@ packets_and_frames.packet.5.convergence_duration="N/A"
packets_and_frames.packet.5.convergence_duration_time="N/A"
packets_and_frames.packet.5.size="30000"
packets_and_frames.packet.5.pos="495650"
packets_and_frames.packet.5.flags="K"
packets_and_frames.packet.5.flags="K_"
packets_and_frames.frame.5.media_type="video"
packets_and_frames.frame.5.stream_index=2
packets_and_frames.frame.5.key_frame=1
......@@ -214,7 +214,7 @@ packets_and_frames.packet.6.convergence_duration="N/A"
packets_and_frames.packet.6.convergence_duration_time="N/A"
packets_and_frames.packet.6.size="2048"
packets_and_frames.packet.6.pos="525655"
packets_and_frames.packet.6.flags="K"
packets_and_frames.packet.6.flags="K_"
packets_and_frames.frame.6.media_type="audio"
packets_and_frames.frame.6.stream_index=0
packets_and_frames.frame.6.key_frame=1
......@@ -244,7 +244,7 @@ packets_and_frames.packet.7.convergence_duration="N/A"
packets_and_frames.packet.7.convergence_duration_time="N/A"
packets_and_frames.packet.7.size="2048"
packets_and_frames.packet.7.pos="527726"
packets_and_frames.packet.7.flags="K"
packets_and_frames.packet.7.flags="K_"
packets_and_frames.frame.7.media_type="audio"
packets_and_frames.frame.7.stream_index=0
packets_and_frames.frame.7.key_frame=1
......@@ -274,7 +274,7 @@ packets_and_frames.packet.8.convergence_duration="N/A"
packets_and_frames.packet.8.convergence_duration_time="N/A"
packets_and_frames.packet.8.size="230400"
packets_and_frames.packet.8.pos="529804"
packets_and_frames.packet.8.flags="K"
packets_and_frames.packet.8.flags="K_"
packets_and_frames.frame.8.media_type="video"
packets_and_frames.frame.8.stream_index=1
packets_and_frames.frame.8.key_frame=1
......@@ -310,7 +310,7 @@ packets_and_frames.packet.9.convergence_duration="N/A"
packets_and_frames.packet.9.convergence_duration_time="N/A"
packets_and_frames.packet.9.size="30000"
packets_and_frames.packet.9.pos="760228"
packets_and_frames.packet.9.flags="K"
packets_and_frames.packet.9.flags="K_"
packets_and_frames.frame.9.media_type="video"
packets_and_frames.frame.9.stream_index=2
packets_and_frames.frame.9.key_frame=1
......@@ -346,7 +346,7 @@ packets_and_frames.packet.10.convergence_duration="N/A"
packets_and_frames.packet.10.convergence_duration_time="N/A"
packets_and_frames.packet.10.size="2048"
packets_and_frames.packet.10.pos="790233"
packets_and_frames.packet.10.flags="K"
packets_and_frames.packet.10.flags="K_"
packets_and_frames.frame.10.media_type="audio"
packets_and_frames.frame.10.stream_index=0
packets_and_frames.frame.10.key_frame=1
......@@ -376,7 +376,7 @@ packets_and_frames.packet.11.convergence_duration="N/A"
packets_and_frames.packet.11.convergence_duration_time="N/A"
packets_and_frames.packet.11.size="2048"
packets_and_frames.packet.11.pos="792304"
packets_and_frames.packet.11.flags="K"
packets_and_frames.packet.11.flags="K_"
packets_and_frames.frame.11.media_type="audio"
packets_and_frames.frame.11.stream_index=0
packets_and_frames.frame.11.key_frame=1
......@@ -406,7 +406,7 @@ packets_and_frames.packet.12.convergence_duration="N/A"
packets_and_frames.packet.12.convergence_duration_time="N/A"
packets_and_frames.packet.12.size="230400"
packets_and_frames.packet.12.pos="794382"
packets_and_frames.packet.12.flags="K"
packets_and_frames.packet.12.flags="K_"
packets_and_frames.frame.12.media_type="video"
packets_and_frames.frame.12.stream_index=1
packets_and_frames.frame.12.key_frame=1
......@@ -442,7 +442,7 @@ packets_and_frames.packet.13.convergence_duration="N/A"
packets_and_frames.packet.13.convergence_duration_time="N/A"
packets_and_frames.packet.13.size="30000"
packets_and_frames.packet.13.pos="1024806"
packets_and_frames.packet.13.flags="K"
packets_and_frames.packet.13.flags="K_"
packets_and_frames.frame.13.media_type="video"
packets_and_frames.frame.13.stream_index=2
packets_and_frames.frame.13.key_frame=1
......
tests/ref/fate/ffprobe_ini
View file @ 6a2cbf90
......@@ -13,7 +13,7 @@ convergence_duration=N/A
convergence_duration_time=N/A
size=2048
pos=647
flags=K
flags=K_
[packets_and_frames.frame.0]
media_type=audio
......@@ -47,7 +47,7 @@ convergence_duration=N/A
convergence_duration_time=N/A
size=230400
pos=2722
flags=K
flags=K_
[packets_and_frames.frame.1]
media_type=video
......@@ -87,7 +87,7 @@ convergence_duration=N/A
convergence_duration_time=N/A
size=30000
pos=233143
flags=K
flags=K_
[packets_and_frames.frame.2]
media_type=video
......@@ -127,7 +127,7 @@ convergence_duration=N/A
convergence_duration_time=N/A
size=2048
pos=263148
flags=K
flags=K_
[packets_and_frames.frame.3]
media_type=audio
......@@ -161,7 +161,7 @@ convergence_duration=N/A
convergence_duration_time=N/A
size=230400
pos=265226
flags=K
flags=K_
[packets_and_frames.frame.4]
media_type=video
......@@ -201,7 +201,7 @@ convergence_duration=N/A
convergence_duration_time=N/A
size=30000
pos=495650
flags=K
flags=K_
[packets_and_frames.frame.5]
media_type=video
......@@ -241,7 +241,7 @@ convergence_duration=N/A
convergence_duration_time=N/A
size=2048
pos=525655
flags=K
flags=K_
[packets_and_frames.frame.6]
media_type=audio
......@@ -275,7 +275,7 @@ convergence_duration=N/A
convergence_duration_time=N/A
size=2048
pos=527726
flags=K
flags=K_
[packets_and_frames.frame.7]
media_type=audio
......@@ -309,7 +309,7 @@ convergence_duration=N/A
convergence_duration_time=N/A
size=230400
pos=529804
flags=K
flags=K_
[packets_and_frames.frame.8]
media_type=video
......@@ -349,7 +349,7 @@ convergence_duration=N/A
convergence_duration_time=N/A
size=30000
pos=760228
flags=K
flags=K_
[packets_and_frames.frame.9]
media_type=video
......@@ -389,7 +389,7 @@ convergence_duration=N/A
convergence_duration_time=N/A
size=2048
pos=790233
flags=K
flags=K_
[packets_and_frames.frame.10]
media_type=audio
......@@ -423,7 +423,7 @@ convergence_duration=N/A
convergence_duration_time=N/A
size=2048
pos=792304
flags=K
flags=K_
[packets_and_frames.frame.11]
media_type=audio
......@@ -457,7 +457,7 @@ convergence_duration=N/A
convergence_duration_time=N/A
size=230400
pos=794382
flags=K
flags=K_
[packets_and_frames.frame.12]
media_type=video
......@@ -497,7 +497,7 @@ convergence_duration=N/A
convergence_duration_time=N/A
size=30000
pos=1024806
flags=K
flags=K_
[packets_and_frames.frame.13]
media_type=video
......
tests/ref/fate/ffprobe_json
View file @ 6a2cbf90
......@@ -12,7 +12,7 @@
"duration_time": "0.023220",
"size": "2048",
"pos": "647",
"flags": "K"
"flags": "K_"
},
{
"type": "frame",
......@@ -45,7 +45,7 @@
"duration_time": "0.040000",
"size": "230400",
"pos": "2722",
"flags": "K"
"flags": "K_"
},
{
"type": "frame",
......@@ -85,7 +85,7 @@
"duration_time": "0.040000",
"size": "30000",
"pos": "233143",
"flags": "K"
"flags": "K_"
},
{
"type": "frame",
......@@ -125,7 +125,7 @@
"duration_time": "0.023220",
"size": "2048",
"pos": "263148",
"flags": "K"
"flags": "K_"
},
{
"type": "frame",
......@@ -158,7 +158,7 @@
"duration_time": "0.040000",
"size": "230400",
"pos": "265226",
"flags": "K"
"flags": "K_"
},
{
"type": "frame",
......@@ -198,7 +198,7 @@
"duration_time": "0.040000",
"size": "30000",
"pos": "495650",
"flags": "K"
"flags": "K_"
},
{
"type": "frame",
......@@ -238,7 +238,7 @@
"duration_time": "0.023220",
"size": "2048",
"pos": "525655",
"flags": "K"
"flags": "K_"
},
{
"type": "frame",
......@@ -271,7 +271,7 @@
"duration_time": "0.023220",
"size": "2048",
"pos": "527726",
"flags": "K"
"flags": "K_"
},
{
"type": "frame",
......@@ -304,7 +304,7 @@
"duration_time": "0.040000",
"size": "230400",
"pos": "529804",
"flags": "K"
"flags": "K_"
},
{
"type": "frame",
......@@ -344,7 +344,7 @@
"duration_time": "0.040000",
"size": "30000",
"pos": "760228",
"flags": "K"
"flags": "K_"
},
{
"type": "frame",
......@@ -384,7 +384,7 @@
"duration_time": "0.023220",
"size": "2048",
"pos": "790233",
"flags": "K"
"flags": "K_"
},
{
"type": "frame",
......@@ -417,7 +417,7 @@
"duration_time": "0.023220",
"size": "2048",
"pos": "792304",
"flags": "K"
"flags": "K_"
},
{
"type": "frame",
......@@ -450,7 +450,7 @@
"duration_time": "0.040000",
"size": "230400",
"pos": "794382",
"flags": "K"
"flags": "K_"
},
{
"type": "frame",
......@@ -490,7 +490,7 @@
"duration_time": "0.040000",
"size": "30000",
"pos": "1024806",
"flags": "K"
"flags": "K_"
},
{
"type": "frame",
......
tests/ref/fate/ffprobe_xml
View file @ 6a2cbf90
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