Changeset 2825 for pjproject/trunk/pjmedia/src/pjmedia-codec/passthrough.c

Timestamp:

Jun 30, 2009 3:02:06 PM (15 years ago)

Author:

nanang

Message:

Ticket #910:

• Added a new API pjmedia_codec_passthrough_init2().
• Updated the initialization steps of passthrough codec in pjsua_media.c, to configure the codecs (of passthrough codec) to be enabled based on audio device extended/encoded formats.
• Minor update: added passthrough.h into pjmedia_codec.vcproj.

File:

• pjproject/trunk/pjmedia/src/pjmedia-codec/passthrough.c (modified) (4 diffs)

pjproject/trunk/pjmedia/src/pjmedia-codec/passthrough.c

@@ -313 +313 @@
     if (codec_factory.pool != NULL) {
         /* Already initialized. */
-        return PJ_SUCCESS;
+        return PJ_EEXISTS;
     }
 
@@ -355 +355 @@
 
 /*
+ * Initialize and register passthrough codec factory to pjmedia endpoint.
+ */
+PJ_DEF(pj_status_t) pjmedia_codec_passthrough_init2( 
+                      pjmedia_endpt *endpt,
+                      const pjmedia_codec_passthrough_setting *setting)
+{
+    if (codec_factory.pool != NULL) {
+        /* Already initialized. */
+        return PJ_EEXISTS;
+    }
+
+    if (setting != NULL) {
+        unsigned i;
+
+        /* Enable/disable codecs based on the specified encoding formats */
+        for (i = 0; i < PJ_ARRAY_SIZE(codec_desc); ++i) {
+            pj_bool_t enabled = PJ_FALSE;
+            unsigned j;
+
+            for (j = 0; j < setting->fmt_cnt && !enabled; ++j) {
+                if (codec_desc[i].fmt_id == setting->fmts[j].id)
+                    enabled = PJ_TRUE;
+            }
+
+            codec_desc[i].enabled = enabled;
+        }
+    }
+
+    return pjmedia_codec_passthrough_init(endpt);
+}
+
+/*
  * Unregister passthrough codecs factory from pjmedia endpoint.
  */
@@ -360 +392 @@
 {
     pjmedia_codec_mgr *codec_mgr;
+    unsigned i;
     pj_status_t status;
 
@@ -387 +420 @@
     pj_pool_release(codec_factory.pool);
     codec_factory.pool = NULL;
+
+    /* Re-enable all codecs in the codec_desc. */
+    for (i = 0; i < PJ_ARRAY_SIZE(codec_desc); ++i) {
+        codec_desc[i].enabled = PJ_TRUE;
+    }
 
     return status;