Changeset 874 for pjproject/trunk/pjmedia/src/pjmedia-codec/ilbc.c

Timestamp:

Dec 30, 2006 2:46:57 AM (18 years ago)

Author:

bennylp

Message:

Implement ticket #40: support for asymmetric encoding/decoding ptime (e.g. with iLBC when local and remote have different mode)

File:

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

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

@@ -64 +64 @@
                                     pj_pool_t *pool );
 static pj_status_t  ilbc_codec_open(pjmedia_codec *codec, 
-                                    const pjmedia_codec_param *attr );
+                                    pjmedia_codec_param *attr );
 static pj_status_t  ilbc_codec_close(pjmedia_codec *codec );
 static pj_status_t  ilbc_codec_modify(pjmedia_codec *codec, 
@@ -365 +365 @@
  */
 static pj_status_t ilbc_codec_open(pjmedia_codec *codec, 
-                                   const pjmedia_codec_param *param_attr )
+                                   pjmedia_codec_param *attr )
 {
     struct ilbc_codec *ilbc_codec = (struct ilbc_codec*)codec;
-    pjmedia_codec_param attr_copy, *attr;
     pj_status_t status;
 
@@ -374 +373 @@
     pj_assert(ilbc_codec->enc_ready == PJ_FALSE && 
               ilbc_codec->dec_ready == PJ_FALSE);
-
-    /* Copy param to temporary location since we need to modify fmtp_mode */
-    pj_memcpy(&attr_copy, param_attr, sizeof(*param_attr));
-    attr = &attr_copy;
 
     /* Decoder mode must be set */
@@ -392 +387 @@
     PJ_ASSERT_RETURN(attr->setting.enc_fmtp_mode==20 ||
                      attr->setting.enc_fmtp_mode==30, PJMEDIA_CODEC_EINMODE);
+
+    /* Update enc_ptime in the param */
+    if (attr->setting.enc_fmtp_mode != attr->setting.dec_fmtp_mode) {
+        attr->info.enc_ptime = attr->setting.enc_fmtp_mode;
+    } else {
+        attr->info.enc_ptime = 0;
+    }
 
     /* Create enc */