From 902a60df2b129af65d1fcb13ab2cd103522b91ae Mon Sep 17 00:00:00 2001
From: Boris Grozev <boris@jitsi.org>
Date: Mon, 8 Oct 2012 13:15:47 +0000
Subject: [PATCH] Fixes a regression with opus and the problem with FEC not
being used for SILK.
---
src/org/jitsi/impl/neomedia/codec/audio/silk/JavaEncoder.java | 2 +-
.../impl/neomedia/codec/audio/silk/Silk_control_codec_FLP.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/org/jitsi/impl/neomedia/codec/audio/silk/JavaEncoder.java b/src/org/jitsi/impl/neomedia/codec/audio/silk/JavaEncoder.java
index d9f99968..0cd38b22 100644
--- a/src/org/jitsi/impl/neomedia/codec/audio/silk/JavaEncoder.java
+++ b/src/org/jitsi/impl/neomedia/codec/audio/silk/JavaEncoder.java
@@ -165,7 +165,7 @@ protected void doOpen()
encControl.bitRate = BITRATE;
encControl.complexity = COMPLEXITY;
encControl.maxInternalSampleRate = encControl.API_sampleRate;
- encControl.packetLossPercentage = assumePacketLoss ? 2 : 0;
+ encControl.packetLossPercentage = assumePacketLoss ? 3 : 0;
encControl.packetSize
= (int)
((JavaDecoder.FRAME_DURATION * sampleRate * channels) / 1000);
diff --git a/src/org/jitsi/impl/neomedia/codec/audio/silk/Silk_control_codec_FLP.java b/src/org/jitsi/impl/neomedia/codec/audio/silk/Silk_control_codec_FLP.java
index 3df2d87d..55a22163 100644
--- a/src/org/jitsi/impl/neomedia/codec/audio/silk/Silk_control_codec_FLP.java
+++ b/src/org/jitsi/impl/neomedia/codec/audio/silk/Silk_control_codec_FLP.java
@@ -619,7 +619,7 @@ static void SKP_Silk_LBRR_ctrl_FLP(
*/
LBRR_usage = Silk_define.SKP_SILK_NO_LBRR;
if (psEnc.speech_activity > Silk_define_FLP.LBRR_SPEECH_ACTIVITY_THRES
- && psEnc.sCmn.PacketLoss_perc >= Silk_define.LBRR_LOSS_THRES)
+ && psEnc.sCmn.PacketLoss_perc > Silk_define.LBRR_LOSS_THRES)
{ // nb! maybe multiply loss prob and speech activity
LBRR_usage = Silk_define.SKP_SILK_ADD_LBRR_TO_PLUS1;
}
--
GitLab