Changeset 5831 for pjproject

Timestamp:

Jul 23, 2018 6:35:57 AM (6 years ago)

Author:

ming

Message:

Fixed #2131: Incorrect Opus fmtp settings

Location:

pjproject/trunk/pjmedia

Files:

• include/pjmedia-codec/opus.h (modified) (1 diff)
• src/pjmedia-codec/opus.c (modified) (8 diffs)

pjproject/trunk/pjmedia/include/pjmedia-codec/opus.h

@@ -140 +140 @@
  *
  * @param cfg           Opus codec configuration.
- * @param param         The new default Opus codec parameter.
+ * @param param         On input, the default Opus codec parameter to be set.
+ *                      On output, the current default Opus codec parameter
+ *                      after setting. This may be different from the input
+ *                      because some settings can be rejected, or overwritten
+ *                      by the Opus codec configuration above.
  *
  * @return              PJ_SUCCESS on success.

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

@@ -300 +300 @@
 }
 
+static void remove_fmtp(pjmedia_codec_fmtp *fmtp, pj_str_t *name)
+{
+    int i, j;
+    for (i = 0; i < fmtp->cnt; i++) {
+        if (pj_stricmp(&fmtp->param[i].name, name) == 0) {
+            fmtp->cnt--;
+            for (j = i; j < fmtp->cnt; j++) {
+                fmtp->param[i].name = fmtp->param[i+1].name;
+                fmtp->param[i].val = fmtp->param[i+1].val;
+            }
+        }
+    }
+}
+
 static pj_status_t generate_fmtp(pjmedia_codec_param *attr)
 {
@@ -317 +331 @@
         if (idx >= 0)
             attr->setting.dec_fmtp.param[idx].val = pj_str(clockrate_str);
+    } else {
+        remove_fmtp(&attr->setting.dec_fmtp, &STR_MAX_PLAYBACK);
+        remove_fmtp(&attr->setting.dec_fmtp, &STR_MAX_CAPTURE);
     }
 
@@ -327 +344 @@
             attr->setting.dec_fmtp.param[idx].val = pj_str(bitrate_str);
         }
+    } else {
+        remove_fmtp(&attr->setting.dec_fmtp, &STR_MAX_BIT_RATE);
     }
 
@@ -337 +356 @@
         if (idx >= 0)
             attr->setting.dec_fmtp.param[idx].val = pj_str("1");
+    } else {
+        remove_fmtp(&attr->setting.dec_fmtp, &STR_STEREO);
+        remove_fmtp(&attr->setting.dec_fmtp, &STR_SPROP_STEREO);
     }
 
@@ -343 +365 @@
         if (idx >= 0)
             attr->setting.dec_fmtp.param[idx].val = pj_str("1");
+    } else {
+        remove_fmtp(&attr->setting.dec_fmtp, &STR_CBR);
     }
 
@@ -349 +373 @@
         if (idx >= 0)
             attr->setting.dec_fmtp.param[idx].val = pj_str("1");
+    } else {
+        remove_fmtp(&attr->setting.dec_fmtp, &STR_INBAND_FEC);
     }
 
@@ -355 +381 @@
         if (idx >= 0)
             attr->setting.dec_fmtp.param[idx].val = pj_str("1");
+    } else {
+        remove_fmtp(&attr->setting.dec_fmtp, &STR_DTX);
     }
     
@@ -390 +418 @@
         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;