Commit 3fc33c6c authored by Muhammed Coban's avatar Muhammed Coban
Browse files

RDPCM RDOQ bug fix and variable name prefix cleanup.

parent 0a77c669
......@@ -1622,7 +1622,7 @@ void QuantRDOQ::forwardRDPCM( TransformUnit &tu, const ComponentID &compID, cons
const BinFracBits fracBitsPar = fracBits.getFracBitsArray(cctx.parityCtxIdAbsTS());
goRiceParam = cctx.templateAbsSumTS(scanPos, dstCoeff);
const BinFracBits fracBitsSign = fracBits.getFracBitsArray(Ctx::TsResidualSign(toChannelType(compID)));
const BinFracBits fracBitsSign = fracBits.getFracBitsArray(Ctx::TsResidualSign(1));
const uint8_t sign = srcCoeff[blkPos] - predCoeff < 0 ? 1 : 0;
DTRACE_COND((maxAbsLevel != 0), g_trace_ctx, D_RDOQ_MORE, " uiCtxSig=%d", ctxIdSig);
......@@ -1721,7 +1721,7 @@ void QuantRDOQ::forwardRDPCM( TransformUnit &tu, const ComponentID &compID, cons
{
int blkPos = cctx.blockPos(scanPos);
TCoeff level = dstCoeff[blkPos];
absSum += level;
absSum += abs(level);
}
}
......
......@@ -1180,13 +1180,13 @@ void IntraSearch::estIntraPredLumaQT( CodingUnit &cu, Partitioner &partitioner,
#if JVET_N0217_MATRIX_INTRAPRED
#if JVET_N0413_RDPCM
for (int uiMode = -2 * int(testBDPCM); uiMode < (int)uiRdModeList.size(); uiMode++)
for (int mode = -2 * int(testBDPCM); mode < (int)uiRdModeList.size(); mode++)
{
// set CU/PU to luma prediction mode
ModeInfo uiOrgMode;
if (testBDPCM && uiMode < 0)
if (testBDPCM && mode < 0)
{
cu.bdpcmMode = -uiMode;
cu.bdpcmMode = -mode;
unsigned mpm_pred[NUM_MOST_PROBABLE_MODES];
PU::getIntraMPMs(pu, mpm_pred);
......@@ -1199,7 +1199,7 @@ void IntraSearch::estIntraPredLumaQT( CodingUnit &cu, Partitioner &partitioner,
else
{
cu.bdpcmMode = 0;
uiOrgMode = uiRdModeList[uiMode];
uiOrgMode = uiRdModeList[mode];
#else
for (uint32_t uiMode = 0; uiMode < uiRdModeList.size(); uiMode++)
{
......@@ -1360,7 +1360,7 @@ void IntraSearch::estIntraPredLumaQT( CodingUnit &cu, Partitioner &partitioner,
if( !cu.ispMode && !cu.bdpcmMode && csBest->cost < bestCostNonBDPCM )
{
bestCostNonBDPCM = csBest->cost;
bestNormalIntraModeIndex = uiMode;
bestNormalIntraModeIndex = mode;
}
#endif
csTemp->releaseIntermediateData();
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment