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

lcu_order_element now has pointer to neighbor LCUs

Browse source
This commit is contained in:
Laurent Fasnacht 2014-05-21 11:06:53 +02:00
parent de76d0a294
commit a3fcb141ed
2 changed files with 38 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/encoder.c
View file

@ -1052,12 +1052,42 @@ int encoder_state_init(encoder_state * const child_state, encoder_state * const
child_state->lcu_order[i].position_px.y = child_state->lcu_order[i].position.y * LCU_WIDTH; child_state->lcu_order[i].position_px.y = child_state->lcu_order[i].position.y * LCU_WIDTH;
child_state->lcu_order[i].size.x = MIN(LCU_WIDTH, encoder->in.width - (child_state->tile->lcu_offset_x * LCU_WIDTH + child_state->lcu_order[i].position_px.x)); child_state->lcu_order[i].size.x = MIN(LCU_WIDTH, encoder->in.width - (child_state->tile->lcu_offset_x * LCU_WIDTH + child_state->lcu_order[i].position_px.x));
child_state->lcu_order[i].size.y = MIN(LCU_WIDTH, encoder->in.height - (child_state->tile->lcu_offset_y * LCU_WIDTH + child_state->lcu_order[i].position_px.y)); child_state->lcu_order[i].size.y = MIN(LCU_WIDTH, encoder->in.height - (child_state->tile->lcu_offset_y * LCU_WIDTH + child_state->lcu_order[i].position_px.y));
child_state->lcu_order[i].position_next_px.x = child_state->lcu_order[i].position_px.x + child_state->lcu_order[i].size.x;
child_state->lcu_order[i].position_next_px.y = child_state->lcu_order[i].position_px.y + child_state->lcu_order[i].size.y;
child_state->lcu_order[i].first_row = lcu_in_first_row(child_state, child_state->tile->lcu_offset_in_ts + lcu_id); child_state->lcu_order[i].first_row = lcu_in_first_row(child_state, child_state->tile->lcu_offset_in_ts + lcu_id);
child_state->lcu_order[i].last_row = lcu_in_last_row(child_state, child_state->tile->lcu_offset_in_ts + lcu_id); child_state->lcu_order[i].last_row = lcu_in_last_row(child_state, child_state->tile->lcu_offset_in_ts + lcu_id);
child_state->lcu_order[i].first_column = lcu_in_first_column(child_state, child_state->tile->lcu_offset_in_ts + lcu_id); child_state->lcu_order[i].first_column = lcu_in_first_column(child_state, child_state->tile->lcu_offset_in_ts + lcu_id);
child_state->lcu_order[i].last_column = lcu_in_last_column(child_state, child_state->tile->lcu_offset_in_ts + lcu_id); child_state->lcu_order[i].last_column = lcu_in_last_column(child_state, child_state->tile->lcu_offset_in_ts + lcu_id);
child_state->lcu_order[i].above = NULL;
child_state->lcu_order[i].below = NULL;
child_state->lcu_order[i].left = NULL;
child_state->lcu_order[i].right = NULL;
if (!child_state->lcu_order[i].first_row) {
//Find LCU above
if (child_state->type == ENCODER_STATE_TYPE_WAVEFRONT_ROW) {
int j;
for (j=0; child_state->parent->children[j].encoder_control; ++j) {
if (child_state->parent->children[j].wfrow->lcu_offset_y == child_state->wfrow->lcu_offset_y - 1) {
int k;
for (k=0; k < child_state->parent->children[j].lcu_order_count; ++k) {
if (child_state->parent->children[j].lcu_order[k].position.x == child_state->lcu_order[i].position.x) {
assert(child_state->parent->children[j].lcu_order[k].position.y == child_state->lcu_order[i].position.y - 1);
child_state->lcu_order[i].above = &child_state->parent->children[j].lcu_order[k];
}
}
}
}
} else {
child_state->lcu_order[i].above = &child_state->lcu_order[i-child_state->tile->cur_pic->width_in_lcu];
}
assert(child_state->lcu_order[i].above);
child_state->lcu_order[i].above->below = &child_state->lcu_order[i];
}
if (!child_state->lcu_order[i].first_column) {
child_state->lcu_order[i].left = &child_state->lcu_order[i-1];
assert(child_state->lcu_order[i].left->position.x == child_state->lcu_order[i].position.x - 1);
child_state->lcu_order[i].left->right = &child_state->lcu_order[i];
}
} }
} else { } else {
child_state->lcu_order_count = 0; child_state->lcu_order_count = 0;

7
src/encoder.h
View file

@ -201,7 +201,7 @@ typedef struct {
int32_t lcu_offset_y; int32_t lcu_offset_y;
} encoder_state_config_wfrow; } encoder_state_config_wfrow;
typedef struct { typedef struct lcu_order_element {
//This it used for leaf of the encoding tree. All is relative to the tile. //This it used for leaf of the encoding tree. All is relative to the tile.
int id; int id;
int index; int index;
@ -214,6 +214,11 @@ typedef struct {
int first_row; int first_row;
int last_column; int last_column;
int last_row; int last_row;
struct lcu_order_element *above;
struct lcu_order_element *below;
struct lcu_order_element *left;
struct lcu_order_element *right;
} lcu_order_element; } lcu_order_element;
typedef struct encoder_state { typedef struct encoder_state {