Changeset 4432

Timestamp:

Mar 8, 2013 8:02:48 AM (12 years ago)

Author:

riza

Message:

Re #1636: add initial support for bdIMAD

Location:

pjproject/trunk

Files:

• pjmedia/build/Makefile (modified) (1 diff)
• pjmedia/build/pjmedia_audiodev.vcproj (modified) (1 diff)
• pjmedia/include/pjmedia-audiodev/config.h (modified) (1 diff)
• pjmedia/include/pjmedia-audiodev/errno.h (modified) (1 diff)
• pjmedia/src/pjmedia-audiodev/audiodev.c (modified) (2 diffs)
• pjmedia/src/pjmedia-audiodev/bdimad_dev.c (added)
• pjmedia/src/pjmedia-audiodev/errno.c (modified) (1 diff)
• third_party/bdsound (added)
• third_party/bdsound/include (added)
• third_party/bdsound/include/bdimad.h (added)

pjproject/trunk/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 bdimad_dev.o
 export PJMEDIA_AUDIODEV_CFLAGS += $(_CFLAGS)
 

pjproject/trunk/pjmedia/build/pjmedia_audiodev.vcproj

@@ -3566 +3566 @@
                         </File>
                         <File
+                                RelativePath="..\src\pjmedia-audiodev\bdimad_dev.c"
+                                >
+                        </File>
+                        <File
                                 RelativePath="..\src\pjmedia-audiodev\errno.c"
                                 >

pjproject/trunk/pjmedia/include/pjmedia-audiodev/config.h

@@ -95 +95 @@
 #ifndef PJMEDIA_AUDIO_DEV_HAS_WMME
 #   define PJMEDIA_AUDIO_DEV_HAS_WMME           1
+#endif
+
+ 
+/**
+ * This setting controls whether BDIMAD support should be included.
+ */
+#ifndef PJMEDIA_AUDIO_DEV_HAS_BDIMAD
+#       define PJMEDIA_AUDIO_DEV_HAS_BDIMAD     0
 #endif
 

pjproject/trunk/pjmedia/include/pjmedia-audiodev/errno.h

@@ -104 +104 @@
 #define PJMEDIA_AUDIODEV_ERRNO_FROM_COREAUDIO(err) \
             ((int)PJMEDIA_AUDIODEV_COREAUDIO_ERRNO_START-err)
+
+/**
+ * Mapping from BDIMAD error codes to pjmedia error space.
+ */
+#define PJMEDIA_AUDIODEV_BDIMAD_ERROR_START     \
+            (PJMEDIA_AUDIODEV_ERRNO_START + 40000)
+#define PJMEDIA_AUDIODEV_BDIMAD_ERROR_END       \
+            (PJMEDIA_AUDIODEV_BDIMAD_ERROR_START + 2000 - 1)
+/**
+ * Convert BDIMAD error codes to PJLIB error space.
+ */
+#define PJMEDIA_AUDIODEV_ERRNO_FROM_BDIMAD(err) \
+            ((int)PJMEDIA_AUDIODEV_BDIMAD_ERROR_START+err)
 
 /************************************************************

pjproject/trunk/pjmedia/src/pjmedia-audiodev/audiodev.c

@@ -87 +87 @@
 #endif
 
+#if PJMEDIA_AUDIO_DEV_HAS_BDIMAD
+pjmedia_aud_dev_factory* pjmedia_bdimad_factory(pj_pool_factory *pf);
+#endif
+
 #if PJMEDIA_AUDIO_DEV_HAS_SYMB_VAS
 pjmedia_aud_dev_factory* pjmedia_symb_vas_factory(pj_pool_factory *pf);
@@ -406 +410 @@
 #if PJMEDIA_AUDIO_DEV_HAS_WMME
     aud_subsys.drv[aud_subsys.drv_cnt++].create = &pjmedia_wmme_factory;
+#endif
+#if PJMEDIA_AUDIO_DEV_HAS_BDIMAD
+    aud_subsys.drv[aud_subsys.drv_cnt++].create = &pjmedia_bdimad_factory;
 #endif
 #if PJMEDIA_AUDIO_DEV_HAS_SYMB_VAS

pjproject/trunk/pjmedia/src/pjmedia-audiodev/errno.c

@@ -156 +156 @@
 #endif
 
+/* See if the error comes from BDIMAD */
+#if PJMEDIA_AUDIO_DEV_HAS_BDIMAD
+        
+        if (statcode >= PJMEDIA_AUDIODEV_BDIMAD_ERROR_START &&
+            statcode <  PJMEDIA_AUDIODEV_BDIMAD_ERROR_END)
+        {
+            pj_status_t native_err;
+            native_err = statcode - PJMEDIA_AUDIODEV_BDIMAD_ERROR_START;
+
+            pj_ansi_snprintf(buf, bufsize, "BDIMAD native error %d", native_err);
+            return pj_str(buf);
+        } else
+#endif
+
     /* Audiodev error */
     if (statcode >= PJMEDIA_AUDIODEV_ERRNO_START &&