WebRtc_Word32 -> int32_t in voice_engine/

BUG=314

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

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

1 files changed, 37 insertions, 37 deletions

diff --git a/voice_engine/transmit_mixer.cc b/voice_engine/transmit_mixer.cc
index 0e4717c2..4e6e6d67 100644
--- a/voice_engine/transmit_mixer.cc
+++ b/voice_engine/transmit_mixer.cc
@@ -81,8 +81,8 @@ TransmitMixer::OnPeriodicProcess()
 }
 
 
-void TransmitMixer::PlayNotification(const WebRtc_Word32 id,
-                                     const WebRtc_UWord32 durationMs)
+void TransmitMixer::PlayNotification(const int32_t id,
+                                     const uint32_t durationMs)
 {
     WEBRTC_TRACE(kTraceStream, kTraceVoice, VoEId(_instanceId, -1),
                  "TransmitMixer::PlayNotification(id=%d, durationMs=%d)",
@@ -91,8 +91,8 @@ void TransmitMixer::PlayNotification(const WebRtc_Word32 id,
     // Not implement yet
 }
 
-void TransmitMixer::RecordNotification(const WebRtc_Word32 id,
-                                       const WebRtc_UWord32 durationMs)
+void TransmitMixer::RecordNotification(const int32_t id,
+                                       const uint32_t durationMs)
 {
     WEBRTC_TRACE(kTraceStream, kTraceVoice, VoEId(_instanceId,-1),
                  "TransmitMixer::RecordNotification(id=%d, durationMs=%d)",
@@ -101,7 +101,7 @@ void TransmitMixer::RecordNotification(const WebRtc_Word32 id,
     // Not implement yet
 }
 
-void TransmitMixer::PlayFileEnded(const WebRtc_Word32 id)
+void TransmitMixer::PlayFileEnded(const int32_t id)
 {
     WEBRTC_TRACE(kTraceStream, kTraceVoice, VoEId(_instanceId, -1),
                  "TransmitMixer::PlayFileEnded(id=%d)", id);
@@ -117,7 +117,7 @@ void TransmitMixer::PlayFileEnded(const WebRtc_Word32 id)
 }
 
 void
-TransmitMixer::RecordFileEnded(const WebRtc_Word32 id)
+TransmitMixer::RecordFileEnded(const int32_t id)
 {
     WEBRTC_TRACE(kTraceStream, kTraceVoice, VoEId(_instanceId, -1),
                  "TransmitMixer::RecordFileEnded(id=%d)", id);
@@ -139,8 +139,8 @@ TransmitMixer::RecordFileEnded(const WebRtc_Word32 id)
     }
 }
 
-WebRtc_Word32
-TransmitMixer::Create(TransmitMixer*& mixer, const WebRtc_UWord32 instanceId)
+int32_t
+TransmitMixer::Create(TransmitMixer*& mixer, const uint32_t instanceId)
 {
     WEBRTC_TRACE(kTraceMemory, kTraceVoice, VoEId(instanceId, -1),
                  "TransmitMixer::Create(instanceId=%d)", instanceId);
@@ -165,7 +165,7 @@ TransmitMixer::Destroy(TransmitMixer*& mixer)
     }
 }
 
-TransmitMixer::TransmitMixer(const WebRtc_UWord32 instanceId) :
+TransmitMixer::TransmitMixer(const uint32_t instanceId) :
     _engineStatisticsPtr(NULL),
     _channelManagerPtr(NULL),
     audioproc_(NULL),
@@ -250,7 +250,7 @@ TransmitMixer::~TransmitMixer()
     delete &_callbackCritSect;
 }
 
-WebRtc_Word32
+int32_t
 TransmitMixer::SetEngineInformation(ProcessThread& processThread,
                                     Statistics& engineStatistics,
                                     ChannelManager& channelManager)
@@ -275,7 +275,7 @@ TransmitMixer::SetEngineInformation(ProcessThread& processThread,
     return 0;
 }
 
-WebRtc_Word32
+int32_t
 TransmitMixer::RegisterVoiceEngineObserver(VoiceEngineObserver& observer)
 {
     WEBRTC_TRACE(kTraceInfo, kTraceVoice, VoEId(_instanceId, -1),
@@ -293,7 +293,7 @@ TransmitMixer::RegisterVoiceEngineObserver(VoiceEngineObserver& observer)
     return 0;
 }
 
-WebRtc_Word32
+int32_t
 TransmitMixer::SetAudioProcessingModule(AudioProcessing* audioProcessingModule)
 {
     WEBRTC_TRACE(kTraceInfo, kTraceVoice, VoEId(_instanceId, -1),
@@ -325,14 +325,14 @@ void TransmitMixer::GetSendCodecInfo(int* max_sample_rate, int* max_channels) {
   }
 }
 
-WebRtc_Word32
+int32_t
 TransmitMixer::PrepareDemux(const void* audioSamples,
-                            const WebRtc_UWord32 nSamples,
-                            const WebRtc_UWord8 nChannels,
-                            const WebRtc_UWord32 samplesPerSec,
-                            const WebRtc_UWord16 totalDelayMS,
-                            const WebRtc_Word32 clockDrift,
-                            const WebRtc_UWord16 currentMicLevel)
+                            const uint32_t nSamples,
+                            const uint8_t nChannels,
+                            const uint32_t samplesPerSec,
+                            const uint16_t totalDelayMS,
+                            const int32_t clockDrift,
+                            const uint16_t currentMicLevel)
 {
     WEBRTC_TRACE(kTraceStream, kTraceVoice, VoEId(_instanceId, -1),
                  "TransmitMixer::PrepareDemux(nSamples=%u, nChannels=%u,"
@@ -341,7 +341,7 @@ TransmitMixer::PrepareDemux(const void* audioSamples,
                  totalDelayMS, clockDrift, currentMicLevel);
 
     // --- Resample input audio and create/store the initial audio frame
-    if (GenerateAudioFrame(static_cast<const WebRtc_Word16*>(audioSamples),
+    if (GenerateAudioFrame(static_cast<const int16_t*>(audioSamples),
                            nSamples,
                            nChannels,
                            samplesPerSec) == -1)
@@ -417,7 +417,7 @@ TransmitMixer::PrepareDemux(const void* audioSamples,
     return 0;
 }
 
-WebRtc_Word32
+int32_t
 TransmitMixer::DemuxAndMix()
 {
     WEBRTC_TRACE(kTraceStream, kTraceVoice, VoEId(_instanceId, -1),
@@ -442,7 +442,7 @@ TransmitMixer::DemuxAndMix()
     return 0;
 }
 
-WebRtc_Word32
+int32_t
 TransmitMixer::EncodeAndSend()
 {
     WEBRTC_TRACE(kTraceStream, kTraceVoice, VoEId(_instanceId, -1),
@@ -462,14 +462,14 @@ TransmitMixer::EncodeAndSend()
     return 0;
 }
 
-WebRtc_UWord32 TransmitMixer::CaptureLevel() const
+uint32_t TransmitMixer::CaptureLevel() const
 {
     CriticalSectionScoped cs(&_critSect);
     return _captureLevel;
 }
 
 void
-TransmitMixer::UpdateMuteMicrophoneTime(const WebRtc_UWord32 lengthMs)
+TransmitMixer::UpdateMuteMicrophoneTime(const uint32_t lengthMs)
 {
     WEBRTC_TRACE(kTraceInfo, kTraceVoice, VoEId(_instanceId, -1),
                "TransmitMixer::UpdateMuteMicrophoneTime(lengthMs=%d)",
@@ -477,7 +477,7 @@ TransmitMixer::UpdateMuteMicrophoneTime(const WebRtc_UWord32 lengthMs)
     _remainingMuteMicTimeMs = lengthMs;
 }
 
-WebRtc_Word32
+int32_t
 TransmitMixer::StopSend()
 {
     WEBRTC_TRACE(kTraceInfo, kTraceVoice, VoEId(_instanceId, -1),
@@ -531,7 +531,7 @@ int TransmitMixer::StartPlayingFileAsMicrophone(const char* fileName,
         return -1;
     }
 
-    const WebRtc_UWord32 notificationTime(0);
+    const uint32_t notificationTime(0);
 
     if (_filePlayerPtr->StartPlayingFile(
         fileName,
@@ -608,7 +608,7 @@ int TransmitMixer::StartPlayingFileAsMicrophone(InStream* stream,
         return -1;
     }
 
-    const WebRtc_UWord32 notificationTime(0);
+    const uint32_t notificationTime(0);
 
     if (_filePlayerPtr->StartPlayingFile(
         (InStream&) *stream,
@@ -713,7 +713,7 @@ int TransmitMixer::StartRecordingMicrophone(const char* fileName,
     }
 
     FileFormats format;
-    const WebRtc_UWord32 notificationTime(0); // Not supported in VoE
+    const uint32_t notificationTime(0); // Not supported in VoE
     CodecInst dummyCodec = { 100, "L16", 16000, 320, 1, 320000 };
 
     if (codecInst != NULL &&
@@ -792,7 +792,7 @@ int TransmitMixer::StartRecordingMicrophone(OutStream* stream,
     }
 
     FileFormats format;
-    const WebRtc_UWord32 notificationTime(0); // Not supported in VoE
+    const uint32_t notificationTime(0); // Not supported in VoE
     CodecInst dummyCodec = { 100, "L16", 16000, 320, 1, 320000 };
 
     if (codecInst != NULL && codecInst->channels != 1)
@@ -899,7 +899,7 @@ int TransmitMixer::StartRecordingCall(const char* fileName,
     }
 
     FileFormats format;
-    const WebRtc_UWord32 notificationTime(0); // Not supported in VoE
+    const uint32_t notificationTime(0); // Not supported in VoE
     CodecInst dummyCodec = { 100, "L16", 16000, 320, 1, 320000 };
 
     if (codecInst != NULL && codecInst->channels != 1)
@@ -977,7 +977,7 @@ int TransmitMixer::StartRecordingCall(OutStream* stream,
     }
 
     FileFormats format;
-    const WebRtc_UWord32 notificationTime(0); // Not supported in VoE
+    const uint32_t notificationTime(0); // Not supported in VoE
     CodecInst dummyCodec = { 100, "L16", 16000, 320, 1, 320000 };
 
     if (codecInst != NULL && codecInst->channels != 1)
@@ -1128,13 +1128,13 @@ TransmitMixer::Mute() const
     return _mute;
 }
 
-WebRtc_Word8 TransmitMixer::AudioLevel() const
+int8_t TransmitMixer::AudioLevel() const
 {
     // Speech + file level [0,9]
     return _audioLevel.Level();
 }
 
-WebRtc_Word16 TransmitMixer::AudioLevelFullRange() const
+int16_t TransmitMixer::AudioLevelFullRange() const
 {
     // Speech + file level [0,32767]
     return _audioLevel.LevelFullRange();
@@ -1211,8 +1211,8 @@ int TransmitMixer::GenerateAudioFrame(const int16_t audio[],
     return 0;
 }
 
-WebRtc_Word32 TransmitMixer::RecordAudioToFile(
-    const WebRtc_UWord32 mixingFrequency)
+int32_t TransmitMixer::RecordAudioToFile(
+    const uint32_t mixingFrequency)
 {
     CriticalSectionScoped cs(&_critSect);
     if (_fileRecorderPtr == NULL)
@@ -1234,10 +1234,10 @@ WebRtc_Word32 TransmitMixer::RecordAudioToFile(
     return 0;
 }
 
-WebRtc_Word32 TransmitMixer::MixOrReplaceAudioWithFile(
+int32_t TransmitMixer::MixOrReplaceAudioWithFile(
     const int mixingFrequency)
 {
-    scoped_array<WebRtc_Word16> fileBuffer(new WebRtc_Word16[640]);
+    scoped_array<int16_t> fileBuffer(new int16_t[640]);
 
     int fileSamples(0);
     {