int i, j;
MPCContext *c = avctx->priv_data;
GetBitContext gb;
- uint8_t buf[16];
+ LOCAL_ALIGNED_16(uint8_t, buf, [16]);
static int vlc_initialized = 0;
static VLC_TYPE scfi_table[1 << MPC7_SCFI_BITS][2];
static VLC_TYPE hdr_table[1 << MPC7_HDR_BITS][2];
static VLC_TYPE quant_tables[7224][2];
+ /* Musepack SV7 is always stereo */
+ if (avctx->channels != 2) {
+ av_log_ask_for_sample(avctx, "Unsupported number of channels: %d\n",
+ avctx->channels);
+ return AVERROR_PATCHWELCOME;
+ }
+
if(avctx->extradata_size < 16){
av_log(avctx, AV_LOG_ERROR, "Too small extradata size (%i)!\n", avctx->extradata_size);
return -1;
}
memset(c->oldDSCF, 0, sizeof(c->oldDSCF));
av_lfg_init(&c->rnd, 0xDEADBEEF);
- dsputil_init(&c->dsp, avctx);
+ ff_dsputil_init(&c->dsp, avctx);
ff_mpadsp_init(&c->mpadsp);
c->dsp.bswap_buf((uint32_t*)buf, (const uint32_t*)avctx->extradata, 4);
ff_mpc_init();
c->IS, c->MSS, c->gapless, c->lastframelen, c->maxbands);
c->frames_to_skip = 0;
- avctx->sample_fmt = AV_SAMPLE_FMT_S16;
- avctx->channel_layout = (avctx->channels==2) ? AV_CH_LAYOUT_STEREO : AV_CH_LAYOUT_MONO;
+ 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");
}
}
vlc_initialized = 1;
+
+ avcodec_get_frame_defaults(&c->frame);
+ avctx->coded_frame = &c->frame;
+
return 0;
}
int t = get_vlc2(gb, dscf_vlc.table, MPC7_DSCF_BITS, 1) - 7;
if (t == 8)
return get_bits(gb, 6);
- return ref + t;
+ return av_clip_uintp2(ref + t, 7);
}
-static int mpc7_decode_frame(AVCodecContext * avctx,
- void *data, int *data_size,
- AVPacket *avpkt)
+static int mpc7_decode_frame(AVCodecContext * avctx, void *data,
+ int *got_frame_ptr, AVPacket *avpkt)
{
const uint8_t *buf = avpkt->data;
- int buf_size = avpkt->size;
+ int buf_size;
MPCContext *c = avctx->priv_data;
GetBitContext gb;
- uint8_t *bits;
int i, ch;
int mb = -1;
Band *bands = c->bands;
- int off;
+ int off, ret, last_frame, skip;
int bits_used, bits_avail;
- memset(bands, 0, sizeof(bands));
- if(buf_size <= 4){
- av_log(avctx, AV_LOG_ERROR, "Too small buffer passed (%i bytes)\n", buf_size);
+ memset(bands, 0, sizeof(*bands) * (c->maxbands + 1));
+
+ buf_size = avpkt->size & ~3;
+ if (buf_size <= 0) {
+ av_log(avctx, AV_LOG_ERROR, "packet size is too small (%i bytes)\n",
+ avpkt->size);
+ return AVERROR_INVALIDDATA;
+ }
+ if (buf_size != avpkt->size) {
+ av_log(avctx, AV_LOG_WARNING, "packet size is not a multiple of 4. "
+ "extra bytes at the end will be skipped.\n");
+ }
+
+ skip = buf[0];
+ last_frame = buf[1];
+ buf += 4;
+ buf_size -= 4;
+
+ /* get output buffer */
+ c->frame.nb_samples = last_frame ? c->lastframelen : MPC_FRAME_SIZE;
+ if ((ret = avctx->get_buffer(avctx, &c->frame)) < 0) {
+ av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
+ return ret;
}
- bits = av_malloc(((buf_size - 1) & ~3) + FF_INPUT_BUFFER_PADDING_SIZE);
- c->dsp.bswap_buf((uint32_t*)bits, (const uint32_t*)(buf + 4), (buf_size - 4) >> 2);
- init_get_bits(&gb, bits, (buf_size - 4)* 8);
- skip_bits_long(&gb, buf[0]);
+ av_fast_padded_malloc(&c->bits, &c->buf_size, buf_size);
+ if (!c->bits)
+ return AVERROR(ENOMEM);
+ c->dsp.bswap_buf((uint32_t *)c->bits, (const uint32_t *)buf, buf_size >> 2);
+ init_get_bits(&gb, c->bits, buf_size * 8);
+ skip_bits_long(&gb, skip);
/* read subband indexes */
for(i = 0; i <= c->maxbands; i++){
int t = 4;
if(i) t = get_vlc2(&gb, hdr_vlc.table, MPC7_HDR_BITS, 1) - 5;
if(t == 4) bands[i].res[ch] = get_bits(&gb, 4);
- else bands[i].res[ch] = bands[i-1].res[ch] + t;
+ else bands[i].res[ch] = av_clip(bands[i-1].res[ch] + t, 0, 17);
}
if(bands[i].res[0] || bands[i].res[1]){
for(ch = 0; ch < 2; ch++)
idx_to_quant(c, &gb, bands[i].res[ch], c->Q[ch] + off);
- ff_mpc_dequantize_and_synth(c, mb, data, 2);
-
- av_free(bits);
+ ff_mpc_dequantize_and_synth(c, mb, (int16_t **)c->frame.extended_data, 2);
bits_used = get_bits_count(&gb);
- bits_avail = (buf_size - 4) * 8;
- if(!buf[1] && ((bits_avail < bits_used) || (bits_used + 32 <= bits_avail))){
- av_log(NULL,0, "Error decoding frame: used %i of %i bits\n", bits_used, bits_avail);
+ bits_avail = buf_size * 8;
+ if (!last_frame && ((bits_avail < bits_used) || (bits_used + 32 <= bits_avail))) {
+ av_log(avctx, AV_LOG_ERROR, "Error decoding frame: used %i of %i bits\n", bits_used, bits_avail);
return -1;
}
if(c->frames_to_skip){
c->frames_to_skip--;
- *data_size = 0;
- return buf_size;
+ *got_frame_ptr = 0;
+ return avpkt->size;
}
- *data_size = (buf[1] ? c->lastframelen : MPC_FRAME_SIZE) * 4;
- return buf_size;
+ *got_frame_ptr = 1;
+ *(AVFrame *)data = c->frame;
+
+ return avpkt->size;
}
static void mpc7_decode_flush(AVCodecContext *avctx)
c->frames_to_skip = 32;
}
+static av_cold int mpc7_decode_close(AVCodecContext *avctx)
+{
+ MPCContext *c = avctx->priv_data;
+ av_freep(&c->bits);
+ c->buf_size = 0;
+ return 0;
+}
+
AVCodec ff_mpc7_decoder = {
- "mpc7",
- AVMEDIA_TYPE_AUDIO,
- CODEC_ID_MUSEPACK7,
- sizeof(MPCContext),
- mpc7_decode_init,
- NULL,
- NULL,
- mpc7_decode_frame,
- .flush = mpc7_decode_flush,
- .long_name = NULL_IF_CONFIG_SMALL("Musepack SV7"),
+ .name = "mpc7",
+ .type = AVMEDIA_TYPE_AUDIO,
+ .id = AV_CODEC_ID_MUSEPACK7,
+ .priv_data_size = sizeof(MPCContext),
+ .init = mpc7_decode_init,
+ .close = mpc7_decode_close,
+ .decode = mpc7_decode_frame,
+ .flush = mpc7_decode_flush,
+ .capabilities = CODEC_CAP_DR1,
+ .long_name = NULL_IF_CONFIG_SMALL("Musepack SV7"),
+ .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_S16P,
+ AV_SAMPLE_FMT_NONE },
};
projects / ffmpeg / blobdiff