Changeset 3725 for pjproject

Timestamp:

Aug 26, 2011 4:19:04 AM (13 years ago)

Author:

nanang

Message:

Fixed #1352:

• Updated maximum video tee ports in pjsua video preview to (PJSUA_MAX_CALLS+1).
• Removed video tee maximum ports compile-time setting, MAX_DST_PORT_COUNT.

Location:

pjproject/trunk

Files:

• pjmedia/src/pjmedia/vid_tee.c (modified) (7 diffs)
• pjsip/src/pjsua-lib/pjsua_vid.c (modified) (2 diffs)

pjproject/trunk/pjmedia/src/pjmedia/vid_tee.c

@@ -30 +30 @@
 #define TEE_PORT_NAME   "vid_tee"
 #define TEE_PORT_SIGN   PJMEDIA_SIG_PORT_VID_TEE
-#define MAX_DST_PORT_COUNT 20
 
 
@@ -52 +51 @@
     unsigned             dst_port_cnt;
     vid_tee_dst_port    *dst_ports;
+    pj_uint8_t          *put_frm_flag;
     
     struct vid_tee_conv_t {
@@ -80 +80 @@
     PJ_ASSERT_RETURN(pool && fmt && p_vid_tee, PJ_EINVAL);
     PJ_ASSERT_RETURN(fmt->type == PJMEDIA_TYPE_VIDEO, PJ_EINVAL);
-    PJ_ASSERT_RETURN(max_dst_cnt <= MAX_DST_PORT_COUNT, PJ_ETOOMANY);
 
     /* Allocate video tee structure */
@@ -95 +94 @@
                     pj_pool_calloc(pool, max_dst_cnt,
                                    sizeof(struct vid_tee_conv_t));
+    tee->put_frm_flag = (pj_uint8_t*)
+                        pj_pool_calloc(pool, max_dst_cnt,
+                                       sizeof(tee->put_frm_flag[0]));
 
     /* Initialize video tee buffer, its size is one frame */
@@ -296 +298 @@
     vid_tee_port *tee = (vid_tee_port*)port;
     unsigned i, j;
-    pj_bool_t done[MAX_DST_PORT_COUNT];
-    
-    pj_bzero(done, sizeof(done));
+    const pj_uint8_t PUT_FRM_DONE = 1;
+
+    pj_bzero(tee->put_frm_flag, tee->dst_port_cnt *
+                                sizeof(tee->put_frm_flag[0]));
 
     for (i = 0; i < tee->dst_port_cnt; ++i) {
         pjmedia_frame frame_ = *frame;
 
-        if (done[i])
+        if (tee->put_frm_flag[i])
             continue;
         
@@ -328 +331 @@
             pjmedia_frame framep;
             
-            if (done[j] ||
+            if (tee->put_frm_flag[j] ||
                 (tee->dst_ports[j].dst->info.fmt.id != 
                  tee->dst_ports[i].dst->info.fmt.id) ||
@@ -353 +356 @@
             /* Deliver the data */
             pjmedia_port_put_frame(tee->dst_ports[j].dst, &framep);
-            done[j] = PJ_TRUE;
+            tee->put_frm_flag[j] = PUT_FRM_DONE;
             
             if (!tee->tee_conv[i].conv)

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

@@ -24 +24 @@
 #if PJSUA_HAS_VIDEO
 
+#define VID_TEE_MAX_PORT    (PJSUA_MAX_CALLS + 1)
+
 static void free_vid_win(pjsua_vid_win_id wid);
 
@@ -406 +408 @@
 
         /* Create video tee */
-        status = pjmedia_vid_tee_create(w->pool, fmt, 2, &w->tee);
+        status = pjmedia_vid_tee_create(w->pool, fmt, VID_TEE_MAX_PORT,
+                                        &w->tee);
         if (status != PJ_SUCCESS)
             goto on_error;