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

Deblocking fix: store block residual status and use it in deblocking

Browse source
This commit is contained in:
Marko Viitanen 2013-10-09 14:09:49 +03:00
parent 2b5159d8ab
commit c9cf75775b
4 changed files with 33 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/encoder.c
View file

@ -1077,6 +1077,7 @@ void encode_coding_tree(encoder_control *encoder, uint16_t x_ctb,
int16_t coeff_y[LCU_WIDTH*LCU_WIDTH*2]; int16_t coeff_y[LCU_WIDTH*LCU_WIDTH*2];
int16_t coeff_u[LCU_WIDTH*LCU_WIDTH>>1]; int16_t coeff_u[LCU_WIDTH*LCU_WIDTH>>1];
int16_t coeff_v[LCU_WIDTH*LCU_WIDTH>>1]; int16_t coeff_v[LCU_WIDTH*LCU_WIDTH>>1];
int8_t residual = 0;
/* Initialize helper structure for transform */ /* Initialize helper structure for transform */
transform_info ti; transform_info ti;
@ -1109,12 +1110,14 @@ void encode_coding_tree(encoder_control *encoder, uint16_t x_ctb,
ti.cb_top[1] = (ti.cb[0] & 0x2 || ti.cb[1] & 0x2 || ti.cb[2] & 0x2 || ti.cb[3] & 0x2)?1:0; ti.cb_top[1] = (ti.cb[0] & 0x2 || ti.cb[1] & 0x2 || ti.cb[2] & 0x2 || ti.cb[3] & 0x2)?1:0;
ti.cb_top[2] = (ti.cb[0] & 0x4 || ti.cb[1] & 0x4 || ti.cb[2] & 0x4 || ti.cb[3] & 0x4)?1:0; ti.cb_top[2] = (ti.cb[0] & 0x4 || ti.cb[1] & 0x4 || ti.cb[2] & 0x4 || ti.cb[3] & 0x4)?1:0;
residual = ti.cb_top[0] | ti.cb_top[1] | ti.cb_top[2];
picture_set_block_residual(encoder->in.cur_pic,x_ctb,y_ctb,depth,residual);
cabac.ctx = &g_cu_qt_root_cbf_model; cabac.ctx = &g_cu_qt_root_cbf_model;
CABAC_BIN(&cabac, ti.cb_top[0] | ti.cb_top[1] | ti.cb_top[2], "rqt_root_cbf"); CABAC_BIN(&cabac, residual, "rqt_root_cbf");
// Code (possible) coeffs to bitstream // Code (possible) coeffs to bitstream
ti.idx = 0; ti.idx = 0;
if(ti.cb_top[0] | ti.cb_top[1] | ti.cb_top[2]) { if(residual) {
encode_transform_coeff(encoder, &ti,depth, 0); encode_transform_coeff(encoder, &ti,depth, 0);
} }
} }

3
src/filter.c
View file

@ -193,7 +193,8 @@ void filter_deblock_edge_luma(encoder_control *encoder,
((ypos>>MIN_SIZE)-(dir == EDGE_HOR)+(dir == EDGE_VER?block_idx/2:0)) * (encoder->in.width_in_lcu << MAX_DEPTH)]; ((ypos>>MIN_SIZE)-(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 = ((cu_q->type == CU_INTRA || cu_p->type == CU_INTRA) ? 2 :
(((abs(cu_q->inter.mv[0] - cu_p->inter.mv[0]) >= 4) || (abs(cu_q->inter.mv[1] - cu_p->inter.mv[1]) >= 4)) ? 1 : 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) ||
cu_q->residual || cu_p->residual ) ? 1 : 0));
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;

23
src/picture.c
View file

@ -20,6 +20,29 @@
#define PSNRMAX (255.0 * 255.0) #define PSNRMAX (255.0 * 255.0)
/**
* \brief Set block residual status
* \param pic picture to use
* \param x_scu x SCU position (smallest CU)
* \param y_scu y SCU position (smallest CU)
* \param depth current CU depth
* \param residual residual status
*/
void picture_set_block_residual(picture *pic, uint32_t x_scu, uint32_t y_scu,
uint8_t depth, int8_t residual)
{
uint32_t x, y;
int width_in_scu = pic->width_in_lcu << MAX_DEPTH;
int block_scu_width = (LCU_WIDTH >> depth) / (LCU_WIDTH >> MAX_DEPTH);
for (y = y_scu; y < y_scu + block_scu_width; ++y) {
int cu_row = y * width_in_scu;
for (x = x_scu; x < x_scu + block_scu_width; ++x) {
pic->cu_array[MAX_DEPTH][cu_row + x].residual = residual;
}
}
}
/** /**
* \brief Set block coded status * \brief Set block coded status
* \param pic picture to use * \param pic picture to use

3
src/picture.h
View file

@ -55,6 +55,7 @@ typedef struct
int8_t type; int8_t type;
int8_t depth; int8_t depth;
int8_t coded; int8_t coded;
int8_t residual;
cu_info_intra intra; cu_info_intra intra;
cu_info_inter inter; cu_info_inter inter;
} cu_info; } cu_info;
@ -101,6 +102,8 @@ picture * picture_init(int32_t width, int32_t height,
int picture_destroy(picture *pic); int picture_destroy(picture *pic);
void picture_set_block_coded(picture *pic, uint32_t x_scu, uint32_t y_scu, void picture_set_block_coded(picture *pic, uint32_t x_scu, uint32_t y_scu,
uint8_t depth, int8_t coded); uint8_t depth, int8_t coded);
void picture_set_block_residual(picture *pic, uint32_t x_scu, uint32_t y_scu,
uint8_t depth, int8_t residual);
void picture_set_block_split(picture *pic, uint32_t x_scu, uint32_t y_scu, void picture_set_block_split(picture *pic, uint32_t x_scu, uint32_t y_scu,
uint8_t depth, int8_t split); uint8_t depth, int8_t split);