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

Fixed and simplified inter deblocking strength selection

Browse source
This commit is contained in:
Marko Viitanen 2013-10-09 16:59:55 +03:00
parent bb9ac4f03b
commit 12fbc5fb4a
1 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/filter.c
View file

@ -164,6 +164,7 @@ void filter_deblock_edge_luma(encoder_control *encoder,
int32_t step = 1; int32_t step = 1;
cu_info *cu_q = &encoder->in.cur_pic->cu_array[MAX_DEPTH][(xpos>>MIN_SIZE) + (ypos>>MIN_SIZE) * (encoder->in.width_in_lcu << MAX_DEPTH)]; cu_info *cu_q = &encoder->in.cur_pic->cu_array[MAX_DEPTH][(xpos>>MIN_SIZE) + (ypos>>MIN_SIZE) * (encoder->in.width_in_lcu << MAX_DEPTH)];
cu_info *cu_p = 0; cu_info *cu_p = 0;
int16_t x_cu = xpos>>MIN_SIZE,y_cu = ypos>>MIN_SIZE;
int8_t strength = 0; int8_t strength = 0;
@ -189,12 +190,22 @@ void filter_deblock_edge_luma(encoder_control *encoder,
if((block_idx & 1) == 0) if((block_idx & 1) == 0)
{ {
// CU in the side we are filtering, update every 8-pixels // CU in the side we are filtering, update every 8-pixels
cu_p = &encoder->in.cur_pic->cu_array[MAX_DEPTH][((xpos>>MIN_SIZE)-(dir == EDGE_VER)+(dir == EDGE_HOR?block_idx/2:0)) + cu_p = &encoder->in.cur_pic->cu_array[MAX_DEPTH][(x_cu - (dir == EDGE_VER) + (dir == EDGE_HOR ? block_idx/2 : 0)) +
((ypos>>MIN_SIZE)-(dir == EDGE_HOR)+(dir == EDGE_VER?block_idx/2:0)) * (encoder->in.width_in_lcu << MAX_DEPTH)]; (y_cu - (dir == EDGE_HOR) + (dir == EDGE_VER ? block_idx/2 : 0))
* (encoder->in.width_in_lcu << MAX_DEPTH)];
// Filter strength // Filter strength
strength = ((cu_q->type == CU_INTRA || cu_p->type == CU_INTRA) ? 2 : strength = 0;
(((abs(cu_q->inter.mv[0] - cu_p->inter.mv[0]) >= 4) || (abs(cu_q->inter.mv[1] - cu_p->inter.mv[1]) >= 4) || // Intra blocks have strength 2
cu_q->residual || cu_p->residual ) ? 1 : 0)); if(cu_q->type == CU_INTRA || cu_p->type == CU_INTRA) {
strength = 2;
// Non-zero residual and transform boundary
} else if((cu_q->residual || cu_p->residual) && (cu_q->depth==0 ? !((dir == EDGE_VER ? y_cu + (block_idx>>1) : x_cu + (block_idx>>1) )&0x3) : 1 ) ) {
strength = 1;
// Absolute motion vector diff between blocks >= 1 (Integer pixel)
} else if((abs(cu_q->inter.mv[0] - cu_p->inter.mv[0]) >= 4) || (abs(cu_q->inter.mv[1] - cu_p->inter.mv[1]) >= 4)) {
strength = 1;
}
tc_index = CLIP(0, 51 + 2, (int32_t)(qp + 2*(strength - 1) + (tc_offset_div2 << 1))); tc_index = CLIP(0, 51 + 2, (int32_t)(qp + 2*(strength - 1) + (tc_offset_div2 << 1)));
tc = g_tc_table_8x8[tc_index] * bitdepth_scale; tc = g_tc_table_8x8[tc_index] * bitdepth_scale;
thr_cut = tc * 10; thr_cut = tc * 10;