linux-pipewire: Support MJPEG and H264 devices

Author: dimtpap

plugins/linux-pipewire/CMakeLists.txt

@@ -7,6 +7,7 @@ if(NOT ENABLE_PIPEWIRE)
 endif()
 
 find_package(PipeWire 0.3.33 REQUIRED)
+find_package(FFmpeg REQUIRED COMPONENTS avcodec avutil avformat)
 find_package(Gio 2.76 REQUIRED)
 find_package(Libdrm REQUIRED)
 get_target_property(libdrm_include_directories Libdrm::Libdrm INTERFACE_INCLUDE_DIRECTORIES)
@@ -26,6 +27,8 @@ target_sources(
   PRIVATE
     $<$<BOOL:${_HAS_PIPEWIRE_CAMERA}>:camera-portal.c>
     $<$<BOOL:${_HAS_PIPEWIRE_CAMERA}>:camera-portal.h>
+    $<$<BOOL:${_HAS_PIPEWIRE_CAMERA}>:video-decoder.c>
+    $<$<BOOL:${_HAS_PIPEWIRE_CAMERA}>:video-decoder.h>
     formats.c
     formats.h
     linux-pipewire.c

plugins/linux-pipewire/camera-portal.c

@@ -366,8 +366,18 @@ static void camera_format_list(struct camera_device *dev, obs_property_t *prop)
 			obs_data_set_int(data, "video_format", format);
 
 			format_name = obs_pw_video_format.pretty_name;
-		} else {
-			continue;
+		} else if (media_subtype == SPA_MEDIA_SUBTYPE_mjpg || media_subtype == SPA_MEDIA_SUBTYPE_h264) {
+			obs_data_set_bool(data, "encoded", true);
+			obs_data_set_int(data, "video_format", SPA_VIDEO_FORMAT_ENCODED);
+
+			switch (media_subtype) {
+			case SPA_MEDIA_SUBTYPE_mjpg:
+				format_name = "MJPG";
+				break;
+			case SPA_MEDIA_SUBTYPE_h264:
+				format_name = "H264";
+				break;
+			}
 		}
 
 		if (spa_pod_parse_object(p->param, SPA_TYPE_OBJECT_Format, format ? &format : NULL,
@@ -647,7 +657,6 @@ static void framerate_list(struct camera_device *dev, uint32_t pixelformat, cons
 	spa_list_for_each(p, &dev->param_list, link)
 	{
 		const struct spa_fraction *framerate_values;
-		struct obs_pw_video_format obs_pw_video_format;
 		enum spa_choice_type choice;
 		const struct spa_pod_prop *prop;
 		struct spa_rectangle this_resolution;
@@ -672,10 +681,7 @@ static void framerate_list(struct camera_device *dev, uint32_t pixelformat, cons
 			format = SPA_VIDEO_FORMAT_ENCODED;
 		}
 
-		if (!obs_pw_video_format_from_spa_format(format, &obs_pw_video_format))
-			continue;
-
-		if (obs_pw_video_format.video_format != pixelformat)
+		if (format != pixelformat)
 			continue;
 
 		if (spa_pod_parse_object(p->param, SPA_TYPE_OBJECT_Format, NULL, SPA_FORMAT_VIDEO_size,