Avoid left-shifting negative values in a number of places

webrtc/common_audio/signal_processing/levinson_durbin.c

Index: webrtc/common_audio/signal_processing/levinson_durbin.c
diff --git a/webrtc/common_audio/signal_processing/levinson_durbin.c b/webrtc/common_audio/signal_processing/levinson_durbin.c
index d46e551367e7dc8798e351001f1667bdbc0b5dcd..e890c806cbac26fb330920c95815f28dbc8f83b7 100644
--- a/webrtc/common_audio/signal_processing/levinson_durbin.c
+++ b/webrtc/common_audio/signal_processing/levinson_durbin.c
@@ -43,10 +43,10 @@ int16_t WebRtcSpl_LevinsonDurbin(const int32_t* R, int16_t* A, int16_t* K,
 
     for (i = 0; i <= order; ++i)
     {
-        temp1W32 = WEBRTC_SPL_LSHIFT_W32(R[i], norm);
+        temp1W32 = R[i] * (1 << norm);
         // Put R in hi and low format
         R_hi[i] = (int16_t)(temp1W32 >> 16);
-        R_low[i] = (int16_t)((temp1W32 - ((int32_t)R_hi[i] << 16)) >> 1);
+        R_low[i] = (int16_t)((temp1W32 - ((int32_t)R_hi[i] * 65536)) >> 1);
     }
 
     // K = A[1] = -R[1] / R[0]
@@ -63,7 +63,7 @@ int16_t WebRtcSpl_LevinsonDurbin(const int32_t* R, int16_t* A, int16_t* K,
 
     // Put K in hi and low format
     K_hi = (int16_t)(temp1W32 >> 16);
-    K_low = (int16_t)((temp1W32 - ((int32_t)K_hi << 16)) >> 1);
+    K_low = (int16_t)((temp1W32 - ((int32_t)K_hi * 65536)) >> 1);
 
     // Store first reflection coefficient
     K[0] = K_hi;
@@ -72,7 +72,7 @@ int16_t WebRtcSpl_LevinsonDurbin(const int32_t* R, int16_t* A, int16_t* K,
 
     // Put A[1] in hi and low format
     A_hi[1] = (int16_t)(temp1W32 >> 16);
-    A_low[1] = (int16_t)((temp1W32 - ((int32_t)A_hi[1] << 16)) >> 1);
+    A_low[1] = (int16_t)((temp1W32 - ((int32_t)A_hi[1] * 65536)) >> 1);
 
     // Alpha = R[0] * (1-K^2)
 
@@ -112,14 +112,14 @@ int16_t WebRtcSpl_LevinsonDurbin(const int32_t* R, int16_t* A, int16_t* K,
         for (j = 1; j < i; j++)
         {
           // temp1W32 is in Q31
-          temp1W32 += (R_hi[j] * A_hi[i - j] << 1) +
+          temp1W32 += (R_hi[j] * A_hi[i - j] * 2) +
               (((R_hi[j] * A_low[i - j] >> 15) +
-              (R_low[j] * A_hi[i - j] >> 15)) << 1);
+              (R_low[j] * A_hi[i - j] >> 15)) * 2);
         }
 
-        temp1W32 = WEBRTC_SPL_LSHIFT_W32(temp1W32, 4);
-        temp1W32 += (WEBRTC_SPL_LSHIFT_W32((int32_t)R_hi[i], 16)
-                + WEBRTC_SPL_LSHIFT_W32((int32_t)R_low[i], 1));
+        temp1W32 = temp1W32 * 16;
+        temp1W32 += ((int32_t)R_hi[i] * 65536)
+                + WEBRTC_SPL_LSHIFT_W32((int32_t)R_low[i], 1);
 
         // K = -temp1W32 / Alpha
         temp2W32 = WEBRTC_SPL_ABS_W32(temp1W32); // abs(temp1W32)
@@ -135,7 +135,7 @@ int16_t WebRtcSpl_LevinsonDurbin(const int32_t* R, int16_t* A, int16_t* K,
         norm = WebRtcSpl_NormW32(temp3W32);
         if ((Alpha_exp <= norm) || (temp3W32 == 0))
         {
-            temp3W32 = WEBRTC_SPL_LSHIFT_W32(temp3W32, Alpha_exp);
+            temp3W32 = temp3W32 * (1 << Alpha_exp);
         } else
         {
             if (temp3W32 > 0)
@@ -149,7 +149,7 @@ int16_t WebRtcSpl_LevinsonDurbin(const int32_t* R, int16_t* A, int16_t* K,
 
         // Put K on hi and low format
         K_hi = (int16_t)(temp3W32 >> 16);
-        K_low = (int16_t)((temp3W32 - ((int32_t)K_hi << 16)) >> 1);
+        K_low = (int16_t)((temp3W32 - ((int32_t)K_hi * 65536)) >> 1);
 
         // Store Reflection coefficient in Q15
         K[i - 1] = K_hi;
@@ -171,17 +171,17 @@ int16_t WebRtcSpl_LevinsonDurbin(const int32_t* R, int16_t* A, int16_t* K,
         for (j = 1; j < i; j++)
         {
             // temp1W32 = A[j] in Q27
-            temp1W32 = WEBRTC_SPL_LSHIFT_W32((int32_t)A_hi[j],16)
+            temp1W32 = (int32_t)A_hi[j] * 65536
                     + WEBRTC_SPL_LSHIFT_W32((int32_t)A_low[j],1);
 
             // temp1W32 += K*A[i-j] in Q27
             temp1W32 += (K_hi * A_hi[i - j] + (K_hi * A_low[i - j] >> 15) +
-                (K_low * A_hi[i - j] >> 15)) << 1;
+                (K_low * A_hi[i - j] >> 15)) * 2;
 
             // Put Anew in hi and low format
             A_upd_hi[j] = (int16_t)(temp1W32 >> 16);
             A_upd_low[j] = (int16_t)(
-                (temp1W32 - ((int32_t)A_upd_hi[j] << 16)) >> 1);
+                (temp1W32 - ((int32_t)A_upd_hi[j] * 65536)) >> 1);
         }
 
         // temp3W32 = K in Q27 (Convert from Q31 to Q27)
@@ -190,7 +190,7 @@ int16_t WebRtcSpl_LevinsonDurbin(const int32_t* R, int16_t* A, int16_t* K,
         // Store Anew in hi and low format
         A_upd_hi[i] = (int16_t)(temp3W32 >> 16);
         A_upd_low[i] = (int16_t)(
-            (temp3W32 - ((int32_t)A_upd_hi[i] << 16)) >> 1);
+            (temp3W32 - ((int32_t)A_upd_hi[i] * 65536)) >> 1);
 
         // Alpha = Alpha * (1-K^2)
 
@@ -237,10 +237,10 @@ int16_t WebRtcSpl_LevinsonDurbin(const int32_t* R, int16_t* A, int16_t* K,
     for (i = 1; i <= order; i++)
     {
         // temp1W32 in Q27
-        temp1W32 = WEBRTC_SPL_LSHIFT_W32((int32_t)A_hi[i], 16)
+        temp1W32 = (int32_t)A_hi[i] * 65536
                 + WEBRTC_SPL_LSHIFT_W32((int32_t)A_low[i], 1);
         // Round and store upper word
-        A[i] = (int16_t)(((temp1W32 << 1) + 32768) >> 16);
+        A[i] = (int16_t)(((temp1W32 * 2) + 32768) >> 16);
     }
     return 1; // Stable filters
 }