Skip to content

F
ffmpeg.wasm-core
Commit d24a82d2 authored by Vittorio Giovara's avatar Vittorio Giovara
Browse files
Options

ffprobe: Print color properties from show_frames 

Signed-off-by: 's avatarVittorio Giovara <vittorio.giovara@gmail.com>
parent dc9735eb
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 276 additions and 81 deletions
doc/ffprobe.xsd
View file @ d24a82d2
......@@ -120,6 +120,11 @@
<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="color_range" type="xsd:string"/>
<xsd:attribute name="color_space" type="xsd:string"/>
<xsd:attribute name="color_primaries" type="xsd:string"/>
<xsd:attribute name="color_transfer" type="xsd:string"/>
<xsd:attribute name="chroma_location" type="xsd:string"/>
</xsd:complexType>
<xsd:complexType name="logsType">
......
ffprobe.c
View file @ d24a82d2
......@@ -2105,6 +2105,31 @@ 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);
if (frame->color_range != AVCOL_RANGE_UNSPECIFIED)
print_str("color_range", av_color_range_name(frame->color_range));
else
print_str_opt("color_range", av_color_range_name(frame->color_range));
if (frame->colorspace != AVCOL_SPC_UNSPECIFIED)
print_str("color_space", av_color_space_name(frame->colorspace));
else
print_str_opt("color_space", av_color_space_name(frame->colorspace));
if (frame->color_primaries != AVCOL_PRI_UNSPECIFIED)
print_str("color_primaries", av_color_primaries_name(frame->color_primaries));
else
print_str_opt("color_primaries", av_color_primaries_name(frame->color_primaries));
if (frame->color_trc != AVCOL_TRC_UNSPECIFIED)
print_str("color_transfer", av_color_transfer_name(frame->color_trc));
else
print_str_opt("color_transfer", av_color_transfer_name(frame->color_trc));
if (frame->chroma_location != AVCHROMA_LOC_UNSPECIFIED)
print_str("chroma_location", av_chroma_location_name(frame->chroma_location));
else
print_str_opt("chroma_location", av_chroma_location_name(frame->chroma_location));
break;
case AVMEDIA_TYPE_AUDIO:
......
tests/ref/fate/exif-image-embedded
View file @ d24a82d2
......@@ -22,6 +22,11 @@ display_picture_number=0
interlaced_frame=0
top_field_first=0
repeat_pict=0
color_range=pc
color_space=bt470bg
color_primaries=unknown
color_transfer=unknown
chroma_location=center
TAG:UserComment=AppleMark
[/FRAME]
......
tests/ref/fate/exif-image-jpg
View file @ d24a82d2
......@@ -22,6 +22,11 @@ display_picture_number=0
interlaced_frame=0
top_field_first=0
repeat_pict=0
color_range=pc
color_space=bt470bg
color_primaries=unknown
color_transfer=unknown
chroma_location=center
TAG:ImageDescription=
TAG:Make=Canon
TAG:Model=Canon PowerShot SX200 IS
......
tests/ref/fate/exif-image-tiff
View file @ d24a82d2
......@@ -22,6 +22,11 @@ display_picture_number=0
interlaced_frame=0
top_field_first=0
repeat_pict=0
color_range=unknown
color_space=unknown
color_primaries=unknown
color_transfer=unknown
chroma_location=unspecified
TAG:document_name=image_small.tiff
TAG:page_number= 0 / 1
TAG:software=ImageMagick 6.5.8-0 2010-02-09 Q16 http://www.imagemagick.org
......
tests/ref/fate/exif-image-webp
View file @ d24a82d2
......@@ -22,6 +22,11 @@ display_picture_number=0
interlaced_frame=0
top_field_first=0
repeat_pict=0
color_range=tv
color_space=bt470bg
color_primaries=unknown
color_transfer=unknown
chroma_location=unspecified
TAG:ImageDescription=
TAG:Make=Canon
TAG:Model=Canon PowerShot SX200 IS
......
tests/ref/fate/ffprobe_compact
View file @ d24a82d2
This diff is collapsed.
tests/ref/fate/ffprobe_csv
View file @ d24a82d2
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
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,unknown,unknown,unknown,unknown,unspecified
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
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,unknown,unknown,unknown,unknown,unspecified
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
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,unknown,unknown,unknown,unknown,unspecified
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
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,unknown,unknown,unknown,unknown,unspecified
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
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,unknown,unknown,unknown,unknown,unspecified
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
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,unknown,unknown,unknown,unknown,unspecified
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,393,0.008912,N/A,N/A,786,792304,K_
frame,audio,0,1,5120,0.116100,5120,0.116100,5120,0.116100,393,0.008912,792304,786,s16,393,1,unknown
packet,video,1,6144,0.120000,6144,0.120000,2048,0.040000,N/A,N/A,230400,793120,K_
frame,video,1,1,6144,0.120000,6144,0.120000,6144,0.120000,2048,0.040000,793120,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,793120,230400,320,240,rgb24,1:1,I,0,0,0,0,0,unknown,unknown,unknown,unknown,unspecified
packet,video,2,6144,0.120000,6144,0.120000,2048,0.040000,N/A,N/A,30000,1023544,K_
frame,video,2,1,6144,0.120000,6144,0.120000,6144,0.120000,2048,0.040000,1023544,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,1023544,30000,100,100,rgb24,1:1,I,0,0,0,0,0,unknown,unknown,unknown,unknown,unspecified
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,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,unknown,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,0,foobar,field-and-tags-conflict-attempt,Lavc rawvideo
stream,2,rawvideo,unknown,video,1/25,RGB[24],0x18424752,100,100,100,100,0,1:1,1:1,rgb24,-99,N/A,unknown,unknown,unknown,unspecified,unknown,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,0,Lavc rawvideo
......
tests/ref/fate/ffprobe_default
View file @ d24a82d2
......@@ -71,6 +71,11 @@ display_picture_number=0
interlaced_frame=0
top_field_first=0
repeat_pict=0
color_range=unknown
color_space=unknown
color_primaries=unknown
color_transfer=unknown
chroma_location=unspecified
[/FRAME]
[PACKET]
codec_type=video
......@@ -111,6 +116,11 @@ display_picture_number=0
interlaced_frame=0
top_field_first=0
repeat_pict=0
color_range=unknown
color_space=unknown
color_primaries=unknown
color_transfer=unknown
chroma_location=unspecified
[/FRAME]
[PACKET]
codec_type=audio
......@@ -185,6 +195,11 @@ display_picture_number=0
interlaced_frame=0
top_field_first=0
repeat_pict=0
color_range=unknown
color_space=unknown
color_primaries=unknown
color_transfer=unknown
chroma_location=unspecified
[/FRAME]
[PACKET]
codec_type=video
......@@ -225,6 +240,11 @@ display_picture_number=0
interlaced_frame=0
top_field_first=0
repeat_pict=0
color_range=unknown
color_space=unknown
color_primaries=unknown
color_transfer=unknown
chroma_location=unspecified
[/FRAME]
[PACKET]
codec_type=audio
......@@ -333,6 +353,11 @@ display_picture_number=0
interlaced_frame=0
top_field_first=0
repeat_pict=0
color_range=unknown
color_space=unknown
color_primaries=unknown
color_transfer=unknown
chroma_location=unspecified
[/FRAME]
[PACKET]
codec_type=video
......@@ -373,6 +398,11 @@ display_picture_number=0
interlaced_frame=0
top_field_first=0
repeat_pict=0
color_range=unknown
color_space=unknown
color_primaries=unknown
color_transfer=unknown
chroma_location=unspecified
[/FRAME]
[PACKET]
codec_type=audio
......@@ -481,6 +511,11 @@ display_picture_number=0
interlaced_frame=0
top_field_first=0
repeat_pict=0
color_range=unknown
color_space=unknown
color_primaries=unknown
color_transfer=unknown
chroma_location=unspecified
[/FRAME]
[PACKET]
codec_type=video
......@@ -521,6 +556,11 @@ display_picture_number=0
interlaced_frame=0
top_field_first=0
repeat_pict=0
color_range=unknown
color_space=unknown
color_primaries=unknown
color_transfer=unknown
chroma_location=unspecified
[/FRAME]
[STREAM]
index=0
......
tests/ref/fate/ffprobe_flat
View file @ d24a82d2
......@@ -64,6 +64,11 @@ 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.color_range="unknown"
packets_and_frames.frame.1.color_space="unknown"
packets_and_frames.frame.1.color_primaries="unknown"
packets_and_frames.frame.1.color_transfer="unknown"
packets_and_frames.frame.1.chroma_location="unspecified"
packets_and_frames.packet.2.codec_type="video"
packets_and_frames.packet.2.stream_index=2
packets_and_frames.packet.2.pts=0
......@@ -100,6 +105,11 @@ 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.color_range="unknown"
packets_and_frames.frame.2.color_space="unknown"
packets_and_frames.frame.2.color_primaries="unknown"
packets_and_frames.frame.2.color_transfer="unknown"
packets_and_frames.frame.2.chroma_location="unspecified"
packets_and_frames.packet.3.codec_type="audio"
packets_and_frames.packet.3.stream_index=0
packets_and_frames.packet.3.pts=1024
......@@ -166,6 +176,11 @@ 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.color_range="unknown"
packets_and_frames.frame.4.color_space="unknown"
packets_and_frames.frame.4.color_primaries="unknown"
packets_and_frames.frame.4.color_transfer="unknown"
packets_and_frames.frame.4.chroma_location="unspecified"
packets_and_frames.packet.5.codec_type="video"
packets_and_frames.packet.5.stream_index=2
packets_and_frames.packet.5.pts=2048
......@@ -202,6 +217,11 @@ 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.color_range="unknown"
packets_and_frames.frame.5.color_space="unknown"
packets_and_frames.frame.5.color_primaries="unknown"
packets_and_frames.frame.5.color_transfer="unknown"
packets_and_frames.frame.5.chroma_location="unspecified"
packets_and_frames.packet.6.codec_type="audio"
packets_and_frames.packet.6.stream_index=0
packets_and_frames.packet.6.pts=2048
......@@ -298,6 +318,11 @@ 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.color_range="unknown"
packets_and_frames.frame.8.color_space="unknown"
packets_and_frames.frame.8.color_primaries="unknown"
packets_and_frames.frame.8.color_transfer="unknown"
packets_and_frames.frame.8.chroma_location="unspecified"
packets_and_frames.packet.9.codec_type="video"
packets_and_frames.packet.9.stream_index=2
packets_and_frames.packet.9.pts=4096
......@@ -334,6 +359,11 @@ 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.color_range="unknown"
packets_and_frames.frame.9.color_space="unknown"
packets_and_frames.frame.9.color_primaries="unknown"
packets_and_frames.frame.9.color_transfer="unknown"
packets_and_frames.frame.9.chroma_location="unspecified"
packets_and_frames.packet.10.codec_type="audio"
packets_and_frames.packet.10.stream_index=0
packets_and_frames.packet.10.pts=4096
......@@ -430,6 +460,11 @@ 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.color_range="unknown"
packets_and_frames.frame.12.color_space="unknown"
packets_and_frames.frame.12.color_primaries="unknown"
packets_and_frames.frame.12.color_transfer="unknown"
packets_and_frames.frame.12.chroma_location="unspecified"
packets_and_frames.packet.13.codec_type="video"
packets_and_frames.packet.13.stream_index=2
packets_and_frames.packet.13.pts=6144
......@@ -466,6 +501,11 @@ 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.color_range="unknown"
packets_and_frames.frame.13.color_space="unknown"
packets_and_frames.frame.13.color_primaries="unknown"
packets_and_frames.frame.13.color_transfer="unknown"
packets_and_frames.frame.13.chroma_location="unspecified"
streams.stream.0.index=0
streams.stream.0.codec_name="pcm_s16le"
streams.stream.0.profile="unknown"
......
tests/ref/fate/ffprobe_ini
View file @ d24a82d2
......@@ -73,6 +73,11 @@ display_picture_number=0
interlaced_frame=0
top_field_first=0
repeat_pict=0
color_range=unknown
color_space=unknown
color_primaries=unknown
color_transfer=unknown
chroma_location=unspecified
[packets_and_frames.packet.2]
codec_type=video
......@@ -113,6 +118,11 @@ display_picture_number=0
interlaced_frame=0
top_field_first=0
repeat_pict=0
color_range=unknown
color_space=unknown
color_primaries=unknown
color_transfer=unknown
chroma_location=unspecified
[packets_and_frames.packet.3]
codec_type=audio
......@@ -187,6 +197,11 @@ display_picture_number=0
interlaced_frame=0
top_field_first=0
repeat_pict=0
color_range=unknown
color_space=unknown
color_primaries=unknown
color_transfer=unknown
chroma_location=unspecified
[packets_and_frames.packet.5]
codec_type=video
......@@ -227,6 +242,11 @@ display_picture_number=0
interlaced_frame=0
top_field_first=0
repeat_pict=0
color_range=unknown
color_space=unknown
color_primaries=unknown
color_transfer=unknown
chroma_location=unspecified
[packets_and_frames.packet.6]
codec_type=audio
......@@ -335,6 +355,11 @@ display_picture_number=0
interlaced_frame=0
top_field_first=0
repeat_pict=0
color_range=unknown
color_space=unknown
color_primaries=unknown
color_transfer=unknown
chroma_location=unspecified
[packets_and_frames.packet.9]
codec_type=video
......@@ -375,6 +400,11 @@ display_picture_number=0
interlaced_frame=0
top_field_first=0
repeat_pict=0
color_range=unknown
color_space=unknown
color_primaries=unknown
color_transfer=unknown
chroma_location=unspecified
[packets_and_frames.packet.10]
codec_type=audio
......@@ -483,6 +513,11 @@ display_picture_number=0
interlaced_frame=0
top_field_first=0
repeat_pict=0
color_range=unknown
color_space=unknown
color_primaries=unknown
color_transfer=unknown
chroma_location=unspecified
[packets_and_frames.packet.13]
codec_type=video
......@@ -523,6 +558,11 @@ display_picture_number=0
interlaced_frame=0
top_field_first=0
repeat_pict=0
color_range=unknown
color_space=unknown
color_primaries=unknown
color_transfer=unknown
chroma_location=unspecified
[streams.stream.0]
index=0
......
tests/ref/fate/h264-dts_5frames
View file @ d24a82d2
......@@ -22,6 +22,11 @@ display_picture_number=0
interlaced_frame=0
top_field_first=0
repeat_pict=0
color_range=unknown
color_space=unknown
color_primaries=unknown
color_transfer=unknown
chroma_location=left
[/FRAME]
[FRAME]
media_type=video
......@@ -47,6 +52,11 @@ display_picture_number=0
interlaced_frame=0
top_field_first=0
repeat_pict=0
color_range=unknown
color_space=unknown
color_primaries=unknown
color_transfer=unknown
chroma_location=left
[/FRAME]
[FRAME]
media_type=video
......@@ -72,6 +82,11 @@ display_picture_number=0
interlaced_frame=0
top_field_first=0
repeat_pict=0
color_range=unknown
color_space=unknown
color_primaries=unknown
color_transfer=unknown
chroma_location=left
[/FRAME]
[FRAME]
media_type=video
......@@ -97,6 +112,11 @@ display_picture_number=0
interlaced_frame=0
top_field_first=0
repeat_pict=0
color_range=unknown
color_space=unknown
color_primaries=unknown
color_transfer=unknown
chroma_location=left
[/FRAME]
[FRAME]
media_type=video
......@@ -122,4 +142,9 @@ display_picture_number=0
interlaced_frame=0
top_field_first=0
repeat_pict=0
color_range=unknown
color_space=unknown
color_primaries=unknown
color_transfer=unknown
chroma_location=left
[/FRAME]
tests/ref/fate/mov-zombie
View file @ d24a82d2
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