From f02edc4c06388bcd7b21130fac5ad8ef3fc8e948 Mon Sep 17 00:00:00 2001 From: Paul B Mahol Date: Mon, 13 Feb 2012 15:01:54 +0000 Subject: apetag: add proper support for binary tags export as attachment streams Signed-off-by: Paul B Mahol Signed-off-by: Justin Ruggles --- libavformat/apetag.c | 35 +++++++++++++++++++++++++++-------- 1 file changed, 27 insertions(+), 8 deletions(-) (limited to 'libavformat/apetag.c') diff --git a/libavformat/apetag.c b/libavformat/apetag.c index 257ed48970..6c65a1c449 100644 --- a/libavformat/apetag.c +++ b/libavformat/apetag.c @@ -29,16 +29,17 @@ #define APE_TAG_FOOTER_BYTES 32 #define APE_TAG_FLAG_CONTAINS_HEADER (1 << 31) #define APE_TAG_FLAG_IS_HEADER (1 << 29) +#define APE_TAG_FLAG_IS_BINARY (1 << 1) static int ape_tag_read_field(AVFormatContext *s) { AVIOContext *pb = s->pb; uint8_t key[1024], *value; - uint32_t size; + uint32_t size, flags; int i, c; size = avio_rl32(pb); /* field size */ - avio_skip(pb, 4); /* field flags */ + flags = avio_rl32(pb); /* field flags */ for (i = 0; i < sizeof(key) - 1; i++) { c = avio_r8(pb); if (c < 0x20 || c > 0x7E) @@ -53,12 +54,30 @@ static int ape_tag_read_field(AVFormatContext *s) } if (size >= UINT_MAX) return -1; - value = av_malloc(size+1); - if (!value) - return AVERROR(ENOMEM); - avio_read(pb, value, size); - value[size] = 0; - av_dict_set(&s->metadata, key, value, AV_DICT_DONT_STRDUP_VAL); + if (flags & APE_TAG_FLAG_IS_BINARY) { + uint8_t filename[1024]; + AVStream *st = avformat_new_stream(s, NULL); + if (!st) + return AVERROR(ENOMEM); + avio_get_str(pb, INT_MAX, filename, sizeof(filename)); + st->codec->extradata = av_malloc(size + FF_INPUT_BUFFER_PADDING_SIZE); + if (!st->codec->extradata) + return AVERROR(ENOMEM); + if (avio_read(pb, st->codec->extradata, size) != size) { + av_freep(&st->codec->extradata); + return AVERROR(EIO); + } + st->codec->extradata_size = size; + av_dict_set(&st->metadata, key, filename, 0); + st->codec->codec_type = AVMEDIA_TYPE_ATTACHMENT; + } else { + value = av_malloc(size+1); + if (!value) + return AVERROR(ENOMEM); + c = avio_read(pb, value, size); + value[c] = 0; + av_dict_set(&s->metadata, key, value, AV_DICT_DONT_STRDUP_VAL); + } return 0; } -- cgit v1.2.3