itycodes
/
wlseeds
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update example and protocol

Browse Source
master
Rostislav Pehlivanov 7 years ago
parent 21928cbe61
commit 9eddcbc376
2 changed files with 102 additions and 106 deletions
Show Stats Download Patch File Download Diff File

28
examples/dmabuf-capture.c
Unescape View File

@ -163,8 +163,7 @@ static void frame_free(void *opaque, uint8_t *data) {
static void frame_start(void *data, struct zwlr_export_dmabuf_frame_v1 *frame, static void frame_start(void *data, struct zwlr_export_dmabuf_frame_v1 *frame,
uint32_t width, uint32_t height, uint32_t offset_x, uint32_t offset_y, uint32_t width, uint32_t height, uint32_t offset_x, uint32_t offset_y,
uint32_t buffer_flags, uint32_t flags, uint32_t format, uint32_t buffer_flags, uint32_t flags, uint32_t format,
uint32_t mod_high, uint32_t mod_low, uint32_t num_objects, uint32_t mod_high, uint32_t mod_low, uint32_t num_objects) {
uint32_t num_planes) {
struct capture_context *ctx = data; struct capture_context *ctx = data;
int err = 0; int err = 0;
@ -180,7 +179,6 @@ static void frame_start(void *data, struct zwlr_export_dmabuf_frame_v1 *frame,
desc->nb_layers = 1; desc->nb_layers = 1;
desc->layers[0].format = format; desc->layers[0].format = format;
desc->layers[0].nb_planes = num_planes;
/* Allocate a frame */ /* Allocate a frame */
AVFrame *f = av_frame_alloc(); AVFrame *f = av_frame_alloc();
@ -213,25 +211,18 @@ fail:
} }
static void frame_object(void *data, struct zwlr_export_dmabuf_frame_v1 *frame, static void frame_object(void *data, struct zwlr_export_dmabuf_frame_v1 *frame,
uint32_t index, int32_t fd, uint32_t size) { uint32_t index, int32_t fd, uint32_t size, uint32_t offset,
uint32_t stride, uint32_t plane_index) {
struct capture_context *ctx = data; struct capture_context *ctx = data;
AVFrame *f = ctx->current_frame; AVFrame *f = ctx->current_frame;
AVDRMFrameDescriptor *desc = (AVDRMFrameDescriptor *)f->data[0]; AVDRMFrameDescriptor *desc = (AVDRMFrameDescriptor *)f->data[0];
desc->objects[index].fd = fd; desc->objects[index].fd = fd;
desc->objects[index].size = size; desc->objects[index].size = size;
}
static void frame_plane(void *data, struct zwlr_export_dmabuf_frame_v1 *frame,
uint32_t index, uint32_t object_index,
uint32_t offset, uint32_t stride) {
struct capture_context *ctx = data;
AVFrame *f = ctx->current_frame;
AVDRMFrameDescriptor *desc = (AVDRMFrameDescriptor *)f->data[0];
desc->layers[0].planes[index].object_index = object_index; desc->layers[0].planes[plane_index].object_index = index;
desc->layers[0].planes[index].offset = offset; desc->layers[0].planes[plane_index].offset = offset;
desc->layers[0].planes[index].pitch = stride; desc->layers[0].planes[plane_index].pitch = stride;
} }
static const uint32_t pixfmt_to_drm_map[] = { static const uint32_t pixfmt_to_drm_map[] = {
@ -311,14 +302,18 @@ static void frame_ready(void *data, struct zwlr_export_dmabuf_frame_v1 *frame,
struct capture_context *ctx = data; struct capture_context *ctx = data;
AVFrame *f = ctx->current_frame; AVFrame *f = ctx->current_frame;
AVDRMFrameDescriptor *desc = (AVDRMFrameDescriptor *)f->data[0]; AVDRMFrameDescriptor *desc = (AVDRMFrameDescriptor *)f->data[0];
enum AVPixelFormat pix_fmt = drm_fmt_to_pixfmt(desc->layers[0].format);
int err = 0; int err = 0;
/* Attach the hardware frame context to the frame */ /* Attach the hardware frame context to the frame */
err = attach_drm_frames_ref(ctx, f, drm_fmt_to_pixfmt(desc->layers[0].format)); err = attach_drm_frames_ref(ctx, f, pix_fmt);
if (err) { if (err) {
goto end; goto end;
} }
/* TODO: support multiplane stuff */
desc->layers[0].nb_planes = av_pix_fmt_count_planes(pix_fmt);
AVFrame *mapped_frame = av_frame_alloc(); AVFrame *mapped_frame = av_frame_alloc();
if (!mapped_frame) { if (!mapped_frame) {
err = AVERROR(ENOMEM); err = AVERROR(ENOMEM);
@ -431,7 +426,6 @@ static void frame_cancel(void *data, struct zwlr_export_dmabuf_frame_v1 *frame,
static const struct zwlr_export_dmabuf_frame_v1_listener frame_listener = { static const struct zwlr_export_dmabuf_frame_v1_listener frame_listener = {
.frame = frame_start, .frame = frame_start,
.object = frame_object, .object = frame_object,
.plane = frame_plane,
.ready = frame_ready, .ready = frame_ready,
.cancel = frame_cancel, .cancel = frame_cancel,
}; };

180
protocol/wlr-export-dmabuf-unstable-v1.xml
Unescape View File

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<protocol name="wlr_export_dmabuf_unstable_v1"> <protocol name="wlr_export_dmabuf_unstable_v1">
<copyright> <copyright>
Copyright © 2018 Rostislav Pehlivanov Copyright © 2018 Rostislav Pehlivanov
@ -25,29 +24,56 @@
</copyright> </copyright>
<description summary="a protocol for low overhead screen content capturing"> <description summary="a protocol for low overhead screen content capturing">
An interface to capture surfaces in an efficient way. An interface to capture surfaces in an efficient way by exporting DMA-BUFs.
Overall usage:
Warning! The protocol described in this file is experimental and
1.) client registers with zwlr_screencontent_manager_v1 backward incompatible changes may be made. Backward compatible changes
2.) server sends client info about surfaces via "receive_surface_info" may be added together with the corresponding interface version bump.
3.) client subscribes to capture a surface via the "capture" requests Backward incompatible changes are done by bumping the version number in
4.) server sends client events via the "zwlr_screencontent_frame" interface the protocol and interface names and resetting the interface version.
5.) client finishes and informs server via the "frame_destroy" event Once the protocol is to be declared stable, the 'z' prefix and the
6.) client optionally resubscribes via repeating steps 3.) through 5.) version number in the protocol and interface names are removed and the
interface version number is reset.
</description> </description>
<interface name="zwlr_export_dmabuf_manager_v1" version="1">
<description summary="manager to inform clients and begin capturing">
This object is a manager with which to start capturing from sources.
</description>
<request name="capture_output">
<description summary="capture a frame from an output">
Capture the next frame of a an entire output.
</description>
<arg name="frame" type="new_id" interface="zwlr_export_dmabuf_frame_v1"/>
<arg name="overlay_cursor" type="int"
summary="include custom client hardware cursor on top of the frame"/>
<arg name="output" type="object" interface="wl_output"/>
</request>
<request name="destroy" type="destructor">
<description summary="destroy the manager">
All objects created by the manager will still remain valid, until their
appropriate destroy request has been called.
</description>
</request>
</interface>
<interface name="zwlr_export_dmabuf_frame_v1" version="1"> <interface name="zwlr_export_dmabuf_frame_v1" version="1">
<description summary="a frame ready for readout"> <description summary="a DMA-BUF frame">
This object represents a frame which is ready to have its resources This object represents a single DMA-BUF frame.
fetched and used.
If the capture is successful, the compositor will first send a "frame"
The receive callback shall be called first, followed by the "object" event, followed by one or several "object". When the frame is available
callback once per dmabuf object or the "plane" callback, once per dmabuf for readout, the "ready" event is sent.
plane. The "ready" event is called last to indicate that all the data has
been made available for readout, as well as the time at which presentation If the capture failed, the "cancel" event is sent. This can happen anytime
happened at. The ownership of the frame is passed to the client, who's before the "ready" event.
responsible for destroying it via the "destroy" event once finished and
by calling close() on the file descriptors received. Once either a "ready" or a "cancel" event is received, the client should
destroy the frame. Once an "object" event is received, the client is
responsible for closing the associated file descriptor.
All frames are read-only and may not be written into or altered. All frames are read-only and may not be written into or altered.
</description> </description>
@ -55,25 +81,23 @@
<description summary="frame flags"> <description summary="frame flags">
Special flags that should be respected by the client. Special flags that should be respected by the client.
</description> </description>
<entry name="transient" value="0x1" since="1" <entry name="transient" value="0x1"
summary="clients should copy frame before processing"/> summary="clients should copy frame before processing"/>
</enum> </enum>
<event name="frame"> <event name="frame">
<description summary="main callback"> <description summary="a frame description">
Main callback supplying the client with information about the frame, Main event supplying the client with information about the frame. If the
as well as an object to serve as context for destruction. Always called capture didn't fail, this event is always emitted first before any other
first before any other events. events.
The "transform" argument describes the orientation needed to be applied This event is followed by a number of "object" as specified by the
to correctly orient the buffer. For example, a buffer rotated by 90 "num_objects" argument.
degrees will have a value of "3" here, corresponding to the need to
apply a 270 degree transpose to correctly present the buffer.
</description> </description>
<arg name="width" type="uint" <arg name="width" type="uint"
summary="frame width, scaling factor included"/> summary="frame width in pixels"/>
<arg name="height" type="uint" <arg name="height" type="uint"
summary="frame height, scaling factor included"/> summary="frame height in pixels"/>
<arg name="offset_x" type="uint" <arg name="offset_x" type="uint"
summary="crop offset for the x axis"/> summary="crop offset for the x axis"/>
<arg name="offset_y" type="uint" <arg name="offset_y" type="uint"
@ -91,13 +115,15 @@
summary="drm format modifier, low"/> summary="drm format modifier, low"/>
<arg name="num_objects" type="uint" <arg name="num_objects" type="uint"
summary="indicates how many objects (FDs) the frame has (max 4)"/> summary="indicates how many objects (FDs) the frame has (max 4)"/>
<arg name="num_planes" type="uint"
summary="indicates how many planes the frame has (max 4)"/>
</event> </event>
<event name="object"> <event name="object">
<description summary="object receiving callback"> <description summary="an object description">
Callback which serves to supply the client with the file descriptors Event which serves to supply the client with the file descriptors
containing the data for each object. containing the data for each object.
After receiving this event, the client must always close the file
descriptor as soon as they're done with it and even if the frame fails.
</description> </description>
<arg name="index" type="uint" <arg name="index" type="uint"
summary="index of the current object"/> summary="index of the current object"/>
@ -105,31 +131,28 @@
summary="fd of the current object"/> summary="fd of the current object"/>
<arg name="size" type="uint" <arg name="size" type="uint"
summary="size in bytes for the current object"/> summary="size in bytes for the current object"/>
</event>
<event name="plane">
<description summary="plane info receiving callback">
Callback which supplies the client with plane information for each
plane.
</description>
<arg name="index" type="uint"
summary="index of the current plane"/>
<arg name="object_index" type="uint"
summary="index of the object the plane applies to"/>
<arg name="offset" type="uint" <arg name="offset" type="uint"
summary="starting point for the data in the object's fd"/> summary="starting point for the data in the object's fd"/>
<arg name="stride" type="uint" <arg name="stride" type="uint"
summary="line size in bytes"/> summary="line size in bytes"/>
<arg name="plane_index" type="uint"
summary="index of the the plane the data in the object applies to"/>
</event> </event>
<event name="ready"> <event name="ready">
<description summary="indicates frame is available for reading"> <description summary="indicates frame is available for reading">
Called as soon as the frame is presented, indicating it is available This event is sent as soon as the frame is presented, indicating it is
for reading. available for reading. This event includes the time at which
presentation happened at.
The timestamp is expressed as tv_sec_hi, tv_sec_lo, tv_nsec triples, The timestamp is expressed as tv_sec_hi, tv_sec_lo, tv_nsec triples,
each component being an unsigned 32-bit value. Whole seconds are in each component being an unsigned 32-bit value. Whole seconds are in
tv_sec which is a 64-bit value combined from tv_sec_hi and tv_sec_lo, tv_sec which is a 64-bit value combined from tv_sec_hi and tv_sec_lo,
and the additional fractional part in tv_nsec as nanoseconds. Hence, and the additional fractional part in tv_nsec as nanoseconds. Hence,
for valid timestamps tv_nsec must be in [0, 999999999]. for valid timestamps tv_nsec must be in [0, 999999999]. The seconds part
The seconds part may have an arbitrary offset at start. may have an arbitrary offset at start.
After receiving this event, the client should destroy this object.
</description> </description>
<arg name="tv_sec_hi" type="uint" <arg name="tv_sec_hi" type="uint"
summary="high 32 bits of the seconds part of the timestamp"/> summary="high 32 bits of the seconds part of the timestamp"/>
@ -143,22 +166,25 @@
<description summary="cancel reason"> <description summary="cancel reason">
Indicates reason for cancelling the frame. Indicates reason for cancelling the frame.
</description> </description>
<entry name="temporary" value="0" since="1" <entry name="temporary" value="0"
summary="temporary error, source will produce more frames"/> summary="temporary error, source will produce more frames"/>
<entry name="pernament" value="1" since="1" <entry name="permanent" value="1"
summary="fatal error, source will not produce frames"/> summary="fatal error, source will not produce frames"/>
<entry name="resizing" value="2" since="1" <entry name="resizing" value="2"
summary="temporary error, source will produce frames"/> summary="temporary error, source will produce more frames"/>
</enum> </enum>
<event name="cancel"> <event name="cancel">
<description summary="indicates the frame is no longer valid"> <description summary="indicates the frame is no longer valid">
If the frame is no longer valid after the "frame" event has been called, If the capture failed or if the frame is no longer valid after the
this callback will be used to inform the client to scrap the frame. "frame" event has been emitted, this event will be used to inform the
Source is still valid for as long as the subscription function does not client to scrap the frame.
return NULL.
This may get called if for instance the surface is in the process of If the failure is temporary, the client may capture again the same
resizing. source. If the failure is permanent, any further attempts to capture the
same source will fail again.
After receiving this event, the client should destroy this object.
</description> </description>
<arg name="reason" type="uint" enum="cancel_reason" <arg name="reason" type="uint" enum="cancel_reason"
summary="indicates a reason for cancelling this frame capture"/> summary="indicates a reason for cancelling this frame capture"/>
@ -166,35 +192,11 @@
<request name="destroy" type="destructor"> <request name="destroy" type="destructor">
<description summary="delete this object, used or not"> <description summary="delete this object, used or not">
Unreferences the frame, allowing it to be reused. Must be called as soon Unreferences the frame. This request must be called as soon as its no
as its no longer used. longer used.
Can be called at any time by the client after the "frame" event, after
which the compositor will not call any other events unless the client
resubscribes to capture more. The client will still have to close any
FDs it has been given.
</description>
</request>
</interface>
<interface name="zwlr_export_dmabuf_manager_v1" version="1"> It can be called at any time by the client. The client will still have
<description summary="manager to inform clients and begin capturing"> to close any FDs it has been given.
This object is a manager with which to start capturing from sources.
</description>
<request name="capture_output">
<description summary="subscribe to start capturing">
Request to start capturing from an entire wl_output.
</description>
<arg name="frame" type="new_id"
interface="zwlr_export_dmabuf_frame_v1"/>
<arg name="overlay_cursor" type="int"
summary="include custom client hardware cursor on top of the frame"/>
<arg name="output" type="object" interface="wl_output"/>
</request>
<request name="destroy" type="destructor">
<description summary="destroy the manager">
All objects created by the manager will still remain valid, until their
appropriate destroy request has been called.
</description> </description>
</request> </request>
</interface> </interface>

Write Preview
Loading…
Cancel
Save