RPJosh
/
wayvnc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

damage-refinery: Hash directly instead of copying

pull/55/head
Andri Yngvason 2020-06-22 19:37:25 +00:00
parent 439d3997d4
commit e398dcc235
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/damage-refinery.c
View File

@ -33,11 +33,10 @@ void damage_refinery_destroy(struct damage_refinery* self)
free(self->hashes); free(self->hashes);
} }
static size_t damage_copy_tile(struct damage_refinery* self, void* tile_buffer, static uint32_t damage_hash_tile(struct damage_refinery* self, uint32_t tx,
uint32_t tx, uint32_t ty, const struct wv_buffer* buffer) uint32_t ty, const struct wv_buffer* buffer)
{ {
// TODO: Support different pixel sizes // TODO: Support different pixel sizes
uint32_t* tile = tile_buffer;
uint32_t* pixels = buffer->pixels; uint32_t* pixels = buffer->pixels;
int pixel_stride = buffer->stride / 4; int pixel_stride = buffer->stride / 4;
@ -46,17 +45,18 @@ static size_t damage_copy_tile(struct damage_refinery* self, void* tile_buffer,
pixel_stride *= -1; pixel_stride *= -1;
} }
size_t i = 0;
int x_start = tx * 32; int x_start = tx * 32;
int x_stop = MIN(((int)tx + 1) * 32, buffer->width); int x_stop = MIN((tx + 1) * 32, self->width);
int y_start = ty * 32; int y_start = ty * 32;
int y_stop = MIN(((int)ty + 1) * 32, buffer->height); int y_stop = MIN((ty + 1) * 32, self->height);
uint32_t hash = 0;
for (int y = y_start; y < y_stop; ++y) for (int y = y_start; y < y_stop; ++y)
for (int x = x_start; x < x_stop; ++x) hash = murmurhash((void*)&(pixels[x_start + y * pixel_stride]),
tile[i++] = pixels[x + y * pixel_stride]; 4 * (x_stop - x_start), hash);
return i; return hash;
} }
static uint32_t* damage_tile_hash_ptr(struct damage_refinery* self, static uint32_t* damage_tile_hash_ptr(struct damage_refinery* self,
@ -70,9 +70,7 @@ static void damage_refine_tile(struct damage_refinery* self,
struct pixman_region16* refined, uint32_t tx, uint32_t ty, struct pixman_region16* refined, uint32_t tx, uint32_t ty,
const struct wv_buffer* buffer) const struct wv_buffer* buffer)
{ {
uint32_t tile[32 * 32]; uint32_t hash = damage_hash_tile(self, tx, ty, buffer);
size_t len = damage_copy_tile(self, tile, tx, ty, buffer);
uint32_t hash = murmurhash((void*)tile, len, HASH_SEED);
uint32_t* old_hash_ptr = damage_tile_hash_ptr(self, tx, ty); uint32_t* old_hash_ptr = damage_tile_hash_ptr(self, tx, ty);
int is_damaged = hash != *old_hash_ptr; int is_damaged = hash != *old_hash_ptr;
*old_hash_ptr = hash; *old_hash_ptr = hash;