[FFmpeg-cvslog] r20256 - trunk/libavcodec/alacenc.c

[jai_menon]

Author: jai_menon
Date: Fri Oct 16 18:50:15 2009
New Revision: 20256

Log:
alacenc : Do not default to the fixed coefficient mode.

Modified:
   trunk/libavcodec/alacenc.c

Modified: trunk/libavcodec/alacenc.c
==============================================================================
--- trunk/libavcodec/alacenc.c	Fri Oct 16 18:12:04 2009	(r20255)
+++ trunk/libavcodec/alacenc.c	Fri Oct 16 18:50:15 2009	(r20256)
@@ -132,7 +132,16 @@ static void calc_predictor_params(AlacEn
     int shift[MAX_LPC_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],
                                       s->avctx->frame_size,
                                       s->min_prediction_order,
@@ -143,15 +152,6 @@ static void calc_predictor_params(AlacEn
         s->lpc[ch].lpc_order = opt_order;
         s->lpc[ch].lpc_quant = shift[opt_order-1];
         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;
     }
 }