summaryrefslogtreecommitdiff
path: root/voice_engine/voe_base_impl.h
diff options
context:
space:
mode:
authorpbos@webrtc.org <pbos@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d>2013-04-09 10:09:10 +0000
committerpbos@webrtc.org <pbos@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d>2013-04-09 10:09:10 +0000
commit54f03bc96c30337a3a97af7262cfb5148063b162 (patch)
tree7ea8ea88941b30b55449b7e64f06383cb9f67611 /voice_engine/voe_base_impl.h
parentc0231afbbf1d7bac40b77da5933715dc63c88144 (diff)
downloadwebrtc-54f03bc96c30337a3a97af7262cfb5148063b162.tar.gz
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
Diffstat (limited to 'voice_engine/voe_base_impl.h')
-rw-r--r--voice_engine/voe_base_impl.h56
1 files changed, 28 insertions, 28 deletions
diff --git a/voice_engine/voe_base_impl.h b/voice_engine/voe_base_impl.h
index 11a4dbe5..42369c31 100644
--- a/voice_engine/voe_base_impl.h
+++ b/voice_engine/voe_base_impl.h
@@ -71,23 +71,23 @@ public:
virtual int LastError();
// AudioTransport
- virtual WebRtc_Word32
+ virtual int32_t
RecordedDataIsAvailable(const void* audioSamples,
- const WebRtc_UWord32 nSamples,
- const WebRtc_UWord8 nBytesPerSample,
- const WebRtc_UWord8 nChannels,
- const WebRtc_UWord32 samplesPerSec,
- const WebRtc_UWord32 totalDelayMS,
- const WebRtc_Word32 clockDrift,
- const WebRtc_UWord32 currentMicLevel,
- WebRtc_UWord32& newMicLevel);
-
- virtual WebRtc_Word32 NeedMorePlayData(const WebRtc_UWord32 nSamples,
- const WebRtc_UWord8 nBytesPerSample,
- const WebRtc_UWord8 nChannels,
- const WebRtc_UWord32 samplesPerSec,
- void* audioSamples,
- WebRtc_UWord32& nSamplesOut);
+ const uint32_t nSamples,
+ const uint8_t nBytesPerSample,
+ const uint8_t nChannels,
+ const uint32_t samplesPerSec,
+ const uint32_t totalDelayMS,
+ const int32_t clockDrift,
+ const uint32_t currentMicLevel,
+ uint32_t& newMicLevel);
+
+ virtual int32_t NeedMorePlayData(const uint32_t nSamples,
+ const uint8_t nBytesPerSample,
+ const uint8_t nChannels,
+ const uint32_t samplesPerSec,
+ void* audioSamples,
+ uint32_t& nSamplesOut);
// AudioDeviceObserver
virtual void OnErrorIsReported(const ErrorCode error);
@@ -98,26 +98,26 @@ protected:
virtual ~VoEBaseImpl();
private:
- WebRtc_Word32 StartPlayout();
- WebRtc_Word32 StopPlayout();
- WebRtc_Word32 StartSend();
- WebRtc_Word32 StopSend();
- WebRtc_Word32 TerminateInternal();
-
- WebRtc_Word32 AddBuildInfo(char* str) const;
- WebRtc_Word32 AddVoEVersion(char* str) const;
+ int32_t StartPlayout();
+ int32_t StopPlayout();
+ int32_t StartSend();
+ int32_t StopSend();
+ int32_t TerminateInternal();
+
+ int32_t AddBuildInfo(char* str) const;
+ int32_t AddVoEVersion(char* str) const;
#ifdef WEBRTC_EXTERNAL_TRANSPORT
- WebRtc_Word32 AddExternalTransportBuild(char* str) const;
+ int32_t AddExternalTransportBuild(char* str) const;
#endif
#ifdef WEBRTC_VOE_EXTERNAL_REC_AND_PLAYOUT
- WebRtc_Word32 AddExternalRecAndPlayoutBuild(char* str) const;
+ int32_t AddExternalRecAndPlayoutBuild(char* str) const;
#endif
VoiceEngineObserver* _voiceEngineObserverPtr;
CriticalSectionWrapper& _callbackCritSect;
bool _voiceEngineObserver;
- WebRtc_UWord32 _oldVoEMicLevel;
- WebRtc_UWord32 _oldMicLevel;
+ uint32_t _oldVoEMicLevel;
+ uint32_t _oldMicLevel;
AudioFrame _audioFrame;
voe::SharedData* _shared;