From da710448b2f59a11a652988ef40a7d92bf5268ce Mon Sep 17 00:00:00 2001 From: "andrew@webrtc.org" Date: Fri, 7 Jun 2013 01:43:12 +0000 Subject: [PATCH] Fix size_t to int conversion error on Win64. 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 --- webrtc/voice_engine/channel.cc | 2 +- webrtc/voice_engine/channel.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/webrtc/voice_engine/channel.cc b/webrtc/voice_engine/channel.cc index 310e3ed588..6bfb259a76 100644 --- a/webrtc/voice_engine/channel.cc +++ b/webrtc/voice_engine/channel.cc @@ -639,7 +639,7 @@ Channel::OnReceivedPayloadData(const uint8_t* payloadData, if (!nack_list.empty()) { // Can't use nack_list.data() since it's not supported by all // compilers. - ResendPackets(&(nack_list[0]), nack_list.size()); + ResendPackets(&(nack_list[0]), static_cast(nack_list.size())); } } return 0; diff --git a/webrtc/voice_engine/channel.h b/webrtc/voice_engine/channel.h index 6473876da8..d05cd21ad3 100644 --- a/webrtc/voice_engine/channel.h +++ b/webrtc/voice_engine/channel.h @@ -279,7 +279,6 @@ public: int SetFECStatus(bool enable, int redPayloadtype); int GetFECStatus(bool& enabled, int& redPayloadtype); void SetNACKStatus(bool enable, int maxNumberOfPackets); - int ResendPackets(const uint16_t* sequence_numbers, int length); int StartRTPDump(const char fileNameUTF8[1024], RTPDirections direction); int StopRTPDump(RTPDirections direction); bool RTPDumpIsActive(RTPDirections direction); @@ -427,6 +426,7 @@ public: uint32_t EncodeAndSend(); private: + int ResendPackets(const uint16_t* sequence_numbers, int length); int InsertInbandDtmfTone(); int32_t MixOrReplaceAudioWithFile(int mixingFrequency); int32_t MixAudioWithFile(AudioFrame& audioFrame, int mixingFrequency);