feat: added the missing macOS camera capture functionality (#180)

* feat: implement macOS video capture support with Objective-C integration

* refactor: unify video capture classes under VideoCaptureBase

* feat: implement VideoTrackDeviceSourceBase and macOS specific video capture support

* feat: update macOS video capture to use VideoTrackDeviceSourceMac

* feat: enhance macOS video capture with improved frame handling and callback integration

* fix: update macOS deployment target to 11.0 and refine CMake configurations

Author: devopvoid

webrtc-jni/src/main/cpp/CMakeLists.txt

@@ -98,7 +98,7 @@ target_link_libraries(${PROJECT_NAME} webrtc)
 
 if(APPLE)
     set_source_files_properties(${SOURCES} PROPERTIES COMPILE_FLAGS "-x objective-c++")
-    target_link_libraries(${PROJECT_NAME} "-framework Foundation" "-framework AVFoundation" "-framework CoreMedia" "-framework CoreAudio" "-framework IOKit")
+    target_link_libraries(${PROJECT_NAME} "-framework Foundation" "-framework AVFoundation" "-framework CoreMedia" "-framework CoreAudio" "-framework IOKit" "-framework CoreVideo" "-framework VideoToolbox")
 elseif(LINUX)
     if(NOT TARGET_CPU MATCHES "^arm")
         set(CXX_LIBS "-static-libgcc -stdlib=libc++ -lc++ -lc++abi")

webrtc-jni/src/main/cpp/dependencies/webrtc/CMakeLists.txt

@@ -159,6 +159,11 @@ target_include_directories(${PROJECT_NAME}
 target_link_libraries(${PROJECT_NAME} ${TARGET_LINK_LIB})
 
 if(APPLE)
+    target_include_directories(${PROJECT_NAME}
+        PUBLIC
+            ${TARGET_INC_DIR}/sdk/objc
+            ${TARGET_INC_DIR}/sdk/objc/base
+    )
     target_compile_definitions(${PROJECT_NAME} PUBLIC WEBRTC_MAC WEBRTC_POSIX)
     target_link_libraries(${PROJECT_NAME} "-framework Foundation" "-framework AVFoundation" "-framework CoreGraphics" "-framework CoreAudio" "-framework CoreVideo" "-framework ScreenCaptureKit" "-framework AudioToolbox" "-framework IOSurface" "-framework ApplicationServices" "-framework AppKit")
 elseif(LINUX)
@@ -277,10 +282,23 @@ execute_command(
 )
 
 message(STATUS "WebRTC: compile")
-execute_command(
-    COMMAND ninja -C "${WEBRTC_BUILD}"
-    WORKING_DIRECTORY "${WEBRTC_SRC}"
-)
+if(APPLE)
+    execute_command(
+        COMMAND ninja -C "${WEBRTC_BUILD}" :default sdk:native_api sdk:videocapture_objc
+        WORKING_DIRECTORY "${WEBRTC_SRC}"
+    )
+
+    file(GLOB_RECURSE SDK_OBJC_FILES ${WEBRTC_SRC}/${WEBRTC_BUILD}/obj/*.o)
+
+    execute_command(
+        COMMAND ${CMAKE_AR} rc ${WEBRTC_SRC}/${WEBRTC_BUILD}/obj/libwebrtc.a ${SDK_OBJC_FILES}
+    )
+else()
+    execute_command(
+        COMMAND ninja -C "${WEBRTC_BUILD}"
+        WORKING_DIRECTORY "${WEBRTC_SRC}"
+    )
+endif()
 
 if(LINUX)
     if(LINUX AND NOT TARGET_CPU MATCHES "^arm")
@@ -338,7 +356,7 @@ install(
         REGEX /src/examples/ EXCLUDE
         REGEX /src/out/ EXCLUDE
         REGEX /src/resources/ EXCLUDE
-        REGEX /src/sdk/ EXCLUDE
+        REGEX /src/sdk/android/ EXCLUDE
         REGEX /src/stats/ EXCLUDE
         REGEX /src/style-guide/ EXCLUDE
         REGEX /src/test/ EXCLUDE
@@ -348,6 +366,7 @@ install(
         REGEX /src/tools_webrtc/ EXCLUDE
         REGEX /test/ EXCLUDE
 )
+
 # Delete empty directories
 install(CODE "
     file(GLOB_RECURSE headers LIST_DIRECTORIES true ${WEBRTC_INSTALL_DIR}/include/!*)

webrtc-jni/src/main/cpp/include/media/video/VideoCapture.h

@@ -17,34 +17,24 @@
 #ifndef JNI_WEBRTC_MEDIA_VIDEO_CAPTURE_H_
 #define JNI_WEBRTC_MEDIA_VIDEO_CAPTURE_H_
 
-#include "media/video/VideoDevice.h"
+#include "media/video/VideoCaptureBase.h"
 
-#include "api/create_peerconnection_factory.h"
-#include "api/video/video_sink_interface.h"
-#include "media/base/video_adapter.h"
 #include "modules/video_capture/video_capture.h"
 #include "modules/video_capture/video_capture_defines.h"
 
 namespace jni
 {
-	class VideoCapture
+	class VideoCapture : public VideoCaptureBase
 	{
 		public:
 			VideoCapture();
 			~VideoCapture();
 
-			void setDevice(const avdev::DevicePtr & device);
-			void setVideoCaptureCapability(const webrtc::VideoCaptureCapability & capability);
-			void setVideoSink(std::unique_ptr<webrtc::VideoSinkInterface<webrtc::VideoFrame>> sink);
-			void start();
-			void stop();
-			void destroy();
+            void start() override;
+			void stop() override;
+			void destroy() override;
 
 		private:
-			avdev::DevicePtr device;
-			webrtc::VideoCaptureCapability capability;
-			std::unique_ptr<webrtc::VideoSinkInterface<webrtc::VideoFrame>> sink;
-
 			webrtc::scoped_refptr<webrtc::VideoCaptureModule> captureModule;
 	};
 }

webrtc-jni/src/main/cpp/include/media/video/VideoCaptureBase.h

@@ -0,0 +1,48 @@
+/*
+ * Copyright 2021 Alex Andres
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef JNI_WEBRTC_MEDIA_VIDEO_CAPTURE_BASE_H_
+#define JNI_WEBRTC_MEDIA_VIDEO_CAPTURE_BASE_H_
+
+#include "media/video/VideoDevice.h"
+
+#include "api/video/video_sink_interface.h"
+#include "modules/video_capture/video_capture_defines.h"
+
+namespace jni
+{
+	class VideoCaptureBase
+	{
+		public:
+			VideoCaptureBase();
+			~VideoCaptureBase();
+
+			void setDevice(const avdev::DevicePtr & device);
+			void setVideoCaptureCapability(const webrtc::VideoCaptureCapability & capability);
+			void setVideoSink(std::unique_ptr<webrtc::VideoSinkInterface<webrtc::VideoFrame>> sink);
+
+			virtual void start() = 0;
+			virtual void stop() = 0;
+			virtual void destroy() = 0;
+
+		protected:
+			avdev::DevicePtr device;
+			webrtc::VideoCaptureCapability capability;
+			std::unique_ptr<webrtc::VideoSinkInterface<webrtc::VideoFrame>> sink;
+	};
+}
+
+#endif

webrtc-jni/src/main/cpp/include/media/video/VideoTrackDeviceSource.h

@@ -26,21 +26,20 @@
 #include "modules/video_capture/video_capture.h"
 #include "modules/video_capture/video_capture_defines.h"
 
+#include "media/video/VideoTrackDeviceSourceBase.h"
 #include "media/video/VideoDevice.h"
 
 namespace jni
 {
-	class VideoTrackDeviceSource : public webrtc::VideoTrackSource, public webrtc::VideoSinkInterface<webrtc::VideoFrame>
+	class VideoTrackDeviceSource : public webrtc::VideoTrackSource, public webrtc::VideoSinkInterface<webrtc::VideoFrame>, public VideoTrackDeviceSourceBase
 	{
 		public:
 			VideoTrackDeviceSource();
 			~VideoTrackDeviceSource();
 
-			void setVideoDevice(const avdev::VideoDevicePtr & device);
-			void setVideoCaptureCapability(const webrtc::VideoCaptureCapability & capability);
-
-			void start();
-			void stop();
+            // VideoTrackDeviceSourceBase implementation.
+            void start() override;
+            void stop() override;
 
 			// VideoSourceInterface implementation.
 			void AddOrUpdateSink(webrtc::VideoSinkInterface<webrtc::VideoFrame> * sink, const webrtc::VideoSinkWants & wants) override;
@@ -58,9 +57,6 @@ namespace jni
 			void destroy();
 
 		private:
-			avdev::VideoDevicePtr device;
-			webrtc::VideoCaptureCapability capability;
-
 			webrtc::scoped_refptr<webrtc::VideoCaptureModule> captureModule;
 			webrtc::VideoBroadcaster broadcaster;
 			webrtc::VideoAdapter videoAdapter;

webrtc-jni/src/main/cpp/include/media/video/VideoTrackDeviceSourceBase.h

@@ -0,0 +1,44 @@
+/*
+ * Copyright 2019 Alex Andres
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef JNI_WEBRTC_MEDIA_VIDEO_TRACK_DEVICE_SOURCE_BASE_H_
+#define JNI_WEBRTC_MEDIA_VIDEO_TRACK_DEVICE_SOURCE_BASE_H_
+
+#include "modules/video_capture/video_capture_defines.h"
+
+#include "media/video/VideoDevice.h"
+
+namespace jni
+{
+	class VideoTrackDeviceSourceBase
+	{
+		public:
+			VideoTrackDeviceSourceBase();
+			~VideoTrackDeviceSourceBase();
+
+			void setVideoDevice(const avdev::VideoDevicePtr & device);
+			void setVideoCaptureCapability(const webrtc::VideoCaptureCapability & capability);
+
+			virtual void start() = 0;
+			virtual void stop() = 0;
+
+		protected:
+			avdev::VideoDevicePtr device;
+			webrtc::VideoCaptureCapability capability;
+	};
+}
+
+#endif

webrtc-jni/src/main/cpp/include/media/video/macos/VideoCaptureMac.h

@@ -0,0 +1,54 @@
+/*
+ * Copyright 2021 Alex Andres
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef JNI_WEBRTC_MEDIA_VIDEO_CAPTURE_MAC_H_
+#define JNI_WEBRTC_MEDIA_VIDEO_CAPTURE_MAC_H_
+
+#include "media/video/VideoCaptureBase.h"
+
+#include "rtc_base/timestamp_aligner.h"
+
+#include "sdk/objc/base/RTCVideoCapturer.h"
+#include "sdk/objc/base/RTCMacros.h"
+#include "sdk/objc/components/capturer/RTCCameraVideoCapturer.h"
+
+
+@interface VideoCaptureCallback
+    : NSObject <RTC_OBJC_TYPE (RTCVideoCapturerDelegate)>
+@end
+
+
+namespace jni
+{
+	class VideoCaptureMac : public VideoCaptureBase
+	{
+		public:
+			VideoCaptureMac();
+			~VideoCaptureMac();
+
+            void start() override;
+			void stop() override;
+			void destroy() override;
+
+			void OnCapturedFrame(RTC_OBJC_TYPE(RTCVideoFrame) * frame);
+
+		private:
+            webrtc::TimestampAligner timestamp_aligner;
+            RTCCameraVideoCapturer * cameraVideoCapturer;
+	};
+}
+
+#endif

webrtc-jni/src/main/cpp/include/media/video/macos/VideoTrackDeviceSourceMac.h

@@ -0,0 +1,66 @@
+/*
+ * Copyright 2019 Alex Andres
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef JNI_WEBRTC_MEDIA_VIDEO_TRACK_DEVICE_SOURCE_MAC_H_
+#define JNI_WEBRTC_MEDIA_VIDEO_TRACK_DEVICE_SOURCE_MAC_H_
+
+#include "media/base/adapted_video_track_source.h"
+#include "modules/video_capture/video_capture_defines.h"
+#include "rtc_base/timestamp_aligner.h"
+
+#include "sdk/objc/base/RTCVideoCapturer.h"
+#include "sdk/objc/base/RTCMacros.h"
+#include "sdk/objc/components/capturer/RTCCameraVideoCapturer.h"
+
+#include "media/video/VideoTrackDeviceSourceBase.h"
+
+
+@interface VideoTrackDeviceSourceCallback
+    : NSObject <RTC_OBJC_TYPE (RTCVideoCapturerDelegate)>
+@end
+
+
+namespace jni
+{
+	class VideoTrackDeviceSourceMac : public webrtc::AdaptedVideoTrackSource, public VideoTrackDeviceSourceBase
+	{
+		public:
+			VideoTrackDeviceSourceMac();
+			~VideoTrackDeviceSourceMac();
+
+            // VideoTrackDeviceSourceBase implementation.
+            void start() override;
+            void stop() override;
+
+            // AdaptedVideoTrackSource implementation.
+            virtual bool is_screencast() const override;
+            virtual std::optional<bool> needs_denoising() const override;
+            SourceState state() const override;
+            bool remote() const override;
+
+            void OnCapturedFrame(RTC_OBJC_TYPE(RTCVideoFrame) * frame);
+
+		private:
+			void destroy();
+
+		private:
+            webrtc::TimestampAligner timestamp_aligner;
+
+            RTCCameraVideoCapturer * cameraVideoCapturer;
+	};
+}
+
+#endif

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

@@ -58,8 +58,13 @@ JNIEXPORT void JNICALL Java_dev_onvoid_webrtc_PeerConnectionFactory_initialize
 
 	try {
 		auto networkThread = webrtc::Thread::CreateWithSocketServer();
+		networkThread->SetName("webrtc_jni_network_thread", nullptr);
+
 		auto signalingThread = webrtc::Thread::Create();
+		signalingThread->SetName("webrtc_jni_signaling_thread", nullptr);
+
 		auto workerThread = webrtc::Thread::Create();
+		workerThread->SetName("webrtc_jni_worker_thread", nullptr);
 
 		if (!networkThread->Start()) {
 			throw jni::Exception("Start network thread failed");