[FFmpeg-devel] [PATCH 1/6] ffprobe: use functions to output data.
Stefano Sabatini
stefano.sabatini-lala at poste.it
Wed Aug 17 23:19:35 CEST 2011
On date Wednesday 2011-08-17 20:32:02 +0200, Clément Bœsch encoded:
> ---
> ffprobe.c | 165 +++++++++++++++++++++++++++++++++++-------------------------
> 1 files changed, 96 insertions(+), 69 deletions(-)
>
> diff --git a/ffprobe.c b/ffprobe.c
> index 4ef9902..7146ea2 100644
> --- a/ffprobe.c
> +++ b/ffprobe.c
> @@ -127,24 +127,54 @@ static const char *media_type_string(enum AVMediaType media_type)
> }
> }
>
> +static void print_info_header(const char *section)
> +{
> + printf("[%s]\n", section);
> +}
> +
> +static void print_info_item_fmt(const char *key, const char *fmt, ...)
> +{
> + va_list ap;
> + va_start(ap, fmt);
> + printf("%s=", key);
> + vprintf(fmt, ap);
> + printf("\n");
> + va_end(ap);
> +}
> +
> +static void print_info_item_str(const char *key, const char *value)
> +{
> + print_info_item_fmt(key, "%s", value);
> +}
> +
> +static void print_info_item_int(const char *key, int value)
> +{
> + printf("%s=%d\n", key, value);
> +}
> +
> +static void print_info_footer(const char *section)
> +{
> + printf("[/%s]\n", section);
> +}
> +
> static void show_packet(AVFormatContext *fmt_ctx, AVPacket *pkt)
> {
> char val_str[128];
> AVStream *st = fmt_ctx->streams[pkt->stream_index];
>
> - printf("[PACKET]\n");
> - printf("codec_type=%s\n" , media_type_string(st->codec->codec_type));
> - printf("stream_index=%d\n" , pkt->stream_index);
> - printf("pts=%s\n" , ts_value_string (val_str, sizeof(val_str), pkt->pts));
> - printf("pts_time=%s\n" , time_value_string(val_str, sizeof(val_str), pkt->pts, &st->time_base));
> - printf("dts=%s\n" , ts_value_string (val_str, sizeof(val_str), pkt->dts));
> - printf("dts_time=%s\n" , time_value_string(val_str, sizeof(val_str), pkt->dts, &st->time_base));
> - printf("duration=%s\n" , ts_value_string (val_str, sizeof(val_str), pkt->duration));
> - printf("duration_time=%s\n", time_value_string(val_str, sizeof(val_str), pkt->duration, &st->time_base));
> - printf("size=%s\n" , value_string (val_str, sizeof(val_str), pkt->size, unit_byte_str));
> - printf("pos=%"PRId64"\n" , pkt->pos);
> - printf("flags=%c\n" , pkt->flags & AV_PKT_FLAG_KEY ? 'K' : '_');
> - printf("[/PACKET]\n");
> + print_info_header("PACKET");
> + print_info_item_str("codec_type", media_type_string(st->codec->codec_type));
> + print_info_item_int("stream_index", pkt->stream_index);
> + print_info_item_str("pts", ts_value_string (val_str, sizeof(val_str), pkt->pts));
> + print_info_item_str("pts_time", time_value_string(val_str, sizeof(val_str), pkt->pts, &st->time_base));
> + print_info_item_str("dts", ts_value_string (val_str, sizeof(val_str), pkt->dts));
> + print_info_item_str("dts_time", time_value_string(val_str, sizeof(val_str), pkt->dts, &st->time_base));
> + print_info_item_str("duration", ts_value_string (val_str, sizeof(val_str), pkt->duration));
> + print_info_item_str("duration_time", time_value_string(val_str, sizeof(val_str), pkt->duration, &st->time_base));
> + print_info_item_str("size", value_string (val_str, sizeof(val_str), pkt->size, unit_byte_str));
> + print_info_item_fmt("pos", "%"PRId64, pkt->pos);
> + print_info_item_fmt("flags", "%c", pkt->flags & AV_PKT_FLAG_KEY ? 'K' : '_');
> + print_info_footer("PACKET");
> fflush(stdout);
> }
>
> @@ -167,74 +197,73 @@ static void show_stream(AVFormatContext *fmt_ctx, int stream_idx)
> AVDictionaryEntry *tag = NULL;
> AVRational display_aspect_ratio;
>
> - printf("[STREAM]\n");
> + print_info_header("STREAM");
>
> - printf("index=%d\n", stream->index);
> + print_info_item_int("index", stream->index);
>
> if ((dec_ctx = stream->codec)) {
> if ((dec = dec_ctx->codec)) {
> - printf("codec_name=%s\n", dec->name);
> - printf("codec_long_name=%s\n", dec->long_name);
> + print_info_item_str("codec_name", dec->name);
> + print_info_item_str("codec_long_name", dec->long_name);
> } else {
> - printf("codec_name=unknown\n");
> + print_info_item_str("codec_name", "unknown");
> }
>
> - 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_info_item_str("codec_type", media_type_string(dec_ctx->codec_type));
> + print_info_item_fmt("codec_time_base", "%d/%d", dec_ctx->time_base.num, dec_ctx->time_base.den);
>
> /* print AVI/FourCC tag */
> av_get_codec_tag_string(val_str, sizeof(val_str), dec_ctx->codec_tag);
> - printf("codec_tag_string=%s\n", val_str);
> - printf("codec_tag=0x%04x\n", dec_ctx->codec_tag);
> + print_info_item_str("codec_tag_string", val_str);
> + print_info_item_fmt("codec_tag", "0x%04x", dec_ctx->codec_tag);
>
> switch (dec_ctx->codec_type) {
> 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);
> + print_info_item_int("width", dec_ctx->width);
> + print_info_item_int("height", dec_ctx->height);
> + print_info_item_int("has_b_frames", dec_ctx->has_b_frames);
> if (dec_ctx->sample_aspect_ratio.num) {
> - printf("sample_aspect_ratio=%d:%d\n", dec_ctx->sample_aspect_ratio.num,
> - dec_ctx->sample_aspect_ratio.den);
> + print_info_item_fmt("sample_aspect_ratio", "%d:%d",
> + 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);
> + print_info_item_fmt("display_aspect_ratio", "%d:%d",
> + 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");
> - printf("level=%d\n", dec_ctx->level);
> + print_info_item_str("pix_fmt", dec_ctx->pix_fmt != PIX_FMT_NONE ? av_pix_fmt_descriptors[dec_ctx->pix_fmt].name : "unknown");
Note: av_get_pix_fmt_name() could be used instead
> + print_info_item_int("level", dec_ctx->level);
> break;
>
> case AVMEDIA_TYPE_AUDIO:
> - printf("sample_rate=%s\n", value_string(val_str, sizeof(val_str),
> - dec_ctx->sample_rate,
> - unit_hertz_str));
> - printf("channels=%d\n", dec_ctx->channels);
> - printf("bits_per_sample=%d\n", av_get_bits_per_sample(dec_ctx->codec_id));
> + print_info_item_str("sample_rate", value_string(val_str, sizeof(val_str), dec_ctx->sample_rate, unit_hertz_str));
> + print_info_item_int("channels", dec_ctx->channels);
> + print_info_item_int("bits_per_sample", av_get_bits_per_sample(dec_ctx->codec_id));
> break;
> }
> } else {
> - printf("codec_type=unknown\n");
> + print_info_item_fmt("codec_type", "unknown");
> }
>
> if (fmt_ctx->iformat->flags & AVFMT_SHOW_IDS)
> - printf("id=0x%x\n", stream->id);
> - printf("r_frame_rate=%d/%d\n", stream->r_frame_rate.num, stream->r_frame_rate.den);
> - printf("avg_frame_rate=%d/%d\n", stream->avg_frame_rate.num, stream->avg_frame_rate.den);
> - printf("time_base=%d/%d\n", stream->time_base.num, stream->time_base.den);
> - printf("start_time=%s\n", time_value_string(val_str, sizeof(val_str), stream->start_time,
> - &stream->time_base));
> - printf("duration=%s\n", time_value_string(val_str, sizeof(val_str), stream->duration,
> - &stream->time_base));
> + print_info_item_fmt("id=", "0x%x", stream->id);
> + print_info_item_fmt("r_frame_rate", "%d/%d", stream->r_frame_rate.num, stream->r_frame_rate.den);
> + print_info_item_fmt("avg_frame_rate", "%d/%d", stream->avg_frame_rate.num, stream->avg_frame_rate.den);
> + print_info_item_fmt("time_base", "%d/%d", stream->time_base.num, stream->time_base.den);
> + print_info_item_str("start_time", time_value_string(val_str, sizeof(val_str), stream->start_time, &stream->time_base));
> + print_info_item_str("duration", time_value_string(val_str, sizeof(val_str), stream->duration, &stream->time_base));
> if (stream->nb_frames)
> - printf("nb_frames=%"PRId64"\n", stream->nb_frames);
> + print_info_item_fmt("nb_frames", "%"PRId64, stream->nb_frames);
>
> - while ((tag = av_dict_get(stream->metadata, "", tag, AV_DICT_IGNORE_SUFFIX)))
> - printf("TAG:%s=%s\n", tag->key, tag->value);
> + while ((tag = av_dict_get(stream->metadata, "", tag, AV_DICT_IGNORE_SUFFIX))) {
> + printf("TAG:");
> + print_info_item_str(tag->key, tag->value);
> + }
>
> - printf("[/STREAM]\n");
> + print_info_footer("STREAM");
> fflush(stdout);
> }
>
> @@ -243,25 +272,23 @@ static void show_format(AVFormatContext *fmt_ctx)
> AVDictionaryEntry *tag = NULL;
> char val_str[128];
>
> - printf("[FORMAT]\n");
> -
> - printf("filename=%s\n", fmt_ctx->filename);
> - printf("nb_streams=%d\n", fmt_ctx->nb_streams);
> - printf("format_name=%s\n", fmt_ctx->iformat->name);
> - printf("format_long_name=%s\n", fmt_ctx->iformat->long_name);
> - printf("start_time=%s\n", time_value_string(val_str, sizeof(val_str), fmt_ctx->start_time,
> - &AV_TIME_BASE_Q));
> - printf("duration=%s\n", time_value_string(val_str, sizeof(val_str), fmt_ctx->duration,
> - &AV_TIME_BASE_Q));
> - printf("size=%s\n", value_string(val_str, sizeof(val_str), fmt_ctx->file_size,
> - unit_byte_str));
> - printf("bit_rate=%s\n", value_string(val_str, sizeof(val_str), fmt_ctx->bit_rate,
> - unit_bit_per_second_str));
> -
> - while ((tag = av_dict_get(fmt_ctx->metadata, "", tag, AV_DICT_IGNORE_SUFFIX)))
> - printf("TAG:%s=%s\n", tag->key, tag->value);
> -
> - printf("[/FORMAT]\n");
> + print_info_header("FORMAT");
> +
> + print_info_item_str("filename", fmt_ctx->filename);
> + print_info_item_int("nb_streams", fmt_ctx->nb_streams);
> + print_info_item_str("format_name", fmt_ctx->iformat->name);
> + print_info_item_str("format_long_name", fmt_ctx->iformat->long_name);
> + print_info_item_str("start_time", time_value_string(val_str, sizeof(val_str), fmt_ctx->start_time, &AV_TIME_BASE_Q));
> + print_info_item_str("duration", time_value_string(val_str, sizeof(val_str), fmt_ctx->duration, &AV_TIME_BASE_Q));
> + print_info_item_str("size", value_string(val_str, sizeof(val_str), fmt_ctx->file_size, unit_byte_str));
> + print_info_item_str("bit_rate", value_string(val_str, sizeof(val_str), fmt_ctx->bit_rate, unit_bit_per_second_str));
> +
> + while ((tag = av_dict_get(fmt_ctx->metadata, "", tag, AV_DICT_IGNORE_SUFFIX))) {
> + printf("TAG:");
> + print_info_item_str(tag->key, tag->value);
> + }
> +
> + print_info_footer("FORMAT");
> fflush(stdout);
> }
Looks a good idea, so I'm not against this, just leave 1/2 days for
the others to comment before committing.
--
FFmpeg = Fantastic and Fast Mystic Philosofic Exxagerate Genius
More information about the ffmpeg-devel
mailing list