diff --git a/JitterBuffer.cpp b/JitterBuffer.cpp index ba6afa3..976e1f3 100644 --- a/JitterBuffer.cpp +++ b/JitterBuffer.cpp @@ -118,7 +118,7 @@ size_t JitterBuffer::HandleOutput(unsigned char *buffer, size_t len, int offsetI int JitterBuffer::GetInternal(jitter_packet_t* pkt, int offset){ /*if(needBuffering && lastPutTimestampsizesize); + LOGE("jitter: packet won't fit into provided buffer of %d (need %d)", int(slots[i].size), int(pkt->size)); }else{ if(pkt) { pkt->size = slots[i].size; @@ -153,7 +153,7 @@ int JitterBuffer::GetInternal(jitter_packet_t* pkt, int offset){ return JR_OK; } - LOGW("jitter: found no packet for timestamp %lld (last put = %d, lost = %d)", timestampToGet, lastPutTimestamp, lostCount); + LOGW("jitter: found no packet for timestamp %lld (last put = %d, lost = %d)", (long long int)timestampToGet, lastPutTimestamp, lostCount); if(offset==0) Advance(); @@ -190,7 +190,7 @@ void JitterBuffer::PutInternal(jitter_packet_t* pkt){ if(wasReset){ wasReset=false; nextTimestamp=((int64_t)pkt->timestamp)-step*minDelay; - LOGI("jitter: resyncing, next timestamp = %lld (step=%d, minDelay=%d)", nextTimestamp, step, minDelay); + LOGI("jitter: resyncing, next timestamp = %lld (step=%d, minDelay=%d)", (long long int)nextTimestamp, step, minDelay); } for(i=0;iseqs[1], qp->seqs, 4*9); qp->seqs[0]=seq; qp->lastSentTime=GetCurrentTime(); - LOGD("Sending queued packet, seq=%u, type=%u, len=%u", seq, qp->type, qp->length); + LOGD("Sending queued packet, seq=%u, type=%u, len=%u", seq, qp->type, unsigned(qp->length)); if(qp->firstSentTime==0) qp->firstSentTime=qp->lastSentTime; if(qp->length) @@ -1440,7 +1440,7 @@ void VoIPController::RunTickThread(){ lastRemoteAckSeq, recvLossCount, conctl ? conctl->GetSendLossCount() : 0, - conctl ? conctl->GetInflightDataSize() : 0, + conctl ? (int)conctl->GetInflightDataSize() : 0, encoder ? encoder->GetBitrate() : 0, encoder ? encoder->GetPacketLoss() : 0, jitterBuffer ? jitterBuffer->GetLastMeasuredJitter() : 0, @@ -1774,14 +1774,15 @@ void VoIPController::GetDebugString(char *buffer, size_t len){ jitterBuffer ? jitterBuffer->GetMinPacketCount() : 0, jitterBuffer ? jitterBuffer->GetCurrentDelay() : 0, avgLate[0], avgLate[1], avgLate[2], // (int)(GetAverageRTT()*1000), 0, (int)(conctl->GetAverageRTT()*1000), (int)(conctl->GetMinimumRTT()*1000), - conctl->GetInflightDataSize(), conctl->GetCongestionWindow(), + int(conctl->GetInflightDataSize()), int(conctl->GetCongestionWindow()), keyFingerprint[0],keyFingerprint[1],keyFingerprint[2],keyFingerprint[3],keyFingerprint[4],keyFingerprint[5],keyFingerprint[6],keyFingerprint[7], - lastSentSeq, lastRemoteAckSeq, lastRemoteSeq, + lastSentSeq, lastRemoteAckSeq, lastRemoteSeq, conctl->GetSendLossCount(), recvLossCount, encoder ? encoder->GetPacketLoss() : 0, encoder ? (encoder->GetBitrate()/1000) : 0, // audioPacketGrouping, outgoingStreams[0]->frameDuration, incomingStreams.size()>0 ? incomingStreams[0]->frameDuration : 0, - stats.bytesSentMobile+stats.bytesSentWifi, stats.bytesRecvdMobile+stats.bytesRecvdWifi); + (long long unsigned int)(stats.bytesSentMobile+stats.bytesSentWifi), + (long long unsigned int)(stats.bytesRecvdMobile+stats.bytesRecvdWifi)); } @@ -1830,7 +1831,7 @@ float VoIPController::GetOutputLevel(){ void VoIPController::SendPacketReliably(unsigned char type, unsigned char *data, size_t len, double retryInterval, double timeout){ - LOGD("Send reliably, type=%u, len=%u, retry=%.3f, timeout=%.3f", type, len, retryInterval, timeout); + LOGD("Send reliably, type=%u, len=%u, retry=%.3f, timeout=%.3f", type, unsigned(len), retryInterval, timeout); voip_queued_packet_t* pkt=(voip_queued_packet_t *) malloc(sizeof(voip_queued_packet_t)); memset(pkt, 0, sizeof(voip_queued_packet_t)); pkt->type=type; @@ -2069,7 +2070,7 @@ Endpoint::Endpoint(int64_t id, uint16_t port, IPv4Address& _address, IPv6Address this->port=port; this->type=type; memcpy(this->peerTag, peerTag, 16); - LOGV("new endpoint %lld: %s:%u", id, address.ToString().c_str(), port); + LOGV("new endpoint %lld: %s:%u", (long long int)id, address.ToString().c_str(), port); lastPingSeq=0; lastPingTime=0; diff --git a/os/windows/AudioOutputWave.cpp b/os/windows/AudioOutputWave.cpp index debc190..752aad8 100644 --- a/os/windows/AudioOutputWave.cpp +++ b/os/windows/AudioOutputWave.cpp @@ -101,7 +101,7 @@ void AudioOutputWave::SetCurrentDevice(std::string deviceID){ bool wasPlaying=isPlaying; isPlaying=false; - LOGV("closing, hWaveOut=%d", hWaveOut); + LOGV("closing, hWaveOut=%d", (int)hWaveOut); if(hWaveOut){ MMRESULT res; if(isPlaying){ @@ -162,4 +162,4 @@ void AudioOutputWave::SetCurrentDevice(std::string deviceID){ CHECK_ERROR(res, "waveOutWrite failed"); } } -} \ No newline at end of file +}