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

Timestamp:

Dec 26, 2006 9:18:11 PM (17 years ago)

Author:

bennylp

Message:

Ticket #54: added ability to modify some codec parameters on the fly

File:

• pjproject/trunk/pjmedia/src/pjmedia-codec/ilbc.c (modified) (7 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, 
-                                    pjmedia_codec_param *attr );
+                                    const pjmedia_codec_param *attr );
 static pj_status_t  ilbc_codec_close(pjmedia_codec *codec );
+static pj_status_t  ilbc_codec_modify(pjmedia_codec *codec, 
+                                      const pjmedia_codec_param *attr );
 static pj_status_t  ilbc_codec_parse(pjmedia_codec *codec,
                                      void *pkt,
@@ -90 +92 @@
     &ilbc_codec_open,
     &ilbc_codec_close,
+    &ilbc_codec_modify,
     &ilbc_codec_parse,
     &ilbc_codec_encode,
@@ -124 +127 @@
     char                 obj_name[PJ_MAX_OBJ_NAME];
     pjmedia_silence_det *vad;
+    pj_bool_t            vad_enabled;
     pj_bool_t            plc_enabled;
 
@@ -361 +365 @@
  */
 static pj_status_t ilbc_codec_open(pjmedia_codec *codec, 
-                                   pjmedia_codec_param *attr )
+                                   const pjmedia_codec_param *param_attr )
 {
     struct ilbc_codec *ilbc_codec = (struct ilbc_codec*)codec;
+    pjmedia_codec_param attr_copy, *attr;
+    pj_status_t status;
 
     pj_assert(ilbc_codec != NULL);
     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 */
@@ -405 +415 @@
 
     /* Save plc flags */
-    ilbc_codec->plc_enabled = attr->setting.plc != 0;
-
-    /* Create silence detector, if wanted. */
-    if (attr->setting.vad != 0) {
-        pj_status_t status;
-        status = pjmedia_silence_det_create(ilbc_codec->pool, CLOCK_RATE,
-                                            ilbc_codec->enc_samples_per_frame,
-                                            &ilbc_codec->vad);
-        if (status != PJ_SUCCESS)
-            return status;
-    }
+    ilbc_codec->plc_enabled = (attr->setting.plc != 0);
+
+    /* Create silence detector. */
+    ilbc_codec->vad_enabled = (attr->setting.vad != 0);
+    status = pjmedia_silence_det_create(ilbc_codec->pool, CLOCK_RATE,
+                                        ilbc_codec->enc_samples_per_frame,
+                                        &ilbc_codec->vad);
+    if (status != PJ_SUCCESS)
+        return status;
 
     PJ_LOG(5,(ilbc_codec->obj_name, 
@@ -439 +447 @@
 }
 
+/*
+ * Modify codec settings.
+ */
+static pj_status_t  ilbc_codec_modify(pjmedia_codec *codec, 
+                                      const pjmedia_codec_param *attr )
+{
+    struct ilbc_codec *ilbc_codec = (struct ilbc_codec*)codec;
+
+    ilbc_codec->plc_enabled = (attr->setting.plc != 0);
+    ilbc_codec->vad_enabled = (attr->setting.vad != 0);
+
+    return PJ_SUCCESS;
+}
 
 /*
@@ -494 +515 @@
 
     /* Detect silence */
-    if (ilbc_codec->vad) {
+    if (ilbc_codec->vad_enabled) {
         pj_bool_t is_silence;