har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ffprobe: rework/fix ini writer

Browse Source 
Do not build from scratch the section header for each section, but build
it using the previous level buffer, thus improving efficiency.

Also fix some few corner cases related to numbering which are exposed by
the pending disposition patch.
This commit is contained in:
Stefano Sabatini 2012-09-27 00:34:16 +02:00
parent 01e4537f66
commit 74bd0cf49c
1 changed files with 35 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
ffprobe.c
View File

@ -956,6 +956,7 @@ static const Writer flat_writer = {
typedef struct { typedef struct {
const AVClass *class; const AVClass *class;
int hierarchical; int hierarchical;
AVBPrint section_header[SECTION_MAX_NB_LEVELS];
} INIContext; } INIContext;
#undef OFFSET #undef OFFSET
@ -969,6 +970,25 @@ static const AVOption ini_options[] = {
DEFINE_WRITER_CLASS(ini); DEFINE_WRITER_CLASS(ini);
static int ini_init(WriterContext *wctx)
{
INIContext *ini = wctx->priv;
int i;
for (i = 0; i < SECTION_MAX_NB_LEVELS; i++)
av_bprint_init(&ini->section_header[i], 1, AV_BPRINT_SIZE_UNLIMITED);
return 0;
}
static void ini_uninit(WriterContext *wctx)
{
INIContext *ini = wctx->priv;
int i;
for (i = 0; i < SECTION_MAX_NB_LEVELS; i++)
av_bprint_finalize(&ini->section_header[i], NULL);
}
static char *ini_escape_str(AVBPrint *dst, const char *src) static char *ini_escape_str(AVBPrint *dst, const char *src)
{ {
int i = 0; int i = 0;
@ -999,14 +1019,13 @@ static char *ini_escape_str(AVBPrint *dst, const char *src)
static void ini_print_section_header(WriterContext *wctx) static void ini_print_section_header(WriterContext *wctx)
{ {
INIContext *ini = wctx->priv; INIContext *ini = wctx->priv;
AVBPrint buf; AVBPrint *buf = &ini->section_header[wctx->level];
int i;
const struct section *section = wctx->section[wctx->level]; const struct section *section = wctx->section[wctx->level];
const struct section *parent_section = wctx->level ? const struct section *parent_section = wctx->level ?
wctx->section[wctx->level-1] : NULL; wctx->section[wctx->level-1] : NULL;
av_bprint_init(&buf, 1, AV_BPRINT_SIZE_UNLIMITED); av_bprint_clear(buf);
if (wctx->level == 0) { if (!parent_section) {
printf("# ffprobe output\n\n"); printf("# ffprobe output\n\n");
return; return;
} }
@ -1014,21 +1033,20 @@ static void ini_print_section_header(WriterContext *wctx)
if (wctx->nb_item[wctx->level-1]) if (wctx->nb_item[wctx->level-1])
printf("\n"); printf("\n");
for (i = 1; i <= wctx->level; i++) { av_bprintf(buf, "%s", ini->section_header[wctx->level-1].str);
if (ini->hierarchical || if (ini->hierarchical ||
!(section->flags & (SECTION_FLAG_IS_ARRAY|SECTION_FLAG_IS_WRAPPER))) !(section->flags & (SECTION_FLAG_IS_ARRAY|SECTION_FLAG_IS_WRAPPER))) {
av_bprintf(&buf, "%s%s", i>1 ? "." : "", wctx->section[i]->name); av_bprintf(buf, "%s%s", buf->str[0] ? "." : "", wctx->section[wctx->level]->name);
}
if (parent_section->flags & SECTION_FLAG_IS_ARRAY) { if (parent_section->flags & SECTION_FLAG_IS_ARRAY) {
int n = parent_section->id == SECTION_ID_PACKETS_AND_FRAMES ? int n = parent_section->id == SECTION_ID_PACKETS_AND_FRAMES ?
wctx->nb_section_packet_frame : wctx->nb_item[wctx->level-1]; wctx->nb_section_packet_frame : wctx->nb_item[wctx->level-1];
av_bprintf(&buf, ".%d", n); av_bprintf(buf, ".%d", n);
}
} }
if (!(section->flags & (SECTION_FLAG_IS_ARRAY|SECTION_FLAG_IS_WRAPPER))) if (!(section->flags & (SECTION_FLAG_IS_ARRAY|SECTION_FLAG_IS_WRAPPER)))
printf("[%s]\n", buf.str); printf("[%s]\n", buf->str);
av_bprint_finalize(&buf, NULL);
} }
static void ini_print_str(WriterContext *wctx, const char *key, const char *value) static void ini_print_str(WriterContext *wctx, const char *key, const char *value)
@ -1050,6 +1068,8 @@ static void ini_print_int(WriterContext *wctx, const char *key, long long int va
static const Writer ini_writer = { static const Writer ini_writer = {
.name = "ini", .name = "ini",
.priv_size = sizeof(INIContext), .priv_size = sizeof(INIContext),
.init = ini_init,
.uninit = ini_uninit,
.print_section_header = ini_print_section_header, .print_section_header = ini_print_section_header,
.print_integer = ini_print_int, .print_integer = ini_print_int,
.print_string = ini_print_str, .print_string = ini_print_str,