mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-10-31 22:25:38 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

spa: libcamera: don't use fixed size buffers for properties

Browse source 
Use `std::string` and `std::ostringstream` when processing the
camera properties, in order to avoid truncation.

See !2095
See !2268
This commit is contained in:
Barnabás Pőcze 2025-02-02 14:14:06 +01:00 • committed by Wim Taymans
parent 41045c5e61
commit 1e09827953
1 changed files with 17 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -8,6 +8,8 @@
#include <stddef.h> #include <stddef.h>
#include <sstream>
#include <spa/support/plugin.h> #include <spa/support/plugin.h>
#include <spa/support/log.h> #include <spa/support/log.h>
#include <spa/support/loop.h> #include <spa/support/loop.h>
@ -110,8 +112,6 @@ static int emit_info(struct impl *impl, bool full)
uint32_t n_items = 0; uint32_t n_items = 0;
struct spa_device_info info; struct spa_device_info info;
struct spa_param_info params[2]; struct spa_param_info params[2];
char path[256], name[256], devices_str[256];
struct spa_strbuf buf;
Camera& camera = *impl->camera; Camera& camera = *impl->camera;
info = SPA_DEVICE_INFO_INIT(); info = SPA_DEVICE_INFO_INIT();
@ -119,8 +119,10 @@ static int emit_info(struct impl *impl, bool full)
info.change_mask = SPA_DEVICE_CHANGE_MASK_PROPS; info.change_mask = SPA_DEVICE_CHANGE_MASK_PROPS;
#define ADD_ITEM(key, value) items[n_items++] = SPA_DICT_ITEM_INIT(key, value) #define ADD_ITEM(key, value) items[n_items++] = SPA_DICT_ITEM_INIT(key, value)
snprintf(path, sizeof(path), "libcamera:%s", impl->device_id.c_str());
ADD_ITEM(SPA_KEY_OBJECT_PATH, path); const auto path = "libcamera:" + impl->device_id;
ADD_ITEM(SPA_KEY_OBJECT_PATH, path.c_str());
ADD_ITEM(SPA_KEY_DEVICE_API, "libcamera"); ADD_ITEM(SPA_KEY_DEVICE_API, "libcamera");
ADD_ITEM(SPA_KEY_MEDIA_CLASS, "Video/Device"); ADD_ITEM(SPA_KEY_MEDIA_CLASS, "Video/Device");
ADD_ITEM(SPA_KEY_API_LIBCAMERA_PATH, impl->device_id.c_str()); ADD_ITEM(SPA_KEY_API_LIBCAMERA_PATH, impl->device_id.c_str());
@ -134,21 +136,24 @@ static int emit_info(struct impl *impl, bool full)
ADD_ITEM(SPA_KEY_DEVICE_PRODUCT_NAME, model.c_str()); ADD_ITEM(SPA_KEY_DEVICE_PRODUCT_NAME, model.c_str());
ADD_ITEM(SPA_KEY_DEVICE_DESCRIPTION, model.c_str()); ADD_ITEM(SPA_KEY_DEVICE_DESCRIPTION, model.c_str());
snprintf(name, sizeof(name), "libcamera_device.%s", impl->device_id.c_str()); const auto name = "libcamera_device." + impl->device_id;
ADD_ITEM(SPA_KEY_DEVICE_NAME, name); ADD_ITEM(SPA_KEY_DEVICE_NAME, name.c_str());
auto device_numbers = cameraDevice(camera); auto device_numbers = cameraDevice(camera);
std::string devids;
if (!device_numbers.empty()) { if (!device_numbers.empty()) {
spa_strbuf_init(&buf, devices_str, sizeof(devices_str)); std::ostringstream s;
/* encode device numbers into a json array */ /* encode device numbers into a json array */
spa_strbuf_append(&buf, "[ "); s << "[ ";
for(int64_t device_number : device_numbers) for (const auto& devid : device_numbers)
spa_strbuf_append(&buf, "%" PRId64 " ", device_number); s << devid << ' ';
s << ']';
spa_strbuf_append(&buf, "]"); devids = std::move(s).str();
ADD_ITEM(SPA_KEY_DEVICE_DEVIDS, devices_str); ADD_ITEM(SPA_KEY_DEVICE_DEVIDS, devids.c_str());
} }
#undef ADD_ITEM #undef ADD_ITEM