Adds an option to set the video bitrate. Patches provided by Benoît Laniel on the dev@ mailing list (under the subject of '[PATCH] Set default max video bandwidth to 128')

cusax-fix
Boris Grozev 13 years ago
parent cbec3cb49e
commit 5ffef82d0f

@ -1398,7 +1398,8 @@ impl.media.configform.VIDEO=&Camera:
impl.media.configform.VIDEO_MORE_SETTINGS=More settings impl.media.configform.VIDEO_MORE_SETTINGS=More settings
impl.media.configform.VIDEO_RESOLUTION=Video resolution impl.media.configform.VIDEO_RESOLUTION=Video resolution
impl.media.configform.VIDEO_FRAME_RATE=Custom 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_PACKETS_POLICY=RTP pacing threshold (kBytes/s)
impl.media.configform.VIDEO_BITRATE=Video bitrate (kilobits/s)
impl.media.configform.VIDEO_RESET=Reset defaults impl.media.configform.VIDEO_RESET=Reset defaults
impl.media.configform.AUDIO_DEVICE_CONNECTED=Connected device: impl.media.configform.AUDIO_DEVICE_CONNECTED=Connected device:
impl.media.configform.AUDIO_DEVICE_DISCONNECTED=Disconnected device: impl.media.configform.AUDIO_DEVICE_DISCONNECTED=Disconnected device:

@ -549,6 +549,11 @@ private static Component createVideoAdvancedSettings()
resources.getI18NString( resources.getI18NString(
"impl.media.configform.VIDEO_PACKETS_POLICY")), "impl.media.configform.VIDEO_PACKETS_POLICY")),
constraints); constraints);
constraints.gridy = 3;
centerPanel.add(new JLabel(
resources.getI18NString(
"impl.media.configform.VIDEO_BITRATE")),
constraints);
constraints.weightx = 1; constraints.weightx = 1;
constraints.gridx = 1; constraints.gridx = 1;
@ -598,15 +603,15 @@ public void actionPerformed(ActionEvent e)
}); });
final JSpinner videoMaxBandwidth = new JSpinner(new SpinnerNumberModel( final JSpinner videoMaxBandwidth = new JSpinner(new SpinnerNumberModel(
deviceConfig.getVideoMaxBandwidth(), deviceConfig.getVideoRTPPacingThreshold(),
1, Integer.MAX_VALUE, 1)); 1, Integer.MAX_VALUE, 1));
videoMaxBandwidth.addChangeListener(new ChangeListener() videoMaxBandwidth.addChangeListener(new ChangeListener()
{ {
public void stateChanged(ChangeEvent e) public void stateChanged(ChangeEvent e)
{ {
deviceConfig.setVideoMaxBandwidth( deviceConfig.setVideoRTPPacingThreshold(
((SpinnerNumberModel)videoMaxBandwidth.getModel()) ((SpinnerNumberModel) videoMaxBandwidth.getModel())
.getNumber().intValue()); .getNumber().intValue());
} }
}); });
constraints.gridx = 1; constraints.gridx = 1;
@ -614,6 +619,21 @@ public void stateChanged(ChangeEvent e)
constraints.insets = new Insets(0, 0, 5, 5); constraints.insets = new Insets(0, 0, 5, 5);
centerPanel.add(videoMaxBandwidth, constraints); centerPanel.add(videoMaxBandwidth, constraints);
final JSpinner videoBitrate = new JSpinner(new SpinnerNumberModel(
deviceConfig.getVideoBitrate(),
1, Integer.MAX_VALUE, 1));
videoBitrate.addChangeListener(new ChangeListener()
{
public void stateChanged(ChangeEvent e)
{
deviceConfig.setVideoBitrate(
((SpinnerNumberModel) videoBitrate.getModel())
.getNumber().intValue());
}
});
constraints.gridy = 3;
centerPanel.add(videoBitrate, constraints);
resetDefaultsButton.addActionListener(new ActionListener() resetDefaultsButton.addActionListener(new ActionListener()
{ {
public void actionPerformed(ActionEvent e) public void actionPerformed(ActionEvent e)
@ -626,7 +646,9 @@ public void actionPerformed(ActionEvent e)
// unlimited framerate // unlimited framerate
deviceConfig.setFrameRate(-1); deviceConfig.setFrameRate(-1);
videoMaxBandwidth.setValue( videoMaxBandwidth.setValue(
DeviceConfiguration.DEFAULT_VIDEO_MAX_BANDWIDTH); DeviceConfiguration.DEFAULT_VIDEO_RTP_PACING_THRESHOLD);
videoBitrate.setValue(
DeviceConfiguration.DEFAULT_VIDEO_BITRATE);
} }
}); });

Loading…
Cancel
Save