danog/libtgvoip
1
0
Fork 0
mirror of https://github.com/danog/libtgvoip.git synced 2024-12-02 09:37:52 +01:00
Code Issues Projects Releases Wiki Activity

Increase packet buffer pool size

Browse Source
This commit is contained in:
Daniil Gentili 2018-03-27 14:01:28 +02:00
parent d876d08313
commit b09ce7f5e4
5 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BufferPool.cpp
View File

@ -12,7 +12,7 @@
using namespace tgvoip; using namespace tgvoip;
BufferPool::BufferPool(unsigned int size, unsigned int count){ BufferPool::BufferPool(unsigned int size, unsigned int count){
assert(count<=64); assert(count<=1024);
init_mutex(mutex); init_mutex(mutex);
buffers[0]=(unsigned char*) malloc(size*count); buffers[0]=(unsigned char*) malloc(size*count);
bufferCount=count; bufferCount=count;

2
BufferPool.h
View File

@ -24,7 +24,7 @@ private:
uint64_t usedBuffers; uint64_t usedBuffers;
int bufferCount; int bufferCount;
size_t size; size_t size;
unsigned char* buffers[64]; unsigned char* buffers[1024];
tgvoip_mutex_t mutex; tgvoip_mutex_t mutex;
}; };
} }

4
OpusEncoder.cpp
View File

@ -68,8 +68,8 @@ void tgvoip::OpusEncoder::Encode(unsigned char *data, size_t len){
}else if(r==1){ }else if(r==1){
LOGW("DTX"); LOGW("DTX");
}else if(running){ }else if(running){
//LOGV("Packet size = %d", r); //LOGV("OPUS Packet size = %d", r);
InvokeCallback(buffer, (size_t)r); InvokeCallback(buffer, r);
} }
} }

16
VoIPController.cpp
View File

