Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-07-24 15:05:35 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

updated VoIP to use new Fast packet sending.

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-initdev@6792 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob 2013-10-03 13:15:10 +00:00
parent 2466c01e35
commit 90b4a20e5d
3 changed files with 34 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

2
plugins/VOIP/gui/SpeexProcessor.h
View file

@ -22,7 +22,7 @@
#define SAMPLING_RATE 16000 //must be the same as the speex setted mode (speex_wb_mode) #define SAMPLING_RATE 16000 //must be the same as the speex setted mode (speex_wb_mode)
#define FRAME_SIZE 320 //must be the same as the speex setted mode (speex_wb_mode) #define FRAME_SIZE 320 //must be the same as the speex setted mode (speex_wb_mode)
#define ECHOTAILSIZE 25 #define ECHOTAILSIZE 10
class SpeexBits; class SpeexBits;

28
plugins/VOIP/services/p3vors.cc
View file

@ -168,7 +168,7 @@ int p3VoRS::tick()
std::cerr << "ticking p3VoRS" << std::endl; std::cerr << "ticking p3VoRS" << std::endl;
#endif #endif
processIncoming(); //processIncoming();
sendPackets(); sendPackets();
return 0; return 0;
@ -393,34 +393,37 @@ bool p3VoRS::getIncomingData(const std::string& peer_id,std::vector<RsVoipDataCh
return true ; return true ;
} }
int p3VoRS::processIncoming() bool p3VoRS::recvItem(RsItem *item)
{ {
/* for each packet - pass to specific handler */ /* pass to specific handler */
RsItem *item = NULL;
while(NULL != (item = recvItem()))
{
bool keep = false ; bool keep = false ;
switch(item->PacketSubType()) switch(item->PacketSubType())
{ {
case RS_PKT_SUBTYPE_VOIP_PING: handlePing(dynamic_cast<RsVoipPingItem*>(item)); case RS_PKT_SUBTYPE_VOIP_PING:
handlePing(dynamic_cast<RsVoipPingItem*>(item));
break; break;
case RS_PKT_SUBTYPE_VOIP_PONG: handlePong(dynamic_cast<RsVoipPongItem*>(item)); case RS_PKT_SUBTYPE_VOIP_PONG:
handlePong(dynamic_cast<RsVoipPongItem*>(item));
break; break;
case RS_PKT_SUBTYPE_VOIP_PROTOCOL: handleProtocol(dynamic_cast<RsVoipProtocolItem*>(item)) ; case RS_PKT_SUBTYPE_VOIP_PROTOCOL:
handleProtocol(dynamic_cast<RsVoipProtocolItem*>(item)) ;
break ; break ;
case RS_PKT_SUBTYPE_VOIP_DATA: handleData(dynamic_cast<RsVoipDataItem*>(item)); case RS_PKT_SUBTYPE_VOIP_DATA:
handleData(dynamic_cast<RsVoipDataItem*>(item));
keep = true ; keep = true ;
break; break;
#if 0 #if 0
/* THESE ARE ALL FUTURISTIC DATA TYPES */ /* THESE ARE ALL FUTURISTIC DATA TYPES */
case RS_BANDWIDTH_PING_ITEM: handleBandwidthPing(item); case RS_BANDWIDTH_PING_ITEM:
handleBandwidthPing(item);
break; break;
case RS_BANDWIDTH_PONG_ITEM: handleBandwidthPong(item); case RS_BANDWIDTH_PONG_ITEM:
handleBandwidthPong(item);
break; break;
#endif #endif
default: default:
@ -430,7 +433,6 @@ int p3VoRS::processIncoming()
/* clean up */ /* clean up */
if(!keep) if(!keep)
delete item; delete item;
}
return true ; return true ;
} }

3
plugins/VOIP/services/p3vors.h
View file

@ -99,6 +99,7 @@ class p3VoRS: public RsPQIService, public RsVoip
*/ */
virtual int tick(); virtual int tick();
virtual int status(); virtual int status();
virtual bool recvItem(RsItem *item);
/*************** pqiMonitor callback ***********************/ /*************** pqiMonitor callback ***********************/
//virtual void statusChange(const std::list<pqipeer> &plist); //virtual void statusChange(const std::list<pqipeer> &plist);
@ -130,7 +131,7 @@ class p3VoRS: public RsPQIService, public RsVoip
private: private:
int sendPackets(); int sendPackets();
void sendPingMeasurements(); void sendPingMeasurements();
int processIncoming(); //int processIncoming();
int handlePing(RsVoipPingItem *item); int handlePing(RsVoipPingItem *item);
int handlePong(RsVoipPongItem *item); int handlePong(RsVoipPongItem *item);