MediaDevices: device and capabilities retrieval

Author: devopvoid

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

@@ -19,8 +19,8 @@
 import dev.onvoid.webrtc.demo.config.AudioConfiguration;
 import dev.onvoid.webrtc.demo.config.Configuration;
 import dev.onvoid.webrtc.demo.view.AudioSettingsView;
+import dev.onvoid.webrtc.media.MediaDevices;
 import dev.onvoid.webrtc.media.audio.AudioDevice;
-import dev.onvoid.webrtc.media.audio.AudioDeviceModule;
 
 import java.util.List;
 
@@ -40,25 +40,21 @@ public class AudioSettingsPresenter extends Presenter<AudioSettingsView> {
 
 	@Override
 	public void initialize() {
-		AudioDeviceModule audioModule = new AudioDeviceModule();
+		var renderDevices = MediaDevices.getAudioRenderDevices();
+		var captureDevices = MediaDevices.getAudioCaptureDevices();
 
-		var playoutDevices = audioModule.getPlayoutDevices();
-		var recordingDevices = audioModule.getRecordingDevices();
+		var renderDevice = getAudioDevice(renderDevices, config.getPlayoutDevice());
+		var captureDevice = getAudioDevice(captureDevices, config.getRecordingDevice());
 
-		var playoutDevice = getAudioDevice(playoutDevices, config.getPlayoutDevice());
-		var recordingDevice = getAudioDevice(recordingDevices, config.getRecordingDevice());
+		config.setPlayoutDevice(renderDevice);
+		config.setRecordingDevice(captureDevice);
 
-		config.setPlayoutDevice(playoutDevice);
-		config.setRecordingDevice(recordingDevice);
-
-		view.setAudioPlayoutDevices(playoutDevices);
-		view.setAudioRecordingDevices(recordingDevices);
+		view.setAudioPlayoutDevices(renderDevices);
+		view.setAudioRecordingDevices(captureDevices);
 		view.setAudioPlayoutDevice(config.playoutDeviceProperty());
 		view.setAudioRecordingDevice(config.recordingDeviceProperty());
 		view.setReceiveAudio(config.receiveAudioProperty());
 		view.setSendAudio(config.sendAudioProperty());
-
-		audioModule.dispose();
 	}
 
 	private AudioDevice getAudioDevice(List<AudioDevice> devices, AudioDevice device) {

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

@@ -19,9 +19,9 @@
 import dev.onvoid.webrtc.demo.config.Configuration;
 import dev.onvoid.webrtc.demo.config.VideoConfiguration;
 import dev.onvoid.webrtc.demo.view.VideoSettingsView;
+import dev.onvoid.webrtc.media.MediaDevices;
 import dev.onvoid.webrtc.media.video.VideoCaptureCapability;
 import dev.onvoid.webrtc.media.video.VideoDevice;
-import dev.onvoid.webrtc.media.video.VideoDeviceModule;
 
 import java.util.Comparator;
 import java.util.List;
@@ -32,26 +32,23 @@ public class VideoSettingsPresenter extends Presenter<VideoSettingsView> {
 
 	private final VideoConfiguration config;
 
-	private final VideoDeviceModule videoModule;
-
 
 	@Inject
 	VideoSettingsPresenter(VideoSettingsView view, Configuration config) {
 		super(view);
 
 		this.config = config.getVideoConfiguration();
-		this.videoModule = new VideoDeviceModule();
 	}
 
 	@Override
 	public void initialize() {
-		var devices = videoModule.getCaptureDevices();
+		var devices = MediaDevices.getVideoCaptureDevices();
 		var device = config.getCaptureDevice();
 
 		int devIndex = devices.indexOf(device);
 		device = (devIndex < 0) ? devices.get(0) : devices.get(devIndex);
 
-		var capabilities = videoModule.getCaptureCapabilities(device);
+		var capabilities = MediaDevices.getVideoCaptureCapabilities(device);
 		capabilities.sort(new VideoCaptureCapabilityComparator());
 		var capability = getCaptureCapability(capabilities);
 
@@ -71,7 +68,7 @@ public void initialize() {
 	}
 
 	private void onVideoCaptureDevice(VideoDevice device) {
-		var capabilities = videoModule.getCaptureCapabilities(device);
+		var capabilities = MediaDevices.getVideoCaptureCapabilities(device);
 		capabilities.sort(new VideoCaptureCapabilityComparator());
 		var capability = getCaptureCapability(capabilities);
 

webrtc-demo/webrtc-demo-javafx/src/main/java/dev/onvoid/webrtc/demo/javafx/factory/DeviceListCell.java

@@ -34,7 +34,7 @@ protected void updateItem(Device item, boolean empty) {
 			setText(null);
 		}
 		else {
-			setText(item.name);
+			setText(item.getName());
 		}
 	}
 

webrtc-jni/include/JNI_AudioDeviceModule.h

@@ -53,50 +53,6 @@ JNIEXPORT void JNICALL Java_dev_onvoid_webrtc_media_audio_AudioDeviceModule_init
 	}
 }
 
-JNIEXPORT jobject JNICALL Java_dev_onvoid_webrtc_media_audio_AudioDeviceModule_getPlayoutDevices
-(JNIEnv * env, jobject caller)
-{
-	webrtc::AudioDeviceModule * audioModule = GetHandle<webrtc::AudioDeviceModule>(env, caller);
-	CHECK_HANDLEV(audioModule, nullptr);
-
-	char name[webrtc::kAdmMaxDeviceNameSize];
-	char guid[webrtc::kAdmMaxGuidSize];
-
-	int16_t deviceCount = audioModule->PlayoutDevices();
-
-	jni::JavaArrayList deviceList(env, deviceCount);
-
-	for (int i = 0; i < deviceCount; ++i) {
-		if (audioModule->PlayoutDeviceName(i, name, guid) == 0) {
-			deviceList.add(jni::Device::toJavaAudioDevice(env, name, guid));
-		}
-	}
-
-	return deviceList.listObject().release();
-}
-
-JNIEXPORT jobject JNICALL Java_dev_onvoid_webrtc_media_audio_AudioDeviceModule_getRecordingDevices
-(JNIEnv * env, jobject caller)
-{
-	webrtc::AudioDeviceModule * audioModule = GetHandle<webrtc::AudioDeviceModule>(env, caller);
-	CHECK_HANDLEV(audioModule, nullptr);
-
-	char name[webrtc::kAdmMaxDeviceNameSize];
-	char guid[webrtc::kAdmMaxGuidSize];
-
-	int16_t deviceCount = audioModule->RecordingDevices();
-
-	jni::JavaArrayList deviceList(env, deviceCount);
-
-	for (int i = 0; i < deviceCount; ++i) {
-		if (audioModule->RecordingDeviceName(i, name, guid) == 0) {
-			deviceList.add(jni::Device::toJavaAudioDevice(env, name, guid));
-		}
-	}
-
-	return deviceList.listObject().release();
-}
-
 JNIEXPORT void JNICALL Java_dev_onvoid_webrtc_media_audio_AudioDeviceModule_setPlayoutDevice
 (JNIEnv * env, jobject caller, jobject device)
 {