Changeset 2463 for pjproject/branches/projects/aps-direct/pjmedia/src/pjmedia-audiodev/audiodev.c

Timestamp:

Feb 18, 2009 8:14:15 PM (16 years ago)

Author:

bennylp

Message:

Added audiotest and initial work on audio demo sample

File:

• pjproject/branches/projects/aps-direct/pjmedia/src/pjmedia-audiodev/audiodev.c (modified) (13 diffs)

pjproject/branches/projects/aps-direct/pjmedia/src/pjmedia-audiodev/audiodev.c

@@ -30 +30 @@
  * At driver level, device ID is a 16bit unsigned integer index.
  */
-#define MAKE_DEV_ID(f_id, index)   (((f_id & 0xFFFF) << 16) & (index & 0xFFFF))
+#define MAKE_DEV_ID(f_id, index)   (((f_id & 0xFFFF) << 16) | (index & 0xFFFF))
 #define GET_INDEX(dev_id)          ((dev_id) & 0xFFFF)
 #define GET_FID(dev_id)            ((dev_id) >> 16)
@@ -40 +40 @@
 pjmedia_aud_dev_factory* pjmedia_wmme_factory(pj_pool_factory *pf);
 
-
-/* Array of factories */
-static struct factory
-{
-    pjmedia_aud_dev_factory*   (*create)(pj_pool_factory*);
-    pjmedia_aud_dev_factory     *f;
-
-} factories[] = 
-{
-    /* WMME */
+#define MAX_DRIVERS     16
+
+/* The audio subsystem */
+static struct aud_subsys
+{
+    pj_pool_factory *pf;
+    unsigned         factory_cnt;
+
+    struct factory
     {
-        &pjmedia_wmme_factory
-    },
-    /* PortAudio: */
-    {
-        &pjmedia_pa_factory
-    },
-};
-static unsigned factory_cnt;
+        pjmedia_aud_dev_factory*   (*create)(pj_pool_factory*);
+        pjmedia_aud_dev_factory     *f;
+
+    } factories[MAX_DRIVERS];
+
+} aud_subsys;
+
 
 
@@ -67 +65 @@
     pj_status_t status = PJ_ENOMEM;
 
-    factory_cnt = 0;
-
-    for (i=0; i<PJ_ARRAY_SIZE(factories); ++i) {
-        factories[i].f = (*factories[i].create)(pf);
-        if (!factories[i].f)
-            continue;
-
-        status = factories[i].f->op->init(factories[i].f);
+    aud_subsys.pf = pf;
+    aud_subsys.factory_cnt = 0;
+
+    aud_subsys.factories[aud_subsys.factory_cnt++].create = &pjmedia_pa_factory;
+    aud_subsys.factories[aud_subsys.factory_cnt++].create = &pjmedia_wmme_factory;
+
+    for (i=0; i<aud_subsys.factory_cnt; ++i) {
+        pjmedia_aud_dev_factory *f;
+
+        f = (*aud_subsys.factories[i].create)(pf);
+        if (!f)
+            continue;
+
+        status = f->op->init(f);
         if (status != PJ_SUCCESS) {
-            factories[i].f->op->destroy(factories[i].f);
-            factories[i].f = NULL;
+            f->op->destroy(f);
+            continue;
         }
 
-        factories[i].f->internal.id = i;
-        ++factory_cnt;
+        aud_subsys.factories[i].f = f;
+        aud_subsys.factories[i].f->internal.id = i;
     }
 
-    return factory_cnt ? PJ_SUCCESS : status;
+    return aud_subsys.factory_cnt ? PJ_SUCCESS : status;
+}
+
+/* API: get the pool factory registered to the audio subsystem. */
+PJ_DEF(pj_pool_factory*) pjmedia_aud_subsys_get_pool_factory(void)
+{
+    return aud_subsys.pf;
 }
 
@@ -92 +102 @@
     unsigned i;
 
