static int use_value_sexagesimal_format = 0;
/* globals */
-static const OptionDef options[];
+static const OptionDef *options;
/* AVprobe context */
static const char *input_filename;
typedef struct {
ProbeElement *prefix;
int level;
+ void (*print_header)(void);
+ void (*print_footer)(void);
+
+ void (*print_array_header) (const char *name);
+ void (*print_array_footer) (const char *name);
+ 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);
} OutputContext;
static AVIOContext *probe_out = NULL;
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);
+ while (*p) {
+ *p = 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);
+ while (*p) {
+ *p = 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.
*/
}
}
-
-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;
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)
{
- if (print_array_header)
- print_array_header(name);
+ if (octx.print_array_header)
+ octx.print_array_header(name);
probe_group_enter(name, ARRAY);
}
static void probe_array_footer(const char *name)
{
probe_group_leave();
- if (print_array_footer)
- print_array_footer(name);
+ if (octx.print_array_footer)
+ octx.print_array_footer(name);
}
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);
}
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++;
}
AVStream *stream = fmt_ctx->streams[stream_idx];
AVCodecContext *dec_ctx;
AVCodec *dec;
+ const char *profile;
char val_str[128];
AVRational display_aspect_ratio;
probe_str("codec_tag", tag_string(val_str, sizeof(val_str),
dec_ctx->codec_tag));
+ /* print profile, if there is one */
+ if (dec && (profile = av_get_profile_name(dec, dec_ctx->profile)))
+ probe_str("profile", profile);
+
switch (dec_ctx->codec_type) {
case AVMEDIA_TYPE_VIDEO:
probe_int("width", dec_ctx->width);
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));
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);
return 0;
}
-static void opt_output_format(const char *opt, const char *arg)
+static int opt_output_format(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;
- } 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 = 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")) {
+ octx.print_header = ini_print_header;
+ octx.print_footer = ini_print_footer;
+ octx.print_array_header = ini_print_array_header;
+ 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);
- exit(1);
+ return AVERROR(EINVAL);
}
+ return 0;
}
static int opt_show_format_entry(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;
}
use_value_sexagesimal_format = 1;
}
-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" },
if (!buffer)
exit(1);
+ options = real_options;
parse_loglevel(argc, argv, options);
av_register_all();
avformat_network_init();
#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_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) {
projects / ffmpeg / blobdiff