Audio device retrieval with the AudioDeviceModule

Author: devopvoid

webrtc-jni/src/main/cpp/include/JNI_AudioDeviceModule.h

@@ -54,6 +54,54 @@ 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) {
+			auto device = std::make_shared<jni::avdev::AudioDevice>(name, guid);
+
+			deviceList.add(jni::AudioDevice::toJavaAudioDevice(env, device));
+		}
+	}
+
+	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) {
+			auto device = std::make_shared<jni::avdev::AudioDevice>(name, guid);
+
+			deviceList.add(jni::AudioDevice::toJavaAudioDevice(env, device));
+		}
+	}
+
+	return deviceList.listObject().release();
+}
+
 JNIEXPORT void JNICALL Java_dev_onvoid_webrtc_media_audio_AudioDeviceModule_setPlayoutDevice
 (JNIEnv * env, jobject caller, jobject device)
 {
@@ -103,6 +151,7 @@ JNIEXPORT void JNICALL Java_dev_onvoid_webrtc_media_audio_AudioDeviceModule_setR
 	jni::JavaObject obj(env, jni::JavaLocalRef<jobject>(env, device));
 
 	const auto javaClass = jni::JavaClasses::get<jni::AudioDevice::JavaAudioDeviceClass>(env);
+	const std::string devName = jni::JavaString::toNative(env, obj.getString(javaClass->name));
 	const std::string devGuid = jni::JavaString::toNative(env, obj.getString(javaClass->descriptor));
 
 	uint16_t index = 0;
@@ -113,6 +162,9 @@ JNIEXPORT void JNICALL Java_dev_onvoid_webrtc_media_audio_AudioDeviceModule_setR
 
 	for (int i = 0; i < deviceCount; ++i) {
 		if ((audioModule->RecordingDeviceName(i, name, guid) == 0) && devGuid == std::string(guid)) {
+			printf("selected audio device: %s - %s\n", name, guid);
+			fflush(NULL);
+
 			index = i;
 			break;
 		}

webrtc-jni/src/main/cpp/src/JNI_AudioDeviceModule.cpp

@@ -37,7 +37,7 @@
 JNIEXPORT void JNICALL Java_dev_onvoid_webrtc_PeerConnectionFactory_initialize
 (JNIEnv * env, jobject caller, jobject audioModule)
 {
-	webrtc::AudioDeviceModule * audioDevModule = GetHandle<webrtc::AudioDeviceModule>(env, caller);
+	webrtc::AudioDeviceModule * audioDevModule = GetHandle<webrtc::AudioDeviceModule>(env, audioModule);
 
 	try {
 		auto networkThread = rtc::Thread::CreateWithSocketServer();

webrtc-jni/src/main/cpp/src/JNI_PeerConnectionFactory.cpp

@@ -18,6 +18,7 @@
 
 import dev.onvoid.webrtc.internal.NativeLoader;
 import dev.onvoid.webrtc.media.audio.AudioDevice;
+import dev.onvoid.webrtc.media.audio.AudioDeviceModule;
 import dev.onvoid.webrtc.media.video.VideoCaptureCapability;
 import dev.onvoid.webrtc.media.video.VideoDevice;
 
@@ -47,4 +48,19 @@ public class MediaDevices {
 
 	public static native List<VideoCaptureCapability> getVideoCaptureCapabilities(VideoDevice device);
 
+	public static List<AudioDevice> getNativeAudioRenderDevices() {
+		AudioDeviceModule deviceModule = new AudioDeviceModule();
+		List<AudioDevice> devices = deviceModule.getPlayoutDevices();
+		deviceModule.dispose();
+
+		return devices;
+	}
+
+	public static List<AudioDevice> getNativeAudioCaptureDevices() {
+		AudioDeviceModule deviceModule = new AudioDeviceModule();
+		List<AudioDevice> devices = deviceModule.getRecordingDevices();
+		deviceModule.dispose();
+
+		return devices;
+	}
 }

webrtc/src/main/java/dev/onvoid/webrtc/media/MediaDevices.java

@@ -18,6 +18,8 @@
 
 import dev.onvoid.webrtc.internal.DisposableNativeObject;
 
+import java.util.List;
+
 public class AudioDeviceModule extends DisposableNativeObject {
 
 	public AudioDeviceModule() {
@@ -32,6 +34,10 @@ public AudioDeviceModule(AudioLayer audioLayer) {
 
 	public native void initRecording();
 
+	public native List<AudioDevice> getPlayoutDevices();
+
+	public native List<AudioDevice> getRecordingDevices();
+
 	public native void setPlayoutDevice(AudioDevice device);
 
 	public native void setRecordingDevice(AudioDevice device);