X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=avprobe.c;h=c7b3d39cb2d86a1d7ed8db249d38f0095cc980a6;hb=1a89025793ca73d9685a8ce8e3194efa64dd6844;hp=28746bf18e7945fad1a684ff97114caa9d1d2483;hpb=36ef5369ee9b336febc2c270f8718cec4476cb85;p=ffmpeg diff --git a/avprobe.c b/avprobe.c index 28746bf18e7..c7b3d39cb2d 100644 --- a/avprobe.c +++ b/avprobe.c @@ -23,9 +23,11 @@ #include "libavformat/avformat.h" #include "libavcodec/avcodec.h" +#include "libavutil/avstring.h" #include "libavutil/opt.h" #include "libavutil/pixdesc.h" #include "libavutil/dict.h" +#include "libavutil/libm.h" #include "libavdevice/avdevice.h" #include "cmdutils.h" @@ -58,10 +60,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,17 +82,17 @@ void exit_program(int ret) typedef enum { ARRAY, OBJECT -} ProbeElementType; +} PrintElementType; typedef struct { const char *name; - ProbeElementType type; + PrintElementType type; int64_t index; int64_t nb_elems; -} ProbeElement; +} PrintElement; typedef struct { - ProbeElement *prefix; + PrintElement *prefix; int level; void (*print_header)(void); void (*print_footer)(void); @@ -103,10 +104,10 @@ typedef struct { void (*print_integer) (const char *key, int64_t value); void (*print_string) (const char *key, const char *value); -} OutputContext; +} PrintContext; static AVIOContext *probe_out = NULL; -static OutputContext octx; +static PrintContext octx; #define AVP_INDENT() avio_printf(probe_out, "%*c", octx.level * 2, ' ') /* @@ -165,7 +166,7 @@ static void ini_print_array_header(const char *name) 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"); @@ -302,7 +303,7 @@ static void old_print_object_header(const char *name) str = p = av_strdup(name); while (*p) { - *p = toupper(*p); + *p = av_toupper(*p); p++; } @@ -319,7 +320,7 @@ static void old_print_object_footer(const char *name) str = p = av_strdup(name); while (*p) { - *p = toupper(*p); + *p = av_toupper(*p); p++; } @@ -361,21 +362,21 @@ 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) @@ -468,7 +469,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]; @@ -525,20 +526,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]; @@ -580,10 +567,11 @@ 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"); @@ -617,21 +605,23 @@ static void show_stream(AVFormatContext *fmt_ctx, int stream_idx) probe_int("width", dec_ctx->width); probe_int("height", dec_ctx->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); break; @@ -654,6 +644,10 @@ static void show_stream(AVFormatContext *fmt_ctx, int stream_idx) 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)); @@ -793,7 +787,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) { @@ -803,7 +797,7 @@ 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")) { @@ -837,7 +831,7 @@ 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++; @@ -860,50 +854,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 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, }, }; @@ -924,6 +919,8 @@ 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(); @@ -952,13 +949,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);