Squashed commit of the following:
[opus.git] / silk / SKP_Silk_structs.h
index fbd618d..75f58d3 100644 (file)
@@ -28,9 +28,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef SKP_SILK_STRUCTS_H\r
 #define SKP_SILK_STRUCTS_H\r
 \r
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+#ifdef HAVE_CONFIG_H\r
+#include "config.h"\r
+#endif\r
 \r
 #include "SKP_Silk_typedef.h"\r
 #include "SKP_Silk_SigProc_FIX.h"\r
@@ -99,7 +99,9 @@ typedef struct {
 } SKP_Silk_NLSF_CB_struct;\r
 \r
 typedef struct {\r
-    SKP_int32                   predictor_prev_Q16;\r
+    SKP_int32                   pred_prev_Q13[ 2 ];\r
+    SKP_int16                   sMid[ 2 ];\r
+    SKP_int16                   sSide[ 2 ];\r
 } stereo_state;\r
 \r
 typedef struct {\r
@@ -187,6 +189,9 @@ typedef struct {
     SKP_int                         nFramesPerPacket;\r
     SKP_int                         nFramesAnalyzed;                /* Number of frames analyzed in current packet                          */\r
 \r
+    SKP_int                         nChannels;\r
+    SKP_int                         channelNb;\r
+\r
     /* Parameters For LTP scaling Control */\r
     SKP_int                         frames_since_onset;\r
 \r
@@ -301,6 +306,7 @@ typedef struct {
     SKP_int             LTP_scale_Q14;\r
 } SKP_Silk_decoder_control;\r
 \r
+\r
 #ifdef __cplusplus\r
 }\r
 #endif\r