Skip to content

F
ffmpeg.wasm-core
Commit 80af00b4 authored by Carl Eugen Hoyos's avatar Carl Eugen Hoyos
Browse files
Options

Support new ALAC magic cookie in caf files.

parent 988f585f
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 0 deletions
libavformat/cafdec.c
View file @ 80af00b4
...@@ -120,6 +120,15 @@ static int read_kuki_chunk(AVFormatContext *s, int64_t size) ...@@ -120,6 +120,15 @@ static int read_kuki_chunk(AVFormatContext *s, int64_t size)
} else if (st->codec->codec_id == CODEC_ID_ALAC) { } else if (st->codec->codec_id == CODEC_ID_ALAC) {
#define ALAC_PREAMBLE 12 #define ALAC_PREAMBLE 12
#define ALAC_HEADER 36 #define ALAC_HEADER 36
#define ALAC_NEW_KUKI 24
if (size == ALAC_NEW_KUKI) {
st->codec->extradata = av_mallocz(ALAC_HEADER + FF_INPUT_BUFFER_PADDING_SIZE);
if (!st->codec->extradata)
return AVERROR(ENOMEM);
strcpy(st->codec->extradata, "\0\0\0\24alac");
avio_read(pb, st->codec->extradata + ALAC_HEADER - ALAC_NEW_KUKI, ALAC_NEW_KUKI);
st->codec->extradata_size = ALAC_HEADER;
} else {
if (size < ALAC_PREAMBLE + ALAC_HEADER) { if (size < ALAC_PREAMBLE + ALAC_HEADER) {
av_log(s, AV_LOG_ERROR, "invalid ALAC magic cookie\n"); av_log(s, AV_LOG_ERROR, "invalid ALAC magic cookie\n");
avio_skip(pb, size); avio_skip(pb, size);
...@@ -132,6 +141,7 @@ static int read_kuki_chunk(AVFormatContext *s, int64_t size) ...@@ -132,6 +141,7 @@ static int read_kuki_chunk(AVFormatContext *s, int64_t size)
avio_read(pb, st->codec->extradata, ALAC_HEADER); avio_read(pb, st->codec->extradata, ALAC_HEADER);
st->codec->extradata_size = ALAC_HEADER; st->codec->extradata_size = ALAC_HEADER;
avio_skip(pb, size - ALAC_PREAMBLE - ALAC_HEADER); avio_skip(pb, size - ALAC_PREAMBLE - ALAC_HEADER);
}
} else { } else {
st->codec->extradata = av_mallocz(size + FF_INPUT_BUFFER_PADDING_SIZE); st->codec->extradata = av_mallocz(size + FF_INPUT_BUFFER_PADDING_SIZE);
if (!st->codec->extradata) if (!st->codec->extradata)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment