Changeset 3956

Timestamp:

Feb 21, 2012 8:31:26 AM (13 years ago)

Author:

nanang

Message:

Fix #1453:

• Add and manage pool instance in default codec param in video codec framework.
• API change: pool param is removed from pjmedia_vid_codec_mgr_set_default_param().

Location:

pjproject/trunk

Files:

• pjmedia/include/pjmedia/vid_codec.h (modified) (1 diff)
• pjmedia/src/pjmedia/vid_codec.c (modified) (9 diffs)
• pjsip/src/pjsua-lib/pjsua_vid.c (modified) (1 diff)

pjproject/trunk/pjmedia/include/pjmedia/vid_codec.h

@@ -620 +620 @@
 PJ_DECL(pj_status_t) 
 pjmedia_vid_codec_mgr_set_default_param(pjmedia_vid_codec_mgr *mgr,
-                                        pj_pool_t *pool,
                                         const pjmedia_vid_codec_info *info,
                                         const pjmedia_vid_codec_param *param);

pjproject/trunk/pjmedia/src/pjmedia/vid_codec.c

@@ -34 +34 @@
 
 
+/* Definition of default codecs parameters */
+typedef struct pjmedia_vid_codec_default_param
+{
+    pj_pool_t                   *pool;
+    pjmedia_vid_codec_param     *param;
+} pjmedia_vid_codec_default_param;
+
+
 /*
  * Codec manager maintains array of these structs for each supported
@@ -44 +52 @@
     pjmedia_codec_priority           prio;      /**< Priority.              */
     pjmedia_vid_codec_factory       *factory;   /**< The factory.           */
-    pjmedia_vid_codec_param         *def_param; /**< Default codecs 
+    pjmedia_vid_codec_default_param *def_param; /**< Default codecs 
                                                      parameters.            */
 } pjmedia_vid_codec_desc;
@@ -52 +60 @@
 struct pjmedia_vid_codec_mgr
 {
+    /** Pool factory instance. */
+    pj_pool_factory             *pf;
+
     /** Codec manager mutex. */
     pj_mutex_t                  *mutex;
@@ -117 +128 @@
 
     mgr = PJ_POOL_ZALLOC_T(pool, pjmedia_vid_codec_mgr);
+    mgr->pf = pool->factory;
     pj_list_init (&mgr->factory_list);
     mgr->codec_cnt = 0;
@@ -612 +624 @@
     /* If we found the codec and its default param is set, return it */
     if (codec_desc && codec_desc->def_param) {
-        pj_memcpy(param, codec_desc->def_param, 
+        pj_memcpy(param, codec_desc->def_param->param, 
                   sizeof(pjmedia_vid_codec_param));
 
@@ -652 +664 @@
 PJ_DEF(pj_status_t) pjmedia_vid_codec_mgr_set_default_param( 
                                             pjmedia_vid_codec_mgr *mgr,
-                                            pj_pool_t *pool,
                                             const pjmedia_vid_codec_info *info,
                                             const pjmedia_vid_codec_param *param )
@@ -659 +670 @@
     pjmedia_codec_id codec_id;
     pjmedia_vid_codec_desc *codec_desc = NULL;
-    pjmedia_vid_codec_param *p;
+    pj_pool_t *pool, *old_pool = NULL;
+    pjmedia_vid_codec_default_param *p;
 
     PJ_ASSERT_RETURN(info, PJ_EINVAL);
@@ -687 +699 @@
     /* If codec param is previously set */
     if (codec_desc->def_param) {
+        pj_assert(codec_desc->def_param->pool);
+        old_pool = codec_desc->def_param->pool;
         codec_desc->def_param = NULL;
     }
@@ -695 +709 @@
     if (NULL == param) {
         pj_mutex_unlock(mgr->mutex);
+        if (old_pool)
+            pj_pool_release(old_pool);
         return PJ_SUCCESS;
     }
 
+    /* Create new default codec param instance */
+    pool = pj_pool_create(mgr->pf, (char*)codec_id, 256, 256, NULL);
+    codec_desc->def_param = PJ_POOL_ZALLOC_T(pool,
+                                             pjmedia_vid_codec_default_param);
+    p = codec_desc->def_param;
+    p->pool = pool;
+
     /* Update codec default param */
-    p = pjmedia_vid_codec_param_clone(pool, param);
+    p->param = pjmedia_vid_codec_param_clone(pool, param);
     if (!p)
         return PJ_EINVAL;

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

@@ -333 +333 @@
     }
 
-    status = pjmedia_vid_codec_mgr_set_default_param(NULL, pjsua_var.pool,
-                                                     info[0], param);
+    status = pjmedia_vid_codec_mgr_set_default_param(NULL, info[0], param);
     return status;
 }