[FFmpeg-devel] [PATCH] ffprobe: add an array of section print buffers to the WriterContext
Clément Bœsch
ubitux at gmail.com
Wed Oct 24 20:39:49 CEST 2012
On Wed, Oct 24, 2012 at 12:07:51PM +0200, Stefano Sabatini wrote:
> Allow to factorize buffers initialization/release, for all the writers
> which use it. Simplify.
> ---
> ffprobe.c | 116 ++++++++++++++----------------------------------------------
> 1 files changed, 27 insertions(+), 89 deletions(-)
>
> diff --git a/ffprobe.c b/ffprobe.c
> index 27f8638..34abfbb 100644
> --- a/ffprobe.c
> +++ b/ffprobe.c
> @@ -248,6 +248,8 @@ struct WriterContext {
>
> /** section per each level */
> const struct section *section[SECTION_MAX_NB_LEVELS];
> + AVBPrint section_pbuf[SECTION_MAX_NB_LEVELS]; ///< generic print buffer dedicated to each section,
> + /// used by various writers
>
> unsigned int nb_section_packet; ///< number of the packet section in case we are in "packets_and_frames" section
> unsigned int nb_section_frame; ///< number of the frame section in case we are in "packets_and_frames" section
> @@ -269,11 +271,15 @@ static const AVClass writer_class = {
>
> static void writer_close(WriterContext **wctx)
> {
> + int i;
> +
> if (!*wctx)
> return;
>
> if ((*wctx)->writer->uninit)
> (*wctx)->writer->uninit(*wctx);
> + for (i = 0; i < SECTION_MAX_NB_LEVELS; i++)
> + av_bprint_finalize(&(*wctx)->section_pbuf[i], NULL);
> if ((*wctx)->writer->priv_class)
> av_opt_free((*wctx)->priv);
> av_freep(&((*wctx)->priv));
> @@ -283,7 +289,7 @@ static void writer_close(WriterContext **wctx)
> static int writer_open(WriterContext **wctx, const Writer *writer, const char *args,
> const struct section *sections, int nb_sections)
> {
> - int ret = 0;
> + int i, ret = 0;
>
> if (!(*wctx = av_malloc(sizeof(WriterContext)))) {
> ret = AVERROR(ENOMEM);
> @@ -310,6 +316,10 @@ static int writer_open(WriterContext **wctx, const Writer *writer, const char *a
> (ret = av_set_options_string(priv_ctx, args, "=", ":")) < 0)
> goto fail;
> }
> +
> + for (i = 0; i < SECTION_MAX_NB_LEVELS; i++)
> + av_bprint_init(&(*wctx)->section_pbuf[i], 1, AV_BPRINT_SIZE_UNLIMITED);
> +
> if ((*wctx)->writer->init)
> ret = (*wctx)->writer->init(*wctx);
> if (ret < 0)
> @@ -497,7 +507,6 @@ typedef struct DefaultContext {
> int nokey;
> int noprint_wrappers;
> int nested_section[SECTION_MAX_NB_LEVELS];
> - AVBPrint prefix[SECTION_MAX_NB_LEVELS];
> } DefaultContext;
>
> #define OFFSET(x) offsetof(DefaultContext, x)
> @@ -522,25 +531,6 @@ static inline char *upcase_string(char *dst, size_t dst_size, const char *src)
> return dst;
> }
>
> -static int default_init(WriterContext *wctx)
> -{
> - DefaultContext *def = wctx->priv;
> - int i;
> -
> - for (i = 0; i < SECTION_MAX_NB_LEVELS; i++)
> - av_bprint_init(&def->prefix[i], 1, AV_BPRINT_SIZE_UNLIMITED);
> - return 0;
> -}
> -
> -static void default_uninit(WriterContext *wctx)
> -{
> - DefaultContext *def = wctx->priv;
> - int i;
> -
> - for (i = 0; i < SECTION_MAX_NB_LEVELS; i++)
> - av_bprint_finalize(&def->prefix[i], NULL);
> -}
> -
> static void default_print_section_header(WriterContext *wctx)
> {
> DefaultContext *def = wctx->priv;
> @@ -549,11 +539,12 @@ static void default_print_section_header(WriterContext *wctx)
> const struct section *parent_section = wctx->level ?
> wctx->section[wctx->level-1] : NULL;
>
> - av_bprint_clear(&def->prefix[wctx->level]);
> + av_bprint_clear(&wctx->section_pbuf[wctx->level]);
> if (parent_section &&
> !(parent_section->flags & (SECTION_FLAG_IS_WRAPPER|SECTION_FLAG_IS_ARRAY))) {
> def->nested_section[wctx->level] = 1;
> - av_bprintf(&def->prefix[wctx->level], "%s%s:", def->prefix[wctx->level-1].str,
> + av_bprintf(&wctx->section_pbuf[wctx->level], "%s%s:",
> + wctx->section_pbuf[wctx->level-1].str,
> upcase_string(buf, sizeof(buf),
> av_x_if_null(section->element_name, section->name)));
> }
> @@ -583,7 +574,7 @@ static void default_print_str(WriterContext *wctx, const char *key, const char *
> DefaultContext *def = wctx->priv;
>
> if (!def->nokey)
> - printf("%s%s=", def->prefix[wctx->level].str, key);
> + printf("%s%s=", wctx->section_pbuf[wctx->level].str, key);
> printf("%s\n", value);
> }
>
> @@ -592,15 +583,13 @@ static void default_print_int(WriterContext *wctx, const char *key, long long in
> DefaultContext *def = wctx->priv;
>
> if (!def->nokey)
> - printf("%s%s=", def->prefix[wctx->level].str, key);
> + printf("%s%s=", wctx->section_pbuf[wctx->level].str, key);
> printf("%lld\n", value);
> }
>
> static const Writer default_writer = {
> .name = "default",
> .priv_size = sizeof(DefaultContext),
> - .init = default_init,
> - .uninit = default_uninit,
> .print_section_header = default_print_section_header,
> .print_section_footer = default_print_section_footer,
> .print_integer = default_print_int,
> @@ -669,7 +658,6 @@ typedef struct CompactContext {
> char *escape_mode_str;
> const char * (*escape_str)(AVBPrint *dst, const char *src, const char sep, void *log_ctx);
> int nested_section[SECTION_MAX_NB_LEVELS];
> - AVBPrint prefix[SECTION_MAX_NB_LEVELS];
> } CompactContext;
>
> #undef OFFSET
> @@ -692,7 +680,6 @@ DEFINE_WRITER_CLASS(compact);
> static av_cold int compact_init(WriterContext *wctx)
> {
> CompactContext *compact = wctx->priv;
> - int i;
>
> if (strlen(compact->item_sep_str) != 1) {
> av_log(wctx, AV_LOG_ERROR, "Item separator '%s' specified, but must contain a single character\n",
> @@ -709,20 +696,9 @@ static av_cold int compact_init(WriterContext *wctx)
> return AVERROR(EINVAL);
> }
>
> - for (i = 0; i < SECTION_MAX_NB_LEVELS; i++)
> - av_bprint_init(&compact->prefix[i], 1, AV_BPRINT_SIZE_UNLIMITED);
> return 0;
> }
>
> -static void compact_uninit(WriterContext *wctx)
> -{
> - CompactContext *compact = wctx->priv;
> - int i;
> -
> - for (i = 0; i < SECTION_MAX_NB_LEVELS; i++)
> - av_bprint_finalize(&compact->prefix[i], NULL);
> -}
> -
> static void compact_print_section_header(WriterContext *wctx)
> {
> CompactContext *compact = wctx->priv;
> @@ -730,12 +706,12 @@ static void compact_print_section_header(WriterContext *wctx)
> const struct section *parent_section = wctx->level ?
> wctx->section[wctx->level-1] : NULL;
>
> - av_bprint_clear(&compact->prefix[wctx->level]);
> + av_bprint_clear(&wctx->section_pbuf[wctx->level]);
> if (parent_section &&
> !(parent_section->flags & (SECTION_FLAG_IS_WRAPPER|SECTION_FLAG_IS_ARRAY))) {
> compact->nested_section[wctx->level] = 1;
> - av_bprintf(&compact->prefix[wctx->level], "%s%s:",
> - compact->prefix[wctx->level-1].str,
> + av_bprintf(&wctx->section_pbuf[wctx->level], "%s%s:",
> + wctx->section_pbuf[wctx->level-1].str,
> (char *)av_x_if_null(section->element_name, section->name));
> wctx->nb_item[wctx->level] = wctx->nb_item[wctx->level-1];
> } else if (compact->print_section &&
> @@ -759,7 +735,7 @@ static void compact_print_str(WriterContext *wctx, const char *key, const char *
>
> if (wctx->nb_item[wctx->level]) printf("%c", compact->item_sep);
> if (!compact->nokey)
> - printf("%s%s=", compact->prefix[wctx->level].str, key);
> + printf("%s%s=", wctx->section_pbuf[wctx->level].str, key);
> av_bprint_init(&buf, 1, AV_BPRINT_SIZE_UNLIMITED);
> printf("%s", compact->escape_str(&buf, value, compact->item_sep, wctx));
> av_bprint_finalize(&buf, NULL);
> @@ -771,7 +747,7 @@ static void compact_print_int(WriterContext *wctx, const char *key, long long in
>
> if (wctx->nb_item[wctx->level]) printf("%c", compact->item_sep);
> if (!compact->nokey)
> - printf("%s%s=", compact->prefix[wctx->level].str, key);
> + printf("%s%s=", wctx->section_pbuf[wctx->level].str, key);
> printf("%lld", value);
> }
>
> @@ -779,7 +755,6 @@ static const Writer compact_writer = {
> .name = "compact",
> .priv_size = sizeof(CompactContext),
> .init = compact_init,
> - .uninit = compact_uninit,
> .print_section_header = compact_print_section_header,
> .print_section_footer = compact_print_section_footer,
> .print_integer = compact_print_int,
> @@ -823,7 +798,6 @@ static const Writer csv_writer = {
>
> typedef struct FlatContext {
> const AVClass *class;
> - AVBPrint section_header[SECTION_MAX_NB_LEVELS];
> const char *sep_str;
> char sep;
> int hierarchical;
> @@ -845,7 +819,6 @@ DEFINE_WRITER_CLASS(flat);
> static av_cold int flat_init(WriterContext *wctx)
> {
> FlatContext *flat = wctx->priv;
> - int i;
>
> if (strlen(flat->sep_str) != 1) {
> av_log(wctx, AV_LOG_ERROR, "Item separator '%s' specified, but must contain a single character\n",
> @@ -854,20 +827,9 @@ static av_cold int flat_init(WriterContext *wctx)
> }
> flat->sep = flat->sep_str[0];
>
> - for (i = 0; i < SECTION_MAX_NB_LEVELS; i++)
> - av_bprint_init(&flat->section_header[i], 1, AV_BPRINT_SIZE_UNLIMITED);
> return 0;
> }
>
> -static void flat_uninit(WriterContext *wctx)
> -{
> - FlatContext *flat = wctx->priv;
> - int i;
> -
> - for (i = 0; i < SECTION_MAX_NB_LEVELS; i++)
> - av_bprint_finalize(&flat->section_header[i], NULL);
> -}
> -
> static const char *flat_escape_key_str(AVBPrint *dst, const char *src, const char sep)
> {
> const char *p;
> @@ -904,7 +866,7 @@ static const char *flat_escape_value_str(AVBPrint *dst, const char *src)
> static void flat_print_section_header(WriterContext *wctx)
> {
> FlatContext *flat = wctx->priv;
> - AVBPrint *buf = &flat->section_header[wctx->level];
> + AVBPrint *buf = &wctx->section_pbuf[wctx->level];
> const struct section *section = wctx->section[wctx->level];
> const struct section *parent_section = wctx->level ?
> wctx->section[wctx->level-1] : NULL;
> @@ -913,7 +875,7 @@ static void flat_print_section_header(WriterContext *wctx)
> av_bprint_clear(buf);
> if (!parent_section)
> return;
> - av_bprintf(buf, "%s", flat->section_header[wctx->level-1].str);
> + av_bprintf(buf, "%s", wctx->section_pbuf[wctx->level-1].str);
>
> if (flat->hierarchical ||
> !(section->flags & (SECTION_FLAG_IS_ARRAY|SECTION_FLAG_IS_WRAPPER))) {
> @@ -929,8 +891,7 @@ static void flat_print_section_header(WriterContext *wctx)
>
> static void flat_print_int(WriterContext *wctx, const char *key, long long int value)
> {
> - FlatContext *flat = wctx->priv;
> - printf("%s%s=%lld\n", flat->section_header[wctx->level].str, key, value);
> + printf("%s%s=%lld\n", wctx->section_pbuf[wctx->level].str, key, value);
> }
>
> static void flat_print_str(WriterContext *wctx, const char *key, const char *value)
> @@ -938,7 +899,7 @@ static void flat_print_str(WriterContext *wctx, const char *key, const char *val
> FlatContext *flat = wctx->priv;
> AVBPrint buf;
>
> - printf("%s", flat->section_header[wctx->level].str);
> + printf("%s", wctx->section_pbuf[wctx->level].str);
> av_bprint_init(&buf, 1, AV_BPRINT_SIZE_UNLIMITED);
> printf("%s=", flat_escape_key_str(&buf, key, flat->sep));
> av_bprint_clear(&buf);
> @@ -950,7 +911,6 @@ static const Writer flat_writer = {
> .name = "flat",
> .priv_size = sizeof(FlatContext),
> .init = flat_init,
> - .uninit = flat_uninit,
> .print_section_header = flat_print_section_header,
> .print_integer = flat_print_int,
> .print_string = flat_print_str,
> @@ -963,7 +923,6 @@ static const Writer flat_writer = {
> typedef struct {
> const AVClass *class;
> int hierarchical;
> - AVBPrint section_header[SECTION_MAX_NB_LEVELS];
> } INIContext;
>
> #undef OFFSET
> @@ -977,25 +936,6 @@ static const AVOption ini_options[] = {
>
> 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)
> {
> int i = 0;
> @@ -1026,7 +966,7 @@ static char *ini_escape_str(AVBPrint *dst, const char *src)
> static void ini_print_section_header(WriterContext *wctx)
> {
> INIContext *ini = wctx->priv;
> - AVBPrint *buf = &ini->section_header[wctx->level];
> + AVBPrint *buf = &wctx->section_pbuf[wctx->level];
> const struct section *section = wctx->section[wctx->level];
> const struct section *parent_section = wctx->level ?
> wctx->section[wctx->level-1] : NULL;
> @@ -1040,7 +980,7 @@ static void ini_print_section_header(WriterContext *wctx)
> if (wctx->nb_item[wctx->level-1])
> printf("\n");
>
> - av_bprintf(buf, "%s", ini->section_header[wctx->level-1].str);
> + av_bprintf(buf, "%s", wctx->section_pbuf[wctx->level-1].str);
> if (ini->hierarchical ||
> !(section->flags & (SECTION_FLAG_IS_ARRAY|SECTION_FLAG_IS_WRAPPER))) {
> av_bprintf(buf, "%s%s", buf->str[0] ? "." : "", wctx->section[wctx->level]->name);
> @@ -1075,8 +1015,6 @@ static void ini_print_int(WriterContext *wctx, const char *key, long long int va
> static const Writer ini_writer = {
> .name = "ini",
> .priv_size = sizeof(INIContext),
> - .init = ini_init,
> - .uninit = ini_uninit,
> .print_section_header = ini_print_section_header,
> .print_integer = ini_print_int,
> .print_string = ini_print_str,
LGTM, thanks a lot!
--
Clément B.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 490 bytes
Desc: not available
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20121024/080eecbe/attachment.asc>
More information about the ffmpeg-devel
mailing list