-    for (i=0; i<PJ_ARRAY_SIZE(factories); ++i) {
-        if (!factories[i].f)
-            continue;
-
-        factories[i].f->op->destroy(factories[i].f);
-        factories[i].f = NULL;
+    for (i=0; i<aud_subsys.factory_cnt; ++i) {
+        pjmedia_aud_dev_factory *f = aud_subsys.factories[i].f;
+
+        if (!f)
+            continue;
+
+        f->op->destroy(f);
+        aud_subsys.factories[i].f = NULL;
     }
 
@@ -108 +120 @@
     unsigned i, count = 0;
 
-    for (i=0; i<PJ_ARRAY_SIZE(factories); ++i) {
-        if (!factories[i].f)
-            continue;
-
-        count += factories[i].f->op->get_dev_count(factories[i].f);
+    for (i=0; i<aud_subsys.factory_cnt; ++i) {
+        pjmedia_aud_dev_factory *f = aud_subsys.factories[i].f;
+
+        if (!f)
+            continue;
+
+        count += f->op->get_dev_count(f);
     }
 
@@ -124 +138 @@
     unsigned i, count = 0;
 
-    for (i=0; i<PJ_ARRAY_SIZE(factories) && count < max_count; ++i) {
+    for (i=0; i<aud_subsys.factory_cnt && count < max_count; ++i) {
+        pjmedia_aud_dev_factory *f = aud_subsys.factories[i].f;
         unsigned j, fcount;
 
-        if (!factories[i].f)
-            continue;
-
-        fcount = factories[i].f->op->get_dev_count(factories[i].f);
+        if (!f)
+            continue;
+
+        fcount = f->op->get_dev_count(f);
         for (j=0; j<fcount && count<max_count; ++j) {
             ids[count++] = MAKE_DEV_ID(i, j);
@@ -144 +159 @@
                                              pjmedia_aud_dev_info *info)
 {
+    pjmedia_aud_dev_factory *f;
     int f_id, index;
 
@@ -152 +168 @@
     index = GET_INDEX(id);
 
-    if (f_id < 0 || f_id >= PJ_ARRAY_SIZE(factories))
-        return PJMEDIA_EAUD_INVDEV;
-
-    if (factories[f_id].f == NULL)
-        return PJMEDIA_EAUD_INVDEV;
-
-    return factories[f_id].f->op->get_dev_info(factories[f_id].f,
-                                               index, info);
+    if (f_id < 0 || f_id >= (int)aud_subsys.factory_cnt)
+        return PJMEDIA_EAUD_INVDEV;
+
+    f = aud_subsys.factories[f_id].f;
+    if (f == NULL)
+        return PJMEDIA_EAUD_INVDEV;
+
+    return f->op->get_dev_info(f, index, info);
 }
 
@@ -168 +184 @@
                                                   pjmedia_aud_dev_param *param)
 {
+    pjmedia_aud_dev_factory *f;
     int f_id, index;
     pj_status_t status;
@@ -177 +194 @@
     index = GET_INDEX(id);
 
-    if (f_id < 0 || f_id >= PJ_ARRAY_SIZE(factories))
-        return PJMEDIA_EAUD_INVDEV;
-
-    if (factories[f_id].f == NULL)
-        return PJMEDIA_EAUD_INVDEV;
-
-    status = factories[f_id].f->op->default_param(factories[f_id].f,
-                                                  index, param);
+    if (f_id < 0 || f_id >= (int)aud_subsys.factory_cnt)
+        return PJMEDIA_EAUD_INVDEV;
+
+    f = aud_subsys.factories[f_id].f;
+    if (f == NULL)
+        return PJMEDIA_EAUD_INVDEV;
+
+    status = f->op->default_param(f, index, param);
     if (status != PJ_SUCCESS)
         return status;
@@ -204 +221 @@
                                               pjmedia_aud_stream **p_aud_strm)
 {
+    pjmedia_aud_dev_factory *f;
     pjmedia_aud_dev_param param;
     int f_id;
@@ -222 +240 @@
         f_id = GET_FID(param.play_id);
 
-    if (f_id < 0 || f_id >= PJ_ARRAY_SIZE(factories))
+    if (f_id < 0 || f_id >= (int)aud_subsys.factory_cnt)
         return PJMEDIA_EAUD_INVDEV;
     
@@ -229 +247 @@
     param.play_id = GET_INDEX(param.play_id);
 
-    if (factories[f_id].f == NULL)
-        return PJMEDIA_EAUD_INVDEV;
-
-    status = factories[f_id].f->op->create_stream(factories[f_id].f,
-                                                  &param, rec_cb, play_cb,
-                                                  user_data, p_aud_strm);
+    f = aud_subsys.factories[f_id].f;
+    if (f == NULL)
+        return PJMEDIA_EAUD_INVDEV;
+
+    status = f->op->create_stream(f, &param, rec_cb, play_cb,
+                                  user_data, p_aud_strm);
     if (status != PJ_SUCCESS)
         return status;
 
-    (*p_aud_strm)->factory = factories[f_id].f;
+    (*p_aud_strm)->factory = f;
     return PJ_SUCCESS;
 }