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

Refactoring encoder.c in preparation for adding merge-mode

Browse source
This commit is contained in:
Marko Viitanen 2013-10-11 11:40:37 +03:00
parent b1b45944a9
commit 96a0f03298
1 changed files with 93 additions and 94 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/encoder.c
View file

@ -977,10 +977,7 @@ void encode_coding_tree(encoder_control *encoder, uint16_t x_ctb,
} else { } else {
CABAC_BIN_EP(&cabac, symbol, "ref_frame_flag2"); CABAC_BIN_EP(&cabac, symbol, "ref_frame_flag2");
} }
if (symbol == 0) break;
if (symbol == 0) {
break;
}
} }
} }
} }
@ -1041,6 +1038,16 @@ void encode_coding_tree(encoder_control *encoder, uint16_t x_ctb,
CABAC_BIN_EP(&cabac, (mvd_ver>0)?0:1, "mvd_sign_flag_ver"); CABAC_BIN_EP(&cabac, (mvd_ver>0)?0:1, "mvd_sign_flag_ver");
} }
}
// Signal which candidate MV to use
cabac_write_unary_max_symbol(&cabac, g_mvp_idx_model, cur_cu->inter.mv_ref, 1,
AMVP_MAX_NUM_CANDS - 1);
}
}
} // for ref_list
} // if !merge
// Inter reconstruction // Inter reconstruction
inter_recon(encoder->ref->pics[0], x_ctb * CU_MIN_SIZE_PIXELS, inter_recon(encoder->ref->pics[0], x_ctb * CU_MIN_SIZE_PIXELS,
@ -1049,17 +1056,9 @@ void encode_coding_tree(encoder_control *encoder, uint16_t x_ctb,
// Mark this block as "coded" (can be used for predictions..) // Mark this block as "coded" (can be used for predictions..)
picture_set_block_coded(encoder->in.cur_pic, x_ctb, y_ctb, depth, 1); picture_set_block_coded(encoder->in.cur_pic, x_ctb, y_ctb, depth, 1);
}
// Signal which candidate MV to use
cabac_write_unary_max_symbol(&cabac, g_mvp_idx_model, cur_cu->inter.mv_ref, 1,
AMVP_MAX_NUM_CANDS - 1);
}
}
}
if (1) { {
pixel *base_y = &encoder->in.cur_pic->y_data[x_ctb*(LCU_WIDTH>>(MAX_DEPTH)) + (y_ctb*(LCU_WIDTH>>(MAX_DEPTH))) *encoder->in.width]; pixel *base_y = &encoder->in.cur_pic->y_data[x_ctb*(LCU_WIDTH>>(MAX_DEPTH)) + (y_ctb*(LCU_WIDTH>>(MAX_DEPTH))) *encoder->in.width];
pixel *base_u = &encoder->in.cur_pic->u_data[x_ctb*(LCU_WIDTH>>(MAX_DEPTH+1)) + (y_ctb*(LCU_WIDTH>>(MAX_DEPTH+1)))*(encoder->in.width>>1)]; pixel *base_u = &encoder->in.cur_pic->u_data[x_ctb*(LCU_WIDTH>>(MAX_DEPTH+1)) + (y_ctb*(LCU_WIDTH>>(MAX_DEPTH+1)))*(encoder->in.width>>1)];
pixel *base_v = &encoder->in.cur_pic->v_data[x_ctb*(LCU_WIDTH>>(MAX_DEPTH+1)) + (y_ctb*(LCU_WIDTH>>(MAX_DEPTH+1)))*(encoder->in.width>>1)]; pixel *base_v = &encoder->in.cur_pic->v_data[x_ctb*(LCU_WIDTH>>(MAX_DEPTH+1)) + (y_ctb*(LCU_WIDTH>>(MAX_DEPTH+1)))*(encoder->in.width>>1)];
@ -1130,7 +1129,7 @@ void encode_coding_tree(encoder_control *encoder, uint16_t x_ctb,
encode_transform_coeff(encoder, &ti,depth, 0); encode_transform_coeff(encoder, &ti,depth, 0);
} }
} }
}
// END for each part // END for each part
} else if (cur_cu->type == CU_INTRA) { } else if (cur_cu->type == CU_INTRA) {