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

Timestamp:

Jul 15, 2009 5:55:16 PM (15 years ago)

Author:

nanang

Message:

Ticket #919:

• Added default ilbc mode into codec passthrough setting.
• Added iLBC mode 'negotiation' in iLBC codec_open().
• Updated stream_create() to prioritize codec_open(), that may update the codec params, over stream initializations involving codec params.

File:

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

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

@@ -377 +377 @@
     struct ilbc_codec *ilbc_codec = (struct ilbc_codec*)codec;
     pj_status_t status;
-    unsigned i, dec_fmtp_mode = 0, enc_fmtp_mode = 0;
+    unsigned i;
+    pj_uint16_t dec_fmtp_mode = DEFAULT_MODE, 
+                enc_fmtp_mode = DEFAULT_MODE;
 
     pj_assert(ilbc_codec != NULL);
@@ -387 +389 @@
         if (pj_stricmp(&attr->setting.dec_fmtp.param[i].name, &STR_MODE) == 0)
         {
-            dec_fmtp_mode = (unsigned)
+            dec_fmtp_mode = (pj_uint16_t)
                             pj_strtoul(&attr->setting.dec_fmtp.param[i].val);
             break;
@@ -401 +403 @@
         if (pj_stricmp(&attr->setting.enc_fmtp.param[i].name, &STR_MODE) == 0)
         {
-            enc_fmtp_mode = (unsigned)
+            enc_fmtp_mode = (pj_uint16_t)
                             pj_strtoul(&attr->setting.enc_fmtp.param[i].val);
             break;
@@ -407 +409 @@
     }
 
-    /* The enc mode must be set in the attribute 
-     * (from the mode parameter in fmtp attribute in the SDP
-     * received from remote) 
+    PJ_ASSERT_RETURN(enc_fmtp_mode==20 || enc_fmtp_mode==30, 
+                     PJMEDIA_CODEC_EINMODE);
+
+    /* Both sides of a bi-directional session MUST use the same "mode" value.
+     * In this point, possible values are only 20 or 30, so when encoder and
+     * decoder modes are not same, just use the default mode, it is 30.
      */
-    if (enc_fmtp_mode == 0)
-        enc_fmtp_mode = dec_fmtp_mode;
-
-    PJ_ASSERT_RETURN(enc_fmtp_mode==20 ||
-                     enc_fmtp_mode==30, PJMEDIA_CODEC_EINMODE);
-
-    /* Update enc_ptime in the param */
     if (enc_fmtp_mode != dec_fmtp_mode) {
-        attr->info.enc_ptime = (pj_uint16_t)enc_fmtp_mode;
-    } else {
-        attr->info.enc_ptime = 0;
-    }
-
-    /* Create enc */
+        enc_fmtp_mode = dec_fmtp_mode = DEFAULT_MODE;
+        PJ_LOG(4,(ilbc_codec->obj_name, 
+                  "Normalized iLBC encoder and decoder modes to %d", 
+                  DEFAULT_MODE));
+    }
+
+    /* Update some attributes based on negotiated mode. */
+    attr->info.avg_bps = (dec_fmtp_mode == 30? 13333 : 15200);
+    attr->info.frm_ptime = dec_fmtp_mode;
+
+    /* Create encoder */
     ilbc_codec->enc_frame_size = initEncode(&ilbc_codec->enc, enc_fmtp_mode);
     ilbc_codec->enc_samples_per_frame = CLOCK_RATE * enc_fmtp_mode / 1000;
@@ -433 +436 @@
                                                    dec_fmtp_mode,
                                                    attr->setting.penh);
-    if (dec_fmtp_mode == 20)
-        ilbc_codec->dec_frame_size = 38;
-    else if (dec_fmtp_mode == 30)
-        ilbc_codec->dec_frame_size = 50;
-    else {
-        pj_assert(!"Invalid iLBC mode");
-        ilbc_codec->dec_frame_size = ilbc_codec->enc_frame_size;
-    }
+    ilbc_codec->dec_frame_size = (dec_fmtp_mode == 20? 38 : 50);
     ilbc_codec->dec_ready = PJ_TRUE;
 
@@ -460 +456 @@
 
     PJ_LOG(5,(ilbc_codec->obj_name, 
-              "iLBC codec opened, encoder mode=%d, decoder mode=%d",
-              enc_fmtp_mode, dec_fmtp_mode));
+              "iLBC codec opened, mode=%d", dec_fmtp_mode));
 
     return PJ_SUCCESS;