diff --git a/lib/installer-exclude/libjitsi.jar b/lib/installer-exclude/libjitsi.jar index 479c46c2d..b1b93e333 100644 Binary files a/lib/installer-exclude/libjitsi.jar and b/lib/installer-exclude/libjitsi.jar differ diff --git a/resources/languages/resources.properties b/resources/languages/resources.properties index 1f00f0a89..4ebd3ac34 100644 --- a/resources/languages/resources.properties +++ b/resources/languages/resources.properties @@ -897,6 +897,7 @@ plugin.generalconfig.SILK_CONFIG=Silk plugin.generalconfig.SILK_USE_FEC=Use inband FEC: plugin.generalconfig.SILK_FORCE_FEC_PACKET_LOSS=Force the encoder to expect packet loss: plugin.generalconfig.SILK_SAT=Speech activity threshold (0-1): +plugin.generalconfig.SILK_ADVERTISE_FEC=Advertise FEC support in SDP: plugin.generalconfig.RESTORE=Restore defaults # gibberish accregwizz diff --git a/src/net/java/sip/communicator/plugin/generalconfig/SilkConfigForm.java b/src/net/java/sip/communicator/plugin/generalconfig/SilkConfigForm.java index 5ebac66fd..087d3104f 100644 --- a/src/net/java/sip/communicator/plugin/generalconfig/SilkConfigForm.java +++ b/src/net/java/sip/communicator/plugin/generalconfig/SilkConfigForm.java @@ -47,6 +47,13 @@ public class SilkConfigForm = "net.java.sip.communicator.impl.neomedia.codec.audio.silk." + "encoder.sat"; + /** + * The property name associated with the 'advertise fec' setting + */ + private static final String FEC_ADVERTISE_PROP + = "net.java.sip.communicator.impl.neomedia.codec.audio.silk." + + "encoder.advertisefec"; + /** * The default value for the SAT setting */ @@ -62,6 +69,11 @@ public class SilkConfigForm */ private static final boolean FEC_FORCE_PL_DEFAULT = true; + /** + * The default value for the 'advertise FEC' setting + */ + private static final boolean FEC_ADVERTISE_DEFAULT = false; + /** * The "restore defaults" button */ @@ -78,6 +90,11 @@ public class SilkConfigForm */ private final JCheckBox fecForcePLCheckbox = new JCheckBox(); + /** + * The " advertise FEC" checkbox + */ + private final JCheckBox advertiseFECCheckbox = new JCheckBox(); + /** * The "speech activity threshold" field */ @@ -121,6 +138,8 @@ public SilkConfigForm() "plugin.generalconfig.SILK_FORCE_FEC_PACKET_LOSS"))); labelPanel.add(new JLabel(Resources.getString( "plugin.generalconfig.SILK_SAT"))); + labelPanel.add(new JLabel(Resources.getString( + "plugin.generalconfig.SILK_ADVERTISE_FEC"))); fecCheckbox.addActionListener(new ActionListener() { @@ -137,7 +156,7 @@ public void actionPerformed(ActionEvent actionEvent) { fecForcePLCheckbox.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent actionEvent) { - configurationService.setProperty(FEC_PROP, + configurationService.setProperty(FEC_FORCE_PL_PROP, fecForcePLCheckbox.isSelected()); } }); @@ -160,6 +179,17 @@ public void focusLost(FocusEvent focusEvent) FEC_SAT_PROP, FEC_SAT_DEFAULT)); valuePanel.add(SATField); + advertiseFECCheckbox.addActionListener(new ActionListener() { + @Override + public void actionPerformed(ActionEvent actionEvent) { + configurationService.setProperty(FEC_ADVERTISE_PROP, + advertiseFECCheckbox.isSelected()); + } + }); + advertiseFECCheckbox.setSelected(configurationService.getBoolean( + FEC_ADVERTISE_PROP, FEC_ADVERTISE_DEFAULT)); + valuePanel.add(advertiseFECCheckbox); + southPanel.add(restoreButton); restoreButton.addActionListener(new ActionListener(){ @@ -168,7 +198,8 @@ public void actionPerformed(ActionEvent e) restoreDefaults(); } }); - + southPanel.add(new JLabel(Resources.getString( + "plugin.generalconfig.DEFAULT_LANGUAGE_RESTART_WARN"))); } /** @@ -185,5 +216,9 @@ private void restoreDefaults() SATField.setText(FEC_SAT_DEFAULT); configurationService.setProperty(FEC_SAT_PROP, FEC_SAT_DEFAULT); + + advertiseFECCheckbox.setSelected(FEC_ADVERTISE_DEFAULT); + configurationService.setProperty( + FEC_ADVERTISE_PROP, FEC_ADVERTISE_DEFAULT); } } \ No newline at end of file