Changeset 3074 for pjproject/trunk/pjsip/src/pjsua-lib/pjsua_media.c

Timestamp:

Jan 26, 2010 3:29:23 PM (14 years ago)

Author:

nanang

Message:

Ticket #1028:

• Added new API pjmedia_codec_mgr_set_default_param() to set/update default codec parameter and implemented pjsua_codec_set_param() based on it.
• Added mutex in codec manager to protect states manipulations.
• Modified API pjmedia_codec_mgr_init() to add pool factory param.
• Added new API pjmedia_codec_mgr_destroy().
• Updated passthrough codec AMR to regard peer's mode-set setting.
• Fixed VAS audio device to apply AMR encoding bitrate setting.
• Fixed IPP codec codec_open() to update AMR bitrate info (for stream) when AMR encoding bitrate is not using the default, e.g: requested by peer via format param 'mode-set' in SDP.

File:

• pjproject/trunk/pjsip/src/pjsua-lib/pjsua_media.c (modified) (1 diff)

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

@@ -3055 +3055 @@
  * Set codec parameters.
  */
-PJ_DEF(pj_status_t) pjsua_codec_set_param( const pj_str_t *id,
+PJ_DEF(pj_status_t) pjsua_codec_set_param( const pj_str_t *codec_id,
                                            const pjmedia_codec_param *param)
 {
-    PJ_UNUSED_ARG(id);
-    PJ_UNUSED_ARG(param);
-    PJ_TODO(set_codec_param);
-    return PJ_SUCCESS;
-}
+    const pjmedia_codec_info *info[2];
+    pjmedia_codec_mgr *codec_mgr;
+    unsigned count = 2;
+    pj_status_t status;
+
+    codec_mgr = pjmedia_endpt_get_codec_mgr(pjsua_var.med_endpt);
+
+    status = pjmedia_codec_mgr_find_codecs_by_id(codec_mgr, codec_id,
+                                                 &count, info, NULL);
+    if (status != PJ_SUCCESS)
+        return status;
+
+    /* Codec ID should be specific, except for G.722.1 */
+    if (count > 1 && 
+        pj_strnicmp2(codec_id, "G7221/16", 8) != 0 &&
+        pj_strnicmp2(codec_id, "G7221/32", 8) != 0)
+    {
+        pj_assert(!"Codec ID is not specific");
+        return PJ_ETOOMANY;
+    }
+
+    status = pjmedia_codec_mgr_set_default_param(codec_mgr, info[0], param);
+    return status;
+}