commit cd2f1356eeccf4d37dfd666eba9bed56635aeb1e
author niklas.enbom@webrtc.org <niklas.enbom@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Thu Jan 24 22:05:30 2013 +0000
committer niklas.enbom@webrtc.org <niklas.enbom@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Thu Jan 24 22:05:30 2013 +0000
tree 70d0221200558ebab0beccff3302c499a659a2bf
parent ebef7e4ac1b31498014435972b52bcc3dde51438

Revert 3405
TBR=turaj@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/1074004

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

webrtc/modules/audio_coding/neteq/automode.c

diff --git a/webrtc/modules/audio_coding/neteq/automode.c b/webrtc/modules/audio_coding/neteq/automode.c
index 10a5dbb..d8d56c6 100644
--- a/webrtc/modules/audio_coding/neteq/automode.c
+++ b/webrtc/modules/audio_coding/neteq/automode.c
@@ -216,7 +216,7 @@
             streamingMode);
         if (tempvar > 0)
         {
-            inst->optBufLevel = tempvar;
+            inst->optBufLevel = (WebRtc_UWord16) tempvar;
 
             if (streamingMode != 0)
             {
@@ -575,7 +575,7 @@
          *
          * levelFiltFact is in Q8
          */
-        inst->buffLevelFilt = (WEBRTC_SPL_RSHIFT_W32(
+        inst->buffLevelFilt = (WebRtc_UWord16) (WEBRTC_SPL_RSHIFT_W32(
             WEBRTC_SPL_MUL_16_U16(inst->levelFiltFact, inst->buffLevelFilt), 8)
             + WEBRTC_SPL_MUL_16_16(256 - inst->levelFiltFact, curSizeFrames));
     }
@@ -589,7 +589,7 @@
          * from samples to packets in Q8. Make sure that the filtered value is
          * non-negative.
          */
-        inst->buffLevelFilt = WEBRTC_SPL_MAX( inst->buffLevelFilt -
+        inst->buffLevelFilt = (WebRtc_UWord16) WEBRTC_SPL_MAX( inst->buffLevelFilt -
             WebRtcSpl_DivW32W16(
                 WEBRTC_SPL_LSHIFT_W32(inst->sampleMemory, 8), /* sampleMemory in Q8 */
                 inst->packetSpeechLenSamp ), /* divide by packetSpeechLenSamp */