sipwise
/
jitsi
mirror of https://github.com/sipwise/jitsi.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Add option in video advanced settings to disable custom framerate and to restore defaults.

Browse Source
cusax-fix
Damian Minkov 15 years ago
parent b6573bb94a
commit 367514a9f4
4 changed files with 79 additions and 15 deletions
Show Stats Download Patch File Download Diff File

3
resources/languages/resources.properties
Unescape View File

@ -1052,8 +1052,9 @@ impl.media.configform.UP=&Up
impl.media.configform.VIDEO=&Camera:
impl.media.configform.VIDEO_MORE_SETTINGS=More settings:
impl.media.configform.VIDEO_RESOLUTION=Video resolution
impl.media.configform.VIDEO_FRAME_RATE=Frame rate (per sec.)
impl.media.configform.VIDEO_FRAME_RATE=Custom frame rate (per sec.)
impl.media.configform.VIDEO_PACKETS_POLICY=Maximum allowed bandwidth (kBytes/s)
impl.media.configform.VIDEO_RESET=Reset defaults
impl.neomedia.configform.AUDIO=Audio
impl.neomedia.configform.VIDEO=Video

83
src/net/java/sip/communicator/impl/neomedia/MediaConfiguration.java
Unescape View File

@ -674,11 +674,26 @@ private static Component createVideoAdvancedSettings()
final DeviceConfiguration deviceConfig =
mediaService.getDeviceConfiguration();
final TransparentPanel centerPanel =
TransparentPanel centerPanel =
new TransparentPanel(new GridBagLayout());
centerPanel.setMaximumSize(new Dimension(WIDTH, 150));
centerPanel.setVisible(false);
advancedPanel.add(centerPanel, BorderLayout.CENTER);
JButton resetDefaultsButton = new JButton(
resources.getI18NString(
"impl.media.configform.VIDEO_RESET"));
JPanel resetButtonPanel = new TransparentPanel(
new FlowLayout(FlowLayout.RIGHT));
resetButtonPanel.add(resetDefaultsButton);
final JPanel centerAdvancedPanel =
new TransparentPanel(new BorderLayout());
centerAdvancedPanel.add(centerPanel, BorderLayout.CENTER);
centerAdvancedPanel.add(resetButtonPanel, BorderLayout.SOUTH);
centerAdvancedPanel.setBorder(BorderFactory.createLineBorder(
centerAdvancedPanel.getForeground()));
centerAdvancedPanel.setVisible(false);
advancedPanel.add(centerAdvancedPanel, BorderLayout.CENTER);
advButton.addMouseListener(new MouseAdapter()
{
@ -687,11 +702,12 @@ public void mouseClicked(MouseEvent e)
{
advButton.setIcon(
NeomediaActivator.getResources().getImage(
centerPanel.isVisible()
centerAdvancedPanel.isVisible()
? "service.gui.icons.RIGHT_ARROW_ICON"
: "service.gui.icons.DOWN_ARROW_ICON"));
centerPanel.setVisible(!centerPanel.isVisible());
centerAdvancedPanel.setVisible(
!centerAdvancedPanel.isVisible());
advancedPanel.revalidate();
@ -703,6 +719,7 @@ public void mouseClicked(MouseEvent e)
GridBagConstraints constraints = new GridBagConstraints();
constraints.fill = GridBagConstraints.HORIZONTAL;
constraints.anchor = GridBagConstraints.NORTHWEST;
constraints.insets = new Insets(5, 5, 0, 0);
constraints.gridx = 0;
constraints.weightx = 0;
constraints.weighty = 0;
@ -712,10 +729,12 @@ public void mouseClicked(MouseEvent e)
resources.getI18NString("impl.media.configform.VIDEO_RESOLUTION")),
constraints);
constraints.gridy = 1;
centerPanel.add(new JLabel(
resources.getI18NString("impl.media.configform.VIDEO_FRAME_RATE")),
constraints);
constraints.insets = new Insets(0, 0, 0, 0);
final JCheckBox frameRateCheck = new JCheckBox(
resources.getI18NString("impl.media.configform.VIDEO_FRAME_RATE"));
centerPanel.add(frameRateCheck, constraints);
constraints.gridy = 2;
constraints.insets = new Insets(5, 5, 0, 0);
centerPanel.add(new JLabel(
resources.getI18NString(
"impl.media.configform.VIDEO_PACKETS_POLICY")),
@ -724,6 +743,7 @@ public void mouseClicked(MouseEvent e)
constraints.weightx = 1;
constraints.gridx = 1;
constraints.gridy = 0;
constraints.insets = new Insets(5, 0, 0, 5);
Object[] resolutionValues
= new Object[DeviceConfiguration.SUPPORTED_RESOLUTIONS.length + 1];
System.arraycopy(DeviceConfiguration.SUPPORTED_RESOLUTIONS, 0,
@ -734,8 +754,9 @@ public void mouseClicked(MouseEvent e)
sizeCombo.setEditable(false);
centerPanel.add(sizeCombo, constraints);
// default value is 20
final JSpinner frameRate = new JSpinner(new SpinnerNumberModel(
DeviceConfiguration.DEFAULT_FRAME_RATE, 5, 25, 1));
20, 5, 30, 1));
frameRate.addChangeListener(new ChangeListener()
{
public void stateChanged(ChangeEvent e)
@ -746,11 +767,29 @@ public void stateChanged(ChangeEvent e)
}
});
constraints.gridy = 1;
constraints.insets = new Insets(0, 0, 0, 5);
centerPanel.add(frameRate, constraints);
frameRateCheck.addActionListener(new ActionListener()
{
public void actionPerformed(ActionEvent e)
{
if(frameRateCheck.isSelected())
{
deviceConfig.setFrameRate(
((SpinnerNumberModel)frameRate.getModel())
.getNumber().intValue());
}
else // unlimited framerate
deviceConfig.setFrameRate(-1);
frameRate.setEnabled(frameRateCheck.isSelected());
}
});
final JSpinner videoMaxBandwidth = new JSpinner(new SpinnerNumberModel(
deviceConfig.getVideoMaxBandwidth(),
1, DeviceConfiguration.DEFAULT_VIDEO_MAX_BANDWIDTH, 1));
1, 256, 1));
videoMaxBandwidth.addChangeListener(new ChangeListener()
{
public void stateChanged(ChangeEvent e)
@ -762,8 +801,24 @@ public void stateChanged(ChangeEvent e)
});
constraints.gridx = 1;
constraints.gridy = 2;
constraints.insets = new Insets(0, 0, 5, 5);
centerPanel.add(videoMaxBandwidth, constraints);
resetDefaultsButton.addActionListener(new ActionListener()
{
public void actionPerformed(ActionEvent e)
{
// reset to defaults
sizeCombo.setSelectedIndex(0);
frameRateCheck.setSelected(false);
frameRate.setEnabled(false);
// unlimited framerate
deviceConfig.setFrameRate(-1);
videoMaxBandwidth.setValue(
DeviceConfiguration.DEFAULT_VIDEO_MAX_BANDWIDTH);
}
});
// load selected value or auto
Dimension videoSize = deviceConfig.getVideoSize();
@ -795,7 +850,13 @@ public void actionPerformed(ActionEvent e)
}
});
frameRate.setValue(deviceConfig.getFrameRate());
frameRateCheck.setSelected(
deviceConfig.getFrameRate()
!= DeviceConfiguration.DEFAULT_FRAME_RATE);
frameRate.setEnabled(frameRateCheck.isSelected());
if(frameRate.isEnabled())
frameRate.setValue(deviceConfig.getFrameRate());
return advancedPanel;
}

4
src/net/java/sip/communicator/impl/neomedia/device/DeviceConfiguration.java
Unescape View File

@ -226,9 +226,9 @@ public class DeviceConfiguration
private int frameRate = -1;
/**
* The default frame rate.
* The default frame rate, -1 unlimited.
*/
public static final int DEFAULT_FRAME_RATE = 20;
public static final int DEFAULT_FRAME_RATE = -1;
/**
* The property we use to store the settings for maximum allowed video

4
src/net/java/sip/communicator/impl/neomedia/device/VideoMediaDeviceSession.java
Unescape View File

@ -188,7 +188,9 @@ protected DataSource createCaptureDevice()
if ((maxSupportedFrameRate > 0)
&& (frameRate > maxSupportedFrameRate))
frameRate = maxSupportedFrameRate;
frameRateControl.setFrameRate(frameRate);
if(frameRate > 0)
frameRateControl.setFrameRate(frameRate);
}
/*

Write Preview
Loading…
Cancel
Save