History

lavf: add AV_DISPOSITION_TIMED_THUMBNAILS

Rodger Combs committed 10 years ago

Commit 73ead471 parent 3b3f97917 files · +47 −24Browse files

Unified · Split

17 files
  1. doc/APIchanges +3 −0
  2. doc/ffprobe.xsd +1 −0
  3. ffprobe.c +1 −0
  4. libavformat/avformat.h +9 −3
  5. libavformat/version.h +1 −1
  6. tests/ref/fate/concat-demuxer-extended-lavf-mxf +1 −1
  7. tests/ref/fate/concat-demuxer-extended-lavf-mxf_d10 +1 −1
  8. tests/ref/fate/concat-demuxer-simple1-lavf-mxf +2 −2
  9. tests/ref/fate/concat-demuxer-simple1-lavf-mxf_d10 +2 −2
  10. tests/ref/fate/concat-demuxer-simple2-lavf-ts +2 −2
  11. tests/ref/fate/ffprobe_compact +3 −3
  12. tests/ref/fate/ffprobe_csv +3 −3
  13. tests/ref/fate/ffprobe_default +3 −0
  14. tests/ref/fate/ffprobe_flat +3 −0
  15. tests/ref/fate/ffprobe_ini +3 −0
  16. tests/ref/fate/ffprobe_json +6 −3
  17. tests/ref/fate/ffprobe_xml +3 −3
