dmabuf: Limit frame rate to 20 FPS
parent
c5fee473d6
commit
ffce795c6f
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 2019 Andri Yngvason
|
* Copyright (c) 2019 - 2020 Andri Yngvason
|
||||||
*
|
*
|
||||||
* Permission to use, copy, modify, and/or distribute this software for any
|
* Permission to use, copy, modify, and/or distribute this software for any
|
||||||
* purpose with or without fee is hereby granted, provided that the above
|
* purpose with or without fee is hereby granted, provided that the above
|
||||||
|
@ -18,6 +18,7 @@
|
||||||
|
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
#include <stdbool.h>
|
#include <stdbool.h>
|
||||||
|
#include <uv.h>
|
||||||
#include "frame-capture.h"
|
#include "frame-capture.h"
|
||||||
|
|
||||||
struct zwlr_export_dmabuf_manager_v1;
|
struct zwlr_export_dmabuf_manager_v1;
|
||||||
|
@ -47,6 +48,9 @@ struct dmabuf_capture {
|
||||||
struct zwlr_export_dmabuf_manager_v1* manager;
|
struct zwlr_export_dmabuf_manager_v1* manager;
|
||||||
struct zwlr_export_dmabuf_frame_v1* zwlr_frame;
|
struct zwlr_export_dmabuf_frame_v1* zwlr_frame;
|
||||||
struct dmabuf_frame frame;
|
struct dmabuf_frame frame;
|
||||||
|
|
||||||
|
uint64_t last_time;
|
||||||
|
uv_timer_t timer;
|
||||||
};
|
};
|
||||||
|
|
||||||
void dmabuf_capture_init(struct dmabuf_capture* self);
|
void dmabuf_capture_init(struct dmabuf_capture* self);
|
||||||
|
|
64
src/dmabuf.c
64
src/dmabuf.c
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 2019 Andri Yngvason
|
* Copyright (c) 2019 - 2020 Andri Yngvason
|
||||||
*
|
*
|
||||||
* Permission to use, copy, modify, and/or distribute this software for any
|
* Permission to use, copy, modify, and/or distribute this software for any
|
||||||
* purpose with or without fee is hereby granted, provided that the above
|
* purpose with or without fee is hereby granted, provided that the above
|
||||||
|
@ -18,15 +18,34 @@
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
#include <wayland-client.h>
|
#include <wayland-client.h>
|
||||||
|
#include <uv.h>
|
||||||
|
#include <wayland-util.h>
|
||||||
|
|
||||||
|
#include "frame-capture.h"
|
||||||
#include "logging.h"
|
#include "logging.h"
|
||||||
#include "dmabuf.h"
|
#include "dmabuf.h"
|
||||||
#include "wlr-export-dmabuf-unstable-v1.h"
|
#include "wlr-export-dmabuf-unstable-v1.h"
|
||||||
|
#include "time-util.h"
|
||||||
|
|
||||||
|
#define RATE_LIMIT 20.0 // Hz
|
||||||
|
|
||||||
|
static void dmabuf_close_fds(struct dmabuf_capture* self)
|
||||||
|
{
|
||||||
|
for (size_t i = 0; i < self->frame.n_planes; ++i)
|
||||||
|
close(self->frame.plane[i].fd);
|
||||||
|
|
||||||
|
self->frame.n_planes = 0;
|
||||||
|
}
|
||||||
|
|
||||||
static void dmabuf_capture_stop(struct frame_capture* fc)
|
static void dmabuf_capture_stop(struct frame_capture* fc)
|
||||||
{
|
{
|
||||||
struct dmabuf_capture* self = (void*)fc;
|
struct dmabuf_capture* self = (void*)fc;
|
||||||
|
|
||||||
|
if (uv_timer_stop(&self->timer))
|
||||||
|
dmabuf_close_fds(self);
|
||||||
|
|
||||||
|
fc->status = CAPTURE_STOPPED;
|
||||||
|
|
||||||
if (self->zwlr_frame) {
|
if (self->zwlr_frame) {
|
||||||
zwlr_export_dmabuf_frame_v1_destroy(self->zwlr_frame);
|
zwlr_export_dmabuf_frame_v1_destroy(self->zwlr_frame);
|
||||||
self->zwlr_frame = NULL;
|
self->zwlr_frame = NULL;
|
||||||
|
@ -45,6 +64,9 @@ static void dmabuf_frame_start(void* data,
|
||||||
struct dmabuf_capture* self = data;
|
struct dmabuf_capture* self = data;
|
||||||
struct frame_capture* fc = data;
|
struct frame_capture* fc = data;
|
||||||
|
|
||||||
|
uv_timer_stop(&self->timer);
|
||||||
|
dmabuf_close_fds(self);
|
||||||
|
|
||||||
uint64_t mod = ((uint64_t)mod_high << 32) | (uint64_t)mod_low;
|
uint64_t mod = ((uint64_t)mod_high << 32) | (uint64_t)mod_low;
|
||||||
|
|
||||||
self->frame.width = width;
|
self->frame.width = width;
|
||||||
|
@ -70,7 +92,6 @@ static void dmabuf_frame_object(void* data,
|
||||||
uint32_t plane_index)
|
uint32_t plane_index)
|
||||||
{
|
{
|
||||||
struct dmabuf_capture* self = data;
|
struct dmabuf_capture* self = data;
|
||||||
struct frame_capture* fc = data;
|
|
||||||
|
|
||||||
self->frame.plane[plane_index].fd = fd;
|
self->frame.plane[plane_index].fd = fd;
|
||||||
self->frame.plane[plane_index].size = size;
|
self->frame.plane[plane_index].size = size;
|
||||||
|
@ -78,6 +99,22 @@ static void dmabuf_frame_object(void* data,
|
||||||
self->frame.plane[plane_index].pitch = stride;
|
self->frame.plane[plane_index].pitch = stride;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void dmabuf_timer_ready(uv_timer_t* timer)
|
||||||
|
{
|
||||||
|
struct dmabuf_capture* self = wl_container_of(timer, self, timer);
|
||||||
|
struct frame_capture* fc = (struct frame_capture*)self;
|
||||||
|
|
||||||
|
if (fc->status != CAPTURE_IN_PROGRESS)
|
||||||
|
return;
|
||||||
|
|
||||||
|
self->last_time = gettime_us();
|
||||||
|
|
||||||
|
fc->status = CAPTURE_DONE;
|
||||||
|
fc->on_done(fc);
|
||||||
|
|
||||||
|
dmabuf_close_fds(self);
|
||||||
|
}
|
||||||
|
|
||||||
static void dmabuf_frame_ready(void* data,
|
static void dmabuf_frame_ready(void* data,
|
||||||
struct zwlr_export_dmabuf_frame_v1* frame,
|
struct zwlr_export_dmabuf_frame_v1* frame,
|
||||||
uint32_t tv_sec_hi, uint32_t tv_sec_lo,
|
uint32_t tv_sec_hi, uint32_t tv_sec_lo,
|
||||||
|
@ -88,12 +125,22 @@ static void dmabuf_frame_ready(void* data,
|
||||||
|
|
||||||
dmabuf_capture_stop(fc);
|
dmabuf_capture_stop(fc);
|
||||||
|
|
||||||
|
uint64_t now = gettime_us();
|
||||||
|
double dt = (now - self->last_time) * 1.0e-6;
|
||||||
|
double time_left = (1.0 / RATE_LIMIT - dt) * 1.0e3;
|
||||||
|
|
||||||
|
if (time_left >= 0.0) {
|
||||||
|
uv_timer_start(&self->timer, dmabuf_timer_ready, time_left, 0);
|
||||||
|
frame_capture_start(fc);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
self->last_time = now;
|
||||||
|
|
||||||
fc->status = CAPTURE_DONE;
|
fc->status = CAPTURE_DONE;
|
||||||
fc->on_done(fc);
|
fc->on_done(fc);
|
||||||
|
|
||||||
for (size_t i = 0; i < self->frame.n_planes; ++i)
|
dmabuf_close_fds(self);
|
||||||
close(self->frame.plane[i].fd);
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void dmabuf_frame_cancel(void* data,
|
static void dmabuf_frame_cancel(void* data,
|
||||||
|
@ -103,14 +150,13 @@ static void dmabuf_frame_cancel(void* data,
|
||||||
struct dmabuf_capture* self = data;
|
struct dmabuf_capture* self = data;
|
||||||
struct frame_capture* fc = data;
|
struct frame_capture* fc = data;
|
||||||
|
|
||||||
|
dmabuf_capture_stop(fc);
|
||||||
fc->status = reason == ZWLR_EXPORT_DMABUF_FRAME_V1_CANCEL_REASON_PERMANENT
|
fc->status = reason == ZWLR_EXPORT_DMABUF_FRAME_V1_CANCEL_REASON_PERMANENT
|
||||||
? CAPTURE_FATAL : CAPTURE_FAILED;
|
? CAPTURE_FATAL : CAPTURE_FAILED;
|
||||||
|
|
||||||
dmabuf_capture_stop(fc);
|
|
||||||
fc->on_done(fc);
|
fc->on_done(fc);
|
||||||
|
|
||||||
for (size_t i = 0; i < self->frame.n_planes; ++i)
|
dmabuf_close_fds(self);
|
||||||
close(self->frame.plane[i].fd);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static int dmabuf_capture_start(struct frame_capture* fc)
|
static int dmabuf_capture_start(struct frame_capture* fc)
|
||||||
|
@ -142,6 +188,8 @@ static int dmabuf_capture_start(struct frame_capture* fc)
|
||||||
|
|
||||||
void dmabuf_capture_init(struct dmabuf_capture* self)
|
void dmabuf_capture_init(struct dmabuf_capture* self)
|
||||||
{
|
{
|
||||||
|
uv_timer_init(uv_default_loop(), &self->timer);
|
||||||
|
|
||||||
self->fc.backend.start = dmabuf_capture_start;
|
self->fc.backend.start = dmabuf_capture_start;
|
||||||
self->fc.backend.stop = dmabuf_capture_stop;
|
self->fc.backend.stop = dmabuf_capture_stop;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue