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

Added LinphoneCall's setVideoWindowId method in JNI wrapper

Browse source
This commit is contained in:
Sylvain Berfini 2017-08-21 13:42:50 +02:00
parent 78824b02a9
commit 1b78b453c1
3 changed files with 30 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
coreapi/linphonecore_jni.cc
View file

@ -7846,6 +7846,21 @@ JNIEXPORT void JNICALL Java_org_linphone_core_LinphoneCallImpl_setListener(JNIEn
linphone_call_set_next_video_frame_decoded_callback(call, _next_video_frame_decoded_callback, listener);
}
extern "C" void Java_org_linphone_core_LinphoneCallImpl_setVideoWindowId(JNIEnv* env
,jobject thiz
,jlong lc
,jobject obj) {
jobject oldWindow = (jobject) linphone_call_get_native_video_window_id((LinphoneCall*)lc);
if (obj != NULL) {
obj = env->NewGlobalRef(obj);
ms_message("Java_org_linphone_core_LinphoneCallImpl_setVideoWindowId(): NewGlobalRef(%p)",obj);
}else ms_message("Java_org_linphone_core_LinphoneCallImpl_setVideoWindowId(): setting to NULL");
linphone_call_set_native_video_window_id((LinphoneCall*)lc,(void *)obj);
if (oldWindow != NULL) {
ms_message("Java_org_linphone_core_LinphoneCallImpl_setVideoWindowId(): DeleteGlobalRef(%p)",oldWindow);
env->DeleteGlobalRef(oldWindow);
}
}
/*
* returns the java TunnelConfig associated with a C LinphoneTunnelConfig.

9
java/common/org/linphone/core/LinphoneCall.java
View file

@ -20,6 +20,8 @@ package org.linphone.core;
import java.util.Vector;
import org.linphone.mediastream.video.AndroidVideoWindowImpl;
/**
* Object representing a call. Calls are created using {@link LinphoneCore#invite(LinphoneAddress)} or passed to the application by listener {@link LinphoneCoreListener#callState}
*
@ -404,6 +406,13 @@ public interface LinphoneCall {
*/
void setListener(LinphoneCall.LinphoneCallListener listener);
/**
* Set the native video window id where the video is to be displayed.
* On Android, it must be of type {@link AndroidVideoWindowImpl}
* @param w window of type {@link AndroidVideoWindowImpl}
*/
void setVideoWindow(Object w);
/**
* Indicates if remote party requested automatic answering to be performed.
* This is an indication - the application remains responsible for answering the call.

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

@ -45,6 +45,7 @@ class LinphoneCallImpl implements LinphoneCall {
private native float getAverageQuality(long nativePtr);
private native boolean mediaInProgress(long nativePtr);
private native void setListener(long ptr, LinphoneCallListener listener);
private native void setVideoWindowId(long nativePtr, Object wid);
native private long getDiversionAddress(long nativePtr);
native private Object getStats(long nativePtr, int stream_type);
native private LinphoneCore getCore(long nativePtr);
@ -295,6 +296,11 @@ class LinphoneCallImpl implements LinphoneCall {
setListener(nativePtr, listener);
}
}
@Override
public synchronized void setVideoWindow(Object w) {
setVideoWindowId(nativePtr, w);
}
public LinphoneAddress getDiversionAddress() {
long lNativePtr = getDiversionAddress(nativePtr);