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

Move encoding part mode to a separate function.

Browse source 
Moves code for encoding the part mode from function
kvz_encode_coding_tree to a new function encode_part_mode.
This commit is contained in:
Arttu Ylä-Outinen 2015-09-04 09:06:05 +03:00
parent ac952cbb44
commit c336674da3
1 changed files with 21 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/encoderstate.c
View file

@ -977,6 +977,26 @@ void kvz_encoder_next_frame(encoder_state_t *state)
state->prepared = 1; state->prepared = 1;
} }
static void encode_part_mode(cabac_data_t * const cabac,
const cu_info_t * const cur_cu,
int depth)
{
if (cur_cu->type == CU_INTRA) {
if (depth == MAX_DEPTH) {
cabac->cur_ctx = &(cabac->ctx.part_size_model[0]);
if (cur_cu->part_size == SIZE_2Nx2N) {
CABAC_BIN(cabac, 1, "part_mode 2Nx2N");
} else {
CABAC_BIN(cabac, 0, "part_mode NxN");
}
}
} else {
// TODO: Handle inter sizes other than 2Nx2N
cabac->cur_ctx = &(cabac->ctx.part_size_model[0]);
CABAC_BIN(cabac, 1, "part_mode 2Nx2N");
}
}
static void encode_inter_prediction_unit(encoder_state_t * const state, static void encode_inter_prediction_unit(encoder_state_t * const state,
cabac_data_t * const cabac, cabac_data_t * const cabac,
const cu_info_t * const cur_cu, const cu_info_t * const cur_cu,
@ -1213,22 +1233,8 @@ void kvz_encode_coding_tree(encoder_state_t * const state,
} }
// part_mode // part_mode
if (cur_cu->type == CU_INTRA) { encode_part_mode(cabac, cur_cu, depth);
if (depth == MAX_DEPTH) {
cabac->cur_ctx = &(cabac->ctx.part_size_model[0]);
if (cur_cu->part_size == SIZE_2Nx2N) {
CABAC_BIN(cabac, 1, "part_mode 2Nx2N");
} else {
CABAC_BIN(cabac, 0, "part_mode NxN");
}
}
} else {
// TODO: Handle inter sizes other than 2Nx2N
cabac->cur_ctx = &(cabac->ctx.part_size_model[0]);
CABAC_BIN(cabac, 1, "part_mode 2Nx2N");
}
//end partsize
if (cur_cu->type == CU_INTER) { if (cur_cu->type == CU_INTER) {
// FOR each part // FOR each part
encode_inter_prediction_unit(state, cabac, cur_cu, x_ctb, y_ctb, depth); encode_inter_prediction_unit(state, cabac, cur_cu, x_ctb, y_ctb, depth);