diff options
| author | emersion <contact@emersion.fr> | 2018-06-17 14:19:45 +0100 |
|---|---|---|
| committer | emersion <contact@emersion.fr> | 2018-06-17 14:19:45 +0100 |
| commit | bd0c1b794992bf94560bd429f4057c9d09989f06 (patch) | |
| tree | 36741a4ac8d42926d4ef470d2730f09210deff59 | |
| parent | 9eddcbc376ff92a3a03002b910c31bf96bdba2da (diff) | |
export-dmabuf: update protocol
| -rw-r--r-- | examples/dmabuf-capture.c | 2 | ||||
| -rw-r--r-- | types/wlr_export_dmabuf_v1.c | 9 |
2 files changed, 4 insertions, 7 deletions
diff --git a/examples/dmabuf-capture.c b/examples/dmabuf-capture.c index 2f7db2f1..1aeaf9c5 100644 --- a/examples/dmabuf-capture.c +++ b/examples/dmabuf-capture.c @@ -415,7 +415,7 @@ static void frame_cancel(void *data, struct zwlr_export_dmabuf_frame_v1 *frame, struct capture_context *ctx = data; av_log(ctx, AV_LOG_WARNING, "Frame cancelled!\n"); av_frame_free(&ctx->current_frame); - if (reason == ZWLR_EXPORT_DMABUF_FRAME_V1_CANCEL_REASON_PERNAMENT) { + if (reason == ZWLR_EXPORT_DMABUF_FRAME_V1_CANCEL_REASON_PERMANENT) { av_log(ctx, AV_LOG_ERROR, "Permanent failure, exiting\n"); ctx->err = 1; } else { diff --git a/types/wlr_export_dmabuf_v1.c b/types/wlr_export_dmabuf_v1.c index 40a0e289..68adda02 100644 --- a/types/wlr_export_dmabuf_v1.c +++ b/types/wlr_export_dmabuf_v1.c @@ -93,7 +93,7 @@ static void manager_handle_capture_output(struct wl_client *client, if (!output->impl->export_dmabuf) { zwlr_export_dmabuf_frame_v1_send_cancel(frame->resource, - ZWLR_EXPORT_DMABUF_FRAME_V1_CANCEL_REASON_PERNAMENT); + ZWLR_EXPORT_DMABUF_FRAME_V1_CANCEL_REASON_PERMANENT); return; } @@ -110,16 +110,13 @@ static void manager_handle_capture_output(struct wl_client *client, zwlr_export_dmabuf_frame_v1_send_frame(frame->resource, output->width, output->height, 0, 0, attribs->flags, frame_flags, - attribs->format, mod_high, mod_low, attribs->n_planes, - attribs->n_planes); + attribs->format, mod_high, mod_low, attribs->n_planes); for (int i = 0; i < attribs->n_planes; ++i) { off_t size = lseek(attribs->fd[i], 0, SEEK_END); zwlr_export_dmabuf_frame_v1_send_object(frame->resource, i, - attribs->fd[i], size); - zwlr_export_dmabuf_frame_v1_send_plane(frame->resource, i, i, - attribs->offset[i], attribs->stride[i]); + attribs->fd[i], size, attribs->offset[i], attribs->stride[i], i); } wl_list_remove(&frame->output_swap_buffers.link); |