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

P-frame: first try...

Browse source
This commit is contained in:
Laurent Fasnacht 2014-04-23 14:24:35 +02:00
parent 03361dcf2c
commit 73c574fb45
3 changed files with 72 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/encmain.c
View file

@ -370,27 +370,7 @@ int main(int argc, char *argv[])
// TODO: add more than one reference
// Remove the ref pic (if present)
if (encoder_state.ref->used_size == (uint32_t)encoder.cfg->ref_frames) {
picture_list_rem(encoder_state.ref, encoder_state.ref->used_size-1, 1);
}
// Add current picture as reference
picture_list_add(encoder_state.ref, cur_pic);
// Allocate new memory to current picture
// TODO: reuse memory from old reference
encoder_state.cur_pic = picture_init(encoder_state.cur_pic->width, encoder_state.cur_pic->height, encoder_state.cur_pic->width_in_lcu, encoder_state.cur_pic->height_in_lcu);
// Copy pointer from the last cur_pic because we don't want to reallocate it
MOVE_POINTER(encoder_state.cur_pic->coeff_y,encoder_state.ref->pics[0]->coeff_y);
MOVE_POINTER(encoder_state.cur_pic->coeff_u,encoder_state.ref->pics[0]->coeff_u);
MOVE_POINTER(encoder_state.cur_pic->coeff_v,encoder_state.ref->pics[0]->coeff_v);
MOVE_POINTER(encoder_state.cur_pic->pred_y,encoder_state.ref->pics[0]->pred_y);
MOVE_POINTER(encoder_state.cur_pic->pred_u,encoder_state.ref->pics[0]->pred_u);
MOVE_POINTER(encoder_state.cur_pic->pred_v,encoder_state.ref->pics[0]->pred_v);
encoder_state.frame++;
encoder_state.poc++;
encoder_next_frame(&encoder_state);
}
// Coding finished
fgetpos(output,(fpos_t*)&curpos);

76
src/encoder.c
View file

@ -376,7 +376,7 @@ int encoder_state_init(encoder_state * const encoder_state, const encoder_contro
fprintf(stderr, "Failed to allocate the picture list (subencoder)!\n");
return 0;
}
encoder_state->ref_list = REF_PIC_LIST_0;
encoder_state->children[i].ref_list = REF_PIC_LIST_0;
encoder_state->children[i].cur_pic = picture_init(tile_width, tile_height,
tile_width_in_lcu, tile_height_in_lcu);
@ -435,6 +435,31 @@ int encoder_state_finalize(encoder_state * const encoder_state) {
return 1;
}
static void encoder_clear_refs(encoder_state *encoder_state) {
const encoder_control * const encoder = encoder_state->encoder_control;
while (encoder_state->ref->used_size) {
picture_list_rem(encoder_state->ref, encoder_state->ref->used_size - 1, 1);
}
encoder_state->poc = 0;
if (USE_TILES && encoder->tiles_enable) {
#if USE_TILES
if (encoder_state->children) {
int x,y;
//Allocate subencoders
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_clear_refs(&encoder_state->children[i]);
}
}
}
#endif //USE_TILES
}
}
void encoder_control_input_init(encoder_control * const encoder,
const int32_t width, const int32_t height)
{
@ -639,11 +664,7 @@ void encode_one_frame(encoder_state * const encoder_state)
**/
if (is_radl_frame) {
// Clear the reference list
while (encoder_state->ref->used_size) {
picture_list_rem(encoder_state->ref, encoder_state->ref->used_size - 1, 1);
}
encoder_state->poc = 0;
encoder_clear_refs(encoder_state);
encoder_state->cur_pic->slicetype = SLICE_I;
encoder_state->cur_pic->type = NAL_IDR_W_RADL;
@ -766,7 +787,7 @@ void encode_one_frame(encoder_state * const encoder_state)
if (encoder->sao_enable) {
sao_reconstruct_frame(encoder_state);
}
// Calculate checksum
add_checksum(encoder_state);
@ -1366,6 +1387,47 @@ static void encode_VUI(encoder_state * const encoder_state)
//ENDIF
}
void encoder_next_frame(encoder_state *encoder_state) {
const encoder_control * const encoder = encoder_state->encoder_control;
// Remove the ref pic (if present)
if (encoder_state->ref->used_size == (uint32_t)encoder->cfg->ref_frames) {
picture_list_rem(encoder_state->ref, encoder_state->ref->used_size-1, 1);
}
// Add current picture as reference
picture_list_add(encoder_state->ref, encoder_state->cur_pic);
// Allocate new memory to current picture
// TODO: reuse memory from old reference
encoder_state->cur_pic = picture_init(encoder_state->cur_pic->width, encoder_state->cur_pic->height, encoder_state->cur_pic->width_in_lcu, encoder_state->cur_pic->height_in_lcu);
// Copy pointer from the last cur_pic because we don't want to reallocate it
MOVE_POINTER(encoder_state->cur_pic->coeff_y,encoder_state->ref->pics[0]->coeff_y);
MOVE_POINTER(encoder_state->cur_pic->coeff_u,encoder_state->ref->pics[0]->coeff_u);
MOVE_POINTER(encoder_state->cur_pic->coeff_v,encoder_state->ref->pics[0]->coeff_v);
MOVE_POINTER(encoder_state->cur_pic->pred_y,encoder_state->ref->pics[0]->pred_y);
MOVE_POINTER(encoder_state->cur_pic->pred_u,encoder_state->ref->pics[0]->pred_u);
MOVE_POINTER(encoder_state->cur_pic->pred_v,encoder_state->ref->pics[0]->pred_v);
encoder_state->frame++;
encoder_state->poc++;
if (USE_TILES && encoder->tiles_enable) {
#if USE_TILES
if (encoder_state->children) {
int x,y;
//Allocate subencoders
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_next_frame(&encoder_state->children[i]);
}
}
}
#endif //USE_TILES
}
}
void encode_slice_header(encoder_state * const encoder_state)
{
const encoder_control * const encoder = encoder_state->encoder_control;

2
src/encoder.h
View file

@ -160,6 +160,8 @@ void encoder_state_init_lambda(encoder_state *encoder_state);
void encode_one_frame(encoder_state *encoder_state);
int read_one_frame(FILE* file, const encoder_state *encoder);
void encoder_next_frame(encoder_state *encoder_state);
void encode_seq_parameter_set(encoder_state *encoder);
void encode_pic_parameter_set(encoder_state *encoder);
void encode_vid_parameter_set(encoder_state *encoder);