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

spa: libcamera: use std::optional intead of separate bool flag + value

Browse source 
`std::optional` conveniently encapsulates a value and a bool flag,
so use that instead of manually replicating it.
This commit is contained in:
Barnabás Pőcze 2022-09-03 23:30:02 +02:00 • committed by Wim Taymans
parent 13357fec20
commit 9374c15c3d
2 changed files with 36 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

6
spa/plugins/libcamera/libcamera-utils.cpp
View file

@ -54,7 +54,7 @@ int spa_libcamera_close(struct impl *impl)
struct port *port = &impl->out_ports[0];
if (!impl->acquired)
return 0;
if (impl->active || port->have_format)
if (impl->active || port->current_format)
return 0;
spa_log_info(impl->log, "close camera %s", impl->device_id.c_str());
@ -419,8 +419,6 @@ static int spa_libcamera_set_format(struct impl *impl, struct port *port,
if ((res = allocBuffers(impl, port, port->streamConfig.bufferCount)) < 0)
goto error;
port->have_format = true;
port->info.change_mask |= SPA_PORT_CHANGE_MASK_FLAGS | SPA_PORT_CHANGE_MASK_RATE;
port->info.flags = SPA_PORT_FLAG_CAN_ALLOC_BUFFERS |
SPA_PORT_FLAG_LIVE |
@ -664,7 +662,7 @@ static int spa_libcamera_stream_on(struct impl *impl)
struct port *port = &impl->out_ports[0];
int res;
if (!port->have_format) {
if (!port->current_format) {
spa_log_error(impl->log, "Exting %s with -EIO", __FUNCTION__);
return -EIO;
}