From 0a6c38a8e9dbccb142a0ff24b5c46068c7a4e74f Mon Sep 17 00:00:00 2001 From: Marko Viitanen Date: Wed, 18 Sep 2013 14:21:03 +0300 Subject: [PATCH] Refactor: context.h renaming --- src/context.c | 178 +++++++++++++++++++++++++------------------------- src/context.h | 66 +++++++++---------- src/encoder.c | 58 ++++++++-------- 3 files changed, 149 insertions(+), 153 deletions(-) diff --git a/src/context.c b/src/context.c index 0fb8f3af..fd2c8a83 100644 --- a/src/context.c +++ b/src/context.c @@ -20,129 +20,129 @@ /* CONTEXTS */ -cabac_ctx g_SplitFlagSCModel[3]; /*QP, INIT_MERGE_FLAG_EXT[SLICE][0]); - ctx_init(&g_cCUMergeIdxExtSCModel, encoder->QP, INIT_MERGE_IDX_EXT[SLICE][0]); - ctx_init(&g_cCUPredModeSCModel, encoder->QP, INIT_PRED_MODE[SLICE][0]); + ctx_init(&g_cu_merge_flag_ext_model, encoder->QP, INIT_MERGE_FLAG_EXT[slice][0]); + ctx_init(&g_cu_merge_idx_ext_model, encoder->QP, INIT_MERGE_IDX_EXT[slice][0]); + ctx_init(&g_cu_pred_mode_model, encoder->QP, INIT_PRED_MODE[slice][0]); - ctx_init(&g_cCUSkipFlagSCModel[0], encoder->QP, INIT_SKIP_FLAG[SLICE][0]); - ctx_init(&g_cCUSkipFlagSCModel[1], encoder->QP, INIT_SKIP_FLAG[SLICE][1]); - ctx_init(&g_cCUSkipFlagSCModel[2], encoder->QP, INIT_SKIP_FLAG[SLICE][2]); + ctx_init(&g_cu_skip_flag_model[0], encoder->QP, INIT_SKIP_FLAG[slice][0]); + ctx_init(&g_cu_skip_flag_model[1], encoder->QP, INIT_SKIP_FLAG[slice][1]); + ctx_init(&g_cu_skip_flag_model[2], encoder->QP, INIT_SKIP_FLAG[slice][2]); - ctx_init(&g_SplitFlagSCModel[0], encoder->QP, INIT_SPLIT_FLAG[SLICE][0]); - ctx_init(&g_SplitFlagSCModel[1], encoder->QP, INIT_SPLIT_FLAG[SLICE][1]); - ctx_init(&g_SplitFlagSCModel[2], encoder->QP, INIT_SPLIT_FLAG[SLICE][2]); + ctx_init(&g_split_flag_model[0], encoder->QP, INIT_SPLIT_FLAG[slice][0]); + ctx_init(&g_split_flag_model[1], encoder->QP, INIT_SPLIT_FLAG[slice][1]); + ctx_init(&g_split_flag_model[2], encoder->QP, INIT_SPLIT_FLAG[slice][2]); - ctx_init(&g_IntraModeSCModel, encoder->QP, INIT_INTRA_PRED_MODE[SLICE]); + ctx_init(&g_intra_mode_model, encoder->QP, INIT_INTRA_PRED_MODE[slice]); - ctx_init(&g_ChromaPredSCModel[0], encoder->QP, INIT_CHROMA_PRED_MODE[SLICE][0]); - ctx_init(&g_ChromaPredSCModel[1], encoder->QP, INIT_CHROMA_PRED_MODE[SLICE][1]); + ctx_init(&g_chroma_pred_model[0], encoder->QP, INIT_CHROMA_PRED_MODE[slice][0]); + ctx_init(&g_chroma_pred_model[1], encoder->QP, INIT_CHROMA_PRED_MODE[slice][1]); - ctx_init(&g_cCUAbsSCModel_chroma[0], encoder->QP, INIT_ABS_FLAG[SLICE][4]); - ctx_init(&g_cCUAbsSCModel_chroma[1], encoder->QP, INIT_ABS_FLAG[SLICE][5]); + ctx_init(&g_cu_abs_model_chroma[0], encoder->QP, INIT_ABS_FLAG[slice][4]); + ctx_init(&g_cu_abs_model_chroma[1], encoder->QP, INIT_ABS_FLAG[slice][5]); //TODO: ignore P/B contexts on intra frame - ctx_init(&g_cCUQtRootCbfSCModel, encoder->QP, INIT_QT_ROOT_CBF[SLICE][0]); + ctx_init(&g_cu_qt_root_cbf_model, encoder->QP, INIT_QT_ROOT_CBF[slice][0]); - ctx_init(&g_cCUMvdSCModel[0], encoder->QP, INIT_MVD[SLICE][0]); - ctx_init(&g_cCUMvdSCModel[1], encoder->QP, INIT_MVD[SLICE][1]); - ctx_init(&g_cCURefPicSCModel[0], encoder->QP, INIT_REF_PIC[SLICE][0]); - ctx_init(&g_cCURefPicSCModel[1], encoder->QP, INIT_REF_PIC[SLICE][1]); - ctx_init(&g_cMVPIdxSCModel[0], encoder->QP, INIT_MVP_IDX[SLICE][0]); - ctx_init(&g_cMVPIdxSCModel[1], encoder->QP, INIT_MVP_IDX[SLICE][1]); + ctx_init(&g_cu_mvd_model[0], encoder->QP, INIT_MVD[slice][0]); + ctx_init(&g_cu_mvd_model[1], encoder->QP, INIT_MVD[slice][1]); + ctx_init(&g_cu_ref_pic_model[0], encoder->QP, INIT_REF_PIC[slice][0]); + ctx_init(&g_cu_ref_pic_model[1], encoder->QP, INIT_REF_PIC[slice][1]); + ctx_init(&g_mvp_idx_model[0], encoder->QP, INIT_MVP_IDX[slice][0]); + ctx_init(&g_mvp_idx_model[1], encoder->QP, INIT_MVP_IDX[slice][1]); for(i = 0; i < 4; i++) { - ctx_init(&g_CUSigCoeffGroupSCModel[i], encoder->QP, INIT_SIG_CG_FLAG[SLICE][i]); - ctx_init(&g_cCUAbsSCModel_luma[i], encoder->QP, INIT_ABS_FLAG[SLICE][i]); - ctx_init(&g_PartSizeSCModel[i], encoder->QP, INIT_PART_SIZE[SLICE][i]); + ctx_init(&g_cu_sig_coeff_group_model[i], encoder->QP, INIT_SIG_CG_FLAG[slice][i]); + ctx_init(&g_cu_abs_model_luma[i], encoder->QP, INIT_ABS_FLAG[slice][i]); + ctx_init(&g_part_size_model[i], encoder->QP, INIT_PART_SIZE[slice][i]); } for(i = 0; i < 3; i++) { - ctx_init(&g_TransSubdivSCModel[i], encoder->QP, INIT_TRANS_SUBDIV_FLAG[SLICE][i]); - ctx_init(&g_QtCbfSCModelY[i], encoder->QP, INIT_QT_CBF[SLICE][i]); - ctx_init(&g_QtCbfSCModelU[i], encoder->QP, INIT_QT_CBF[SLICE][i+3]); + ctx_init(&g_trans_subdiv_model[i], encoder->QP, INIT_TRANS_SUBDIV_FLAG[slice][i]); + ctx_init(&g_qt_cbf_model_luma[i], encoder->QP, INIT_QT_CBF[slice][i]); + ctx_init(&g_qt_cbf_model_chroma[i], encoder->QP, INIT_QT_CBF[slice][i+3]); //cxt_init(&g_QtCbfSCModelV[i], encoder->QP, INIT_QT_CBF[SLICE][i]); } for(i = 0; i < 8; i++) { - ctx_init(&g_CUOneSCModel_chroma[i], encoder->QP, INIT_ONE_FLAG[SLICE][i+16]); + ctx_init(&g_cu_one_model_chroma[i], encoder->QP, INIT_ONE_FLAG[slice][i+16]); } for(i = 0; i < 15; i++) { - ctx_init(&g_CuCtxLastY_luma[i], encoder->QP, INIT_LAST[SLICE][i] ); - ctx_init(&g_CuCtxLastX_luma[i], encoder->QP, INIT_LAST[SLICE][i] ); + ctx_init(&g_cu_ctx_last_y_luma[i], encoder->QP, INIT_LAST[slice][i] ); + ctx_init(&g_cu_ctx_last_x_luma[i], encoder->QP, INIT_LAST[slice][i] ); - ctx_init(&g_CuCtxLastY_chroma[i], encoder->QP, INIT_LAST[SLICE][i+15] ); - ctx_init(&g_CuCtxLastX_chroma[i], encoder->QP, INIT_LAST[SLICE][i+15] ); + ctx_init(&g_cu_ctx_last_y_chroma[i], encoder->QP, INIT_LAST[slice][i+15] ); + ctx_init(&g_cu_ctx_last_x_chroma[i], encoder->QP, INIT_LAST[slice][i+15] ); - ctx_init(&g_CUOneSCModel_luma[i], encoder->QP, INIT_ONE_FLAG[SLICE][i]); + ctx_init(&g_cu_one_model_luma[i], encoder->QP, INIT_ONE_FLAG[slice][i]); } - ctx_init(&g_CUOneSCModel_luma[15], encoder->QP, INIT_ONE_FLAG[SLICE][15]); + ctx_init(&g_cu_one_model_luma[15], encoder->QP, INIT_ONE_FLAG[slice][15]); for(i = 0; i < 27; i++) { - ctx_init(&g_CUSigSCModel_luma[i], encoder->QP, INIT_SIG_FLAG[SLICE][i]); + ctx_init(&g_cu_sig_model_luma[i], encoder->QP, INIT_SIG_FLAG[slice][i]); if(i < 15) { - ctx_init(&g_CUSigSCModel_chroma[i], encoder->QP, INIT_SIG_FLAG[SLICE][i+27]); + ctx_init(&g_cu_sig_model_chroma[i], encoder->QP, INIT_SIG_FLAG[slice][i+27]); } } } -uint32_t context_get_sigCoeffGroup( uint32_t* uiSigCoeffGroupFlag, - uint32_t uiCGPosX, - uint32_t uiCGPosY, +uint32_t context_get_sig_coeff_group( uint32_t* sig_coeff_group_flag, + uint32_t pos_x, + uint32_t pos_y, int32_t width) { uint32_t uiRight = 0; uint32_t uiLower = 0; width >>= 2; - if( uiCGPosX < (uint32_t)width - 1 ) - uiRight = (uiSigCoeffGroupFlag[ uiCGPosY * width + uiCGPosX + 1 ] != 0); + if( pos_x < (uint32_t)width - 1 ) + uiRight = (sig_coeff_group_flag[ pos_y * width + pos_x + 1 ] != 0); - if (uiCGPosY < (uint32_t)width - 1 ) - uiLower = (uiSigCoeffGroupFlag[ (uiCGPosY + 1 ) * width + uiCGPosX ] != 0); + if (pos_y < (uint32_t)width - 1 ) + uiLower = (sig_coeff_group_flag[ (pos_y + 1 ) * width + pos_x ] != 0); return (uiRight || uiLower); } @@ -158,7 +158,7 @@ uint32_t context_get_sigCoeffGroup( uint32_t* uiSigCoeffGroupFlag, \returns pattern for current coefficient group */ -int32_t context_calcPatternSigCtx( const uint32_t* sigCoeffGroupFlag, uint32_t posXCG, uint32_t posYCG, int32_t width) +int32_t context_calc_pattern_sig_ctx( const uint32_t* sig_coeff_group_flag, uint32_t pos_x, uint32_t pos_y, int32_t width) { if( width == 4) return -1; @@ -166,13 +166,13 @@ int32_t context_calcPatternSigCtx( const uint32_t* sigCoeffGroupFlag, uint32_t uint32_t sigRight = 0; uint32_t sigLower = 0; width >>= 2; - if( posXCG < (uint32_t)width - 1 ) + if( pos_x < (uint32_t)width - 1 ) { - sigRight = (sigCoeffGroupFlag[ posYCG * width + posXCG + 1 ] != 0); + sigRight = (sig_coeff_group_flag[ pos_y * width + pos_x + 1 ] != 0); } - if (posYCG < (uint32_t)width - 1 ) + if (pos_y < (uint32_t)width - 1 ) { - sigLower = (sigCoeffGroupFlag[ (posYCG + 1 ) * width + posXCG ] != 0); + sigLower = (sig_coeff_group_flag[ (pos_y + 1 ) * width + pos_x ] != 0); } return sigRight + (sigLower<<1); @@ -191,11 +191,11 @@ int32_t context_calcPatternSigCtx( const uint32_t* sigCoeffGroupFlag, uint32_t \returns ctxInc for current scan position */ -int32_t context_getSigCtxInc(int32_t patternSigCtx,uint32_t scanIdx,int32_t posX, - int32_t posY,int32_t blockType,int32_t width, - int8_t textureType) +int32_t context_get_sig_ctx_inc(int32_t pattern_sig_ctx,uint32_t scan_idx,int32_t pos_x, + int32_t pos_y,int32_t block_type,int32_t width, + int8_t texture_type) { - const int32_t ctxIndMap[16] = + const int32_t ctx_ind_map[16] = { 0, 1, 4, 5, 2, 3, 4, 5, @@ -203,27 +203,27 @@ int32_t context_getSigCtxInc(int32_t patternSigCtx,uint32_t scanIdx,int32_t posX 7, 7, 8, 8 }; - if( posX + posY == 0 ) + if( pos_x + pos_y == 0 ) return 0; - if ( blockType == 2 ) - return ctxIndMap[ 4 * posY + posX ]; + if ( block_type == 2 ) + return ctx_ind_map[ 4 * pos_y + pos_x ]; { int32_t cnt = 0; - int32_t offset = blockType == 3 ? (scanIdx==SCAN_DIAG ? 9 : 15) : (textureType == 0 ? 21 : 12); - int32_t posXinSubset = posX-((posX>>2)<<2); - int32_t posYinSubset = posY-((posY>>2)<<2); + int32_t offset = block_type == 3 ? (scan_idx==SCAN_DIAG ? 9 : 15) : (texture_type == 0 ? 21 : 12); + int32_t posXinSubset = pos_x-((pos_x>>2)<<2); + int32_t posYinSubset = pos_y-((pos_y>>2)<<2); - if(patternSigCtx==0) + if(pattern_sig_ctx==0) { cnt = posXinSubset+posYinSubset<=2 ? (posXinSubset+posYinSubset==0 ? 2 : 1) : 0; } - else if(patternSigCtx==1) + else if(pattern_sig_ctx==1) { cnt = posYinSubset<=1 ? (posYinSubset==0 ? 2 : 1) : 0; } - else if(patternSigCtx==2) + else if(pattern_sig_ctx==2) { cnt = posXinSubset<=1 ? (posXinSubset==0 ? 2 : 1) : 0; } @@ -231,7 +231,7 @@ int32_t context_getSigCtxInc(int32_t patternSigCtx,uint32_t scanIdx,int32_t posX { cnt = 2; } - return (( textureType == 0 && ((posX>>2) + (posY>>2)) > 0 ) ? 3 : 0) + offset + cnt; + return (( texture_type == 0 && ((pos_x>>2) + (pos_y>>2)) > 0 ) ? 3 : 0) + offset + cnt; } } diff --git a/src/context.h b/src/context.h index b068d1fe..9e80d72c 100644 --- a/src/context.h +++ b/src/context.h @@ -18,46 +18,42 @@ #include "encoder.h" #include "cabac.h" +void init_contexts(encoder_control *encoder, int8_t slice); +int32_t context_calc_pattern_sig_ctx( const uint32_t* sig_coeff_group_flag, uint32_t pos_x, uint32_t pos_y, int32_t width); -void init_contexts(encoder_control *encoder, int8_t SLICE); +uint32_t context_get_sig_coeff_group( uint32_t* sig_coeff_group_flag,uint32_t pos_x, uint32_t pos_y,int32_t width); -int32_t context_calcPatternSigCtx( const uint32_t* sigCoeffGroupFlag, uint32_t posXCG, uint32_t posYCG, int32_t width); - -uint32_t context_get_sigCoeffGroup( uint32_t* uiSigCoeffGroupFlag,uint32_t uiCGPosX, - uint32_t uiCGPosY,int32_t width); - -int32_t context_getSigCtxInc(int32_t patternSigCtx,uint32_t scanIdx,int32_t posX, - int32_t posY,int32_t blockType,int32_t width, - int8_t textureType); +int32_t context_get_sig_ctx_inc(int32_t pattern_sig_ctx,uint32_t scan_idx,int32_t pos_x, + int32_t pos_y,int32_t block_type,int32_t width, int8_t texture_type); /* CONTEXTS */ -extern cabac_ctx g_SplitFlagSCModel[3]; -extern cabac_ctx g_IntraModeSCModel; -extern cabac_ctx g_ChromaPredSCModel[2]; -extern cabac_ctx g_TransSubdivSCModel[3]; -extern cabac_ctx g_QtCbfSCModelY[3]; -extern cabac_ctx g_QtCbfSCModelU[3]; -extern cabac_ctx g_PartSizeSCModel[4]; -extern cabac_ctx g_CUSigCoeffGroupSCModel[4]; -extern cabac_ctx g_CUSigSCModel_luma[27]; -extern cabac_ctx g_CUSigSCModel_chroma[15]; -extern cabac_ctx g_CuCtxLastY_luma[15]; -extern cabac_ctx g_CuCtxLastY_chroma[15]; -extern cabac_ctx g_CuCtxLastX_luma[15]; -extern cabac_ctx g_CuCtxLastX_chroma[15]; -extern cabac_ctx g_CUOneSCModel_luma[16]; -extern cabac_ctx g_CUOneSCModel_chroma[8]; -extern cabac_ctx g_cCUAbsSCModel_luma[4]; -extern cabac_ctx g_cCUAbsSCModel_chroma[2]; -extern cabac_ctx g_cCUPredModeSCModel; -extern cabac_ctx g_cCUSkipFlagSCModel[3]; -extern cabac_ctx g_cCUMergeIdxExtSCModel; -extern cabac_ctx g_cCUMergeFlagExtSCModel; -extern cabac_ctx g_cCUMvdSCModel[2]; -extern cabac_ctx g_cCURefPicSCModel[2]; -extern cabac_ctx g_cMVPIdxSCModel[2]; -extern cabac_ctx g_cCUQtRootCbfSCModel; +extern cabac_ctx g_split_flag_model[3]; +extern cabac_ctx g_intra_mode_model; +extern cabac_ctx g_chroma_pred_model[2]; +extern cabac_ctx g_trans_subdiv_model[3]; +extern cabac_ctx g_qt_cbf_model_luma[3]; +extern cabac_ctx g_qt_cbf_model_chroma[3]; +extern cabac_ctx g_part_size_model[4]; +extern cabac_ctx g_cu_sig_coeff_group_model[4]; +extern cabac_ctx g_cu_sig_model_luma[27]; +extern cabac_ctx g_cu_sig_model_chroma[15]; +extern cabac_ctx g_cu_ctx_last_y_luma[15]; +extern cabac_ctx g_cu_ctx_last_y_chroma[15]; +extern cabac_ctx g_cu_ctx_last_x_luma[15]; +extern cabac_ctx g_cu_ctx_last_x_chroma[15]; +extern cabac_ctx g_cu_one_model_luma[16]; +extern cabac_ctx g_cu_one_model_chroma[8]; +extern cabac_ctx g_cu_abs_model_luma[4]; +extern cabac_ctx g_cu_abs_model_chroma[2]; +extern cabac_ctx g_cu_pred_mode_model; +extern cabac_ctx g_cu_skip_flag_model[3]; +extern cabac_ctx g_cu_merge_idx_ext_model; +extern cabac_ctx g_cu_merge_flag_ext_model; +extern cabac_ctx g_cu_mvd_model[2]; +extern cabac_ctx g_cu_ref_pic_model[2]; +extern cabac_ctx g_mvp_idx_model[2]; +extern cabac_ctx g_cu_qt_root_cbf_model; #define CNU 154 static const uint8_t diff --git a/src/encoder.c b/src/encoder.c index 6fc6bd21..75c7cfdd 100644 --- a/src/encoder.c +++ b/src/encoder.c @@ -850,7 +850,7 @@ void encode_coding_tree(encoder_control* encoder,uint16_t xCtb,uint16_t yCtb, ui { split_model++; } - cabac.ctx = &g_SplitFlagSCModel[split_model]; + cabac.ctx = &g_split_flag_model[split_model]; CABAC_BIN(&cabac, split_flag, "SplitFlag"); } if(split_flag || border) @@ -880,7 +880,7 @@ void encode_coding_tree(encoder_control* encoder,uint16_t xCtb,uint16_t yCtb, ui { int8_t uiCtxSkip = 0; /* uiCtxSkip = aboveskipped + leftskipped; */ - cabac.ctx = &g_cCUSkipFlagSCModel[uiCtxSkip]; + cabac.ctx = &g_cu_skip_flag_model[uiCtxSkip]; CABAC_BIN(&cabac, (cur_CU->type == CU_SKIP)?1:0, "SkipFlag"); } @@ -899,7 +899,7 @@ void encode_coding_tree(encoder_control* encoder,uint16_t xCtb,uint16_t yCtb, ui int32_t symbol = (ui == unaryIdx) ? 0 : 1; if ( ui==0 ) { - cabac.ctx = &g_cCUMergeIdxExtSCModel; + cabac.ctx = &g_cu_merge_idx_ext_model; CABAC_BIN(&cabac, symbol, "MergeIndex"); } else @@ -919,7 +919,7 @@ void encode_coding_tree(encoder_control* encoder,uint16_t xCtb,uint16_t yCtb, ui /* Prediction mode */ if(encoder->in.cur_pic->slicetype != SLICE_I) { - cabac.ctx = &g_cCUPredModeSCModel; + cabac.ctx = &g_cu_pred_mode_model; CABAC_BIN(&cabac, (cur_CU->type == CU_INTRA)?1:0, "PredMode"); } @@ -927,7 +927,7 @@ void encode_coding_tree(encoder_control* encoder,uint16_t xCtb,uint16_t yCtb, ui if(depth == MAX_DEPTH || cur_CU->type != CU_INTRA) { /* TODO: Handle inter sizes other than 2Nx2N */ - cabac.ctx = &g_PartSizeSCModel[0]; + cabac.ctx = &g_part_size_model[0]; CABAC_BIN(&cabac, 1, "PartSize"); /* TODO: add AMP modes */ } @@ -938,7 +938,7 @@ void encode_coding_tree(encoder_control* encoder,uint16_t xCtb,uint16_t yCtb, ui /* FOR each part */ /* Mergeflag */ uint8_t mergeFlag = 0; - cabac.ctx = &g_cCUMergeFlagExtSCModel; + cabac.ctx = &g_cu_merge_flag_ext_model; CABAC_BIN(&cabac, mergeFlag, "MergeFlag"); if(mergeFlag) //merge { @@ -953,7 +953,7 @@ void encode_coding_tree(encoder_control* encoder,uint16_t xCtb,uint16_t yCtb, ui int32_t symbol = (ui == unaryIdx) ? 0 : 1; if (ui == 0) { - cabac.ctx = &g_cCUMergeIdxExtSCModel; + cabac.ctx = &g_cu_merge_idx_ext_model; CABAC_BIN(&cabac, symbol, "MergeIndex"); } else @@ -1006,7 +1006,7 @@ void encode_coding_tree(encoder_control* encoder,uint16_t xCtb,uint16_t yCtb, ui /* parseRefFrmIdx */ int32_t iRefFrame = cur_CU->inter.mv_ref; - cabac.ctx = &g_cCURefPicSCModel[0]; + cabac.ctx = &g_cu_ref_pic_model[0]; CABAC_BIN(&cabac, (iRefFrame==0)?0:1, "ref_frame_flag"); if(iRefFrame > 0) @@ -1014,7 +1014,7 @@ void encode_coding_tree(encoder_control* encoder,uint16_t xCtb,uint16_t yCtb, ui uint32_t ui; uint32_t uiRefNum = encoder->ref_idx_num[uiRefListIdx]-2; - cabac.ctx = &g_cCURefPicSCModel[1]; + cabac.ctx = &g_cu_ref_pic_model[1]; iRefFrame--; for(ui = 0; ui < uiRefNum; ++ui) { @@ -1058,12 +1058,12 @@ void encode_coding_tree(encoder_control* encoder,uint16_t xCtb,uint16_t yCtb, ui const int8_t bVerAbsGr0 = mvd_ver != 0; const uint32_t mvd_hor_abs = abs(mvd_hor); const uint32_t mvd_ver_abs = abs(mvd_ver); - - cabac.ctx = &g_cCUMvdSCModel[0]; + + cabac.ctx = &g_cu_mvd_model[0]; CABAC_BIN(&cabac, (mvd_hor!=0)?1:0, "abs_mvd_greater0_flag_hor"); CABAC_BIN(&cabac, (mvd_ver!=0)?1:0, "abs_mvd_greater0_flag_ver"); - cabac.ctx = &g_cCUMvdSCModel[1]; + cabac.ctx = &g_cu_mvd_model[1]; if(bHorAbsGr0) { @@ -1100,12 +1100,12 @@ void encode_coding_tree(encoder_control* encoder,uint16_t xCtb,uint16_t yCtb, ui picture_setBlockCoded(encoder->in.cur_pic,xCtb, yCtb, depth, 1); } /* Signal which candidate MV to use */ - cabac_write_unary_max_symbol(&cabac,g_cMVPIdxSCModel, cur_CU->inter.mv_ref,1,AMVP_MAX_NUM_CANDS-1); + cabac_write_unary_max_symbol(&cabac,g_mvp_idx_model, cur_CU->inter.mv_ref,1,AMVP_MAX_NUM_CANDS-1); } } - } + } - cabac.ctx = &g_cCUQtRootCbfSCModel; + cabac.ctx = &g_cu_qt_root_cbf_model; CABAC_BIN(&cabac, 0, "rqt_root_cbf"); if(0) { @@ -1185,7 +1185,7 @@ void encode_coding_tree(encoder_control* encoder,uint16_t xCtb,uint16_t yCtb, ui } /* For each part { */ flag = (mpmPred==-1)?0:1; - cabac.ctx = &g_IntraModeSCModel; + cabac.ctx = &g_intra_mode_model; CABAC_BIN(&cabac,flag,"IntraPred"); /*} End for each part */ @@ -1228,7 +1228,7 @@ void encode_coding_tree(encoder_control* encoder,uint16_t xCtb,uint16_t yCtb, ui if(encoder->in.video_format != FORMAT_400) { /* Chroma intra prediction */ - cabac.ctx = &g_ChromaPredSCModel[0]; + cabac.ctx = &g_chroma_pred_model[0]; CABAC_BIN(&cabac,((intraPredModeChroma!=36)?1:0),"IntraPredChroma"); /* If not copied from luma, signal it */ @@ -1649,7 +1649,7 @@ void encode_transform_coeff(encoder_control* encoder,transform_info* ti,int8_t d if(depth != 0 && depth != MAX_DEPTH+1) { - cabac.ctx = &g_TransSubdivSCModel[5-((g_aucConvertToBit[LCU_WIDTH]+2)-depth)]; + cabac.ctx = &g_trans_subdiv_model[5-((g_aucConvertToBit[LCU_WIDTH]+2)-depth)]; CABAC_BIN(&cabac,split,"TransformSubdivFlag"); } @@ -1660,7 +1660,7 @@ void encode_transform_coeff(encoder_control* encoder,transform_info* ti,int8_t d { /* Non-zero chroma U Tcoeffs */ int8_t Cb_flag = (trDepth==0)?ti->cb_top[1]:((ti->cb[ti->idx]&0x2)?1:0); - cabac.ctx = &g_QtCbfSCModelU[trDepth]; + cabac.ctx = &g_qt_cbf_model_chroma[trDepth]; if(trDepth == 0 || ti->cb_top[1]) { CABAC_BIN(&cabac,Cb_flag,"cbf_chroma_u"); @@ -1687,7 +1687,7 @@ void encode_transform_coeff(encoder_control* encoder,transform_info* ti,int8_t d CbV = (ti->cb[ti->idx]&0x4)?1:0; /* Non-zero luma Tcoeffs */ - cabac.ctx = &g_QtCbfSCModelY[trDepth?0:1]; + cabac.ctx = &g_qt_cbf_model_luma[trDepth?0:1]; CABAC_BIN(&cabac,CbY,"cbf_luma"); { @@ -1771,8 +1771,8 @@ void encode_CoeffNxN(encoder_control* encoder,int16_t* coeff, uint8_t width, uin const uint32_t* scanCG = NULL; /* Init base contexts according to block type */ - cabac_ctx* baseCoeffGroupCtx = &g_CUSigCoeffGroupSCModel[type]; - cabac_ctx* baseCtx = (type==0) ? &g_CUSigSCModel_luma[0] :&g_CUSigSCModel_chroma[0]; + cabac_ctx* baseCoeffGroupCtx = &g_cu_sig_coeff_group_model[type]; + cabac_ctx* baseCtx = (type==0) ? &g_cu_sig_model_luma[0] :&g_cu_sig_model_chroma[0]; memset(sig_coeffgroup_flag,0,sizeof(uint32_t)*64); /* Count non-zero coeffs */ @@ -1847,14 +1847,14 @@ void encode_CoeffNxN(encoder_control* encoder,int16_t* coeff, uint8_t width, uin else { uint32_t uiSigCoeffGroup = (sig_coeffgroup_flag[ iCGBlkPos ] != 0); - uint32_t uiCtxSig = context_get_sigCoeffGroup(sig_coeffgroup_flag, iCGPosX, iCGPosY,width); + uint32_t uiCtxSig = context_get_sig_coeff_group(sig_coeffgroup_flag, iCGPosX, iCGPosY,width); cabac.ctx = &baseCoeffGroupCtx[ uiCtxSig ]; CABAC_BIN(&cabac,uiSigCoeffGroup,"significant_coeff_group"); } if( sig_coeffgroup_flag[ iCGBlkPos ] ) { - int32_t patternSigCtx = context_calcPatternSigCtx( sig_coeffgroup_flag, iCGPosX, iCGPosY, width); + int32_t patternSigCtx = context_calc_pattern_sig_ctx( sig_coeffgroup_flag, iCGPosX, iCGPosY, width); for( ; iScanPosSig >= iSubPos; iScanPosSig-- ) { uiBlkPos = scan[ iScanPosSig ]; @@ -1863,7 +1863,7 @@ void encode_CoeffNxN(encoder_control* encoder,int16_t* coeff, uint8_t width, uin uiSig = (coeff[ uiBlkPos ] != 0)?1:0; if( iScanPosSig > iSubPos || i == 0 || numNonZero ) { - uiCtxSig = context_getSigCtxInc( patternSigCtx, scanMode, uiPosX, uiPosY, uiLog2BlockSize, width, type ); + uiCtxSig = context_get_sig_ctx_inc( patternSigCtx, scanMode, uiPosX, uiPosY, uiLog2BlockSize, width, type ); cabac.ctx = &baseCtx[ uiCtxSig ]; CABAC_BIN(&cabac,uiSig,"significant_coeff_flag"); } @@ -1897,7 +1897,7 @@ void encode_CoeffNxN(encoder_control* encoder,int16_t* coeff, uint8_t width, uin } c1 = 1; - baseCtxMod = ( type==0 ) ? &g_CUOneSCModel_luma[4 * uiCtxSet] : &g_CUOneSCModel_chroma[4 * uiCtxSet]; + baseCtxMod = ( type==0 ) ? &g_cu_one_model_luma[4 * uiCtxSet] : &g_cu_one_model_chroma[4 * uiCtxSet]; numC1Flag = MIN(numNonZero, C1FLAG_NUMBER); firstC2FlagIdx = -1; for(idx = 0; idx < numC1Flag; idx++ ) @@ -1921,7 +1921,7 @@ void encode_CoeffNxN(encoder_control* encoder,int16_t* coeff, uint8_t width, uin if (c1 == 0) { - baseCtxMod = ( type==0 ) ? &g_cCUAbsSCModel_luma[uiCtxSet] : &g_cCUAbsSCModel_chroma[uiCtxSet]; + baseCtxMod = ( type==0 ) ? &g_cu_abs_model_luma[uiCtxSet] : &g_cu_abs_model_chroma[uiCtxSet]; if (firstC2FlagIdx != -1) { uint8_t symbol = (abs_coeff[ firstC2FlagIdx ] > 2)?1:0; @@ -1982,8 +1982,8 @@ void encode_lastSignificantXY(encoder_control* encoder,uint8_t lastpos_x, uint8_ int uiGroupIdxX; int uiGroupIdxY; int last_x,last_y,i; - cabac_ctx* basectxX = (type?g_CuCtxLastX_chroma:g_CuCtxLastX_luma); - cabac_ctx* basectxY = (type?g_CuCtxLastY_chroma:g_CuCtxLastY_luma); + cabac_ctx* basectxX = (type?g_cu_ctx_last_x_chroma:g_cu_ctx_last_x_luma); + cabac_ctx* basectxY = (type?g_cu_ctx_last_y_chroma:g_cu_ctx_last_y_luma); if( scan == SCAN_VER ) {