Changeset 5799 for pjproject/trunk/pjmedia/src/pjmedia-codec/opus.c

Timestamp:

May 30, 2018 7:41:23 AM (6 years ago)

Author:

nanang

Message:

Re #2089:

• Set default max Opus RX frame length, i.e: param.info.max_rx_frame_size, to 1275. This is to avoid issue of truncated frame in jitter buffer when incoming frame length gets increased (after remote Opus encoder changes Opus params on the fly, e.g: ptime, VBR/CBR, sampling rate). Thanks Marcus Froeschl for the report, the investigation, and the solution.
• Fixed pjmedia_codec_opus_set_default_param() to initiate codec param with current default settings.
• Fixed some compile warnings.

File:

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

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

@@ -374 +374 @@
 
     TRACE_((THIS_FILE, "%s:%d: - TRACE", __FUNCTION__, __LINE__));
-    PJ_ASSERT_RETURN(cfg, PJ_EINVAL);
+    PJ_ASSERT_RETURN(cfg && param, PJ_EINVAL);
 
     codec_mgr = pjmedia_endpt_get_codec_mgr(opus_codec_factory.endpt);
@@ -390 +390 @@
         return PJ_EINVAL;
     }
+
+    status = pjmedia_codec_mgr_get_default_param(codec_mgr, info[0], param);
+    if (status != PJ_SUCCESS)
+        return status;
+
     param->info.clock_rate = opus_cfg.sample_rate = cfg->sample_rate;
     param->info.max_bps = opus_cfg.sample_rate * 2;
-    param->info.frm_ptime = opus_cfg.frm_ptime = cfg->frm_ptime;
+    opus_cfg.frm_ptime = cfg->frm_ptime;
+    param->info.frm_ptime = (pj_uint16_t)cfg->frm_ptime;
 
     /* Set channel count */
@@ -474 +480 @@
     attr->info.avg_bps             = opus_cfg.bit_rate;
     attr->info.max_bps             = opus_cfg.sample_rate * 2;
-    attr->info.frm_ptime           = opus_cfg.frm_ptime;
+    attr->info.frm_ptime           = (pj_uint16_t)opus_cfg.frm_ptime;
     attr->setting.frm_per_pkt      = 1;
     attr->info.pcm_bits_per_sample = 16;
     attr->setting.vad              = OPUS_DEFAULT_VAD;
     attr->setting.plc              = OPUS_DEFAULT_PLC;
+
+    /* Set max RX frame size to 1275 (max Opus frame size) to anticipate
+     * possible ptime change on the fly.
+     */
+    attr->info.max_rx_frame_size   = 1275;
 
     generate_fmtp(attr);
@@ -808 +819 @@
     int i, num_frames;
     int size, out_pos;
-    unsigned samples_per_frame;
+    unsigned samples_per_frame = 0;
 #if (USE_INCOMING_WORSE_SETTINGS)
     int bw;
@@ -1002 +1013 @@
                opus_data->cfg.channel_cnt);
     if (inframe->type != PJMEDIA_FRAME_TYPE_AUDIO || fec) {
-        frm_size = PJ_MIN(frm_size,
+        frm_size = PJ_MIN((unsigned)frm_size,
                           opus_data->cfg.sample_rate *
                           opus_data->dec_ptime / 1000);
@@ -1063 +1074 @@
     if (opus_data->dec_frame_index == -1) {
         /* Recover the first packet? Don't think so, fill it with zeroes. */
-        pj_uint16_t samples_per_frame;
+        unsigned samples_per_frame;
         samples_per_frame = opus_data->cfg.sample_rate * opus_data->dec_ptime/
                             1000;
@@ -1078 +1089 @@
                opus_data->cfg.channel_cnt);
     if (inframe->type != PJMEDIA_FRAME_TYPE_AUDIO) {
-        frm_size = PJ_MIN(frm_size, opus_data->cfg.sample_rate *
+        frm_size = PJ_MIN((unsigned)frm_size, opus_data->cfg.sample_rate *
                           opus_data->dec_ptime/1000);
     }