Changeset 3380 for pjproject

Timestamp:

Dec 2, 2010 6:12:19 AM (14 years ago)

Author:

nanang

Message:

Fix #1171, fixed issues in pjmedia_codec_mgr_set_default_param():

• updated the releasing of the old pool to be done after the new codec param is copied
• fixed the double dec_fmtp copy loop, one of them should be enc_fmtp copy loop instead

File:

• pjproject/trunk/pjmedia/src/pjmedia/codec.c (modified) (4 diffs)

pjproject/trunk/pjmedia/src/pjmedia/codec.c

@@ -536 +536 @@
     unsigned i;
     pjmedia_codec_id codec_id;
-    pj_pool_t *pool;
+    pj_pool_t *pool, *old_pool = NULL;
     struct pjmedia_codec_desc *codec_desc = NULL;
     pjmedia_codec_default_param *p;
@@ -561 +561 @@
     }
 
-    /* If codec param is previously set, release codec param pool */
+    /* If codec param is previously set, reset the codec param but release
+     * the codec param pool later after the new param is set (ticket #1171).
+     */
     if (codec_desc->param) {
         pj_assert(codec_desc->param->pool);
-        pj_pool_release(codec_desc->param->pool);
+        old_pool = codec_desc->param->pool;
         codec_desc->param = NULL;
     }
@@ -573 +575 @@
     if (NULL == param) {
         pj_mutex_unlock(mgr->mutex);
+        if (old_pool)
+            pj_pool_release(old_pool);
         return PJ_SUCCESS;
     }
@@ -591 +595 @@
                   &param->setting.dec_fmtp.param[i].val);
     }
-    for (i = 0; i < param->setting.dec_fmtp.cnt; ++i) {
-        pj_strdup(pool, &p->param->setting.dec_fmtp.param[i].name, 
-                  &param->setting.dec_fmtp.param[i].name);
-        pj_strdup(pool, &p->param->setting.dec_fmtp.param[i].val, 
-                  &param->setting.dec_fmtp.param[i].val);
-    }
-
-    pj_mutex_unlock(mgr->mutex);
+    for (i = 0; i < param->setting.enc_fmtp.cnt; ++i) {
+        pj_strdup(pool, &p->param->setting.enc_fmtp.param[i].name, 
+                  &param->setting.enc_fmtp.param[i].name);
+        pj_strdup(pool, &p->param->setting.enc_fmtp.param[i].val, 
+                  &param->setting.enc_fmtp.param[i].val);
+    }
+
+    pj_mutex_unlock(mgr->mutex);
+
+    if (old_pool)
+        pj_pool_release(old_pool);
 
     return PJ_SUCCESS;