From 7fe6f6e2b10fe278fecea850fda1d8e321330c15 Mon Sep 17 00:00:00 2001 From: Paul B Mahol Date: Thu, 25 Oct 2012 23:33:34 +0000 Subject: caf muxer: write metadata Signed-off-by: Paul B Mahol --- libavformat/cafenc.c | 17 +++++++++++++++++ libavformat/version.h | 2 +- 2 files changed, 18 insertions(+), 1 deletion(-) (limited to 'libavformat') diff --git a/libavformat/cafenc.c b/libavformat/cafenc.c index dc222cd50d..cc39a8341c 100644 --- a/libavformat/cafenc.c +++ b/libavformat/cafenc.c @@ -25,6 +25,7 @@ #include "isom.h" #include "avio_internal.h" #include "libavutil/intfloat.h" +#include "libavutil/dict.h" typedef struct { int64_t data; @@ -102,7 +103,9 @@ static int caf_write_header(AVFormatContext *s) AVIOContext *pb = s->pb; AVCodecContext *enc = s->streams[0]->codec; CAFContext *caf = s->priv_data; + AVDictionaryEntry *t = NULL; unsigned int codec_tag = ff_codec_get_tag(ff_codec_caf_tags, enc->codec_id); + int64_t chunk_size = 0; switch (enc->codec_id) { case AV_CODEC_ID_AAC: @@ -180,6 +183,20 @@ static int caf_write_header(AVFormatContext *s) avio_write(pb, enc->extradata, enc->extradata_size); } + if (av_dict_count(s->metadata)) { + ffio_wfourcc(pb, "info"); //< Information chunk + while ((t = av_dict_get(s->metadata, "", t, AV_DICT_IGNORE_SUFFIX))) { + chunk_size += strlen(t->key) + strlen(t->value) + 2; + } + avio_wb64(pb, chunk_size + 4); + avio_wb32(pb, av_dict_count(s->metadata)); + t = NULL; + while ((t = av_dict_get(s->metadata, "", t, AV_DICT_IGNORE_SUFFIX))) { + avio_put_str(pb, t->key); + avio_put_str(pb, t->value); + } + } + ffio_wfourcc(pb, "data"); //< Audio Data chunk caf->data = avio_tell(pb); avio_wb64(pb, -1); //< mChunkSize diff --git a/libavformat/version.h b/libavformat/version.h index fe31a7d78d..bab294c73c 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -30,7 +30,7 @@ #include "libavutil/avutil.h" #define LIBAVFORMAT_VERSION_MAJOR 54 -#define LIBAVFORMAT_VERSION_MINOR 34 +#define LIBAVFORMAT_VERSION_MINOR 35 #define LIBAVFORMAT_VERSION_MICRO 100 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ -- cgit v1.2.3