updated to 0.3.1

Author: grishka

BlockingQueue.cpp

@@ -8,6 +8,7 @@
 
 CBlockingQueue::CBlockingQueue(size_t capacity){
 	this->capacity=capacity;
+	overflowCallback=NULL;
 	init_lock(lock);
 	init_mutex(mutex);
 }
@@ -29,7 +30,12 @@ void CBlockingQueue::Put(void *thing){
 	}
 	queue.push_back(thing);
 	while(queue.size()>capacity){
-		queue.pop_front();
+		if(overflowCallback){
+			overflowCallback(queue.front());
+			queue.pop_front();
+		}else{
+			abort();
+		}
 	}
 	unlock_mutex(mutex);
 }
@@ -72,3 +78,7 @@ void CBlockingQueue::PrepareDealloc(){
 	unlock_mutex(mutex);
 }
 
+
+void CBlockingQueue::SetOverflowCallback(void (*overflowCallback)(void *)){
+	this->overflowCallback=overflowCallback;
+}

BlockingQueue.h

@@ -22,13 +22,15 @@ class CBlockingQueue{
 	void* Get();
 	unsigned int Size();
 	void PrepareDealloc();
+	void SetOverflowCallback(void (*overflowCallback)(void*));
 
 private:
 	void* GetInternal();
 	list<void*> queue;
 	size_t capacity;
 	tgvoip_lock_t lock;
 	tgvoip_mutex_t mutex;
+	void (*overflowCallback)(void*);
 };
 
 

BufferInputStream.cpp

@@ -10,7 +10,7 @@
 #include <exception>
 #include <stdexcept>
 
