blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

export-dmabuf: update protocol

This commit is contained in:
emersion 2018-06-17 14:19:45 +01:00
parent 9eddcbc376
commit bd0c1b7949
No known key found for this signature in database
GPG Key ID: 0FDE7BE0E88F5E48
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/dmabuf-capture.c
View File

@ -415,7 +415,7 @@ static void frame_cancel(void *data, struct zwlr_export_dmabuf_frame_v1 *frame,
struct capture_context *ctx = data; struct capture_context *ctx = data;
av_log(ctx, AV_LOG_WARNING, "Frame cancelled!\n"); av_log(ctx, AV_LOG_WARNING, "Frame cancelled!\n");
av_frame_free(&ctx->current_frame); 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"); av_log(ctx, AV_LOG_ERROR, "Permanent failure, exiting\n");
ctx->err = 1; ctx->err = 1;
} else { } else {

9
types/wlr_export_dmabuf_v1.c
View File

@ -93,7 +93,7 @@ static void manager_handle_capture_output(struct wl_client *client,
if (!output->impl->export_dmabuf) { if (!output->impl->export_dmabuf) {
zwlr_export_dmabuf_frame_v1_send_cancel(frame->resource, 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; return;
} }
@ -110,16 +110,13 @@ static void manager_handle_capture_output(struct wl_client *client,
zwlr_export_dmabuf_frame_v1_send_frame(frame->resource, zwlr_export_dmabuf_frame_v1_send_frame(frame->resource,
output->width, output->height, 0, 0, attribs->flags, frame_flags, output->width, output->height, 0, 0, attribs->flags, frame_flags,
attribs->format, mod_high, mod_low, attribs->n_planes, attribs->format, mod_high, mod_low, attribs->n_planes);
attribs->n_planes);
for (int i = 0; i < attribs->n_planes; ++i) { for (int i = 0; i < attribs->n_planes; ++i) {
off_t size = lseek(attribs->fd[i], 0, SEEK_END); off_t size = lseek(attribs->fd[i], 0, SEEK_END);
zwlr_export_dmabuf_frame_v1_send_object(frame->resource, i, zwlr_export_dmabuf_frame_v1_send_object(frame->resource, i,
attribs->fd[i], size); attribs->fd[i], size, attribs->offset[i], attribs->stride[i], i);
zwlr_export_dmabuf_frame_v1_send_plane(frame->resource, i, i,
attribs->offset[i], attribs->stride[i]);
} }
wl_list_remove(&frame->output_swap_buffers.link); wl_list_remove(&frame->output_swap_buffers.link);