Squashed commit of the following:
[opus.git] / silk / float / SKP_Silk_encode_frame_FLP.c
index 43b5283..0a9fc0c 100644 (file)
@@ -119,13 +119,6 @@ TIC(NOISE_SHAPE_ANALYSIS)
     SKP_Silk_noise_shape_analysis_FLP( psEnc, &sEncCtrl, res_pitch_frame, x_frame );\r
 TOC(NOISE_SHAPE_ANALYSIS)\r
 \r
-    /*****************************************/\r
-    /* Prefiltering for noise shaper         */\r
-    /*****************************************/\r
-TIC(PREFILTER)\r
-    SKP_Silk_prefilter_FLP( psEnc, &sEncCtrl, xfw, x_frame );\r
-TOC(PREFILTER)\r
-\r
     /***************************************************/\r
     /* Find linear prediction coefficients (LPC + LTP) */\r
     /***************************************************/\r
@@ -139,7 +132,7 @@ TOC(FIND_PRED_COEF)
 TIC(PROCESS_GAINS)\r
     SKP_Silk_process_gains_FLP( psEnc, &sEncCtrl );\r
 TOC(PROCESS_GAINS)\r
-    \r
+\r
     /****************************************/\r
     /* Low Bitrate Redundant Encoding       */\r
     /****************************************/\r
@@ -148,6 +141,13 @@ TIC(LBRR)
 TOC(LBRR)\r
 \r
     /*****************************************/\r
+    /* Prefiltering for noise shaper         */\r
+    /*****************************************/\r
+TIC(PREFILTER)\r
+    SKP_Silk_prefilter_FLP( psEnc, &sEncCtrl, xfw, x_frame );\r
+TOC(PREFILTER)\r
+\r
+    /*****************************************/\r
     /* Noise shaping quantization            */\r
     /*****************************************/\r
 TIC(NSQ)\r