mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-01-23 06:08:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update submodules and rtp_transport behavior

Browse source
This commit is contained in:
Gautier Pelloux-Prayer 2014-09-05 14:46:06 +02:00
parent e5522d62ef
commit 06035f934d
4 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
coreapi/TunnelManager.cc
View file

@ -79,13 +79,16 @@ static void sCloseRtpTransport(RtpTransport *t, void *userData){
}
void TunnelManager::closeRtpTransport(RtpTransport *t, TunnelSocket *s){
mTunnelClient->closeSocket(s);
ms_free(t);
}
static RtpTransport *sCreateRtpTransport(void* userData, int port){
return ((TunnelManager *) userData)->createRtpTransport(port);
}
void sDestroyRtpTransport(RtpTransport *t){
ms_free(t);
}
RtpTransport *TunnelManager::createRtpTransport(int port){
TunnelSocket *socket=mTunnelClient->createSocket(port);
socket->setUserPointer(this);
@ -94,6 +97,7 @@ RtpTransport *TunnelManager::createRtpTransport(int port){
t->t_recvfrom=customRecvfrom;
t->t_sendto=customSendto;
t->t_close=sCloseRtpTransport;
t->t_destroy=sDestroyRtpTransport;
t->data=socket;
return t;
}

8
coreapi/linphonecall.c
View file

@ -1605,9 +1605,13 @@ void linphone_call_init_video_stream(LinphoneCall *call){
if (lc->rtptf){
RtpTransport *vrtp=lc->rtptf->video_rtp_func(lc->rtptf->video_rtp_func_data, call->media_ports[1].rtp_port);
RtpTransport *vrtcp=lc->rtptf->video_rtcp_func(lc->rtptf->video_rtcp_func_data, call->media_ports[1].rtcp_port);
rtp_session_set_transports(call->videostream->ms.sessions.rtp_session,vrtp,vrtcp);
RtpTransport *meta_rtp;
RtpTransport *meta_rtcp;
meta_rtp_transport_new(&meta_rtp,TRUE,vrtp, 0);
meta_rtp_transport_new(&meta_rtcp,FALSE,vrtcp, 0);
rtp_session_set_transports(call->videostream->ms.sessions.rtp_session,meta_rtp,meta_rtcp);
}
call->videostream_app_evq = ortp_ev_queue_new();
call->videostream_app_evq = ortp_ev_queue_new();
rtp_session_register_event_queue(call->videostream->ms.sessions.rtp_session,call->videostream_app_evq);
_linphone_call_prepare_ice_for_stream(call,1,FALSE);
#ifdef TEST_EXT_RENDERER

2
mediastreamer2

@ -1 +1 @@
Subproject commit 4d43eeedbcf715182325c27438106735593f4e8e
Subproject commit 73ee30b2f6dcf4ca752d0a26bef4c1415e4796d3

2
oRTP

@ -1 +1 @@
Subproject commit 509e86632b4a9544ff5d7ce57b66c89e3e384933
Subproject commit 6774293d236a3f02c9dd56f30f44055847de9c02