Changeset 4193 for pjproject

Timestamp:

Jul 3, 2012 7:51:53 AM (12 years ago)

Author:

ming

Message:

Re #1518: Add support for OpenSL ES audio device

Location:

pjproject/branches/projects/android/pjmedia

Files:

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

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
+                                 alsa_dev.o bb10_dev.o opensl_dev.o
 export PJMEDIA_AUDIODEV_CFLAGS += $(_CFLAGS)
 

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

@@ -56 +56 @@
 #       define PJMEDIA_AUDIO_DEV_HAS_PORTAUDIO  1
 #   endif
+#endif
+
+/**
+ * This setting controls whether Android OpenSL audio support should be
+ * included.
+ */
+#ifndef PJMEDIA_AUDIO_DEV_HAS_OPENSL
+#   define PJMEDIA_AUDIO_DEV_HAS_OPENSL         0
 #endif
 

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

@@ -79 +79 @@
 #endif
 
+#if PJMEDIA_AUDIO_DEV_HAS_OPENSL
+pjmedia_aud_dev_factory* pjmedia_opensl_factory(pj_pool_factory *pf);
+#endif
+
 #if PJMEDIA_AUDIO_DEV_HAS_BB10
 pjmedia_aud_dev_factory* pjmedia_bb10_factory(pj_pool_factory *pf);
@@ -392 +396 @@
 
     /* Register creation functions */
+#if PJMEDIA_AUDIO_DEV_HAS_OPENSL
+    aud_subsys.drv[aud_subsys.drv_cnt++].create = &pjmedia_opensl_factory;
+#endif
 #if PJMEDIA_AUDIO_DEV_HAS_BB10
     aud_subsys.drv[aud_subsys.drv_cnt++].create = &pjmedia_bb10_factory;