generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix size_t to int conversion error on Win64.

Browse Source 
TBR=pwestin

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@4192 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
andrew@webrtc.org 2013-06-07 01:43:12 +00:00
parent 7e4ff354e3
commit da710448b2
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
webrtc/voice_engine/channel.cc
View File

@ -639,7 +639,7 @@ Channel::OnReceivedPayloadData(const uint8_t* payloadData,
if (!nack_list.empty()) { if (!nack_list.empty()) {
// Can't use nack_list.data() since it's not supported by all // Can't use nack_list.data() since it's not supported by all
// compilers. // compilers.
ResendPackets(&(nack_list[0]), nack_list.size()); ResendPackets(&(nack_list[0]), static_cast<int>(nack_list.size()));
} }
} }
return 0; return 0;

2
webrtc/voice_engine/channel.h
View File

@ -279,7 +279,6 @@ public:
int SetFECStatus(bool enable, int redPayloadtype); int SetFECStatus(bool enable, int redPayloadtype);
int GetFECStatus(bool& enabled, int& redPayloadtype); int GetFECStatus(bool& enabled, int& redPayloadtype);
void SetNACKStatus(bool enable, int maxNumberOfPackets); void SetNACKStatus(bool enable, int maxNumberOfPackets);
int ResendPackets(const uint16_t* sequence_numbers, int length);
int StartRTPDump(const char fileNameUTF8[1024], RTPDirections direction); int StartRTPDump(const char fileNameUTF8[1024], RTPDirections direction);
int StopRTPDump(RTPDirections direction); int StopRTPDump(RTPDirections direction);
bool RTPDumpIsActive(RTPDirections direction); bool RTPDumpIsActive(RTPDirections direction);
@ -427,6 +426,7 @@ public:
uint32_t EncodeAndSend(); uint32_t EncodeAndSend();
private: private:
int ResendPackets(const uint16_t* sequence_numbers, int length);
int InsertInbandDtmfTone(); int InsertInbandDtmfTone();
int32_t MixOrReplaceAudioWithFile(int mixingFrequency); int32_t MixOrReplaceAudioWithFile(int mixingFrequency);
int32_t MixAudioWithFile(AudioFrame& audioFrame, int mixingFrequency); int32_t MixAudioWithFile(AudioFrame& audioFrame, int mixingFrequency);