mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-12-15 08:56:38 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

spa: libcamera: add libcamera version check for properties::SystemDevices

Browse source
This commit is contained in:
Robert Mader 2023-07-17 16:02:04 +02:00 • committed by Wim Taymans
parent 6cd29aed05
commit 5bac089229
3 changed files with 6 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
spa/meson.build
View file

@ -94,6 +94,7 @@ if get_option('spa-plugins').allowed()
libcamera_dep = dependency('libcamera', required: get_option('libcamera')) libcamera_dep = dependency('libcamera', required: get_option('libcamera'))
summary({'libcamera': libcamera_dep.found()}, bool_yn: true, section: 'Backend') summary({'libcamera': libcamera_dep.found()}, bool_yn: true, section: 'Backend')
cdata.set('HAVE_LIBCAMERA_SYSTEM_DEVICES', libcamera_dep.version().version_compare('>= 0.1.0'))
compress_offload_option = get_option('compress-offload') compress_offload_option = get_option('compress-offload')
summary({'Compress-Offload': compress_offload_option.allowed()}, bool_yn: true, section: 'Backend') summary({'Compress-Offload': compress_offload_option.allowed()}, bool_yn: true, section: 'Backend')

4
spa/plugins/libcamera/libcamera-device.cpp
View file

@ -4,6 +4,8 @@
/* SPDX-FileCopyrightText: Copyright © 2021 Wim Taymans <wim.taymans@gmail.com> */ /* SPDX-FileCopyrightText: Copyright © 2021 Wim Taymans <wim.taymans@gmail.com> */
/* SPDX-License-Identifier: MIT */ /* SPDX-License-Identifier: MIT */
#include "config.h"
#include <stddef.h> #include <stddef.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
@ -59,10 +61,12 @@ struct impl {
static const libcamera::Span<const int64_t> cameraDevice( static const libcamera::Span<const int64_t> cameraDevice(
const Camera *camera) const Camera *camera)
{ {
#ifdef HAVE_LIBCAMERA_SYSTEM_DEVICES
const ControlList &props = camera->properties(); const ControlList &props = camera->properties();
if (auto devices = props.get(properties::SystemDevices)) if (auto devices = props.get(properties::SystemDevices))
return devices.value(); return devices.value();
#endif
return {}; return {};
} }

1
spa/plugins/libcamera/meson.build
View file

@ -7,6 +7,7 @@ libcamera_sources = [
libcameralib = shared_library('spa-libcamera', libcameralib = shared_library('spa-libcamera',
libcamera_sources, libcamera_sources,
include_directories : [ configinc ],
dependencies : [ spa_dep, libudev_dep, libcamera_dep, pthread_lib ], dependencies : [ spa_dep, libudev_dep, libcamera_dep, pthread_lib ],
install : true, install : true,
install_dir : spa_plugindir / 'libcamera') install_dir : spa_plugindir / 'libcamera')