#include "avcodec.h"
#include "internal.h"
-#include "bitstream.h"
+#include "get_bits.h"
#include "qcelpdata.h"
#include "celp_math.h"
#include "celp_filters.h"
#include "acelp_vectors.h"
+#include "lsp.h"
#undef NDEBUG
#include <assert.h>
uint8_t warned_buf_mismatch_bitrate;
} QCELPContext;
-/**
- * Reconstructs LPC coefficients from the line spectral pair frequencies.
- *
- * TIA/EIA/IS-733 2.4.3.3.5
- */
-void ff_celp_lspf2lpc(const double *lspf, float *lpc);
-
/**
* Initialize the speech codec according to the specification.
*
gain[2] = gain[1];
gain[1] = 0.6*gain[0] + 0.4*gain[1];
}
- }else
+ }else if (q->bitrate != SILENCE)
{
if(q->bitrate == RATE_OCTAVE)
{
* @param v_in gain-controlled vector
* @param v_ref vector to control gain of
*
- * FIXME: If v_ref is a zero vector, it energy is zero
- * and the behavior of the gain control is
- * undefined in the specs.
- *
- * TIA/EIA/IS-733 2.4.8.3-2/3/4/5, 2.4.8.6
+ * TIA/EIA/IS-733 2.4.8.3, 2.4.8.6
*/
static void apply_gain_ctrl(float *v_out, const float *v_ref,
const float *v_in)
{
- int i, j, len;
- float scalefactor;
+ int i;
- for(i=0, j=0; i<4; i++)
- {
- scalefactor = ff_dot_productf(v_in + j, v_in + j, 40);
- if(scalefactor)
- scalefactor = sqrt(ff_dot_productf(v_ref + j, v_ref + j, 40)
- / scalefactor);
- else
- ff_log_missing_feature(NULL, "Zero energy for gain control", 1);
- for(len=j+40; j<len; j++)
- v_out[j] = scalefactor * v_in[j];
- }
+ for (i = 0; i < 160; i += 40)
+ ff_scale_vector_to_given_sum_of_squares(v_out + i, v_in + i,
+ ff_dot_productf(v_ref + i,
+ v_ref + i, 40),
+ 40);
}
/**
* @param lspf line spectral pair frequencies
* @param lpc linear predictive coding coefficients
*
- * @note: bandwith_expansion_coeff could be precalculated into a table
+ * @note: bandwidth_expansion_coeff could be precalculated into a table
* but it seems to be slower on x86
*
* TIA/EIA/IS-733 2.4.3.3.5
*/
static void lspf2lpc(const float *lspf, float *lpc)
{
- double lsf[10];
- double bandwith_expansion_coeff = QCELP_BANDWITH_EXPANSION_COEFF;
+ double lsp[10];
+ double bandwidth_expansion_coeff = QCELP_BANDWIDTH_EXPANSION_COEFF;
int i;
for (i=0; i<10; i++)
- lsf[i] = cos(M_PI * lspf[i]);
+ lsp[i] = cos(M_PI * lspf[i]);
- ff_celp_lspf2lpc(lsf, lpc);
+ ff_acelp_lspd2lpc(lsp, lpc, 5);
for (i=0; i<10; i++)
{
- lpc[i] *= bandwith_expansion_coeff;
- bandwith_expansion_coeff *= QCELP_BANDWITH_EXPANSION_COEFF;
+ lpc[i] *= bandwidth_expansion_coeff;
+ bandwidth_expansion_coeff *= QCELP_BANDWIDTH_EXPANSION_COEFF;
}
}
if(bitrate == SILENCE)
{
//FIXME: Remove experimental warning when tested with samples.
- ff_log_ask_for_sample(avctx, "'Blank frame handling is experimental.");
+ av_log_ask_for_sample(avctx, "'Blank frame handling is experimental.");
}
return bitrate;
}
}
static int qcelp_decode_frame(AVCodecContext *avctx, void *data, int *data_size,
- const uint8_t *buf, int buf_size)
+ AVPacket *avpkt)
{
+ const uint8_t *buf = avpkt->data;
+ int buf_size = avpkt->size;
QCELPContext *q = avctx->priv_data;
float *outbuffer = data;
int i;