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

Implement linphone_core_set_video_preset().

Browse source
This commit is contained in:
Ghislain MARY 2015-06-11 09:41:56 +02:00
parent 8669032383
commit 278bf66e33
8 changed files with 32 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
coreapi/linphonecall.c
View file

@ -2745,6 +2745,7 @@ static void linphone_call_start_video_stream(LinphoneCall *call, bool_t all_inpu
if (is_multicast)
rtp_session_set_multicast_ttl(call->videostream->ms.sessions.rtp_session,vstream->ttl);
video_stream_use_video_preset(call->videostream, lp_config_get_string(lc->config, "video", "preset", NULL));
if( lc->video_conf.reuse_preview_source && source ){
ms_message("video_stream_start_with_source kept: %p", source);
video_stream_start_with_source(call->videostream,

4
coreapi/linphonecore.c
View file

@ -7370,6 +7370,10 @@ bool_t linphone_core_video_multicast_enabled(const LinphoneCore *lc) {
return lc->rtp_conf.video_multicast_enabled;
}
void linphone_core_set_video_preset(LinphoneCore *lc, const char *preset) {
lp_config_set_string(lc->config, "video", "preset", NULL);
}
#ifdef ANDROID
static int linphone_core_call_void_method(jobject obj, jmethodID id) {
JNIEnv *env=ms_get_jni_env();

7
coreapi/linphonecore.h
View file

@ -3521,6 +3521,13 @@ LINPHONE_PUBLIC int linphone_core_set_network_simulator_params(LinphoneCore *lc,
**/
LINPHONE_PUBLIC const OrtpNetworkSimulatorParams *linphone_core_get_network_simulator_params(const LinphoneCore *lc);
/**
* Set the video preset to be used for video calls.
* @param[in] lc LinphoneCore object
* @param[in] preset The name of the video preset to be used (can be NULL to use the default video preset).
*/
LINPHONE_PUBLIC void linphone_core_set_video_preset(LinphoneCore *lc, const char *preset);
#ifdef __cplusplus
}
#endif

6
coreapi/linphonecore_jni.cc
View file

@ -6215,3 +6215,9 @@ JNIEXPORT void JNICALL Java_org_linphone_core_LinphoneCoreImpl_enableDnsSrv(JNIE
JNIEXPORT jboolean JNICALL Java_org_linphone_core_LinphoneCoreImpl_dnsSrvEnabled(JNIEnv *env, jobject thiz, jlong lc) {
return linphone_core_dns_srv_enabled((LinphoneCore *)lc);
}
JNIEXPORT void JNICALL Java_org_linphone_core_LinphoneCoreImpl_setVideoPreset(JNIEnv *env, jobject thiz, jlong lc, jstring preset) {
const char *char_preset = preset ? env->GetStringUTFChars(preset, NULL) : NULL;
linphone_core_set_video_preset((LinphoneCore *)lc, char_preset);
if (char_preset) env->ReleaseStringUTFChars(preset, char_preset);
}

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

@ -2035,4 +2035,10 @@ public interface LinphoneCore {
*/
public boolean dnsSrvEnabled();
/**
* Set the video preset to be used for video calls.
* @param lc LinphoneCore object
* @param preset The name of the video preset to be used (can be null to use the default video preset).
*/
public void setVideoPreset(String preset);
}

6
java/impl/org/linphone/core/LinphoneCoreImpl.java
View file

@ -1479,4 +1479,10 @@ class LinphoneCoreImpl implements LinphoneCore {
public boolean dnsSrvEnabled() {
return dnsSrvEnabled(nativePtr);
}
private native void setVideoPreset(long nativePtr, String preset);
@Override
public void setVideoPreset(String preset) {
setVideoPreset(nativePtr, preset);
}
}

2
mediastreamer2

@ -1 +1 @@
Subproject commit 2bf2780d900bba2cff6c9819bd9ef3bb05d39adf
Subproject commit 4b3211ea7aa00acf1bc4f6f46180fa4d59d100a0

2
oRTP

@ -1 +1 @@
Subproject commit 6e619ac1ffc23a83c56b69a39d0bb0593fe10f68
Subproject commit 74a48864b37726c6e93ca3d32894046ac2321199