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

tight2: Copy to dst after all deflate is done

tight-encoder-v2
Andri Yngvason 2020-07-09 11:59:07 +00:00
parent cd2c296fa9
commit e1728727c0
2 changed files with 38 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/tight-encoder-v2.h
View File

@ -28,7 +28,6 @@ struct tight_encoder_v2 {
uint32_t n_jobs; uint32_t n_jobs;
struct vec* dst; struct vec* dst;
pthread_mutex_t dst_mutex;
pthread_mutex_t wait_mutex; pthread_mutex_t wait_mutex;
pthread_cond_t wait_cond; pthread_cond_t wait_cond;

58
src/tight-encoder-v2.c
View File

@ -128,8 +128,6 @@ int tight_encoder_v2_init(struct tight_encoder_v2* self, uint32_t width,
tight_init_zs_worker(self, 2); tight_init_zs_worker(self, 2);
tight_init_zs_worker(self, 3); tight_init_zs_worker(self, 3);
pthread_mutex_init(&self->dst_mutex, NULL);
pthread_mutex_init(&self->wait_mutex, NULL); pthread_mutex_init(&self->wait_mutex, NULL);
pthread_cond_init(&self->wait_cond, NULL); pthread_cond_init(&self->wait_cond, NULL);
@ -141,8 +139,6 @@ void tight_encoder_v2_destroy(struct tight_encoder_v2* self)
pthread_cond_destroy(&self->wait_cond); pthread_cond_destroy(&self->wait_cond);
pthread_mutex_destroy(&self->wait_mutex); pthread_mutex_destroy(&self->wait_mutex);
pthread_mutex_destroy(&self->dst_mutex);
aml_unref(self->zs_worker[3]); aml_unref(self->zs_worker[3]);
aml_unref(self->zs_worker[2]); aml_unref(self->zs_worker[2]);
aml_unref(self->zs_worker[1]); aml_unref(self->zs_worker[1]);
@ -275,22 +271,7 @@ static void tight_encode_tile(struct tight_encoder_v2* self,
tight_encode_tile_basic(self, tile, x, y, width, height, zs_index); tight_encode_tile_basic(self, tile, x, y, width, height, zs_index);
//TODO Jpeg //TODO Jpeg
struct rfb_server_fb_rect rect = { tile->state = TIGHT_TILE_ENCODED;
.encoding = htonl(RFB_ENCODING_TIGHT),
.x = htons(x),
.y = htons(y),
.width = htons(width),
.height = htons(height),
};
pthread_mutex_lock(&self->dst_mutex);
vec_append(self->dst, &rect, sizeof(rect));
vec_append(self->dst, &tile->type, sizeof(tile->type));
tight_encode_size(self->dst, tile->size);
vec_append(self->dst, tile->buffer, tile->size);
pthread_mutex_unlock(&self->dst_mutex);
tile->state = TIGHT_TILE_READY;
} }
static int tight_encode_rect_count(struct tight_encoder_v2* self) static int tight_encode_rect_count(struct tight_encoder_v2* self)
@ -344,6 +325,41 @@ static int tight_schedule_encoding_jobs(struct tight_encoder_v2* self)
return 0; return 0;
} }
static void tight_finish_tile(struct tight_encoder_v2* self,
uint32_t gx, uint32_t gy)
{
struct tight_tile* tile = tight_tile(self, gx, gy);
uint32_t x = gx * TSL;
uint32_t y = gy * TSL;
uint32_t width = tight_tile_width(self, x);
uint32_t height = tight_tile_height(self, y);
struct rfb_server_fb_rect rect = {
.encoding = htonl(RFB_ENCODING_TIGHT),
.x = htons(x),
.y = htons(y),
.width = htons(width),
.height = htons(height),
};
vec_append(self->dst, &rect, sizeof(rect));
vec_append(self->dst, &tile->type, sizeof(tile->type));
tight_encode_size(self->dst, tile->size);
vec_append(self->dst, tile->buffer, tile->size);
tile->state = TIGHT_TILE_READY;
}
static void tight_finish(struct tight_encoder_v2* self)
{
for (uint32_t y = 0; y < self->grid_height; ++y)
for (uint32_t x = 0; x < self->grid_width; ++x)
if (tight_tile(self, x, y)->state == TIGHT_TILE_ENCODED)
tight_finish_tile(self, x, y);
}
int tight_encode_frame_v2(struct tight_encoder_v2* self, struct vec* dst, int tight_encode_frame_v2(struct tight_encoder_v2* self, struct vec* dst,
const struct rfb_pixel_format* dfmt, const struct rfb_pixel_format* dfmt,
const struct nvnc_fb* src, const struct nvnc_fb* src,
@ -371,5 +387,7 @@ int tight_encode_frame_v2(struct tight_encoder_v2* self, struct vec* dst,
pthread_cond_wait(&self->wait_cond, &self->wait_mutex); pthread_cond_wait(&self->wait_cond, &self->wait_mutex);
pthread_mutex_unlock(&self->wait_mutex); pthread_mutex_unlock(&self->wait_mutex);
tight_finish(self);
return 0; return 0;
} }