| @@ -82,17 +82,17 @@ static void exit_program(void) | |||||
| typedef enum { | typedef enum { | ||||
| ARRAY, | ARRAY, | ||||
| OBJECT | OBJECT | ||||
| } ProbeElementType; | |||||
| } PrintElementType; | |||||
| typedef struct { | typedef struct { | ||||
| const char *name; | const char *name; | ||||
| ProbeElementType type; | |||||
| PrintElementType type; | |||||
| int64_t index; | int64_t index; | ||||
| int64_t nb_elems; | int64_t nb_elems; | ||||
| } ProbeElement; | |||||
| } PrintElement; | |||||
| typedef struct { | typedef struct { | ||||
| ProbeElement *prefix; | |||||
| PrintElement *prefix; | |||||
| int level; | int level; | ||||
| void (*print_header)(void); | void (*print_header)(void); | ||||
| void (*print_footer)(void); | void (*print_footer)(void); | ||||
| @@ -104,10 +104,10 @@ typedef struct { | |||||
| void (*print_integer) (const char *key, int64_t value); | void (*print_integer) (const char *key, int64_t value); | ||||
| void (*print_string) (const char *key, const char *value); | void (*print_string) (const char *key, const char *value); | ||||
| } OutputContext; | |||||
| } PrintContext; | |||||
| static AVIOContext *probe_out = NULL; | static AVIOContext *probe_out = NULL; | ||||
| static OutputContext octx; | |||||
| static PrintContext octx; | |||||
| #define AVP_INDENT() avio_printf(probe_out, "%*c", octx.level * 2, ' ') | #define AVP_INDENT() avio_printf(probe_out, "%*c", octx.level * 2, ' ') | ||||
| /* | /* | ||||
| @@ -166,7 +166,7 @@ static void ini_print_array_header(const char *name) | |||||
| static void ini_print_object_header(const char *name) | static void ini_print_object_header(const char *name) | ||||
| { | { | ||||
| int i; | int i; | ||||
| ProbeElement *el = octx.prefix + octx.level -1; | |||||
| PrintElement *el = octx.prefix + octx.level -1; | |||||
| if (el->nb_elems) | if (el->nb_elems) | ||||
| avio_printf(probe_out, "\n"); | avio_printf(probe_out, "\n"); | ||||
| @@ -362,7 +362,7 @@ static void probe_group_enter(const char *name, int type) | |||||
| int64_t count = -1; | int64_t count = -1; | ||||
| octx.prefix = | octx.prefix = | ||||
| av_realloc(octx.prefix, sizeof(ProbeElement) * (octx.level + 1)); | |||||
| av_realloc(octx.prefix, sizeof(PrintElement) * (octx.level + 1)); | |||||
| if (!octx.prefix || !name) { | if (!octx.prefix || !name) { | ||||
| fprintf(stderr, "Out of memory\n"); | fprintf(stderr, "Out of memory\n"); | ||||
| @@ -370,13 +370,13 @@ static void probe_group_enter(const char *name, int type) | |||||
| } | } | ||||
| if (octx.level) { | if (octx.level) { | ||||
| ProbeElement *parent = octx.prefix + octx.level -1; | |||||
| PrintElement *parent = octx.prefix + octx.level -1; | |||||
| if (parent->type == ARRAY) | if (parent->type == ARRAY) | ||||
| count = parent->nb_elems; | count = parent->nb_elems; | ||||
| 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) | static void probe_group_leave(void) | ||||