Audio/video device (Windows) handling consistent with the internal API

devopvoid · Jul 18, 2021 · 702e58c · 702e58c
1 parent 6550c3c
commit 702e58c
Show file tree

Hide file tree

Showing 21 changed files with 253 additions and 731 deletions.
diff --git a/webrtc-jni/src/main/cpp/dependencies/jni-voithos/src/JavaUtils.cpp b/webrtc-jni/src/main/cpp/dependencies/jni-voithos/src/JavaUtils.cpp
@@ -35,8 +35,14 @@ bool ExceptionCheck(JNIEnv * env)
 
 void ThrowCxxJavaException(JNIEnv * env)
 {
+	std::exception_ptr eptr = std::current_exception();
+
+	if (!eptr) {
+		return;
+	}
+
 	try {
-		std::rethrow_exception(std::current_exception());
+		std::rethrow_exception(eptr);
 	}
 	catch (const jni::JavaWrappedException & e) {
 		env->Throw(e.exception().get());
@@ -48,12 +54,7 @@ void ThrowCxxJavaException(JNIEnv * env)
 		env->Throw(jni::JavaError(env, e.what()));
 	}
 	catch (...) {
-		try {
-			std::rethrow_exception(std::current_exception());
-		}
-		catch (const std::exception & e) {
-			env->Throw(jni::JavaError(env, e.what()));
-		}
+		env->Throw(jni::JavaError(env, "Unhandled Exception"));
 	}
 }
 

