Changeset 5947

Timestamp:

Mar 8, 2019 7:02:23 AM (6 years ago)

Author:

nanang

Message:

Re #2181: Fixed unreleased pool when disconnecting ports in video conference.

File:

• pjproject/trunk/pjmedia/src/pjmedia/vid_conf.c (modified) (7 diffs)

pjproject/trunk/pjmedia/src/pjmedia/vid_conf.c

@@ -610 +610 @@
 
     if (i != src_port->listener_cnt) {
+        unsigned k;
+
         pj_assert(j != dst_port->transmitter_cnt);
         pj_assert(src_port->listener_cnt > 0 && 
@@ -615 +617 @@
         pj_assert(dst_port->transmitter_cnt > 0 && 
                   dst_port->transmitter_cnt < vid_conf->opt.max_slot_cnt);
+
+        /* Cleanup all render states of the sink */
+        for (k=0; k<dst_port->transmitter_cnt; ++k)
+            cleanup_render_state(dst_port, k);
+
+        /* Update listeners array of the source and transmitters array of
+         * the sink.
+         */
         pj_array_erase(src_port->listener_slots, sizeof(unsigned), 
                        src_port->listener_cnt, i);
@@ -622 +632 @@
         --dst_port->transmitter_cnt;
 
-        cleanup_render_state(src_port, j);
+        /* Update render states of the sink */
         update_render_state(vid_conf, dst_port);
 
@@ -806 +816 @@
     if (cp->render_pool[transmitter_idx]) {
         pj_pool_safe_release(&cp->render_pool[transmitter_idx]);
+
+        TRACE_((THIS_FILE, "Cleaned up render state for connection %d->%d",
+                cp->transmitter_slots[transmitter_idx], cp->idx));
     }
 }
@@ -822 +835 @@
     unsigned i;
     pj_status_t status;
-    char buf[5];
 
     /* Nothing to render, just return */
@@ -860 +872 @@
         render_state *rs;
         pjmedia_conversion_param cparam;
+        char tmp_buf[32];
 
         /* Create pool & render state */
-        pool = pj_pool_create(cp->pool->factory, "vconf_rdr", 128, 128, NULL);
+        pj_ansi_snprintf(tmp_buf, sizeof(tmp_buf), "vcport_rs_%d->%d",
+                         cp->transmitter_slots[i], cp->idx);
+        pool = pj_pool_create(cp->pool->factory, tmp_buf, 128, 128, NULL);
         cp->render_pool[i] = pool;
         rs = cp->render_states[i] = PJ_POOL_ZALLOC_T(pool, render_state);
+
+        TRACE_((THIS_FILE, "Created render state for connection %d->%d",
+                           cp->transmitter_slots[i], cp->idx));
 
         /* Setup format & frame */
@@ -963 +981 @@
             rs->src_rect.coord.y = (tr_size[i].h - rs->src_rect.size.h)/2;
 
-        TRACE_((THIS_FILE, "src%d=%s/%dx%d->%dx%d@%d,%d dst=%dx%d@%d,%d",
-                           i, pjmedia_fourcc_name(tr_fmt_id[i], buf),
+        TRACE_((THIS_FILE, "src#%d=%s/%dx%d->%dx%d@%d,%d dst=%dx%d@%d,%d",
+                           i, pjmedia_fourcc_name(tr_fmt_id[i], tmp_buf),
                            tr_size[i].w, tr_size[i].h,
                            rs->src_rect.size.w, rs->src_rect.size.h,