Skip to content

F
ffmpeg.wasm-core
Commit 09ec31ce authored by Dave Rice's avatar Dave Rice Committed by Stefano Sabatini
Browse files
Options

ffprobe: print stream_index with frame data 

This makes it easier to relate frame data to its associated stream.
parent c312bfac
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 100 additions and 42 deletions
doc/ffprobe.xsd
View file @ 09ec31ce
......@@ -87,6 +87,7 @@
</xsd:sequence>
<xsd:attribute name="media_type" type="xsd:string" use="required"/>
<xsd:attribute name="stream_index" type="xsd:int" />
<xsd:attribute name="key_frame" type="xsd:int" use="required"/>
<xsd:attribute name="pts" type="xsd:long" />
<xsd:attribute name="pts_time" type="xsd:float"/>
......
ffprobe.c
View file @ 09ec31ce
......@@ -1824,6 +1824,7 @@ static void show_frame(WriterContext *w, AVFrame *frame, AVStream *stream,
s = av_get_media_type_string(stream->codec->codec_type);
if (s) print_str ("media_type", s);
else print_str_opt("media_type", "unknown");
print_int("stream_index", stream->index);
print_int("key_frame", frame->key_frame);
print_ts ("pkt_pts", frame->pkt_pts);
print_time("pkt_pts_time", frame->pkt_pts, &stream->time_base);
......
tests/ref/fate/ffprobe_compact
View file @ 09ec31ce
This diff is collapsed.
tests/ref/fate/ffprobe_csv
View file @ 09ec31ce
packet,audio,0,0,0.000000,0,0.000000,1024,0.023220,N/A,N/A,2048,642,K
frame,audio,1,0,0.000000,0,0.000000,0,0.000000,1024,0.023220,642,2048,s16,1024,1,unknown
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,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
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,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
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,1,1024,0.023220,1024,0.023220,1024,0.023220,1024,0.023220,263143,2048,s16,1024,1,unknown
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,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
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,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
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,1,2048,0.046440,2048,0.046440,2048,0.046440,1024,0.023220,525650,2048,s16,1024,1,unknown
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,1,3072,0.069660,3072,0.069660,3072,0.069660,1024,0.023220,527721,2048,s16,1024,1,unknown
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,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
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,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
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,1,4096,0.092880,4096,0.092880,4096,0.092880,1024,0.023220,790228,2048,s16,1024,1,unknown
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,1,5120,0.116100,5120,0.116100,5120,0.116100,1024,0.023220,792299,2048,s16,1024,1,unknown
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,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
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,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
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
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
......
tests/ref/fate/ffprobe_default
View file @ 09ec31ce
......@@ -15,6 +15,7 @@ flags=K
[/PACKET]
[FRAME]
media_type=audio
stream_index=0
key_frame=1
pkt_pts=0
pkt_pts_time=0.000000
......@@ -48,6 +49,7 @@ flags=K
[/PACKET]
[FRAME]
media_type=video
stream_index=1
key_frame=1
pkt_pts=0
pkt_pts_time=0.000000
......@@ -87,6 +89,7 @@ flags=K
[/PACKET]
[FRAME]
media_type=video
stream_index=2
key_frame=1
pkt_pts=0
pkt_pts_time=0.000000
......@@ -126,6 +129,7 @@ flags=K
[/PACKET]
[FRAME]
media_type=audio
stream_index=0
key_frame=1
pkt_pts=1024
pkt_pts_time=0.023220
......@@ -159,6 +163,7 @@ flags=K
[/PACKET]
[FRAME]
media_type=video
stream_index=1
key_frame=1
pkt_pts=2048
pkt_pts_time=0.040000
......@@ -198,6 +203,7 @@ flags=K
[/PACKET]
[FRAME]
media_type=video
stream_index=2
key_frame=1
pkt_pts=2048
pkt_pts_time=0.040000
......@@ -237,6 +243,7 @@ flags=K
[/PACKET]
[FRAME]
media_type=audio
stream_index=0
key_frame=1
pkt_pts=2048
pkt_pts_time=0.046440
......@@ -270,6 +277,7 @@ flags=K
[/PACKET]
[FRAME]
media_type=audio
stream_index=0
key_frame=1
pkt_pts=3072
pkt_pts_time=0.069660
......@@ -303,6 +311,7 @@ flags=K
[/PACKET]
[FRAME]
media_type=video
stream_index=1
key_frame=1
pkt_pts=4096
pkt_pts_time=0.080000
......@@ -342,6 +351,7 @@ flags=K
[/PACKET]
[FRAME]
media_type=video
stream_index=2
key_frame=1
pkt_pts=4096
pkt_pts_time=0.080000
......@@ -381,6 +391,7 @@ flags=K
[/PACKET]
[FRAME]
media_type=audio
stream_index=0
key_frame=1
pkt_pts=4096
pkt_pts_time=0.092880
......@@ -414,6 +425,7 @@ flags=K
[/PACKET]
[FRAME]
media_type=audio
stream_index=0
key_frame=1
pkt_pts=5120
pkt_pts_time=0.116100
......@@ -447,6 +459,7 @@ flags=K
[/PACKET]
[FRAME]
media_type=video
stream_index=1
key_frame=1
pkt_pts=6144
pkt_pts_time=0.120000
......@@ -486,6 +499,7 @@ flags=K
[/PACKET]
[FRAME]
media_type=video
stream_index=2
key_frame=1
pkt_pts=6144
pkt_pts_time=0.120000
......
tests/ref/fate/ffprobe_flat
View file @ 09ec31ce
......@@ -12,6 +12,7 @@ packets_and_frames.packet.0.size="2048"
packets_and_frames.packet.0.pos="642"
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
packets_and_frames.frame.0.pkt_pts=0
packets_and_frames.frame.0.pkt_pts_time="0.000000"
......@@ -41,6 +42,7 @@ packets_and_frames.packet.1.size="230400"
packets_and_frames.packet.1.pos="2717"
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
packets_and_frames.frame.1.pkt_pts=0
packets_and_frames.frame.1.pkt_pts_time="0.000000"
......@@ -76,6 +78,7 @@ packets_and_frames.packet.2.size="30000"
packets_and_frames.packet.2.pos="233138"
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
packets_and_frames.frame.2.pkt_pts=0
packets_and_frames.frame.2.pkt_pts_time="0.000000"
......@@ -111,6 +114,7 @@ packets_and_frames.packet.3.size="2048"
packets_and_frames.packet.3.pos="263143"
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
packets_and_frames.frame.3.pkt_pts=1024
packets_and_frames.frame.3.pkt_pts_time="0.023220"
......@@ -140,6 +144,7 @@ packets_and_frames.packet.4.size="230400"
packets_and_frames.packet.4.pos="265221"
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
packets_and_frames.frame.4.pkt_pts=2048
packets_and_frames.frame.4.pkt_pts_time="0.040000"
......@@ -175,6 +180,7 @@ packets_and_frames.packet.5.size="30000"
packets_and_frames.packet.5.pos="495645"
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
packets_and_frames.frame.5.pkt_pts=2048
packets_and_frames.frame.5.pkt_pts_time="0.040000"
......@@ -210,6 +216,7 @@ packets_and_frames.packet.6.size="2048"
packets_and_frames.packet.6.pos="525650"
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
packets_and_frames.frame.6.pkt_pts=2048
packets_and_frames.frame.6.pkt_pts_time="0.046440"
......@@ -239,6 +246,7 @@ packets_and_frames.packet.7.size="2048"
packets_and_frames.packet.7.pos="527721"
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
packets_and_frames.frame.7.pkt_pts=3072
packets_and_frames.frame.7.pkt_pts_time="0.069660"
......@@ -268,6 +276,7 @@ packets_and_frames.packet.8.size="230400"
packets_and_frames.packet.8.pos="529799"
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
packets_and_frames.frame.8.pkt_pts=4096
packets_and_frames.frame.8.pkt_pts_time="0.080000"
......@@ -303,6 +312,7 @@ packets_and_frames.packet.9.size="30000"
packets_and_frames.packet.9.pos="760223"
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
packets_and_frames.frame.9.pkt_pts=4096
packets_and_frames.frame.9.pkt_pts_time="0.080000"
......@@ -338,6 +348,7 @@ packets_and_frames.packet.10.size="2048"
packets_and_frames.packet.10.pos="790228"
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
packets_and_frames.frame.10.pkt_pts=4096
packets_and_frames.frame.10.pkt_pts_time="0.092880"
......@@ -367,6 +378,7 @@ packets_and_frames.packet.11.size="2048"
packets_and_frames.packet.11.pos="792299"
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
packets_and_frames.frame.11.pkt_pts=5120
packets_and_frames.frame.11.pkt_pts_time="0.116100"
......@@ -396,6 +408,7 @@ packets_and_frames.packet.12.size="230400"
packets_and_frames.packet.12.pos="794377"
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
packets_and_frames.frame.12.pkt_pts=6144
packets_and_frames.frame.12.pkt_pts_time="0.120000"
......@@ -431,6 +444,7 @@ packets_and_frames.packet.13.size="30000"
packets_and_frames.packet.13.pos="1024801"
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
packets_and_frames.frame.13.pkt_pts=6144
packets_and_frames.frame.13.pkt_pts_time="0.120000"
......
tests/ref/fate/ffprobe_ini
View file @ 09ec31ce
......@@ -17,6 +17,7 @@ flags=K
[packets_and_frames.frame.0]
media_type=audio
stream_index=0
key_frame=1
pkt_pts=0
pkt_pts_time=0.000000
......@@ -50,6 +51,7 @@ flags=K
[packets_and_frames.frame.1]
media_type=video
stream_index=1
key_frame=1
pkt_pts=0
pkt_pts_time=0.000000
......@@ -89,6 +91,7 @@ flags=K
[packets_and_frames.frame.2]
media_type=video
stream_index=2
key_frame=1
pkt_pts=0
pkt_pts_time=0.000000
......@@ -128,6 +131,7 @@ flags=K
[packets_and_frames.frame.3]
media_type=audio
stream_index=0
key_frame=1
pkt_pts=1024
pkt_pts_time=0.023220
......@@ -161,6 +165,7 @@ flags=K
[packets_and_frames.frame.4]
media_type=video
stream_index=1
key_frame=1
pkt_pts=2048
pkt_pts_time=0.040000
......@@ -200,6 +205,7 @@ flags=K
[packets_and_frames.frame.5]
media_type=video
stream_index=2
key_frame=1
pkt_pts=2048
pkt_pts_time=0.040000
......@@ -239,6 +245,7 @@ flags=K
[packets_and_frames.frame.6]
media_type=audio
stream_index=0
key_frame=1
pkt_pts=2048
pkt_pts_time=0.046440
......@@ -272,6 +279,7 @@ flags=K
[packets_and_frames.frame.7]
media_type=audio
stream_index=0
key_frame=1
pkt_pts=3072
pkt_pts_time=0.069660
......@@ -305,6 +313,7 @@ flags=K
[packets_and_frames.frame.8]
media_type=video
stream_index=1
key_frame=1
pkt_pts=4096
pkt_pts_time=0.080000
......@@ -344,6 +353,7 @@ flags=K
[packets_and_frames.frame.9]
media_type=video
stream_index=2
key_frame=1
pkt_pts=4096
pkt_pts_time=0.080000
......@@ -383,6 +393,7 @@ flags=K
[packets_and_frames.frame.10]
media_type=audio
stream_index=0
key_frame=1
pkt_pts=4096
pkt_pts_time=0.092880
......@@ -416,6 +427,7 @@ flags=K
[packets_and_frames.frame.11]
media_type=audio
stream_index=0
key_frame=1
pkt_pts=5120
pkt_pts_time=0.116100
......@@ -449,6 +461,7 @@ flags=K
[packets_and_frames.frame.12]
media_type=video
stream_index=1
key_frame=1
pkt_pts=6144
pkt_pts_time=0.120000
......@@ -488,6 +501,7 @@ flags=K
[packets_and_frames.frame.13]
media_type=video
stream_index=2
key_frame=1
pkt_pts=6144
pkt_pts_time=0.120000
......
tests/ref/fate/ffprobe_json
View file @ 09ec31ce
......@@ -17,6 +17,7 @@
{
"type": "frame",
"media_type": "audio",
"stream_index": 0,
"key_frame": 1,
"pkt_pts": 0,
"pkt_pts_time": "0.000000",
......@@ -49,6 +50,7 @@
{
"type": "frame",
"media_type": "video",
"stream_index": 1,
"key_frame": 1,
"pkt_pts": 0,
"pkt_pts_time": "0.000000",
......@@ -88,6 +90,7 @@
{
"type": "frame",
"media_type": "video",
"stream_index": 2,
"key_frame": 1,
"pkt_pts": 0,
"pkt_pts_time": "0.000000",
......@@ -127,6 +130,7 @@
{
"type": "frame",
"media_type": "audio",
"stream_index": 0,
"key_frame": 1,
"pkt_pts": 1024,
"pkt_pts_time": "0.023220",
......@@ -159,6 +163,7 @@
{
"type": "frame",
"media_type": "video",
"stream_index": 1,
"key_frame": 1,
"pkt_pts": 2048,
"pkt_pts_time": "0.040000",
......@@ -198,6 +203,7 @@
{
"type": "frame",
"media_type": "video",
"stream_index": 2,
"key_frame": 1,
"pkt_pts": 2048,
"pkt_pts_time": "0.040000",
......@@ -237,6 +243,7 @@
{
"type": "frame",
"media_type": "audio",
"stream_index": 0,
"key_frame": 1,
"pkt_pts": 2048,
"pkt_pts_time": "0.046440",
......@@ -269,6 +276,7 @@
{
"type": "frame",
"media_type": "audio",
"stream_index": 0,
"key_frame": 1,
"pkt_pts": 3072,
"pkt_pts_time": "0.069660",
......@@ -301,6 +309,7 @@
{
"type": "frame",
"media_type": "video",
"stream_index": 1,
"key_frame": 1,
"pkt_pts": 4096,
"pkt_pts_time": "0.080000",
......@@ -340,6 +349,7 @@
{
"type": "frame",
"media_type": "video",
"stream_index": 2,
"key_frame": 1,
"pkt_pts": 4096,
"pkt_pts_time": "0.080000",
......@@ -379,6 +389,7 @@
{
"type": "frame",
"media_type": "audio",
"stream_index": 0,
"key_frame": 1,
"pkt_pts": 4096,
"pkt_pts_time": "0.092880",
......@@ -411,6 +422,7 @@
{
"type": "frame",
"media_type": "audio",
"stream_index": 0,
"key_frame": 1,
"pkt_pts": 5120,
"pkt_pts_time": "0.116100",
......@@ -443,6 +455,7 @@
{
"type": "frame",
"media_type": "video",
"stream_index": 1,
"key_frame": 1,
"pkt_pts": 6144,
"pkt_pts_time": "0.120000",
......@@ -482,6 +495,7 @@
{
"type": "frame",
"media_type": "video",
"stream_index": 2,
"key_frame": 1,
"pkt_pts": 6144,
"pkt_pts_time": "0.120000",
......
tests/ref/fate/ffprobe_xml
View file @ 09ec31ce
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