Changeset 4254 for pjproject/trunk/pjmedia/src/pjmedia/codec.c

Timestamp:

Sep 14, 2012 4:06:29 AM (12 years ago)

Author:

nanang

Message:

Close #1568:

• Added media change detection based on SDP negotiation result and local codec param settings, the detection result will decide whether the media should be re-initialized after the SDP negotiation.
• Fixed stream to keep the duplicate of codec param for the stream info (was only copying the pointer).
• Introduced macro PJSUA_THIRD_PARTY_STREAM_HAS_GET_INFO & PJSUA_THIRD_PARTY_STREAM_HAS_GET_STAT.

File:

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

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

@@ -42 +42 @@
 
 /*
+ * Duplicate codec parameter.
+ */
+PJ_DEF(pjmedia_codec_param*) pjmedia_codec_param_clone(
+                                        pj_pool_t *pool, 
+                                        const pjmedia_codec_param *src)
+{
+    pjmedia_codec_param *p;
+    unsigned i;
+
+    PJ_ASSERT_RETURN(pool && src, NULL);
+
+    p = PJ_POOL_ZALLOC_T(pool, pjmedia_codec_param);
+
+    /* Update codec param */
+    pj_memcpy(p, src, sizeof(pjmedia_codec_param));
+    for (i = 0; i < src->setting.dec_fmtp.cnt; ++i) {
+        pj_strdup(pool, &p->setting.dec_fmtp.param[i].name, 
+                  &src->setting.dec_fmtp.param[i].name);
+        pj_strdup(pool, &p->setting.dec_fmtp.param[i].val, 
+                  &src->setting.dec_fmtp.param[i].val);
+    }
+    for (i = 0; i < src->setting.enc_fmtp.cnt; ++i) {
+        pj_strdup(pool, &p->setting.enc_fmtp.param[i].name, 
+                  &src->setting.enc_fmtp.param[i].name);
+        pj_strdup(pool, &p->setting.enc_fmtp.param[i].val, 
+                  &src->setting.enc_fmtp.param[i].val);
+    }
+
+    return p;
+}
+
+
+/*
  * Initialize codec manager.
  */
@@ -601 +634 @@
     p = codec_desc->param;
     p->pool = pool;
-    p->param = PJ_POOL_ZALLOC_T(pool, pjmedia_codec_param);
 
     /* Update codec param */
-    pj_memcpy(p->param, param, sizeof(pjmedia_codec_param));
-    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);
-    }
-    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);
-    }
+    p->param = pjmedia_codec_param_clone(pool, param);
+    if (!p->param)
+        return PJ_EINVAL;
 
     pj_mutex_unlock(mgr->mutex);