Changeset 4443 for pjproject/trunk/pjmedia/src/pjmedia/conf_switch.c

Timestamp:

Mar 20, 2013 6:56:19 AM (10 years ago)

Author:

nanang

Message:

Misc (re #1630): Added compile-time setting to configure audio switchboard buffer size.

File:

• pjproject/trunk/pjmedia/src/pjmedia/conf_switch.c (modified) (2 diffs)

pjproject/trunk/pjmedia/src/pjmedia/conf_switch.c

@@ -51 +51 @@
 #define SLOT_TYPE           unsigned
 #define INVALID_SLOT        ((SLOT_TYPE)-1)
-#define BUFFER_SIZE         PJMEDIA_MAX_MTU
+#define BUFFER_SIZE         PJMEDIA_CONF_SWITCH_BOARD_BUF_SIZE
 #define MAX_LEVEL           (32767)
 #define MIN_LEVEL           (-32768)
@@ -144 +144 @@
 
     PJ_ASSERT_RETURN(pool && conf && port && name && p_conf_port, PJ_EINVAL);
+
+    /* Check port's buffer size */
+    if (port->info.fmt.id == PJMEDIA_FORMAT_PCM &&
+        PJMEDIA_PIA_SPF(&port->info)*2 > BUFFER_SIZE - sizeof(pjmedia_frame))
+    {
+        pj_assert(!"Too small buffer size for audio switchboard. "
+                   "Try increase PJMEDIA_CONF_SWITCH_BOARD_BUF_SIZE");
+        return PJ_ETOOSMALL;
+    }
 
     /* Create port. */