mirror of https://git.ffmpeg.org/ffmpeg.git
avcodec/mpc7: Don't pretend initializing static VLC tables can fail
It can't if one hasn't made a mistake at calculating the sizes; and this is checked by asserts/aborts. Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
This commit is contained in:
parent
0f1db365c7
commit
1e40dc920a
|
@ -47,15 +47,12 @@ static const uint16_t quant_offsets[MPC7_QUANT_VLC_TABLES*2 + 1] =
|
||||||
|
|
||||||
static av_cold int mpc7_decode_init(AVCodecContext * avctx)
|
static av_cold int mpc7_decode_init(AVCodecContext * avctx)
|
||||||
{
|
{
|
||||||
int i, j, ret;
|
int i, j;
|
||||||
MPCContext *c = avctx->priv_data;
|
MPCContext *c = avctx->priv_data;
|
||||||
GetBitContext gb;
|
GetBitContext gb;
|
||||||
LOCAL_ALIGNED_16(uint8_t, buf, [16]);
|
LOCAL_ALIGNED_16(uint8_t, buf, [16]);
|
||||||
static int vlc_initialized = 0;
|
static int vlc_initialized = 0;
|
||||||
|
|
||||||
static VLC_TYPE scfi_table[1 << MPC7_SCFI_BITS][2];
|
|
||||||
static VLC_TYPE dscf_table[1 << MPC7_DSCF_BITS][2];
|
|
||||||
static VLC_TYPE hdr_table[1 << MPC7_HDR_BITS][2];
|
|
||||||
static VLC_TYPE quant_tables[7224][2];
|
static VLC_TYPE quant_tables[7224][2];
|
||||||
|
|
||||||
/* Musepack SV7 is always stereo */
|
/* Musepack SV7 is always stereo */
|
||||||
|
@ -95,40 +92,22 @@ static av_cold int mpc7_decode_init(AVCodecContext * avctx)
|
||||||
|
|
||||||
if(vlc_initialized) return 0;
|
if(vlc_initialized) return 0;
|
||||||
av_log(avctx, AV_LOG_DEBUG, "Initing VLC\n");
|
av_log(avctx, AV_LOG_DEBUG, "Initing VLC\n");
|
||||||
scfi_vlc.table = scfi_table;
|
INIT_VLC_STATIC(&scfi_vlc, MPC7_SCFI_BITS, MPC7_SCFI_SIZE,
|
||||||
scfi_vlc.table_allocated = 1 << MPC7_SCFI_BITS;
|
|
||||||
if ((ret = init_vlc(&scfi_vlc, MPC7_SCFI_BITS, MPC7_SCFI_SIZE,
|
|
||||||
&mpc7_scfi[1], 2, 1,
|
&mpc7_scfi[1], 2, 1,
|
||||||
&mpc7_scfi[0], 2, 1, INIT_VLC_USE_NEW_STATIC))) {
|
&mpc7_scfi[0], 2, 1, 1 << MPC7_SCFI_BITS);
|
||||||
av_log(avctx, AV_LOG_ERROR, "Cannot init SCFI VLC\n");
|
INIT_VLC_STATIC(&dscf_vlc, MPC7_DSCF_BITS, MPC7_DSCF_SIZE,
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
dscf_vlc.table = dscf_table;
|
|
||||||
dscf_vlc.table_allocated = 1 << MPC7_DSCF_BITS;
|
|
||||||
if ((ret = init_vlc(&dscf_vlc, MPC7_DSCF_BITS, MPC7_DSCF_SIZE,
|
|
||||||
&mpc7_dscf[1], 2, 1,
|
&mpc7_dscf[1], 2, 1,
|
||||||
&mpc7_dscf[0], 2, 1, INIT_VLC_USE_NEW_STATIC))) {
|
&mpc7_dscf[0], 2, 1, 1 << MPC7_DSCF_SIZE);
|
||||||
av_log(avctx, AV_LOG_ERROR, "Cannot init DSCF VLC\n");
|
INIT_VLC_STATIC(&hdr_vlc, MPC7_HDR_BITS, MPC7_HDR_SIZE,
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
hdr_vlc.table = hdr_table;
|
|
||||||
hdr_vlc.table_allocated = 1 << MPC7_HDR_BITS;
|
|
||||||
if ((ret = init_vlc(&hdr_vlc, MPC7_HDR_BITS, MPC7_HDR_SIZE,
|
|
||||||
&mpc7_hdr[1], 2, 1,
|
&mpc7_hdr[1], 2, 1,
|
||||||
&mpc7_hdr[0], 2, 1, INIT_VLC_USE_NEW_STATIC))) {
|
&mpc7_hdr[0], 2, 1, 1 << MPC7_HDR_SIZE);
|
||||||
av_log(avctx, AV_LOG_ERROR, "Cannot init HDR VLC\n");
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
for(i = 0; i < MPC7_QUANT_VLC_TABLES; i++){
|
for(i = 0; i < MPC7_QUANT_VLC_TABLES; i++){
|
||||||
for(j = 0; j < 2; j++){
|
for(j = 0; j < 2; j++){
|
||||||
quant_vlc[i][j].table = &quant_tables[quant_offsets[i*2 + j]];
|
quant_vlc[i][j].table = &quant_tables[quant_offsets[i*2 + j]];
|
||||||
quant_vlc[i][j].table_allocated = quant_offsets[i*2 + j + 1] - quant_offsets[i*2 + j];
|
quant_vlc[i][j].table_allocated = quant_offsets[i*2 + j + 1] - quant_offsets[i*2 + j];
|
||||||
if ((ret = init_vlc(&quant_vlc[i][j], 9, mpc7_quant_vlc_sizes[i],
|
init_vlc(&quant_vlc[i][j], 9, mpc7_quant_vlc_sizes[i],
|
||||||
&mpc7_quant_vlc[i][j][1], 4, 2,
|
&mpc7_quant_vlc[i][j][1], 4, 2,
|
||||||
&mpc7_quant_vlc[i][j][0], 4, 2, INIT_VLC_USE_NEW_STATIC))) {
|
&mpc7_quant_vlc[i][j][0], 4, 2, INIT_VLC_USE_NEW_STATIC);
|
||||||
av_log(avctx, AV_LOG_ERROR, "Cannot init QUANT VLC %i,%i\n",i,j);
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
vlc_initialized = 1;
|
vlc_initialized = 1;
|
||||||
|
|
Loading…
Reference in New Issue