doc/APIchanges+3−0
@@ -15,6 +15,9 @@ libavutil: 2015-08-28 · 14 unmodified lines
15 15
16API changes, most recent first:16API changes, most recent first:
17 17
182016-10-24 - xxxxxxx - lavf 57.55.100 - avformat.h
19 Add AV_DISPOSITION_TIMED_THUMBNAILS
20
182016-10-24 - xxxxxxx - lavf 57.54.100 - avformat.h212016-10-24 - xxxxxxx - lavf 57.54.100 - avformat.h
19 Add avformat_init_output() and AVSTREAM_INIT_IN_ macros22 Add avformat_init_output() and AVSTREAM_INIT_IN_ macros
20 23
doc/ffprobe.xsd+1−0
@@ -166,6 +166,7 @@ · 165 unmodified lines
166 <xsd:attribute name="visual_impaired" type="xsd:int" use="required" />166 <xsd:attribute name="visual_impaired" type="xsd:int" use="required" />
167 <xsd:attribute name="clean_effects" type="xsd:int" use="required" />167 <xsd:attribute name="clean_effects" type="xsd:int" use="required" />
168 <xsd:attribute name="attached_pic" type="xsd:int" use="required" />168 <xsd:attribute name="attached_pic" type="xsd:int" use="required" />
169 <xsd:attribute name="timed_thumbnails" type="xsd:int" use="required" />
169 </xsd:complexType>170 </xsd:complexType>
170 171
171 <xsd:complexType name="streamType">172 <xsd:complexType name="streamType">
ffprobe.c+1−0
@@ -2383,6 +2383,7 @@ static int show_stream(WriterContext *w, AVFormatContext *fmt_ctx, int stream_id · 2382 unmodified lines
2383 PRINT_DISPOSITION(VISUAL_IMPAIRED, "visual_impaired");2383 PRINT_DISPOSITION(VISUAL_IMPAIRED, "visual_impaired");
2384 PRINT_DISPOSITION(CLEAN_EFFECTS, "clean_effects");2384 PRINT_DISPOSITION(CLEAN_EFFECTS, "clean_effects");
2385 PRINT_DISPOSITION(ATTACHED_PIC, "attached_pic");2385 PRINT_DISPOSITION(ATTACHED_PIC, "attached_pic");
2386 PRINT_DISPOSITION(TIMED_THUMBNAILS, "timed_thumbnails");
2386 writer_print_section_footer(w);2387 writer_print_section_footer(w);
2387 }2388 }
2388 2389
libavformat/avformat.h+9−3
@@ -842,11 +842,17 @@ typedef struct AVIndexEntry { · 841 unmodified lines
842#define AV_DISPOSITION_CLEAN_EFFECTS 0x0200 /**< stream without voice */842#define AV_DISPOSITION_CLEAN_EFFECTS 0x0200 /**< stream without voice */
843/**843/**
844 * The stream is stored in the file as an attached picture/"cover art" (e.g.844 * The stream is stored in the file as an attached picture/"cover art" (e.g.
845 * APIC frame in ID3v2). The single packet associated with it will be returned845 * APIC frame in ID3v2). The first (usually only) packet associated with it
846 * among the first few packets read from the file unless seeking takes place.846 * will be returned among the first few packets read from the file unless
847 * It can also be accessed at any time in AVStream.attached_pic.847 * seeking takes place. It can also be accessed at any time in
848 * AVStream.attached_pic.
848 */849 */
849#define AV_DISPOSITION_ATTACHED_PIC 0x0400850#define AV_DISPOSITION_ATTACHED_PIC 0x0400
851/**
852 * The stream is sparse, and contains thumbnail images, often corresponding
853 * to chapter markers. Only ever used with AV_DISPOSITION_ATTACHED_PIC.
854 */
855#define AV_DISPOSITION_TIMED_THUMBNAILS 0x0800
850 856
851typedef struct AVStreamInternal AVStreamInternal;857typedef struct AVStreamInternal AVStreamInternal;
852 858
libavformat/version.h+1−1
@@ -32,7 +32,7 @@ · 31 unmodified lines
32// Major bumping may affect Ticket5467, 5421, 5451(compatibility with Chromium)32// Major bumping may affect Ticket5467, 5421, 5451(compatibility with Chromium)
33// Also please add any ticket numbers that you believe might be affected here33// Also please add any ticket numbers that you believe might be affected here
34#define LIBAVFORMAT_VERSION_MAJOR 5734#define LIBAVFORMAT_VERSION_MAJOR 57
35#define LIBAVFORMAT_VERSION_MINOR 5435#define LIBAVFORMAT_VERSION_MINOR 55
36#define LIBAVFORMAT_VERSION_MICRO 10036#define LIBAVFORMAT_VERSION_MICRO 100
37 37
38#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \38#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
tests/ref/fate/concat-demuxer-extended-lavf-mxf+1−1
@@ -1 +1 @@
1a277e04c23cf764abe692ca07e87b82e *tests/data/fate/concat-demuxer-extended-lavf-mxf.ffprobe132fe9ae5b89c7802c804ac51f62d89cb *tests/data/fate/concat-demuxer-extended-lavf-mxf.ffprobe
tests/ref/fate/concat-demuxer-extended-lavf-mxf_d10+1−1
@@ -1 +1 @@
1026045a43aa2dde1723d7331c2252b01 *tests/data/fate/concat-demuxer-extended-lavf-mxf_d10.ffprobe10724a00f35550e4ae1e87240a5c95050 *tests/data/fate/concat-demuxer-extended-lavf-mxf_d10.ffprobe
tests/ref/fate/concat-demuxer-simple1-lavf-mxf+2−2
@@ -120,5 +120,5 @@ audio|1|65280|1.360000|65280|1.360000|1920|0.040000|N/A|N/A|3840|206848|K_|1 · 119 unmodified lines
120Strings Metadata|8120Strings Metadata|8
121video|0|37|1.480000|34|1.360000|1|0.040000|N/A|N/A|24786|211456|K_|1121video|0|37|1.480000|34|1.360000|1|0.040000|N/A|N/A|24786|211456|K_|1
122Strings Metadata|8122Strings Metadata|8
1230|mpeg2video|4|video|1/25|[0][0][0][0]|0x0000|352|288|0|0|1|1:1|11:9|yuv420p|8|tv|unknown|unknown|unknown|left|progressive|N/A|1|N/A|25/1|25/1|1/25|N/A|N/A|N/A|N/A|N/A|N/A|N/A|N/A|N/A|51|0|0|0|0|0|0|0|0|0|0|0|0x060A2B340101010501010D0013000000000000000000000000000000000000011230|mpeg2video|4|video|1/25|[0][0][0][0]|0x0000|352|288|0|0|1|1:1|11:9|yuv420p|8|tv|unknown|unknown|unknown|left|progressive|N/A|1|N/A|25/1|25/1|1/25|N/A|N/A|N/A|N/A|N/A|N/A|N/A|N/A|N/A|51|0|0|0|0|0|0|0|0|0|0|0|0|0x060A2B340101010501010D001300000000000000000000000000000000000001
1241|pcm_s16le|unknown|audio|1/48000|[0][0][0][0]|0x0000|s16|48000|1|unknown|16|N/A|0/0|0/0|1/48000|0|0.000000|N/A|N/A|768000|N/A|N/A|N/A|N/A|50|0|0|0|0|0|0|0|0|0|0|0|0x060A2B340101010501010D0013000000000000000000000000000000000000011241|pcm_s16le|unknown|audio|1/48000|[0][0][0][0]|0x0000|s16|48000|1|unknown|16|N/A|0/0|0/0|1/48000|0|0.000000|N/A|N/A|768000|N/A|N/A|N/A|N/A|50|0|0|0|0|0|0|0|0|0|0|0|0|0x060A2B340101010501010D001300000000000000000000000000000000000001
tests/ref/fate/concat-demuxer-simple1-lavf-mxf_d10+2−2
@@ -78,5 +78,5 @@ video|0|34|1.360000|34|1.360000|1|0.040000|N/A|N/A|150000|1923072|K_|1 · 77 unmodified lines
78Strings Metadata|878Strings Metadata|8
79audio|1|65280|1.360000|65280|1.360000|1920|0.040000|N/A|N/A|7680|2073600|K_|179audio|1|65280|1.360000|65280|1.360000|1920|0.040000|N/A|N/A|7680|2073600|K_|1
80Strings Metadata|880Strings Metadata|8
810|mpeg2video|0|video|1/25|[0][0][0][0]|0x0000|720|608|0|0|0|1:1|45:38|yuv422p|5|tv|unknown|unknown|unknown|topleft|tt|N/A|1|N/A|25/1|25/1|1/25|0|0.000000|N/A|N/A|30000000|N/A|N/A|N/A|N/A|35|0|0|0|0|0|0|0|0|0|0|0|0x060A2B340101010501010D001300000000000000000000000000000000000001810|mpeg2video|0|video|1/25|[0][0][0][0]|0x0000|720|608|0|0|0|1:1|45:38|yuv422p|5|tv|unknown|unknown|unknown|topleft|tt|N/A|1|N/A|25/1|25/1|1/25|0|0.000000|N/A|N/A|30000000|N/A|N/A|N/A|N/A|35|0|0|0|0|0|0|0|0|0|0|0|0|0x060A2B340101010501010D001300000000000000000000000000000000000001
821|pcm_s16le|unknown|audio|1/48000|[0][0][0][0]|0x0000|s16|48000|2|unknown|16|N/A|0/0|0/0|1/48000|0|0.000000|N/A|N/A|1536000|N/A|N/A|N/A|N/A|35|0|0|0|0|0|0|0|0|0|0|0|0x060A2B340101010501010D001300000000000000000000000000000000000001821|pcm_s16le|unknown|audio|1/48000|[0][0][0][0]|0x0000|s16|48000|2|unknown|16|N/A|0/0|0/0|1/48000|0|0.000000|N/A|N/A|1536000|N/A|N/A|N/A|N/A|35|0|0|0|0|0|0|0|0|0|0|0|0|0x060A2B340101010501010D001300000000000000000000000000000000000001
tests/ref/fate/concat-demuxer-simple2-lavf-ts+2−2
@@ -147,5 +147,5 @@ video|1|164782|1.830911|161182|1.790911|3600|0.040000|N/A|N/A|12296|176344|__ · 146 unmodified lines
147video|1|168382|1.870911|164782|1.830911|3600|0.040000|N/A|N/A|24800|189692|K_147video|1|168382|1.870911|164782|1.830911|3600|0.040000|N/A|N/A|24800|189692|K_
148video|1|171982|1.910911|168382|1.870911|3600|0.040000|N/A|N/A|17454|216388|__148video|1|171982|1.910911|168382|1.870911|3600|0.040000|N/A|N/A|17454|216388|__
149video|1|175582|1.950911|171982|1.910911|3600|0.040000|N/A|N/A|15033|235000|__149video|1|175582|1.950911|171982|1.910911|3600|0.040000|N/A|N/A|15033|235000|__
1500|mp2|unknown|audio|1/44100|[3][0][0][0]|0x0003|s16p|44100|1|mono|0|N/A|0/0|0/0|1/90000|0|0.000000|N/A|N/A|64000|N/A|N/A|N/A|N/A|89|0|0|0|0|0|0|0|0|0|0|01500|mp2|unknown|audio|1/44100|[3][0][0][0]|0x0003|s16p|44100|1|mono|0|N/A|0/0|0/0|1/90000|0|0.000000|N/A|N/A|64000|N/A|N/A|N/A|N/A|89|0|0|0|0|0|0|0|0|0|0|0|0
1511|mpeg2video|4|video|1/25|[2][0][0][0]|0x0002|352|288|0|0|1|1:1|11:9|yuv420p|8|tv|unknown|unknown|unknown|left|progressive|N/A|1|N/A|25/1|25/1|1/90000|N/A|N/A|N/A|N/A|N/A|N/A|N/A|N/A|N/A|60|0|0|0|0|0|0|0|0|0|0|01511|mpeg2video|4|video|1/25|[2][0][0][0]|0x0002|352|288|0|0|1|1:1|11:9|yuv420p|8|tv|unknown|unknown|unknown|left|progressive|N/A|1|N/A|25/1|25/1|1/90000|N/A|N/A|N/A|N/A|N/A|N/A|N/A|N/A|N/A|60|0|0|0|0|0|0|0|0|0|0|0|0
tests/ref/fate/ffprobe_compact+3−3
@@ -26,7 +26,7 @@ packet|codec_type=video|stream_index=1|pts=6144|pts_time=0.120000|dts=6144|dts_t · 25 unmodified lines
26frame|media_type=video|stream_index=1|key_frame=1|pkt_pts=6144|pkt_pts_time=0.120000|pkt_dts=6144|pkt_dts_time=0.120000|best_effort_timestamp=6144|best_effort_timestamp_time=0.120000|pkt_duration=2048|pkt_duration_time=0.040000|pkt_pos=794382|pkt_size=230400|width=320|height=240|pix_fmt=rgb24|sample_aspect_ratio=1:1|pict_type=I|coded_picture_number=0|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=026frame|media_type=video|stream_index=1|key_frame=1|pkt_pts=6144|pkt_pts_time=0.120000|pkt_dts=6144|pkt_dts_time=0.120000|best_effort_timestamp=6144|best_effort_timestamp_time=0.120000|pkt_duration=2048|pkt_duration_time=0.040000|pkt_pos=794382|pkt_size=230400|width=320|height=240|pix_fmt=rgb24|sample_aspect_ratio=1:1|pict_type=I|coded_picture_number=0|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0
27packet|codec_type=video|stream_index=2|pts=6144|pts_time=0.120000|dts=6144|dts_time=0.120000|duration=2048|duration_time=0.040000|convergence_duration=N/A|convergence_duration_time=N/A|size=30000|pos=1024806|flags=K_27packet|codec_type=video|stream_index=2|pts=6144|pts_time=0.120000|dts=6144|dts_time=0.120000|duration=2048|duration_time=0.040000|convergence_duration=N/A|convergence_duration_time=N/A|size=30000|pos=1024806|flags=K_
28frame|media_type=video|stream_index=2|key_frame=1|pkt_pts=6144|pkt_pts_time=0.120000|pkt_dts=6144|pkt_dts_time=0.120000|best_effort_timestamp=6144|best_effort_timestamp_time=0.120000|pkt_duration=2048|pkt_duration_time=0.040000|pkt_pos=1024806|pkt_size=30000|width=100|height=100|pix_fmt=rgb24|sample_aspect_ratio=1:1|pict_type=I|coded_picture_number=0|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=028frame|media_type=video|stream_index=2|key_frame=1|pkt_pts=6144|pkt_pts_time=0.120000|pkt_dts=6144|pkt_dts_time=0.120000|best_effort_timestamp=6144|best_effort_timestamp_time=0.120000|pkt_duration=2048|pkt_duration_time=0.040000|pkt_pos=1024806|pkt_size=30000|width=100|height=100|pix_fmt=rgb24|sample_aspect_ratio=1:1|pict_type=I|coded_picture_number=0|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0
29stream|index=0|codec_name=pcm_s16le|profile=unknown|codec_type=audio|codec_time_base=1/44100|codec_tag_string=PSD[16]|codec_tag=0x10445350|sample_fmt=s16|sample_rate=44100|channels=1|channel_layout=unknown|bits_per_sample=16|id=N/A|r_frame_rate=0/0|avg_frame_rate=0/0|time_base=1/44100|start_pts=0|start_time=0.000000|duration_ts=N/A|duration=N/A|bit_rate=705600|max_bit_rate=N/A|bits_per_raw_sample=N/A|nb_frames=N/A|nb_read_frames=6|nb_read_packets=6|disposition:default=0|disposition:dub=0|disposition:original=0|disposition:comment=0|disposition:lyrics=0|disposition:karaoke=0|disposition:forced=0|disposition:hearing_impaired=0|disposition:visual_impaired=0|disposition:clean_effects=0|disposition:attached_pic=0|tag:E=mc²|tag:encoder=Lavc pcm_s16le29stream|index=0|codec_name=pcm_s16le|profile=unknown|codec_type=audio|codec_time_base=1/44100|codec_tag_string=PSD[16]|codec_tag=0x10445350|sample_fmt=s16|sample_rate=44100|channels=1|channel_layout=unknown|bits_per_sample=16|id=N/A|r_frame_rate=0/0|avg_frame_rate=0/0|time_base=1/44100|start_pts=0|start_time=0.000000|duration_ts=N/A|duration=N/A|bit_rate=705600|max_bit_rate=N/A|bits_per_raw_sample=N/A|nb_frames=N/A|nb_read_frames=6|nb_read_packets=6|disposition:default=0|disposition:dub=0|disposition:original=0|disposition:comment=0|disposition:lyrics=0|disposition:karaoke=0|disposition:forced=0|disposition:hearing_impaired=0|disposition:visual_impaired=0|disposition:clean_effects=0|disposition:attached_pic=0|disposition:timed_thumbnails=0|tag:E=mc²|tag:encoder=Lavc pcm_s16le
30stream|index=1|codec_name=rawvideo|profile=unknown|codec_type=video|codec_time_base=1/25|codec_tag_string=RGB[24]|codec_tag=0x18424752|width=320|height=240|coded_width=320|coded_height=240|has_b_frames=0|sample_aspect_ratio=1:1|display_aspect_ratio=4:3|pix_fmt=rgb24|level=-99|color_range=N/A|color_space=unknown|color_transfer=unknown|color_primaries=unknown|chroma_location=unspecified|field_order=unknown|timecode=N/A|refs=1|id=N/A|r_frame_rate=25/1|avg_frame_rate=25/1|time_base=1/51200|start_pts=0|start_time=0.000000|duration_ts=N/A|duration=N/A|bit_rate=N/A|max_bit_rate=N/A|bits_per_raw_sample=N/A|nb_frames=N/A|nb_read_frames=4|nb_read_packets=4|disposition:default=0|disposition:dub=0|disposition:original=0|disposition:comment=0|disposition:lyrics=0|disposition:karaoke=0|disposition:forced=0|disposition:hearing_impaired=0|disposition:visual_impaired=0|disposition:clean_effects=0|disposition:attached_pic=0|tag:title=foobar|tag:duration_ts=field-and-tags-conflict-attempt|tag:encoder=Lavc rawvideo30stream|index=1|codec_name=rawvideo|profile=unknown|codec_type=video|codec_time_base=1/25|codec_tag_string=RGB[24]|codec_tag=0x18424752|width=320|height=240|coded_width=320|coded_height=240|has_b_frames=0|sample_aspect_ratio=1:1|display_aspect_ratio=4:3|pix_fmt=rgb24|level=-99|color_range=N/A|color_space=unknown|color_transfer=unknown|color_primaries=unknown|chroma_location=unspecified|field_order=unknown|timecode=N/A|refs=1|id=N/A|r_frame_rate=25/1|avg_frame_rate=25/1|time_base=1/51200|start_pts=0|start_time=0.000000|duration_ts=N/A|duration=N/A|bit_rate=N/A|max_bit_rate=N/A|bits_per_raw_sample=N/A|nb_frames=N/A|nb_read_frames=4|nb_read_packets=4|disposition:default=0|disposition:dub=0|disposition:original=0|disposition:comment=0|disposition:lyrics=0|disposition:karaoke=0|disposition:forced=0|disposition:hearing_impaired=0|disposition:visual_impaired=0|disposition:clean_effects=0|disposition:attached_pic=0|disposition:timed_thumbnails=0|tag:title=foobar|tag:duration_ts=field-and-tags-conflict-attempt|tag:encoder=Lavc rawvideo
31stream|index=2|codec_name=rawvideo|profile=unknown|codec_type=video|codec_time_base=1/25|codec_tag_string=RGB[24]|codec_tag=0x18424752|width=100|height=100|coded_width=100|coded_height=100|has_b_frames=0|sample_aspect_ratio=1:1|display_aspect_ratio=1:1|pix_fmt=rgb24|level=-99|color_range=N/A|color_space=unknown|color_transfer=unknown|color_primaries=unknown|chroma_location=unspecified|field_order=unknown|timecode=N/A|refs=1|id=N/A|r_frame_rate=25/1|avg_frame_rate=25/1|time_base=1/51200|start_pts=0|start_time=0.000000|duration_ts=N/A|duration=N/A|bit_rate=N/A|max_bit_rate=N/A|bits_per_raw_sample=N/A|nb_frames=N/A|nb_read_frames=4|nb_read_packets=4|disposition:default=0|disposition:dub=0|disposition:original=0|disposition:comment=0|disposition:lyrics=0|disposition:karaoke=0|disposition:forced=0|disposition:hearing_impaired=0|disposition:visual_impaired=0|disposition:clean_effects=0|disposition:attached_pic=0|tag:encoder=Lavc rawvideo31stream|index=2|codec_name=rawvideo|profile=unknown|codec_type=video|codec_time_base=1/25|codec_tag_string=RGB[24]|codec_tag=0x18424752|width=100|height=100|coded_width=100|coded_height=100|has_b_frames=0|sample_aspect_ratio=1:1|display_aspect_ratio=1:1|pix_fmt=rgb24|level=-99|color_range=N/A|color_space=unknown|color_transfer=unknown|color_primaries=unknown|chroma_location=unspecified|field_order=unknown|timecode=N/A|refs=1|id=N/A|r_frame_rate=25/1|avg_frame_rate=25/1|time_base=1/51200|start_pts=0|start_time=0.000000|duration_ts=N/A|duration=N/A|bit_rate=N/A|max_bit_rate=N/A|bits_per_raw_sample=N/A|nb_frames=N/A|nb_read_frames=4|nb_read_packets=4|disposition:default=0|disposition:dub=0|disposition:original=0|disposition:comment=0|disposition:lyrics=0|disposition:karaoke=0|disposition:forced=0|disposition:hearing_impaired=0|disposition:visual_impaired=0|disposition:clean_effects=0|disposition:attached_pic=0|disposition:timed_thumbnails=0|tag:encoder=Lavc rawvideo
32format|filename=tests/data/ffprobe-test.nut|nb_streams=3|nb_programs=0|format_name=nut|start_time=0.000000|duration=0.120000|size=1054887|bit_rate=70325800|probe_score=100|tag:title=ffprobe test file|tag:comment='A comment with CSV, XML & JSON special chars': <tag value="x">|tag:comment2=I ♥ Üñîçød€32format|filename=tests/data/ffprobe-test.nut|nb_streams=3|nb_programs=0|format_name=nut|start_time=0.000000|duration=0.120000|size=1054887|bit_rate=70325800|probe_score=100|tag:title=ffprobe test file|tag:comment='A comment with CSV, XML & JSON special chars': <tag value="x">|tag:comment2=I ♥ Üñîçød€
tests/ref/fate/ffprobe_csv+3−3
@@ -26,7 +26,7 @@ packet,video,1,6144,0.120000,6144,0.120000,2048,0.040000,N/A,N/A,230400,794382,K · 25 unmodified lines
26frame,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,026frame,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
27packet,video,2,6144,0.120000,6144,0.120000,2048,0.040000,N/A,N/A,30000,1024806,K_27packet,video,2,6144,0.120000,6144,0.120000,2048,0.040000,N/A,N/A,30000,1024806,K_
28frame,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,028frame,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
29stream,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_s16le29stream,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
30stream,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,foobar,field-and-tags-conflict-attempt,Lavc rawvideo30stream,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
31stream,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,Lavc rawvideo31stream,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
32format,tests/data/ffprobe-test.nut,3,0,nut,0.000000,0.120000,1054887,70325800,100,ffprobe test file,"'A comment with CSV, XML & JSON special chars': <tag value=""x"">",I ♥ Üñîçød€32format,tests/data/ffprobe-test.nut,3,0,nut,0.000000,0.120000,1054887,70325800,100,ffprobe test file,"'A comment with CSV, XML & JSON special chars': <tag value=""x"">",I ♥ Üñîçød€
tests/ref/fate/ffprobe_default+3−0
@@ -560,6 +560,7 @@ DISPOSITION:hearing_impaired=0 · 559 unmodified lines
560DISPOSITION:visual_impaired=0560DISPOSITION:visual_impaired=0
561DISPOSITION:clean_effects=0561DISPOSITION:clean_effects=0
562DISPOSITION:attached_pic=0562DISPOSITION:attached_pic=0
563DISPOSITION:timed_thumbnails=0
563TAG:E=mc²564TAG:E=mc²
564TAG:encoder=Lavc pcm_s16le565TAG:encoder=Lavc pcm_s16le
565[/STREAM]566[/STREAM]
@@ -613,6 +614,7 @@ DISPOSITION:hearing_impaired=0 · 47 unmodified lines
613DISPOSITION:visual_impaired=0614DISPOSITION:visual_impaired=0
614DISPOSITION:clean_effects=0615DISPOSITION:clean_effects=0
615DISPOSITION:attached_pic=0616DISPOSITION:attached_pic=0
617DISPOSITION:timed_thumbnails=0
616TAG:title=foobar618TAG:title=foobar
617TAG:duration_ts=field-and-tags-conflict-attempt619TAG:duration_ts=field-and-tags-conflict-attempt
618TAG:encoder=Lavc rawvideo620TAG:encoder=Lavc rawvideo
@@ -667,6 +669,7 @@ DISPOSITION:hearing_impaired=0 · 48 unmodified lines
667DISPOSITION:visual_impaired=0669DISPOSITION:visual_impaired=0
668DISPOSITION:clean_effects=0670DISPOSITION:clean_effects=0
669DISPOSITION:attached_pic=0671DISPOSITION:attached_pic=0
672DISPOSITION:timed_thumbnails=0
670TAG:encoder=Lavc rawvideo673TAG:encoder=Lavc rawvideo
671[/STREAM]674[/STREAM]
672[FORMAT]675[FORMAT]
tests/ref/fate/ffprobe_flat+3−0
@@ -503,6 +503,7 @@ streams.stream.0.disposition.hearing_impaired=0 · 502 unmodified lines
503streams.stream.0.disposition.visual_impaired=0503streams.stream.0.disposition.visual_impaired=0
504streams.stream.0.disposition.clean_effects=0504streams.stream.0.disposition.clean_effects=0
505streams.stream.0.disposition.attached_pic=0505streams.stream.0.disposition.attached_pic=0
506streams.stream.0.disposition.timed_thumbnails=0
506streams.stream.0.tags.E="mc²"507streams.stream.0.tags.E="mc²"
507streams.stream.0.tags.encoder="Lavc pcm_s16le"508streams.stream.0.tags.encoder="Lavc pcm_s16le"
508streams.stream.1.index=1509streams.stream.1.index=1
@@ -554,6 +555,7 @@ streams.stream.1.disposition.hearing_impaired=0 · 45 unmodified lines
554streams.stream.1.disposition.visual_impaired=0555streams.stream.1.disposition.visual_impaired=0
555streams.stream.1.disposition.clean_effects=0556streams.stream.1.disposition.clean_effects=0
556streams.stream.1.disposition.attached_pic=0557streams.stream.1.disposition.attached_pic=0
558streams.stream.1.disposition.timed_thumbnails=0
557streams.stream.1.tags.title="foobar"559streams.stream.1.tags.title="foobar"
558streams.stream.1.tags.duration_ts="field-and-tags-conflict-attempt"560streams.stream.1.tags.duration_ts="field-and-tags-conflict-attempt"
559streams.stream.1.tags.encoder="Lavc rawvideo"561streams.stream.1.tags.encoder="Lavc rawvideo"
@@ -606,6 +608,7 @@ streams.stream.2.disposition.hearing_impaired=0 · 46 unmodified lines
606streams.stream.2.disposition.visual_impaired=0608streams.stream.2.disposition.visual_impaired=0
607streams.stream.2.disposition.clean_effects=0609streams.stream.2.disposition.clean_effects=0
608streams.stream.2.disposition.attached_pic=0610streams.stream.2.disposition.attached_pic=0
611streams.stream.2.disposition.timed_thumbnails=0
609streams.stream.2.tags.encoder="Lavc rawvideo"612streams.stream.2.tags.encoder="Lavc rawvideo"
610format.filename="tests/data/ffprobe-test.nut"613format.filename="tests/data/ffprobe-test.nut"
611format.nb_streams=3614format.nb_streams=3
tests/ref/fate/ffprobe_ini+3−0
@@ -564,6 +564,7 @@ hearing_impaired=0 · 563 unmodified lines
564visual_impaired=0564visual_impaired=0
565clean_effects=0565clean_effects=0
566attached_pic=0566attached_pic=0
567timed_thumbnails=0
567 568
568[streams.stream.0.tags]569[streams.stream.0.tags]
569E=mc²570E=mc²
@@ -621,6 +622,7 @@ hearing_impaired=0 · 51 unmodified lines
621visual_impaired=0622visual_impaired=0
622clean_effects=0623clean_effects=0
623attached_pic=0624attached_pic=0
625timed_thumbnails=0
624 626
625[streams.stream.1.tags]627[streams.stream.1.tags]
626title=foobar628title=foobar
@@ -679,6 +681,7 @@ hearing_impaired=0 · 52 unmodified lines
679visual_impaired=0681visual_impaired=0
680clean_effects=0682clean_effects=0
681attached_pic=0683attached_pic=0
684timed_thumbnails=0
682 685
683[streams.stream.2.tags]686[streams.stream.2.tags]
684encoder=Lavc rawvideo687encoder=Lavc rawvideo
tests/ref/fate/ffprobe_json+6−3
@@ -550,7 +550,8 @@ · 549 unmodified lines
550 "hearing_impaired": 0,550 "hearing_impaired": 0,
551 "visual_impaired": 0,551 "visual_impaired": 0,
552 "clean_effects": 0,552 "clean_effects": 0,
553 "attached_pic": 0553 "attached_pic": 0,
554 "timed_thumbnails": 0
554 },555 },
555 "tags": {556 "tags": {
556 "E": "mc²",557 "E": "mc²",
@@ -592,7 +593,8 @@ · 35 unmodified lines
592 "hearing_impaired": 0,593 "hearing_impaired": 0,
593 "visual_impaired": 0,594 "visual_impaired": 0,
594 "clean_effects": 0,595 "clean_effects": 0,
595 "attached_pic": 0596 "attached_pic": 0,
597 "timed_thumbnails": 0
596 },598 },
597 "tags": {599 "tags": {
598 "title": "foobar",600 "title": "foobar",
@@ -635,7 +637,8 @@ · 36 unmodified lines
635 "hearing_impaired": 0,637 "hearing_impaired": 0,
636 "visual_impaired": 0,638 "visual_impaired": 0,
637 "clean_effects": 0,639 "clean_effects": 0,
638 "attached_pic": 0640 "attached_pic": 0,
641 "timed_thumbnails": 0
639 },642 },
640 "tags": {643 "tags": {
641 "encoder": "Lavc rawvideo"644 "encoder": "Lavc rawvideo"
tests/ref/fate/ffprobe_xml+3−3
@@ -33,18 +33,18 @@ · 32 unmodified lines
33 33
34 <streams>34 <streams>
35 <stream index="0" codec_name="pcm_s16le" codec_type="audio" codec_time_base="1/44100" codec_tag_string="PSD[16]" codec_tag="0x10445350" sample_fmt="s16" sample_rate="44100" channels="1" bits_per_sample="16" r_frame_rate="0/0" avg_frame_rate="0/0" time_base="1/44100" start_pts="0" start_time="0.000000" bit_rate="705600" nb_read_frames="6" nb_read_packets="6">35 <stream index="0" codec_name="pcm_s16le" codec_type="audio" codec_time_base="1/44100" codec_tag_string="PSD[16]" codec_tag="0x10445350" sample_fmt="s16" sample_rate="44100" channels="1" bits_per_sample="16" r_frame_rate="0/0" avg_frame_rate="0/0" time_base="1/44100" start_pts="0" start_time="0.000000" bit_rate="705600" nb_read_frames="6" nb_read_packets="6">
36 <disposition default="0" dub="0" original="0" comment="0" lyrics="0" karaoke="0" forced="0" hearing_impaired="0" visual_impaired="0" clean_effects="0" attached_pic="0"/>36 <disposition default="0" dub="0" original="0" comment="0" lyrics="0" karaoke="0" forced="0" hearing_impaired="0" visual_impaired="0" clean_effects="0" attached_pic="0" timed_thumbnails="0"/>
37 <tag key="E" value="mc²"/>37 <tag key="E" value="mc²"/>
38 <tag key="encoder" value="Lavc pcm_s16le"/>38 <tag key="encoder" value="Lavc pcm_s16le"/>
39 </stream>39 </stream>
40 <stream index="1" codec_name="rawvideo" codec_type="video" codec_time_base="1/25" codec_tag_string="RGB[24]" codec_tag="0x18424752" width="320" height="240" coded_width="320" coded_height="240" has_b_frames="0" sample_aspect_ratio="1:1" display_aspect_ratio="4:3" pix_fmt="rgb24" level="-99" refs="1" r_frame_rate="25/1" avg_frame_rate="25/1" time_base="1/51200" start_pts="0" start_time="0.000000" nb_read_frames="4" nb_read_packets="4">40 <stream index="1" codec_name="rawvideo" codec_type="video" codec_time_base="1/25" codec_tag_string="RGB[24]" codec_tag="0x18424752" width="320" height="240" coded_width="320" coded_height="240" has_b_frames="0" sample_aspect_ratio="1:1" display_aspect_ratio="4:3" pix_fmt="rgb24" level="-99" refs="1" r_frame_rate="25/1" avg_frame_rate="25/1" time_base="1/51200" start_pts="0" start_time="0.000000" nb_read_frames="4" nb_read_packets="4">
41 <disposition default="0" dub="0" original="0" comment="0" lyrics="0" karaoke="0" forced="0" hearing_impaired="0" visual_impaired="0" clean_effects="0" attached_pic="0"/>41 <disposition default="0" dub="0" original="0" comment="0" lyrics="0" karaoke="0" forced="0" hearing_impaired="0" visual_impaired="0" clean_effects="0" attached_pic="0" timed_thumbnails="0"/>
42 <tag key="title" value="foobar"/>42 <tag key="title" value="foobar"/>
43 <tag key="duration_ts" value="field-and-tags-conflict-attempt"/>43 <tag key="duration_ts" value="field-and-tags-conflict-attempt"/>
44 <tag key="encoder" value="Lavc rawvideo"/>44 <tag key="encoder" value="Lavc rawvideo"/>
45 </stream>45 </stream>
46 <stream index="2" codec_name="rawvideo" codec_type="video" codec_time_base="1/25" codec_tag_string="RGB[24]" codec_tag="0x18424752" width="100" height="100" coded_width="100" coded_height="100" has_b_frames="0" sample_aspect_ratio="1:1" display_aspect_ratio="1:1" pix_fmt="rgb24" level="-99" refs="1" r_frame_rate="25/1" avg_frame_rate="25/1" time_base="1/51200" start_pts="0" start_time="0.000000" nb_read_frames="4" nb_read_packets="4">46 <stream index="2" codec_name="rawvideo" codec_type="video" codec_time_base="1/25" codec_tag_string="RGB[24]" codec_tag="0x18424752" width="100" height="100" coded_width="100" coded_height="100" has_b_frames="0" sample_aspect_ratio="1:1" display_aspect_ratio="1:1" pix_fmt="rgb24" level="-99" refs="1" r_frame_rate="25/1" avg_frame_rate="25/1" time_base="1/51200" start_pts="0" start_time="0.000000" nb_read_frames="4" nb_read_packets="4">
47 <disposition default="0" dub="0" original="0" comment="0" lyrics="0" karaoke="0" forced="0" hearing_impaired="0" visual_impaired="0" clean_effects="0" attached_pic="0"/>47 <disposition default="0" dub="0" original="0" comment="0" lyrics="0" karaoke="0" forced="0" hearing_impaired="0" visual_impaired="0" clean_effects="0" attached_pic="0" timed_thumbnails="0"/>
48 <tag key="encoder" value="Lavc rawvideo"/>48 <tag key="encoder" value="Lavc rawvideo"/>
49 </stream>49 </stream>
50 </streams>50 </streams>

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t