Browse Source

linux-pipewire: Fix future compiler errors

Unused variables and missing switch branches will break in cmake 3.0,
and are breaking for me right now so let's merge this early.
Kurt Kartaltepe 1 năm trước cách đây
mục cha
commit
befce71219

+ 0 - 4
plugins/linux-pipewire/camera-portal.c

@@ -690,7 +690,6 @@ static void framerate_list(struct camera_device *dev, uint32_t pixelformat,
 			   const struct spa_rectangle *resolution,
 			   obs_property_t *prop)
 {
-	g_autoptr(GHashTable) framerates_map = NULL;
 	g_autoptr(GArray) framerates = NULL;
 	struct param *p;
 	obs_data_t *data;
@@ -703,9 +702,7 @@ static void framerate_list(struct camera_device *dev, uint32_t pixelformat,
 		struct obs_pw_video_format obs_pw_video_format;
 		enum spa_choice_type choice;
 		const struct spa_pod_prop *prop;
-		struct spa_pod_parser pod_parser;
 		struct spa_rectangle this_resolution;
-		struct spa_fraction framerate;
 		struct spa_pod *framerate_pod;
 		uint32_t media_subtype;
 		uint32_t media_type;
@@ -1259,7 +1256,6 @@ static const char *pipewire_camera_get_name(void *data)
 static void *pipewire_camera_create(obs_data_t *settings, obs_source_t *source)
 {
 	struct camera_portal_source *camera_source;
-	bool set;
 
 	camera_source = bzalloc(sizeof(struct camera_portal_source));
 	camera_source->source = source;

+ 4 - 1
plugins/linux-pipewire/pipewire.c

@@ -721,7 +721,6 @@ static void process_video_sync(obs_pipewire_stream *obs_pw_stream)
 {
 	obs_pipewire *obs_pw = obs_pw_stream->obs_pw;
 	struct spa_meta_cursor *cursor;
-	uint32_t drm_format;
 	struct spa_meta_header *header;
 	struct spa_meta_region *region;
 	struct spa_meta_videotransform *video_transform;
@@ -1313,6 +1312,8 @@ uint32_t obs_pipewire_stream_get_width(obs_pipewire_stream *obs_pw_stream)
 	case SPA_META_TRANSFORMATION_270:
 		return has_crop ? obs_pw_stream->crop.height
 				: obs_pw_stream->format.info.raw.size.height;
+	default:
+		return 0;
 	}
 }
 
@@ -1338,6 +1339,8 @@ uint32_t obs_pipewire_stream_get_height(obs_pipewire_stream *obs_pw_stream)
 	case SPA_META_TRANSFORMATION_270:
 		return has_crop ? obs_pw_stream->crop.width
 				: obs_pw_stream->format.info.raw.size.width;
+	default:
+		return 0;
 	}
 }