Skip to content

F
ffmpeg.wasm-core
Commit f7ab23b0 authored by Stefano Sabatini's avatar Stefano Sabatini
Browse files
Options

ffprobe: remove deprecated frame "reference" field

parent db36ea5b
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 32 additions and 66 deletions
doc/ffprobe.xsd
View file @ f7ab23b0
......@@ -78,7 +78,6 @@
<xsd:attribute name="interlaced_frame" type="xsd:int" />
<xsd:attribute name="top_field_first" type="xsd:int" />
<xsd:attribute name="repeat_pict" type="xsd:int" />
<xsd:attribute name="reference" type="xsd:int" />
</xsd:complexType>
<xsd:complexType name="streamsType">
......
ffprobe.c
View file @ f7ab23b0
......@@ -1500,7 +1500,6 @@ static void show_frame(WriterContext *w, AVFrame *frame, AVStream *stream,
print_int("interlaced_frame", frame->interlaced_frame);
print_int("top_field_first", frame->top_field_first);
print_int("repeat_pict", frame->repeat_pict);
print_int("reference", frame->reference);
break;
case AVMEDIA_TYPE_AUDIO:
......
tests/ref/fate/ffprobe_compact
View file @ f7ab23b0
This diff is collapsed.
tests/ref/fate/ffprobe_csv
View file @ f7ab23b0
packet,audio,0,0,0.000000,0,0.000000,1024,0.023220,N/A,N/A,2048,572,K
frame,audio,1,0,0.000000,0,0.000000,1024,0.023220,572,2048,s16,1024,1,mono
packet,video,1,0,0.000000,0,0.000000,2048,0.040000,N/A,N/A,230400,2647,K
frame,video,1,0,0.000000,0,0.000000,2048,0.040000,2647,N/A,320,240,rgb24,1:1,I,0,0,0,0,0,0
frame,video,1,0,0.000000,0,0.000000,2048,0.040000,2647,N/A,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,233068,K
frame,video,1,0,0.000000,0,0.000000,2048,0.040000,233068,N/A,100,100,rgb24,1:1,I,0,0,0,0,0,0
frame,video,1,0,0.000000,0,0.000000,2048,0.040000,233068,N/A,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,263073,K
frame,audio,1,1024,0.023220,1024,0.023220,1024,0.023220,263073,2048,s16,1024,1,mono
packet,video,1,2048,0.040000,2048,0.040000,2048,0.040000,N/A,N/A,230400,265151,K
frame,video,1,2048,0.040000,2048,0.040000,2048,0.040000,265151,N/A,320,240,rgb24,1:1,I,0,0,0,0,0,0
frame,video,1,2048,0.040000,2048,0.040000,2048,0.040000,265151,N/A,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,495575,K
frame,video,1,2048,0.040000,2048,0.040000,2048,0.040000,495575,N/A,100,100,rgb24,1:1,I,0,0,0,0,0,0
frame,video,1,2048,0.040000,2048,0.040000,2048,0.040000,495575,N/A,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,525580,K
frame,audio,1,2048,0.046440,2048,0.046440,1024,0.023220,525580,2048,s16,1024,1,mono
packet,audio,0,3072,0.069660,3072,0.069660,1024,0.023220,N/A,N/A,2048,527651,K
frame,audio,1,3072,0.069660,3072,0.069660,1024,0.023220,527651,2048,s16,1024,1,mono
packet,video,1,4096,0.080000,4096,0.080000,2048,0.040000,N/A,N/A,230400,529729,K
frame,video,1,4096,0.080000,4096,0.080000,2048,0.040000,529729,N/A,320,240,rgb24,1:1,I,0,0,0,0,0,0
frame,video,1,4096,0.080000,4096,0.080000,2048,0.040000,529729,N/A,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,760153,K
frame,video,1,4096,0.080000,4096,0.080000,2048,0.040000,760153,N/A,100,100,rgb24,1:1,I,0,0,0,0,0,0
frame,video,1,4096,0.080000,4096,0.080000,2048,0.040000,760153,N/A,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,790158,K
frame,audio,1,4096,0.092880,4096,0.092880,1024,0.023220,790158,2048,s16,1024,1,mono
packet,audio,0,5120,0.116100,5120,0.116100,1024,0.023220,N/A,N/A,2048,792229,K
frame,audio,1,5120,0.116100,5120,0.116100,1024,0.023220,792229,2048,s16,1024,1,mono
packet,video,1,6144,0.120000,6144,0.120000,2048,0.040000,N/A,N/A,230400,794307,K
frame,video,1,6144,0.120000,6144,0.120000,2048,0.040000,794307,N/A,320,240,rgb24,1:1,I,0,0,0,0,0,0
frame,video,1,6144,0.120000,6144,0.120000,2048,0.040000,794307,N/A,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,1024731,K
frame,video,1,6144,0.120000,6144,0.120000,2048,0.040000,1024731,N/A,100,100,rgb24,1:1,I,0,0,0,0,0,0
frame,video,1,6144,0.120000,6144,0.120000,2048,0.040000,1024731,N/A,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,16,N/A,0/0,0/0,1/44100,0,0.000000,527406,11.959320,705600,N/A,6,6,0,0,0,0,0,0,0,0,0,0,0,mc²
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,612317,11.959316,N/A,N/A,4,4,0,0,0,0,0,0,0,0,0,0,0,foobar,field-and-tags-conflict-attempt
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,612317,11.959316,N/A,N/A,4,4,0,0,0,0,0,0,0,0,0,0,0
......
tests/ref/fate/ffprobe_default
View file @ f7ab23b0
......@@ -65,7 +65,6 @@ display_picture_number=0
interlaced_frame=0
top_field_first=0
repeat_pict=0
reference=0
[/FRAME]
[PACKET]
codec_type=video
......@@ -103,7 +102,6 @@ display_picture_number=0
interlaced_frame=0
top_field_first=0
repeat_pict=0
reference=0
[/FRAME]
[PACKET]
codec_type=audio
......@@ -172,7 +170,6 @@ display_picture_number=0
interlaced_frame=0
top_field_first=0
repeat_pict=0
reference=0
[/FRAME]
[PACKET]
codec_type=video
......@@ -210,7 +207,6 @@ display_picture_number=0
interlaced_frame=0
top_field_first=0
repeat_pict=0
reference=0
[/FRAME]
[PACKET]
codec_type=audio
......@@ -310,7 +306,6 @@ display_picture_number=0
interlaced_frame=0
top_field_first=0
repeat_pict=0
reference=0
[/FRAME]
[PACKET]
codec_type=video
......@@ -348,7 +343,6 @@ display_picture_number=0
interlaced_frame=0
top_field_first=0
repeat_pict=0
reference=0
[/FRAME]
[PACKET]
codec_type=audio
......@@ -448,7 +442,6 @@ display_picture_number=0
interlaced_frame=0
top_field_first=0
repeat_pict=0
reference=0
[/FRAME]
[PACKET]
codec_type=video
......@@ -486,7 +479,6 @@ display_picture_number=0
interlaced_frame=0
top_field_first=0
repeat_pict=0
reference=0
[/FRAME]
[STREAM]
index=0
......
tests/ref/fate/ffprobe_flat
View file @ f7ab23b0
......@@ -58,7 +58,6 @@ packets_and_frames.frame.1.display_picture_number=0
packets_and_frames.frame.1.interlaced_frame=0
packets_and_frames.frame.1.top_field_first=0
packets_and_frames.frame.1.repeat_pict=0
packets_and_frames.frame.1.reference=0
packets_and_frames.packet.2.codec_type="video"
packets_and_frames.packet.2.stream_index=2
packets_and_frames.packet.2.pts=0
......@@ -92,7 +91,6 @@ packets_and_frames.frame.2.display_picture_number=0
packets_and_frames.frame.2.interlaced_frame=0
packets_and_frames.frame.2.top_field_first=0
packets_and_frames.frame.2.repeat_pict=0
packets_and_frames.frame.2.reference=0
packets_and_frames.packet.3.codec_type="audio"
packets_and_frames.packet.3.stream_index=0
packets_and_frames.packet.3.pts=1024
......@@ -153,7 +151,6 @@ packets_and_frames.frame.4.display_picture_number=0
packets_and_frames.frame.4.interlaced_frame=0
packets_and_frames.frame.4.top_field_first=0
packets_and_frames.frame.4.repeat_pict=0
packets_and_frames.frame.4.reference=0
packets_and_frames.packet.5.codec_type="video"
packets_and_frames.packet.5.stream_index=2
packets_and_frames.packet.5.pts=2048
......@@ -187,7 +184,6 @@ packets_and_frames.frame.5.display_picture_number=0
packets_and_frames.frame.5.interlaced_frame=0
packets_and_frames.frame.5.top_field_first=0
packets_and_frames.frame.5.repeat_pict=0
packets_and_frames.frame.5.reference=0
packets_and_frames.packet.6.codec_type="audio"
packets_and_frames.packet.6.stream_index=0
packets_and_frames.packet.6.pts=2048
......@@ -275,7 +271,6 @@ packets_and_frames.frame.8.display_picture_number=0
packets_and_frames.frame.8.interlaced_frame=0
packets_and_frames.frame.8.top_field_first=0
packets_and_frames.frame.8.repeat_pict=0
packets_and_frames.frame.8.reference=0
packets_and_frames.packet.9.codec_type="video"
packets_and_frames.packet.9.stream_index=2
packets_and_frames.packet.9.pts=4096
......@@ -309,7 +304,6 @@ packets_and_frames.frame.9.display_picture_number=0
packets_and_frames.frame.9.interlaced_frame=0
packets_and_frames.frame.9.top_field_first=0
packets_and_frames.frame.9.repeat_pict=0
packets_and_frames.frame.9.reference=0
packets_and_frames.packet.10.codec_type="audio"
packets_and_frames.packet.10.stream_index=0
packets_and_frames.packet.10.pts=4096
......@@ -397,7 +391,6 @@ packets_and_frames.frame.12.display_picture_number=0
packets_and_frames.frame.12.interlaced_frame=0
packets_and_frames.frame.12.top_field_first=0
packets_and_frames.frame.12.repeat_pict=0
packets_and_frames.frame.12.reference=0
packets_and_frames.packet.13.codec_type="video"
packets_and_frames.packet.13.stream_index=2
packets_and_frames.packet.13.pts=6144
......@@ -431,7 +424,6 @@ packets_and_frames.frame.13.display_picture_number=0
packets_and_frames.frame.13.interlaced_frame=0
packets_and_frames.frame.13.top_field_first=0
packets_and_frames.frame.13.repeat_pict=0
packets_and_frames.frame.13.reference=0
streams.stream.0.index=0
streams.stream.0.codec_name="pcm_s16le"
streams.stream.0.profile="unknown"
......
tests/ref/fate/ffprobe_ini
View file @ f7ab23b0
......@@ -67,7 +67,6 @@ display_picture_number=0
interlaced_frame=0
top_field_first=0
repeat_pict=0
reference=0
[packets_and_frames.packet.2]
codec_type=video
......@@ -105,7 +104,6 @@ display_picture_number=0
interlaced_frame=0
top_field_first=0
repeat_pict=0
reference=0
[packets_and_frames.packet.3]
codec_type=audio
......@@ -174,7 +172,6 @@ display_picture_number=0
interlaced_frame=0
top_field_first=0
repeat_pict=0
reference=0
[packets_and_frames.packet.5]
codec_type=video
......@@ -212,7 +209,6 @@ display_picture_number=0
interlaced_frame=0
top_field_first=0
repeat_pict=0
reference=0
[packets_and_frames.packet.6]
codec_type=audio
......@@ -312,7 +308,6 @@ display_picture_number=0
interlaced_frame=0
top_field_first=0
repeat_pict=0
reference=0
[packets_and_frames.packet.9]
codec_type=video
......@@ -350,7 +345,6 @@ display_picture_number=0
interlaced_frame=0
top_field_first=0
repeat_pict=0
reference=0
[packets_and_frames.packet.10]
codec_type=audio
......@@ -450,7 +444,6 @@ display_picture_number=0
interlaced_frame=0
top_field_first=0
repeat_pict=0
reference=0
[packets_and_frames.packet.13]
codec_type=video
......@@ -488,7 +481,6 @@ display_picture_number=0
interlaced_frame=0
top_field_first=0
repeat_pict=0
reference=0
[streams.stream.0]
index=0
......
tests/ref/fate/ffprobe_json
View file @ f7ab23b0
......@@ -65,8 +65,7 @@
"display_picture_number": 0,
"interlaced_frame": 0,
"top_field_first": 0,
"repeat_pict": 0,
"reference": 0
"repeat_pict": 0
},
{
"type": "packet",
......@@ -102,8 +101,7 @@
"display_picture_number": 0,
"interlaced_frame": 0,
"top_field_first": 0,
"repeat_pict": 0,
"reference": 0
"repeat_pict": 0
},
{
"type": "packet",
......@@ -170,8 +168,7 @@
"display_picture_number": 0,
"interlaced_frame": 0,
"top_field_first": 0,
"repeat_pict": 0,
"reference": 0
"repeat_pict": 0
},
{
"type": "packet",
......@@ -207,8 +204,7 @@
"display_picture_number": 0,
"interlaced_frame": 0,
"top_field_first": 0,
"repeat_pict": 0,
"reference": 0
"repeat_pict": 0
},
{
"type": "packet",
......@@ -306,8 +302,7 @@
"display_picture_number": 0,
"interlaced_frame": 0,
"top_field_first": 0,
"repeat_pict": 0,
"reference": 0
"repeat_pict": 0
},
{
"type": "packet",
......@@ -343,8 +338,7 @@
"display_picture_number": 0,
"interlaced_frame": 0,
"top_field_first": 0,
"repeat_pict": 0,
"reference": 0
"repeat_pict": 0
},
{
"type": "packet",
......@@ -442,8 +436,7 @@
"display_picture_number": 0,
"interlaced_frame": 0,
"top_field_first": 0,
"repeat_pict": 0,
"reference": 0
"repeat_pict": 0
},
{
"type": "packet",
......@@ -479,8 +472,7 @@
"display_picture_number": 0,
"interlaced_frame": 0,
"top_field_first": 0,
"repeat_pict": 0,
"reference": 0
"repeat_pict": 0
}
],
"streams": [
......
tests/ref/fate/ffprobe_xml
View file @ f7ab23b0
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