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

Fix frame rate

Browse Source
This commit is contained in:
Kamil Trzcinski
2022-04-11 17:07:35 +02:00
parent fb400f3139
commit e69f707ef0
3 changed files with 35 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
device/libcamera/buffer.cc
View File

@ -76,12 +76,6 @@ int libcamera_buffer_enqueue(buffer_t *buf, const char *who)
request->reuse(libcamera::Request::ReuseBuffers);
// TODO: assign timestamps
// for (auto const &pair : request->buffers()) {
// v4l2_buf.timestamp.tv_sec = buf->captured_time_us / (1000LL * 1000LL);
// v4l2_buf.timestamp.tv_usec = buf->captured_time_us % (1000LL * 1000LL);
// }
if (buf->buf_list->dev->libcamera->camera->queueRequest(buf->libcamera->request.get()) < 0) {
LOG_ERROR(buf, "Can't queue buffer.");
}
@ -119,11 +113,6 @@ int libcamera_buffer_list_dequeue(buffer_list_t *buf_list, buffer_t **bufp)
}
*bufp = buf_list->bufs[index];
// TODO: fix timestamps
// buf->v4l2->flags = v4l2_buf.flags;
// buf->flags.is_keyframe = (v4l2_buf.flags & V4L2_BUF_FLAG_KEYFRAME) != 0;
// buf->captured_time_us = get_time_us(CLOCK_FROM_PARAMS, NULL, &v4l2_buf.timestamp, 0);
return 0;
}

2
device/libcamera/buffer_list.cc
View File

@ -88,7 +88,7 @@ int libcamera_buffer_list_set_stream(buffer_list_t *buf_list, bool do_on)
buf_list->dev->libcamera->camera->requestCompleted.connect(
buf_list->libcamera, &buffer_list_libcamera_t::libcamera_buffer_list_dequeued);
if (buf_list->dev->libcamera->camera->start() < 0) {
if (buf_list->dev->libcamera->camera->start(&buf_list->dev->libcamera->controls) < 0) {
LOG_ERROR(buf_list, "Failed to start camera.");
}
} else {