Changeset 1403

Timestamp:

Jul 17, 2007 4:25:45 PM (17 years ago)

Author:

bennylp

Message:

Ticket #353: memory leak with pjsua WAV file player/recorder

Location:

pjproject/trunk

Files:

• pjsip-apps/src/pjsua/pjsua_app.c (modified) (1 diff)
• pjsip/include/pjsua-lib/pjsua_internal.h (modified) (1 diff)
• pjsip/src/pjsua-lib/pjsua_media.c (modified) (15 diffs)

pjproject/trunk/pjsip-apps/src/pjsua/pjsua_app.c

@@ -2964 +2964 @@
 
     /* Create pool for application */
-    app_config.pool = pjsua_pool_create("pjsua", 4000, 4000);
+    app_config.pool = pjsua_pool_create("pjsua", 1000, 1000);
 
     /* Initialize default config */

pjproject/trunk/pjsip/include/pjsua-lib/pjsua_internal.h

@@ -148 +148 @@
     pj_bool_t        type;  /* 0=player, 1=playlist */
     pjmedia_port    *port;
+    pj_pool_t       *pool;
     unsigned         slot;
 } pjsua_file_data;

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

@@ -1106 +1106 @@
  */
 
+static char* get_basename(const char *path, unsigned len)
+{
+    char *p = ((char*)path) + len;
+
+    if (len==0)
+        return p;
+
+    for (--p; p!=path && *p!='/' && *p!='\\'; --p);
+
+    return (p==path) ? p : p+1;
+}
+
+
 /*
  * Create a file player, and automatically connect this player to
@@ -1116 +1129 @@
     unsigned slot, file_id;
     char path[PJ_MAXPATH];
+    pj_pool_t *pool;
     pjmedia_port *port;
     pj_status_t status;
@@ -1138 +1152 @@
     pj_memcpy(path, filename->ptr, filename->slen);
     path[filename->slen] = '\0';
-    status = pjmedia_wav_player_port_create(pjsua_var.pool, path,
+
+    pool = pjsua_pool_create(get_basename(path, filename->slen), 1000, 1000);
+    if (!pool) {
+        PJSUA_UNLOCK();
+        return PJ_ENOMEM;
+    }
+
+    status = pjmedia_wav_player_port_create(pool, path,
                                             pjsua_var.mconf_cfg.samples_per_frame *
                                               1000 / pjsua_var.media_cfg.clock_rate, 
@@ -1145 +1166 @@
         PJSUA_UNLOCK();
         pjsua_perror(THIS_FILE, "Unable to open file for playback", status);
+        pj_pool_release(pool);
         return status;
     }
@@ -1155 +1177 @@
         pjsua_perror(THIS_FILE, "Unable to add file to conference bridge", 
                      status);
+        pj_pool_release(pool);
         return status;
     }
 
     pjsua_var.player[file_id].type = 0;
+    pjsua_var.player[file_id].pool = pool;
     pjsua_var.player[file_id].port = port;
     pjsua_var.player[file_id].slot = slot;
@@ -1182 +1206 @@
 {
     unsigned slot, file_id, ptime;
+    pj_pool_t *pool;
     pjmedia_port *port;
     pj_status_t status;
@@ -1206 +1231 @@
             pjsua_var.media_cfg.clock_rate;
 
-    status = pjmedia_wav_playlist_create(pjsua_var.pool, label, 
+    pool = pjsua_pool_create("playlist", 1000, 1000);
+    if (!pool) {
+        PJSUA_UNLOCK();
+        return PJ_ENOMEM;
+    }
+
+    status = pjmedia_wav_playlist_create(pool, label, 
                                          file_names, file_count,
                                          ptime, options, 0, &port);
@@ -1212 +1243 @@
         PJSUA_UNLOCK();
         pjsua_perror(THIS_FILE, "Unable to create playlist", status);
-        return status;
-    }
-
-    status = pjmedia_conf_add_port(pjsua_var.mconf, pjsua_var.pool, 
+        pj_pool_release(pool);
+        return status;
+    }
+
+    status = pjmedia_conf_add_port(pjsua_var.mconf, pool, 
                                    port, &port->info.name, &slot);
     if (status != PJ_SUCCESS) {
@@ -1221 +1253 @@
         PJSUA_UNLOCK();
         pjsua_perror(THIS_FILE, "Unable to add port", status);
+        pj_pool_release(pool);
         return status;
     }
 
     pjsua_var.player[file_id].type = 1;
+    pjsua_var.player[file_id].pool = pool;
     pjsua_var.player[file_id].port = port;
     pjsua_var.player[file_id].slot = slot;
@@ -1295 +1329 @@
         pjsua_var.player[id].port = NULL;
         pjsua_var.player[id].slot = 0xFFFF;
+        pj_pool_release(pjsua_var.player[id].pool);
+        pjsua_var.player[id].pool = NULL;
         pjsua_var.player_cnt--;
     }
@@ -1329 +1365 @@
     pj_str_t ext;
     int file_format;
+    pj_pool_t *pool;
     pjmedia_port *port;
     pj_status_t status;
@@ -1376 +1413 @@
     path[filename->slen] = '\0';
 
+    pool = pjsua_pool_create(get_basename(path, filename->slen), 1000, 1000);
+    if (!pool) {
+        PJSUA_UNLOCK();
+        return PJ_ENOMEM;
+    }
+
     if (file_format == FMT_WAV) {
-        status = pjmedia_wav_writer_port_create(pjsua_var.pool, path, 
+        status = pjmedia_wav_writer_port_create(pool, path, 
                                                 pjsua_var.media_cfg.clock_rate, 
                                                 pjsua_var.mconf_cfg.channel_count,
@@ -1392 +1435 @@
         PJSUA_UNLOCK();
         pjsua_perror(THIS_FILE, "Unable to open file for recording", status);
-        return status;
-    }
-
-    status = pjmedia_conf_add_port(pjsua_var.mconf, pjsua_var.pool, 
+        pj_pool_release(pool);
+        return status;
+    }
+
+    status = pjmedia_conf_add_port(pjsua_var.mconf, pool, 
                                    port, filename, &slot);
     if (status != PJ_SUCCESS) {
         pjmedia_port_destroy(port);
         PJSUA_UNLOCK();
+        pj_pool_release(pool);
         return status;
     }
@@ -1405 +1450 @@
     pjsua_var.recorder[file_id].port = port;
     pjsua_var.recorder[file_id].slot = slot;
+    pjsua_var.recorder[file_id].pool = pool;
 
     if (p_id) *p_id = file_id;
@@ -1459 +1505 @@
         pjsua_var.recorder[id].port = NULL;
         pjsua_var.recorder[id].slot = 0xFFFF;
+        pj_pool_release(pjsua_var.recorder[id].pool);
+        pjsua_var.recorder[id].pool = NULL;
         pjsua_var.rec_cnt--;
     }