[FFmpeg-cvslog] r10905 - in trunk/libavcodec: Makefile mpc.c mpc.h mpc7.c mpc7data.h mpcdata.h
kostya
subversion
Fri Nov 2 07:40:43 CET 2007
Author: kostya
Date: Fri Nov 2 07:40:42 2007
New Revision: 10905
Log:
Split Musepack decoder into SV7 decoder and synth core
(for upcoming SV8 decoder)
Added:
trunk/libavcodec/mpc.h
- copied, changed from r10904, /trunk/libavcodec/mpc.c
trunk/libavcodec/mpc7.c
- copied, changed from r10904, /trunk/libavcodec/mpc.c
trunk/libavcodec/mpc7data.h
- copied, changed from r10904, /trunk/libavcodec/mpcdata.h
Modified:
trunk/libavcodec/Makefile
trunk/libavcodec/mpc.c
trunk/libavcodec/mpcdata.h
Modified: trunk/libavcodec/Makefile
==============================================================================
--- trunk/libavcodec/Makefile (original)
+++ trunk/libavcodec/Makefile Fri Nov 2 07:40:42 2007
@@ -114,7 +114,7 @@ OBJS-$(CONFIG_MP2_ENCODER) +
OBJS-$(CONFIG_MP3_DECODER) += mpegaudiodec.o mpegaudiodecheader.o mpegaudio.o mpegaudiodata.o
OBJS-$(CONFIG_MP3ADU_DECODER) += mpegaudiodec.o mpegaudiodecheader.o mpegaudio.o mpegaudiodata.o
OBJS-$(CONFIG_MP3ON4_DECODER) += mpegaudiodec.o mpegaudiodecheader.o mpegaudio.o mpegaudiodata.o
-OBJS-$(CONFIG_MPC7_DECODER) += mpc.o mpegaudiodec.o mpegaudiodecheader.o mpegaudio.o mpegaudiodata.o
+OBJS-$(CONFIG_MPC7_DECODER) += mpc7.o mpc.o mpegaudiodec.o mpegaudiodecheader.o mpegaudio.o mpegaudiodata.o
OBJS-$(CONFIG_MPEG1VIDEO_ENCODER) += mpeg12enc.o mpeg12data.o mpegvideo_enc.o motion_est.o ratecontrol.o
OBJS-$(CONFIG_MPEG2VIDEO_ENCODER) += mpeg12enc.o mpeg12data.o mpegvideo_enc.o motion_est.o ratecontrol.o
OBJS-$(CONFIG_MPEG4_DECODER) += h263dec.o h263.o
Modified: trunk/libavcodec/mpc.c
==============================================================================
--- trunk/libavcodec/mpc.c (original)
+++ trunk/libavcodec/mpc.c Fri Nov 2 07:40:42 2007
@@ -1,5 +1,5 @@
/*
- * Musepack decoder
+ * Musepack decoder core
* Copyright (c) 2006 Konstantin Shishkov
*
* This file is part of FFmpeg.
@@ -20,7 +20,7 @@
*/
/**
- * @file mpc.c Musepack decoder
+ * @file mpc.c Musepack decoder core
* MPEG Audio Layer 1/2 -like codec with frames of 1152 samples
* divided into 32 subbands.
*/
@@ -35,108 +35,18 @@
#endif
#include "mpegaudio.h"
+#include "mpc.h"
#include "mpcdata.h"
-#define BANDS 32
-#define SAMPLES_PER_BAND 36
-#define MPC_FRAME_SIZE (BANDS * SAMPLES_PER_BAND)
-
-static VLC scfi_vlc, dscf_vlc, hdr_vlc, quant_vlc[MPC7_QUANT_VLC_TABLES][2];
-
static DECLARE_ALIGNED_16(MPA_INT, mpa_window[512]);
-typedef struct {
- DSPContext dsp;
- int IS, MSS, gapless;
- int lastframelen, bands;
- int oldDSCF[2][BANDS];
- AVRandomState rnd;
- int frames_to_skip;
- /* for synthesis */
- DECLARE_ALIGNED_16(MPA_INT, synth_buf[MPA_MAX_CHANNELS][512*2]);
- int synth_buf_offset[MPA_MAX_CHANNELS];
- DECLARE_ALIGNED_16(int32_t, sb_samples[MPA_MAX_CHANNELS][36][SBLIMIT]);
-} MPCContext;
-
-/** Subband structure - hold all variables for each subband */
-typedef struct {
- int msf; ///< mid-stereo flag
- int res[2];
- int scfi[2];
- int scf_idx[2][3];
- int Q[2];
-}Band;
-
-static int mpc7_decode_init(AVCodecContext * avctx)
+void ff_mpc_init()
{
- int i, j;
- MPCContext *c = avctx->priv_data;
- GetBitContext gb;
- uint8_t buf[16];
- static int vlc_inited = 0;
-
- 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_init_random(0xDEADBEEF, &c->rnd);
- dsputil_init(&c->dsp, avctx);
- c->dsp.bswap_buf(buf, avctx->extradata, 4);
ff_mpa_synth_init(mpa_window);
- init_get_bits(&gb, buf, 128);
-
- c->IS = get_bits1(&gb);
- c->MSS = get_bits1(&gb);
- c->bands = get_bits(&gb, 6);
- if(c->bands >= BANDS){
- av_log(avctx, AV_LOG_ERROR, "Too many bands: %i\n", c->bands);
- return -1;
- }
- skip_bits(&gb, 88);
- c->gapless = get_bits1(&gb);
- c->lastframelen = get_bits(&gb, 11);
- av_log(avctx, AV_LOG_DEBUG, "IS: %d, MSS: %d, TG: %d, LFL: %d, bands: %d\n",
- c->IS, c->MSS, c->gapless, c->lastframelen, c->bands);
- c->frames_to_skip = 0;
-
- if(vlc_inited) return 0;
- av_log(avctx, AV_LOG_DEBUG, "Initing VLC\n");
- if(init_vlc(&scfi_vlc, MPC7_SCFI_BITS, MPC7_SCFI_SIZE,
- &mpc7_scfi[1], 2, 1,
- &mpc7_scfi[0], 2, 1, INIT_VLC_USE_STATIC)){
- av_log(avctx, AV_LOG_ERROR, "Cannot init SCFI VLC\n");
- return -1;
- }
- if(init_vlc(&dscf_vlc, MPC7_DSCF_BITS, MPC7_DSCF_SIZE,
- &mpc7_dscf[1], 2, 1,
- &mpc7_dscf[0], 2, 1, INIT_VLC_USE_STATIC)){
- av_log(avctx, AV_LOG_ERROR, "Cannot init DSCF VLC\n");
- return -1;
- }
- if(init_vlc(&hdr_vlc, MPC7_HDR_BITS, MPC7_HDR_SIZE,
- &mpc7_hdr[1], 2, 1,
- &mpc7_hdr[0], 2, 1, INIT_VLC_USE_STATIC)){
- av_log(avctx, AV_LOG_ERROR, "Cannot init HDR VLC\n");
- return -1;
- }
- for(i = 0; i < MPC7_QUANT_VLC_TABLES; i++){
- for(j = 0; j < 2; j++){
- if(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][0], 4, 2, INIT_VLC_USE_STATIC)){
- av_log(avctx, AV_LOG_ERROR, "Cannot init QUANT VLC %i,%i\n",i,j);
- return -1;
- }
- }
- }
- vlc_inited = 1;
- return 0;
}
/**
* Process decoded Musepack data and produce PCM
- * @todo make it available for MPC8 and MPC6
*/
static void mpc_synth(MPCContext *c, int16_t *out)
{
@@ -158,147 +68,29 @@ static void mpc_synth(MPCContext *c, int
*out++=samples[i];
}
-/**
- * Fill samples for given subband
- */
-static inline void idx_to_quant(MPCContext *c, GetBitContext *gb, int idx, int *dst)
-{
- int i, i1, t;
- switch(idx){
- case -1:
- for(i = 0; i < SAMPLES_PER_BAND; i++){
- *dst++ = (av_random(&c->rnd) & 0x3FC) - 510;
- }
- break;
- case 1:
- i1 = get_bits1(gb);
- for(i = 0; i < SAMPLES_PER_BAND/3; i++){
- t = get_vlc2(gb, quant_vlc[0][i1].table, 9, 2);
- *dst++ = mpc_idx30[t];
- *dst++ = mpc_idx31[t];
- *dst++ = mpc_idx32[t];
- }
- break;
- case 2:
- i1 = get_bits1(gb);
- for(i = 0; i < SAMPLES_PER_BAND/2; i++){
- t = get_vlc2(gb, quant_vlc[1][i1].table, 9, 2);
- *dst++ = mpc_idx50[t];
- *dst++ = mpc_idx51[t];
- }
- break;
- 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];
- break;
- case 8: case 9: case 10: case 11: case 12:
- case 13: case 14: case 15: case 16: case 17:
- t = (1 << (idx - 2)) - 1;
- for(i = 0; i < SAMPLES_PER_BAND; i++)
- *dst++ = get_bits(gb, idx - 1) - t;
- break;
- default: // case 0 and -2..-17
- return;
- }
-}
-
-static int mpc7_decode_frame(AVCodecContext * avctx,
- void *data, int *data_size,
- uint8_t * buf, int buf_size)
+void ff_mpc_dequantize_and_synth(MPCContext * c, int maxband, void *data)
{
- MPCContext *c = avctx->priv_data;
- GetBitContext gb;
- uint8_t *bits;
- int i, j, ch, t;
- int mb = -1;
- Band bands[BANDS];
- int Q[2][MPC_FRAME_SIZE];
+ int i, j, ch;
+ Band *bands = c->bands;
int off;
float mul;
- 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);
- }
-
- bits = av_malloc(((buf_size - 1) & ~3) + FF_INPUT_BUFFER_PADDING_SIZE);
- c->dsp.bswap_buf(bits, buf + 4, (buf_size - 4) >> 2);
- init_get_bits(&gb, bits, (buf_size - 4)* 8);
- skip_bits(&gb, buf[0]);
-
- /* read subband indexes */
- for(i = 0; i <= c->bands; i++){
- for(ch = 0; ch < 2; ch++){
- if(i) t = get_vlc2(&gb, hdr_vlc.table, MPC7_HDR_BITS, 1) - 5;
- if(!i || (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[0] || bands[i].res[1]){
- mb = i;
- if(c->MSS) bands[i].msf = get_bits1(&gb);
- }
- }
- /* get scale indexes coding method */
- for(i = 0; i <= mb; i++)
- for(ch = 0; ch < 2; ch++)
- if(bands[i].res[ch]) bands[i].scfi[ch] = get_vlc2(&gb, scfi_vlc.table, MPC7_SCFI_BITS, 1);
- /* get scale indexes */
- for(i = 0; i <= mb; i++){
- for(ch = 0; ch < 2; ch++){
- if(bands[i].res[ch]){
- bands[i].scf_idx[ch][2] = c->oldDSCF[ch][i];
- t = get_vlc2(&gb, dscf_vlc.table, MPC7_DSCF_BITS, 1) - 7;
- bands[i].scf_idx[ch][0] = (t == 8) ? get_bits(&gb, 6) : (bands[i].scf_idx[ch][2] + t);
- switch(bands[i].scfi[ch]){
- case 0:
- t = get_vlc2(&gb, dscf_vlc.table, MPC7_DSCF_BITS, 1) - 7;
- bands[i].scf_idx[ch][1] = (t == 8) ? get_bits(&gb, 6) : (bands[i].scf_idx[ch][0] + t);
- t = get_vlc2(&gb, dscf_vlc.table, MPC7_DSCF_BITS, 1) - 7;
- bands[i].scf_idx[ch][2] = (t == 8) ? get_bits(&gb, 6) : (bands[i].scf_idx[ch][1] + t);
- break;
- case 1:
- t = get_vlc2(&gb, dscf_vlc.table, MPC7_DSCF_BITS, 1) - 7;
- bands[i].scf_idx[ch][1] = (t == 8) ? get_bits(&gb, 6) : (bands[i].scf_idx[ch][0] + t);
- bands[i].scf_idx[ch][2] = bands[i].scf_idx[ch][1];
- break;
- case 2:
- bands[i].scf_idx[ch][1] = bands[i].scf_idx[ch][0];
- t = get_vlc2(&gb, dscf_vlc.table, MPC7_DSCF_BITS, 1) - 7;
- bands[i].scf_idx[ch][2] = (t == 8) ? get_bits(&gb, 6) : (bands[i].scf_idx[ch][1] + t);
- break;
- case 3:
- bands[i].scf_idx[ch][2] = bands[i].scf_idx[ch][1] = bands[i].scf_idx[ch][0];
- break;
- }
- c->oldDSCF[ch][i] = bands[i].scf_idx[ch][2];
- }
- }
- }
- /* get quantizers */
- memset(Q, 0, sizeof(Q));
- off = 0;
- for(i = 0; i < BANDS; i++, off += SAMPLES_PER_BAND)
- for(ch = 0; ch < 2; ch++)
- idx_to_quant(c, &gb, bands[i].res[ch], Q[ch] + off);
/* dequantize */
memset(c->sb_samples, 0, sizeof(c->sb_samples));
off = 0;
- for(i = 0; i <= mb; i++, off += SAMPLES_PER_BAND){
+ for(i = 0; i <= maxband; i++, off += SAMPLES_PER_BAND){
for(ch = 0; ch < 2; ch++){
if(bands[i].res[ch]){
j = 0;
- mul = mpc_CC[bands[i].res[ch]] * mpc7_SCF[bands[i].scf_idx[ch][0]];
+ mul = mpc_CC[bands[i].res[ch]] * mpc_SCF[bands[i].scf_idx[ch][0]];
for(; j < 12; j++)
- c->sb_samples[ch][j][i] = mul * Q[ch][j + off];
- mul = mpc_CC[bands[i].res[ch]] * mpc7_SCF[bands[i].scf_idx[ch][1]];
+ c->sb_samples[ch][j][i] = mul * c->Q[ch][j + off];
+ mul = mpc_CC[bands[i].res[ch]] * mpc_SCF[bands[i].scf_idx[ch][1]];
for(; j < 24; j++)
- c->sb_samples[ch][j][i] = mul * Q[ch][j + off];
- mul = mpc_CC[bands[i].res[ch]] * mpc7_SCF[bands[i].scf_idx[ch][2]];
+ c->sb_samples[ch][j][i] = mul * c->Q[ch][j + off];
+ mul = mpc_CC[bands[i].res[ch]] * mpc_SCF[bands[i].scf_idx[ch][2]];
for(; j < 36; j++)
- c->sb_samples[ch][j][i] = mul * Q[ch][j + off];
+ c->sb_samples[ch][j][i] = mul * c->Q[ch][j + off];
}
}
if(bands[i].msf){
@@ -313,41 +105,4 @@ static int mpc7_decode_frame(AVCodecCont
}
mpc_synth(c, data);
-
- av_free(bits);
-
- 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);
- return -1;
- }
- if(c->frames_to_skip){
- c->frames_to_skip--;
- *data_size = 0;
- return buf_size;
- }
- *data_size = (buf[1] ? c->lastframelen : MPC_FRAME_SIZE) * 4;
-
- return buf_size;
-}
-
-static void mpc7_decode_flush(AVCodecContext *avctx)
-{
- MPCContext *c = avctx->priv_data;
-
- memset(c->oldDSCF, 0, sizeof(c->oldDSCF));
- c->frames_to_skip = 32;
}
-
-AVCodec mpc7_decoder = {
- "mpc sv7",
- CODEC_TYPE_AUDIO,
- CODEC_ID_MUSEPACK7,
- sizeof(MPCContext),
- mpc7_decode_init,
- NULL,
- NULL,
- mpc7_decode_frame,
- .flush = mpc7_decode_flush,
-};
Copied: trunk/libavcodec/mpc.h (from r10904, /trunk/libavcodec/mpc.c)
==============================================================================
--- /trunk/libavcodec/mpc.c (original)
+++ trunk/libavcodec/mpc.h Fri Nov 2 07:40:42 2007
@@ -20,11 +20,14 @@
*/
/**
- * @file mpc.c Musepack decoder
+ * @file mpc.h Musepack decoder
* MPEG Audio Layer 1/2 -like codec with frames of 1152 samples
* divided into 32 subbands.
*/
+#ifndef FFMPEG_MPC_H
+#define FFMPEG_MPC_H
+
#include "avcodec.h"
#include "bitstream.h"
#include "dsputil.h"
@@ -41,23 +44,6 @@
#define SAMPLES_PER_BAND 36
#define MPC_FRAME_SIZE (BANDS * SAMPLES_PER_BAND)
-static VLC scfi_vlc, dscf_vlc, hdr_vlc, quant_vlc[MPC7_QUANT_VLC_TABLES][2];
-
-static DECLARE_ALIGNED_16(MPA_INT, mpa_window[512]);
-
-typedef struct {
- DSPContext dsp;
- int IS, MSS, gapless;
- int lastframelen, bands;
- int oldDSCF[2][BANDS];
- AVRandomState rnd;
- int frames_to_skip;
- /* for synthesis */
- DECLARE_ALIGNED_16(MPA_INT, synth_buf[MPA_MAX_CHANNELS][512*2]);
- int synth_buf_offset[MPA_MAX_CHANNELS];
- DECLARE_ALIGNED_16(int32_t, sb_samples[MPA_MAX_CHANNELS][36][SBLIMIT]);
-} MPCContext;
-
/** Subband structure - hold all variables for each subband */
typedef struct {
int msf; ///< mid-stereo flag
@@ -67,287 +53,28 @@ typedef struct {
int Q[2];
}Band;
-static int mpc7_decode_init(AVCodecContext * avctx)
-{
- int i, j;
- MPCContext *c = avctx->priv_data;
- GetBitContext gb;
- uint8_t buf[16];
- static int vlc_inited = 0;
-
- 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_init_random(0xDEADBEEF, &c->rnd);
- dsputil_init(&c->dsp, avctx);
- c->dsp.bswap_buf(buf, avctx->extradata, 4);
- ff_mpa_synth_init(mpa_window);
- init_get_bits(&gb, buf, 128);
-
- c->IS = get_bits1(&gb);
- c->MSS = get_bits1(&gb);
- c->bands = get_bits(&gb, 6);
- if(c->bands >= BANDS){
- av_log(avctx, AV_LOG_ERROR, "Too many bands: %i\n", c->bands);
- return -1;
- }
- skip_bits(&gb, 88);
- c->gapless = get_bits1(&gb);
- c->lastframelen = get_bits(&gb, 11);
- av_log(avctx, AV_LOG_DEBUG, "IS: %d, MSS: %d, TG: %d, LFL: %d, bands: %d\n",
- c->IS, c->MSS, c->gapless, c->lastframelen, c->bands);
- c->frames_to_skip = 0;
-
- if(vlc_inited) return 0;
- av_log(avctx, AV_LOG_DEBUG, "Initing VLC\n");
- if(init_vlc(&scfi_vlc, MPC7_SCFI_BITS, MPC7_SCFI_SIZE,
- &mpc7_scfi[1], 2, 1,
- &mpc7_scfi[0], 2, 1, INIT_VLC_USE_STATIC)){
- av_log(avctx, AV_LOG_ERROR, "Cannot init SCFI VLC\n");
- return -1;
- }
- if(init_vlc(&dscf_vlc, MPC7_DSCF_BITS, MPC7_DSCF_SIZE,
- &mpc7_dscf[1], 2, 1,
- &mpc7_dscf[0], 2, 1, INIT_VLC_USE_STATIC)){
- av_log(avctx, AV_LOG_ERROR, "Cannot init DSCF VLC\n");
- return -1;
- }
- if(init_vlc(&hdr_vlc, MPC7_HDR_BITS, MPC7_HDR_SIZE,
- &mpc7_hdr[1], 2, 1,
- &mpc7_hdr[0], 2, 1, INIT_VLC_USE_STATIC)){
- av_log(avctx, AV_LOG_ERROR, "Cannot init HDR VLC\n");
- return -1;
- }
- for(i = 0; i < MPC7_QUANT_VLC_TABLES; i++){
- for(j = 0; j < 2; j++){
- if(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][0], 4, 2, INIT_VLC_USE_STATIC)){
- av_log(avctx, AV_LOG_ERROR, "Cannot init QUANT VLC %i,%i\n",i,j);
- return -1;
- }
- }
- }
- vlc_inited = 1;
- return 0;
-}
-
-/**
- * Process decoded Musepack data and produce PCM
- * @todo make it available for MPC8 and MPC6
- */
-static void mpc_synth(MPCContext *c, int16_t *out)
-{
- int dither_state = 0;
- int i, ch;
- OUT_INT samples[MPA_MAX_CHANNELS * MPA_FRAME_SIZE], *samples_ptr;
-
- for(ch = 0; ch < 2; ch++){
- samples_ptr = samples + ch;
- for(i = 0; i < SAMPLES_PER_BAND; i++) {
- ff_mpa_synth_filter(c->synth_buf[ch], &(c->synth_buf_offset[ch]),
- mpa_window, &dither_state,
- samples_ptr, 2,
- c->sb_samples[ch][i]);
- samples_ptr += 64;
- }
- }
- for(i = 0; i < MPC_FRAME_SIZE*2; i++)
- *out++=samples[i];
-}
-
-/**
- * Fill samples for given subband
- */
-static inline void idx_to_quant(MPCContext *c, GetBitContext *gb, int idx, int *dst)
-{
- int i, i1, t;
- switch(idx){
- case -1:
- for(i = 0; i < SAMPLES_PER_BAND; i++){
- *dst++ = (av_random(&c->rnd) & 0x3FC) - 510;
- }
- break;
- case 1:
- i1 = get_bits1(gb);
- for(i = 0; i < SAMPLES_PER_BAND/3; i++){
- t = get_vlc2(gb, quant_vlc[0][i1].table, 9, 2);
- *dst++ = mpc_idx30[t];
- *dst++ = mpc_idx31[t];
- *dst++ = mpc_idx32[t];
- }
- break;
- case 2:
- i1 = get_bits1(gb);
- for(i = 0; i < SAMPLES_PER_BAND/2; i++){
- t = get_vlc2(gb, quant_vlc[1][i1].table, 9, 2);
- *dst++ = mpc_idx50[t];
- *dst++ = mpc_idx51[t];
- }
- break;
- 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];
- break;
- case 8: case 9: case 10: case 11: case 12:
- case 13: case 14: case 15: case 16: case 17:
- t = (1 << (idx - 2)) - 1;
- for(i = 0; i < SAMPLES_PER_BAND; i++)
- *dst++ = get_bits(gb, idx - 1) - t;
- break;
- default: // case 0 and -2..-17
- return;
- }
-}
-
-static int mpc7_decode_frame(AVCodecContext * avctx,
- void *data, int *data_size,
- uint8_t * buf, int buf_size)
-{
- MPCContext *c = avctx->priv_data;
+typedef struct {
+ DSPContext dsp;
GetBitContext gb;
- uint8_t *bits;
- int i, j, ch, t;
- int mb = -1;
+ int IS, MSS, gapless;
+ int lastframelen;
+ int maxbands, last_max_band;
+ int last_bits_used;
+ int oldDSCF[2][BANDS];
Band bands[BANDS];
int Q[2][MPC_FRAME_SIZE];
- int off;
- float mul;
- 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);
- }
-
- bits = av_malloc(((buf_size - 1) & ~3) + FF_INPUT_BUFFER_PADDING_SIZE);
- c->dsp.bswap_buf(bits, buf + 4, (buf_size - 4) >> 2);
- init_get_bits(&gb, bits, (buf_size - 4)* 8);
- skip_bits(&gb, buf[0]);
-
- /* read subband indexes */
- for(i = 0; i <= c->bands; i++){
- for(ch = 0; ch < 2; ch++){
- if(i) t = get_vlc2(&gb, hdr_vlc.table, MPC7_HDR_BITS, 1) - 5;
- if(!i || (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[0] || bands[i].res[1]){
- mb = i;
- if(c->MSS) bands[i].msf = get_bits1(&gb);
- }
- }
- /* get scale indexes coding method */
- for(i = 0; i <= mb; i++)
- for(ch = 0; ch < 2; ch++)
- if(bands[i].res[ch]) bands[i].scfi[ch] = get_vlc2(&gb, scfi_vlc.table, MPC7_SCFI_BITS, 1);
- /* get scale indexes */
- for(i = 0; i <= mb; i++){
- for(ch = 0; ch < 2; ch++){
- if(bands[i].res[ch]){
- bands[i].scf_idx[ch][2] = c->oldDSCF[ch][i];
- t = get_vlc2(&gb, dscf_vlc.table, MPC7_DSCF_BITS, 1) - 7;
- bands[i].scf_idx[ch][0] = (t == 8) ? get_bits(&gb, 6) : (bands[i].scf_idx[ch][2] + t);
- switch(bands[i].scfi[ch]){
- case 0:
- t = get_vlc2(&gb, dscf_vlc.table, MPC7_DSCF_BITS, 1) - 7;
- bands[i].scf_idx[ch][1] = (t == 8) ? get_bits(&gb, 6) : (bands[i].scf_idx[ch][0] + t);
- t = get_vlc2(&gb, dscf_vlc.table, MPC7_DSCF_BITS, 1) - 7;
- bands[i].scf_idx[ch][2] = (t == 8) ? get_bits(&gb, 6) : (bands[i].scf_idx[ch][1] + t);
- break;
- case 1:
- t = get_vlc2(&gb, dscf_vlc.table, MPC7_DSCF_BITS, 1) - 7;
- bands[i].scf_idx[ch][1] = (t == 8) ? get_bits(&gb, 6) : (bands[i].scf_idx[ch][0] + t);
- bands[i].scf_idx[ch][2] = bands[i].scf_idx[ch][1];
- break;
- case 2:
- bands[i].scf_idx[ch][1] = bands[i].scf_idx[ch][0];
- t = get_vlc2(&gb, dscf_vlc.table, MPC7_DSCF_BITS, 1) - 7;
- bands[i].scf_idx[ch][2] = (t == 8) ? get_bits(&gb, 6) : (bands[i].scf_idx[ch][1] + t);
- break;
- case 3:
- bands[i].scf_idx[ch][2] = bands[i].scf_idx[ch][1] = bands[i].scf_idx[ch][0];
- break;
- }
- c->oldDSCF[ch][i] = bands[i].scf_idx[ch][2];
- }
- }
- }
- /* get quantizers */
- memset(Q, 0, sizeof(Q));
- off = 0;
- for(i = 0; i < BANDS; i++, off += SAMPLES_PER_BAND)
- for(ch = 0; ch < 2; ch++)
- idx_to_quant(c, &gb, bands[i].res[ch], Q[ch] + off);
- /* dequantize */
- memset(c->sb_samples, 0, sizeof(c->sb_samples));
- off = 0;
- for(i = 0; i <= mb; i++, off += SAMPLES_PER_BAND){
- for(ch = 0; ch < 2; ch++){
- if(bands[i].res[ch]){
- j = 0;
- mul = mpc_CC[bands[i].res[ch]] * mpc7_SCF[bands[i].scf_idx[ch][0]];
- for(; j < 12; j++)
- c->sb_samples[ch][j][i] = mul * Q[ch][j + off];
- mul = mpc_CC[bands[i].res[ch]] * mpc7_SCF[bands[i].scf_idx[ch][1]];
- for(; j < 24; j++)
- c->sb_samples[ch][j][i] = mul * Q[ch][j + off];
- mul = mpc_CC[bands[i].res[ch]] * mpc7_SCF[bands[i].scf_idx[ch][2]];
- for(; j < 36; j++)
- c->sb_samples[ch][j][i] = mul * Q[ch][j + off];
- }
- }
- if(bands[i].msf){
- int t1, t2;
- for(j = 0; j < SAMPLES_PER_BAND; j++){
- t1 = c->sb_samples[0][j][i];
- t2 = c->sb_samples[1][j][i];
- c->sb_samples[0][j][i] = t1 + t2;
- c->sb_samples[1][j][i] = t1 - t2;
- }
- }
- }
-
- mpc_synth(c, data);
-
- av_free(bits);
-
- 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);
- return -1;
- }
- if(c->frames_to_skip){
- c->frames_to_skip--;
- *data_size = 0;
- return buf_size;
- }
- *data_size = (buf[1] ? c->lastframelen : MPC_FRAME_SIZE) * 4;
-
- return buf_size;
-}
-
-static void mpc7_decode_flush(AVCodecContext *avctx)
-{
- MPCContext *c = avctx->priv_data;
+ int cur_frame, frames;
+ uint8_t *bits;
+ int buf_size;
+ AVRandomState rnd;
+ int frames_to_skip;
+ /* for synthesis */
+ DECLARE_ALIGNED_16(MPA_INT, synth_buf[MPA_MAX_CHANNELS][512*2]);
+ int synth_buf_offset[MPA_MAX_CHANNELS];
+ DECLARE_ALIGNED_16(int32_t, sb_samples[MPA_MAX_CHANNELS][36][SBLIMIT]);
+} MPCContext;
- memset(c->oldDSCF, 0, sizeof(c->oldDSCF));
- c->frames_to_skip = 32;
-}
+extern void ff_mpc_init();
+extern void ff_mpc_dequantize_and_synth(MPCContext *c, int maxband, void *dst);
-AVCodec mpc7_decoder = {
- "mpc sv7",
- CODEC_TYPE_AUDIO,
- CODEC_ID_MUSEPACK7,
- sizeof(MPCContext),
- mpc7_decode_init,
- NULL,
- NULL,
- mpc7_decode_frame,
- .flush = mpc7_decode_flush,
-};
+#endif /* FFMPEG_MPC_H */
Copied: trunk/libavcodec/mpc7.c (from r10904, /trunk/libavcodec/mpc.c)
==============================================================================
--- /trunk/libavcodec/mpc.c (original)
+++ trunk/libavcodec/mpc7.c Fri Nov 2 07:40:42 2007
@@ -1,5 +1,5 @@
/*
- * Musepack decoder
+ * Musepack SV7 decoder
* Copyright (c) 2006 Konstantin Shishkov
*
* This file is part of FFmpeg.
@@ -20,7 +20,7 @@
*/
/**
- * @file mpc.c Musepack decoder
+ * @file mpc7.c Musepack SV7 decoder
* MPEG Audio Layer 1/2 -like codec with frames of 1152 samples
* divided into 32 subbands.
*/
@@ -35,7 +35,8 @@
#endif
#include "mpegaudio.h"
-#include "mpcdata.h"
+#include "mpc.h"
+#include "mpc7data.h"
#define BANDS 32
#define SAMPLES_PER_BAND 36
@@ -43,30 +44,6 @@
static VLC scfi_vlc, dscf_vlc, hdr_vlc, quant_vlc[MPC7_QUANT_VLC_TABLES][2];
-static DECLARE_ALIGNED_16(MPA_INT, mpa_window[512]);
-
-typedef struct {
- DSPContext dsp;
- int IS, MSS, gapless;
- int lastframelen, bands;
- int oldDSCF[2][BANDS];
- AVRandomState rnd;
- int frames_to_skip;
- /* for synthesis */
- DECLARE_ALIGNED_16(MPA_INT, synth_buf[MPA_MAX_CHANNELS][512*2]);
- int synth_buf_offset[MPA_MAX_CHANNELS];
- DECLARE_ALIGNED_16(int32_t, sb_samples[MPA_MAX_CHANNELS][36][SBLIMIT]);
-} MPCContext;
-
-/** Subband structure - hold all variables for each subband */
-typedef struct {
- int msf; ///< mid-stereo flag
- int res[2];
- int scfi[2];
- int scf_idx[2][3];
- int Q[2];
-}Band;
-
static int mpc7_decode_init(AVCodecContext * avctx)
{
int i, j;
@@ -83,21 +60,21 @@ static int mpc7_decode_init(AVCodecConte
av_init_random(0xDEADBEEF, &c->rnd);
dsputil_init(&c->dsp, avctx);
c->dsp.bswap_buf(buf, avctx->extradata, 4);
- ff_mpa_synth_init(mpa_window);
+ ff_mpc_init();
init_get_bits(&gb, buf, 128);
c->IS = get_bits1(&gb);
c->MSS = get_bits1(&gb);
- c->bands = get_bits(&gb, 6);
- if(c->bands >= BANDS){
- av_log(avctx, AV_LOG_ERROR, "Too many bands: %i\n", c->bands);
+ c->maxbands = get_bits(&gb, 6);
+ if(c->maxbands >= BANDS){
+ av_log(avctx, AV_LOG_ERROR, "Too many bands: %i\n", c->maxbands);
return -1;
}
skip_bits(&gb, 88);
c->gapless = get_bits1(&gb);
c->lastframelen = get_bits(&gb, 11);
av_log(avctx, AV_LOG_DEBUG, "IS: %d, MSS: %d, TG: %d, LFL: %d, bands: %d\n",
- c->IS, c->MSS, c->gapless, c->lastframelen, c->bands);
+ c->IS, c->MSS, c->gapless, c->lastframelen, c->maxbands);
c->frames_to_skip = 0;
if(vlc_inited) return 0;
@@ -135,30 +112,6 @@ static int mpc7_decode_init(AVCodecConte
}
/**
- * Process decoded Musepack data and produce PCM
- * @todo make it available for MPC8 and MPC6
- */
-static void mpc_synth(MPCContext *c, int16_t *out)
-{
- int dither_state = 0;
- int i, ch;
- OUT_INT samples[MPA_MAX_CHANNELS * MPA_FRAME_SIZE], *samples_ptr;
-
- for(ch = 0; ch < 2; ch++){
- samples_ptr = samples + ch;
- for(i = 0; i < SAMPLES_PER_BAND; i++) {
- ff_mpa_synth_filter(c->synth_buf[ch], &(c->synth_buf_offset[ch]),
- mpa_window, &dither_state,
- samples_ptr, 2,
- c->sb_samples[ch][i]);
- samples_ptr += 64;
- }
- }
- for(i = 0; i < MPC_FRAME_SIZE*2; i++)
- *out++=samples[i];
-}
-
-/**
* Fill samples for given subband
*/
static inline void idx_to_quant(MPCContext *c, GetBitContext *gb, int idx, int *dst)
@@ -174,17 +127,17 @@ static inline void idx_to_quant(MPCConte
i1 = get_bits1(gb);
for(i = 0; i < SAMPLES_PER_BAND/3; i++){
t = get_vlc2(gb, quant_vlc[0][i1].table, 9, 2);
- *dst++ = mpc_idx30[t];
- *dst++ = mpc_idx31[t];
- *dst++ = mpc_idx32[t];
+ *dst++ = mpc7_idx30[t];
+ *dst++ = mpc7_idx31[t];
+ *dst++ = mpc7_idx32[t];
}
break;
case 2:
i1 = get_bits1(gb);
for(i = 0; i < SAMPLES_PER_BAND/2; i++){
t = get_vlc2(gb, quant_vlc[1][i1].table, 9, 2);
- *dst++ = mpc_idx50[t];
- *dst++ = mpc_idx51[t];
+ *dst++ = mpc7_idx50[t];
+ *dst++ = mpc7_idx51[t];
}
break;
case 3: case 4: case 5: case 6: case 7:
@@ -210,12 +163,10 @@ static int mpc7_decode_frame(AVCodecCont
MPCContext *c = avctx->priv_data;
GetBitContext gb;
uint8_t *bits;
- int i, j, ch, t;
+ int i, ch, t;
int mb = -1;
- Band bands[BANDS];
- int Q[2][MPC_FRAME_SIZE];
+ Band *bands = c->bands;
int off;
- float mul;
int bits_used, bits_avail;
memset(bands, 0, sizeof(bands));
@@ -229,7 +180,7 @@ static int mpc7_decode_frame(AVCodecCont
skip_bits(&gb, buf[0]);
/* read subband indexes */
- for(i = 0; i <= c->bands; i++){
+ for(i = 0; i <= c->maxbands; i++){
for(ch = 0; ch < 2; ch++){
if(i) t = get_vlc2(&gb, hdr_vlc.table, MPC7_HDR_BITS, 1) - 5;
if(!i || (t == 4)) bands[i].res[ch] = get_bits(&gb, 4);
@@ -278,41 +229,13 @@ static int mpc7_decode_frame(AVCodecCont
}
}
/* get quantizers */
- memset(Q, 0, sizeof(Q));
+ memset(c->Q, 0, sizeof(c->Q));
off = 0;
for(i = 0; i < BANDS; i++, off += SAMPLES_PER_BAND)
for(ch = 0; ch < 2; ch++)
- idx_to_quant(c, &gb, bands[i].res[ch], Q[ch] + off);
- /* dequantize */
- memset(c->sb_samples, 0, sizeof(c->sb_samples));
- off = 0;
- for(i = 0; i <= mb; i++, off += SAMPLES_PER_BAND){
- for(ch = 0; ch < 2; ch++){
- if(bands[i].res[ch]){
- j = 0;
- mul = mpc_CC[bands[i].res[ch]] * mpc7_SCF[bands[i].scf_idx[ch][0]];
- for(; j < 12; j++)
- c->sb_samples[ch][j][i] = mul * Q[ch][j + off];
- mul = mpc_CC[bands[i].res[ch]] * mpc7_SCF[bands[i].scf_idx[ch][1]];
- for(; j < 24; j++)
- c->sb_samples[ch][j][i] = mul * Q[ch][j + off];
- mul = mpc_CC[bands[i].res[ch]] * mpc7_SCF[bands[i].scf_idx[ch][2]];
- for(; j < 36; j++)
- c->sb_samples[ch][j][i] = mul * Q[ch][j + off];
- }
- }
- if(bands[i].msf){
- int t1, t2;
- for(j = 0; j < SAMPLES_PER_BAND; j++){
- t1 = c->sb_samples[0][j][i];
- t2 = c->sb_samples[1][j][i];
- c->sb_samples[0][j][i] = t1 + t2;
- c->sb_samples[1][j][i] = t1 - t2;
- }
- }
- }
+ idx_to_quant(c, &gb, bands[i].res[ch], c->Q[ch] + off);
- mpc_synth(c, data);
+ ff_mpc_dequantize_and_synth(c, mb, data);
av_free(bits);
Copied: trunk/libavcodec/mpc7data.h (from r10904, /trunk/libavcodec/mpcdata.h)
==============================================================================
--- /trunk/libavcodec/mpcdata.h (original)
+++ trunk/libavcodec/mpc7data.h Fri Nov 2 07:40:42 2007
@@ -19,22 +19,16 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef FFMPEG_MPCDATA_H
-#define FFMPEG_MPCDATA_H
+#ifndef FFMPEG_MPC7DATA_H
+#define FFMPEG_MPC7DATA_H
#include <stdint.h>
-static const int8_t mpc_idx30[] = { -1, 0, 1,-1, 0, 1,-1, 0, 1,-1, 0, 1,-1, 0, 1,-1, 0, 1,-1, 0, 1,-1, 0, 1,-1, 0, 1};
-static const int8_t mpc_idx31[] = { -1,-1,-1, 0, 0, 0, 1, 1, 1,-1,-1,-1, 0, 0, 0, 1, 1, 1,-1,-1,-1, 0, 0, 0, 1, 1, 1};
-static const int8_t mpc_idx32[] = { -1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1};
-static const int8_t mpc_idx50[] = { -2,-1, 0, 1, 2,-2,-1, 0, 1, 2,-2,-1, 0, 1, 2,-2,-1, 0, 1, 2,-2,-1, 0, 1, 2};
-static const int8_t mpc_idx51[] = { -2,-2,-2,-2,-2,-1,-1,-1,-1,-1, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2};
-
-static const float mpc_CC[18] = {
- 65536.0000, 21845.3333, 13107.2000, 9362.2857, 7281.7778, 4369.0667, 2114.0645,
- 1040.2539, 516.0315, 257.0039, 128.2505, 64.0626, 32.0156, 16.0039, 8.0010,
- 4.0002, 2.0001, 1.0000
-};
+static const int8_t mpc7_idx30[] = { -1, 0, 1,-1, 0, 1,-1, 0, 1,-1, 0, 1,-1, 0, 1,-1, 0, 1,-1, 0, 1,-1, 0, 1,-1, 0, 1};
+static const int8_t mpc7_idx31[] = { -1,-1,-1, 0, 0, 0, 1, 1, 1,-1,-1,-1, 0, 0, 0, 1, 1, 1,-1,-1,-1, 0, 0, 0, 1, 1, 1};
+static const int8_t mpc7_idx32[] = { -1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1};
+static const int8_t mpc7_idx50[] = { -2,-1, 0, 1, 2,-2,-1, 0, 1, 2,-2,-1, 0, 1, 2,-2,-1, 0, 1, 2,-2,-1, 0, 1, 2};
+static const int8_t mpc7_idx51[] = { -2,-2,-2,-2,-2,-1,-1,-1,-1,-1, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2};
#define MPC7_SCFI_SIZE 4
#define MPC7_SCFI_BITS 3
@@ -174,39 +168,4 @@ static const uint16_t mpc7_quant_vlc[MPC
}
};
-static const float mpc7_SCF[128] = {
- 307.330047607421875000, 255.999984741210937500, 213.243041992187500000, 177.627334594726562500,
- 147.960128784179687500, 123.247924804687500000, 102.663139343261718750, 85.516410827636718750,
- 71.233520507812500000, 59.336143493652343750, 49.425861358642578125, 41.170787811279296875,
- 34.294471740722656250, 28.566631317138671875, 23.795452117919921875, 19.821151733398437500,
- 16.510635375976562500, 13.753040313720703125, 11.456016540527343750, 9.542640686035156250,
- 7.948835372924804688, 6.621226310729980469, 5.515353679656982422, 4.594182968139648438,
- 3.826865673065185547, 3.187705039978027344, 2.655296564102172852, 2.211810588836669922,
- 1.842395424842834473, 1.534679770469665527, 1.278358578681945801, 1.064847946166992188,
- 0.886997759342193604, 0.738851964473724365, 0.615449428558349609, 0.512657463550567627,
- 0.427033752202987671, 0.355710864067077637, 0.296300262212753296, 0.246812388300895691,
- 0.205589950084686279, 0.171252459287643433, 0.142649993300437927, 0.118824683129787445,
- 0.098978661000728607, 0.082447312772274017, 0.068677015602588654, 0.057206626981496811,
- 0.047652013599872589, 0.039693206548690796, 0.033063672482967377, 0.027541399002075195,
- 0.022941453382372856, 0.019109787419438362, 0.015918083488941193, 0.013259455561637878,
- 0.011044870130717754, 0.009200163185596466, 0.007663558237254620, 0.006383595988154411,
- 0.005317411851137877, 0.004429301247000694, 0.003689522389322519, 0.003073300700634718,
- 0.002560000168159604, 0.002132430672645569, 0.001776273478753865, 0.001479601487517357,
- 0.001232479466125369, 0.001026631565764546, 0.000855164253152907, 0.000712335284333676,
- 0.000593361502978951, 0.000494258652906865, 0.000411707907915115, 0.000342944724252447,
- 0.000285666319541633, 0.000237954518524930, 0.000198211506358348, 0.000165106350323185,
- 0.000137530398205854, 0.000114560163638089, 0.000095426403277088, 0.000079488345363643,
- 0.000066212254751008, 0.000055153526773211, 0.000045941822463647, 0.000038268648495432,
- 0.000031877043511486, 0.000026552961571724, 0.000022118103515822, 0.000018423952496960,
- 0.000015346795407822, 0.000012783583770215, 0.000010648477655195, 0.000008869976227288,
- 0.000007388518497464, 0.000006154492893984, 0.000005126573796588, 0.000004270336830814,
- 0.000003557107902452, 0.000002963002089018, 0.000002468123511790, 0.000002055899130937,
- 0.000001712524181130, 0.000001426499579793, 0.000001188246528727, 0.000000989786371974,
- 0.000000824472920158, 0.000000686770022185, 0.000000572066142013, 0.000000476520028769,
- 0.000000396931966407, 0.000000330636652279, 0.000000275413924555, 0.000000229414467867,
- 0.000000191097811353, 0.000000159180785886, 0.000000132594522029, 0.000000110448674207,
- 0.000000092001613439, 0.000000076635565449, 0.000000063835940978, 0.000000053174105119,
- 0.000000044293003043, 0.000000036895215771, 0.000000030733001921, 0.000000025599996789
-};
-
-#endif /* FFMPEG_MPCDATA_H */
+#endif /* FFMPEG_MPC7DATA_H */
Modified: trunk/libavcodec/mpcdata.h
==============================================================================
--- trunk/libavcodec/mpcdata.h (original)
+++ trunk/libavcodec/mpcdata.h Fri Nov 2 07:40:42 2007
@@ -24,157 +24,13 @@
#include <stdint.h>
-static const int8_t mpc_idx30[] = { -1, 0, 1,-1, 0, 1,-1, 0, 1,-1, 0, 1,-1, 0, 1,-1, 0, 1,-1, 0, 1,-1, 0, 1,-1, 0, 1};
-static const int8_t mpc_idx31[] = { -1,-1,-1, 0, 0, 0, 1, 1, 1,-1,-1,-1, 0, 0, 0, 1, 1, 1,-1,-1,-1, 0, 0, 0, 1, 1, 1};
-static const int8_t mpc_idx32[] = { -1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1};
-static const int8_t mpc_idx50[] = { -2,-1, 0, 1, 2,-2,-1, 0, 1, 2,-2,-1, 0, 1, 2,-2,-1, 0, 1, 2,-2,-1, 0, 1, 2};
-static const int8_t mpc_idx51[] = { -2,-2,-2,-2,-2,-1,-1,-1,-1,-1, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2};
-
static const float mpc_CC[18] = {
65536.0000, 21845.3333, 13107.2000, 9362.2857, 7281.7778, 4369.0667, 2114.0645,
1040.2539, 516.0315, 257.0039, 128.2505, 64.0626, 32.0156, 16.0039, 8.0010,
4.0002, 2.0001, 1.0000
};
-#define MPC7_SCFI_SIZE 4
-#define MPC7_SCFI_BITS 3
-static const uint8_t mpc7_scfi[MPC7_SCFI_SIZE * 2] = {
- 0x2, 3, 0x1, 1, 0x3, 3, 0x0, 2
-};
-
-#define MPC7_DSCF_SIZE 16
-#define MPC7_DSCF_BITS 6
-static const uint8_t mpc7_dscf[MPC7_DSCF_SIZE * 2] = {
- 0x20, 6, 0x04, 5, 0x11, 5, 0x1E, 5, 0x0D, 4, 0x00, 3, 0x03, 3, 0x09, 4,
- 0x05, 3, 0x02, 3, 0x0E, 4, 0x03, 4, 0x1F, 5, 0x05, 5, 0x21, 6, 0x0C, 4
-};
-
-#define MPC7_HDR_SIZE 10
-#define MPC7_HDR_BITS 9
-static const uint8_t mpc7_hdr[MPC7_HDR_SIZE * 2] = {
- 0x5C, 8, 0x2F, 7, 0x0A, 5, 0x04, 4, 0x00, 2,
- 0x01, 1, 0x03, 3, 0x16, 6, 0xBB, 9, 0xBA, 9
-};
-
-#define MPC7_QUANT_VLC_TABLES 7
-static const uint8_t mpc7_quant_vlc_sizes[MPC7_QUANT_VLC_TABLES * 2] = {
- 27, 25, 7, 9, 15, 31, 63
-};
-
-static const uint8_t mpc7_quant_vlc_off[MPC7_QUANT_VLC_TABLES] = {
- 0, 0, 3, 4, 7, 15, 31
-};
-
-static const uint16_t mpc7_quant_vlc[MPC7_QUANT_VLC_TABLES][2][64 * 2] = {
-{
- {
- 0x0036, 6, 0x0009, 5, 0x0020, 6, 0x0005, 5, 0x000A, 4, 0x0007, 5,
- 0x0034, 6, 0x0000, 5, 0x0023, 6, 0x000A, 5, 0x0006, 4, 0x0004, 5,
- 0x000B, 4, 0x0007, 3, 0x000C, 4, 0x0003, 5, 0x0007, 4, 0x000B, 5,
- 0x0022, 6, 0x0001, 5, 0x0035, 6, 0x0006, 5, 0x0009, 4, 0x0002, 5,
- 0x0021, 6, 0x0008, 5, 0x0037, 6
- },
- {
- 0x0067, 8, 0x003E, 7, 0x00E1, 9, 0x0037, 7, 0x0003, 4, 0x0034, 7,
- 0x0065, 8, 0x003C, 7, 0x00E3, 9, 0x0018, 6, 0x0000, 4, 0x003D, 7,
- 0x0004, 4, 0x0001, 1, 0x0005, 4, 0x003F, 7, 0x0001, 4, 0x003B, 7,
- 0x00E2, 9, 0x0039, 7, 0x0064, 8, 0x0035, 7, 0x0002, 4, 0x0036, 7,
- 0x00E0, 9, 0x003A, 7, 0x0066, 8
- }
-},
-{
- {
- 0x0059, 7, 0x002F, 6, 0x000F, 5, 0x0000, 5, 0x005B, 7, 0x0004, 5,
- 0x0006, 4, 0x000D, 4, 0x0004, 4, 0x0005, 5, 0x0014, 5, 0x000C, 4,
- 0x0004, 3, 0x000F, 4, 0x000E, 5, 0x0003, 5, 0x0003, 4, 0x000E, 4,
- 0x0005, 4, 0x0001, 5, 0x005A, 7, 0x0002, 5, 0x0015, 5, 0x002E, 6,
- 0x0058, 7
- },
- {
- 0x0399, 10, 0x0071, 7, 0x0033, 6, 0x00E7, 8, 0x039A, 10, 0x0068, 7,
- 0x001E, 5, 0x0000, 3, 0x001D, 5, 0x0069, 7, 0x0032, 6, 0x0001, 3,
- 0x0002, 2, 0x0003, 3, 0x0031, 6, 0x006B, 7, 0x001B, 5, 0x0002, 3,
- 0x001F, 5, 0x0070, 7, 0x0398, 10, 0x006A, 7, 0x0030, 6, 0x0072, 7,
- 0x039B, 10
- }
-},
-{
- {
- 0x000C, 4, 0x0004, 3, 0x0000, 2, 0x0001, 2, 0x0007, 3, 0x0005, 3, 0x000D, 4
- },
- {
- 0x0004, 5, 0x0003, 4, 0x0002, 2, 0x0003, 2, 0x0001, 2, 0x0000, 3, 0x0005, 5
- }
-},
-{
- {
- 0x0005, 4, 0x0000, 3, 0x0004, 3, 0x0006, 3, 0x0007, 3, 0x0005, 3, 0x0003, 3, 0x0001, 3, 0x0004, 4
- },
- {
- 0x0009, 5, 0x000C, 4, 0x0003, 3, 0x0000, 2, 0x0002, 2, 0x0007, 3, 0x000D, 4, 0x0005, 4, 0x0008, 5
- }
-},
-{
- {
- 0x0039, 6, 0x0017, 5, 0x0008, 4, 0x000A, 4, 0x000D, 4, 0x0000, 3,
- 0x0002, 3, 0x0003, 3, 0x0001, 3, 0x000F, 4, 0x000C, 4, 0x0009, 4,
- 0x001D, 5, 0x0016, 5, 0x0038, 6,
- },
- {
- 0x00E5, 8, 0x0038, 6, 0x0007, 5, 0x0002, 4, 0x0000, 3, 0x0003, 3,
- 0x0005, 3, 0x0006, 3, 0x0004, 3, 0x0002, 3, 0x000F, 4, 0x001D, 5,
- 0x0006, 5, 0x0073, 7, 0x00E4, 8,
- },
-},
-{
- {
- 0x0041, 7, 0x0006, 6, 0x002C, 6, 0x002D, 6, 0x003B, 6, 0x000D, 5,
- 0x0011, 5, 0x0013, 5, 0x0017, 5, 0x0015, 5, 0x001A, 5, 0x001E, 5,
- 0x0000, 4, 0x0002, 4, 0x0005, 4, 0x0007, 4, 0x0003, 4, 0x0004, 4,
- 0x001F, 5, 0x001C, 5, 0x0019, 5, 0x001B, 5, 0x0018, 5, 0x0014, 5,
- 0x0012, 5, 0x000C, 5, 0x0002, 5, 0x003A, 6, 0x0021, 6, 0x0007, 6,
- 0x0040, 7
- },
- {
- 0x1948, 13, 0x194A, 13, 0x0328, 10, 0x0195, 9, 0x00CB, 8, 0x0066, 7,
- 0x0031, 6, 0x0009, 5, 0x000F, 5, 0x001F, 5, 0x0002, 4, 0x0006, 4,
- 0x0008, 4, 0x000B, 4, 0x000D, 4, 0x0000, 3, 0x000E, 4, 0x000A, 4,
- 0x0009, 4, 0x0005, 4, 0x0003, 4, 0x001E, 5, 0x000E, 5, 0x0008, 5,
- 0x0030, 6, 0x0067, 7, 0x00C9, 8, 0x00C8, 8, 0x0653, 11, 0x1949, 13,
- 0x194B, 13
- }
-},
-{
- {
- 0x0067, 8, 0x0099, 8, 0x00B5, 8, 0x00E9, 8, 0x0040, 7, 0x0041, 7,
- 0x004D, 7, 0x0051, 7, 0x005B, 7, 0x0071, 7, 0x0070, 7, 0x0018, 6,
- 0x001D, 6, 0x0023, 6, 0x0025, 6, 0x0029, 6, 0x002C, 6, 0x002E, 6,
- 0x0033, 6, 0x0031, 6, 0x0036, 6, 0x0037, 6, 0x0039, 6, 0x003C, 6,
- 0x0000, 5, 0x0002, 5, 0x000A, 5, 0x0005, 5, 0x0009, 5, 0x0006, 5,
- 0x000D, 5, 0x0007, 5, 0x000B, 5, 0x000F, 5, 0x0008, 5, 0x0004, 5,
- 0x0003, 5, 0x0001, 5, 0x003F, 6, 0x003E, 6, 0x003D, 6, 0x0035, 6,
- 0x003B, 6, 0x0034, 6, 0x0030, 6, 0x002F, 6, 0x002B, 6, 0x002A, 6,
- 0x0027, 6, 0x0024, 6, 0x0021, 6, 0x001C, 6, 0x0075, 7, 0x0065, 7,
- 0x0064, 7, 0x0050, 7, 0x0045, 7, 0x0044, 7, 0x0032, 7, 0x00E8, 8,
- 0x00B4, 8, 0x0098, 8, 0x0066, 8
- },
- {
- 0x37A4, 14, 0x37AD, 14, 0x37A6, 14, 0x37AE, 14, 0x0DEA, 12, 0x02F0, 10,
- 0x02F1, 10, 0x00A0, 9, 0x00A2, 9, 0x01BC, 9, 0x007A, 8, 0x00DF, 8,
- 0x003C, 7, 0x0049, 7, 0x006E, 7, 0x000E, 6, 0x0018, 6, 0x0019, 6,
- 0x0022, 6, 0x0025, 6, 0x0036, 6, 0x0003, 5, 0x0009, 5, 0x000B, 5,
- 0x0010, 5, 0x0013, 5, 0x0015, 5, 0x0018, 5, 0x001A, 5, 0x001D, 5,
- 0x001F, 5, 0x0002, 4, 0x0000, 4, 0x001E, 5, 0x001C, 5, 0x0019, 5,
- 0x0016, 5, 0x0014, 5, 0x000E, 5, 0x000D, 5, 0x0008, 5, 0x0006, 5,
- 0x0002, 5, 0x002E, 6, 0x0023, 6, 0x001F, 6, 0x0015, 6, 0x000F, 6,
- 0x005F, 7, 0x0048, 7, 0x0029, 7, 0x00BD, 8, 0x007B, 8, 0x0179, 9,
- 0x00A1, 9, 0x037B, 10, 0x0147, 10, 0x0146, 10, 0x0DE8, 12, 0x37AF, 14,
- 0x37A7, 14, 0x37AC, 14, 0x37A5, 14
- }
-}
-};
-
-static const float mpc7_SCF[128] = {
+static const float mpc_SCF[128] = {
307.330047607421875000, 255.999984741210937500, 213.243041992187500000, 177.627334594726562500,
147.960128784179687500, 123.247924804687500000, 102.663139343261718750, 85.516410827636718750,
71.233520507812500000, 59.336143493652343750, 49.425861358642578125, 41.170787811279296875,
More information about the ffmpeg-cvslog
mailing list