Changeset 3127 for pjproject/branches/projects/iphone

Timestamp:

Mar 30, 2010 10:55:01 AM (15 years ago)

Author:

ming

Message:

Implemented ticket #1051: Core audio device support for Mac and iPhone OS

Location:

pjproject/branches/projects/iphone/pjmedia

Files:

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

pjproject/branches/projects/iphone/pjmedia/build/Makefile

@@ -73 +73 @@
 export PJMEDIA_AUDIODEV_SRCDIR = ../src/pjmedia-audiodev
 export PJMEDIA_AUDIODEV_OBJS +=  audiodev.o audiotest.o errno.o \
-                                 legacy_dev.o null_dev.o pa_dev.o wmme_dev.o alsa_dev.o
+                                 coreaudio_dev.o legacy_dev.o null_dev.o pa_dev.o wmme_dev.o \
+                                 alsa_dev.o
 export PJMEDIA_AUDIODEV_CFLAGS += $(_CFLAGS)
 

pjproject/branches/projects/iphone/pjmedia/include/pjmedia-audiodev/audiodev.h

@@ -202 +202 @@
 
     /** Route to earpiece */
-    PJMEDIA_AUD_DEV_ROUTE_EARPIECE = 2
+    PJMEDIA_AUD_DEV_ROUTE_EARPIECE = 2,
+
+    /** Route to paired Bluetooth device */
+    PJMEDIA_AUD_DEV_ROUTE_BLUETOOTH = 4
 
 } pjmedia_aud_dev_route;

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

@@ -72 +72 @@
 #ifndef PJMEDIA_AUDIO_DEV_HAS_NULL_AUDIO
 #   define PJMEDIA_AUDIO_DEV_HAS_NULL_AUDIO     0
+#endif
+
+
+/**
+ * This setting controls whether coreaudio support should be included.
+ */
+#ifndef PJMEDIA_AUDIO_DEV_HAS_COREAUDIO
+#   define PJMEDIA_AUDIO_DEV_HAS_COREAUDIO      1
 #endif
 

pjproject/branches/projects/iphone/pjmedia/include/pjmedia-audiodev/errno.h

@@ -90 +90 @@
             ((int)PJMEDIA_AUDIODEV_WMME_OUT_ERROR_START+err)
 
+
+/**
+ * Mapping from CoreAudio error codes to pjmedia error space.
+ */
+#define PJMEDIA_AUDIODEV_COREAUDIO_ERRNO_START \
+            (PJMEDIA_AUDIODEV_ERRNO_START+20000)
+#define PJMEDIA_AUDIODEV_COREAUDIO_ERRNO_END   \
+            (PJMEDIA_AUDIODEV_COREAUDIO_ERRNO_START + 20000 -1)
+/**
+ * Convert CoreAudio error code to PJLIB error code.
+ * CoreAudio error code range: 0 >= err >= -10000
+ */
+#define PJMEDIA_AUDIODEV_ERRNO_FROM_COREAUDIO(err) \
+            ((int)PJMEDIA_AUDIODEV_COREAUDIO_ERRNO_START-err)
 
 /************************************************************

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

@@ -71 +71 @@
 #endif
 
+#if PJMEDIA_AUDIO_DEV_HAS_COREAUDIO
+pjmedia_aud_dev_factory* pjmedia_coreaudio_factory(pj_pool_factory *pf);
+#endif
+
 #if PJMEDIA_AUDIO_DEV_HAS_ALSA
 pjmedia_aud_dev_factory* pjmedia_alsa_factory(pj_pool_factory *pf);
@@ -379 +383 @@
 #if PJMEDIA_AUDIO_DEV_HAS_ALSA
     aud_subsys.drv[aud_subsys.drv_cnt++].create = &pjmedia_alsa_factory;
+#endif
+#if PJMEDIA_AUDIO_DEV_HAS_COREAUDIO
+    aud_subsys.drv[aud_subsys.drv_cnt++].create = &pjmedia_coreaudio_factory;
 #endif
 #if PJMEDIA_AUDIO_DEV_HAS_PORTAUDIO

pjproject/branches/projects/iphone/pjmedia/src/pjmedia-audiodev/errno.c

@@ -76 +76 @@
 #if defined(PJ_HAS_ERROR_STRING) && (PJ_HAS_ERROR_STRING != 0)
 
+
+    /* See if the error comes from Core Audio. */
+#if PJMEDIA_AUDIO_DEV_HAS_COREAUDIO
+    if (statcode >= PJMEDIA_AUDIODEV_COREAUDIO_ERRNO_START &&
+        statcode <= PJMEDIA_AUDIODEV_COREAUDIO_ERRNO_END)
+    {
+        int ca_err = PJMEDIA_AUDIODEV_COREAUDIO_ERRNO_START - statcode;
+
+        PJ_UNUSED_ARG(ca_err);
+        // TODO: create more helpful error messages
+        errstr.ptr = buf;
+        pj_strcpy2(&errstr, "Core audio error");
+        return errstr;
+    } else
+#endif
+
     /* See if the error comes from PortAudio. */
 #if PJMEDIA_AUDIO_DEV_HAS_PORTAUDIO