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

Timestamp:

Jun 6, 2008 12:15:23 PM (16 years ago)

Author:

nanang

Message:

Added field maximum bitrate to codec param, this is useful for providing safer frame size calculation, especially when peer's bitrate is unknown

File:

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

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

@@ -122 +122 @@
     int              framesize;         /* Frame size for current mode.     */
     int              bitrate;           /* Bit rate for current mode.       */
+    int              max_bitrate;       /* Max bit rate for current mode.   */
 };
 
@@ -161 +162 @@
         return PJMEDIA_CODEC_EFAILED;
 
-    /* We have to get maximum bitrate, so let's set maximum quality */
-    tmp = 10;
-    speex_encoder_ctl(state, SPEEX_SET_QUALITY, &tmp);
+    /* Set the quality */
+    if (p->quality != -1)
+        speex_encoder_ctl(state, SPEEX_SET_QUALITY, &p->quality);
 
     /* Sampling rate. */
@@ -179 +180 @@
     speex_encoder_ctl(state, SPEEX_GET_FRAME_SIZE, &p->samples_per_frame);
 
-    /* Now get the the averate bitrate */
+    /* Now get the average bitrate */
     speex_encoder_ctl(state, SPEEX_GET_BITRATE, &p->bitrate);
 
     /* Calculate framesize. */
     p->framesize = p->bitrate * 20 / 1000;
+
+    /* Now get the maximum bitrate by using maximum quality (=10) */
+    tmp = 10;
+    speex_encoder_ctl(state, SPEEX_SET_QUALITY, &tmp);
+    speex_encoder_ctl(state, SPEEX_GET_BITRATE, &p->max_bitrate);
 
     /* Destroy encoder. */
@@ -238 +244 @@
         ((options & PJMEDIA_SPEEX_NO_NB) == 0);
     spx_factory.speex_param[PARAM_NB].pt = PJMEDIA_RTP_PT_SPEEX_NB;
-    spx_factory.speex_param[PARAM_NB].mode = &speex_nb_mode;
+    spx_factory.speex_param[PARAM_NB].mode = speex_lib_get_mode(SPEEX_MODEID_NB);
     spx_factory.speex_param[PARAM_NB].clock_rate = 8000;
     spx_factory.speex_param[PARAM_NB].quality = quality;
@@ -246 +252 @@
         ((options & PJMEDIA_SPEEX_NO_WB) == 0);
     spx_factory.speex_param[PARAM_WB].pt = PJMEDIA_RTP_PT_SPEEX_WB;
-    spx_factory.speex_param[PARAM_WB].mode = &speex_wb_mode;
+    spx_factory.speex_param[PARAM_WB].mode = speex_lib_get_mode(SPEEX_MODEID_WB);
     spx_factory.speex_param[PARAM_WB].clock_rate = 16000;
     spx_factory.speex_param[PARAM_WB].quality = quality;
@@ -254 +260 @@
         ((options & PJMEDIA_SPEEX_NO_UWB) == 0);
     spx_factory.speex_param[PARAM_UWB].pt = PJMEDIA_RTP_PT_SPEEX_UWB;
-    spx_factory.speex_param[PARAM_UWB].mode = &speex_uwb_mode;
+    spx_factory.speex_param[PARAM_UWB].mode = speex_lib_get_mode(SPEEX_MODEID_UWB);
     spx_factory.speex_param[PARAM_UWB].clock_rate = 32000;
     spx_factory.speex_param[PARAM_UWB].quality = quality;
@@ -438 +444 @@
         attr->info.clock_rate = spx_factory.speex_param[PARAM_NB].clock_rate;
         attr->info.avg_bps = spx_factory.speex_param[PARAM_NB].bitrate;
+        attr->info.max_bps = spx_factory.speex_param[PARAM_NB].max_bitrate;
 
     } else if (id->clock_rate <= 16000) {
         attr->info.clock_rate = spx_factory.speex_param[PARAM_WB].clock_rate;
         attr->info.avg_bps = spx_factory.speex_param[PARAM_WB].bitrate;
+        attr->info.max_bps = spx_factory.speex_param[PARAM_WB].max_bitrate;
 
     } else {
@@ -447 +455 @@
         attr->info.clock_rate = spx_factory.speex_param[PARAM_UWB].clock_rate;
         attr->info.avg_bps = spx_factory.speex_param[PARAM_UWB].bitrate;
+        attr->info.max_bps = spx_factory.speex_param[PARAM_UWB].max_bitrate;
     }