hashirama/uvg266
1
0
Fork 0
mirror of https://github.com/ultravideo/uvg266.git synced 2024-11-23 18:14:06 +00:00
Code Issues Actions Projects Releases Wiki Activity

Context model bugfix

Browse source
This commit is contained in:
Marko Viitanen 2012-06-12 17:41:03 +03:00
parent 620541a7fc
commit 53f8d9f83a
2 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/encoder.c
View file

@ -255,9 +255,9 @@ cabac_ctx g_SplitFlagSCModel[3]; /*<! \brief split flag context models */
cabac_ctx g_IntraModeSCModel; /*<! \brief intra mode context models */ cabac_ctx g_IntraModeSCModel; /*<! \brief intra mode context models */
cabac_ctx g_ChromaPredSCModel[2]; cabac_ctx g_ChromaPredSCModel[2];
cabac_ctx g_TransSubdivSCModel[4]; /*<! \brief intra mode context models */ cabac_ctx g_TransSubdivSCModel[4]; /*<! \brief intra mode context models */
cabac_ctx g_QtCbfSCModelY[5]; cabac_ctx g_QtCbfSCModelY[3];
cabac_ctx g_QtCbfSCModelU[5]; cabac_ctx g_QtCbfSCModelU[3];
cabac_ctx g_QtCbfSCModelV[5]; //cabac_ctx g_QtCbfSCModelV[3];
cabac_ctx g_PartSizeSCModel; cabac_ctx g_PartSizeSCModel;
cabac_ctx g_CUSigCoeffGroupSCModel[4]; cabac_ctx g_CUSigCoeffGroupSCModel[4];
cabac_ctx g_CUSigSCModel[45]; cabac_ctx g_CUSigSCModel[45];
@ -282,11 +282,11 @@ void encode_slice_data(encoder_control* encoder)
cxt_init(&g_TransSubdivSCModel[i], encoder->QP, INIT_TRANS_SUBDIV_FLAG[SLICE_I][i]); cxt_init(&g_TransSubdivSCModel[i], encoder->QP, INIT_TRANS_SUBDIV_FLAG[SLICE_I][i]);
cxt_init(&g_CUSigCoeffGroupSCModel[i], encoder->QP, INIT_SIG_CG_FLAG[SLICE_I][i]); cxt_init(&g_CUSigCoeffGroupSCModel[i], encoder->QP, INIT_SIG_CG_FLAG[SLICE_I][i]);
} }
for(i = 0; i < 5; i++) for(i = 0; i < 3; i++)
{ {
cxt_init(&g_QtCbfSCModelY[i], encoder->QP, INIT_QT_CBF[SLICE_I][i+5]); cxt_init(&g_QtCbfSCModelY[i], encoder->QP, INIT_QT_CBF[SLICE_I][i]);
cxt_init(&g_QtCbfSCModelU[i], encoder->QP, INIT_QT_CBF[SLICE_I][i+5]); cxt_init(&g_QtCbfSCModelU[i], encoder->QP, INIT_QT_CBF[SLICE_I][i+3]);
cxt_init(&g_QtCbfSCModelV[i], encoder->QP, INIT_QT_CBF[SLICE_I][i]); //cxt_init(&g_QtCbfSCModelV[i], encoder->QP, INIT_QT_CBF[SLICE_I][i]);
} }
for(i = 0; i < 45; i++) for(i = 0; i < 45; i++)
{ {

8
src/encoder.h
View file

@ -80,11 +80,11 @@ static const uint8_t INIT_TRANS_SUBDIV_FLAG[3][4] =
{ CNU, 224, 167, 122 } { CNU, 224, 167, 122 }
}; };
static const uint8_t INIT_QT_CBF[3][10] = static const uint8_t INIT_QT_CBF[3][6] =
{ {
{ 153, 111, CNU, CNU, CNU, 149, 92, 167, CNU, CNU }, { 153, 111, CNU, 149, 92, 167 },
{ 153, 111, CNU, CNU, CNU, 149, 107, 167, CNU, CNU }, { 153, 111, CNU, 149, 107, 167 },
{ 111, 141, CNU, CNU, CNU, 94, 138, 182, CNU, CNU } { 111, 141, CNU, 94, 138, 182 }
}; };
static const uint8_t INIT_SIG_CG_FLAG[3][4] = static const uint8_t INIT_SIG_CG_FLAG[3][4] =