Skip to content

F
ffmpeg.wasm-core
Commit 3bdc886c authored by Kostya's avatar Kostya Committed by Janne Grunau
Browse files
Options

Extend WavPack demuxer and decoder to support >2 channel audio 

Signed-off-by: 's avatarJanne Grunau <janne-ffmpeg@jannau.net>
parent 07b48f8c
Expand all Show whitespace changes
Inline Side-by-side
Showing with 324 additions and 66 deletions
libavcodec/wavpack.c
View file @ 3bdc886c
This diff is collapsed.
libavformat/wv.c
View file @ 3bdc886c
/* /*
* WavPack demuxer * WavPack demuxer
* Copyright (c) 2006 Konstantin Shishkov * Copyright (c) 2006,2011 Konstantin Shishkov
* *
* This file is part of FFmpeg. * This file is part of FFmpeg.
* *
...@@ -29,6 +29,10 @@ ...@@ -29,6 +29,10 @@
#define WV_EXTRA_SIZE 12 #define WV_EXTRA_SIZE 12
#define WV_START_BLOCK 0x0800
#define WV_END_BLOCK 0x1000
#define WV_SINGLE_BLOCK (WV_START_BLOCK | WV_END_BLOCK)
enum WV_FLAGS{ enum WV_FLAGS{
WV_MONO = 0x0004, WV_MONO = 0x0004,
WV_HYBRID = 0x0008, WV_HYBRID = 0x0008,
...@@ -51,7 +55,9 @@ static const int wv_rates[16] = { ...@@ -51,7 +55,9 @@ static const int wv_rates[16] = {
typedef struct{ typedef struct{
uint32_t blksize, flags; uint32_t blksize, flags;
int rate, chan, bpp; int rate, chan, bpp;
uint32_t chmask;
uint32_t samples, soff; uint32_t samples, soff;
int multichannel;
int block_parsed; int block_parsed;
uint8_t extra[WV_EXTRA_SIZE]; uint8_t extra[WV_EXTRA_SIZE];
int64_t pos; int64_t pos;
...@@ -69,14 +75,16 @@ static int wv_probe(AVProbeData *p) ...@@ -69,14 +75,16 @@ static int wv_probe(AVProbeData *p)
return 0; return 0;
} }
static int wv_read_block_header(AVFormatContext *ctx, ByteIOContext *pb) static int wv_read_block_header(AVFormatContext *ctx, ByteIOContext *pb, int append)
{ {
WVContext *wc = ctx->priv_data; WVContext *wc = ctx->priv_data;
uint32_t tag, ver; uint32_t tag, ver;
int size; int size;
int rate, bpp, chan; int rate, bpp, chan;
uint32_t chmask;
wc->pos = url_ftell(pb); wc->pos = url_ftell(pb);
if(!append){
tag = get_le32(pb); tag = get_le32(pb);
if (tag != MKTAG('w', 'v', 'p', 'k')) if (tag != MKTAG('w', 'v', 'p', 'k'))
return -1; return -1;
...@@ -96,19 +104,24 @@ static int wv_read_block_header(AVFormatContext *ctx, ByteIOContext *pb) ...@@ -96,19 +104,24 @@ static int wv_read_block_header(AVFormatContext *ctx, ByteIOContext *pb)
wc->samples = get_le32(pb); // total samples in file wc->samples = get_le32(pb); // total samples in file
wc->soff = get_le32(pb); // offset in samples of current block wc->soff = get_le32(pb); // offset in samples of current block
get_buffer(pb, wc->extra, WV_EXTRA_SIZE); get_buffer(pb, wc->extra, WV_EXTRA_SIZE);
}else{
size = wc->blksize;
}
wc->flags = AV_RL32(wc->extra + 4); wc->flags = AV_RL32(wc->extra + 4);
//parse flags //parse flags
bpp = ((wc->flags & 3) + 1) << 3; bpp = ((wc->flags & 3) + 1) << 3;
chan = 1 + !(wc->flags & WV_MONO); chan = 1 + !(wc->flags & WV_MONO);
chmask = wc->flags & WV_MONO ? CH_LAYOUT_MONO : CH_LAYOUT_STEREO;
rate = wv_rates[(wc->flags >> 23) & 0xF]; rate = wv_rates[(wc->flags >> 23) & 0xF];
if((wc->flags & 0x1800) != 0x1800){ wc->multichannel = !!((wc->flags & WV_SINGLE_BLOCK) != WV_SINGLE_BLOCK);
av_log(ctx, AV_LOG_ERROR, "Multichannel WavPack is not supported yet.\n"); if(wc->multichannel){
return -1; chan = wc->chan;
chmask = wc->chmask;
} }
if(rate == -1 && !wc->block_parsed){ if((rate == -1 || !chan) && !wc->block_parsed){
int64_t block_end = url_ftell(pb) + wc->blksize - 24; int64_t block_end = url_ftell(pb) + wc->blksize - 24;
if(url_is_streamed(pb)){ if(url_is_streamed(pb)){
av_log(ctx, AV_LOG_ERROR, "Cannot determine custom sampling rate\n"); av_log(ctx, AV_LOG_ERROR, "Cannot determine additional parameters\n");
return -1; return -1;
} }
while(url_ftell(pb) < block_end){ while(url_ftell(pb) < block_end){
...@@ -118,12 +131,44 @@ static int wv_read_block_header(AVFormatContext *ctx, ByteIOContext *pb) ...@@ -118,12 +131,44 @@ static int wv_read_block_header(AVFormatContext *ctx, ByteIOContext *pb)
size <<= 1; size <<= 1;
if(id&0x40) if(id&0x40)
size--; size--;
if((id&0x3F) == 0x27){ switch(id&0x3F){
case 0xD:
if(size <= 1){
av_log(ctx, AV_LOG_ERROR, "Insufficient channel information\n");
return -1;
}
chan = get_byte(pb);
switch(size - 2){
case 0:
chmask = get_byte(pb);
break;
case 1:
chmask = get_le16(pb);
break;
case 2:
chmask = get_le24(pb);
break;
case 3:
chmask = get_le32(pb);
break;
case 5:
url_fskip(pb, 1);
chan |= (get_byte(pb) & 0xF) << 8;
chmask = get_le24(pb);
break;
default:
av_log(ctx, AV_LOG_ERROR, "Invalid channel info size %d\n", size);
return -1;
}
break;
case 0x27:
rate = get_le24(pb); rate = get_le24(pb);
break; break;
}else{ default:
url_fskip(pb, size); url_fskip(pb, size);
} }
if(id&0x40)
url_fskip(pb, 1);
} }
if(rate == -1){ if(rate == -1){
av_log(ctx, AV_LOG_ERROR, "Cannot determine custom sampling rate\n"); av_log(ctx, AV_LOG_ERROR, "Cannot determine custom sampling rate\n");
...@@ -133,13 +178,14 @@ static int wv_read_block_header(AVFormatContext *ctx, ByteIOContext *pb) ...@@ -133,13 +178,14 @@ static int wv_read_block_header(AVFormatContext *ctx, ByteIOContext *pb)
} }
if(!wc->bpp) wc->bpp = bpp; if(!wc->bpp) wc->bpp = bpp;
if(!wc->chan) wc->chan = chan; if(!wc->chan) wc->chan = chan;
if(!wc->chmask) wc->chmask = chmask;
if(!wc->rate) wc->rate = rate; if(!wc->rate) wc->rate = rate;
if(wc->flags && bpp != wc->bpp){ if(wc->flags && bpp != wc->bpp){
av_log(ctx, AV_LOG_ERROR, "Bits per sample differ, this block: %i, header block: %i\n", bpp, wc->bpp); av_log(ctx, AV_LOG_ERROR, "Bits per sample differ, this block: %i, header block: %i\n", bpp, wc->bpp);
return -1; return -1;
} }
if(wc->flags && chan != wc->chan){ if(wc->flags && !wc->multichannel && chan != wc->chan){
av_log(ctx, AV_LOG_ERROR, "Channels differ, this block: %i, header block: %i\n", chan, wc->chan); av_log(ctx, AV_LOG_ERROR, "Channels differ, this block: %i, header block: %i\n", chan, wc->chan);
return -1; return -1;
} }
...@@ -159,7 +205,7 @@ static int wv_read_header(AVFormatContext *s, ...@@ -159,7 +205,7 @@ static int wv_read_header(AVFormatContext *s,
AVStream *st; AVStream *st;
wc->block_parsed = 0; wc->block_parsed = 0;
if(wv_read_block_header(s, pb) < 0) if(wv_read_block_header(s, pb, 0) < 0)
return -1; return -1;
/* now we are ready: build format streams */ /* now we are ready: build format streams */
...@@ -169,6 +215,7 @@ static int wv_read_header(AVFormatContext *s, ...@@ -169,6 +215,7 @@ static int wv_read_header(AVFormatContext *s,
st->codec->codec_type = AVMEDIA_TYPE_AUDIO; st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
st->codec->codec_id = CODEC_ID_WAVPACK; st->codec->codec_id = CODEC_ID_WAVPACK;
st->codec->channels = wc->chan; st->codec->channels = wc->chan;
st->codec->channel_layout = wc->chmask;
st->codec->sample_rate = wc->rate; st->codec->sample_rate = wc->rate;
st->codec->bits_per_coded_sample = wc->bpp; st->codec->bits_per_coded_sample = wc->bpp;
av_set_pts_info(st, 64, 1, wc->rate); av_set_pts_info(st, 64, 1, wc->rate);
...@@ -191,25 +238,70 @@ static int wv_read_packet(AVFormatContext *s, ...@@ -191,25 +238,70 @@ static int wv_read_packet(AVFormatContext *s,
{ {
WVContext *wc = s->priv_data; WVContext *wc = s->priv_data;
int ret; int ret;
int size, ver, off;
if (url_feof(s->pb)) if (url_feof(s->pb))
return AVERROR(EIO); return AVERROR(EIO);
if(wc->block_parsed){ if(wc->block_parsed){
if(wv_read_block_header(s, s->pb) < 0) if(wv_read_block_header(s, s->pb, 0) < 0)
return -1; return -1;
} }
if(av_new_packet(pkt, wc->blksize + WV_EXTRA_SIZE) < 0) off = wc->multichannel ? 4 : 0;
if(av_new_packet(pkt, wc->blksize + WV_EXTRA_SIZE + off) < 0)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
memcpy(pkt->data, wc->extra, WV_EXTRA_SIZE); if(wc->multichannel)
ret = get_buffer(s->pb, pkt->data + WV_EXTRA_SIZE, wc->blksize); AV_WL32(pkt->data, wc->blksize + WV_EXTRA_SIZE + 12);
memcpy(pkt->data + off, wc->extra, WV_EXTRA_SIZE);
ret = get_buffer(s->pb, pkt->data + WV_EXTRA_SIZE + off, wc->blksize);
if(ret != wc->blksize){ if(ret != wc->blksize){
av_free_packet(pkt); av_free_packet(pkt);
return AVERROR(EIO); return AVERROR(EIO);
} }
while(!(wc->flags & WV_END_BLOCK)){
if(get_le32(s->pb) != MKTAG('w', 'v', 'p', 'k')){
av_free_packet(pkt);
return -1;
}
if((ret = av_append_packet(s->pb, pkt, 4)) < 0){
av_free_packet(pkt);
return ret;
}
size = AV_RL32(pkt->data + pkt->size - 4);
if(size < 24 || size > WV_BLOCK_LIMIT){
av_free_packet(pkt);
av_log(s, AV_LOG_ERROR, "Incorrect block size %d\n", size);
return -1;
}
wc->blksize = size;
ver = get_le16(s->pb);
if(ver < 0x402 || ver > 0x410){
av_free_packet(pkt);
av_log(s, AV_LOG_ERROR, "Unsupported version %03X\n", ver);
return -1;
}
get_byte(s->pb); // track no
get_byte(s->pb); // track sub index
wc->samples = get_le32(s->pb); // total samples in file
wc->soff = get_le32(s->pb); // offset in samples of current block
if((ret = av_append_packet(s->pb, pkt, WV_EXTRA_SIZE)) < 0){
av_free_packet(pkt);
return ret;
}
memcpy(wc->extra, pkt->data + pkt->size - WV_EXTRA_SIZE, WV_EXTRA_SIZE);
if(wv_read_block_header(s, s->pb, 1) < 0){
av_free_packet(pkt);
return -1;
}
ret = av_append_packet(s->pb, pkt, wc->blksize);
if(ret < 0){
av_free_packet(pkt);
return ret;
}
}
pkt->stream_index = 0; pkt->stream_index = 0;
wc->block_parsed = 1; wc->block_parsed = 1;
pkt->size = ret + WV_EXTRA_SIZE;
pkt->pts = wc->soff; pkt->pts = wc->soff;
av_add_index_entry(s->streams[0], wc->pos, pkt->pts, 0, 0, AVINDEX_KEYFRAME); av_add_index_entry(s->streams[0], wc->pos, pkt->pts, 0, 0, AVINDEX_KEYFRAME);
return 0; return 0;
......
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