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

Check wl_shm_buffer format

This commit is contained in:
emersion 2017-10-07 18:25:27 +02:00
parent 4374c52135
commit b27b6cd69c
No known key found for this signature in database
GPG Key ID: 0FDE7BE0E88F5E48
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
types/wlr_screenshooter.c
View File

@ -7,7 +7,7 @@
#include <wlr/util/log.h> #include <wlr/util/log.h>
#include "screenshooter-protocol.h" #include "screenshooter-protocol.h"
static void copy_bgra_yflip(uint8_t *dst, uint8_t *src, int32_t height, static void copy_yflip(uint8_t *dst, uint8_t *src, int32_t height,
int32_t stride) { int32_t stride) {
uint8_t *end = dst + height * stride; uint8_t *end = dst + height * stride;
while (dst < end) { while (dst < end) {
@ -34,7 +34,7 @@ static void output_frame_notify(struct wl_listener *listener, void *_data) {
void *data = wl_shm_buffer_get_data(state->shm_buffer); void *data = wl_shm_buffer_get_data(state->shm_buffer);
wl_shm_buffer_begin_access(state->shm_buffer); wl_shm_buffer_begin_access(state->shm_buffer);
copy_bgra_yflip(data, state->pixels + state->stride * (state->height - 1), copy_yflip(data, state->pixels + state->stride * (state->height - 1),
state->height, state->stride); state->height, state->stride);
wl_shm_buffer_end_access(state->shm_buffer); wl_shm_buffer_end_access(state->shm_buffer);
@ -63,6 +63,12 @@ static void screenshooter_shoot(struct wl_client *client,
return; return;
} }
uint32_t format = wl_shm_buffer_get_format(shm_buffer);
if (format != WL_SHM_FORMAT_XRGB8888) {
wlr_log(L_ERROR, "Invalid buffer: unsupported format");
return;
}
uint8_t *pixels = malloc(stride * height); uint8_t *pixels = malloc(stride * height);
if (pixels == NULL) { if (pixels == NULL) {
wl_client_post_no_memory(client); wl_client_post_no_memory(client);