forked/ustreamer
1
0
Fork 0
mirror of https://github.com/pikvm/ustreamer.git synced 2026-03-10 09:33:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

decreased grab latency

Browse Source
This commit is contained in:
Maxim Devaev
2023-08-23 05:26:35 +03:00
parent 0745f0a75a
commit 516c0be6ea
2 changed files with 34 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/ustreamer/device.c
View File

@@ -310,16 +310,37 @@ int us_device_grab_buffer(us_device_s *dev, us_hw_buffer_s **hw) {
*hw = NULL; *hw = NULL;
struct v4l2_buffer buf = {0}; struct v4l2_buffer buf = {0};
buf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE; bool buf_got = false;
buf.memory = dev->io_method; unsigned skipped = 0;
US_LOG_DEBUG("Grabbing device buffer ..."); US_LOG_DEBUG("Grabbing device buffer ...");
if (_D_XIOCTL(VIDIOC_DQBUF, &buf) < 0) {
US_LOG_PERROR("Can't grab device buffer");
return -1;
}
US_LOG_DEBUG("Grabbed new frame: buffer=%u, bytesused=%u", buf.index, buf.bytesused); do {
struct v4l2_buffer new = {0};
new.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
new.memory = dev->io_method;
const bool new_got = (_D_XIOCTL(VIDIOC_DQBUF, &new) >= 0);
if (new_got) {
if (buf_got) {
if (_D_XIOCTL(VIDIOC_QBUF, &buf) < 0) {
US_LOG_PERROR("Can't release device buffer=%u (skipped frame)", buf.index);
return -1;
}
++skipped;
buf_got = false;
}
memcpy(&buf, &new, sizeof(struct v4l2_buffer));
buf_got = true;
} else {
if (buf_got && errno == EAGAIN) {
break;
} else {
US_LOG_PERROR("Can't grab device buffer");
return -1;
}
}
} while (true);
if (buf.index >= _RUN(n_bufs)) { if (buf.index >= _RUN(n_bufs)) {
US_LOG_ERROR("V4L2 error: grabbed invalid device buffer=%u, n_bufs=%u", buf.index, _RUN(n_bufs)); US_LOG_ERROR("V4L2 error: grabbed invalid device buffer=%u, n_bufs=%u", buf.index, _RUN(n_bufs));
@@ -358,7 +379,9 @@ int us_device_grab_buffer(us_device_s *dev, us_hw_buffer_s **hw) {
HW(raw.stride) = _RUN(stride); HW(raw.stride) = _RUN(stride);
HW(raw.online) = true; HW(raw.online) = true;
memcpy(&HW(buf), &buf, sizeof(struct v4l2_buffer)); memcpy(&HW(buf), &buf, sizeof(struct v4l2_buffer));
HW(raw.grab_ts) = us_get_now_monotonic(); HW(raw.grab_ts)= (long double)((buf.timestamp.tv_sec * (uint64_t)1000) + (buf.timestamp.tv_usec / 1000)) / 1000;
US_LOG_DEBUG("Grabbed new frame: buffer=%u, bytesused=%u, grab_ts=%.3Lf, latency=%.3Lf, skipped=%u",
buf.index, buf.bytesused, HW(raw.grab_ts), us_get_now_monotonic() - HW(raw.grab_ts), skipped);
# undef HW # undef HW
*hw = &_RUN(hw_bufs[buf.index]); *hw = &_RUN(hw_bufs[buf.index]);

5
src/ustreamer/stream.c
View File

@@ -112,9 +112,10 @@ void us_stream_loop(us_stream_s *stream) {
if (!ready_wr->job_failed) { if (!ready_wr->job_failed) {
if (ready_wr->job_timely) { if (ready_wr->job_timely) {
_stream_expose_frame(stream, ready_job->dest, captured_fps); _stream_expose_frame(stream, ready_job->dest, captured_fps);
US_LOG_PERF("##### Encoded frame exposed; worker=%s", ready_wr->name); US_LOG_PERF("##### Encoded JPEG exposed; worker=%s, latency=%.3Lf",
ready_wr->name, us_get_now_monotonic() - ready_job->dest->grab_ts);
} else { } else {
US_LOG_PERF("----- Encoded frame dropped; worker=%s", ready_wr->name); US_LOG_PERF("----- Encoded JPEG dropped; worker=%s", ready_wr->name);
} }
} else { } else {
break; break;