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

Timestamp:

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

Author:

bennylp

Message:

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

File:

• pjproject/trunk/pjmedia/src/pjmedia-codec/speex_codec.c (modified) (5 diffs)

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

@@ -60 +60 @@
                                     pj_pool_t *pool );
 static pj_status_t  spx_codec_open( pjmedia_codec *codec, 
-                                    pjmedia_codec_param *attr );
+                                    const pjmedia_codec_param *attr );
 static pj_status_t  spx_codec_close( pjmedia_codec *codec );
+static pj_status_t  spx_codec_modify(pjmedia_codec *codec, 
+                                     const pjmedia_codec_param *attr );
 static pj_status_t  spx_codec_parse( pjmedia_codec *codec,
                                      void *pkt,
@@ -86 +88 @@
     &spx_codec_open,
     &spx_codec_close,
+    &spx_codec_modify,
     &spx_codec_parse,
     &spx_codec_encode,
@@ -545 +548 @@
  */
 static pj_status_t spx_codec_open( pjmedia_codec *codec, 
-                                   pjmedia_codec_param *attr )
+                                   const pjmedia_codec_param *attr )
 {
     struct spx_private *spx;
@@ -552 +555 @@
     spx = (struct spx_private*) codec->codec_data;
     id = spx->param_id;
+
+    /* Only supports one frame per packet */
+    PJ_ASSERT_RETURN(attr->setting.frm_per_pkt==1, PJ_EINVAL);
 
     /* 
@@ -626 +632 @@
         speex_bits_destroy( &spx->dec_bits );
     }
+
+    return PJ_SUCCESS;
+}
+
+
+/*
+ * Modify codec settings.
+ */
+static pj_status_t  spx_codec_modify(pjmedia_codec *codec, 
+                                     const pjmedia_codec_param *attr )
+{
+    struct spx_private *spx;
+    int tmp;
+
+    spx = (struct spx_private*) codec->codec_data;
+
+    /* Only supports one frame per packet */
+    PJ_ASSERT_RETURN(attr->setting.frm_per_pkt==1, PJ_EINVAL);
+
+    /* VAD */
+    tmp = (attr->setting.vad != 0);
+    speex_encoder_ctl(spx->enc, SPEEX_SET_VAD, &tmp);
+    speex_encoder_ctl(spx->enc, SPEEX_SET_DTX, &tmp);
+
+    /* PENH */
+    tmp = attr->setting.penh;
+    speex_decoder_ctl(spx->dec, SPEEX_SET_ENH, &tmp);
 
     return PJ_SUCCESS;