Changeset 222

Timestamp:

Feb 23, 2006 2:09:10 AM (18 years ago)

Author:

bennylp

Message:

Added support for playing WAV file

Location:

pjproject/trunk

Files:

• pjmedia/build/pjmedia.dsp (modified) (3 diffs)
• pjmedia/include/pjmedia.h (modified) (2 diffs)
• pjmedia/include/pjmedia/conference.h (modified) (2 diffs)
• pjmedia/include/pjmedia/errno.h (modified) (1 diff)
• pjmedia/include/pjmedia/file_port.h (added)
• pjmedia/include/pjmedia/vad.h (modified) (1 diff)
• pjmedia/include/pjmedia/wave.h (added)
• pjmedia/src/pjmedia/conference.c (modified) (2 diffs)
• pjmedia/src/pjmedia/errno.c (modified) (1 diff)
• pjmedia/src/pjmedia/file_port.c (added)
• pjsip/src/pjsua/main.c (modified) (1 diff)
• pjsip/src/pjsua/pjsua.h (modified) (1 diff)
• pjsip/src/pjsua/pjsua_core.c (modified) (3 diffs)
• pjsip/src/pjsua/pjsua_opt.c (modified) (4 diffs)

pjproject/trunk/pjmedia/build/pjmedia.dsp

@@ -109 +109 @@
 # Begin Source File
 
+SOURCE=..\src\pjmedia\file_port.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\src\pjmedia\g711.c
 # End Source File
@@ -194 +198 @@
 # Begin Source File
 
+SOURCE=..\include\pjmedia\file_port.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\pjmedia\jbuf.h
 # End Source File
@@ -243 +251 @@
 
 SOURCE=..\include\pjmedia\vad.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\pjmedia\wave.h
 # End Source File
 # End Group

pjproject/trunk/pjmedia/include/pjmedia.h

@@ -30 +30 @@
 #include <pjmedia/endpoint.h>
 #include <pjmedia/errno.h>
+#include <pjmedia/file_port.h>
 #include <pjmedia/jbuf.h>
 #include <pjmedia/port.h>
@@ -38 +39 @@
 #include <pjmedia/session.h>
 #include <pjmedia/sound.h>
+#include <pjmedia/wave.h>
 
 #endif  /* __PJMEDIA_H__ */

pjproject/trunk/pjmedia/include/pjmedia/conference.h

@@ -41 +41 @@
 typedef struct pjmedia_conf_port_info
 {
+    unsigned            slot;
     pj_str_t            name;
     pjmedia_port_op     tx_setting;
@@ -151 +152 @@
 /**
  * Get port info.
+ *
+ * @param conf          The conference bridge.
+ * @param slot          Port index.
+ * @param info          Pointer to receive the info.
+ *
+ * @return              PJ_SUCCESS on success.
  */
 PJ_DECL(pj_status_t) pjmedia_conf_get_port_info( pjmedia_conf *conf,
                                                  unsigned slot,
                                                  pjmedia_conf_port_info *info);
+
+
+/**
+ * Get occupied ports info.
+ *
+ * @param conf          The conference bridge.
+ * @param size          On input, contains maximum number of infos
+ *                      to be retrieved. On output, contains the actual
+ *                      number of infos that have been copied.
+ * @param info          Array of info.
+ *
+ * @return              PJ_SUCCESS on success.
+ */
+PJ_DECL(pj_status_t) pjmedia_conf_get_ports_info(pjmedia_conf *conf,
+                                                 unsigned *size,
+                                                 pjmedia_conf_port_info info[]);
 
 

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

@@ -407 +407 @@
 
 
+/************************************************************
+ * FILE ERRORS
+ ***********************************************************/
+/**
+ * @hideinitializer
+ * Not a valid WAVE file.
+ */
+#define PJMEDIA_ENOTVALIDWAVE       (PJMEDIA_ERRNO_START+180)    /* 220180 */
+/**
+ * @hideinitializer
+ * Unsupported WAVE file.
+ */
+#define PJMEDIA_EWAVEUNSUPP         (PJMEDIA_ERRNO_START+181)    /* 220181 */
+/**
+ * @hideinitializer
+ * Wave file too short.
+ */
+#define PJMEDIA_EWAVETOOSHORT       (PJMEDIA_ERRNO_START+182)    /* 220182 */
+
 
 PJ_END_DECL

pjproject/trunk/pjmedia/include/pjmedia/vad.h

@@ -23 +23 @@
 /**
  * @file vad.h
- * @brief Voice Activity Detector.
+ * @brief Simple, adaptive silence detector.
  */
 #include <pjmedia/types.h>

pjproject/trunk/pjmedia/src/pjmedia/conference.c

@@ -600 +600 @@
     conf_port = conf->ports[slot];
 
+    info->slot = slot;
     info->name = conf_port->name;
     info->tx_setting = conf_port->tx_setting;
@@ -605 +606 @@
     info->listener = conf_port->listeners;
 
+    return PJ_SUCCESS;
+}
+
+
+PJ_DEF(pj_status_t) pjmedia_conf_get_ports_info(pjmedia_conf *conf,
+                                                unsigned *size,
+                                                pjmedia_conf_port_info info[])
+{
+    unsigned i, count=0;
+
+    PJ_ASSERT_RETURN(conf && size && info, PJ_EINVAL);
+
+    for (i=0; i<conf->max_ports && count<*size; ++i) {
+        if (!conf->ports[i])
+            continue;
+
+        pjmedia_conf_get_port_info(conf, i, &info[count]);
+        ++count;
+    }
+
+    *size = count;
     return PJ_SUCCESS;
 }

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

