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

Merge remote-tracking branch 'remotes/upstream/master'

Browse source
This commit is contained in:
Yann Diorcet 2012-03-26 12:56:49 +02:00
commit 386d4008ae
6 changed files with 2049 additions and 2039 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
coreapi/linphonecall.c
View file

@ -898,17 +898,21 @@ void linphone_call_init_media_streams(LinphoneCall *call){
#ifdef VIDEO_ENABLED
if ((lc->video_conf.display || lc->video_conf.capture) && md->streams[1].port>0){
int video_recv_buf_size=lp_config_get_int(lc->config,"video","recv_buf_size",0);
call->videostream=video_stream_new(md->streams[1].port,linphone_core_ipv6_enabled(lc));
if( lc->video_conf.displaytype != NULL)
video_stream_set_display_filter_name(call->videostream,lc->video_conf.displaytype);
video_stream_set_event_callback(call->videostream,video_stream_event_cb, call);
if (lc->rtptf){
RtpTransport *vrtp=lc->rtptf->video_rtp_func(lc->rtptf->video_rtp_func_data, call->video_port);
RtpTransport *vrtcp=lc->rtptf->video_rtcp_func(lc->rtptf->video_rtcp_func_data, call->video_port+1);
rtp_session_set_transports(call->videostream->session,vrtp,vrtcp);
}
call->videostream_app_evq = ortp_ev_queue_new();
rtp_session_register_event_queue(call->videostream->session,call->videostream_app_evq);
video_stream_enable_display_filter_auto_rotate(call->videostream, lp_config_get_int(lc->config,"video","display_filter_auto_rotate",0));
if (video_recv_buf_size>0) rtp_session_set_recv_buf_size(call->videostream->session,video_recv_buf_size);
if( lc->video_conf.displaytype != NULL)
video_stream_set_display_filter_name(call->videostream,lc->video_conf.displaytype);
video_stream_set_event_callback(call->videostream,video_stream_event_cb, call);
if (lc->rtptf){
RtpTransport *vrtp=lc->rtptf->video_rtp_func(lc->rtptf->video_rtp_func_data, call->video_port);
RtpTransport *vrtcp=lc->rtptf->video_rtcp_func(lc->rtptf->video_rtcp_func_data, call->video_port+1);
rtp_session_set_transports(call->videostream->session,vrtp,vrtcp);
}
call->videostream_app_evq = ortp_ev_queue_new();
rtp_session_register_event_queue(call->videostream->session,call->videostream_app_evq);
#ifdef TEST_EXT_RENDERER
video_stream_set_render_callback(call->videostream,rendercb,NULL);
#endif

4
coreapi/linphonecore_jni.cc
View file

@ -1705,3 +1705,7 @@ extern "C" void Java_org_linphone_core_LinphoneCoreImpl_setVideoPolicy(JNIEnv *e
vpol.automatically_accept = autoAccept;
linphone_core_set_video_policy((LinphoneCore *)lc, &vpol);
}
extern "C" void Java_org_linphone_core_LinphoneCoreImpl_setCpuCountNative(JNIEnv *env, jobject thiz, jint count) {
ms_set_cpu_count(count);
}

2
java/common/org/linphone/core/LinphoneCore.java
View file

@ -761,4 +761,6 @@ public interface LinphoneCore {
void setVideoPolicy(boolean autoInitiate, boolean autoAccept);
void setUserAgent(String name, String version);
void setCpuCount(int count);
}

2
mediastreamer2

@ -1 +1 @@
Subproject commit 902cd8d36daef0913ac235b283668e5b3dbda515
Subproject commit 33599a544a23878604cd42a769c1044d599c1347

2
oRTP

@ -1 +1 @@
Subproject commit d62fa221ed9d373427f1fda9bdbfc301f25a5141
Subproject commit 3fb614e2ed15803f2c96c223cceb5545a60f2431

4054
po/es.po
View file

File diff suppressed because it is too large Load diff