Skip to content

Commit 86bd776

Browse files
committed
Fixed demo audio/video config settings
1 parent af058e8 commit 86bd776

File tree

6 files changed

+27
-19
lines changed

6 files changed

+27
-19
lines changed

webrtc-demo/webrtc-demo-api/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<dependency>
1515
<groupId>com.google.inject</groupId>
1616
<artifactId>guice</artifactId>
17-
<version>4.2.2</version>
17+
<version>5.0.0-BETA-1</version>
1818
</dependency>
1919

2020
<dependency>

webrtc-demo/webrtc-demo-api/src/main/java/dev/onvoid/webrtc/demo/config/Configuration.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,13 @@ public class Configuration {
4242
/** The locale of the application. */
4343
private final ObjectProperty<Locale> locale;
4444

45-
private AudioConfiguration audioConfig;
45+
private final AudioConfiguration audioConfig;
4646

47-
private VideoConfiguration videoConfig;
47+
private final VideoConfiguration videoConfig;
4848

49-
private DesktopCaptureConfiguration desktopCaptureConfig;
49+
private final DesktopCaptureConfiguration desktopCaptureConfig;
5050

51-
private RTCConfiguration rtcConfig;
51+
private final RTCConfiguration rtcConfig;
5252

5353

5454
public Configuration() {

webrtc-demo/webrtc-demo-api/src/main/java/dev/onvoid/webrtc/demo/net/PeerConnectionClient.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@
4444
import dev.onvoid.webrtc.demo.model.Contact;
4545
import dev.onvoid.webrtc.demo.model.message.ChatMessage;
4646
import dev.onvoid.webrtc.demo.net.codec.JsonBCodec;
47-
import dev.onvoid.webrtc.media.MediaSource.State;
4847
import dev.onvoid.webrtc.media.MediaStreamTrack;
4948
import dev.onvoid.webrtc.media.audio.AudioOptions;
5049
import dev.onvoid.webrtc.media.audio.AudioSource;
@@ -74,7 +73,7 @@
7473

7574
public class PeerConnectionClient implements PeerConnectionObserver {
7675

77-
private static Logger LOGGER = System.getLogger(PeerConnectionClient.class.getName());
76+
private static final Logger LOGGER = System.getLogger(PeerConnectionClient.class.getName());
7877

7978
private final ExecutorService executor;
8079

webrtc-demo/webrtc-demo-api/src/main/java/dev/onvoid/webrtc/demo/presenter/AudioSettingsPresenter.java

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616

1717
package dev.onvoid.webrtc.demo.presenter;
1818

19+
import static java.util.Objects.isNull;
20+
1921
import dev.onvoid.webrtc.demo.config.AudioConfiguration;
2022
import dev.onvoid.webrtc.demo.config.Configuration;
2123
import dev.onvoid.webrtc.demo.view.AudioSettingsView;
@@ -58,9 +60,13 @@ public void initialize() {
5860
}
5961

6062
private AudioDevice getAudioDevice(List<AudioDevice> devices, AudioDevice device) {
61-
return devices.stream()
63+
AudioDevice audioDevice = devices.stream()
6264
.filter(dev -> dev.equals(device))
6365
.findFirst()
64-
.orElse(devices.get(0));
66+
.orElse(null);
67+
68+
return isNull(audioDevice) ?
69+
!devices.isEmpty() ? devices.get(0) : null :
70+
audioDevice;
6571
}
6672
}

webrtc-demo/webrtc-demo-api/src/main/java/dev/onvoid/webrtc/demo/presenter/StartPresenter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public class StartPresenter extends Presenter<StartView> {
3434

3535
private final PeerConnectionService peerConnectionService;
3636

37-
private ResourceBundle resources;
37+
private final ResourceBundle resources;
3838

3939
private Room room;
4040

webrtc-demo/webrtc-demo-api/src/main/java/dev/onvoid/webrtc/demo/presenter/VideoSettingsPresenter.java

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -45,24 +45,27 @@ public void initialize() {
4545
var devices = MediaDevices.getVideoCaptureDevices();
4646
var device = config.getCaptureDevice();
4747

48-
int devIndex = devices.indexOf(device);
49-
device = (devIndex < 0) ? devices.get(0) : devices.get(devIndex);
48+
if (!devices.isEmpty()) {
49+
int devIndex = devices.indexOf(device);
50+
device = (devIndex < 0) ? devices.get(0) : devices.get(devIndex);
5051

51-
var capabilities = MediaDevices.getVideoCaptureCapabilities(device);
52-
capabilities.sort(new VideoCaptureCapabilityComparator());
53-
var capability = getCaptureCapability(capabilities);
52+
var capabilities = MediaDevices.getVideoCaptureCapabilities(device);
53+
capabilities.sort(new VideoCaptureCapabilityComparator());
54+
var capability = getCaptureCapability(capabilities);
5455

55-
config.setCaptureDevice(device);
56-
config.setCaptureCapability(capability);
56+
config.setCaptureDevice(device);
57+
config.setCaptureCapability(capability);
58+
59+
view.setVideoCaptureCapabilities(capabilities);
60+
view.setVideoCaptureCapability(config.captureCapabilityProperty());
61+
}
5762

5863
config.captureDeviceProperty().addListener((observable, oldDevice, newDevice) -> {
5964
onVideoCaptureDevice(newDevice);
6065
});
6166

6267
view.setVideoDevices(devices);
6368
view.setVideoDevice(config.captureDeviceProperty());
64-
view.setVideoCaptureCapabilities(capabilities);
65-
view.setVideoCaptureCapability(config.captureCapabilityProperty());
6669
view.setReceiveVideo(config.receiveVideoProperty());
6770
view.setSendVideo(config.sendVideoProperty());
6871
}

0 commit comments

Comments
 (0)