-CBufferInputStream::CBufferInputStream(char* data, size_t length){
+CBufferInputStream::CBufferInputStream(unsigned char* data, size_t length){
 	this->buffer=data;
 	this->length=length;
 	offset=0;
@@ -22,7 +22,9 @@ CBufferInputStream::~CBufferInputStream(){
 
 
 void CBufferInputStream::Seek(size_t offset){
-	assert(offset<=length);
+	if(offset>length){
+		throw std::out_of_range("Not enough bytes in buffer");
+	}
 	this->offset=offset;
 }
 
@@ -88,7 +90,7 @@ int32_t CBufferInputStream::ReadTlLength(){
 	return res;
 }
 
-void CBufferInputStream::ReadBytes(char *to, size_t count){
+void CBufferInputStream::ReadBytes(unsigned char *to, size_t count){
 	EnsureEnoughRemaining(count);
 	memcpy(to, buffer+offset, count);
 	offset+=count;

BufferInputStream.h

@@ -13,7 +13,7 @@
 class CBufferInputStream{
 
 public:
-	CBufferInputStream(char* data, size_t length);
+	CBufferInputStream(unsigned char* data, size_t length);
 	~CBufferInputStream();
 	void Seek(size_t offset);
 	size_t GetLength();
@@ -24,11 +24,11 @@ class CBufferInputStream{
 	int32_t ReadInt32();
 	int16_t ReadInt16();
 	int32_t ReadTlLength();
-	void ReadBytes(char* to, size_t count);
+	void ReadBytes(unsigned char* to, size_t count);
 
 private:
 	void EnsureEnoughRemaining(size_t need);
-	char* buffer;
+	unsigned char* buffer;
 	size_t length;
 	size_t offset;
 };

BufferOutputStream.cpp

@@ -8,7 +8,7 @@
 #include <string.h>
 
 CBufferOutputStream::CBufferOutputStream(size_t size){
-	buffer=(char*) malloc(size);
+	buffer=(unsigned char*) malloc(size);
 	offset=0;
 	this->size=size;
 }
@@ -24,40 +24,40 @@ void CBufferOutputStream::WriteByte(unsigned char byte){
 
 void CBufferOutputStream::WriteInt32(int32_t i){
 	this->ExpandBufferIfNeeded(4);
-	buffer[offset+3]=(char)((i >> 24) & 0xFF);
-	buffer[offset+2]=(char)((i >> 16) & 0xFF);
-	buffer[offset+1]=(char)((i >> 8) & 0xFF);
-	buffer[offset]=(char)(i & 0xFF);
+	buffer[offset+3]=(unsigned char)((i >> 24) & 0xFF);
+	buffer[offset+2]=(unsigned char)((i >> 16) & 0xFF);
+	buffer[offset+1]=(unsigned char)((i >> 8) & 0xFF);
+	buffer[offset]=(unsigned char)(i & 0xFF);
 	offset+=4;
 }
 
 void CBufferOutputStream::WriteInt64(int64_t i){
 	this->ExpandBufferIfNeeded(8);
-	buffer[offset+7]=(char)((i >> 56) & 0xFF);
-	buffer[offset+6]=(char)((i >> 48) & 0xFF);
-	buffer[offset+5]=(char)((i >> 40) & 0xFF);
-	buffer[offset+4]=(char)((i >> 32) & 0xFF);
-	buffer[offset+3]=(char)((i >> 24) & 0xFF);
-	buffer[offset+2]=(char)((i >> 16) & 0xFF);
-	buffer[offset+1]=(char)((i >> 8) & 0xFF);
-	buffer[offset]=(char)(i & 0xFF);
+	buffer[offset+7]=(unsigned char)((i >> 56) & 0xFF);
+	buffer[offset+6]=(unsigned char)((i >> 48) & 0xFF);
+	buffer[offset+5]=(unsigned char)((i >> 40) & 0xFF);
+	buffer[offset+4]=(unsigned char)((i >> 32) & 0xFF);
+	buffer[offset+3]=(unsigned char)((i >> 24) & 0xFF);
+	buffer[offset+2]=(unsigned char)((i >> 16) & 0xFF);
+	buffer[offset+1]=(unsigned char)((i >> 8) & 0xFF);
+	buffer[offset]=(unsigned char)(i & 0xFF);
 	offset+=8;
 }
 
 void CBufferOutputStream::WriteInt16(int16_t i){
 	this->ExpandBufferIfNeeded(2);
-	buffer[offset+1]=(char)((i >> 8) & 0xFF);
-	buffer[offset]=(char)(i & 0xFF);
+	buffer[offset+1]=(unsigned char)((i >> 8) & 0xFF);
+	buffer[offset]=(unsigned char)(i & 0xFF);
 	offset+=2;
 }
 
-void CBufferOutputStream::WriteBytes(char *bytes, size_t count){
+void CBufferOutputStream::WriteBytes(unsigned char *bytes, size_t count){
 	this->ExpandBufferIfNeeded(count);
 	memcpy(buffer+offset, bytes, count);
 	offset+=count;
 }
 
-char *CBufferOutputStream::GetBuffer(){
+unsigned char *CBufferOutputStream::GetBuffer(){
 	return buffer;
 }
 
@@ -68,10 +68,10 @@ size_t CBufferOutputStream::GetLength(){
 void CBufferOutputStream::ExpandBufferIfNeeded(size_t need){
 	if(offset+need>size){
 		if(need<1024){
-			buffer=(char *) realloc(buffer, size+1024);
+			buffer=(unsigned char *) realloc(buffer, size+1024);
 			size+=1024;
 		}else{
-			buffer=(char *) realloc(buffer, size+need);
+			buffer=(unsigned char *) realloc(buffer, size+need);
 			size+=need;
 		}
 	}

BufferOutputStream.h

@@ -18,14 +18,14 @@ class CBufferOutputStream{
 	void WriteInt64(int64_t i);
 	void WriteInt32(int32_t i);
 	void WriteInt16(int16_t i);
-	void WriteBytes(char* bytes, size_t count);
-	char* GetBuffer();
+	void WriteBytes(unsigned char* bytes, size_t count);
+	unsigned char* GetBuffer();
 	size_t GetLength();
 	void Reset();
 
 private:
 	void ExpandBufferIfNeeded(size_t need);
-	char* buffer;
+	unsigned char* buffer;
 	size_t size;
 	size_t offset;
 };

CongestionControl.cpp

@@ -7,6 +7,7 @@
 #include "CongestionControl.h"
 #include "VoIPController.h"
 #include "logging.h"
+#include "VoIPServerConfig.h"
 #include <math.h>
 #include <assert.h>
 
@@ -26,7 +27,7 @@ CCongestionControl::CCongestionControl(){
 	stateTransitionTime=0;
 	inflightDataSize=0;
 	lossCount=0;
-	cwnd=1024;
+	cwnd=(size_t) CVoIPServerConfig::GetSharedInstance()->GetInt("audio_congestion_window", 1024);
 	init_mutex(mutex);
 }
 

CongestionControl.h

@@ -55,8 +55,8 @@ class CCongestionControl{
 	double stateTransitionTime;
 	int tmpRttCount;
 	char rttHistorySize;
-	char rttHistoryTop;
-	char inflightHistoryTop;
+	unsigned int rttHistoryTop;
+	unsigned int inflightHistoryTop;
 	uint32_t lastSentSeq;
 	uint32_t tickCount;
 	size_t inflightDataSize;