X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=ffprobe.c;h=80eace96ddbf2dc57af601b5814e9e56f3139417;hb=bf807a5e874442aa3fe1b475459cdd509e34bff4;hp=ce4883b3bbdaac406dc6e87233e8e4954a821e8b;hpb=eef4b70450b5ed57a5c57a719d31b8ca14532bc9;p=ffmpeg diff --git a/ffprobe.c b/ffprobe.c index ce4883b3bbd..80eace96ddb 100644 --- a/ffprobe.c +++ b/ffprobe.c @@ -32,6 +32,7 @@ #include "libavutil/opt.h" #include "libavutil/pixdesc.h" #include "libavutil/dict.h" +#include "libavutil/timecode.h" #include "libavdevice/avdevice.h" #include "libswscale/swscale.h" #include "libswresample/swresample.h" @@ -41,6 +42,10 @@ const char program_name[] = "ffprobe"; const int program_birth_year = 2007; +static int do_count_frames = 0; +static int do_count_packets = 0; +static int do_read_frames = 0; +static int do_read_packets = 0; static int do_show_error = 0; static int do_show_format = 0; static int do_show_frames = 0; @@ -63,13 +68,15 @@ static const OptionDef options[]; static const char *input_filename; static AVInputFormat *iformat = NULL; -static const char *binary_unit_prefixes [] = { "", "Ki", "Mi", "Gi", "Ti", "Pi" }; -static const char *decimal_unit_prefixes[] = { "", "K" , "M" , "G" , "T" , "P" }; +static const char *const binary_unit_prefixes [] = { "", "Ki", "Mi", "Gi", "Ti", "Pi" }; +static const char *const decimal_unit_prefixes[] = { "", "K" , "M" , "G" , "T" , "P" }; -static const char *unit_second_str = "s" ; -static const char *unit_hertz_str = "Hz" ; -static const char *unit_byte_str = "byte" ; -static const char *unit_bit_per_second_str = "bit/s"; +static const char unit_second_str[] = "s" ; +static const char unit_hertz_str[] = "Hz" ; +static const char unit_byte_str[] = "byte" ; +static const char unit_bit_per_second_str[] = "bit/s"; +static uint64_t *nb_streams_packets; +static uint64_t *nb_streams_frames; void av_noreturn exit_program(int ret) { @@ -106,7 +113,7 @@ static char *value_string(char *buf, int buf_size, struct unit_value uv) const char *prefix_string = ""; int l; - if (use_value_prefix) { + if (use_value_prefix && vald > 1) { long long int index; if (uv.unit == unit_byte_str && use_byte_value_binary_prefix) { @@ -123,7 +130,7 @@ static char *value_string(char *buf, int buf_size, struct unit_value uv) } if (show_float || (use_value_prefix && vald != (long long int)vald)) - l = snprintf(buf, buf_size, "%.3f", vald); + l = snprintf(buf, buf_size, "%f", vald); else l = snprintf(buf, buf_size, "%lld", (long long int)vald); snprintf(buf+l, buf_size-l, "%s%s%s", *prefix_string || show_value_unit ? " " : "", @@ -384,7 +391,7 @@ fail: char buf[64]; \ snprintf(buf, sizeof(buf), "%s", src); \ av_log(log_ctx, AV_LOG_WARNING, \ - "String '%s...' with is too big\n", buf); \ + "String '%s...' is too big\n", buf); \ return "FFPROBE_TOO_BIG_STRING"; \ } @@ -1359,7 +1366,7 @@ static av_always_inline int get_decoded_frame(AVFormatContext *fmt_ctx, return ret; } -static void show_packets(WriterContext *w, AVFormatContext *fmt_ctx) +static void read_packets(WriterContext *w, AVFormatContext *fmt_ctx) { AVPacket pkt, pkt1; AVFrame frame; @@ -1368,18 +1375,23 @@ static void show_packets(WriterContext *w, AVFormatContext *fmt_ctx) av_init_packet(&pkt); while (!av_read_frame(fmt_ctx, &pkt)) { - if (do_show_packets) - show_packet(w, fmt_ctx, &pkt, i++); - if (do_show_frames) { + if (do_read_packets) { + if (do_show_packets) + show_packet(w, fmt_ctx, &pkt, i++); + nb_streams_packets[pkt.stream_index]++; + } + if (do_read_frames) { pkt1 = pkt; while (1) { avcodec_get_frame_defaults(&frame); ret = get_decoded_frame(fmt_ctx, &frame, &got_frame, &pkt1); if (ret < 0 || !got_frame) break; - show_frame(w, &frame, fmt_ctx->streams[pkt.stream_index]); + if (do_show_frames) + show_frame(w, &frame, fmt_ctx->streams[pkt.stream_index]); pkt1.data += ret; pkt1.size -= ret; + nb_streams_frames[pkt.stream_index]++; } } av_free_packet(&pkt); @@ -1390,8 +1402,13 @@ static void show_packets(WriterContext *w, AVFormatContext *fmt_ctx) //Flush remaining frames that are cached in the decoder for (i = 0; i < fmt_ctx->nb_streams; i++) { pkt.stream_index = i; - while (get_decoded_frame(fmt_ctx, &frame, &got_frame, &pkt) >= 0 && got_frame) - show_frame(w, &frame, fmt_ctx->streams[pkt.stream_index]); + while (get_decoded_frame(fmt_ctx, &frame, &got_frame, &pkt) >= 0 && got_frame) { + if (do_read_frames) { + if (do_show_frames) + show_frame(w, &frame, fmt_ctx->streams[pkt.stream_index]); + nb_streams_frames[pkt.stream_index]++; + } + } } } @@ -1453,13 +1470,9 @@ static void show_stream(WriterContext *w, AVFormatContext *fmt_ctx, int stream_i else print_str_opt("pix_fmt", "unknown"); print_int("level", dec_ctx->level); if (dec_ctx->timecode_frame_start >= 0) { - uint32_t tc = dec_ctx->timecode_frame_start; - print_fmt("timecode", "%02d:%02d:%02d%c%02d", - tc>>19 & 0x1f, // hours - tc>>13 & 0x3f, // minutes - tc>>6 & 0x3f, // seconds - tc & 1<<24 ? ';' : ':', // drop - tc & 0x3f); // frames + char tcbuf[AV_TIMECODE_STR_SIZE]; + av_timecode_make_mpeg_tc_string(tcbuf, dec_ctx->timecode_frame_start); + print_str("timecode", tcbuf); } else { print_str_opt("timecode", "N/A"); } @@ -1496,8 +1509,14 @@ static void show_stream(WriterContext *w, AVFormatContext *fmt_ctx, int stream_i print_fmt("time_base", "%d/%d", stream->time_base.num, stream->time_base.den); print_time("start_time", stream->start_time, &stream->time_base); print_time("duration", stream->duration, &stream->time_base); + if (dec_ctx->bit_rate > 0) print_val ("bit_rate", dec_ctx->bit_rate, unit_bit_per_second_str); + else print_str_opt("bit_rate", "N/A"); if (stream->nb_frames) print_fmt ("nb_frames", "%"PRId64, stream->nb_frames); else print_str_opt("nb_frames", "N/A"); + if (nb_streams_frames[stream_idx]) print_fmt ("nb_read_frames", "%"PRIu64, nb_streams_frames[stream_idx]); + else print_str_opt("nb_read_frames", "N/A"); + if (nb_streams_packets[stream_idx]) print_fmt ("nb_read_packets", "%"PRIu64, nb_streams_packets[stream_idx]); + else print_str_opt("nb_read_packets", "N/A"); show_tags(stream->metadata); print_section_footer("stream"); @@ -1606,9 +1625,14 @@ static int probe_file(WriterContext *wctx, const char *filename) AVFormatContext *fmt_ctx; int ret, i; + do_read_frames = do_show_frames || do_count_frames; + do_read_packets = do_show_packets || do_count_packets; + ret = open_input_file(&fmt_ctx, filename); if (ret >= 0) { - if (do_show_packets || do_show_frames) { + nb_streams_frames = av_calloc(fmt_ctx->nb_streams, sizeof(*nb_streams_frames)); + nb_streams_packets = av_calloc(fmt_ctx->nb_streams, sizeof(*nb_streams_packets)); + if (do_read_frames || do_read_packets) { const char *chapter; if (do_show_frames && do_show_packets && wctx->writer->flags & WRITER_FLAG_PUT_PACKETS_AND_FRAMES_IN_SAME_CHAPTER) @@ -1617,9 +1641,11 @@ static int probe_file(WriterContext *wctx, const char *filename) chapter = "packets"; else // (!do_show_packets && do_show_frames) chapter = "frames"; - writer_print_chapter_header(wctx, chapter); - show_packets(wctx, fmt_ctx); - writer_print_chapter_footer(wctx, chapter); + if (do_show_frames || do_show_packets) + writer_print_chapter_header(wctx, chapter); + read_packets(wctx, fmt_ctx); + if (do_show_frames || do_show_packets) + writer_print_chapter_footer(wctx, chapter); } PRINT_CHAPTER(streams); PRINT_CHAPTER(format); @@ -1627,8 +1653,9 @@ static int probe_file(WriterContext *wctx, const char *filename) if (fmt_ctx->streams[i]->codec->codec_id != CODEC_ID_NONE) avcodec_close(fmt_ctx->streams[i]->codec); avformat_close_input(&fmt_ctx); + av_freep(&nb_streams_frames); + av_freep(&nb_streams_packets); } - return ret; } @@ -1756,6 +1783,8 @@ static const OptionDef options[] = { { "show_frames", OPT_BOOL, {(void*)&do_show_frames} , "show frames info" }, { "show_packets", OPT_BOOL, {(void*)&do_show_packets}, "show packets info" }, { "show_streams", OPT_BOOL, {(void*)&do_show_streams}, "show streams info" }, + { "count_frames", OPT_BOOL, {(void*)&do_count_frames}, "count the number of frames per stream" }, + { "count_packets", OPT_BOOL, {(void*)&do_count_packets}, "count the number of packets per stream" }, { "show_program_version", OPT_BOOL, {(void*)&do_show_program_version}, "show ffprobe version" }, { "show_library_versions", OPT_BOOL, {(void*)&do_show_library_versions}, "show library versions" }, { "show_versions", 0, {(void*)&opt_show_versions}, "show program and library versions" },