Changeset 4443 for pjproject/trunk

Timestamp:

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

Author:

nanang

Message:

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

Location:

pjproject/trunk/pjmedia

Files:

• include/pjmedia/config.h (modified) (1 diff)
• src/pjmedia/conf_switch.c (modified) (2 diffs)

pjproject/trunk/pjmedia/include/pjmedia/config.h

@@ -60 +60 @@
 #   define PJMEDIA_CONF_USE_SWITCH_BOARD    0
 #endif
+
+/**
+ * Specify buffer size for audio switch board, in bytes. This buffer will
+ * be used for transmitting/receiving audio frame data (and some overheads,
+ * i.e: pjmedia_frame structure) among conference ports in the audio
+ * switch board. For example, if a port uses PCM format @44100Hz mono
+ * and frame time 20ms, the PCM audio data will require 1764 bytes,
+ * so with overhead, a safe buffer size will be ~1900 bytes.
+ *
+ * Default: PJMEDIA_MAX_MTU
+ */
+#ifndef PJMEDIA_CONF_SWITCH_BOARD_BUF_SIZE
+#   define PJMEDIA_CONF_SWITCH_BOARD_BUF_SIZE    PJMEDIA_MAX_MTU
+#endif
+
 
 /*

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. */