From 52ade6752e038c8dc115dec5233bc87ae564964e Mon Sep 17 00:00:00 2001
From: Lyubomir Marinov <lyubomir.marinov@jitsi.org>
Date: Wed, 16 Jan 2013 09:39:36 +0000
Subject: [PATCH] Provides compatibility with r [dx] UNEXPECTED TOP-LEVEL
EXCEPTION:
---
src/native/jawtrenderer/JAWTRenderer.h | 14 +++++++++++---
...edia_jmfext_media_renderer_video_JAWTRenderer.c | 4 ++++
2 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/src/native/jawtrenderer/JAWTRenderer.h b/src/native/jawtrenderer/JAWTRenderer.h
index a5105e9e..53eb8b92 100644
--- a/src/native/jawtrenderer/JAWTRenderer.h
+++ b/src/native/jawtrenderer/JAWTRenderer.h
@@ -8,12 +8,20 @@
#ifndef _JAWTRENDERER_H_
#define _JAWTRENDERER_H_
-#include <jawt.h>
+#ifndef __ANDROID__
+ #include <jawt.h>
+#else /* #ifndef __ANDROID__ */
+ typedef void JAWT_DrawingSurfaceInfo;
+#endif /* #ifndef __ANDROID__ */
#include <jni.h>
+#ifndef NULL
+#define NULL 0
+#endif /* #ifndef NULL */
+
#ifdef __cplusplus
extern "C" {
-#endif
+#endif /* #ifdef __cplusplus */
void JAWTRenderer_close
(JNIEnv *env, jclass clazz, jlong handle, jobject component);
@@ -31,6 +39,6 @@ jstring JAWTRenderer_sysctlbyname(JNIEnv *env, jstring name);
#ifdef __cplusplus
} /* extern "C" { */
-#endif
+#endif /* #ifdef __cplusplus */
#endif /* _JAWTRENDERER_H_ */
diff --git a/src/native/jawtrenderer/org_jitsi_impl_neomedia_jmfext_media_renderer_video_JAWTRenderer.c b/src/native/jawtrenderer/org_jitsi_impl_neomedia_jmfext_media_renderer_video_JAWTRenderer.c
index 236350e2..671f2ab5 100644
--- a/src/native/jawtrenderer/org_jitsi_impl_neomedia_jmfext_media_renderer_video_JAWTRenderer.c
+++ b/src/native/jawtrenderer/org_jitsi_impl_neomedia_jmfext_media_renderer_video_JAWTRenderer.c
@@ -27,6 +27,9 @@ Java_org_jitsi_impl_neomedia_jmfext_media_renderer_video_JAWTRenderer_paint
(JNIEnv *env, jclass clazz, jlong handle, jobject component, jobject g,
jint zOrder)
{
+#ifdef __ANDROID__
+ return JAWTRenderer_paint(0, NULL, clazz, handle, g, zOrder);
+#else /* #ifdef __ANDROID__ */
JAWT awt;
jboolean awtIsAvailable;
jboolean wantsPaint;
@@ -93,6 +96,7 @@ Java_org_jitsi_impl_neomedia_jmfext_media_renderer_video_JAWTRenderer_paint
}
}
return wantsPaint;
+#endif /* #ifdef __ANDROID__ */
}
JNIEXPORT jboolean JNICALL
--
GitLab