X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=ffprobe.c;h=80eace96ddbf2dc57af601b5814e9e56f3139417;hb=a3f36b09e75f01e7a1a506e635401cbc5a5f65c9;hp=be6ed198d17c9e1c48e37d15dd2d99754d30dca3;hpb=0cc88646877aea8fc2adb2244f6019707df2082a;p=ffmpeg diff --git a/ffprobe.c b/ffprobe.c index be6ed198d17..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) { @@ -77,7 +84,7 @@ void av_noreturn exit_program(int ret) } struct unit_value { - union { double d; int i; } val; + union { double d; long long int i; } val; const char *unit; }; @@ -102,33 +109,32 @@ static char *value_string(char *buf, int buf_size, struct unit_value uv) hours = mins / 60; mins %= 60; snprintf(buf, buf_size, "%d:%02d:%09.6f", hours, mins, secs); - } else if (use_value_prefix) { - const char *prefix_string; - int index, l; - - if (uv.unit == unit_byte_str && use_byte_value_binary_prefix) { - index = (int) (log(vald)/log(2)) / 10; - index = av_clip(index, 0, FF_ARRAY_ELEMS(binary_unit_prefixes) -1); - vald /= pow(2, index*10); - prefix_string = binary_unit_prefixes[index]; - } else { - index = (int) (log10(vald)) / 3; - index = av_clip(index, 0, FF_ARRAY_ELEMS(decimal_unit_prefixes) -1); - vald /= pow(10, index*3); - prefix_string = decimal_unit_prefixes[index]; - } - - if (show_float || vald != (int)vald) l = snprintf(buf, buf_size, "%.3f", vald); - else l = snprintf(buf, buf_size, "%d", (int)vald); - snprintf(buf+l, buf_size-l, "%s%s%s", prefix_string || show_value_unit ? " " : "", - prefix_string, show_value_unit ? uv.unit : ""); } else { + const char *prefix_string = ""; int l; - if (show_float) l = snprintf(buf, buf_size, "%.3f", vald); - else l = snprintf(buf, buf_size, "%d", (int)vald); - snprintf(buf+l, buf_size-l, "%s%s", show_value_unit ? " " : "", - show_value_unit ? uv.unit : ""); + if (use_value_prefix && vald > 1) { + long long int index; + + if (uv.unit == unit_byte_str && use_byte_value_binary_prefix) { + index = (long long int) (log(vald)/log(2)) / 10; + index = av_clip(index, 0, FF_ARRAY_ELEMS(binary_unit_prefixes) - 1); + vald /= pow(2, index * 10); + prefix_string = binary_unit_prefixes[index]; + } else { + index = (long long int) (log10(vald)) / 3; + index = av_clip(index, 0, FF_ARRAY_ELEMS(decimal_unit_prefixes) - 1); + vald /= pow(10, index * 3); + prefix_string = decimal_unit_prefixes[index]; + } + } + + if (show_float || (use_value_prefix && vald != (long long int)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 ? " " : "", + prefix_string, show_value_unit ? uv.unit : ""); } return buf; @@ -385,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"; \ } @@ -1290,26 +1296,10 @@ static void show_frame(WriterContext *w, AVFrame *frame, AVStream *stream) const char *s; print_section_header("frame"); - print_str("media_type", "video"); - print_int("width", frame->width); - print_int("height", frame->height); - s = av_get_pix_fmt_name(frame->format); - if (s) print_str ("pix_fmt", s); - else print_str_opt("pix_fmt", "unknown"); - if (frame->sample_aspect_ratio.num) { - print_fmt("sample_aspect_ratio", "%d:%d", - frame->sample_aspect_ratio.num, - frame->sample_aspect_ratio.den); - } else { - print_str_opt("sample_aspect_ratio", "N/A"); - } - print_fmt("pict_type", "%c", av_get_picture_type_char(frame->pict_type)); - print_int("coded_picture_number", frame->coded_picture_number); - print_int("display_picture_number", frame->display_picture_number); - 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); + + s = av_get_media_type_string(stream->codec->codec_type); + if (s) print_str ("media_type", s); + else print_str_opt("media_type", "unknown"); print_int("key_frame", frame->key_frame); print_ts ("pkt_pts", frame->pkt_pts); print_time("pkt_pts_time", frame->pkt_pts, &stream->time_base); @@ -1317,40 +1307,94 @@ static void show_frame(WriterContext *w, AVFrame *frame, AVStream *stream) print_time("pkt_dts_time", frame->pkt_dts, &stream->time_base); if (frame->pkt_pos != -1) print_fmt ("pkt_pos", "%"PRId64, frame->pkt_pos); else print_str_opt("pkt_pos", "N/A"); + + switch (stream->codec->codec_type) { + case AVMEDIA_TYPE_VIDEO: + print_int("width", frame->width); + print_int("height", frame->height); + s = av_get_pix_fmt_name(frame->format); + if (s) print_str ("pix_fmt", s); + else print_str_opt("pix_fmt", "unknown"); + if (frame->sample_aspect_ratio.num) { + print_fmt("sample_aspect_ratio", "%d:%d", + frame->sample_aspect_ratio.num, + frame->sample_aspect_ratio.den); + } else { + print_str_opt("sample_aspect_ratio", "N/A"); + } + print_fmt("pict_type", "%c", av_get_picture_type_char(frame->pict_type)); + print_int("coded_picture_number", frame->coded_picture_number); + print_int("display_picture_number", frame->display_picture_number); + 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: + s = av_get_sample_fmt_name(frame->format); + if (s) print_str ("sample_fmt", s); + else print_str_opt("sample_fmt", "unknown"); + print_int("nb_samples", frame->nb_samples); + break; + } + print_section_footer("frame"); av_free(pbuf.s); fflush(stdout); } -static av_always_inline int get_video_frame(AVFormatContext *fmt_ctx, - AVFrame *frame, AVPacket *pkt) +static av_always_inline int get_decoded_frame(AVFormatContext *fmt_ctx, + AVFrame *frame, int *got_frame, + AVPacket *pkt) { AVCodecContext *dec_ctx = fmt_ctx->streams[pkt->stream_index]->codec; - int got_picture = 0; + int ret = 0; - if (dec_ctx->codec_id != CODEC_ID_NONE && - dec_ctx->codec_type == AVMEDIA_TYPE_VIDEO) - avcodec_decode_video2(dec_ctx, frame, &got_picture, pkt); - return got_picture; + *got_frame = 0; + switch (dec_ctx->codec_type) { + case AVMEDIA_TYPE_VIDEO: + ret = avcodec_decode_video2(dec_ctx, frame, got_frame, pkt); + break; + + case AVMEDIA_TYPE_AUDIO: + ret = avcodec_decode_audio4(dec_ctx, frame, got_frame, pkt); + break; + } + + return ret; } -static void show_packets(WriterContext *w, AVFormatContext *fmt_ctx) +static void read_packets(WriterContext *w, AVFormatContext *fmt_ctx) { - AVPacket pkt; + AVPacket pkt, pkt1; AVFrame frame; - int i = 0; + int i = 0, ret, got_frame; 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 && - get_video_frame(fmt_ctx, &frame, &pkt)) { - show_frame(w, &frame, fmt_ctx->streams[pkt.stream_index]); - av_destruct_packet(&pkt); + 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; + 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); } av_init_packet(&pkt); pkt.data = NULL; @@ -1358,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_video_frame(fmt_ctx, &frame, &pkt)) - 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]++; + } + } } } @@ -1421,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"); } @@ -1464,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"); @@ -1483,7 +1534,7 @@ static void show_streams(WriterContext *w, AVFormatContext *fmt_ctx) static void show_format(WriterContext *w, AVFormatContext *fmt_ctx) { char val_str[128]; - int64_t size = avio_size(fmt_ctx->pb); + int64_t size = fmt_ctx->pb ? avio_size(fmt_ctx->pb) : -1; print_section_header("format"); print_str("filename", fmt_ctx->filename); @@ -1523,7 +1574,8 @@ static int open_input_file(AVFormatContext **fmt_ctx_ptr, const char *filename) AVFormatContext *fmt_ctx = NULL; AVDictionaryEntry *t; - if ((err = avformat_open_input(&fmt_ctx, filename, iformat, &format_opts)) < 0) { + if ((err = avformat_open_input(&fmt_ctx, filename, + iformat, &format_opts)) < 0) { print_error(filename, err); return err; } @@ -1547,8 +1599,9 @@ static int open_input_file(AVFormatContext **fmt_ctx_ptr, const char *filename) AVCodec *codec; if (!(codec = avcodec_find_decoder(stream->codec->codec_id))) { - av_log(NULL, AV_LOG_ERROR, "Unsupported codec with id %d for input stream %d\n", - stream->codec->codec_id, stream->index); + av_log(NULL, AV_LOG_ERROR, + "Unsupported codec with id %d for input stream %d\n", + stream->codec->codec_id, stream->index); } else if (avcodec_open2(stream->codec, codec, NULL) < 0) { av_log(NULL, AV_LOG_ERROR, "Error while opening codec for input stream %d\n", stream->index); @@ -1572,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) @@ -1583,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); @@ -1593,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; } @@ -1666,8 +1727,9 @@ static int opt_format(const char *opt, const char *arg) static void opt_input_file(void *optctx, const char *arg) { if (input_filename) { - av_log(NULL, AV_LOG_ERROR, "Argument '%s' provided as input filename, but '%s' was already specified.\n", - arg, input_filename); + av_log(NULL, AV_LOG_ERROR, + "Argument '%s' provided as input filename, but '%s' was already specified.\n", + arg, input_filename); exit(1); } if (!strcmp(arg, "-")) @@ -1721,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" }, @@ -1739,6 +1803,7 @@ int main(int argc, char **argv) char *w_name = NULL, *w_args = NULL; int ret; + av_log_set_flags(AV_LOG_SKIP_REPEATED); parse_loglevel(argc, argv, options); av_register_all(); avformat_network_init();