Browse Source

aiffenc: metadata support

Signed-off-by: Paul B Mahol <onemda@gmail.com>
tags/n1.1
Paul B Mahol 13 years ago
parent
commit
48340bbb36
2 changed files with 23 additions and 2 deletions
  1. +21
    -0
      libavformat/aiffenc.c
  2. +2
    -2
      tests/ref/lavf/aiff

+ 21
- 0
libavformat/aiffenc.c View File

@@ -33,6 +33,22 @@ typedef struct {
int64_t ssnd;
} AIFFOutputContext;

static void put_meta(AVFormatContext *s, const char *key, uint32_t id)
{
AVDictionaryEntry *tag;
AVIOContext *pb = s->pb;

if (tag = av_dict_get(s->metadata, key, NULL, 0)) {
int size = strlen(tag->value);

avio_wl32(pb, id);
avio_wb32(pb, FFALIGN(size, 2));
avio_write(pb, tag->value, size);
if (size & 1)
avio_w8(pb, 0);
}
}

static int aiff_write_header(AVFormatContext *s)
{
AIFFOutputContext *aiff = s->priv_data;
@@ -70,6 +86,11 @@ static int aiff_write_header(AVFormatContext *s)
ff_mov_write_chan(pb, enc->channel_layout);
}

put_meta(s, "title", MKTAG('N', 'A', 'M', 'E'));
put_meta(s, "author", MKTAG('A', 'U', 'T', 'H'));
put_meta(s, "copyright", MKTAG('(', 'c', ')', ' '));
put_meta(s, "comment", MKTAG('A', 'N', 'N', 'O'));

/* Common chunk */
ffio_wfourcc(pb, "COMM");
avio_wb32(pb, aifc ? 24 : 18); /* size */


+ 2
- 2
tests/ref/lavf/aiff View File

@@ -1,3 +1,3 @@
379908755146d4ead062abe9c3b5c582 *./tests/data/lavf/lavf.aif
90166 ./tests/data/lavf/lavf.aif
b0d42747a6fc99a5cd1ab0e861671f3a *./tests/data/lavf/lavf.aif
90182 ./tests/data/lavf/lavf.aif
./tests/data/lavf/lavf.aif CRC=0xf1ae5536

Loading…
Cancel
Save