@@ -113 +113 @@
     { PJMEDIA_ENCBITS,              "Media ports have incompatible bits per sample" },
     { PJMEDIA_ENCBYTES,             "Media ports have incompatible bytes per frame" },
+
+    /* Media file errors: */
+    { PJMEDIA_ENOTVALIDWAVE,        "Not a valid WAVE file" },
+    { PJMEDIA_EWAVEUNSUPP,          "Unsupported WAVE file format" },
+    { PJMEDIA_EWAVETOOSHORT,        "WAVE file too short" },
 };
 

pjproject/trunk/pjsip/src/pjsua/main.c

@@ -262 +262 @@
 static void conf_list(void)
 {
-    pjmedia_conf_port_info info;
-    struct pjsua_inv_data *inv_data;
+    unsigned i, count;
+    pjmedia_conf_port_info info[16];
 
     printf("Conference ports:\n");
 
-    inv_data = pjsua.inv_list.next;
-    while (inv_data != &pjsua.inv_list) {
+    count = PJ_ARRAY_SIZE(info);
+    pjmedia_conf_get_ports_info(pjsua.mconf, &count, info);
+    for (i=0; i<count; ++i) {
+        char txlist[80];
+        unsigned j;
+        pjmedia_conf_port_info *port_info = &info[i];   
         
-        pjmedia_conf_get_port_info(pjsua.mconf, inv_data->conf_slot, &info);
-
-        printf("Port %2d %.*s\n", inv_data->conf_slot, 
-                                  (int)info.name.slen, info.name.ptr);
-
-        inv_data = inv_data->next;
-    }
+        txlist[0] = '\0';
+        for (j=0; j<pjsua.max_ports; ++j) {
+            char s[10];
+            if (port_info->listener[j]) {
+                pj_sprintf(s, "#%d ", j);
+                pj_ansi_strcat(txlist, s);
+            }
+        }
+        printf("Port #%02d %20.*s  tx to: %s\n", 
+               port_info->slot, 
+               (int)port_info->name.slen, 
+               port_info->name.ptr,
+               txlist);
+
+    }
+    puts("");
 }
 

pjproject/trunk/pjsip/src/pjsua/pjsua.h

@@ -116 +116 @@
 
     pjmedia_endpt   *med_endpt;     /**< Media endpoint.                */
+    unsigned         max_ports;     /**< Max ports in conf.             */
     pjmedia_conf    *mconf;         /**< Media conference.              */
     pj_bool_t        null_audio;    /**< Null audio flag.               */
+    char            *wav_file;      /**< WAV file name to play.         */
+    unsigned         wav_slot;      /**< WAV player slot in bridge      */
 
 

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

@@ -76 +76 @@
 
     pjsua.reg_timeout = 55;
+
+    /* Default maximum conference ports: */
+
+    pjsua.max_ports = 8;
 
     /* Init route set list: */
@@ -518 +522 @@
     /* Init conference bridge. */
 
-    status = pjmedia_conf_create(pjsua.pool, 8, 8000, 160, 16, &pjsua.mconf);
+    status = pjmedia_conf_create(pjsua.pool, pjsua.max_ports, 
+                                 8000, 160, 16, &pjsua.mconf);
     if (status != PJ_SUCCESS) {
         pj_caching_pool_destroy(&pjsua.cp);
@@ -554 +559 @@
     pjsip_transport *udp_transport;
     pj_status_t status = PJ_SUCCESS;
+
+    /* Create WAV file player if required: */
+
+    if (pjsua.wav_file) {
+        pjmedia_port *port;
+        pj_str_t port_name;
+
+        /* Create the file player port. */
+        status = pjmedia_file_player_port_create( pjsua.pool, pjsua.wav_file,
+                                                  0, -1, NULL, &port);
+        if (status != PJ_SUCCESS) {
+            pjsua_perror(THIS_FILE, 
+                         "Error playing media file", 
+                         status);
+            return status;
+        }
+
+        /* Add port to conference bridge: */
+        status = pjmedia_conf_add_port(pjsua.mconf, pjsua.pool, port, 
+                                       pj_cstr(&port_name, pjsua.wav_file),
+                                       &pjsua.wav_slot);
+        if (status != PJ_SUCCESS) {
+            pjsua_perror(THIS_FILE, 
+                         "Unable to add file player to conference bridge", 
+                         status);
+            return status;
+        }
+    }
+
 
     /* Init sockets (STUN etc): */

pjproject/trunk/pjsip/src/pjsua/pjsua_opt.c

@@ -56 +56 @@
     puts("Media options:");
     puts("  --null-audio        Use NULL audio device");
+    puts("  --wav-file=file     Play WAV file in conference bridge");
+    puts("");
     //puts("");
     //puts("User Agent options:");
@@ -197 +199 @@
            OPT_USE_STUN1, OPT_USE_STUN2, 
            OPT_ADD_BUDDY, OPT_OFFER_X_MS_MSG, OPT_NO_PRESENCE,
-           OPT_AUTO_ANSWER, OPT_AUTO_HANGUP};
+           OPT_AUTO_ANSWER, OPT_AUTO_HANGUP, OPT_WAV_FILE};
     struct option long_options[] = {
         { "config-file",1, 0, OPT_CONFIG_FILE},
@@ -223 +225 @@
         { "auto-answer",1, 0, OPT_AUTO_ANSWER},
         { "auto-hangup",1, 0, OPT_AUTO_HANGUP},
+        { "wav-file",  1, 0, OPT_WAV_FILE},
         { NULL, 0, 0, 0}
     };
@@ -405 +408 @@
             }
             pjsua.buddies[pjsua.buddy_cnt++].uri = pj_str(optarg);
+            break;
+
+        case OPT_WAV_FILE:
+            pjsua.wav_file = optarg;
             break;
         }