From 2186a7e547fdda716138444c8345ce8b823f2d4a Mon Sep 17 00:00:00 2001 From: Florent Tribouilloy Date: Thu, 25 Jul 2013 12:55:40 +0200 Subject: ffprobe: add -show_programs option The option is used to sort the streams by program. Signed-off-by: Florent Tribouilloy Signed-off-by: Stefano Sabatini --- Changelog | 1 + doc/ffprobe.texi | 14 ++++++-- doc/ffprobe.xsd | 24 +++++++++++++ ffprobe.c | 78 +++++++++++++++++++++++++++++++++++++----- tests/ref/fate/ffprobe_compact | 2 +- tests/ref/fate/ffprobe_csv | 2 +- tests/ref/fate/ffprobe_default | 1 + tests/ref/fate/ffprobe_flat | 1 + tests/ref/fate/ffprobe_ini | 1 + tests/ref/fate/ffprobe_json | 1 + tests/ref/fate/ffprobe_xml | 2 +- 11 files changed, 113 insertions(+), 14 deletions(-) diff --git a/Changelog b/Changelog index 2571fa3da6..a8ff9b1c6e 100644 --- a/Changelog +++ b/Changelog @@ -5,6 +5,7 @@ version - aecho filter - perspective filter ported from libmpcodecs +- ffprobe -show_programs option version 2.0: diff --git a/doc/ffprobe.texi b/doc/ffprobe.texi index 38517a8890..02cffbb478 100644 --- a/doc/ffprobe.texi +++ b/doc/ffprobe.texi @@ -44,7 +44,8 @@ name (which may be shared by other sections), and an unique name. See the output of @option{sections}. Metadata tags stored in the container or in the streams are recognized -and printed in the corresponding "FORMAT" or "STREAM" section. +and printed in the corresponding "FORMAT", "STREAM" or "PROGRAM_STREAM" +section. @c man end @@ -209,6 +210,13 @@ multimedia stream. Each media stream information is printed within a dedicated section with name "STREAM". +@item -show_programs +Show information about programs and their streams contained in the input +multimedia stream. + +Each media stream information is printed within a dedicated section +with name "PROGRAM_STREAM". + @item -show_chapters Show information about chapters stored in the format. @@ -279,8 +287,8 @@ keyN=valN [/SECTION] @end example -Metadata tags are printed as a line in the corresponding FORMAT or -STREAM section, and are prefixed by the string "TAG:". +Metadata tags are printed as a line in the corresponding FORMAT, STREAM or +PROGRAM_STREAM section, and are prefixed by the string "TAG:". A description of the accepted options follows. diff --git a/doc/ffprobe.xsd b/doc/ffprobe.xsd index 82cb80d048..8a1e102704 100644 --- a/doc/ffprobe.xsd +++ b/doc/ffprobe.xsd @@ -11,6 +11,7 @@ + @@ -87,6 +88,12 @@ + + + + + + @@ -147,6 +154,23 @@ + + + + + + + + + + + + + + + + + diff --git a/ffprobe.c b/ffprobe.c index 17c05b532a..8a65e1afde 100644 --- a/ffprobe.c +++ b/ffprobe.c @@ -57,6 +57,7 @@ static int do_show_error = 0; static int do_show_format = 0; static int do_show_frames = 0; static int do_show_packets = 0; +static int do_show_programs = 0; static int do_show_streams = 0; static int do_show_stream_disposition = 0; static int do_show_data = 0; @@ -108,7 +109,14 @@ typedef enum { SECTION_ID_PACKET, SECTION_ID_PACKETS, SECTION_ID_PACKETS_AND_FRAMES, + SECTION_ID_PROGRAM_STREAM_DISPOSITION, + SECTION_ID_PROGRAM_STREAM_TAGS, + SECTION_ID_PROGRAM, + SECTION_ID_PROGRAM_STREAMS, + SECTION_ID_PROGRAM_STREAM, + SECTION_ID_PROGRAM_TAGS, SECTION_ID_PROGRAM_VERSION, + SECTION_ID_PROGRAMS, SECTION_ID_ROOT, SECTION_ID_STREAM, SECTION_ID_STREAM_DISPOSITION, @@ -131,10 +139,17 @@ static struct section sections[] = { [SECTION_ID_PACKETS] = { SECTION_ID_PACKETS, "packets", SECTION_FLAG_IS_ARRAY, { SECTION_ID_PACKET, -1} }, [SECTION_ID_PACKETS_AND_FRAMES] = { SECTION_ID_PACKETS_AND_FRAMES, "packets_and_frames", SECTION_FLAG_IS_ARRAY, { SECTION_ID_PACKET, -1} }, [SECTION_ID_PACKET] = { SECTION_ID_PACKET, "packet", 0, { -1 } }, + [SECTION_ID_PROGRAM_STREAM_DISPOSITION] = { SECTION_ID_PROGRAM_STREAM_DISPOSITION, "disposition", 0, { -1 }, .unique_name = "program_stream_disposition" }, + [SECTION_ID_PROGRAM_STREAM_TAGS] = { SECTION_ID_PROGRAM_STREAM_TAGS, "tags", SECTION_FLAG_HAS_VARIABLE_FIELDS, { -1 }, .element_name = "tag", .unique_name = "program_stream_tags" }, + [SECTION_ID_PROGRAM] = { SECTION_ID_PROGRAM, "program", 0, { SECTION_ID_PROGRAM_TAGS, SECTION_ID_PROGRAM_STREAMS, -1 } }, + [SECTION_ID_PROGRAM_STREAMS] = { SECTION_ID_PROGRAM_STREAMS, "streams", SECTION_FLAG_IS_ARRAY, { SECTION_ID_PROGRAM_STREAM, -1 }, .unique_name = "program_streams" }, + [SECTION_ID_PROGRAM_STREAM] = { SECTION_ID_PROGRAM_STREAM, "stream", 0, { SECTION_ID_PROGRAM_STREAM_DISPOSITION, SECTION_ID_PROGRAM_STREAM_TAGS, -1 }, .unique_name = "program_stream" }, + [SECTION_ID_PROGRAM_TAGS] = { SECTION_ID_PROGRAM_TAGS, "tags", SECTION_FLAG_HAS_VARIABLE_FIELDS, { -1 }, .element_name = "tag", .unique_name = "program_tags" }, [SECTION_ID_PROGRAM_VERSION] = { SECTION_ID_PROGRAM_VERSION, "program_version", 0, { -1 } }, + [SECTION_ID_PROGRAMS] = { SECTION_ID_PROGRAMS, "programs", SECTION_FLAG_IS_ARRAY, { SECTION_ID_PROGRAM, -1 } }, [SECTION_ID_ROOT] = { SECTION_ID_ROOT, "root", SECTION_FLAG_IS_WRAPPER, - { SECTION_ID_CHAPTERS, SECTION_ID_FORMAT, SECTION_ID_FRAMES, SECTION_ID_STREAMS, SECTION_ID_PACKETS, - SECTION_ID_ERROR, SECTION_ID_PROGRAM_VERSION, SECTION_ID_LIBRARY_VERSIONS, -1} }, + { SECTION_ID_CHAPTERS, SECTION_ID_FORMAT, SECTION_ID_FRAMES, SECTION_ID_PROGRAMS, SECTION_ID_STREAMS, + SECTION_ID_PACKETS, SECTION_ID_ERROR, SECTION_ID_PROGRAM_VERSION, SECTION_ID_LIBRARY_VERSIONS, -1} }, [SECTION_ID_STREAMS] = { SECTION_ID_STREAMS, "streams", SECTION_FLAG_IS_ARRAY, { SECTION_ID_STREAM, -1 } }, [SECTION_ID_STREAM] = { SECTION_ID_STREAM, "stream", 0, { SECTION_ID_STREAM_DISPOSITION, SECTION_ID_STREAM_TAGS, -1 } }, [SECTION_ID_STREAM_DISPOSITION] = { SECTION_ID_STREAM_DISPOSITION, "disposition", 0, { -1 }, .unique_name = "stream_disposition" }, @@ -1611,7 +1626,7 @@ static void read_packets(WriterContext *w, AVFormatContext *fmt_ctx) } } -static void show_stream(WriterContext *w, AVFormatContext *fmt_ctx, int stream_idx) +static void show_stream(WriterContext *w, AVFormatContext *fmt_ctx, int stream_idx, int in_program) { AVStream *stream = fmt_ctx->streams[stream_idx]; AVCodecContext *dec_ctx; @@ -1623,7 +1638,7 @@ static void show_stream(WriterContext *w, AVFormatContext *fmt_ctx, int stream_i av_bprint_init(&pbuf, 1, AV_BPRINT_SIZE_UNLIMITED); - writer_print_section_header(w, SECTION_ID_STREAM); + writer_print_section_header(w, in_program ? SECTION_ID_PROGRAM_STREAM : SECTION_ID_STREAM); print_int("index", stream->index); @@ -1739,7 +1754,7 @@ static void show_stream(WriterContext *w, AVFormatContext *fmt_ctx, int stream_i } while (0) if (do_show_stream_disposition) { - writer_print_section_header(w, SECTION_ID_STREAM_DISPOSITION); + writer_print_section_header(w, in_program ? SECTION_ID_PROGRAM_STREAM_DISPOSITION : SECTION_ID_STREAM_DISPOSITION); PRINT_DISPOSITION(DEFAULT, "default"); PRINT_DISPOSITION(DUB, "dub"); PRINT_DISPOSITION(ORIGINAL, "original"); @@ -1754,7 +1769,7 @@ static void show_stream(WriterContext *w, AVFormatContext *fmt_ctx, int stream_i writer_print_section_footer(w); } - show_tags(w, stream->metadata, SECTION_ID_STREAM_TAGS); + show_tags(w, stream->metadata, in_program ? SECTION_ID_PROGRAM_STREAM_TAGS : SECTION_ID_STREAM_TAGS); writer_print_section_footer(w); av_bprint_finalize(&pbuf, NULL); @@ -1767,7 +1782,47 @@ static void show_streams(WriterContext *w, AVFormatContext *fmt_ctx) writer_print_section_header(w, SECTION_ID_STREAMS); for (i = 0; i < fmt_ctx->nb_streams; i++) if (selected_streams[i]) - show_stream(w, fmt_ctx, i); + show_stream(w, fmt_ctx, i, 0); + writer_print_section_footer(w); +} + +static void show_program(WriterContext *w, AVFormatContext *fmt_ctx, AVProgram *program) +{ + int i; + + writer_print_section_header(w, SECTION_ID_PROGRAM); + print_int("program_id", program->id); + print_int("program_num", program->program_num); + print_int("nb_streams", program->nb_stream_indexes); + print_int("pmt_pid", program->pmt_pid); + print_int("pcr_pid", program->pcr_pid); + print_ts("start_pts", program->start_time); + print_time("start_time", program->start_time, &AV_TIME_BASE_Q); + print_ts("end_pts", program->end_time); + print_time("end_time", program->end_time, &AV_TIME_BASE_Q); + show_tags(w, program->metadata, SECTION_ID_PROGRAM_TAGS); + + writer_print_section_header(w, SECTION_ID_PROGRAM_STREAMS); + for (i = 0; i < program->nb_stream_indexes; i++) { + if (selected_streams[program->stream_index[i]]) + show_stream(w, fmt_ctx, program->stream_index[i], 1); + } + writer_print_section_footer(w); + + writer_print_section_footer(w); +} + +static void show_programs(WriterContext *w, AVFormatContext *fmt_ctx) +{ + int i; + + writer_print_section_header(w, SECTION_ID_PROGRAMS); + for (i = 0; i < fmt_ctx->nb_programs; i++) { + AVProgram *program = fmt_ctx->programs[i]; + if (!program) + continue; + show_program(w, fmt_ctx, program); + } writer_print_section_footer(w); } @@ -1800,6 +1855,7 @@ static void show_format(WriterContext *w, AVFormatContext *fmt_ctx) writer_print_section_header(w, SECTION_ID_FORMAT); print_str("filename", fmt_ctx->filename); print_int("nb_streams", fmt_ctx->nb_streams); + print_int("nb_programs", fmt_ctx->nb_programs); print_str("format_name", fmt_ctx->iformat->name); if (!do_bitexact) { if (fmt_ctx->iformat->long_name) print_str ("format_long_name", fmt_ctx->iformat->long_name); @@ -1953,6 +2009,8 @@ static int probe_file(WriterContext *wctx, const char *filename) if (do_show_frames || do_show_packets) writer_print_section_footer(wctx); } + if (do_show_programs) + show_programs(wctx, fmt_ctx); if (do_show_streams) show_streams(wctx, fmt_ctx); if (do_show_chapters) @@ -2219,6 +2277,7 @@ DEFINE_OPT_SHOW_SECTION(library_versions, LIBRARY_VERSIONS); DEFINE_OPT_SHOW_SECTION(packets, PACKETS); DEFINE_OPT_SHOW_SECTION(program_version, PROGRAM_VERSION); DEFINE_OPT_SHOW_SECTION(streams, STREAMS); +DEFINE_OPT_SHOW_SECTION(programs, PROGRAMS); static const OptionDef real_options[] = { #include "cmdutils_common_opts.h" @@ -2245,6 +2304,7 @@ static const OptionDef real_options[] = { { "show_entries", HAS_ARG, {.func_arg = opt_show_entries}, "show a set of specified entries", "entry_list" }, { "show_packets", 0, {(void*)&opt_show_packets}, "show packets info" }, + { "show_programs", 0, {(void*)&opt_show_programs}, "show programs info" }, { "show_streams", 0, {(void*)&opt_show_streams}, "show streams info" }, { "show_chapters", 0, {(void*)&opt_show_chapters}, "show chapters info" }, { "count_frames", OPT_BOOL, {(void*)&do_count_frames}, "count the number of frames per stream" }, @@ -2308,8 +2368,10 @@ int main(int argc, char **argv) SET_DO_SHOW(LIBRARY_VERSIONS, library_versions); SET_DO_SHOW(PACKETS, packets); SET_DO_SHOW(PROGRAM_VERSION, program_version); + SET_DO_SHOW(PROGRAMS, programs); SET_DO_SHOW(STREAMS, streams); SET_DO_SHOW(STREAM_DISPOSITION, stream_disposition); + SET_DO_SHOW(PROGRAM_STREAM_DISPOSITION, stream_disposition); if (do_bitexact && (do_show_program_version || do_show_library_versions)) { av_log(NULL, AV_LOG_ERROR, @@ -2347,7 +2409,7 @@ int main(int argc, char **argv) ffprobe_show_library_versions(wctx); if (!input_filename && - ((do_show_format || do_show_streams || do_show_chapters || do_show_packets || do_show_error) || + ((do_show_format || do_show_programs || do_show_streams || do_show_chapters || do_show_packets || do_show_error) || (!do_show_program_version && !do_show_library_versions))) { show_usage(); av_log(NULL, AV_LOG_ERROR, "You have to specify one input file.\n"); diff --git a/tests/ref/fate/ffprobe_compact b/tests/ref/fate/ffprobe_compact index 409ac9c5e9..04d8ce42c5 100644 --- a/tests/ref/fate/ffprobe_compact +++ b/tests/ref/fate/ffprobe_compact @@ -29,4 +29,4 @@ frame|media_type=video|key_frame=1|pkt_pts=6144|pkt_pts_time=0.120000|pkt_dts=61 stream|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|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|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² stream|index=1|codec_name=rawvideo|profile=unknown|codec_type=video|codec_time_base=1/51200|codec_tag_string=RGB[24]|codec_tag=0x18424752|width=320|height=240|has_b_frames=0|sample_aspect_ratio=1:1|display_aspect_ratio=4:3|pix_fmt=rgb24|level=-99|timecode=N/A|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|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 stream|index=2|codec_name=rawvideo|profile=unknown|codec_type=video|codec_time_base=1/51200|codec_tag_string=RGB[24]|codec_tag=0x18424752|width=100|height=100|has_b_frames=0|sample_aspect_ratio=1:1|display_aspect_ratio=1:1|pix_fmt=rgb24|level=-99|timecode=N/A|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|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 -format|filename=tests/data/ffprobe-test.nut|nb_streams=3|format_name=nut|start_time=0.000000|duration=0.120000|size=1054812|bit_rate=70320800|tag:title=ffprobe test file|tag:comment='A comment with CSV, XML & JSON special chars': |tag:comment2=I ♥ Üñîçød€ +format|filename=tests/data/ffprobe-test.nut|nb_streams=3|nb_programs=0|format_name=nut|start_time=0.000000|duration=0.120000|size=1054812|bit_rate=70320800|tag:title=ffprobe test file|tag:comment='A comment with CSV, XML & JSON special chars': |tag:comment2=I ♥ Üñîçød€ diff --git a/tests/ref/fate/ffprobe_csv b/tests/ref/fate/ffprobe_csv index 0094c39c65..a11b321b6f 100644 --- a/tests/ref/fate/ffprobe_csv +++ b/tests/ref/fate/ffprobe_csv @@ -29,4 +29,4 @@ frame,video,1,6144,0.120000,6144,0.120000,2048,0.040000,1024731,N/A,100,100,rgb2 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,N/A,N/A,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,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 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,N/A,N/A,N/A,N/A,4,4,0,0,0,0,0,0,0,0,0,0,0 -format,tests/data/ffprobe-test.nut,3,nut,0.000000,0.120000,1054812,70320800,ffprobe test file,"'A comment with CSV, XML & JSON special chars': ",I ♥ Üñîçød€ +format,tests/data/ffprobe-test.nut,3,0,nut,0.000000,0.120000,1054812,70320800,ffprobe test file,"'A comment with CSV, XML & JSON special chars': ",I ♥ Üñîçød€ diff --git a/tests/ref/fate/ffprobe_default b/tests/ref/fate/ffprobe_default index 9f523fdba1..f56bd8d4a3 100644 --- a/tests/ref/fate/ffprobe_default +++ b/tests/ref/fate/ffprobe_default @@ -602,6 +602,7 @@ DISPOSITION:attached_pic=0 [FORMAT] filename=tests/data/ffprobe-test.nut nb_streams=3 +nb_programs=0 format_name=nut start_time=0.000000 duration=0.120000 diff --git a/tests/ref/fate/ffprobe_flat b/tests/ref/fate/ffprobe_flat index c08ca0fa94..7cb9c3ef69 100644 --- a/tests/ref/fate/ffprobe_flat +++ b/tests/ref/fate/ffprobe_flat @@ -539,6 +539,7 @@ streams.stream.2.disposition.clean_effects=0 streams.stream.2.disposition.attached_pic=0 format.filename="tests/data/ffprobe-test.nut" format.nb_streams=3 +format.nb_programs=0 format.format_name="nut" format.start_time="0.000000" format.duration="0.120000" diff --git a/tests/ref/fate/ffprobe_ini b/tests/ref/fate/ffprobe_ini index 1bc46d0d91..c0254dc71a 100644 --- a/tests/ref/fate/ffprobe_ini +++ b/tests/ref/fate/ffprobe_ini @@ -614,6 +614,7 @@ attached_pic=0 [format] filename=tests/data/ffprobe-test.nut nb_streams=3 +nb_programs=0 format_name=nut start_time=0.000000 duration=0.120000 diff --git a/tests/ref/fate/ffprobe_json b/tests/ref/fate/ffprobe_json index fc3d22e89c..ee5ddb95b7 100644 --- a/tests/ref/fate/ffprobe_json +++ b/tests/ref/fate/ffprobe_json @@ -584,6 +584,7 @@ "format": { "filename": "tests/data/ffprobe-test.nut", "nb_streams": 3, + "nb_programs": 0, "format_name": "nut", "start_time": "0.000000", "duration": "0.120000", diff --git a/tests/ref/fate/ffprobe_xml b/tests/ref/fate/ffprobe_xml index 1f2715a8e4..410f250cb0 100644 --- a/tests/ref/fate/ffprobe_xml +++ b/tests/ref/fate/ffprobe_xml @@ -46,7 +46,7 @@ - + -- cgit v1.2.3