jordan/camera-streamer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix printf warnings

Browse Source
This commit is contained in:
Kamil Trzcinski 2022-07-05 09:22:40 +00:00
parent 981eb459ed
commit 26d94709e3
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
device/libcamera/buffer.cc
View File

@ -1,6 +1,8 @@
#ifdef USE_LIBCAMERA #ifdef USE_LIBCAMERA
#include "libcamera.hh" #include "libcamera.hh"
#include <inttypes.h>
int libcamera_buffer_open(buffer_t *buf) int libcamera_buffer_open(buffer_t *buf)
{ {
buf->libcamera = new buffer_libcamera_t{}; buf->libcamera = new buffer_libcamera_t{};
@ -37,7 +39,7 @@ int libcamera_buffer_open(buffer_t *buf)
} }
if (offset + length != plane.offset) { if (offset + length != plane.offset) {
LOG_ERROR(buf, "Plane is not continuous: offset=%u, expected=%lu", plane.offset, offset + length); LOG_ERROR(buf, "Plane is not continuous: offset=%u, expected=%" PRIu64, plane.offset, offset + length);
} }
length += plane.length; length += plane.length;
@ -51,7 +53,7 @@ int libcamera_buffer_open(buffer_t *buf)
buf->dma_fd = dma_fd.get(); buf->dma_fd = dma_fd.get();
buf->length = length; buf->length = length;
LOG_DEBUG(buf, "Mapped buffer: start=%p, length=%zu, fd=%d, planes=%lu", LOG_DEBUG(buf, "Mapped buffer: start=%p, length=%zu, fd=%d, planes=%zu",
buf->start, buf->length, buf->dma_fd, buffer->planes().size()); buf->start, buf->length, buf->dma_fd, buffer->planes().size());
} }

9
device/libcamera/device.cc
View File

@ -7,6 +7,11 @@ std::string libcamera_device_option_normalize(std::string key)
return key; return key;
} }
libcamera::ControlInfoMap libcamera_control_list(device_t *dev)
{
return dev->libcamera->camera->controls();
}
int libcamera_device_open(device_t *dev) int libcamera_device_open(device_t *dev)
{ {
dev->libcamera = new device_libcamera_t{}; dev->libcamera = new device_libcamera_t{};
@ -35,7 +40,7 @@ int libcamera_device_open(device_t *dev)
LOG_INFO(dev, "Device path=%s opened", dev->path); LOG_INFO(dev, "Device path=%s opened", dev->path);
for (auto const &control : dev->libcamera->camera->controls()) { for (auto const &control : libcamera_control_list(dev)) {
if (!control.first) if (!control.first)
continue; continue;
@ -74,7 +79,7 @@ int libcamera_device_set_option(device_t *dev, const char *keyp, const char *val
{ {
auto key = libcamera_device_option_normalize(keyp); auto key = libcamera_device_option_normalize(keyp);
for (auto const &control : dev->libcamera->camera->controls()) { for (auto const &control : libcamera_control_list(dev)) {
if (!control.first) if (!control.first)
continue; continue;