forked/ustreamer
1
0
Fork 0
mirror of https://github.com/pikvm/ustreamer.git synced 2026-04-11 09:06:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

renamed us_hw_buffer_s to us_capture_hwbuf_s

Browse Source
This commit is contained in:
Maxim Devaev
2024-03-26 01:54:01 +02:00
parent f0f5fcd67f
commit 8d4e9a6ca0
7 changed files with 40 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/v4p/drm.c
View File

@@ -377,7 +377,7 @@ int us_drm_expose_stub(us_drm_s *drm, us_drm_stub_e stub, const us_capture_s *ca
return retval;
}
int us_drm_expose_dma(us_drm_s *drm, const us_hw_buffer_s *hw) {
int us_drm_expose_dma(us_drm_s *drm, const us_capture_hwbuf_s *hw) {
us_drm_runtime_s *const run = drm->run;
us_drm_buffer_s *const buf = &run->bufs[hw->buf.index];
@@ -513,7 +513,7 @@ static int _drm_init_buffers(us_drm_s *drm, const us_capture_s *cap) {
strides[0] = create.pitch;
} else {
if (drmPrimeFDToHandle(run->fd, cap->run->hw_bufs[n_buf].dma_fd, &buf->handle) < 0) {
if (drmPrimeFDToHandle(run->fd, cap->run->bufs[n_buf].dma_fd, &buf->handle) < 0) {
_D_LOG_PERROR("Can't import DMA buffer=%u from capture device", n_buf);
return -1;
}

2
src/v4p/drm.h
View File

@@ -89,4 +89,4 @@ void us_drm_close(us_drm_s *drm);
int us_drm_dpms_power_off(us_drm_s *drm);
int us_drm_wait_for_vsync(us_drm_s *drm);
int us_drm_expose_stub(us_drm_s *drm, us_drm_stub_e stub, const us_capture_s *cap);
int us_drm_expose_dma(us_drm_s *drm, const us_hw_buffer_s *hw);
int us_drm_expose_dma(us_drm_s *drm, const us_capture_hwbuf_s *hw);

4
src/v4p/main.c
View File

@@ -213,7 +213,7 @@ static void _main_loop(void) {
us_drm_close(drm);
CHECK(drm_opened = us_drm_open(drm, cap));
us_hw_buffer_s *prev_hw = NULL;
us_capture_hwbuf_s *prev_hw = NULL;
while (!atomic_load(&_g_stop)) {
if (atomic_load(&_g_ustreamer_online)) {
goto close;
@@ -226,7 +226,7 @@ static void _main_loop(void) {
prev_hw = NULL;
}
us_hw_buffer_s *hw;
us_capture_hwbuf_s *hw;
switch (us_capture_grab_buffer(cap, &hw)) {
case -2: continue; // Broken frame
case -1: goto close; // Any error