mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-02 09:01:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

libcamera: fix device id assignment

Browse source 
Find a free id from the available ids instead of just taking the current
number of devices, which would give assign the same id to multiple
cameras when: added 0, added 1, removed 0, added 1.
This commit is contained in:
Wim Taymans 2022-11-14 16:04:21 +01:00
parent a57590e334
commit 93d2571b30
1 changed files with 17 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

22
spa/plugins/libcamera/libcamera-manager.cpp
View file

@ -117,6 +117,13 @@ std::shared_ptr<CameraManager> libcamera_manager_acquire(int& res)
return manager; return manager;
} }
static uint32_t get_free_id(struct impl *impl)
{
for (std::size_t i = 0; i < MAX_DEVICES; i++)
if (impl->devices[i].camera == nullptr)
return i;
return 0;
}
static struct device *add_device(struct impl *impl, std::shared_ptr<Camera> camera) static struct device *add_device(struct impl *impl, std::shared_ptr<Camera> camera)
{ {
@ -125,10 +132,11 @@ static struct device *add_device(struct impl *impl, std::shared_ptr<Camera> came
if (impl->n_devices >= MAX_DEVICES) if (impl->n_devices >= MAX_DEVICES)
return NULL; return NULL;
id = impl->n_devices++; id = get_free_id(impl);;
device = &impl->devices[id]; device = &impl->devices[id];
device->id = id; device->id = get_free_id(impl);;
device->camera = std::move(camera); device->camera = std::move(camera);
impl->n_devices++;
return device; return device;
} }
@ -144,8 +152,10 @@ static struct device *find_device(struct impl *impl, const Camera *camera)
static void remove_device(struct impl *impl, struct device *device) static void remove_device(struct impl *impl, struct device *device)
{ {
uint32_t old = --impl->n_devices;
device->camera.reset(); device->camera.reset();
*device = std::move(impl->devices[--impl->n_devices]); *device = std::move(impl->devices[old]);
impl->devices[old].camera = nullptr;
} }
static void clear_devices(struct impl *impl) static void clear_devices(struct impl *impl)
@ -196,7 +206,8 @@ static void try_add_camera(struct impl *impl, std::shared_ptr<Camera> camera)
if ((device = add_device(impl, std::move(camera))) == NULL) if ((device = add_device(impl, std::move(camera))) == NULL)
return; return;
spa_log_info(impl->log, "camera added: %s", device->camera->id().c_str()); spa_log_info(impl->log, "camera added: id:%d %s", device->id,
device->camera->id().c_str());
emit_object_info(impl, device); emit_object_info(impl, device);
} }
@ -207,7 +218,8 @@ static void try_remove_camera(struct impl *impl, const Camera *camera)
if ((device = find_device(impl, camera)) == NULL) if ((device = find_device(impl, camera)) == NULL)
return; return;
spa_log_info(impl->log, "camera removed: %s", device->camera->id().c_str()); spa_log_info(impl->log, "camera removed: id:%d %s", device->id,
device->camera->id().c_str());
spa_device_emit_object_info(&impl->hooks, device->id, NULL); spa_device_emit_object_info(&impl->hooks, device->id, NULL);
remove_device(impl, device); remove_device(impl, device);
} }