Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
L
libjitsi
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Analyze
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
ZRTP
libjitsi
Commits
52ade675
Commit
52ade675
authored
12 years ago
by
Lyubomir Marinov
Browse files
Options
Downloads
Patches
Plain Diff
Provides compatibility with r [dx] UNEXPECTED TOP-LEVEL EXCEPTION:
parent
55e9514a
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/native/jawtrenderer/JAWTRenderer.h
+11
-3
11 additions, 3 deletions
src/native/jawtrenderer/JAWTRenderer.h
src/native/jawtrenderer/org_jitsi_impl_neomedia_jmfext_media_renderer_video_JAWTRenderer.c
+4
-0
4 additions, 0 deletions
..._impl_neomedia_jmfext_media_renderer_video_JAWTRenderer.c
with
15 additions
and
3 deletions
src/native/jawtrenderer/JAWTRenderer.h
+
11
−
3
View file @
52ade675
...
@@ -8,12 +8,20 @@
...
@@ -8,12 +8,20 @@
#ifndef _JAWTRENDERER_H_
#ifndef _JAWTRENDERER_H_
#define _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>
#include
<jni.h>
#ifndef NULL
#define NULL 0
#endif
/* #ifndef NULL */
#ifdef __cplusplus
#ifdef __cplusplus
extern
"C"
{
extern
"C"
{
#endif
#endif
/* #ifdef __cplusplus */
void
JAWTRenderer_close
void
JAWTRenderer_close
(
JNIEnv
*
env
,
jclass
clazz
,
jlong
handle
,
jobject
component
);
(
JNIEnv
*
env
,
jclass
clazz
,
jlong
handle
,
jobject
component
);
...
@@ -31,6 +39,6 @@ jstring JAWTRenderer_sysctlbyname(JNIEnv *env, jstring name);
...
@@ -31,6 +39,6 @@ jstring JAWTRenderer_sysctlbyname(JNIEnv *env, jstring name);
#ifdef __cplusplus
#ifdef __cplusplus
}
/* extern "C" { */
}
/* extern "C" { */
#endif
#endif
/* #ifdef __cplusplus */
#endif
/* _JAWTRENDERER_H_ */
#endif
/* _JAWTRENDERER_H_ */
This diff is collapsed.
Click to expand it.
src/native/jawtrenderer/org_jitsi_impl_neomedia_jmfext_media_renderer_video_JAWTRenderer.c
+
4
−
0
View file @
52ade675
...
@@ -27,6 +27,9 @@ Java_org_jitsi_impl_neomedia_jmfext_media_renderer_video_JAWTRenderer_paint
...
@@ -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
,
(
JNIEnv
*
env
,
jclass
clazz
,
jlong
handle
,
jobject
component
,
jobject
g
,
jint
zOrder
)
jint
zOrder
)
{
{
#ifdef __ANDROID__
return
JAWTRenderer_paint
(
0
,
NULL
,
clazz
,
handle
,
g
,
zOrder
);
#else
/* #ifdef __ANDROID__ */
JAWT
awt
;
JAWT
awt
;
jboolean
awtIsAvailable
;
jboolean
awtIsAvailable
;
jboolean
wantsPaint
;
jboolean
wantsPaint
;
...
@@ -93,6 +96,7 @@ Java_org_jitsi_impl_neomedia_jmfext_media_renderer_video_JAWTRenderer_paint
...
@@ -93,6 +96,7 @@ Java_org_jitsi_impl_neomedia_jmfext_media_renderer_video_JAWTRenderer_paint
}
}
}
}
return
wantsPaint
;
return
wantsPaint
;
#endif
/* #ifdef __ANDROID__ */
}
}
JNIEXPORT
jboolean
JNICALL
JNIEXPORT
jboolean
JNICALL
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment