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
diff --git a/webrtc/modules/audio_coding/neteq/mcu.h b/webrtc/modules/audio_coding/neteq/mcu.h
index 499684a..6994a36 100644
--- a/webrtc/modules/audio_coding/neteq/mcu.h
+++ b/webrtc/modules/audio_coding/neteq/mcu.h
@@ -43,19 +43,19 @@
typedef struct
{
- WebRtc_Word16 current_Codec;
- WebRtc_Word16 current_Payload;
- WebRtc_UWord32 timeStamp; /* Next timestamp that should be played */
- WebRtc_Word16 millisecondsPerCall;
- WebRtc_UWord16 timestampsPerCall; /* Output chunk size */
- WebRtc_UWord16 fs;
- WebRtc_UWord32 ssrc; /* Current ssrc */
- WebRtc_Word16 new_codec;
- WebRtc_Word16 first_packet;
+ int16_t current_Codec;
+ int16_t current_Payload;
+ uint32_t timeStamp; /* Next timestamp that should be played */
+ int16_t millisecondsPerCall;
+ uint16_t timestampsPerCall; /* Output chunk size */
+ uint16_t fs;
+ uint32_t ssrc; /* Current ssrc */
+ int16_t new_codec;
+ int16_t first_packet;
/* MCU/DSP Communication layer */
- WebRtc_Word16 *pw16_readAddress;
- WebRtc_Word16 *pw16_writeAddress;
+ int16_t *pw16_readAddress;
+ int16_t *pw16_writeAddress;
void *main_inst;
CodecDbInst_t codec_DB_inst; /* Information about all the codecs, i.e. which
@@ -71,21 +71,21 @@
dtmf_inst_t DTMF_inst;
#endif
int NoOfExpandCalls;
- WebRtc_Word16 AVT_PlayoutOn;
+ int16_t AVT_PlayoutOn;
enum WebRtcNetEQPlayoutMode NetEqPlayoutMode;
- WebRtc_Word16 one_desc; /* Number of times running on one desc */
+ int16_t one_desc; /* Number of times running on one desc */
- WebRtc_UWord32 lostTS; /* Number of timestamps lost */
- WebRtc_UWord32 lastReportTS; /* Timestamp elapsed since last report was given */
+ uint32_t lostTS; /* Number of timestamps lost */
+ uint32_t lastReportTS; /* Timestamp elapsed since last report was given */
int waiting_times[kLenWaitingTimes]; /* Waiting time statistics storage. */
int len_waiting_times;
int next_waiting_time_index;
- WebRtc_UWord32 externalTS;
- WebRtc_UWord32 internalTS;
- WebRtc_Word16 TSscalingInitialized;
+ uint32_t externalTS;
+ uint32_t internalTS;
+ int16_t TSscalingInitialized;
enum TsScaling scalingFactor;
#ifdef NETEQ_STEREO
@@ -187,7 +187,7 @@
* Return value : 0 - Ok
* <0 - Error
*/
-int WebRtcNetEQ_McuSetFs(MCUInst_t *inst, WebRtc_UWord16 fs_hz);
+int WebRtcNetEQ_McuSetFs(MCUInst_t *inst, uint16_t fs_hz);
/****************************************************************************
* WebRtcNetEQ_SignalMcu(...)
@@ -217,7 +217,7 @@
*/
int WebRtcNetEQ_RecInInternal(MCUInst_t *MCU_inst, RTPPacket_t *RTPpacket,
- WebRtc_UWord32 uw32_timeRec);
+ uint32_t uw32_timeRec);
/****************************************************************************
* WebRtcNetEQ_RecInInternal(...)
@@ -234,7 +234,7 @@
* -1 - Error
*/
int WebRtcNetEQ_SplitAndInsertPayload(RTPPacket_t *packet, PacketBuf_t *Buffer_inst,
- SplitInfo_t *split_inst, WebRtc_Word16 *flushed);
+ SplitInfo_t *split_inst, int16_t *flushed);
/****************************************************************************
* WebRtcNetEQ_GetTimestampScaling(...)
@@ -264,8 +264,8 @@
* Return value : Internal timestamp
*/
-WebRtc_UWord32 WebRtcNetEQ_ScaleTimestampExternalToInternal(const MCUInst_t *MCU_inst,
- WebRtc_UWord32 externalTS);
+uint32_t WebRtcNetEQ_ScaleTimestampExternalToInternal(const MCUInst_t *MCU_inst,
+ uint32_t externalTS);
/****************************************************************************
* WebRtcNetEQ_ScaleTimestampInternalToExternal(...)
@@ -279,6 +279,6 @@
* Return value : External timestamp
*/
-WebRtc_UWord32 WebRtcNetEQ_ScaleTimestampInternalToExternal(const MCUInst_t *MCU_inst,
- WebRtc_UWord32 internalTS);
+uint32_t WebRtcNetEQ_ScaleTimestampInternalToExternal(const MCUInst_t *MCU_inst,
+ uint32_t internalTS);
#endif