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

Introduce buffer_format_t and use it for buffer_list_open

Browse Source
This commit is contained in:
Kamil Trzcinski
2022-04-11 20:48:09 +02:00
parent a3e8ef1e24
commit 5a9e871484
14 changed files with 117 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
device/libcamera/buffer_list.cc
View File

@ -1,10 +1,8 @@
#ifdef USE_LIBCAMERA
#include "libcamera.hh"
int libcamera_buffer_list_open(buffer_list_t *buf_list, const char *path, unsigned width, unsigned height, unsigned format, unsigned bytesperline, int nbufs)
int libcamera_buffer_list_open(buffer_list_t *buf_list)
{
int got_bufs = 0;
if (!buf_list->do_capture) {
LOG_INFO(buf_list, "Only capture mode is supported.");
return -1;
@ -29,13 +27,13 @@ int libcamera_buffer_list_open(buffer_list_t *buf_list, const char *path, unsign
{ libcamera::StreamRole::Viewfinder });
auto &configuration = buf_list->libcamera->configuration->at(0);
configuration.size = libcamera::Size(width, height);
configuration.pixelFormat = libcamera::PixelFormat(format);
if (bytesperline > 0) {
configuration.stride = bytesperline;
configuration.size = libcamera::Size(buf_list->fmt.width, buf_list->fmt.height);
configuration.pixelFormat = libcamera::PixelFormat(buf_list->fmt.format);
if (buf_list->fmt.bytesperline > 0) {
configuration.stride = buf_list->fmt.bytesperline;
}
if (nbufs > 0) {
configuration.bufferCount = nbufs;
if (buf_list->fmt.nbufs > 0) {
configuration.bufferCount = buf_list->fmt.nbufs;
}
if (buf_list->libcamera->configuration->validate() == libcamera::CameraConfiguration::Invalid) {
LOG_ERROR(buf_list, "Camera configuration invalid");
@ -45,15 +43,15 @@ int libcamera_buffer_list_open(buffer_list_t *buf_list, const char *path, unsign
LOG_ERROR(buf_list, "Failed to configure camera");
}
buf_list->fmt_width = configuration.size.width;
buf_list->fmt_height = configuration.size.height;
buf_list->fmt_format = configuration.pixelFormat.fourcc();
buf_list->fmt_bytesperline = configuration.stride;
buf_list->fmt.width = configuration.size.width;
buf_list->fmt.height = configuration.size.height;
buf_list->fmt.format = configuration.pixelFormat.fourcc();
buf_list->fmt.bytesperline = configuration.stride;
buf_list->fmt.nbufs = configuration.bufferCount;
buf_list->libcamera->allocator = std::make_shared<libcamera::FrameBufferAllocator>(
buf_list->dev->libcamera->camera);
got_bufs = configuration.bufferCount;
for (libcamera::StreamConfiguration &stream_config : *buf_list->libcamera->configuration) {
if (buf_list->libcamera->allocator->allocate(stream_config.stream()) < 0) {
@ -62,10 +60,10 @@ int libcamera_buffer_list_open(buffer_list_t *buf_list, const char *path, unsign
int allocated = buf_list->libcamera->allocator->buffers(
stream_config.stream()).size();
got_bufs = std::min(got_bufs, allocated);
buf_list->fmt.nbufs = std::min<unsigned>(buf_list->fmt.nbufs, allocated);
}
return got_bufs;
return buf_list->fmt.nbufs;
error:
return -1;

2
device/libcamera/libcamera.hh
View File

@ -67,7 +67,7 @@ void libcamera_buffer_list_dequeued(buffer_list_t *buf_list, libcamera::Request
int libcamera_buffer_list_dequeue(buffer_list_t *buf_list, buffer_t **bufp);
int libcamera_buffer_list_pollfd(buffer_list_t *buf_list, struct pollfd *pollfd, bool can_dequeue);
int libcamera_buffer_list_open(buffer_list_t *buf_list, const char *path, unsigned width, unsigned height, unsigned format, unsigned bytesperline, int nbufs);
int libcamera_buffer_list_open(buffer_list_t *buf_list);
void libcamera_buffer_list_close(buffer_list_t *buf_list);
int libcamera_buffer_list_set_stream(buffer_list_t *buf_list, bool do_on);
#endif // USE_LIBCAMERA