X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=avprobe.c;h=a83fa6815dc983d7f8dc45231e4abe4f49f67a4d;hb=b9f76d19d81fbc7f088536f966c2d3dc23c34ddc;hp=acf0ab9d495904fd4283785b384fbc7dd8623817;hpb=d30acfa94c995d8ebde9c8492747fec611db066d;p=ffmpeg diff --git a/avprobe.c b/avprobe.c index acf0ab9d495..a83fa6815dc 100644 --- a/avprobe.c +++ b/avprobe.c @@ -23,9 +23,12 @@ #include "libavformat/avformat.h" #include "libavcodec/avcodec.h" +#include "libavutil/avstring.h" +#include "libavutil/display.h" #include "libavutil/opt.h" #include "libavutil/pixdesc.h" #include "libavutil/dict.h" +#include "libavutil/libm.h" #include "libavdevice/avdevice.h" #include "cmdutils.h" @@ -44,7 +47,7 @@ static int use_byte_value_binary_prefix = 0; static int use_value_sexagesimal_format = 0; /* globals */ -static const OptionDef options[]; +static const OptionDef *options; /* AVprobe context */ static const char *input_filename; @@ -58,10 +61,9 @@ 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) +static void avprobe_cleanup(int ret) { av_dict_free(&fmt_entries_to_show); - exit(ret); } /* @@ -81,22 +83,32 @@ void exit_program(int ret) typedef enum { ARRAY, OBJECT -} ProbeElementType; +} PrintElementType; -typedef struct { +typedef struct PrintElement { const char *name; - ProbeElementType type; + PrintElementType type; int64_t index; int64_t nb_elems; -} ProbeElement; +} PrintElement; -typedef struct { - ProbeElement *prefix; +typedef struct PrintContext { + PrintElement *prefix; int level; -} OutputContext; + void (*print_header)(void); + void (*print_footer)(void); + + void (*print_array_header) (const char *name, int plain_values); + void (*print_array_footer) (const char *name, int plain_values); + void (*print_object_header)(const char *name); + void (*print_object_footer)(const char *name); + + void (*print_integer) (const char *key, int64_t value); + void (*print_string) (const char *key, const char *value); +} PrintContext; static AVIOContext *probe_out = NULL; -static OutputContext octx; +static PrintContext octx; #define AVP_INDENT() avio_printf(probe_out, "%*c", octx.level * 2, ' ') /* @@ -146,16 +158,28 @@ static void ini_escape_print(const char *s) } } -static void ini_print_array_header(const char *name) +static void ini_print_array_header(const char *name, int plain_values) { - if (octx.prefix[octx.level -1].nb_elems) + if (!plain_values) { + /* Add a new line if we create a new full group */ + if (octx.prefix[octx.level -1].nb_elems) + avio_printf(probe_out, "\n"); + } else { + ini_escape_print(name); + avio_w8(probe_out, '='); + } +} + +static void ini_print_array_footer(const char *name, int plain_values) +{ + if (plain_values) avio_printf(probe_out, "\n"); } static void ini_print_object_header(const char *name) { int i; - ProbeElement *el = octx.prefix + octx.level -1; + PrintElement *el = octx.prefix + octx.level -1; if (el->nb_elems) avio_printf(probe_out, "\n"); @@ -170,15 +194,21 @@ static void ini_print_object_header(const char *name) } avio_printf(probe_out, "%s", name); - if (el && el->type == ARRAY) + if (el->type == ARRAY) avio_printf(probe_out, ".%"PRId64"", el->nb_elems); avio_printf(probe_out, "]\n"); } static void ini_print_integer(const char *key, int64_t value) { - ini_escape_print(key); - avio_printf(probe_out, "=%"PRId64"\n", value); + if (key) { + ini_escape_print(key); + avio_printf(probe_out, "=%"PRId64"\n", value); + } else { + if (octx.prefix[octx.level -1].nb_elems) + avio_printf(probe_out, ","); + avio_printf(probe_out, "%"PRId64, value); + } } @@ -203,7 +233,7 @@ static void json_print_footer(void) avio_printf(probe_out, "}\n"); } -static void json_print_array_header(const char *name) +static void json_print_array_header(const char *name, int plain_values) { if (octx.prefix[octx.level -1].nb_elems) avio_printf(probe_out, ",\n"); @@ -212,7 +242,7 @@ static void json_print_array_header(const char *name) avio_printf(probe_out, "[\n"); } -static void json_print_array_footer(const char *name) +static void json_print_array_footer(const char *name, int plain_values) { avio_printf(probe_out, "\n"); AVP_INDENT(); @@ -238,10 +268,18 @@ static void json_print_object_footer(const char *name) static void json_print_integer(const char *key, int64_t value) { - if (octx.prefix[octx.level -1].nb_elems) - avio_printf(probe_out, ",\n"); - AVP_INDENT(); - avio_printf(probe_out, "\"%s\" : %"PRId64"", key, value); + if (key) { + if (octx.prefix[octx.level -1].nb_elems) + avio_printf(probe_out, ",\n"); + AVP_INDENT(); + avio_printf(probe_out, "\"%s\" : ", key); + } else { + if (octx.prefix[octx.level -1].nb_elems) + avio_printf(probe_out, ", "); + else + AVP_INDENT(); + } + avio_printf(probe_out, "%"PRId64, value); } static void json_escape_print(const char *s) @@ -280,6 +318,54 @@ static void json_print_string(const char *key, const char *value) avio_w8(probe_out, '\"'); } +/* + * old-style pseudo-INI + */ +static void old_print_object_header(const char *name) +{ + char *str, *p; + + if (!strcmp(name, "tags")) + return; + + str = p = av_strdup(name); + if (!str) + return; + while (*p) { + *p = av_toupper(*p); + p++; + } + + avio_printf(probe_out, "[%s]\n", str); + av_freep(&str); +} + +static void old_print_object_footer(const char *name) +{ + char *str, *p; + + if (!strcmp(name, "tags")) + return; + + str = p = av_strdup(name); + if (!str) + return; + while (*p) { + *p = av_toupper(*p); + p++; + } + + avio_printf(probe_out, "[/%s]\n", str); + av_freep(&str); +} + +static void old_print_string(const char *key, const char *value) +{ + if (!strcmp(octx.prefix[octx.level - 1].name, "tags")) + avio_printf(probe_out, "TAG:"); + ini_print_string(key, value); +} + /* * Simple Formatter for single entries. */ @@ -302,39 +388,26 @@ static void show_format_entry_string(const char *key, const char *value) } } - -void (*print_header)(void) = ini_print_header; -void (*print_footer)(void) = ini_print_footer; - -void (*print_array_header) (const char *name) = ini_print_array_header; -void (*print_array_footer) (const char *name); -void (*print_object_header)(const char *name) = ini_print_object_header; -void (*print_object_footer)(const char *name); - -void (*print_integer) (const char *key, int64_t value) = ini_print_integer; -void (*print_string) (const char *key, const char *value) = ini_print_string; - - static void probe_group_enter(const char *name, int type) { int64_t count = -1; octx.prefix = - av_realloc(octx.prefix, sizeof(ProbeElement) * (octx.level + 1)); + av_realloc(octx.prefix, sizeof(PrintElement) * (octx.level + 1)); if (!octx.prefix || !name) { fprintf(stderr, "Out of memory\n"); - exit(1); + exit_program(1); } if (octx.level) { - ProbeElement *parent = octx.prefix + octx.level -1; + PrintElement *parent = octx.prefix + octx.level -1; if (parent->type == ARRAY) count = parent->nb_elems; parent->nb_elems++; } - octx.prefix[octx.level++] = (ProbeElement){name, type, count, 0}; + octx.prefix[octx.level++] = (PrintElement){name, type, count, 0}; } static void probe_group_leave(void) @@ -344,38 +417,38 @@ static void probe_group_leave(void) static void probe_header(void) { - if (print_header) - print_header(); + if (octx.print_header) + octx.print_header(); probe_group_enter("root", OBJECT); } static void probe_footer(void) { - if (print_footer) - print_footer(); + if (octx.print_footer) + octx.print_footer(); probe_group_leave(); } -static void probe_array_header(const char *name) +static void probe_array_header(const char *name, int plain_values) { - if (print_array_header) - print_array_header(name); + if (octx.print_array_header) + octx.print_array_header(name, plain_values); probe_group_enter(name, ARRAY); } -static void probe_array_footer(const char *name) +static void probe_array_footer(const char *name, int plain_values) { probe_group_leave(); - if (print_array_footer) - print_array_footer(name); + if (octx.print_array_footer) + octx.print_array_footer(name, plain_values); } static void probe_object_header(const char *name) { - if (print_object_header) - print_object_header(name); + if (octx.print_object_header) + octx.print_object_header(name); probe_group_enter(name, OBJECT); } @@ -383,19 +456,19 @@ static void probe_object_header(const char *name) static void probe_object_footer(const char *name) { probe_group_leave(); - if (print_object_footer) - print_object_footer(name); + if (octx.print_object_footer) + octx.print_object_footer(name); } static void probe_int(const char *key, int64_t value) { - print_integer(key, value); + octx.print_integer(key, value); octx.prefix[octx.level -1].nb_elems++; } static void probe_str(const char *key, const char *value) { - print_string(key, value); + octx.print_string(key, value); octx.prefix[octx.level -1].nb_elems++; } @@ -427,7 +500,7 @@ static char *value_string(char *buf, int buf_size, double val, const char *unit) int index; if (unit == unit_byte_str && use_byte_value_binary_prefix) { - index = (int) (log(val)/log(2)) / 10; + index = (int) log2(val) / 10; index = av_clip(index, 0, FF_ARRAY_ELEMS(binary_unit_prefixes) - 1); val /= pow(2, index * 10); prefix_string = binary_unit_prefixes[index]; @@ -484,20 +557,6 @@ static char *tag_string(char *buf, int buf_size, int tag) return buf; } - - -static const char *media_type_string(enum AVMediaType media_type) -{ - switch (media_type) { - case AVMEDIA_TYPE_VIDEO: return "video"; - case AVMEDIA_TYPE_AUDIO: return "audio"; - case AVMEDIA_TYPE_DATA: return "data"; - case AVMEDIA_TYPE_SUBTITLE: return "subtitle"; - case AVMEDIA_TYPE_ATTACHMENT: return "attachment"; - default: return "unknown"; - } -} - static void show_packet(AVFormatContext *fmt_ctx, AVPacket *pkt) { char val_str[128]; @@ -529,20 +588,21 @@ static void show_packets(AVFormatContext *fmt_ctx) AVPacket pkt; av_init_packet(&pkt); - probe_array_header("packets"); + probe_array_header("packets", 0); while (!av_read_frame(fmt_ctx, &pkt)) show_packet(fmt_ctx, &pkt); - probe_array_footer("packets"); + probe_array_footer("packets", 0); } static void show_stream(AVFormatContext *fmt_ctx, int stream_idx) { AVStream *stream = fmt_ctx->streams[stream_idx]; AVCodecContext *dec_ctx; - AVCodec *dec; + const AVCodec *dec; const char *profile; char val_str[128]; - AVRational display_aspect_ratio; + AVRational display_aspect_ratio, *sar = NULL; + const AVPixFmtDescriptor *desc; probe_object_header("stream"); @@ -575,23 +635,33 @@ static void show_stream(AVFormatContext *fmt_ctx, int stream_idx) case AVMEDIA_TYPE_VIDEO: probe_int("width", dec_ctx->width); probe_int("height", dec_ctx->height); + probe_int("coded_width", dec_ctx->coded_width); + probe_int("coded_height", dec_ctx->coded_height); probe_int("has_b_frames", dec_ctx->has_b_frames); - if (dec_ctx->sample_aspect_ratio.num) { + if (dec_ctx->sample_aspect_ratio.num) + sar = &dec_ctx->sample_aspect_ratio; + else if (stream->sample_aspect_ratio.num) + sar = &stream->sample_aspect_ratio; + + if (sar) { probe_str("sample_aspect_ratio", - rational_string(val_str, sizeof(val_str), ":", - &dec_ctx->sample_aspect_ratio)); + rational_string(val_str, sizeof(val_str), ":", sar)); av_reduce(&display_aspect_ratio.num, &display_aspect_ratio.den, - dec_ctx->width * dec_ctx->sample_aspect_ratio.num, - dec_ctx->height * dec_ctx->sample_aspect_ratio.den, + dec_ctx->width * sar->num, dec_ctx->height * sar->den, 1024*1024); probe_str("display_aspect_ratio", rational_string(val_str, sizeof(val_str), ":", &display_aspect_ratio)); } - probe_str("pix_fmt", - dec_ctx->pix_fmt != PIX_FMT_NONE ? av_pix_fmt_descriptors[dec_ctx->pix_fmt].name - : "unknown"); + desc = av_pix_fmt_desc_get(dec_ctx->pix_fmt); + probe_str("pix_fmt", desc ? desc->name : "unknown"); probe_int("level", dec_ctx->level); + + probe_str("color_range", av_color_range_name(dec_ctx->color_range)); + probe_str("color_space", av_color_space_name(dec_ctx->colorspace)); + probe_str("color_trc", av_color_transfer_name(dec_ctx->color_trc)); + probe_str("color_pri", av_color_primaries_name(dec_ctx->color_primaries)); + probe_str("chroma_loc", av_chroma_location_name(dec_ctx->chroma_sample_location)); break; case AVMEDIA_TYPE_AUDIO: @@ -610,12 +680,13 @@ static void show_stream(AVFormatContext *fmt_ctx, int stream_idx) if (fmt_ctx->iformat->flags & AVFMT_SHOW_IDS) probe_int("id", stream->id); - probe_str("r_frame_rate", - rational_string(val_str, sizeof(val_str), "/", - &stream->r_frame_rate)); probe_str("avg_frame_rate", rational_string(val_str, sizeof(val_str), "/", &stream->avg_frame_rate)); + if (dec_ctx->bit_rate) + probe_str("bit_rate", + value_string(val_str, sizeof(val_str), + dec_ctx->bit_rate, unit_bit_per_second_str)); probe_str("time_base", rational_string(val_str, sizeof(val_str), "/", &stream->time_base)); @@ -630,6 +701,27 @@ static void show_stream(AVFormatContext *fmt_ctx, int stream_idx) probe_dict(stream->metadata, "tags"); + if (stream->nb_side_data) { + int i, j; + probe_object_header("sidedata"); + for (i = 0; i < stream->nb_side_data; i++) { + const AVPacketSideData* sd = &stream->side_data[i]; + switch (sd->type) { + case AV_PKT_DATA_DISPLAYMATRIX: + probe_object_header("displaymatrix"); + probe_array_header("matrix", 1); + for (j = 0; j < 9; j++) + probe_int(NULL, ((int32_t *)sd->data)[j]); + probe_array_footer("matrix", 1); + probe_int("rotation", + av_display_rotation_get((int32_t *)sd->data)); + probe_object_footer("displaymatrix"); + break; + } + } + probe_object_footer("sidedata"); + } + probe_object_footer("stream"); } @@ -692,7 +784,10 @@ static int open_input_file(AVFormatContext **fmt_ctx_ptr, const char *filename) AVStream *stream = fmt_ctx->streams[i]; AVCodec *codec; - if (!(codec = avcodec_find_decoder(stream->codec->codec_id))) { + if (stream->codec->codec_id == AV_CODEC_ID_PROBE) { + fprintf(stderr, "Failed to probe codec for input stream %d\n", + stream->index); + } else if (!(codec = avcodec_find_decoder(stream->codec->codec_id))) { fprintf(stderr, "Unsupported codec with id %d for input stream %d\n", stream->codec->codec_id, stream->index); @@ -732,10 +827,10 @@ static int probe_file(const char *filename) show_format(fmt_ctx); if (do_show_streams) { - probe_array_header("streams"); + probe_array_header("streams", 0); for (i = 0; i < fmt_ctx->nb_streams; i++) show_stream(fmt_ctx, i); - probe_array_footer("streams"); + probe_array_footer("streams", 0); } if (do_show_packets) @@ -752,7 +847,7 @@ static void show_usage(void) printf("\n"); } -static int opt_format(const char *opt, const char *arg) +static int opt_format(void *optctx, const char *opt, const char *arg) { iformat = av_find_input_format(arg); if (!iformat) { @@ -762,27 +857,34 @@ static int opt_format(const char *opt, const char *arg) return 0; } -static int opt_output_format(const char *opt, const char *arg) +static int opt_output_format(void *optctx, const char *opt, const char *arg) { if (!strcmp(arg, "json")) { - print_header = json_print_header; - print_footer = json_print_footer; - print_array_header = json_print_array_header; - print_array_footer = json_print_array_footer; - print_object_header = json_print_object_header; - print_object_footer = json_print_object_footer; - - print_integer = json_print_integer; - print_string = json_print_string; + octx.print_header = json_print_header; + octx.print_footer = json_print_footer; + octx.print_array_header = json_print_array_header; + octx.print_array_footer = json_print_array_footer; + octx.print_object_header = json_print_object_header; + octx.print_object_footer = json_print_object_footer; + + octx.print_integer = json_print_integer; + octx.print_string = json_print_string; } else if (!strcmp(arg, "ini")) { - print_header = ini_print_header; - print_footer = ini_print_footer; - print_array_header = ini_print_array_header; - print_object_header = ini_print_object_header; - - print_integer = ini_print_integer; - print_string = ini_print_string; + octx.print_header = ini_print_header; + octx.print_footer = ini_print_footer; + octx.print_array_header = ini_print_array_header; + octx.print_array_footer = ini_print_array_footer; + octx.print_object_header = ini_print_object_header; + + octx.print_integer = ini_print_integer; + octx.print_string = ini_print_string; + } else if (!strcmp(arg, "old")) { + octx.print_header = NULL; + octx.print_object_header = old_print_object_header; + octx.print_object_footer = old_print_object_footer; + + octx.print_string = old_print_string; } else { av_log(NULL, AV_LOG_ERROR, "Unsupported formatter %s\n", arg); return AVERROR(EINVAL); @@ -790,19 +892,19 @@ static int opt_output_format(const char *opt, const char *arg) return 0; } -static int opt_show_format_entry(const char *opt, const char *arg) +static int opt_show_format_entry(void *optctx, const char *opt, const char *arg) { do_show_format = 1; nb_fmt_entries_to_show++; - print_header = NULL; - print_footer = NULL; - print_array_header = NULL; - print_array_footer = NULL; - print_object_header = NULL; - print_object_footer = NULL; - - print_integer = show_format_entry_integer; - print_string = show_format_entry_string; + octx.print_header = NULL; + octx.print_footer = NULL; + octx.print_array_header = NULL; + octx.print_array_footer = NULL; + octx.print_object_header = NULL; + octx.print_object_footer = NULL; + + octx.print_integer = show_format_entry_integer; + octx.print_string = show_format_entry_string; av_dict_set(&fmt_entries_to_show, arg, "", 0); return 0; } @@ -813,50 +915,51 @@ static void opt_input_file(void *optctx, const char *arg) fprintf(stderr, "Argument '%s' provided as input filename, but '%s' was already specified.\n", arg, input_filename); - exit(1); + exit_program(1); } if (!strcmp(arg, "-")) arg = "pipe:"; input_filename = arg; } -static void show_help(void) +void show_help_default(const char *opt, const char *arg) { av_log_set_callback(log_callback_help); show_usage(); - show_help_options(options, "Main options:\n", 0, 0); + show_help_options(options, "Main options:", 0, 0, 0); printf("\n"); show_help_children(avformat_get_class(), AV_OPT_FLAG_DECODING_PARAM); } -static void opt_pretty(void) +static int opt_pretty(void *optctx, const char *opt, const char *arg) { show_value_unit = 1; use_value_prefix = 1; use_byte_value_binary_prefix = 1; use_value_sexagesimal_format = 1; + return 0; } -static const OptionDef options[] = { +static const OptionDef real_options[] = { #include "cmdutils_common_opts.h" - { "f", HAS_ARG, {(void*)opt_format}, "force format", "format" }, - { "of", HAS_ARG, {(void*)&opt_output_format}, "output the document either as ini or json", "output_format" }, - { "unit", OPT_BOOL, {(void*)&show_value_unit}, + { "f", HAS_ARG, {.func_arg = opt_format}, "force format", "format" }, + { "of", HAS_ARG, {.func_arg = opt_output_format}, "output the document either as ini or json", "output_format" }, + { "unit", OPT_BOOL, {&show_value_unit}, "show unit of the displayed values" }, - { "prefix", OPT_BOOL, {(void*)&use_value_prefix}, + { "prefix", OPT_BOOL, {&use_value_prefix}, "use SI prefixes for the displayed values" }, - { "byte_binary_prefix", OPT_BOOL, {(void*)&use_byte_value_binary_prefix}, + { "byte_binary_prefix", OPT_BOOL, {&use_byte_value_binary_prefix}, "use binary prefixes for byte units" }, - { "sexagesimal", OPT_BOOL, {(void*)&use_value_sexagesimal_format}, + { "sexagesimal", OPT_BOOL, {&use_value_sexagesimal_format}, "use sexagesimal format HOURS:MM:SS.MICROSECONDS for time units" }, - { "pretty", 0, {(void*)&opt_pretty}, + { "pretty", 0, {.func_arg = opt_pretty}, "prettify the format of displayed values, make it more human readable" }, - { "show_format", OPT_BOOL, {(void*)&do_show_format} , "show format/container info" }, - { "show_format_entry", HAS_ARG, {(void*)opt_show_format_entry}, + { "show_format", OPT_BOOL, {&do_show_format} , "show format/container info" }, + { "show_format_entry", HAS_ARG, {.func_arg = opt_show_format_entry}, "show a particular entry from the format/container info", "entry" }, - { "show_packets", OPT_BOOL, {(void*)&do_show_packets}, "show packets info" }, - { "show_streams", OPT_BOOL, {(void*)&do_show_streams}, "show streams info" }, - { "default", HAS_ARG | OPT_AUDIO | OPT_VIDEO | OPT_EXPERT, {(void*)opt_default}, + { "show_packets", OPT_BOOL, {&do_show_packets}, "show packets info" }, + { "show_streams", OPT_BOOL, {&do_show_streams}, "show streams info" }, + { "default", HAS_ARG | OPT_AUDIO | OPT_VIDEO | OPT_EXPERT, {.func_arg = opt_default}, "generic catch all option", "" }, { NULL, }, }; @@ -877,6 +980,9 @@ int main(int argc, char **argv) if (!buffer) exit(1); + register_exit(avprobe_cleanup); + + options = real_options; parse_loglevel(argc, argv, options); av_register_all(); avformat_network_init(); @@ -886,6 +992,17 @@ int main(int argc, char **argv) #endif show_banner(); + + octx.print_header = ini_print_header; + octx.print_footer = ini_print_footer; + + octx.print_array_header = ini_print_array_header; + octx.print_array_footer = ini_print_array_footer; + octx.print_object_header = ini_print_object_header; + + octx.print_integer = ini_print_integer; + octx.print_string = ini_print_string; + parse_options(NULL, argc, argv, options, opt_input_file); if (!input_filename) { @@ -894,13 +1011,13 @@ int main(int argc, char **argv) fprintf(stderr, "Use -h to get full help or, even better, run 'man %s'.\n", program_name); - exit(1); + exit_program(1); } probe_out = avio_alloc_context(buffer, AVP_BUFFSIZE, 1, NULL, NULL, probe_buf_write, NULL); if (!probe_out) - exit(1); + exit_program(1); probe_header(); ret = probe_file(input_filename);