Changeset 4231

Timestamp:

Aug 15, 2012 7:58:46 AM (12 years ago)

Author:

ming

Message:

Re #1518: Add JNI-based Android audio device

Location:

pjproject/branches/projects/android

Files:

• pjlib/include/pj/config_site_sample.h (modified) (1 diff)
• pjmedia/build/Makefile (modified) (1 diff)
• pjmedia/include/pjmedia-audiodev/config.h (modified) (1 diff)
• pjmedia/src/pjmedia-audiodev/android_jni_dev.c (added)
• pjmedia/src/pjmedia-audiodev/audiodev.c (modified) (2 diffs)

pjproject/branches/projects/android/pjlib/include/pj/config_site_sample.h

@@ -382 +382 @@
     #define PJMEDIA_AUDIO_DEV_HAS_WMME          0
     #define PJMEDIA_AUDIO_DEV_HAS_OPENSL        1
+    #define PJMEDIA_AUDIO_DEV_HAS_ANDROID_JNI   0
 
     /* Disable some codecs */

pjproject/branches/projects/android/pjmedia/build/Makefile

@@ -82 +82 @@
 export PJMEDIA_AUDIODEV_OBJS +=  audiodev.o audiotest.o errno.o \
                                  coreaudio_dev.o legacy_dev.o null_dev.o pa_dev.o wmme_dev.o \
-                                 alsa_dev.o bb10_dev.o opensl_dev.o
+                                 alsa_dev.o bb10_dev.o android_jni_dev.o opensl_dev.o
 export PJMEDIA_AUDIODEV_CFLAGS += $(_CFLAGS)
 

pjproject/branches/projects/android/pjmedia/include/pjmedia-audiodev/config.h

@@ -64 +64 @@
 #ifndef PJMEDIA_AUDIO_DEV_HAS_OPENSL
 #   define PJMEDIA_AUDIO_DEV_HAS_OPENSL         0
+#endif
+
+/**
+ * This setting controls whether Android JNI audio support should be
+ * included.
+ */
+#ifndef PJMEDIA_AUDIO_DEV_HAS_ANDROID_JNI
+#   define PJMEDIA_AUDIO_DEV_HAS_ANDROID_JNI    0
 #endif
 

pjproject/branches/projects/android/pjmedia/src/pjmedia-audiodev/audiodev.c

@@ -83 +83 @@
 #endif
 
+#if PJMEDIA_AUDIO_DEV_HAS_ANDROID_JNI
+pjmedia_aud_dev_factory* pjmedia_android_factory(pj_pool_factory *pf);
+#endif
+
 #if PJMEDIA_AUDIO_DEV_HAS_BB10
 pjmedia_aud_dev_factory* pjmedia_bb10_factory(pj_pool_factory *pf);
@@ -398 +402 @@
 #if PJMEDIA_AUDIO_DEV_HAS_OPENSL
     aud_subsys.drv[aud_subsys.drv_cnt++].create = &pjmedia_opensl_factory;
+#endif
+#if PJMEDIA_AUDIO_DEV_HAS_ANDROID_JNI
+    aud_subsys.drv[aud_subsys.drv_cnt++].create = &pjmedia_android_factory;
 #endif
 #if PJMEDIA_AUDIO_DEV_HAS_BB10