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

Move device/hw/buffer_lock.h to device/buffer_lock.h

Browse Source
This commit is contained in:
Kamil Trzcinski
2022-04-10 09:47:24 +02:00
parent dfc6df83cf
commit 13528eff1d
5 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

135
device/hw/buffer_lock.c
View File

@ -1,135 +0,0 @@
#include "device/hw/buffer_lock.h"
#include "device/hw/buffer_list.h"
#include "device/hw/buffer.h"
#include "device/hw/v4l2.h"
bool buffer_lock_is_used(buffer_lock_t *buf_lock)
{
int refs = 0;
pthread_mutex_lock(&buf_lock->lock);
refs = buf_lock->refs;
pthread_mutex_unlock(&buf_lock->lock);
return refs;
}
void buffer_lock_use(buffer_lock_t *buf_lock, int ref)
{
pthread_mutex_lock(&buf_lock->lock);
buf_lock->refs += ref;
pthread_mutex_unlock(&buf_lock->lock);
}
bool buffer_lock_needs_buffer(buffer_lock_t *buf_lock)
{
uint64_t now = get_monotonic_time_us(NULL, NULL);
bool needs_buffer = false;
pthread_mutex_lock(&buf_lock->lock);
if (buf_lock->timeout_us > 0 && now - buf_lock->buf_time_us > buf_lock->timeout_us) {
buffer_consumed(buf_lock->buf, buf_lock->name);
buf_lock->buf = NULL;
}
if (buf_lock->refs > 0) {
needs_buffer = true;
}
pthread_mutex_unlock(&buf_lock->lock);
return needs_buffer;
}
void buffer_lock_capture(buffer_lock_t *buf_lock, buffer_t *buf)
{
uint64_t now = get_monotonic_time_us(NULL, NULL);
uint64_t captured_time_us = buf ? get_time_us(CLOCK_FROM_PARAMS, NULL, &buf->v4l2_buffer.timestamp, 0) : 0;
pthread_mutex_lock(&buf_lock->lock);
if (!buf) {
buffer_consumed(buf_lock->buf, buf_lock->name);
buf_lock->buf = NULL;
buf_lock->buf_time_us = now;
} else if (now - buf_lock->buf_time_us < buf_lock->frame_interval_ms * 1000) {
buf_lock->dropped++;
E_LOG_DEBUG(buf_lock, "Dropped buffer %s (refs=%d), frame=%d/%d, frame_ms=%.1f",
dev_name(buf), buf ? buf->mmap_reflinks : 0,
buf_lock->counter, buf_lock->dropped,
(now - captured_time_us) / 1000.0f);
} else {
buffer_consumed(buf_lock->buf, buf_lock->name);
buffer_use(buf);
buf_lock->buf = buf;
buf_lock->counter++;
E_LOG_DEBUG(buf_lock, "Captured buffer %s (refs=%d), frame=%d/%d, processing_ms=%.1f, frame_ms=%.1f",
dev_name(buf), buf ? buf->mmap_reflinks : 0,
buf_lock->counter, buf_lock->dropped,
(now - captured_time_us) / 1000.0f,
(now - buf_lock->buf_time_us) / 1000.0f);
buf_lock->buf_time_us = now;
pthread_cond_broadcast(&buf_lock->cond_wait);
}
pthread_mutex_unlock(&buf_lock->lock);
}
buffer_t *buffer_lock_get(buffer_lock_t *buf_lock, int timeout_ms, int *counter)
{
buffer_t *buf = NULL;
struct timespec timeout;
if(!timeout_ms)
timeout_ms = DEFAULT_BUFFER_LOCK_GET_TIMEOUT;
get_time_us(CLOCK_REALTIME, &timeout, NULL, timeout_ms * 1000LL);
pthread_mutex_lock(&buf_lock->lock);
if (*counter == buf_lock->counter || !buf_lock->buf) {
int ret = pthread_cond_timedwait(&buf_lock->cond_wait, &buf_lock->lock, &timeout);
if (ret == ETIMEDOUT) {
goto ret;
} else if (ret < 0) {
goto ret;
}
}
buf = buf_lock->buf;
buffer_use(buf);
*counter = buf_lock->counter;
ret:
pthread_mutex_unlock(&buf_lock->lock);
return buf;
}
int buffer_lock_write_loop(buffer_lock_t *buf_lock, int nframes, buffer_write_fn fn, void *data)
{
int counter = 0;
int frames = 0;
buffer_lock_use(buf_lock, 1);
while (nframes == 0 || frames < nframes) {
buffer_t *buf = buffer_lock_get(buf_lock, 0, &counter);
if (!buf) {
goto error;
}
int ret = fn(buf_lock, buf, frames, data);
buffer_consumed(buf, "write-loop");
if (ret > 0) {
frames++;
} else if (ret < 0) {
goto error;
}
}
ok:
buffer_lock_use(buf_lock, -1);
return frames;
error:
buffer_lock_use(buf_lock, -1);
return -frames;
}

42
device/hw/buffer_lock.h
View File

@ -1,42 +0,0 @@
#pragma once
#include <stdbool.h>
#include <stdint.h>
#include <pthread.h>
typedef struct buffer_s buffer_t;
typedef struct buffer_lock_s {
const char *name;
pthread_mutex_t lock;
pthread_cond_t cond_wait;
buffer_t *buf;
uint64_t buf_time_us;
int counter;
int refs;
int dropped;
uint64_t timeout_us;
int frame_interval_ms;
} buffer_lock_t;
#define DEFAULT_BUFFER_LOCK_TIMEOUT 16 // ~60fps
#define DEFAULT_BUFFER_LOCK_GET_TIMEOUT 2000 // 2s
#define DEFINE_BUFFER_LOCK(_name, _timeout_ms) buffer_lock_t _name = { \
.name = #_name, \
.lock = PTHREAD_MUTEX_INITIALIZER, \
.cond_wait = PTHREAD_COND_INITIALIZER, \
.timeout_us = (_timeout_ms > DEFAULT_BUFFER_LOCK_TIMEOUT ? _timeout_ms : DEFAULT_BUFFER_LOCK_TIMEOUT) * 1000LL, \
};
#define DECLARE_BUFFER_LOCK(_name) extern buffer_lock_t _name;
typedef int (*buffer_write_fn)(buffer_lock_t *buf_lock, buffer_t *buf, int frame, void *data);
void buffer_lock_capture(buffer_lock_t *buf_lock, buffer_t *buf);
buffer_t *buffer_lock_get(buffer_lock_t *buf_lock, int timeout_ms, int *counter);
bool buffer_lock_needs_buffer(buffer_lock_t *buf_lock);
void buffer_lock_use(buffer_lock_t *buf_lock, int ref);
bool buffer_lock_is_used(buffer_lock_t *buf_lock);
int buffer_lock_write_loop(buffer_lock_t *buf_lock, int nframes, buffer_write_fn fn, void *data);