@ -165,7 +165,7 @@ VoIPController::VoIPController() : activeNetItfName(""),
proxyAddress(""), proxyAddress(""),
proxyUsername(""), proxyUsername(""),
proxyPassword(""), proxyPassword(""),
outgoingPacketsBufferPool(1024, 64){ outgoingPacketsBufferPool(1024, 1024){
seq=1; seq=1;
lastRemoteSeq=0; lastRemoteSeq=0;
state=STATE_WAIT_INIT; state=STATE_WAIT_INIT;
@ -267,7 +267,7 @@ VoIPController::VoIPController() : activeNetItfName(""),
stm->type=STREAM_TYPE_AUDIO; stm->type=STREAM_TYPE_AUDIO;
stm->codec=CODEC_OPUS; stm->codec=CODEC_OPUS;
stm->enabled=1; stm->enabled=1;
stm->frameDuration=60; stm->frameDuration=60; //ServerConfig::GetSharedInstance()->GetInt("audio_frame_size", 100);
outgoingStreams.push_back(stm); outgoingStreams.push_back(stm);
memset(signalBarsHistory, 0, sizeof(signalBarsHistory)); memset(signalBarsHistory, 0, sizeof(signalBarsHistory));
@ -414,7 +414,7 @@ void* VoIPController::StartTickThread(void* controller){
void VoIPController::Start(){ void VoIPController::Start(){
int res; int res;
LOGW("Starting voip controller"); LOGW("========= Starting voip controller =========");
int32_t cfgFrameSize=60; //ServerConfig::GetSharedInstance()->GetInt("audio_frame_size", 60); int32_t cfgFrameSize=60; //ServerConfig::GetSharedInstance()->GetInt("audio_frame_size", 60);
if(cfgFrameSize==20 || cfgFrameSize==40 || cfgFrameSize==60) if(cfgFrameSize==20 || cfgFrameSize==40 || cfgFrameSize==60)
outgoingStreams[0]->frameDuration=(uint16_t) cfgFrameSize; outgoingStreams[0]->frameDuration=(uint16_t) cfgFrameSize;
@ -450,6 +450,7 @@ void VoIPController::HandleAudioInput(unsigned char *data, size_t len){
LOGV("waiting for RLC, dropping outgoing audio packet"); LOGV("waiting for RLC, dropping outgoing audio packet");
return; return;
} }
//LOGE("GOT PACKET OF SIZE %i", len);
unsigned char* buf=outgoingPacketsBufferPool.Get(); unsigned char* buf=outgoingPacketsBufferPool.Get();
if(buf){ if(buf){
@ -472,6 +473,8 @@ void VoIPController::HandleAudioInput(unsigned char *data, size_t len){
/*.endpoint=*/NULL, /*.endpoint=*/NULL,
}; };
sendQueue->Put(p); sendQueue->Put(p);
} else {
LOGE("============ COULD NOT GET BUFFER ========");
} }
audioTimestampOut+=outgoingStreams[0]->frameDuration; audioTimestampOut+=outgoingStreams[0]->frameDuration;
@ -700,7 +703,6 @@ void VoIPController::RunRecvThread(){
readSockets.push_back(realUdpSocket); readSockets.push_back(realUdpSocket);
errorSockets.push_back(realUdpSocket); errorSockets.push_back(realUdpSocket);
//if(useTCP){
for(std::vector<Endpoint*>::iterator itr=endpoints.begin();itr!=endpoints.end();++itr){ for(std::vector<Endpoint*>::iterator itr=endpoints.begin();itr!=endpoints.end();++itr){
if((*itr)->type==EP_TYPE_TCP_RELAY){ if((*itr)->type==EP_TYPE_TCP_RELAY){
if((*itr)->socket){ if((*itr)->socket){
@ -709,7 +711,6 @@ void VoIPController::RunRecvThread(){
} }
} }
} }
//}
bool selRes=NetworkSocket::Select(readSockets, errorSockets, selectCanceller); bool selRes=NetworkSocket::Select(readSockets, errorSockets, selectCanceller);
if(!selRes){ if(!selRes){
@ -790,13 +791,13 @@ void VoIPController::RunRecvThread(){
stats.bytesRecvdMobile+=(uint64_t)len; stats.bytesRecvdMobile+=(uint64_t)len;
else else
stats.bytesRecvdWifi+=(uint64_t)len; stats.bytesRecvdWifi+=(uint64_t)len;
BufferInputStream in(buffer, (size_t)len);
try{ try{
if(memcmp(buffer, srcEndpoint->type==EP_TYPE_UDP_RELAY || srcEndpoint->type==EP_TYPE_TCP_RELAY ? (void*)srcEndpoint->peerTag : (void*)callID, 16)!=0){ if(memcmp(buffer, srcEndpoint->type==EP_TYPE_UDP_RELAY || srcEndpoint->type==EP_TYPE_TCP_RELAY ? (void*)srcEndpoint->peerTag : (void*)callID, 16)!=0){
LOGW("Received packet has wrong peerTag"); LOGW("Received packet has wrong peerTag");
continue; continue;
} }
BufferInputStream in(buffer, (size_t)len);
in.Seek(16); in.Seek(16);
if(in.Remaining()>=16 && (srcEndpoint->type==EP_TYPE_UDP_RELAY || srcEndpoint->type==EP_TYPE_TCP_RELAY) if(in.Remaining()>=16 && (srcEndpoint->type==EP_TYPE_UDP_RELAY || srcEndpoint->type==EP_TYPE_TCP_RELAY)
&& *reinterpret_cast<uint64_t*>(buffer+16)==0xFFFFFFFFFFFFFFFFLL && *reinterpret_cast<uint32_t*>(buffer+24)==0xFFFFFFFF){ && *reinterpret_cast<uint64_t*>(buffer+16)==0xFFFFFFFFFFFFFFFFLL && *reinterpret_cast<uint32_t*>(buffer+24)==0xFFFFFFFF){
@ -811,7 +812,7 @@ void VoIPController::RunRecvThread(){
unsigned char myIP[16]; unsigned char myIP[16];
in.ReadBytes(myIP, 16); in.ReadBytes(myIP, 16);
int32_t myPort=in.ReadInt32(); int32_t myPort=in.ReadInt32();
udpConnectivityState=UDP_AVAILABIE; udpConnectivityState=UDP_AVAILABLE;
//LOGV("Received UDP ping reply from %s:%d: date=%d, queryID=%lld, my IP=%s, my port=%d", srcEndpoint->address.ToString().c_str(), srcEndpoint->port, date, queryID, IPv6Address(myIP).ToString().c_str(), myPort); //LOGV("Received UDP ping reply from %s:%d: date=%d, queryID=%lld, my IP=%s, my port=%d", srcEndpoint->address.ToString().c_str(), srcEndpoint->port, date, queryID, IPv6Address(myIP).ToString().c_str(), myPort);
} }
}else if(tlid==TLID_UDP_REFLECTOR_PEER_INFO){ }else if(tlid==TLID_UDP_REFLECTOR_PEER_INFO){
@ -1808,6 +1809,7 @@ void VoIPController::SendPacket(unsigned char *data, size_t len, Endpoint* ep){
stats.bytesSentWifi+=(uint64_t)out.GetLength(); stats.bytesSentWifi+=(uint64_t)out.GetLength();
NetworkPacket pkt; NetworkPacket pkt;
//LOGE("WILL SEND PACKET OF SIZE %i", out.GetLength());
pkt.address=(NetworkAddress*)&ep->address; pkt.address=(NetworkAddress*)&ep->address;
pkt.port=ep->port; pkt.port=ep->port;
pkt.length=out.GetLength(); pkt.length=out.GetLength();

2
VoIPController.h
View File

@ -355,7 +355,7 @@ private:
enum{ enum{
UDP_UNKNOWN=0, UDP_UNKNOWN=0,
UDP_PING_SENT, UDP_PING_SENT,
UDP_AVAILABIE, UDP_AVAILABLE,
UDP_NOT_AVAILABLE UDP_NOT_AVAILABLE
}; };