hashirama/uvg266
1
0
Fork 0
mirror of https://github.com/ultravideo/uvg266.git synced 2024-11-24 02:24:07 +00:00
Code Issues Actions Projects Releases Wiki Activity

Wavefront are in tile coordinates

Browse source
This commit is contained in:
Laurent Fasnacht 2014-05-20 09:13:10 +02:00
parent 4751a3744b
commit 06532292fc
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/encoder.c
View file

@ -1002,7 +1002,7 @@ int encoder_state_init(encoder_state * const child_state, encoder_state * const
new_child->slice = child_state->slice; new_child->slice = child_state->slice;
new_child->wfrow = MALLOC(encoder_state_config_wfrow, 1); new_child->wfrow = MALLOC(encoder_state_config_wfrow, 1);
if (!new_child->wfrow || !encoder_state_config_wfrow_init(new_child, i + first_row)) { if (!new_child->wfrow || !encoder_state_config_wfrow_init(new_child, i)) {
fprintf(stderr, "Could not initialize encoder_state->wfrow!\n"); fprintf(stderr, "Could not initialize encoder_state->wfrow!\n");
return 0; return 0;
} }
@ -1033,17 +1033,19 @@ int encoder_state_init(encoder_state * const child_state, encoder_state * const
//Restrict to the current wavefront row if needed //Restrict to the current wavefront row if needed
if (child_state->type == ENCODER_STATE_TYPE_WAVEFRONT_ROW) { if (child_state->type == ENCODER_STATE_TYPE_WAVEFRONT_ROW) {
lcu_start = MAX(lcu_start, (child_state->wfrow->lcu_offset_y - child_state->tile->lcu_offset_y) * child_state->tile->cur_pic->width_in_lcu); lcu_start = MAX(lcu_start, (child_state->wfrow->lcu_offset_y) * child_state->tile->cur_pic->width_in_lcu);
lcu_end = MIN(lcu_end, (child_state->wfrow->lcu_offset_y - child_state->tile->lcu_offset_y + 1) * child_state->tile->cur_pic->width_in_lcu); lcu_end = MIN(lcu_end, (child_state->wfrow->lcu_offset_y + 1) * child_state->tile->cur_pic->width_in_lcu);
} }
child_state->lcu_order_count = lcu_end - lcu_start; child_state->lcu_order_count = lcu_end - lcu_start;
child_state->lcu_order = MALLOC(lcu_order_element, child_state->lcu_order_count); child_state->lcu_order = MALLOC(lcu_order_element, child_state->lcu_order_count);
assert(child_state->lcu_order);
for (i = 0; i < child_state->lcu_order_count; ++i) { for (i = 0; i < child_state->lcu_order_count; ++i) {
lcu_id = lcu_start + i; lcu_id = lcu_start + i;
child_state->lcu_order[i].encoder_state = child_state; child_state->lcu_order[i].encoder_state = child_state;
child_state->lcu_order[i].id = lcu_id; child_state->lcu_order[i].id = lcu_id;
child_state->lcu_order[i].index = i;
child_state->lcu_order[i].position.x = lcu_id % child_state->tile->cur_pic->width_in_lcu; child_state->lcu_order[i].position.x = lcu_id % child_state->tile->cur_pic->width_in_lcu;
child_state->lcu_order[i].position.y = lcu_id / child_state->tile->cur_pic->width_in_lcu; child_state->lcu_order[i].position.y = lcu_id / child_state->tile->cur_pic->width_in_lcu;
child_state->lcu_order[i].position_px.x = child_state->lcu_order[i].position.x * LCU_WIDTH; child_state->lcu_order[i].position_px.x = child_state->lcu_order[i].position.x * LCU_WIDTH;

2
src/encoder.h
View file

@ -197,7 +197,7 @@ typedef struct {
} encoder_state_config_slice; } encoder_state_config_slice;
typedef struct { typedef struct {
//Row in image coordinates of the wavefront //Row in tile coordinates of the wavefront
int32_t lcu_offset_y; int32_t lcu_offset_y;
} encoder_state_config_wfrow; } encoder_state_config_wfrow;