Commit 14cb05ee authored by jehan's avatar jehan
Browse files

Merge branch 'master' of git.savannah.nongnu.org:/srv/git/linphone

parents 044ddc63 c8f4f8f2
......@@ -881,7 +881,7 @@ int linphone_core_get_download_ptime(LinphoneCore *lc) {
*
**/
void linphone_core_set_upload_ptime(LinphoneCore *lc, int ptime){
lp_config_set_int(lc->config,"rtp","up_ptime",ptime);
lp_config_set_int(lc->config,"rtp","upload_ptime",ptime);
}
/**
......@@ -890,7 +890,7 @@ void linphone_core_set_upload_ptime(LinphoneCore *lc, int ptime){
*
**/
int linphone_core_get_upload_ptime(LinphoneCore *lc){
return lp_config_get_int(lc->config,"rtp","up_ptime",0);
return lp_config_get_int(lc->config,"rtp","upload_ptime",0);
}
......
......@@ -1206,6 +1206,15 @@ extern "C" void Java_org_linphone_core_LinphoneCoreImpl_setDownloadBandwidth(JNI
extern "C" void Java_org_linphone_core_LinphoneCoreImpl_setUploadBandwidth(JNIEnv *env, jobject thiz, jlong lc, jint bw){
linphone_core_set_upload_bandwidth((LinphoneCore *)lc, (int) bw);
}
extern "C" void Java_org_linphone_core_LinphoneCoreImpl_setDownloadPtime(JNIEnv *env, jobject thiz, jlong lc, jint ptime){
linphone_core_set_download_ptime((LinphoneCore *)lc, (int) ptime);
}
extern "C" void Java_org_linphone_core_LinphoneCoreImpl_setUploadPtime(JNIEnv *env, jobject thiz, jlong lc, jint ptime){
linphone_core_set_upload_ptime((LinphoneCore *)lc, (int) ptime);
}
extern "C" int Java_org_linphone_core_LinphoneProxyConfigImpl_getState(JNIEnv* env,jobject thiz,jlong ptr) {
return (int) linphone_proxy_config_get_state((const LinphoneProxyConfig *) ptr);
}
......
......@@ -250,7 +250,6 @@ LinphoneSoundDaemon * linphone_sound_daemon_new(const char *cardname, int rate,
lsd_player_init(&lsd->branches[0],mp,MS_ITC_SOURCE_ID,lsd);
ms_filter_set_notify_callback(lsd->branches[0].player,(MSFilterNotifyFunc)lsd_player_configure,&lsd->branches[0]);
ms_filter_enable_synchronous_notifcations (lsd->branches[0].player,TRUE);
for(i=1;i<MAX_BRANCHES;++i){
mp.pin=i;
lsd_player_init(&lsd->branches[i],mp,MS_FILE_PLAYER_ID,lsd);
......
......@@ -836,7 +836,7 @@ void sal_op_cancel_authentication(SalOp *h) {
static void set_network_origin(SalOp *op, osip_message_t *req){
const char *received=NULL;
int rport=5060;
char origin[64];
char origin[64]={0};
SalTransport transport;
if (extract_received_rport(req,&received,&rport,&transport)!=0){
osip_via_t *via=NULL;
......@@ -1020,7 +1020,8 @@ static void update_contact_from_response(SalOp *op, osip_message_t *response){
char *tmp;
sal_address_set_domain(addr,received);
sal_address_set_port_int(addr,rport);
sal_address_set_transport(addr,transport);
if (transport!=SalTransportUDP)
sal_address_set_transport(addr,transport);
tmp=sal_address_as_string(addr);
ms_message("Contact address updated to %s",tmp);
sal_op_set_contact(op,tmp);
......
......@@ -531,6 +531,18 @@ public interface LinphoneCore {
void setUploadBandwidth(int bw);
void setDownloadBandwidth(int bw);
/**
* Sets audio packetization interval suggested for remote end.
* @param ptime packetization interval in milliseconds
*/
void setDownloadPtime(int ptime);
/**
* Sets audio packetization interval sent to remote end.
* @param ptime packetization interval in milliseconds
*/
void setUploadPtime(int ptime);
void setPreferredVideoSize(VideoSize vSize);
......
mediastreamer2 @ 1e18ab2f
Subproject commit 07d1b02eb57b7fc5cc8e4821c6485df2f138906e
Subproject commit 1e18ab2f4bf3ad6e8cac65b7bc9643ed3b80f455
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment