X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=ffprobe.c;h=f9f5715ea5a028b4c3624bea27d79dd924b35b66;hb=7221579b0cf08e263827542c2ac767016c657d55;hp=47dad44ec5cfc857f63164c5921e474c04699d6a;hpb=336ce917e6e6adb10ee44945684c67cdea65e228;p=ffmpeg diff --git a/ffprobe.c b/ffprobe.c index 47dad44ec5c..f9f5715ea5a 100644 --- a/ffprobe.c +++ b/ffprobe.c @@ -19,11 +19,13 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#undef HAVE_AV_CONFIG_H +#include "config.h" + #include "libavformat/avformat.h" #include "libavcodec/avcodec.h" #include "libavcodec/opt.h" #include "libavutil/pixdesc.h" +#include "libavdevice/avdevice.h" #include "cmdutils.h" const char program_name[] = "FFprobe"; @@ -32,6 +34,7 @@ const int program_birth_year = 2007; static int do_show_format = 0; static int do_show_streams = 0; +static int convert_tags = 0; static int show_value_unit = 0; static int use_value_prefix = 0; static int use_byte_value_binary_prefix = 0; @@ -42,6 +45,7 @@ static const OptionDef options[]; /* FFprobe context */ 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" }; @@ -67,7 +71,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) (log2(val)) / 10; + index = (int) (log(val)/log(2)) / 10; index = av_clip(index, 0, FF_ARRAY_ELEMS(binary_unit_prefixes) -1); val /= pow(2, index*10); prefix_string = binary_unit_prefixes[index]; @@ -97,14 +101,14 @@ static char *time_value_string(char *buf, int buf_size, int64_t val, const AVRat return buf; } -static const char *codec_type_string(enum CodecType codec_type) +static const char *media_type_string(enum AVMediaType media_type) { - switch (codec_type) { - case CODEC_TYPE_VIDEO: return "video"; - case CODEC_TYPE_AUDIO: return "audio"; - case CODEC_TYPE_DATA: return "data"; - case CODEC_TYPE_SUBTITLE: return "subtitle"; - case CODEC_TYPE_ATTACHMENT: return "attachment"; + 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"; } } @@ -115,8 +119,9 @@ static void show_stream(AVFormatContext *fmt_ctx, int stream_idx) AVCodecContext *dec_ctx; AVCodec *dec; char val_str[128]; - AVMetadataTag *tag; + AVMetadataTag *tag = NULL; char a, b, c, d; + AVRational display_aspect_ratio; printf("[STREAM]\n"); @@ -130,7 +135,7 @@ static void show_stream(AVFormatContext *fmt_ctx, int stream_idx) printf("codec_name=unknown\n"); } - printf("codec_type=%s\n", codec_type_string(dec_ctx->codec_type)); + printf("codec_type=%s\n", media_type_string(dec_ctx->codec_type)); printf("codec_time_base=%d/%d\n", dec_ctx->time_base.num, dec_ctx->time_base.den); /* print AVI/FourCC tag */ @@ -146,19 +151,23 @@ static void show_stream(AVFormatContext *fmt_ctx, int stream_idx) printf("\ncodec_tag=0x%04x\n", dec_ctx->codec_tag); switch (dec_ctx->codec_type) { - case CODEC_TYPE_VIDEO: + case AVMEDIA_TYPE_VIDEO: printf("width=%d\n", dec_ctx->width); printf("height=%d\n", dec_ctx->height); printf("has_b_frames=%d\n", dec_ctx->has_b_frames); printf("sample_aspect_ratio=%d:%d\n", dec_ctx->sample_aspect_ratio.num, dec_ctx->sample_aspect_ratio.den); - printf("display_aspect_ratio=%d:%d\n", dec_ctx->sample_aspect_ratio.num, - dec_ctx->sample_aspect_ratio.den); + 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, + 1024*1024); + printf("display_aspect_ratio=%d:%d\n", display_aspect_ratio.num, + display_aspect_ratio.den); printf("pix_fmt=%s\n", dec_ctx->pix_fmt != PIX_FMT_NONE ? av_pix_fmt_descriptors[dec_ctx->pix_fmt].name : "unknown"); break; - case CODEC_TYPE_AUDIO: + case AVMEDIA_TYPE_AUDIO: printf("sample_rate=%s\n", value_string(val_str, sizeof(val_str), dec_ctx->sample_rate, unit_hertz_str)); @@ -183,7 +192,7 @@ static void show_stream(AVFormatContext *fmt_ctx, int stream_idx) &stream->time_base)); while ((tag = av_metadata_get(stream->metadata, "", tag, AV_METADATA_IGNORE_SUFFIX))) - printf("%s=%s\n", tag->key, tag->value); + printf("TAG:%s=%s\n", tag->key, tag->value); printf("[/STREAM]\n"); } @@ -208,6 +217,8 @@ static void show_format(AVFormatContext *fmt_ctx) printf("bit_rate=%s\n", value_string(val_str, sizeof(val_str), fmt_ctx->bit_rate, unit_bit_per_second_str)); + if (convert_tags) + av_metadata_conv(fmt_ctx, NULL, fmt_ctx->iformat->metadata_conv); while ((tag = av_metadata_get(fmt_ctx->metadata, "", tag, AV_METADATA_IGNORE_SUFFIX))) printf("TAG:%s=%s\n", tag->key, tag->value); @@ -221,7 +232,7 @@ static int open_input_file(AVFormatContext **fmt_ctx_ptr, const char *filename) fmt_ctx = avformat_alloc_context(); - if ((err = av_open_input_file(&fmt_ctx, filename, NULL, 0, NULL)) < 0) { + if ((err = av_open_input_file(&fmt_ctx, filename, iformat, 0, NULL)) < 0) { print_error(filename, err); return err; } @@ -278,11 +289,25 @@ static void show_usage(void) printf("\n"); } -static void opt_input_file(const char *filename) +static void opt_format(const char *arg) { - if (!strcmp(filename, "-")) - filename = "pipe:"; - input_filename = filename; + iformat = av_find_input_format(arg); + if (!iformat) { + fprintf(stderr, "Unknown input format: %s\n", arg); + exit(1); + } +} + +static void opt_input_file(const char *arg) +{ + if (input_filename) { + fprintf(stderr, "Argument '%s' provided as input filename, but '%s' was already specified.\n", + arg, input_filename); + exit(1); + } + if (!strcmp(arg, "-")) + arg = "pipe:"; + input_filename = arg; } static void show_help(void) @@ -302,8 +327,10 @@ static void opt_pretty(void) static const OptionDef options[] = { #include "cmdutils_common_opts.h" - { "unit", OPT_BOOL, {(void*)&show_value_unit}, "show unit of the displayed values" }, - { "prefix", OPT_BOOL, {(void*)&use_value_prefix}, "use SI prefixes for the displayed values" }, + { "convert_tags", OPT_BOOL, {(void*)&convert_tags}, "convert tag names to the FFmpeg generic tag names" }, + { "f", HAS_ARG, {(void*)opt_format}, "force format", "format" }, + { "unit", OPT_BOOL, {(void*)&show_value_unit}, "show unit of the displayed values" }, + { "prefix", OPT_BOOL, {(void*)&use_value_prefix}, "use SI prefixes for the displayed values" }, { "byte_binary_prefix", OPT_BOOL, {(void*)&use_byte_value_binary_prefix}, "use binary prefixes for byte units" }, { "sexagesimal", OPT_BOOL, {(void*)&use_value_sexagesimal_format}, @@ -311,13 +338,16 @@ static const OptionDef options[] = { { "pretty", 0, {(void*)&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_streams", OPT_BOOL, {(void*)&do_show_streams}, "show streams info" }, + { "show_streams", OPT_BOOL, {(void*)&do_show_streams}, "show streams info" }, { NULL, }, }; int main(int argc, char **argv) { av_register_all(); +#if CONFIG_AVDEVICE + avdevice_register_all(); +#endif show_banner(); parse_options(argc, argv, options, opt_input_file);