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

Fix more chroma deblocking issues

Browse source
This commit is contained in:
Jaakko Laitinen 2021-01-06 19:06:14 +02:00
parent b96753961c
commit 88b837c4f0
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/filter.c
View file

@ -990,14 +990,14 @@ static void filter_deblock_edge_chroma(encoder_state_t * const state,
if (dir == EDGE_VER) { if (dir == EDGE_VER) {
x_coord <<= 1; x_coord <<= 1;
y_coord = (y + min_chroma_length * blk_idx) << 1; y_coord = (y + min_chroma_length * blk_idx) << 1;
cu_p = kvz_cu_array_at(frame->cu_array, (x - 1) << 1, y_coord); cu_p = kvz_cu_array_at(frame->cu_array, x_coord - 1, y_coord);
cu_q = kvz_cu_array_at(frame->cu_array, x << 1, y_coord); cu_q = kvz_cu_array_at(frame->cu_array, x_coord , y_coord);
} else { } else {
x_coord = (x + min_chroma_length * blk_idx) << 1; x_coord = (x + min_chroma_length * blk_idx) << 1;
y_coord <<= 1; y_coord <<= 1;
cu_p = kvz_cu_array_at(frame->cu_array, x_coord, (y - 1) << 1); cu_p = kvz_cu_array_at(frame->cu_array, x_coord, y_coord - 1);
cu_q = kvz_cu_array_at(frame->cu_array, x_coord, (y ) << 1); cu_q = kvz_cu_array_at(frame->cu_array, x_coord, y_coord );
} }
const int cu_size = LCU_WIDTH >> cu_q->depth; const int cu_size = LCU_WIDTH >> cu_q->depth;
@ -1021,7 +1021,7 @@ static void filter_deblock_edge_chroma(encoder_state_t * const state,
const bool large_boundary = (max_filter_length_P >= 3 && max_filter_length_Q >= 3); const bool large_boundary = (max_filter_length_P >= 3 && max_filter_length_Q >= 3);
const bool is_chroma_hor_CTB_boundary = (dir == EDGE_HOR && y_coord % LCU_WIDTH == 0); const bool is_chroma_hor_CTB_boundary = (dir == EDGE_HOR && y_coord % LCU_WIDTH == 0);
uint8_t c_strength[2] = { 0, 0 }; uint8_t c_strength[2] = { 0, 0 };
bool use_long_filter = false;
if (cu_q->type == CU_INTRA || cu_p->type == CU_INTRA) { if (cu_q->type == CU_INTRA || cu_p->type == CU_INTRA) {
c_strength[0] = 2; c_strength[0] = 2;
@ -1043,6 +1043,8 @@ static void filter_deblock_edge_chroma(encoder_state_t * const state,
int32_t Tc = encoder->bitdepth < 10 ? ((kvz_g_tc_table_8x8[TC_index] + (1 << (9 - encoder->bitdepth))) >> (10 - encoder->bitdepth)) int32_t Tc = encoder->bitdepth < 10 ? ((kvz_g_tc_table_8x8[TC_index] + (1 << (9 - encoder->bitdepth))) >> (10 - encoder->bitdepth))
: (kvz_g_tc_table_8x8[TC_index] << (encoder->bitdepth - 10)); : (kvz_g_tc_table_8x8[TC_index] << (encoder->bitdepth - 10));
bool use_long_filter = false;
// +-- edge_src // +-- edge_src
// v // v
// line0 p3 p2 p1 p0 q0 q1 q2 q3 // line0 p3 p2 p1 p0 q0 q1 q2 q3