Changeset 4293 for pjproject/trunk/pjmedia/src/pjmedia-codec/silk.c

Timestamp:

Nov 3, 2012 3:32:09 AM (12 years ago)

Author:

ming

Message:

Re #1586: Fixed useInBandFEC setting and default value setting in pjmedia_codec_silk_set_config()

File:

• pjproject/trunk/pjmedia/src/pjmedia-codec/silk.c (modified) (4 diffs)

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

@@ -40 +40 @@
 #endif
 
-#define FRAME_LENGTH_MS         20
+#define FRAME_LENGTH_MS                 20
+#define SILK_ENC_CTL_PACKET_LOSS_PCT    10
+#define SILK_MIN_BITRATE                5000
 #define CALC_BITRATE_QUALITY(quality, max_br) \
                 (quality * max_br / 10)
@@ -311 +313 @@
     {
         if (silk_factory.silk_param[i].clock_rate == clock_rate) {
+            int quality = PJMEDIA_CODEC_SILK_DEFAULT_QUALITY;
+            int complexity = PJMEDIA_CODEC_SILK_DEFAULT_COMPLEXITY;
+
             silk_factory.silk_param[i].enabled = opt->enabled;
-            silk_factory.silk_param[i].complexity = opt->complexity;
+            if (opt->complexity >= 0)
+                complexity = opt->complexity;
+            silk_factory.silk_param[i].complexity = complexity;
+            if (opt->quality >= 0)
+                quality = opt->quality;
             silk_factory.silk_param[i].bitrate =
-                CALC_BITRATE_QUALITY(opt->quality,
+                CALC_BITRATE_QUALITY(quality,
                                      silk_factory.silk_param[i].max_bitrate);
+            if (silk_factory.silk_param[i].bitrate < SILK_MIN_BITRATE)
+                silk_factory.silk_param[i].bitrate = SILK_MIN_BITRATE;
+
             return PJ_SUCCESS;
         }
@@ -589 +601 @@
 
     /* Check fmtp params */
-    enc_use_fec = PJ_FALSE;
+    enc_use_fec = PJ_TRUE;
     enc_bitrate = sp->bitrate;
     for (i = 0; i < attr->setting.enc_fmtp.cnt; ++i) {
@@ -615 +627 @@
     silk->enc_ctl.maxInternalSampleRate = attr->info.clock_rate;
     silk->enc_ctl.packetSize            = silk->samples_per_frame;
-    silk->enc_ctl.packetLossPercentage  = 0;
+    /* For useInBandFEC setting to be useful, we need to set
+     * packetLossPercentage greater than LBRR_LOSS_THRES (1)
+     */
+    silk->enc_ctl.packetLossPercentage  = SILK_ENC_CTL_PACKET_LOSS_PCT;
     silk->enc_ctl.useInBandFEC          = enc_use_fec;
     silk->enc_ctl.useDTX                = attr->setting.vad;