return voice_decision;
}
-static int32_t scalarproduct_int16_c(const int16_t * v1, const int16_t * v2, int order, int shift)
+static int32_t scalarproduct_int16_c(const int16_t * v1, const int16_t * v2, int order)
{
int res = 0;
while (order--)
- res += (*v1++ * *v2++) >> shift;
+ res += *v1++ * *v2++;
return res;
}
for(i=0; i<4; i++)
ctx->quant_energy[i] = -14336; // -14 in (5.10)
- dsputil_init(&ctx->dsp, avctx);
+ ff_dsputil_init(&ctx->dsp, avctx);
ctx->dsp.scalarproduct_int16 = scalarproduct_int16_c;
avcodec_get_frame_defaults(&ctx->frame);
av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
return ret;
}
- out_frame= ctx->frame.data[0];
+ out_frame = (int16_t*) ctx->frame.data[0];
if (buf_size == 10) {
packet_type = FORMAT_G729_8K;
1,
0,
0x800))
- /* Overflow occured, downscale excitation signal... */
+ /* Overflow occurred, downscale excitation signal... */
for (j = 0; j < 2 * SUBFRAME_SIZE + PITCH_DELAY_MAX + INTERPOL_LEN; j++)
ctx->exc_base[j] >>= 2;