#include "acelp_filters.h"
#include "celp_filters.h"
-#define LSFQ_DIFF_MIN (0.0125 * M_PI)
-
-#define LP_FILTER_ORDER 10
-
-/** Number of past samples needed for excitation interpolation */
-#define L_INTERPOL (LP_FILTER_ORDER + 1)
-
-/** Subframe size for all modes except 16k */
-#define SUBFR_SIZE 48
-
#define MAX_SUBFRAME_COUNT 5
+#include "sipr.h"
#include "siprdata.h"
-typedef enum {
- MODE_16k,
- MODE_8k5,
- MODE_6k5,
- MODE_5k0,
- MODE_COUNT
-} SiprMode;
-
typedef struct {
const char *mode_name;
uint16_t bits_per_frame;
/* bitstream parameters */
uint8_t number_of_fc_indexes;
+ uint8_t ma_predictor_bits; ///< size in bits of the switched MA predictor
/** size in bits of the i-th stage vector of quantizer */
uint8_t vq_indexes_bits[5];
} SiprModeParam;
static const SiprModeParam modes[MODE_COUNT] = {
+ [MODE_16k] = {
+ .mode_name = "16k",
+ .bits_per_frame = 160,
+ .subframe_count = SUBFRAME_COUNT_16k,
+ .frames_per_packet = 1,
+ .pitch_sharp_factor = 0.00,
+
+ .number_of_fc_indexes = 10,
+ .ma_predictor_bits = 1,
+ .vq_indexes_bits = {7, 8, 7, 7, 7},
+ .pitch_delay_bits = {9, 6},
+ .gp_index_bits = 4,
+ .fc_index_bits = {4, 5, 4, 5, 4, 5, 4, 5, 4, 5},
+ .gc_index_bits = 5
+ },
+
[MODE_8k5] = {
.mode_name = "8k5",
.bits_per_frame = 152,
.pitch_sharp_factor = 0.8,
.number_of_fc_indexes = 3,
+ .ma_predictor_bits = 0,
.vq_indexes_bits = {6, 7, 7, 7, 5},
.pitch_delay_bits = {8, 5, 5},
.gp_index_bits = 0,
.pitch_sharp_factor = 0.8,
.number_of_fc_indexes = 3,
+ .ma_predictor_bits = 0,
.vq_indexes_bits = {6, 7, 7, 7, 5},
.pitch_delay_bits = {8, 5, 5},
.gp_index_bits = 0,
.pitch_sharp_factor = 0.85,
.number_of_fc_indexes = 1,
+ .ma_predictor_bits = 0,
.vq_indexes_bits = {6, 7, 7, 7, 5},
.pitch_delay_bits = {8, 5, 8, 5, 5},
.gp_index_bits = 0,
}
};
-typedef struct {
- AVCodecContext *avctx;
- DSPContext dsp;
-
- SiprMode mode;
-
- float past_pitch_gain;
- float lsf_history[LP_FILTER_ORDER];
-
- float excitation[L_INTERPOL + PITCH_DELAY_MAX + 5*SUBFR_SIZE];
-
- DECLARE_ALIGNED_16(float, synth_buf[LP_FILTER_ORDER + 5*SUBFR_SIZE + 6]);
-
- float lsp_history[LP_FILTER_ORDER];
- float gain_mem;
- float energy_history[4];
- float highpass_filt_mem[2];
- float postfilter_mem[PITCH_DELAY_MAX + LP_FILTER_ORDER];
-
- /* 5k0 */
- float tilt_mem;
- float postfilter_agc;
- float postfilter_mem5k0[PITCH_DELAY_MAX + LP_FILTER_ORDER];
- float postfilter_syn5k0[LP_FILTER_ORDER + SUBFR_SIZE*5];
-} SiprContext;
-
-typedef struct {
- int vq_indexes[5];
- int pitch_delay[5]; ///< pitch delay
- int gp_index[5]; ///< adaptive-codebook gain indexes
- int16_t fc_indexes[5][10]; ///< fixed-codebook indexes
- int gc_index[5]; ///< fixed-codebook gain indexes
-} SiprParameters;
-
+const float ff_pow_0_5[] = {
+ 1.0/(1 << 1), 1.0/(1 << 2), 1.0/(1 << 3), 1.0/(1 << 4),
+ 1.0/(1 << 5), 1.0/(1 << 6), 1.0/(1 << 7), 1.0/(1 << 8),
+ 1.0/(1 << 9), 1.0/(1 << 10), 1.0/(1 << 11), 1.0/(1 << 12),
+ 1.0/(1 << 13), 1.0/(1 << 14), 1.0/(1 << 15), 1.0/(1 << 16)
+};
static void dequant(float *out, const int *idx, const float *cbs[])
{
{
int i, j;
+ parms->ma_pred_switch = get_bits(pgb, p->ma_predictor_bits);
+
for (i = 0; i < 5; i++)
parms->vq_indexes[i] = get_bits(pgb, p->vq_indexes_bits[i]);
}
/**
- * Evaluates the adaptative impulse response.
+ * Evaluates the adaptive impulse response.
*/
static void eval_ir(const float *Az, int pitch_lag, float *freq,
float pitch_sharp_factor)
for (i = 0; i < LP_FILTER_ORDER; i++) {
lpc_d[i] = lpc[i] * ff_pow_0_75[i];
- lpc_n[i] = lpc[i] * pow_0_5 [i];
+ lpc_n[i] = lpc[i] * ff_pow_0_5 [i];
};
memcpy(pole_out - LP_FILTER_ORDER, ctx->postfilter_mem,
float energy = ff_dot_productf(ctx->postfilter_syn5k0 + LP_FILTER_ORDER + i*SUBFR_SIZE,
ctx->postfilter_syn5k0 + LP_FILTER_ORDER + i*SUBFR_SIZE,
SUBFR_SIZE);
- ff_adaptative_gain_control(&synth[i * SUBFR_SIZE], energy,
- SUBFR_SIZE, 0.9, &ctx->postfilter_agc);
+ ff_adaptive_gain_control(&synth[i * SUBFR_SIZE],
+ &synth[i * SUBFR_SIZE], energy,
+ SUBFR_SIZE, 0.9, &ctx->postfilter_agc);
}
memcpy(ctx->postfilter_syn5k0, ctx->postfilter_syn5k0 + frame_size,
memcpy(ctx->excitation, excitation - PITCH_DELAY_MAX - L_INTERPOL,
(PITCH_DELAY_MAX + L_INTERPOL) * sizeof(float));
- ff_acelp_apply_order_2_transfer_function(synth,
+ ff_acelp_apply_order_2_transfer_function(out_data, synth,
(const float[2]) {-1.99997 , 1.000000000},
(const float[2]) {-1.93307352, 0.935891986},
0.939805806,
ctx->highpass_filt_mem,
frame_size);
-
- ctx->dsp.vector_clipf(out_data, synth, -1, 32767./(1<<15), frame_size);
-
}
static av_cold int sipr_decoder_init(AVCodecContext * avctx)
av_log(avctx, AV_LOG_DEBUG, "Mode: %s\n", modes[ctx->mode].mode_name);
+ if (ctx->mode == MODE_16k)
+ ff_sipr_init_16k(ctx);
+
for (i = 0; i < LP_FILTER_ORDER; i++)
ctx->lsp_history[i] = cos((i+1) * M_PI / (LP_FILTER_ORDER + 1));
avctx->sample_fmt = SAMPLE_FMT_FLT;
- if (ctx->mode == MODE_16k) {
- av_log(avctx, AV_LOG_ERROR, "decoding 16kbps SIPR files is not "
- "supported yet.\n");
- return -1;
- }
-
dsputil_init(&ctx->dsp, avctx);
return 0;
const SiprModeParam *mode_par = &modes[ctx->mode];
GetBitContext gb;
float *data = datap;
+ int subframe_size = ctx->mode == MODE_16k ? L_SUBFR_16k : SUBFR_SIZE;
int i;
ctx->avctx = avctx;
*data_size = 0;
return -1;
}
- if (*data_size < SUBFR_SIZE * mode_par->subframe_count * sizeof(float)) {
+ if (*data_size < subframe_size * mode_par->subframe_count * sizeof(float)) {
av_log(avctx, AV_LOG_ERROR,
"Error processing packet: output buffer (%d) too small\n",
*data_size);
for (i = 0; i < mode_par->frames_per_packet; i++) {
decode_parameters(&parm, &gb, mode_par);
- decode_frame(ctx, &parm, data);
- data += SUBFR_SIZE * mode_par->subframe_count;
+ if (ctx->mode == MODE_16k)
+ ff_sipr_decode_frame_16k(ctx, &parm, data);
+ else
+ decode_frame(ctx, &parm, data);
+
+ data += subframe_size * mode_par->subframe_count;
}
- *data_size = mode_par->frames_per_packet * SUBFR_SIZE *
+ *data_size = mode_par->frames_per_packet * subframe_size *
mode_par->subframe_count * sizeof(float);
return mode_par->bits_per_frame >> 3;
AVCodec sipr_decoder = {
"sipr",
- CODEC_TYPE_AUDIO,
+ AVMEDIA_TYPE_AUDIO,
CODEC_ID_SIPR,
sizeof(SiprContext),
sipr_decoder_init,
projects / ffmpeg / blobdiff