commit 0946a56023d821e0deca04029bb016ae1f23aa82
author pbos@webrtc.org <pbos@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Tue Apr 09 00:28:06 2013
committer pbos@webrtc.org <pbos@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Tue Apr 09 00:28:06 2013
tree 504a7ac85144a61e871e5858ffdae54fddd99815
parent 6faf71d27b89ce4fc29ebd8148fc2ffd90983a61

WebRtc_Word32 => int32_t etc. in audio_coding/

BUG=314

Review URL: https://webrtc-codereview.appspot.com/1271006

git-svn-id: http://webrtc.googlecode.com/svn/trunk@3789 4adac7df-926f-26a2-2b94-8c16560cd09d

webrtc/modules/audio_coding/codecs/ilbc/frame_classify.c

diff --git a/webrtc/modules/audio_coding/codecs/ilbc/frame_classify.c b/webrtc/modules/audio_coding/codecs/ilbc/frame_classify.c
index ea3675e..c2c6f75 100644
--- a/webrtc/modules/audio_coding/codecs/ilbc/frame_classify.c
+++ b/webrtc/modules/audio_coding/codecs/ilbc/frame_classify.c
@@ -23,19 +23,19 @@
  *  Classification of subframes to localize start state
  *---------------------------------------------------------------*/
 
-WebRtc_Word16 WebRtcIlbcfix_FrameClassify(
+int16_t WebRtcIlbcfix_FrameClassify(
     /* (o) Index to the max-energy sub frame */
     iLBC_Enc_Inst_t *iLBCenc_inst,
     /* (i/o) the encoder state structure */
-    WebRtc_Word16 *residualFIX /* (i) lpc residual signal */
+    int16_t *residualFIX /* (i) lpc residual signal */
                                                 ){
-  WebRtc_Word16 max, scale;
-  WebRtc_Word32 ssqEn[NSUB_MAX-1];
-  WebRtc_Word16 *ssqPtr;
-  WebRtc_Word32 *seqEnPtr;
-  WebRtc_Word32 maxW32;
-  WebRtc_Word16 scale1;
-  WebRtc_Word16 pos;
+  int16_t max, scale;
+  int32_t ssqEn[NSUB_MAX-1];
+  int16_t *ssqPtr;
+  int32_t *seqEnPtr;
+  int32_t maxW32;
+  int16_t scale1;
+  int16_t pos;
   int n;
 
   /*
@@ -62,7 +62,7 @@
   }
 
   /* Scale to maximum 20 bits in order to allow for the 11 bit window */
-  maxW32 = WebRtcSpl_MaxValueW32(ssqEn, (WebRtc_Word16)(iLBCenc_inst->nsub-1));
+  maxW32 = WebRtcSpl_MaxValueW32(ssqEn, (int16_t)(iLBCenc_inst->nsub-1));
   scale = WebRtcSpl_GetSizeInBits(maxW32) - 20;
   scale1 = WEBRTC_SPL_MAX(0, scale);
 
@@ -71,9 +71,9 @@
   */
   seqEnPtr=ssqEn;
   if (iLBCenc_inst->mode==20) {
-    ssqPtr=(WebRtc_Word16*)WebRtcIlbcfix_kStartSequenceEnrgWin+1;
+    ssqPtr=(int16_t*)WebRtcIlbcfix_kStartSequenceEnrgWin+1;
   } else {
-    ssqPtr=(WebRtc_Word16*)WebRtcIlbcfix_kStartSequenceEnrgWin;
+    ssqPtr=(int16_t*)WebRtcIlbcfix_kStartSequenceEnrgWin;
   }
   for (n=(iLBCenc_inst->nsub-1); n>0; n--) {
     (*seqEnPtr)=WEBRTC_SPL_MUL(((*seqEnPtr)>>scale1), (*ssqPtr));
@@ -82,7 +82,7 @@
   }
 
   /* Extract the best choise of start state */
-  pos = WebRtcSpl_MaxIndexW32(ssqEn, (WebRtc_Word16)(iLBCenc_inst->nsub-1)) + 1;
+  pos = WebRtcSpl_MaxIndexW32(ssqEn, (int16_t)(iLBCenc_inst->nsub-1)) + 1;
 
   return(pos);
 }