diff --git a/webrtc-jni/src/main/cpp/include/media/audio/windows/WasapiAudioDeviceManager.h b/webrtc-jni/src/main/cpp/include/media/audio/windows/WasapiAudioDeviceManager.h
diff --git a/...edia/audio/windows/MFAudioDeviceManager.h → ...audio/windows/WindowsAudioDeviceManager.h b/...edia/audio/windows/MFAudioDeviceManager.h → ...audio/windows/WindowsAudioDeviceManager.h
@@ -26,11 +26,11 @@ namespace jni
 {
 	namespace avdev
 	{
-		class MFAudioDeviceManager : public AudioDeviceManager, IMMNotificationClient
+		class WindowsAudioDeviceManager : public AudioDeviceManager, IMMNotificationClient
 		{
 			public:
-				MFAudioDeviceManager();
-				~MFAudioDeviceManager();
+				WindowsAudioDeviceManager();
+				~WindowsAudioDeviceManager();
 
 				std::set<AudioDevicePtr> getAudioCaptureDevices() override;
 				std::set<AudioDevicePtr> getAudioPlaybackDevices() override;

diff --git a/webrtc-jni/src/main/cpp/include/media/video/VideoDevice.h b/webrtc-jni/src/main/cpp/include/media/video/VideoDevice.h
@@ -28,11 +28,14 @@ namespace jni
 	namespace avdev
 	{
 		class VideoDevice : public Device
-		{
+		{ 
 			public:
 				VideoDevice(std::string name, std::string descriptor);
 				virtual ~VideoDevice() {};
 		};
+
+
+		using VideoDevicePtr = std::shared_ptr<VideoDevice>;
 	}
 
 	namespace VideoDevice
@@ -48,7 +51,7 @@ namespace jni
 				jfieldID descriptor;
 		};
 
-		JavaLocalRef<jobject> toJavaVideoDevice(JNIEnv * env, avdev::DevicePtr device);
+		JavaLocalRef<jobject> toJavaVideoDevice(JNIEnv * env, const avdev::VideoDevice & device);
 		avdev::VideoDevice toNativeVideoDevice(JNIEnv * env, const JavaRef<jobject> & javaType);
 	}
 }

diff --git a/webrtc-jni/src/main/cpp/include/media/video/VideoTrackDeviceSource.h b/webrtc-jni/src/main/cpp/include/media/video/VideoTrackDeviceSource.h
@@ -26,6 +26,8 @@
 #include "modules/video_capture/video_capture.h"
 #include "modules/video_capture/video_capture_defines.h"
 
+#include "media/video/VideoDevice.h"
+
 namespace jni
 {
 	class VideoTrackDeviceSource : public webrtc::VideoTrackSource, public rtc::VideoSinkInterface<webrtc::VideoFrame>
@@ -34,7 +36,7 @@ namespace jni
 			VideoTrackDeviceSource();
 			~VideoTrackDeviceSource();
 
-			void setDeviceUid(const std::string & deviceUid);
+			void setVideoDevice(const avdev::VideoDevicePtr & device);
 			void setVideoCaptureCapability(const webrtc::VideoCaptureCapability & capability);
 
 			void start();
@@ -56,7 +58,7 @@ namespace jni
 			void destroy();
 
 		private:
-			std::string deviceUid;
+			avdev::VideoDevicePtr device;
 			webrtc::VideoCaptureCapability capability;
 
 			rtc::scoped_refptr<webrtc::VideoCaptureModule> captureModule;

diff --git a/...edia/video/windows/MFVideoDeviceManager.h → ...video/windows/WindowsVideoDeviceManager.h b/...edia/video/windows/MFVideoDeviceManager.h → ...video/windows/WindowsVideoDeviceManager.h
@@ -24,11 +24,11 @@ namespace jni
 {
 	namespace avdev
 	{
-		class MFVideoDeviceManager : public VideoDeviceManager, WinHotplugNotifier
+		class WindowsVideoDeviceManager : public VideoDeviceManager, WinHotplugNotifier
 		{
 			public:
-				MFVideoDeviceManager();
-				~MFVideoDeviceManager() = default;
+				WindowsVideoDeviceManager();
+				~WindowsVideoDeviceManager() = default;
 
 				std::set<VideoDevicePtr> getVideoCaptureDevices() override;
 				std::set<VideoCaptureCapability> getVideoCaptureCapabilities(const VideoDevice & device) override;

diff --git a/webrtc-jni/src/main/cpp/src/JNI_AudioDeviceModule.cpp b/webrtc-jni/src/main/cpp/src/JNI_AudioDeviceModule.cpp
@@ -151,7 +151,6 @@ 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;
@@ -162,9 +161,6 @@ 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;
 		}

diff --git a/webrtc-jni/src/main/cpp/src/JNI_MediaDevices.cpp b/webrtc-jni/src/main/cpp/src/JNI_MediaDevices.cpp
@@ -117,7 +117,7 @@ JNIEXPORT jobject JNICALL Java_dev_onvoid_webrtc_media_MediaDevices_getVideoCapt
 		jni::JavaArrayList deviceList(env, devices.size());
 
 		for (const auto & device : devices) {
-			deviceList.add(jni::VideoDevice::toJavaVideoDevice(env, device));
+			deviceList.add(jni::VideoDevice::toJavaVideoDevice(env, *device.get()));
 		}
 
 		return deviceList.listObject().release();

diff --git a/webrtc-jni/src/main/cpp/src/JNI_VideoCapture.cpp b/webrtc-jni/src/main/cpp/src/JNI_VideoCapture.cpp
@@ -34,7 +34,6 @@ JNIEXPORT void JNICALL Java_dev_onvoid_webrtc_media_video_VideoCapture_setVideoC
 	jni::VideoCapture * videoSource = GetHandle<jni::VideoCapture>(env, caller);
 	CHECK_HANDLE(videoSource);
 
-	const auto javaClass = jni::JavaClasses::get<jni::VideoDevice::JavaVideoDeviceClass>(env);
 	const auto dev = jni::VideoDevice::toNativeVideoDevice(env, jni::JavaLocalRef<jobject>(env, device));
 
 	videoSource->setDevice(std::make_shared<jni::avdev::VideoDevice>(dev.getName(), dev.getDescriptor()));

diff --git a/webrtc-jni/src/main/cpp/src/JNI_VideoDeviceSource.cpp b/webrtc-jni/src/main/cpp/src/JNI_VideoDeviceSource.cpp
@@ -34,12 +34,9 @@ JNIEXPORT void JNICALL Java_dev_onvoid_webrtc_media_video_VideoDeviceSource_setV
 	jni::VideoTrackDeviceSource * videoSource = GetHandle<jni::VideoTrackDeviceSource>(env, caller);
 	CHECK_HANDLE(videoSource);
 
-	jni::JavaObject obj(env, jni::JavaLocalRef<jobject>(env, device));
+	const auto dev = jni::VideoDevice::toNativeVideoDevice(env, jni::JavaLocalRef<jobject>(env, device));
 
-	const auto javaClass = jni::JavaClasses::get<jni::VideoDevice::JavaVideoDeviceClass>(env);
-	const std::string guid = jni::JavaString::toNative(env, obj.getString(javaClass->descriptor));
-
-	videoSource->setDeviceUid(guid);
+	videoSource->setVideoDevice(std::make_shared<jni::avdev::VideoDevice>(dev.getName(), dev.getDescriptor()));
 }
 
 JNIEXPORT void JNICALL Java_dev_onvoid_webrtc_media_video_VideoDeviceSource_setVideoCaptureCapability

diff --git a/webrtc-jni/src/main/cpp/src/WebRTCContext.cpp b/webrtc-jni/src/main/cpp/src/WebRTCContext.cpp
@@ -30,8 +30,8 @@
 
 #ifdef _WIN32
 #include <windows.h>
-#include "media/audio/windows/MFAudioDeviceManager.h"
-#include "media/video/windows/MFVideoDeviceManager.h"
+#include "media/audio/windows/WindowsAudioDeviceManager.h"
+#include "media/video/windows/WindowsVideoDeviceManager.h"
 #endif
 #ifdef __linux__
 #include "media/audio/linux/PulseAudioDeviceManager.h"
@@ -123,8 +123,8 @@ namespace jni
 	void WebRTCContext::initDeviceManagers()
 	{
 #ifdef _WIN32
-		audioDevManager = std::make_unique<avdev::MFAudioDeviceManager>();
-		videoDevManager = std::make_unique<avdev::MFVideoDeviceManager>();
+		audioDevManager = std::make_unique<avdev::WindowsAudioDeviceManager>();
+		videoDevManager = std::make_unique<avdev::WindowsVideoDeviceManager>();
 #endif
 #ifdef __linux__
 		audioDevManager = std::make_unique<avdev::PulseAudioDeviceManager>();

diff --git a/webrtc-jni/src/main/cpp/src/media/DeviceChangeListener.cpp b/webrtc-jni/src/main/cpp/src/media/DeviceChangeListener.cpp
@@ -39,7 +39,8 @@ namespace jni
 			jdevice = AudioDevice::toJavaAudioDevice(env, device);
 		}
 		else if (dynamic_cast<jni::avdev::VideoDevice *>(device.get())) {
-			jdevice = VideoDevice::toJavaVideoDevice(env, device);
+			const auto dev = dynamic_cast<jni::avdev::VideoDevice*>(device.get());
+			jdevice = VideoDevice::toJavaVideoDevice(env, *dev);
 		}
 
 		if (jdevice) {
@@ -56,7 +57,8 @@ namespace jni
 			jdevice = AudioDevice::toJavaAudioDevice(env, device);
 		}
 		else if (dynamic_cast<jni::avdev::VideoDevice *>(device.get())) {
-			jdevice = VideoDevice::toJavaVideoDevice(env, device);
+			const auto dev = dynamic_cast<jni::avdev::VideoDevice *>(device.get());
+			jdevice = VideoDevice::toJavaVideoDevice(env, *dev);
 		}
 
 		if (jdevice) {