Changeset 320 for pjproject/trunk/pjsip/src/pjsua-lib/pjsua_core.c

Timestamp:

Mar 16, 2006 2:24:26 PM (18 years ago)

Author:

bennylp

Message:

Added misc flags and modify Makefiles to allow exclusion of PortAudio? and specific codec during compilation

File:

• pjproject/trunk/pjsip/src/pjsua-lib/pjsua_core.c (modified) (9 diffs)

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_core.c

@@ -618 +618 @@
     if (pjsua.codec_cnt == 0) {
 
+#if PJMEDIA_HAS_SPEEX_CODEC
         unsigned option = PJMEDIA_SPEEX_NO_WB | PJMEDIA_SPEEX_NO_UWB;
 
@@ -637 +638 @@
         pjsua.codec_deinit[pjsua.codec_cnt] = &pjmedia_codec_speex_deinit;
         pjsua.codec_cnt++;
-
+#endif /* PJMEDIA_HAS_SPEEX_CODEC */
+
+#if PJMEDIA_HAS_GSM_CODEC
         /* Register GSM */
         status = pjmedia_codec_gsm_init(pjsua.med_endpt);
@@ -649 +652 @@
         pjsua.codec_deinit[pjsua.codec_cnt] = &pjmedia_codec_gsm_deinit;
         pjsua.codec_cnt++;
-
+#endif /* PJMEDIA_HAS_GSM_CODEC */
+
+#if PJMEDIA_HAS_G711_CODEC
         /* Register PCMA and PCMU */
         status = pjmedia_codec_g711_init(pjsua.med_endpt);
@@ -664 +669 @@
         pjsua.codec_deinit[pjsua.codec_cnt] = &pjmedia_codec_g711_deinit;
         pjsua.codec_cnt++;
+#endif  /* PJMEDIA_HAS_G711_CODEC */
 
     } else {
@@ -674 +680 @@
         for (i=0; i<pjsua.codec_cnt; ++i) {
         
+            if (0) {
+                /* Dummy */
+            }
+#if PJMEDIA_HAS_SPEEX_CODEC
             /* Is it speex? */
-            if (!pj_stricmp2(&pjsua.codec_arg[i], "speex")) {
+            else if (!pj_stricmp2(&pjsua.codec_arg[i], "speex")) {
 
                 unsigned option = PJMEDIA_SPEEX_NO_WB | PJMEDIA_SPEEX_NO_UWB;
@@ -695 +705 @@
                 pjsua.codec_deinit[i] = &pjmedia_codec_speex_deinit;
             }
+#endif  /* PJMEDIA_HAS_SPEEX_CODEC */
+
+#if PJMEDIA_HAS_GSM_CODEC
             /* Is it gsm? */
             else if (!pj_stricmp2(&pjsua.codec_arg[i], "gsm")) {
@@ -708 +721 @@
 
             }
+#endif  /* PJMEDIA_HAS_GSM_CODEC */
+
+#if PJMEDIA_HAS_G711_CODEC
             /* Is it pcma/pcmu? */
             else if (!pj_stricmp2(&pjsua.codec_arg[i], "pcmu") ||
@@ -723 +739 @@
 
             }
+#endif  /* PJMEDIA_HAS_G711_CODEC */
+
             /* Don't know about this codec... */
             else {
@@ -1059 +1077 @@
 
     /* Destroy file port */
-    pjmedia_port_destroy(pjsua.file_port);
+    if (pjsua.file_port)
+        pjmedia_port_destroy(pjsua.file_port);
 
     /* Destroy null port. */
-    pjmedia_port_destroy(pjsua.null_port);
+    if (pjsua.null_port)
+        pjmedia_port_destroy(pjsua.null_port);