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

Fix iteration on children

Browse source
This commit is contained in:
Laurent Fasnacht 2014-05-07 06:24:22 +02:00
parent 699669ee35
commit cee6bb0e71
2 changed files with 6 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/encoder.c
View file

@ -660,32 +660,15 @@ int encoder_state_init(encoder_state * const child_state, encoder_state * const
printf("Wavefront\n");
}
}
/* if (encoder->tiles_enable) {
int x,y;
//Allocate subencoders (valid subencoder have a non null encoder_control field, so we use a null one to mark the end of the list)
encoder_state->children = MALLOC(struct encoder_state, encoder->tiles_num_tile_columns * encoder->tiles_num_tile_rows + 1);
encoder_state->children[encoder->tiles_num_tile_columns * encoder->tiles_num_tile_rows].encoder_control = NULL;
for (y=0; y < encoder->tiles_num_tile_rows; ++y) {
for (x=0; x < encoder->tiles_num_tile_columns; ++x) {
const int i = y * encoder->tiles_num_tile_columns + x;
encoder_state->children[i].encoder_control = encoder;
if (!encoder_state_init_one(&encoder_state->children[i], encoder_state, x, y)) {
fprintf(stderr, "Could not initialize encoder state %d!\n", i);
return 0;
}
}
*/
return 1;
}
void encoder_state_finalize(encoder_state * const encoder_state) {
if (encoder_state->children) {
int i=0;
do {
for (i = 0; encoder_state->children[i].encoder_control; ++i) {
encoder_state_finalize(&encoder_state->children[i]);
} while (encoder_state->children[++i].encoder_control);
}
FREE_POINTER(encoder_state->children);
}
@ -1037,6 +1020,7 @@ void encode_one_frame(encoder_state * const main_state)
if (main_state->children) {
int i;
//FIXME!
//This can be parallelized, we don't use a do...while loop because we use OpenMP
#pragma omp parallel for
for (i = 0; i < encoder->tiles_num_tile_rows * encoder->tiles_num_tile_columns; ++i) {
@ -1062,11 +1046,11 @@ void encode_one_frame(encoder_state * const main_state)
//This has to be serial
i = 0;
do {
for (i = 0; main_state->children[i].encoder_control; ++i) {
//Append bitstream to main stream
bitstream_append(&main_state->stream, &main_state->children[i].stream);
bitstream_clear(&main_state->children[i].stream);
} while (main_state->children[++i].encoder_control);
}
} else {
//Encode the whole thing as one stream

2
src/encoder.h
View file

@ -186,7 +186,7 @@ typedef struct encoder_state {
encoder_state_type type;
//List of children, the last item of this list is a pseudo-encoder with encoder_control = NULL
//Use do { } while (encoder_state->children[++i].encoder_control)
//Use for (i = 0; encoder_state->children[i].encoder_control; ++i) {
struct encoder_state *children;
struct encoder_state *parent;