highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avcodec/wavpack: remove hard limitation on number of supported channels

Browse Source
This commit is contained in:
Paul B Mahol 2023-08-15 00:12:52 +02:00
parent ddc1cd5cdd
commit 46412a8935
1 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libavcodec/wavpack.c
View File

@ -96,12 +96,10 @@ typedef struct WavpackFrameContext {
uint8_t *value_lookup[MAX_HISTORY_BINS]; uint8_t *value_lookup[MAX_HISTORY_BINS];
} WavpackFrameContext; } WavpackFrameContext;
#define WV_MAX_FRAME_DECODERS 14
typedef struct WavpackContext { typedef struct WavpackContext {
AVCodecContext *avctx; AVCodecContext *avctx;
WavpackFrameContext *fdec[WV_MAX_FRAME_DECODERS]; WavpackFrameContext **fdec;
int fdec_num; int fdec_num;
int block; int block;
@ -971,7 +969,8 @@ static inline int wv_unpack_mono(WavpackFrameContext *s, GetBitContext *gb,
static av_cold int wv_alloc_frame_context(WavpackContext *c) static av_cold int wv_alloc_frame_context(WavpackContext *c)
{ {
if (c->fdec_num == WV_MAX_FRAME_DECODERS) c->fdec = av_realloc_f(c->fdec, c->fdec_num + 1, sizeof(*c->fdec));
if (!c->fdec)
return -1; return -1;
c->fdec[c->fdec_num] = av_mallocz(sizeof(**c->fdec)); c->fdec[c->fdec_num] = av_mallocz(sizeof(**c->fdec));
@ -1064,6 +1063,7 @@ static av_cold int wavpack_decode_end(AVCodecContext *avctx)
for (int i = 0; i < s->fdec_num; i++) for (int i = 0; i < s->fdec_num; i++)
av_freep(&s->fdec[i]); av_freep(&s->fdec[i]);
av_freep(&s->fdec);
s->fdec_num = 0; s->fdec_num = 0;
ff_thread_release_ext_buffer(avctx, &s->curr_frame); ff_thread_release_ext_buffer(avctx, &s->curr_frame);
@ -1415,18 +1415,12 @@ static int wavpack_decode_block(AVCodecContext *avctx, int block_no,
size = bytestream2_get_byte(&gb); size = bytestream2_get_byte(&gb);
chan |= (bytestream2_get_byte(&gb) & 0xF) << 8; chan |= (bytestream2_get_byte(&gb) & 0xF) << 8;
chan += 1; chan += 1;
if (avctx->ch_layout.nb_channels != chan)
av_log(avctx, AV_LOG_WARNING, "%i channels signalled"
" instead of %i.\n", chan, avctx->ch_layout.nb_channels);
chmask = bytestream2_get_le24(&gb); chmask = bytestream2_get_le24(&gb);
break; break;
case 5: case 5:
size = bytestream2_get_byte(&gb); size = bytestream2_get_byte(&gb);
chan |= (bytestream2_get_byte(&gb) & 0xF) << 8; chan |= (bytestream2_get_byte(&gb) & 0xF) << 8;
chan += 1; chan += 1;
if (avctx->ch_layout.nb_channels != chan)
av_log(avctx, AV_LOG_WARNING, "%i channels signalled"
" instead of %i.\n", chan, avctx->ch_layout.nb_channels);
chmask = bytestream2_get_le32(&gb); chmask = bytestream2_get_le32(&gb);
break; break;
default: default:
@ -1519,11 +1513,7 @@ static int wavpack_decode_block(AVCodecContext *avctx, int block_no,
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
} else { } else {
ret = av_channel_layout_copy(&new_ch_layout, &avctx->ch_layout); av_channel_layout_default(&new_ch_layout, chan);
if (ret < 0) {
av_log(avctx, AV_LOG_ERROR, "Error copying channel layout\n");
return ret;
}
} }
} else { } else {
av_channel_layout_default(&new_ch_layout, s->stereo + 1); av_channel_layout_default(&new_ch_layout, s->stereo + 1);