hyprwm/xdg-desktop-portal-hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/xdg-desktop-portal-hyprland.git synced 2024-11-22 14:35:57 +01:00
Code Issues Projects Releases Packages Wiki Activity

screencast: remove pipewire on_event callback

Browse source 
Since we are driving the screencast there are no events on the pipewire loop
calling the on_event callback. We want to import and export (if possible) on
every frame of the wlroots loop, so this event is no longer needed.
This commit is contained in:
columbarius 2021-05-27 19:59:30 +02:00
parent 11de00735f
commit 9bf7367320
2 changed files with 0 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/screencast_common.h
View file

@ -85,7 +85,6 @@ struct xdpw_screencast_instance {
bool initialized; bool initialized;
// pipewire // pipewire
struct spa_source *event;
struct pw_stream *stream; struct pw_stream *stream;
struct spa_hook stream_listener; struct spa_hook stream_listener;
struct spa_video_info_raw pwr_format; struct spa_video_info_raw pwr_format;

50
src/screencast/pipewire_screencast.c
View file

@ -60,51 +60,6 @@ static struct spa_pod *build_format(struct spa_pod_builder *b, enum spa_video_fo
return spa_pod_builder_pop(b, &f[0]); return spa_pod_builder_pop(b, &f[0]);
} }
static void pwr_on_event(void *data, uint64_t expirations) {
struct xdpw_screencast_instance *cast = data;
struct pw_buffer *pw_buf;
struct spa_buffer *spa_buf;
struct spa_meta_header *h;
struct spa_data *d;
logprint(TRACE, "********************");
logprint(TRACE, "pipewire: event fired");
if ((pw_buf = pw_stream_dequeue_buffer(cast->stream)) == NULL) {
logprint(WARN, "pipewire: out of buffers");
goto out;
}
spa_buf = pw_buf->buffer;
d = spa_buf->datas;
if ((d[0].data) == NULL) {
logprint(TRACE, "pipewire: data pointer undefined");
goto out;
}
if ((h = spa_buffer_find_meta_data(spa_buf, SPA_META_Header, sizeof(*h)))) {
h->pts = -1;
h->flags = 0;
h->seq = cast->seq++;
h->dts_offset = 0;
}
writeFrameData(d[0].data, cast->simple_frame.data, cast->simple_frame.height,
cast->simple_frame.stride, cast->simple_frame.y_invert);
logprint(TRACE, "pipewire: pointer %p", d[0].data);
logprint(TRACE, "pipewire: size %d", d[0].maxsize);
logprint(TRACE, "pipewire: stride %d", d[0].chunk->stride);
logprint(TRACE, "pipewire: width %d", cast->simple_frame.width);
logprint(TRACE, "pipewire: height %d", cast->simple_frame.height);
logprint(TRACE, "pipewire: y_invert %d", cast->simple_frame.y_invert);
logprint(TRACE, "********************");
pw_stream_queue_buffer(cast->stream, pw_buf);
out:
xdpw_wlr_frame_free(cast);
}
static void pwr_handle_stream_state_changed(void *data, static void pwr_handle_stream_state_changed(void *data,
enum pw_stream_state old, enum pw_stream_state state, const char *error) { enum pw_stream_state old, enum pw_stream_state state, const char *error) {
struct xdpw_screencast_instance *cast = data; struct xdpw_screencast_instance *cast = data;
@ -322,11 +277,6 @@ void xdpw_pwr_stream_create(struct xdpw_screencast_instance *cast) {
} }
cast->pwr_stream_state = false; cast->pwr_stream_state = false;
/* make an event to signal frame ready */
cast->event =
pw_loop_add_event(state->pw_loop, pwr_on_event, cast);
logprint(DEBUG, "pipewire: registered event %p", cast->event);
enum spa_video_format format = xdpw_format_pw_from_wl_shm(cast->simple_frame.format); enum spa_video_format format = xdpw_format_pw_from_wl_shm(cast->simple_frame.format);
const struct spa_pod *param = build_format(&b, format, const struct spa_pod *param = build_format(&b, format,