mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-04 13:30:12 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

spa: libcamera: call get() instead of fd()

Browse source 
libcamera commit 560f5cf998646ddc54a20dc1c7326012834d3204
renamed the `fd()` method on `SharedFD` to `get()`.

Adjust the libcamera plugin accordingly.
This commit is contained in:
Barnabás Pőcze 2021-12-07 16:12:58 +01:00 • committed by Wim Taymans
parent 128f80dd6b
commit 57dae3e2b3
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -558,7 +558,7 @@ mmap_init(struct impl *impl, struct port *port,
if (port->memtype == SPA_DATA_DmaBuf || if (port->memtype == SPA_DATA_DmaBuf ||
port->memtype == SPA_DATA_MemFd) { port->memtype == SPA_DATA_MemFd) {
d[j].fd = bufs[i]->planes()[j].fd.fd(); d[j].fd = bufs[i]->planes()[j].fd.get();
spa_log_debug(impl->log, "Got fd = %ld for buffer: #%d", d[j].fd, i); spa_log_debug(impl->log, "Got fd = %ld for buffer: #%d", d[j].fd, i);
d[j].data = NULL; d[j].data = NULL;
SPA_FLAG_SET(b->flags, BUFFER_FLAG_ALLOCATED); SPA_FLAG_SET(b->flags, BUFFER_FLAG_ALLOCATED);
@ -568,7 +568,7 @@ mmap_init(struct impl *impl, struct port *port,
d[j].data = mmap(NULL, d[j].data = mmap(NULL,
d[j].maxsize + d[j].mapoffset, d[j].maxsize + d[j].mapoffset,
PROT_READ, MAP_SHARED, PROT_READ, MAP_SHARED,
bufs[i]->planes()[j].fd.fd(), bufs[i]->planes()[j].fd.get(),
0); 0);
if (d[j].data == MAP_FAILED) { if (d[j].data == MAP_FAILED) {
spa_log_error(impl->log, "mmap: %m"); spa_log_error(impl->log, "mmap: %m");