Browse Source

camera: move PipeWire camera first in list

If it fails, we fall back to the next one, which is v4l2.
Wim Taymans 11 months ago
parent
commit
55d4b44441

+ 3 - 3
src/camera/SDL_camera.c

@@ -31,12 +31,12 @@
 
 // Available camera drivers
 static const CameraBootStrap *const bootstrap[] = {
-#ifdef SDL_CAMERA_DRIVER_V4L2
-    &V4L2_bootstrap,
-#endif
 #ifdef SDL_CAMERA_DRIVER_PIPEWIRE
     &PIPEWIRECAMERA_bootstrap,
 #endif
+#ifdef SDL_CAMERA_DRIVER_V4L2
+    &V4L2_bootstrap,
+#endif
 #ifdef SDL_CAMERA_DRIVER_COREMEDIA
     &COREMEDIA_bootstrap,
 #endif

+ 1 - 1
src/camera/SDL_syscamera.h

@@ -204,8 +204,8 @@ typedef struct CameraBootStrap
 
 // Not all of these are available in a given build. Use #ifdefs, etc.
 extern CameraBootStrap DUMMYCAMERA_bootstrap;
-extern CameraBootStrap V4L2_bootstrap;
 extern CameraBootStrap PIPEWIRECAMERA_bootstrap;
+extern CameraBootStrap V4L2_bootstrap;
 extern CameraBootStrap COREMEDIA_bootstrap;
 extern CameraBootStrap ANDROIDCAMERA_bootstrap;
 extern CameraBootStrap EMSCRIPTENCAMERA_bootstrap;

+ 1 - 1
src/camera/pipewire/SDL_camera_pipewire.c

@@ -1129,7 +1129,7 @@ static SDL_bool PIPEWIRECAMERA_Init(SDL_CameraDriverImpl *impl)
 }
 
 CameraBootStrap PIPEWIRECAMERA_bootstrap = {
-    "pipewire", "SDL PipeWire camera driver", PIPEWIRECAMERA_Init, SDL_TRUE
+    "pipewire", "SDL PipeWire camera driver", PIPEWIRECAMERA_Init, SDL_FALSE
 };
 
 #endif  // SDL_CAMERA_DRIVER_PIPEWIRE