Changeset 3425 for pjproject/branches/projects/2.0-dev/pjmedia/src/pjmedia/vid_codec.c

Timestamp:

Feb 28, 2011 6:59:47 PM (13 years ago)

Author:

nanang

Message:

Re #1182:

• Renamed vstreamutil.c to vid_steamutil.c just for filename format consistency reason.
• Updated sample app simpleua.c and vid_streamutil.c to sync with updated API, e.g: strip session usage, two media ports exported video streams for each dir.
• Added vid_streamutil.c capability to be able to stream video file (involving transcoding when video codec used in the file different to the video stream codec), also updated AVI player and ffmpeg codecs to be able to read and decode XVID/MPEG4 codec.
• Fixed bug wrong media type check in stream.c and vid_stream.c in creating stream info from SDP.
• Minor update: docs, logs, app samples makefiles.

File:

• pjproject/branches/projects/2.0-dev/pjmedia/src/pjmedia/vid_codec.c (modified) (3 diffs)

pjproject/branches/projects/2.0-dev/pjmedia/src/pjmedia/vid_codec.c

@@ -69 +69 @@
 
 /*
+ * Duplicate video codec parameter.
+ */
+PJ_DEF(pjmedia_vid_codec_param*) pjmedia_vid_codec_param_clone(
+                                        pj_pool_t *pool, 
+                                        const pjmedia_vid_codec_param *src)
+{
+    pjmedia_vid_codec_param *p;
+    unsigned i;
+
+    PJ_ASSERT_RETURN(pool && src, NULL);
+
+    p = PJ_POOL_ZALLOC_T(pool, pjmedia_vid_codec_param);
+
+    /* Update codec param */
+    pj_memcpy(p, src, sizeof(pjmedia_vid_codec_param));
+    for (i = 0; i < src->dec_fmtp.cnt; ++i) {
+        pj_strdup(pool, &p->dec_fmtp.param[i].name, 
+                  &src->dec_fmtp.param[i].name);
+        pj_strdup(pool, &p->dec_fmtp.param[i].val, 
+                  &src->dec_fmtp.param[i].val);
+    }
+    for (i = 0; i < src->enc_fmtp.cnt; ++i) {
+        pj_strdup(pool, &p->enc_fmtp.param[i].name, 
+                  &src->enc_fmtp.param[i].name);
+        pj_strdup(pool, &p->enc_fmtp.param[i].val, 
+                  &src->enc_fmtp.param[i].val);
+    }
+
+    return p;
+}
+
+/*
  * Initialize codec manager.
  */
@@ -306 +338 @@
 
 
+PJ_DEF(pj_status_t) pjmedia_vid_codec_mgr_get_codec_info2(
+                                    pjmedia_vid_codec_mgr *mgr,
+                                    pjmedia_format_id fmt_id,
+                                    const pjmedia_vid_codec_info **p_info)
+{
+    unsigned i;
+
+    PJ_ASSERT_RETURN(p_info, PJ_EINVAL);
+
+    if (!mgr) mgr = def_vid_codec_mgr;
+    PJ_ASSERT_RETURN(mgr, PJ_EINVAL);
+
+    pj_mutex_lock(mgr->mutex);
+
+    for (i=0; i<mgr->codec_cnt; ++i) {
+        if (mgr->codec_desc[i].info.fmt_id == fmt_id) {
+            *p_info = &mgr->codec_desc[i].info;
+
+            pj_mutex_unlock(mgr->mutex);
+            return PJ_SUCCESS;
+        }
+    }
+
+    pj_mutex_unlock(mgr->mutex);
+
+    return PJMEDIA_CODEC_EUNSUP;
+}
+
+
 /*
  * Convert codec info struct into a unique codec identifier.
@@ -633 +694 @@
     }
 
-    p = PJ_POOL_ZALLOC_T(pool, pjmedia_vid_codec_param);
-    p = codec_desc->def_param;
-
-    /* Update codec param */
-    pj_memcpy(p, param, sizeof(pjmedia_vid_codec_param));
-    for (i = 0; i < param->dec_fmtp.cnt; ++i) {
-        pj_strdup(pool, &p->dec_fmtp.param[i].name, 
-                  &param->dec_fmtp.param[i].name);
-        pj_strdup(pool, &p->dec_fmtp.param[i].val, 
-                  &param->dec_fmtp.param[i].val);
-    }
-    for (i = 0; i < param->enc_fmtp.cnt; ++i) {
-        pj_strdup(pool, &p->enc_fmtp.param[i].name, 
-                  &param->enc_fmtp.param[i].name);
-        pj_strdup(pool, &p->enc_fmtp.param[i].val, 
-                  &param->enc_fmtp.param[i].val);
-    }
+    /* Update codec default param */
+    p = pjmedia_vid_codec_param_clone(pool, param);
+    if (!p)
+        return PJ_EINVAL;
+    codec_desc->def_param = p;
 
     pj_mutex_unlock(mgr->mutex);