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

Fixed deblocking filter when using intra blocks in inter slice

Browse source
This commit is contained in:
Marko Viitanen 2013-11-12 12:00:30 +02:00
parent 61232b466c
commit 661ed343e6
1 changed files with 23 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
src/filter.c
View file

@ -163,7 +163,7 @@ void filter_deblock_edge_luma(encoder_control *encoder,
pixel *src = orig_src; pixel *src = orig_src;
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 = NULL;
int16_t x_cu = xpos>>MIN_SIZE,y_cu = ypos>>MIN_SIZE; int16_t x_cu = xpos>>MIN_SIZE,y_cu = ypos>>MIN_SIZE;
int8_t strength = 0; int8_t strength = 0;
@ -265,12 +265,12 @@ void filter_deblock_edge_chroma(encoder_control *encoder,
int32_t offset = stride; int32_t offset = stride;
int32_t step = 1; int32_t step = 1;
cu_info *cu_q = &encoder->in.cur_pic->cu_array[MAX_DEPTH][(x>>(MIN_SIZE-1)) + (y>>(MIN_SIZE-1)) * (encoder->in.width_in_lcu << MAX_DEPTH)]; cu_info *cu_q = &encoder->in.cur_pic->cu_array[MAX_DEPTH][(x>>(MIN_SIZE-1)) + (y>>(MIN_SIZE-1)) * (encoder->in.width_in_lcu << MAX_DEPTH)];
cu_info *cu_p = &encoder->in.cur_pic->cu_array[MAX_DEPTH][((x>>(MIN_SIZE-1))-(dir == EDGE_VER)) + cu_info *cu_p = NULL;
((y>>(MIN_SIZE-1))-(dir == EDGE_HOR)) * (encoder->in.width_in_lcu << MAX_DEPTH)]; int16_t x_cu = x>>(MIN_SIZE-1),y_cu = y>>(MIN_SIZE-1);
int8_t strength = (cu_q->type == CU_INTRA || cu_p->type == CU_INTRA) ? 2 : 0; // Filter strength int8_t strength = 2;
// We cannot filter edges not on 8x8 grid // We cannot filter edges not on 8x8 grid
if(strength != 2 || (depth == MAX_DEPTH && (( (y & 0x7) && dir == EDGE_HOR ) || ( (x & 0x7) && dir == EDGE_VER ) ) )) if((depth == MAX_DEPTH && (( (y & 0x7) && dir == EDGE_HOR ) || ( (x & 0x7) && dir == EDGE_VER ) ) ))
{ {
return; return;
} }
@ -292,16 +292,23 @@ void filter_deblock_edge_chroma(encoder_control *encoder,
for (blk_idx = 0; blk_idx < blocks_in_part; ++blk_idx) for (blk_idx = 0; blk_idx < blocks_in_part; ++blk_idx)
{ {
// Chroma U
filter_deblock_chroma(src_u + step * (4*blk_idx + 0), offset, Tc, 0, 0); cu_p = &encoder->in.cur_pic->cu_array[MAX_DEPTH][(x_cu - (dir == EDGE_VER) + (dir == EDGE_HOR ? blk_idx : 0)) +
filter_deblock_chroma(src_u + step * (4*blk_idx + 1), offset, Tc, 0, 0); (y_cu - (dir == EDGE_HOR) + (dir == EDGE_VER ? blk_idx : 0))
filter_deblock_chroma(src_u + step * (4*blk_idx + 2), offset, Tc, 0, 0); * (encoder->in.width_in_lcu << MAX_DEPTH)];
filter_deblock_chroma(src_u + step * (4*blk_idx + 3), offset, Tc, 0, 0); // Only filter when strenght == 2 (one of the blocks is intra coded)
// Chroma V if (cu_q->type == CU_INTRA || cu_p->type == CU_INTRA) {
filter_deblock_chroma(src_v + step * (4*blk_idx + 0), offset, Tc, 0, 0); // Chroma U
filter_deblock_chroma(src_v + step * (4*blk_idx + 1), offset, Tc, 0, 0); filter_deblock_chroma(src_u + step * (4*blk_idx + 0), offset, Tc, 0, 0);
filter_deblock_chroma(src_v + step * (4*blk_idx + 2), offset, Tc, 0, 0); filter_deblock_chroma(src_u + step * (4*blk_idx + 1), offset, Tc, 0, 0);
filter_deblock_chroma(src_v + step * (4*blk_idx + 3), offset, Tc, 0, 0); filter_deblock_chroma(src_u + step * (4*blk_idx + 2), offset, Tc, 0, 0);
filter_deblock_chroma(src_u + step * (4*blk_idx + 3), offset, Tc, 0, 0);
// Chroma V
filter_deblock_chroma(src_v + step * (4*blk_idx + 0), offset, Tc, 0, 0);
filter_deblock_chroma(src_v + step * (4*blk_idx + 1), offset, Tc, 0, 0);
filter_deblock_chroma(src_v + step * (4*blk_idx + 2), offset, Tc, 0, 0);
filter_deblock_chroma(src_v + step * (4*blk_idx + 3), offset, Tc, 0, 0);
}
} }
} }
} }