update ortp to fix conflict with gettimeofday defined both in ortp and

tunnel.
update documentation
This commit is contained in:
Simon Morlat 2013-11-07 14:32:53 +01:00
parent 062db87ed5
commit 6c4f1da92b
3 changed files with 3 additions and 7 deletions

View file

@ -65,10 +65,6 @@ WARNING: During the build, windows might slow down suddenly. Using ctl+alt+del t
you might see a process 'LVpSRV.exe' or something like this that eats 90% of cpu.
Kill it. Don't know what it is, but once killed, windows runs normally.
#Compile and install tunnel (optional, available under proprietary licensing)
cd tunnel && ./autogen.sh && ./configure --prefix=/usr --enable-shared --disable-static && make && make install
#Build linphone itself:
#run autogen.sh after a git checkout or update

View file

@ -528,7 +528,7 @@ int linphone_core_run_stun_tests(LinphoneCore *lc, LinphoneCall *call){
}
got_audio=FALSE;
got_video=FALSE;
gettimeofday(&init,NULL);
ortp_gettimeofday(&init,NULL);
do{
int id;
@ -561,7 +561,7 @@ int linphone_core_run_stun_tests(LinphoneCore *lc, LinphoneCall *call){
cone_video=TRUE;
got_video=TRUE;
}
gettimeofday(&cur,NULL);
ortp_gettimeofday(&cur,NULL);
elapsed=((cur.tv_sec-init.tv_sec)*1000.0) + ((cur.tv_usec-init.tv_usec)/1000.0);
if (elapsed>2000) {
ms_message("Stun responses timeout, going ahead.");

2
oRTP

@ -1 +1 @@
Subproject commit 120e58e2c12d608ecb7a2f0c4ae91768cb1862a0
Subproject commit b5d1414e63b21c83eb8e26988a3fe423ff8fc3b3