Commit 9bfee01f authored by jai_menon's avatar jai_menon

alacenc : Do not default to the fixed coefficient mode.



git-svn-id: file:///var/local/repositories/ffmpeg/trunk@20256 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 4a56371d
...@@ -132,7 +132,16 @@ static void calc_predictor_params(AlacEncodeContext *s, int ch) ...@@ -132,7 +132,16 @@ static void calc_predictor_params(AlacEncodeContext *s, int ch)
int shift[MAX_LPC_ORDER]; int shift[MAX_LPC_ORDER];
int opt_order; int opt_order;
if (s->avctx->compression_level > 1) { if (s->avctx->compression_level == 1) {
s->lpc[ch].lpc_order = 6;
s->lpc[ch].lpc_quant = 6;
s->lpc[ch].lpc_coeff[0] = 160;
s->lpc[ch].lpc_coeff[1] = -190;
s->lpc[ch].lpc_coeff[2] = 170;
s->lpc[ch].lpc_coeff[3] = -130;
s->lpc[ch].lpc_coeff[4] = 80;
s->lpc[ch].lpc_coeff[5] = -25;
} else {
opt_order = ff_lpc_calc_coefs(&s->dspctx, s->sample_buf[ch], opt_order = ff_lpc_calc_coefs(&s->dspctx, s->sample_buf[ch],
s->avctx->frame_size, s->avctx->frame_size,
s->min_prediction_order, s->min_prediction_order,
...@@ -143,15 +152,6 @@ static void calc_predictor_params(AlacEncodeContext *s, int ch) ...@@ -143,15 +152,6 @@ static void calc_predictor_params(AlacEncodeContext *s, int ch)
s->lpc[ch].lpc_order = opt_order; s->lpc[ch].lpc_order = opt_order;
s->lpc[ch].lpc_quant = shift[opt_order-1]; s->lpc[ch].lpc_quant = shift[opt_order-1];
memcpy(s->lpc[ch].lpc_coeff, coefs[opt_order-1], opt_order*sizeof(int)); memcpy(s->lpc[ch].lpc_coeff, coefs[opt_order-1], opt_order*sizeof(int));
} else {
s->lpc[ch].lpc_order = 6;
s->lpc[ch].lpc_quant = 6;
s->lpc[ch].lpc_coeff[0] = 160;
s->lpc[ch].lpc_coeff[1] = -190;
s->lpc[ch].lpc_coeff[2] = 170;
s->lpc[ch].lpc_coeff[3] = -130;
s->lpc[ch].lpc_coeff[4] = 80;
s->lpc[ch].lpc_coeff[5] = -25;
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment