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

smp/amp CUs cannot be skipped

Browse source
This commit is contained in:
Joose Sainio 2022-02-01 14:16:38 +02:00
parent 71b1e59548
commit c7174b25cf
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/search_inter.c
View file

@ -2082,7 +2082,7 @@ void kvz_cu_cost_inter_rd2(encoder_state_t * const state,
double no_cbf_bits; double no_cbf_bits;
double bits = 0; double bits = 0;
int skip_context = kvz_get_skip_context(x, y, lcu, NULL); int skip_context = kvz_get_skip_context(x, y, lcu, NULL);
if (cur_cu->merged) { if (cur_cu->merged && cur_cu->part_size == SIZE_2Nx2N) {
no_cbf_bits = CTX_ENTROPY_FBITS(&state->cabac.ctx.cu_skip_flag_model[skip_context], 1); no_cbf_bits = CTX_ENTROPY_FBITS(&state->cabac.ctx.cu_skip_flag_model[skip_context], 1);
bits += CTX_ENTROPY_FBITS(&state->cabac.ctx.cu_skip_flag_model[skip_context], 0); bits += CTX_ENTROPY_FBITS(&state->cabac.ctx.cu_skip_flag_model[skip_context], 0);
} }
@ -2110,7 +2110,7 @@ void kvz_cu_cost_inter_rd2(encoder_state_t * const state,
else { else {
// If we have no coeffs after quant we already have the cost calculated // If we have no coeffs after quant we already have the cost calculated
*inter_cost = no_cbf_cost; *inter_cost = no_cbf_cost;
if(cur_cu->merged) { if(cur_cu->merged && cur_cu->part_size == SIZE_2Nx2N) {
*inter_bitcost += no_cbf_bits; *inter_bitcost += no_cbf_bits;
} }
return; return;
@ -2122,12 +2122,12 @@ void kvz_cu_cost_inter_rd2(encoder_state_t * const state,
if(no_cbf_cost < *inter_cost) { if(no_cbf_cost < *inter_cost) {
cur_cu->cbf = 0; cur_cu->cbf = 0;
if (cur_cu->merged) { if (cur_cu->merged && cur_cu->part_size == SIZE_2Nx2N) {
cur_cu->skipped = 1; cur_cu->skipped = 1;
} }
kvz_inter_recon_cu(state, lcu, x, y, CU_WIDTH_FROM_DEPTH(depth), true, reconstruct_chroma); kvz_inter_recon_cu(state, lcu, x, y, CU_WIDTH_FROM_DEPTH(depth), true, reconstruct_chroma);
*inter_cost = no_cbf_cost; *inter_cost = no_cbf_cost;
if (cur_cu->merged) { if (cur_cu->merged && cur_cu->part_size == SIZE_2Nx2N) {
*inter_bitcost += no_cbf_bits; *inter_bitcost += no_cbf_bits;
} }
} }