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

Fix mip context calculation for P and B slices

Browse source
This commit is contained in:
Joose Sainio 2022-03-10 10:48:37 +02:00
parent ae2e0da6ab
commit 0dd7646a34
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/intra.c
View file

@ -562,24 +562,28 @@ int kvz_get_mip_flag_context(int x, int y, int width, int height, const lcu_t* l
} }
int context = 0; int context = 0;
const cu_info_t* left = NULL;
const cu_info_t* top = NULL;
if (lcu) { if (lcu) {
int x_local = SUB_SCU(x); int x_local = SUB_SCU(x);
int y_local = SUB_SCU(y); int y_local = SUB_SCU(y);
if (x) { if (x) {
context += LCU_GET_CU_AT_PX(lcu, x_local - 1, y_local)->intra.mip_flag; left = LCU_GET_CU_AT_PX(lcu, x_local - 1, y_local);
} }
if (y) { if (y) {
context += LCU_GET_CU_AT_PX(lcu, x_local, y_local - 1)->intra.mip_flag; top = LCU_GET_CU_AT_PX(lcu, x_local - 1, y_local);
} }
} }
else { else {
if (x > 0) { if (x > 0) {
context += kvz_cu_array_at_const(cu_a, x - 1, y)->intra.mip_flag; left = kvz_cu_array_at_const(cu_a, x - 1, y);
} }
if (y > 0) { if (y > 0) {
context += kvz_cu_array_at_const(cu_a, x, y - 1)->intra.mip_flag; top = kvz_cu_array_at_const(cu_a, x, y - 1);
} }
} }
context += left && left->type == CU_INTRA ? left->intra.mip_flag : 0;
context += top && top->type == CU_INTRA ? top->intra.mip_flag : 0;
return context; return context;
} }