Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

camera: add PipeWire camera support #9723

Merged
merged 9 commits into from
May 9, 2024
Merged

camera: add PipeWire camera support #9723

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
651e69c
camera: add PipeWire camera support
wtay May 7, 2024
d211934
camera: pipewire: only list formats with valid mapping
wtay May 8, 2024
7088bfe
camera: move PipeWire camera first in list
wtay May 8, 2024
ff33d11
camera: clean up format table some more
wtay May 8, 2024
0f7d3da
camera: PipeWire 24 bits formats are endianness independent
wtay May 9, 2024
0fbd53f
camera: improve PipeWire version checks
wtay May 9, 2024
17688b7
camera: don't use newer PipeWire cleanup features
wtay May 9, 2024
a94193f
camera: work around old PipeWire versions
wtay May 9, 2024
ed1ab79
camera: make things work on older PipeWire
wtay May 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions cmake/sdlchecks.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,13 +139,16 @@ macro(CheckPipewire)
if(PC_PIPEWIRE_FOUND)
set(HAVE_PIPEWIRE TRUE)
sdl_glob_sources("${SDL3_SOURCE_DIR}/src/audio/pipewire/*.c")
sdl_glob_sources("${SDL3_SOURCE_DIR}/src/camera/pipewire/*.c")
set(SDL_AUDIO_DRIVER_PIPEWIRE 1)
set(SDL_CAMERA_DRIVER_PIPEWIRE 1)
if(SDL_PIPEWIRE_SHARED AND NOT HAVE_SDL_LOADSO)
message(WARNING "You must have SDL_LoadObject() support for dynamic PipeWire loading")
endif()
FindLibraryAndSONAME("pipewire-0.3" LIBDIRS ${PC_PIPEWIRE_LIBRARY_DIRS})
if(SDL_PIPEWIRE_SHARED AND PIPEWIRE_0.3_LIB AND HAVE_SDL_LOADSO)
set(SDL_AUDIO_DRIVER_PIPEWIRE_DYNAMIC "\"${PIPEWIRE_0.3_LIB_SONAME}\"")
set(SDL_CAMERA_DRIVER_PIPEWIRE_DYNAMIC "\"${PIPEWIRE_0.3_LIB_SONAME}\"")
set(HAVE_PIPEWIRE_SHARED TRUE)
sdl_link_dependency(pipewire INCLUDES $<TARGET_PROPERTY:PkgConfig::PC_PIPEWIRE,INTERFACE_INCLUDE_DIRECTORIES>)
else()
Expand Down
2 changes: 2 additions & 0 deletions include/build_config/SDL_build_config.h.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -485,6 +485,8 @@
#cmakedefine SDL_CAMERA_DRIVER_ANDROID @SDL_CAMERA_DRIVER_ANDROID@
#cmakedefine SDL_CAMERA_DRIVER_EMSCRIPTEN @SDL_CAMERA_DRIVER_EMSCRIPTEN@
#cmakedefine SDL_CAMERA_DRIVER_MEDIAFOUNDATION @SDL_CAMERA_DRIVER_MEDIAFOUNDATION@
#cmakedefine SDL_CAMERA_DRIVER_PIPEWIRE @SDL_CAMERA_DRIVER_PIPEWIRE@
#cmakedefine SDL_CAMERA_DRIVER_PIPEWIRE_DYNAMIC @SDL_CAMERA_DRIVER_PIPEWIRE_DYNAMIC@

/* Enable misc subsystem */
#cmakedefine SDL_MISC_DUMMY @SDL_MISC_DUMMY@
Expand Down
3 changes: 3 additions & 0 deletions src/camera/SDL_camera.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,9 @@

// Available camera drivers
static const CameraBootStrap *const bootstrap[] = {
#ifdef SDL_CAMERA_DRIVER_PIPEWIRE
&PIPEWIRECAMERA_bootstrap,
wtay marked this conversation as resolved.
Show resolved Hide resolved
#endif
#ifdef SDL_CAMERA_DRIVER_V4L2
&V4L2_bootstrap,
#endif
Expand Down
1 change: 1 addition & 0 deletions src/camera/SDL_syscamera.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,7 @@ typedef struct CameraBootStrap

// Not all of these are available in a given build. Use #ifdefs, etc.
extern CameraBootStrap DUMMYCAMERA_bootstrap;
extern CameraBootStrap PIPEWIRECAMERA_bootstrap;
extern CameraBootStrap V4L2_bootstrap;
extern CameraBootStrap COREMEDIA_bootstrap;
extern CameraBootStrap ANDROIDCAMERA_bootstrap;
Expand Down