shithub: opus

Info  •  Files  •  Log  •  Branches

fix possible mismerge

--- a/silk/LPC_inv_pred_gain.c

+++ b/silk/LPC_inv_pred_gain.c

@@ -45,7 +45,7 @@

 )

 {

     opus_int   k, n, mult2Q;

-    opus_int32 invGain_Q30, rc_Q31, rc_mult1_Q30, rc_mult2, tmp1, tmp2, tmp3;

+    opus_int32 invGain_Q30, rc_Q31, rc_mult1_Q30, rc_mult2, tmp1, tmp2;

     invGain_Q30 = SILK_FIX_CONST( 1, 30 );

     for( k = order - 1; k > 0; k-- ) {

@@ -80,14 +80,14 @@

             opus_int64 tmp64;

             tmp1 = A_QA[ n ];

             tmp2 = A_QA[ k - n - 1 ];

-            tmp3 = silk_SUB_SAT32(tmp1, MUL32_FRAC_Q( tmp2, rc_Q31, 31 ) );

-            tmp64 = silk_RSHIFT_ROUND64( silk_SMULL(tmp3, rc_mult2 ), mult2Q);

+            tmp64 = silk_RSHIFT_ROUND64( silk_SMULL( silk_SUB_SAT32(tmp1,

+                  MUL32_FRAC_Q( tmp2, rc_Q31, 31 ) ), rc_mult2 ), mult2Q);

             if( tmp64 > silk_int32_MAX || tmp64 < silk_int32_MIN ) {

                return 0;

             }

             A_QA[ n ] = ( opus_int32 )tmp64;

-            tmp3 = silk_SUB_SAT32(tmp2, MUL32_FRAC_Q( tmp1, rc_Q31, 31 ) );

-            tmp64 = silk_RSHIFT_ROUND64( silk_SMULL(tmp3, rc_mult2), mult2Q);

+            tmp64 = silk_RSHIFT_ROUND64( silk_SMULL( silk_SUB_SAT32(tmp2,

+                  MUL32_FRAC_Q( tmp1, rc_Q31, 31 ) ), rc_mult2), mult2Q);

             if( tmp64 > silk_int32_MAX || tmp64 < silk_int32_MIN ) {

                return 0;

             }

--- a/silk/debug.c

+++ b/silk/debug.c

@@ -29,6 +29,8 @@

 #include "config.h"

 #endif

+typedef int prevent_empty_translation_unit_warning;

+

 #include "debug.h"

 #if SILK_DEBUG || SILK_TIC_TOC

@@ -168,3 +170,4 @@

 #if SILK_DEBUG

 FILE *silk_debug_store_fp[ silk_NUM_STORES_MAX ];

 int silk_debug_store_count = 0;

+#endif /* SILK_DEBUG */

-- 

⑨