Skip to content
GitLab
Explore
Projects
Groups
Topics
Snippets
Projects
Groups
Topics
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
BC
public
liblinphone
Commits
5732fcea
Commit
5732fcea
authored
13 years ago
by
jehan
Browse files
Options
Download
Patches
Plain Diff
g729 integration for Android
parent
f1933983
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
build/android/Android.mk
+6
-0
build/android/Android.mk
coreapi/linphonecore_jni.cc
+6
-0
coreapi/linphonecore_jni.cc
with
12 additions
and
0 deletions
build/android/Android.mk
+
6
−
0
View file @
5732fcea
...
...
@@ -132,6 +132,12 @@ LOCAL_CFLAGS += -DHAVE_SILK
LOCAL_STATIC_LIBRARIES
+=
libmssilk
endif
ifeq
($(BUILD_G729),1)
LOCAL_CFLAGS
+=
-DHAVE_G729
LOCAL_SHARED_LIBRARIES
+=
libbcg729
LOCAL_STATIC_LIBRARIES
+=
libmsbcg729
endif
ifeq
($(LINPHONE_VIDEO),1)
LOCAL_LDLIBS
+=
-lGLESv2
LOCAL_STATIC_LIBRARIES
+=
libvpx
...
...
This diff is collapsed.
Click to expand it.
coreapi/linphonecore_jni.cc
+
6
−
0
View file @
5732fcea
...
...
@@ -43,6 +43,9 @@ extern "C" void libmsamr_init();
#ifdef HAVE_SILK
extern
"C"
void
libmssilk_init
();
#endif
#ifdef HAVE_G729
extern
"C"
void
libmsbcg729_init
();
#endif
#endif
/*ANDROID*/
static
JavaVM
*
jvm
=
0
;
...
...
@@ -415,6 +418,9 @@ extern "C" jlong Java_org_linphone_core_LinphoneCoreImpl_newLinphoneCore(JNIEnv*
#endif
#ifdef HAVE_SILK
libmssilk_init
();
#endif
#ifdef HAVE_G729
libmsbcg729_init
();
#endif
jlong
nativePtr
=
(
jlong
)
linphone_core_new
(
&
ldata
->
vTable
,
userConfig
...
...
This diff is collapsed.
Click to expand it.
Preview
Supports
Markdown
0%
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
Menu
Explore
Projects
Groups
Topics
Snippets