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/main/test/PCMFile.h b/webrtc/modules/audio_coding/main/test/PCMFile.h
index 2dbfecd..bd2ce21 100644
--- a/webrtc/modules/audio_coding/main/test/PCMFile.h
+++ b/webrtc/modules/audio_coding/main/test/PCMFile.h
@@ -23,45 +23,45 @@
class PCMFile {
public:
PCMFile();
- PCMFile(WebRtc_UWord32 timestamp);
+ PCMFile(uint32_t timestamp);
~PCMFile() {
if (pcm_file_ != NULL) {
fclose(pcm_file_);
}
}
- void Open(const std::string& filename, WebRtc_UWord16 frequency,
+ void Open(const std::string& filename, uint16_t frequency,
const char* mode, bool auto_rewind = false);
- WebRtc_Word32 Read10MsData(AudioFrame& audio_frame);
+ int32_t Read10MsData(AudioFrame& audio_frame);
- void Write10MsData(WebRtc_Word16 *playout_buffer,
- WebRtc_UWord16 length_smpls);
+ void Write10MsData(int16_t *playout_buffer,
+ uint16_t length_smpls);
void Write10MsData(AudioFrame& audio_frame);
- WebRtc_UWord16 PayloadLength10Ms() const;
- WebRtc_Word32 SamplingFrequency() const;
+ uint16_t PayloadLength10Ms() const;
+ int32_t SamplingFrequency() const;
void Close();
bool EndOfFile() const {
return end_of_file_;
}
void Rewind();
- static WebRtc_Word16 ChooseFile(std::string* file_name,
- WebRtc_Word16 max_len,
- WebRtc_UWord16* frequency_hz);
- static WebRtc_Word16 ChooseFile(std::string* file_name,
- WebRtc_Word16 max_len);
+ static int16_t ChooseFile(std::string* file_name,
+ int16_t max_len,
+ uint16_t* frequency_hz);
+ static int16_t ChooseFile(std::string* file_name,
+ int16_t max_len);
bool Rewinded();
void SaveStereo(bool is_stereo = true);
void ReadStereo(bool is_stereo = true);
private:
FILE* pcm_file_;
- WebRtc_UWord16 samples_10ms_;
- WebRtc_Word32 frequency_;
+ uint16_t samples_10ms_;
+ int32_t frequency_;
bool end_of_file_;
bool auto_rewind_;
bool rewinded_;
- WebRtc_UWord32 timestamp_;
+ uint32_t timestamp_;
bool read_stereo_;
bool save_stereo_;
};