X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=ffprobe.c;h=71f7ded6e70f8a67614b43f0bb6a721c26d706e8;hb=ab6603b1d8d7d15542a9e1bafa580c4f3798c428;hp=470001c4064abd37e2cd278cae1f0f90a36b5088;hpb=6faf0a21e18f314c48a886864145abe715be6572;p=ffmpeg diff --git a/ffprobe.c b/ffprobe.c index 470001c4064..71f7ded6e70 100644 --- a/ffprobe.c +++ b/ffprobe.c @@ -58,17 +58,32 @@ static const char *unit_hertz_str = "Hz" ; static const char *unit_byte_str = "byte" ; static const char *unit_bit_per_second_str = "bit/s"; -void exit_program(int ret) +void av_noreturn exit_program(int ret) { exit(ret); } -static char *value_string(char *buf, int buf_size, double val, const char *unit) +struct unit_value { + union { double d; int i; } val; + const char *unit; +}; + +static char *value_string(char *buf, int buf_size, struct unit_value uv) { - if (unit == unit_second_str && use_value_sexagesimal_format) { + double vald; + int show_float = 0; + + if (uv.unit == unit_second_str) { + vald = uv.val.d; + show_float = 1; + } else { + vald = uv.val.i; + } + + if (uv.unit == unit_second_str && use_value_sexagesimal_format) { double secs; int hours, mins; - secs = val; + secs = vald; mins = (int)secs / 60; secs = secs - mins * 60; hours = mins / 60; @@ -76,47 +91,31 @@ static char *value_string(char *buf, int buf_size, double val, const char *unit) snprintf(buf, buf_size, "%d:%02d:%09.6f", hours, mins, secs); } else if (use_value_prefix) { const char *prefix_string; - int index; + int index, l; - if (unit == unit_byte_str && use_byte_value_binary_prefix) { - index = (int) (log(val)/log(2)) / 10; + 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); - val /= pow(2, index*10); + vald /= pow(2, index*10); prefix_string = binary_unit_prefixes[index]; } else { - index = (int) (log10(val)) / 3; + index = (int) (log10(vald)) / 3; index = av_clip(index, 0, FF_ARRAY_ELEMS(decimal_unit_prefixes) -1); - val /= pow(10, index*3); + vald /= pow(10, index*3); prefix_string = decimal_unit_prefixes[index]; } - snprintf(buf, buf_size, "%.3f%s%s%s", val, prefix_string || show_value_unit ? " " : "", - prefix_string, show_value_unit ? unit : ""); - } else { - snprintf(buf, buf_size, "%f%s%s", val, show_value_unit ? " " : "", - show_value_unit ? unit : ""); - } - - return buf; -} - -static char *time_value_string(char *buf, int buf_size, int64_t val, const AVRational *time_base) -{ - if (val == AV_NOPTS_VALUE) { - snprintf(buf, buf_size, "N/A"); + 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 { - value_string(buf, buf_size, val * av_q2d(*time_base), unit_second_str); - } + int l; - return buf; -} - -static char *ts_value_string (char *buf, int buf_size, int64_t ts) -{ - if (ts == AV_NOPTS_VALUE) { - snprintf(buf, buf_size, "N/A"); - } else { - snprintf(buf, buf_size, "%"PRId64, ts); + 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 : ""); } return buf; @@ -126,6 +125,8 @@ static char *ts_value_string (char *buf, int buf_size, int64_t ts) typedef struct WriterContext WriterContext; +#define WRITER_FLAG_DISPLAY_OPTIONAL_FIELDS 1 + typedef struct Writer { int priv_size; ///< private size for the writer context const char *name; @@ -140,9 +141,10 @@ typedef struct Writer { void (*print_chapter_footer)(WriterContext *wctx, const char *); void (*print_section_header)(WriterContext *wctx, const char *); void (*print_section_footer)(WriterContext *wctx, const char *); - void (*print_integer) (WriterContext *wctx, const char *, int); + void (*print_integer) (WriterContext *wctx, const char *, long long int); void (*print_string) (WriterContext *wctx, const char *, const char *); void (*show_tags) (WriterContext *wctx, AVDictionary *dict); + int flags; ///< a combination or WRITER_FLAG_* } Writer; struct WriterContext { @@ -252,19 +254,44 @@ static inline void writer_print_section_footer(WriterContext *wctx, } static inline void writer_print_integer(WriterContext *wctx, - const char *key, int val) + const char *key, long long int val) { wctx->writer->print_integer(wctx, key, val); wctx->nb_item++; } static inline void writer_print_string(WriterContext *wctx, - const char *key, const char *val) + const char *key, const char *val, int opt) { + if (opt && !(wctx->writer->flags & WRITER_FLAG_DISPLAY_OPTIONAL_FIELDS)) + return; wctx->writer->print_string(wctx, key, val); wctx->nb_item++; } +static void writer_print_time(WriterContext *wctx, const char *key, + int64_t ts, const AVRational *time_base) +{ + char buf[128]; + + if (ts == AV_NOPTS_VALUE) { + writer_print_string(wctx, key, "N/A", 1); + } else { + double d = ts * av_q2d(*time_base); + value_string(buf, sizeof(buf), (struct unit_value){.val.d=d, .unit=unit_second_str}); + writer_print_string(wctx, key, buf, 0); + } +} + +static void writer_print_ts(WriterContext *wctx, const char *key, int64_t ts) +{ + if (ts == AV_NOPTS_VALUE) { + writer_print_string(wctx, key, "N/A", 1); + } else { + writer_print_integer(wctx, key, ts); + } +} + static inline void writer_show_tags(WriterContext *wctx, AVDictionary *dict) { wctx->writer->show_tags(wctx, dict); @@ -272,9 +299,9 @@ static inline void writer_show_tags(WriterContext *wctx, AVDictionary *dict) #define MAX_REGISTERED_WRITERS_NB 64 -static Writer *registered_writers[MAX_REGISTERED_WRITERS_NB + 1]; +static const Writer *registered_writers[MAX_REGISTERED_WRITERS_NB + 1]; -static int writer_register(Writer *writer) +static int writer_register(const Writer *writer) { static int next_registered_writer_idx = 0; @@ -285,7 +312,7 @@ static int writer_register(Writer *writer) return 0; } -static Writer *writer_get_by_name(const char *name) +static const Writer *writer_get_by_name(const char *name) { int i; @@ -406,9 +433,9 @@ static void default_print_str(WriterContext *wctx, const char *key, const char * printf("%s=%s\n", key, value); } -static void default_print_int(WriterContext *wctx, const char *key, int value) +static void default_print_int(WriterContext *wctx, const char *key, long long int value) { - printf("%s=%d\n", key, value); + printf("%s=%lld\n", key, value); } static void default_show_tags(WriterContext *wctx, AVDictionary *dict) @@ -416,11 +443,11 @@ static void default_show_tags(WriterContext *wctx, AVDictionary *dict) AVDictionaryEntry *tag = NULL; while ((tag = av_dict_get(dict, "", tag, AV_DICT_IGNORE_SUFFIX))) { printf("TAG:"); - writer_print_string(wctx, tag->key, tag->value); + writer_print_string(wctx, tag->key, tag->value, 0); } } -static Writer default_writer = { +static const Writer default_writer = { .name = "default", .print_footer = default_print_footer, .print_chapter_header = default_print_chapter_header, @@ -428,7 +455,253 @@ static Writer default_writer = { .print_section_footer = default_print_section_footer, .print_integer = default_print_int, .print_string = default_print_str, - .show_tags = default_show_tags + .show_tags = default_show_tags, + .flags = WRITER_FLAG_DISPLAY_OPTIONAL_FIELDS, +}; + +/* Compact output */ + +/** + * Escape \n, \r, \\ and sep characters contained in s, and print the + * resulting string. + */ +static const char *c_escape_str(char **dst, size_t *dst_size, + const char *src, const char sep, void *log_ctx) +{ + const char *p; + char *q; + size_t size = 1; + + /* precompute size */ + for (p = src; *p; p++, size++) { + ESCAPE_CHECK_SIZE(src, size, SIZE_MAX-2); + if (*p == '\n' || *p == '\r' || *p == '\\') + size++; + } + + ESCAPE_REALLOC_BUF(dst_size, dst, src, size); + + q = *dst; + for (p = src; *p; p++) { + switch (*src) { + case '\n': *q++ = '\\'; *q++ = 'n'; break; + case '\r': *q++ = '\\'; *q++ = 'r'; break; + case '\\': *q++ = '\\'; *q++ = '\\'; break; + default: + if (*p == sep) + *q++ = '\\'; + *q++ = *p; + } + } + *q = 0; + return *dst; +} + +/** + * Quote fields containing special characters, check RFC4180. + */ +static const char *csv_escape_str(char **dst, size_t *dst_size, + const char *src, const char sep, void *log_ctx) +{ + const char *p; + char *q; + size_t size = 1; + int quote = 0; + + /* precompute size */ + for (p = src; *p; p++, size++) { + ESCAPE_CHECK_SIZE(src, size, SIZE_MAX-4); + if (*p == '"' || *p == sep || *p == '\n' || *p == '\r') + if (!quote) { + quote = 1; + size += 2; + } + if (*p == '"') + size++; + } + + ESCAPE_REALLOC_BUF(dst_size, dst, src, size); + + q = *dst; + p = src; + if (quote) + *q++ = '\"'; + while (*p) { + if (*p == '"') + *q++ = '\"'; + *q++ = *p++; + } + if (quote) + *q++ = '\"'; + *q = 0; + + return *dst; +} + +static const char *none_escape_str(char **dst, size_t *dst_size, + const char *src, const char sep, void *log_ctx) +{ + return src; +} + +typedef struct CompactContext { + const AVClass *class; + char *item_sep_str; + char item_sep; + int nokey; + char *buf; + size_t buf_size; + char *escape_mode_str; + const char * (*escape_str)(char **dst, size_t *dst_size, + const char *src, const char sep, void *log_ctx); +} CompactContext; + +#define OFFSET(x) offsetof(CompactContext, x) + +static const AVOption compact_options[]= { + {"item_sep", "set item separator", OFFSET(item_sep_str), AV_OPT_TYPE_STRING, {.str="|"}, CHAR_MIN, CHAR_MAX }, + {"s", "set item separator", OFFSET(item_sep_str), AV_OPT_TYPE_STRING, {.str="|"}, CHAR_MIN, CHAR_MAX }, + {"nokey", "force no key printing", OFFSET(nokey), AV_OPT_TYPE_INT, {.dbl=0}, 0, 1 }, + {"nk", "force no key printing", OFFSET(nokey), AV_OPT_TYPE_INT, {.dbl=0}, 0, 1 }, + {"escape", "set escape mode", OFFSET(escape_mode_str), AV_OPT_TYPE_STRING, {.str="c"}, CHAR_MIN, CHAR_MAX }, + {"e", "set escape mode", OFFSET(escape_mode_str), AV_OPT_TYPE_STRING, {.str="c"}, CHAR_MIN, CHAR_MAX }, + {NULL}, +}; + +static const char *compact_get_name(void *ctx) +{ + return "compact"; +} + +static const AVClass compact_class = { + "CompactContext", + compact_get_name, + compact_options +}; + +static av_cold int compact_init(WriterContext *wctx, const char *args, void *opaque) +{ + CompactContext *compact = wctx->priv; + int err; + + compact->class = &compact_class; + av_opt_set_defaults(compact); + + if (args && + (err = (av_set_options_string(compact, args, "=", ":"))) < 0) { + av_log(wctx, AV_LOG_ERROR, "Error parsing options string: '%s'\n", args); + return err; + } + if (strlen(compact->item_sep_str) != 1) { + av_log(wctx, AV_LOG_ERROR, "Item separator '%s' specified, but must contain a single character\n", + compact->item_sep_str); + return AVERROR(EINVAL); + } + compact->item_sep = compact->item_sep_str[0]; + + compact->buf_size = ESCAPE_INIT_BUF_SIZE; + if (!(compact->buf = av_malloc(compact->buf_size))) + return AVERROR(ENOMEM); + + if (!strcmp(compact->escape_mode_str, "none")) compact->escape_str = none_escape_str; + else if (!strcmp(compact->escape_mode_str, "c" )) compact->escape_str = c_escape_str; + else if (!strcmp(compact->escape_mode_str, "csv" )) compact->escape_str = csv_escape_str; + else { + av_log(wctx, AV_LOG_ERROR, "Unknown escape mode '%s'\n", compact->escape_mode_str); + return AVERROR(EINVAL); + } + + return 0; +} + +static av_cold void compact_uninit(WriterContext *wctx) +{ + CompactContext *compact = wctx->priv; + + av_freep(&compact->item_sep_str); + av_freep(&compact->buf); + av_freep(&compact->escape_mode_str); +} + +static void compact_print_section_header(WriterContext *wctx, const char *section) +{ + CompactContext *compact = wctx->priv; + + printf("%s%c", section, compact->item_sep); +} + +static void compact_print_section_footer(WriterContext *wctx, const char *section) +{ + printf("\n"); +} + +static void compact_print_str(WriterContext *wctx, const char *key, const char *value) +{ + CompactContext *compact = wctx->priv; + + if (wctx->nb_item) printf("%c", compact->item_sep); + if (!compact->nokey) + printf("%s=", key); + printf("%s", compact->escape_str(&compact->buf, &compact->buf_size, + value, compact->item_sep, wctx)); +} + +static void compact_print_int(WriterContext *wctx, const char *key, long long int value) +{ + CompactContext *compact = wctx->priv; + + if (wctx->nb_item) printf("%c", compact->item_sep); + if (!compact->nokey) + printf("%s=", key); + printf("%lld", value); +} + +static void compact_show_tags(WriterContext *wctx, AVDictionary *dict) +{ + CompactContext *compact = wctx->priv; + AVDictionaryEntry *tag = NULL; + + while ((tag = av_dict_get(dict, "", tag, AV_DICT_IGNORE_SUFFIX))) { + if (wctx->nb_item) printf("%c", compact->item_sep); + if (!compact->nokey) + printf("tag:%s=", compact->escape_str(&compact->buf, &compact->buf_size, + tag->key, compact->item_sep, wctx)); + printf("%s", compact->escape_str(&compact->buf, &compact->buf_size, + tag->value, compact->item_sep, wctx)); + } +} + +static const Writer compact_writer = { + .name = "compact", + .priv_size = sizeof(CompactContext), + .init = compact_init, + .uninit = compact_uninit, + .print_section_header = compact_print_section_header, + .print_section_footer = compact_print_section_footer, + .print_integer = compact_print_int, + .print_string = compact_print_str, + .show_tags = compact_show_tags, + .flags = WRITER_FLAG_DISPLAY_OPTIONAL_FIELDS, +}; + +/* CSV output */ + +static av_cold int csv_init(WriterContext *wctx, const char *args, void *opaque) +{ + return compact_init(wctx, "item_sep=,:nokey=1:escape=csv", opaque); +} + +static const Writer csv_writer = { + .name = "csv", + .priv_size = sizeof(CompactContext), + .init = csv_init, + .uninit = compact_uninit, + .print_section_header = compact_print_section_header, + .print_section_footer = compact_print_section_footer, + .print_integer = compact_print_int, + .print_string = compact_print_str, + .show_tags = compact_show_tags, + .flags = WRITER_FLAG_DISPLAY_OPTIONAL_FIELDS, }; /* JSON output */ @@ -549,12 +822,12 @@ static void json_print_str(WriterContext *wctx, const char *key, const char *val json_print_item_str(wctx, key, value, INDENT); } -static void json_print_int(WriterContext *wctx, const char *key, int value) +static void json_print_int(WriterContext *wctx, const char *key, long long int value) { JSONContext *json = wctx->priv; if (wctx->nb_item) printf(",\n"); - printf(INDENT "\"%s\": %d", + printf(INDENT "\"%s\": %lld", json_escape_str(&json->buf, &json->buf_size, key, wctx), value); } @@ -573,10 +846,9 @@ static void json_show_tags(WriterContext *wctx, AVDictionary *dict) printf("\n }"); } -static Writer json_writer = { - .name = "json", - .priv_size = sizeof(JSONContext), - +static const Writer json_writer = { + .name = "json", + .priv_size = sizeof(JSONContext), .init = json_init, .uninit = json_uninit, .print_header = json_print_header, @@ -599,16 +871,28 @@ static void writer_register_all(void) initialized = 1; writer_register(&default_writer); + writer_register(&compact_writer); + writer_register(&csv_writer); writer_register(&json_writer); } #define print_fmt(k, f, ...) do { \ if (fast_asprintf(&pbuf, f, __VA_ARGS__)) \ - writer_print_string(w, k, pbuf.s); \ + writer_print_string(w, k, pbuf.s, 0); \ +} while (0) + +#define print_fmt_opt(k, f, ...) do { \ + if (fast_asprintf(&pbuf, f, __VA_ARGS__)) \ + writer_print_string(w, k, pbuf.s, 1); \ } while (0) #define print_int(k, v) writer_print_integer(w, k, v) -#define print_str(k, v) writer_print_string(w, k, v) +#define print_str(k, v) writer_print_string(w, k, v, 0) +#define print_str_opt(k, v) writer_print_string(w, k, v, 1) +#define print_time(k, v, tb) writer_print_time(w, k, v, tb) +#define print_ts(k, v) writer_print_ts(w, k, v) +#define print_val(k, v, u) writer_print_string(w, k, \ + value_string(val_str, sizeof(val_str), (struct unit_value){.val.i = v, .unit=u}), 0) #define print_section_header(s) writer_print_section_header(w, s) #define print_section_footer(s) writer_print_section_footer(w, s) #define show_tags(metadata) writer_show_tags(w, metadata) @@ -618,18 +902,22 @@ static void show_packet(WriterContext *w, AVFormatContext *fmt_ctx, AVPacket *pk char val_str[128]; AVStream *st = fmt_ctx->streams[pkt->stream_index]; struct print_buf pbuf = {.s = NULL}; + const char *s; print_section_header("packet"); - print_str("codec_type", av_x_if_null(av_get_media_type_string(st->codec->codec_type), "unknown")); + s = av_get_media_type_string(st->codec->codec_type); + if (s) print_str ("codec_type", s); + else print_str_opt("codec_type", "unknown"); print_int("stream_index", pkt->stream_index); - print_str("pts", ts_value_string (val_str, sizeof(val_str), pkt->pts)); - print_str("pts_time", time_value_string(val_str, sizeof(val_str), pkt->pts, &st->time_base)); - print_str("dts", ts_value_string (val_str, sizeof(val_str), pkt->dts)); - print_str("dts_time", time_value_string(val_str, sizeof(val_str), pkt->dts, &st->time_base)); - print_str("duration", ts_value_string (val_str, sizeof(val_str), pkt->duration)); - print_str("duration_time", time_value_string(val_str, sizeof(val_str), pkt->duration, &st->time_base)); - print_str("size", value_string (val_str, sizeof(val_str), pkt->size, unit_byte_str)); - print_fmt("pos", "%"PRId64, pkt->pos); + print_ts ("pts", pkt->pts); + print_time("pts_time", pkt->pts, &st->time_base); + print_ts ("dts", pkt->dts); + print_time("dts_time", pkt->dts, &st->time_base); + print_ts ("duration", pkt->duration); + print_time("duration_time", pkt->duration, &st->time_base); + print_val("size", pkt->size, unit_byte_str); + if (pkt->pos != -1) print_fmt ("pos", "%"PRId64, pkt->pos); + else print_str_opt("pos", "N/A"); print_fmt("flags", "%c", pkt->flags & AV_PKT_FLAG_KEY ? 'K' : '_'); print_section_footer("packet"); @@ -654,6 +942,7 @@ static void show_stream(WriterContext *w, AVFormatContext *fmt_ctx, int stream_i AVCodecContext *dec_ctx; AVCodec *dec; char val_str[128]; + const char *s; AVRational display_aspect_ratio; struct print_buf pbuf = {.s = NULL}; @@ -666,10 +955,13 @@ static void show_stream(WriterContext *w, AVFormatContext *fmt_ctx, int stream_i print_str("codec_name", dec->name); print_str("codec_long_name", dec->long_name); } else { - print_str("codec_name", "unknown"); + print_str_opt("codec_name", "unknown"); + print_str_opt("codec_long_name", "unknown"); } - print_str("codec_type", av_x_if_null(av_get_media_type_string(dec_ctx->codec_type), "unknown")); + s = av_get_media_type_string(dec_ctx->codec_type); + if (s) print_str ("codec_type", s); + else print_str_opt("codec_type", "unknown"); print_fmt("codec_time_base", "%d/%d", dec_ctx->time_base.num, dec_ctx->time_base.den); /* print AVI/FourCC tag */ @@ -693,33 +985,60 @@ static void show_stream(WriterContext *w, AVFormatContext *fmt_ctx, int stream_i print_fmt("display_aspect_ratio", "%d:%d", display_aspect_ratio.num, display_aspect_ratio.den); + } else { + print_str_opt("sample_aspect_ratio", "N/A"); + print_str_opt("display_aspect_ratio", "N/A"); } - print_str("pix_fmt", av_x_if_null(av_get_pix_fmt_name(dec_ctx->pix_fmt), "unknown")); + s = av_get_pix_fmt_name(dec_ctx->pix_fmt); + if (s) print_str ("pix_fmt", s); + 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 + } else { + print_str_opt("timecode", "N/A"); + } break; case AVMEDIA_TYPE_AUDIO: - print_str("sample_fmt", - av_x_if_null(av_get_sample_fmt_name(dec_ctx->sample_fmt), "unknown")); - print_str("sample_rate", value_string(val_str, sizeof(val_str), dec_ctx->sample_rate, unit_hertz_str)); + s = av_get_sample_fmt_name(dec_ctx->sample_fmt); + if (s) print_str ("sample_fmt", s); + else print_str_opt("sample_fmt", "unknown"); + print_val("sample_rate", dec_ctx->sample_rate, unit_hertz_str); print_int("channels", dec_ctx->channels); print_int("bits_per_sample", av_get_bits_per_sample(dec_ctx->codec_id)); break; } } else { - print_str("codec_type", "unknown"); + print_str_opt("codec_type", "unknown"); + } + if (dec_ctx->codec && dec_ctx->codec->priv_class) { + const AVOption *opt = NULL; + while (opt = av_opt_next(dec_ctx->priv_data,opt)) { + uint8_t *str; + if (opt->flags) continue; + if (av_opt_get(dec_ctx->priv_data, opt->name, 0, &str) >= 0) { + print_str(opt->name, str); + av_free(str); + } + } } - if (fmt_ctx->iformat->flags & AVFMT_SHOW_IDS) - print_fmt("id", "0x%x", stream->id); + if (fmt_ctx->iformat->flags & AVFMT_SHOW_IDS) print_fmt ("id", "0x%x", stream->id); + else print_str_opt("id", "N/A"); print_fmt("r_frame_rate", "%d/%d", stream->r_frame_rate.num, stream->r_frame_rate.den); print_fmt("avg_frame_rate", "%d/%d", stream->avg_frame_rate.num, stream->avg_frame_rate.den); print_fmt("time_base", "%d/%d", stream->time_base.num, stream->time_base.den); - print_str("start_time", time_value_string(val_str, sizeof(val_str), stream->start_time, &stream->time_base)); - print_str("duration", time_value_string(val_str, sizeof(val_str), stream->duration, &stream->time_base)); - if (stream->nb_frames) - print_fmt("nb_frames", "%"PRId64, stream->nb_frames); - + print_time("start_time", stream->start_time, &stream->time_base); + print_time("duration", stream->duration, &stream->time_base); + if (stream->nb_frames) print_fmt ("nb_frames", "%"PRId64, stream->nb_frames); + else print_str_opt("nb_frames", "N/A"); show_tags(stream->metadata); print_section_footer("stream"); @@ -737,6 +1056,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); struct print_buf pbuf = {.s = NULL}; print_section_header("format"); @@ -744,10 +1064,12 @@ static void show_format(WriterContext *w, AVFormatContext *fmt_ctx) print_int("nb_streams", fmt_ctx->nb_streams); print_str("format_name", fmt_ctx->iformat->name); print_str("format_long_name", fmt_ctx->iformat->long_name); - print_str("start_time", time_value_string(val_str, sizeof(val_str), fmt_ctx->start_time, &AV_TIME_BASE_Q)); - print_str("duration", time_value_string(val_str, sizeof(val_str), fmt_ctx->duration, &AV_TIME_BASE_Q)); - print_str("size", value_string(val_str, sizeof(val_str), fmt_ctx->file_size, unit_byte_str)); - print_str("bit_rate", value_string(val_str, sizeof(val_str), fmt_ctx->bit_rate, unit_bit_per_second_str)); + print_time("start_time", fmt_ctx->start_time, &AV_TIME_BASE_Q); + print_time("duration", fmt_ctx->duration, &AV_TIME_BASE_Q); + if (size >= 0) print_val ("size", size, unit_byte_str); + else print_str_opt("size", "N/A"); + if (fmt_ctx->bit_rate > 0) print_val ("bit_rate", fmt_ctx->bit_rate, unit_bit_per_second_str); + else print_str_opt("bit_rate", "N/A"); show_tags(fmt_ctx->metadata); print_section_footer("format"); av_free(pbuf.s); @@ -808,7 +1130,7 @@ static int probe_file(const char *filename) { AVFormatContext *fmt_ctx; int ret; - Writer *w; + const Writer *w; char *buf; char *w_name = NULL, *w_args = NULL; WriterContext *wctx; @@ -838,7 +1160,7 @@ static int probe_file(const char *filename) PRINT_CHAPTER(format); writer_print_footer(wctx); - av_close_input_file(fmt_ctx); + avformat_close_input(&fmt_ctx); writer_close(&wctx); end: @@ -908,7 +1230,8 @@ static const OptionDef options[] = { "use sexagesimal format HOURS:MM:SS.MICROSECONDS for time units" }, { "pretty", 0, {(void*)&opt_pretty}, "prettify the format of displayed values, make it more human readable" }, - { "print_format", OPT_STRING | HAS_ARG, {(void*)&print_format}, "set the output printing format (available formats are: default, json)", "format" }, + { "print_format", OPT_STRING | HAS_ARG, {(void*)&print_format}, + "set the output printing format (available formats are: default, compact, csv, json)", "format" }, { "show_format", OPT_BOOL, {(void*)&do_show_format} , "show format/container info" }, { "show_packets", OPT_BOOL, {(void*)&do_show_packets}, "show packets info" }, { "show_streams", OPT_BOOL, {(void*)&do_show_streams}, "show streams info" }, @@ -923,12 +1246,13 @@ int main(int argc, char **argv) parse_loglevel(argc, argv, options); av_register_all(); + avformat_network_init(); init_opts(); #if CONFIG_AVDEVICE avdevice_register_all(); #endif - show_banner(); + show_banner(argc, argv, options); parse_options(NULL, argc, argv, options, opt_input_file); if (!input_filename) { @@ -940,5 +1264,7 @@ int main(int argc, char **argv) ret = probe_file(input_filename); + avformat_network_deinit(); + return ret; }