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

Merge branch 'refactoring' of Z:/Work/HEVC_encoder into refactoring

Browse source
This commit is contained in:
Marko Viitanen 2013-09-18 14:49:36 +03:00
parent 0bf4f65a55 81e4e05b42
commit 945e6c9c0e
3 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/debug.h
View file

@ -16,6 +16,6 @@
FILE * open_cu_file(char *filename);
void close_cu_file(FILE *fp);
unsigned render_cu_file(encoder_control *encoder, unsigned depth, uint16_t xCtb, uint16_t yCtb, FILE *fp);
unsigned render_cu_file(encoder_control *encoder, unsigned depth, uint16_t x_cu, uint16_t y_cu, FILE *fp);
#endif

14
src/filter.c
View file

@ -252,7 +252,7 @@ void filter_deblock_edge_chroma(encoder_control* encoder,int32_t xpos, int32_t y
until the coded block size has been achived. Calls luma and chroma filtering
functions for each coded CU size
*/
void filter_deblock_CU(encoder_control* encoder, int32_t xCtb, int32_t yCtb, int8_t depth, int32_t edge)
void filter_deblock_cu(encoder_control* encoder, int32_t xCtb, int32_t yCtb, int8_t depth, int32_t edge)
{
CU_info *cur_CU = &encoder->in.cur_pic->CU[depth][xCtb+yCtb*(encoder->in.width_in_lcu<<MAX_DEPTH)];
uint8_t split_flag = (cur_CU->depth > depth)?1:0;
@ -268,19 +268,19 @@ void filter_deblock_CU(encoder_control* encoder, int32_t xCtb, int32_t yCtb, int
{
/* Split blocks and remember to change x and y block positions */
uint8_t change = 1<<(MAX_DEPTH-1-depth);
filter_deblock_CU(encoder,xCtb,yCtb,depth+1,edge); /* x,y */
filter_deblock_cu(encoder,xCtb,yCtb,depth+1,edge); /* x,y */
if(!border_x || border_split_x)
{
filter_deblock_CU(encoder,xCtb+change,yCtb,depth+1,edge); /* x+1,y */
filter_deblock_cu(encoder,xCtb+change,yCtb,depth+1,edge); /* x+1,y */
}
if(!border_y || border_split_y)
{
filter_deblock_CU(encoder,xCtb,yCtb+change,depth+1,edge); /* x,y+1 */
filter_deblock_cu(encoder,xCtb,yCtb+change,depth+1,edge); /* x,y+1 */
}
if((!border_x && !border_y) || (border_split_x && border_split_y) )
{
filter_deblock_CU(encoder,xCtb+change,yCtb+change,depth+1,edge); /* x+1,y+1 */
filter_deblock_cu(encoder,xCtb+change,yCtb+change,depth+1,edge); /* x+1,y+1 */
}
return;
}
@ -311,7 +311,7 @@ void filter_deblock(encoder_control* encoder)
{
for(xCtb = 0; xCtb < encoder->in.width_in_lcu; xCtb++)
{
filter_deblock_CU(encoder, xCtb<<MAX_DEPTH, yCtb<<MAX_DEPTH, 0, EDGE_VER);
filter_deblock_cu(encoder, xCtb<<MAX_DEPTH, yCtb<<MAX_DEPTH, 0, EDGE_VER);
}
}
@ -320,7 +320,7 @@ void filter_deblock(encoder_control* encoder)
{
for(xCtb = 0; xCtb < encoder->in.width_in_lcu; xCtb++)
{
filter_deblock_CU(encoder, xCtb<<MAX_DEPTH, yCtb<<MAX_DEPTH, 0, EDGE_HOR);
filter_deblock_cu(encoder, xCtb<<MAX_DEPTH, yCtb<<MAX_DEPTH, 0, EDGE_HOR);
}
}

8
src/filter.h
View file

@ -22,12 +22,12 @@
#define EDGE_HOR 1
/* DEBLOCKING */
void filter_deblock_CU(encoder_control* encoder, int32_t xCtb, int32_t yCtb, int8_t depth, int32_t edge);
void filter_deblock_edge_luma(encoder_control* encoder, int32_t xpos, int32_t ypos, int8_t depth, int8_t dir);
void filter_deblock_cu(encoder_control* encoder, int32_t x_cu, int32_t y_cu, int8_t depth, int32_t edge);
void filter_deblock_edge_luma(encoder_control* encoder, int32_t x_pos, int32_t y_pos, int8_t depth, int8_t dir);
void filter_deblock_edge_chroma(encoder_control* encoder,int32_t xpos, int32_t ypos, int8_t depth, int8_t dir);
void filter_deblock(encoder_control* encoder);
void filter_deblock_luma( uint8_t* src, int32_t offset, int32_t tc , int8_t sw, int8_t part_P_nofilter, int8_t part_Q_nofilter, int32_t thr_cut, int8_t filter_second_P, int8_t filter_second_Q);
void filter_deblock_chroma( uint8_t* src, int32_t offset, int32_t tc ,int8_t part_P_nofilter, int8_t part_Q_nofilter);
void filter_deblock_luma( uint8_t* src, int32_t offset, int32_t tc , int8_t sw, int8_t part_p_nofilter, int8_t part_q_nofilter, int32_t thr_cut, int8_t filter_second_p, int8_t filter_second_q);
void filter_deblock_chroma( uint8_t* src, int32_t offset, int32_t tc ,int8_t part_p_nofilter, int8_t part_q_nofilter);
/* SAO */