mirror of https://github.com/sipwise/jitsi.git
Adds FEC support for the SILK codec. Minor clean-ups in EncodingConfiguration and MediaConfigurationImpl.
Boris Grozev
13 years ago
parent
4247259805
commit
19d2276dd4
Binary file not shown.
@ -0,0 +1,189 @@
|
||||
/*
|
||||
* Jitsi, the OpenSource Java VoIP and Instant Messaging client.
|
||||
*
|
||||
* Distributable under LGPL license.
|
||||
* See terms of license at gnu.org.
|
||||
*/
|
||||
package net.java.sip.communicator.plugin.generalconfig;
|
||||
|
||||
|
||||
import net.java.sip.communicator.util.swing.*;
|
||||
import org.jitsi.service.configuration.ConfigurationService;
|
||||
|
||||
import javax.swing.*;
|
||||
import java.awt.*;
|
||||
import java.awt.event.ActionEvent;
|
||||
import java.awt.event.ActionListener;
|
||||
import java.awt.event.FocusEvent;
|
||||
import java.awt.event.FocusListener;
|
||||
|
||||
|
||||
/**
|
||||
* Implements the Silk configuration panel.
|
||||
*
|
||||
* @author Boris Grozev
|
||||
*/
|
||||
public class SilkConfigForm
|
||||
extends TransparentPanel
|
||||
{
|
||||
/**
|
||||
* The property name associated with the 'use fec' setting
|
||||
*/
|
||||
private static final String FEC_PROP
|
||||
= "net.java.sip.communicator.impl.neomedia.codec.audio.silk." +
|
||||
"encoder.usefec";
|
||||
|
||||
/**
|
||||
* The property name associated with the 'force packet loss' setting
|
||||
*/
|
||||
private static final String FEC_FORCE_PL_PROP
|
||||
= "net.java.sip.communicator.impl.neomedia.codec.audio.silk." +
|
||||
"encoder.forcepacketloss";
|
||||
|
||||
/**
|
||||
* The property name associated with the 'speech activity threshold' setting
|
||||
*/
|
||||
private static final String FEC_SAT_PROP
|
||||
= "net.java.sip.communicator.impl.neomedia.codec.audio.silk." +
|
||||
"encoder.sat";
|
||||
|
||||
/**
|
||||
* The default value for the SAT setting
|
||||
*/
|
||||
private static final String FEC_SAT_DEFAULT = "0.5";
|
||||
|
||||
/**
|
||||
* The default value for the FEC setting
|
||||
*/
|
||||
private static final boolean FEC_DEFAULT = true;
|
||||
|
||||
/**
|
||||
* The default value for the FEC force packet loss setting
|
||||
*/
|
||||
private static final boolean FEC_FORCE_PL_DEFAULT = true;
|
||||
|
||||
/**
|
||||
* The "restore defaults" button
|
||||
*/
|
||||
private final JButton restoreButton = new JButton(Resources.getString(
|
||||
"plugin.generalconfig.RESTORE"));
|
||||
|
||||
/**
|
||||
* The "use fec" checkbox
|
||||
*/
|
||||
private final JCheckBox fecCheckbox = new JCheckBox();
|
||||
|
||||
/**
|
||||
* The "force packet loss" checkbox
|
||||
*/
|
||||
private final JCheckBox fecForcePLCheckbox = new JCheckBox();
|
||||
|
||||
/**
|
||||
* The "speech activity threshold" field
|
||||
*/
|
||||
private final JTextField SATField = new JTextField(6);
|
||||
|
||||
/**
|
||||
* The <tt>ConfigurationService</tt> to be used to access configuration
|
||||
*/
|
||||
ConfigurationService configurationService
|
||||
= GeneralConfigPluginActivator.getConfigurationService();
|
||||
|
||||
|
||||
/**
|
||||
* Initialize a new <tt>OpusConfigForm</tt> instance.
|
||||
*/
|
||||
public SilkConfigForm()
|
||||
{
|
||||
super(new BorderLayout());
|
||||
Box box = Box.createVerticalBox();
|
||||
add(box, BorderLayout.NORTH);
|
||||
|
||||
TransparentPanel contentPanel = new TransparentPanel();
|
||||
contentPanel.setLayout(new BorderLayout(10, 10));
|
||||
|
||||
box.add(contentPanel);
|
||||
|
||||
TransparentPanel labelPanel
|
||||
= new TransparentPanel(new GridLayout(0, 1, 2, 2));
|
||||
TransparentPanel valuePanel
|
||||
= new TransparentPanel(new GridLayout(0, 1, 2, 2));
|
||||
TransparentPanel southPanel
|
||||
= new TransparentPanel(new GridLayout(0, 1, 2, 2));
|
||||
|
||||
contentPanel.add(labelPanel, BorderLayout.WEST);
|
||||
contentPanel.add(valuePanel, BorderLayout.CENTER);
|
||||
contentPanel.add(southPanel, BorderLayout.SOUTH);
|
||||
|
||||
labelPanel.add(new JLabel(Resources.getString(
|
||||
"plugin.generalconfig.SILK_USE_FEC")));
|
||||
labelPanel.add(new JLabel(Resources.getString(
|
||||
"plugin.generalconfig.SILK_FORCE_FEC_PACKET_LOSS")));
|
||||
labelPanel.add(new JLabel(Resources.getString(
|
||||
"plugin.generalconfig.SILK_SAT")));
|
||||
|
||||
|
||||
fecCheckbox.addActionListener(new ActionListener() {
|
||||
@Override
|
||||
public void actionPerformed(ActionEvent actionEvent) {
|
||||
configurationService.setProperty(FEC_PROP,
|
||||
fecCheckbox.isSelected());
|
||||
}
|
||||
});
|
||||
fecCheckbox.setSelected(configurationService.getBoolean(
|
||||
FEC_PROP, FEC_DEFAULT));
|
||||
valuePanel.add(fecCheckbox);
|
||||
|
||||
fecForcePLCheckbox.addActionListener(new ActionListener() {
|
||||
@Override
|
||||
public void actionPerformed(ActionEvent actionEvent) {
|
||||
configurationService.setProperty(FEC_PROP,
|
||||
fecForcePLCheckbox.isSelected());
|
||||
}
|
||||
});
|
||||
fecForcePLCheckbox.setSelected(configurationService.getBoolean(
|
||||
FEC_FORCE_PL_PROP, FEC_FORCE_PL_DEFAULT));
|
||||
valuePanel.add(fecForcePLCheckbox);
|
||||
|
||||
SATField.addFocusListener(new FocusListener() {
|
||||
@Override
|
||||
public void focusGained(FocusEvent focusEvent){}
|
||||
|
||||
@Override
|
||||
public void focusLost(FocusEvent focusEvent)
|
||||
{
|
||||
configurationService.setProperty(FEC_SAT_PROP,
|
||||
SATField.getText());
|
||||
}
|
||||
});
|
||||
SATField.setText(configurationService.getString(
|
||||
FEC_SAT_PROP, FEC_SAT_DEFAULT));
|
||||
valuePanel.add(SATField);
|
||||
|
||||
|
||||
southPanel.add(restoreButton);
|
||||
restoreButton.addActionListener(new ActionListener(){
|
||||
public void actionPerformed(ActionEvent e)
|
||||
{
|
||||
restoreDefaults();
|
||||
}
|
||||
});
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* Restores the UI components and the configuration to their default state
|
||||
*/
|
||||
private void restoreDefaults()
|
||||
{
|
||||
fecCheckbox.setSelected(FEC_DEFAULT);
|
||||
configurationService.setProperty(FEC_PROP, FEC_DEFAULT);
|
||||
|
||||
fecForcePLCheckbox.setSelected(FEC_FORCE_PL_DEFAULT);
|
||||
configurationService.setProperty(
|
||||
FEC_FORCE_PL_PROP, FEC_FORCE_PL_DEFAULT);
|
||||
|
||||
SATField.setText(FEC_SAT_DEFAULT);
|
||||
configurationService.setProperty(FEC_SAT_PROP, FEC_SAT_DEFAULT);
|
||||
}
|
||||
}
|
||||
Loading…
Reference in new issue