#include "libavutil/channel_layout.h"
#include "libavutil/internal.h"
#include "libavutil/lfg.h"
+#include "libavutil/mem_internal.h"
+#include "libavutil/thread.h"
+
#include "avcodec.h"
#include "get_bits.h"
#include "internal.h"
static VLC scfi_vlc, dscf_vlc, hdr_vlc, quant_vlc[MPC7_QUANT_VLC_TABLES][2];
-static const uint16_t quant_sizes[MPC7_QUANT_VLC_TABLES*2] =
+static av_cold void mpc7_init_static(void)
{
- 512, 512, 512, 516, 512, 512, 512, 512, 512, 512, 512, 528, 512, 548
-};
+ static VLC_TYPE quant_tables[7224][2];
+ const uint8_t *raw_quant_table = mpc7_quant_vlcs;
+ INIT_VLC_STATIC_FROM_LENGTHS(&scfi_vlc, MPC7_SCFI_BITS, MPC7_SCFI_SIZE,
+ &mpc7_scfi[1], 2,
+ &mpc7_scfi[0], 2, 1, 0, 0, 1 << MPC7_SCFI_BITS);
+ INIT_VLC_STATIC_FROM_LENGTHS(&dscf_vlc, MPC7_DSCF_BITS, MPC7_DSCF_SIZE,
+ &mpc7_dscf[1], 2,
+ &mpc7_dscf[0], 2, 1, -7, 0, 1 << MPC7_DSCF_BITS);
+ INIT_VLC_STATIC_FROM_LENGTHS(&hdr_vlc, MPC7_HDR_BITS, MPC7_HDR_SIZE,
+ &mpc7_hdr[1], 2,
+ &mpc7_hdr[0], 2, 1, -5, 0, 1 << MPC7_HDR_BITS);
+ for (unsigned i = 0, offset = 0; i < MPC7_QUANT_VLC_TABLES; i++){
+ for (int j = 0; j < 2; j++) {
+ quant_vlc[i][j].table = &quant_tables[offset];
+ quant_vlc[i][j].table_allocated = FF_ARRAY_ELEMS(quant_tables) - offset;
+ ff_init_vlc_from_lengths(&quant_vlc[i][j], 9, mpc7_quant_vlc_sizes[i],
+ &raw_quant_table[1], 2,
+ &raw_quant_table[0], 2, 1,
+ mpc7_quant_vlc_off[i],
+ INIT_VLC_STATIC_OVERLONG, NULL);
+ raw_quant_table += 2 * mpc7_quant_vlc_sizes[i];
+ offset += quant_vlc[i][j].table_size;
+ }
+ }
+ ff_mpa_synth_init_fixed();
+}
static av_cold int mpc7_decode_init(AVCodecContext * avctx)
{
- int i, j;
+ static AVOnce init_static_once = AV_ONCE_INIT;
MPCContext *c = avctx->priv_data;
GetBitContext gb;
LOCAL_ALIGNED_16(uint8_t, buf, [16]);
- static int vlc_initialized = 0;
-
- static VLC_TYPE quant_tables[7224][2];
- VLC_TYPE (*quant_table)[2] = quant_tables;
- const uint8_t *raw_quant_table = mpc7_quant_vlcs;
/* Musepack SV7 is always stereo */
if (avctx->channels != 2) {
avctx->sample_fmt = AV_SAMPLE_FMT_S16P;
avctx->channel_layout = AV_CH_LAYOUT_STEREO;
- if(vlc_initialized) return 0;
- av_log(avctx, AV_LOG_DEBUG, "Initing VLC\n");
- INIT_VLC_STATIC_FROM_LENGTHS(&scfi_vlc, MPC7_SCFI_BITS, MPC7_SCFI_SIZE,
- &mpc7_scfi[1], 2,
- &mpc7_scfi[0], 2, 1, 0, 0, 1 << MPC7_SCFI_BITS);
- INIT_VLC_STATIC_FROM_LENGTHS(&dscf_vlc, MPC7_DSCF_BITS, MPC7_DSCF_SIZE,
- &mpc7_dscf[1], 2,
- &mpc7_dscf[0], 2, 1, 0, 0, 1 << MPC7_DSCF_BITS);
- INIT_VLC_STATIC_FROM_LENGTHS(&hdr_vlc, MPC7_HDR_BITS, MPC7_HDR_SIZE,
- &mpc7_hdr[1], 2,
- &mpc7_hdr[0], 2, 1, 0, 0, 1 << MPC7_HDR_BITS);
- for(i = 0; i < MPC7_QUANT_VLC_TABLES; i++){
- for(j = 0; j < 2; j++){
- quant_vlc[i][j].table = quant_table;
- quant_vlc[i][j].table_allocated = quant_sizes[i * 2 + j];
- quant_table += quant_sizes[i * 2 + j];
- ff_init_vlc_from_lengths(&quant_vlc[i][j], 9, mpc7_quant_vlc_sizes[i],
- &raw_quant_table[1], 2,
- &raw_quant_table[0], 2, 1,
- 0, INIT_VLC_USE_NEW_STATIC, NULL);
- raw_quant_table += 2 * mpc7_quant_vlc_sizes[i];
- }
- }
- vlc_initialized = 1;
- ff_mpa_synth_init_fixed();
+ ff_thread_once(&init_static_once, mpc7_init_static);
return 0;
}
case 3: case 4: case 5: case 6: case 7:
i1 = get_bits1(gb);
for(i = 0; i < SAMPLES_PER_BAND; i++)
- *dst++ = get_vlc2(gb, quant_vlc[idx-1][i1].table, 9, 2) - mpc7_quant_vlc_off[idx-1];
+ *dst++ = get_vlc2(gb, quant_vlc[idx-1][i1].table, 9, 2);
break;
case 8: case 9: case 10: case 11: case 12:
case 13: case 14: case 15: case 16: case 17:
static int get_scale_idx(GetBitContext *gb, int ref)
{
- int t = get_vlc2(gb, dscf_vlc.table, MPC7_DSCF_BITS, 1) - 7;
+ int t = get_vlc2(gb, dscf_vlc.table, MPC7_DSCF_BITS, 1);
if (t == 8)
return get_bits(gb, 6);
return ref + t;
/* read subband indexes */
for(i = 0; i <= c->maxbands; i++){
for(ch = 0; ch < 2; ch++){
- int t = 4;
- if(i) t = get_vlc2(&gb, hdr_vlc.table, MPC7_HDR_BITS, 1) - 5;
+ int t = i ? get_vlc2(&gb, hdr_vlc.table, MPC7_HDR_BITS, 1) : 4;
if(t == 4) bands[i].res[ch] = get_bits(&gb, 4);
else bands[i].res[ch] = bands[i-1].res[ch] + t;
if (bands[i].res[ch] < -1 || bands[i].res[ch] > 17) {
return 0;
}
-AVCodec ff_mpc7_decoder = {
+const AVCodec ff_mpc7_decoder = {
.name = "mpc7",
.long_name = NULL_IF_CONFIG_SMALL("Musepack SV7"),
.type = AVMEDIA_TYPE_AUDIO,
.capabilities = AV_CODEC_CAP_DR1,
.sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_S16P,
AV_SAMPLE_FMT_NONE },
+ .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE,
};