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

Suffix encoder_state_config structs with _t.

Browse source
This commit is contained in:
Ari Koivula 2015-03-04 13:48:58 +02:00
parent cdb1a25f05
commit 9e64ee3cee
2 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/encoder_state-ctors_dtors.c
View file

@ -294,22 +294,22 @@ int encoder_state_init(encoder_state_t * const child_state, encoder_state_t * co
const encoder_control_t * const encoder = child_state->encoder_control;
child_state->type = ENCODER_STATE_TYPE_MAIN;
assert(child_state->encoder_control);
child_state->global = MALLOC(encoder_state_config_global, 1);
child_state->global = MALLOC(encoder_state_config_global_t, 1);
if (!child_state->global || !encoder_state_config_global_init(child_state)) {
fprintf(stderr, "Could not initialize encoder_state->global!\n");
return 0;
}
child_state->tile = MALLOC(encoder_state_config_tile, 1);
child_state->tile = MALLOC(encoder_state_config_tile_t, 1);
if (!child_state->tile || !encoder_state_config_tile_init(child_state, 0, 0, encoder->in.width, encoder->in.height, encoder->in.width_in_lcu, encoder->in.height_in_lcu)) {
fprintf(stderr, "Could not initialize encoder_state->tile!\n");
return 0;
}
child_state->slice = MALLOC(encoder_state_config_slice, 1);
child_state->slice = MALLOC(encoder_state_config_slice_t, 1);
if (!child_state->slice || !encoder_state_config_slice_init(child_state, 0, encoder->in.width_in_lcu * encoder->in.height_in_lcu - 1)) {
fprintf(stderr, "Could not initialize encoder_state->slice!\n");
return 0;
}
child_state->wfrow = MALLOC(encoder_state_config_wfrow, 1);
child_state->wfrow = MALLOC(encoder_state_config_wfrow_t, 1);
if (!child_state->wfrow || !encoder_state_config_wfrow_init(child_state, 0)) {
fprintf(stderr, "Could not initialize encoder_state->wfrow!\n");
return 0;
@ -422,7 +422,7 @@ int encoder_state_init(encoder_state_t * const child_state, encoder_state_t * co
new_child->global = child_state->global;
new_child->tile = child_state->tile;
new_child->wfrow = child_state->wfrow;
new_child->slice = MALLOC(encoder_state_config_slice, 1);
new_child->slice = MALLOC(encoder_state_config_slice_t, 1);
if (!new_child->slice || !encoder_state_config_slice_init(new_child, range_start, range_end_slice)) {
fprintf(stderr, "Could not initialize encoder_state->slice!\n");
return 0;
@ -446,7 +446,7 @@ int encoder_state_init(encoder_state_t * const child_state, encoder_state_t * co
new_child->encoder_control = encoder;
new_child->type = ENCODER_STATE_TYPE_TILE;
new_child->global = child_state->global;
new_child->tile = MALLOC(encoder_state_config_tile, 1);
new_child->tile = MALLOC(encoder_state_config_tile_t, 1);
new_child->slice = child_state->slice;
new_child->wfrow = child_state->wfrow;
@ -531,7 +531,7 @@ int encoder_state_init(encoder_state_t * const child_state, encoder_state_t * co
new_child->global = child_state->global;
new_child->tile = child_state->tile;
new_child->slice = child_state->slice;
new_child->wfrow = MALLOC(encoder_state_config_wfrow, 1);
new_child->wfrow = MALLOC(encoder_state_config_wfrow_t, 1);
if (!new_child->wfrow || !encoder_state_config_wfrow_init(new_child, i)) {
fprintf(stderr, "Could not initialize encoder_state->wfrow!\n");

16
src/encoderstate.h
View file

@ -76,7 +76,7 @@ typedef struct {
uint8_t pictype;
uint8_t slicetype;
} encoder_state_config_global;
} encoder_state_config_global_t;
typedef struct {
//Current sub-frame
@ -102,7 +102,7 @@ typedef struct {
//Job pointers for wavefronts
threadqueue_job **wf_jobs;
} encoder_state_config_tile;
} encoder_state_config_tile_t;
typedef struct {
int32_t id;
@ -114,12 +114,12 @@ typedef struct {
//Global coordinates
int32_t start_in_rs;
int32_t end_in_rs;
} encoder_state_config_slice;
} encoder_state_config_slice_t;
typedef struct {
//Row in tile coordinates of the wavefront
int32_t lcu_offset_y;
} encoder_state_config_wfrow;
} encoder_state_config_wfrow_t;
typedef struct lcu_order_element {
//This it used for leaf of the encoding tree. All is relative to the tile.
@ -152,10 +152,10 @@ typedef struct encoder_state_t {
//Pointer to the encoder_state of the previous frame
struct encoder_state_t *previous_encoder_state;
encoder_state_config_global *global;
encoder_state_config_tile *tile;
encoder_state_config_slice *slice;
encoder_state_config_wfrow *wfrow;
encoder_state_config_global_t *global;
encoder_state_config_tile_t *tile;
encoder_state_config_slice_t *slice;
encoder_state_config_wfrow_t *wfrow;
int is_leaf; //A leaf encoder state is one which should encode LCUs...
lcu_order_element *lcu_order;