Changeset 5371 for pjproject

Timestamp:

Jun 30, 2016 3:36:39 AM (8 years ago)

Author:

riza

Message:

Re #1928: Fixed set bitrate on opus codec might not change the codec param and support opus automatic bitrate setting.

File:

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

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

@@ -398 +398 @@
     }
     opus_cfg.bit_rate = cfg->bit_rate;
+    param->info.avg_bps = opus_cfg.bit_rate;
 
     /* Set expected packet loss */
@@ -462 +463 @@
     attr->info.clock_rate          = opus_cfg.sample_rate;
     attr->info.channel_cnt         = opus_cfg.channel_cnt;
-    attr->info.avg_bps             = (opus_cfg.bit_rate > 0) ?
-                                     opus_cfg.bit_rate :
-                                     opus_cfg.sample_rate; // Estimate
+    attr->info.avg_bps             = opus_cfg.bit_rate;
     attr->info.max_bps             = opus_cfg.bit_rate * 2;
     attr->info.frm_ptime           = 20;
@@ -588 +587 @@
     struct opus_data *opus_data = (struct opus_data *)codec->codec_data;
     int idx, err;
+    pj_bool_t auto_bit_rate = PJ_TRUE;
 
     PJ_ASSERT_RETURN(codec && attr && opus_data, PJ_EINVAL);
@@ -630 +630 @@
     if (idx >= 0) {
         unsigned rate;
+        auto_bit_rate = PJ_FALSE;
         rate = (unsigned)pj_strtoul(&attr->setting.enc_fmtp.param[idx].val);
         if (rate < attr->info.avg_bps)
@@ -684 +685 @@
     opus_encoder_ctl(opus_data->enc, OPUS_SET_SIGNAL(OPUS_SIGNAL_VOICE));
     /* Set bitrate */
-    opus_encoder_ctl(opus_data->enc, OPUS_SET_BITRATE(attr->info.avg_bps));
+    opus_encoder_ctl(opus_data->enc, OPUS_SET_BITRATE(auto_bit_rate?
+                                                      OPUS_AUTO:
+                                                      attr->info.avg_bps));
     /* Set VAD */
     opus_encoder_ctl(opus_data->enc, OPUS_SET_DTX(attr->setting.vad ? 1 : 0));
@@ -767 +770 @@
     /* Set bitrate */
     opus_data->cfg.bit_rate = attr->info.avg_bps;
-    opus_encoder_ctl(opus_data->enc, OPUS_SET_BITRATE(attr->info.avg_bps));
+    opus_encoder_ctl(opus_data->enc, OPUS_SET_BITRATE(attr->info.avg_bps?
+                                                      attr->info.avg_bps:
+                                                      OPUS_AUTO));
     /* Set VAD */
     opus_encoder_ctl(opus_data->enc, OPUS_SET_DTX(attr->setting.vad ? 1 : 0));