Revert "Reland "Upconvert various types to int.", common_audio portion."

webrtc/common_audio/signal_processing/include/signal_processing_library.h

Index: webrtc/common_audio/signal_processing/include/signal_processing_library.h
diff --git a/webrtc/common_audio/signal_processing/include/signal_processing_library.h b/webrtc/common_audio/signal_processing/include/signal_processing_library.h
index 24656b749fab34a7d8d2d07f4a634f7e9e08b0b5..f6ab352d856766425d7334f15accca49b640fc4e 100644
--- a/webrtc/common_audio/signal_processing/include/signal_processing_library.h
+++ b/webrtc/common_audio/signal_processing/include/signal_processing_library.h
@@ -542,24 +542,24 @@ typedef void (*CrossCorrelation)(int32_t* cross_correlation,
                                  const int16_t* seq2,
                                  int16_t dim_seq,
                                  int16_t dim_cross_correlation,
-                                 int right_shifts,
-                                 int step_seq2);
+                                 int16_t right_shifts,
+                                 int16_t step_seq2);
 extern CrossCorrelation WebRtcSpl_CrossCorrelation;
 void WebRtcSpl_CrossCorrelationC(int32_t* cross_correlation,
                                  const int16_t* seq1,
                                  const int16_t* seq2,
                                  int16_t dim_seq,
                                  int16_t dim_cross_correlation,
-                                 int right_shifts,
-                                 int step_seq2);
+                                 int16_t right_shifts,
+                                 int16_t step_seq2);
 #if (defined WEBRTC_DETECT_NEON) || (defined WEBRTC_HAS_NEON)
 void WebRtcSpl_CrossCorrelationNeon(int32_t* cross_correlation,
                                     const int16_t* seq1,
                                     const int16_t* seq2,
                                     int16_t dim_seq,
                                     int16_t dim_cross_correlation,
-                                    int right_shifts,
-                                    int step_seq2);
+                                    int16_t right_shifts,
+                                    int16_t step_seq2);
 #endif
 #if defined(MIPS32_LE)
 void WebRtcSpl_CrossCorrelation_mips(int32_t* cross_correlation,
@@ -567,8 +567,8 @@ void WebRtcSpl_CrossCorrelation_mips(int32_t* cross_correlation,
                                      const int16_t* seq2,
                                      int16_t dim_seq,
                                      int16_t dim_cross_correlation,
-                                     int right_shifts,
-                                     int step_seq2);
+                                     int16_t right_shifts,
+                                     int16_t step_seq2);
 #endif
 
 // Creates (the first half of) a Hanning window. Size must be at least 1 and