Skip to content

Reuse local RDOQ rate costs and entropy flags #989

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
xiujunwang-dev wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Reuse local RDOQ rate costs and entropy flags #989

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 20 additions & 25 deletions source/common/quant.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,26 +46,22 @@ struct coeffGroupRDStats
int64_t sigCost0; /* cost of signaling sig coeff bit of coeff 0 */
};

inline int getICRate(uint32_t absLevel, int32_t diffLevel, const int* greaterOneBits, const int* levelAbsBits, const uint32_t absGoRice, const uint32_t maxVlc, const uint32_t c1c2Rate)
inline int getICRate(uint32_t absLevel, int32_t diffLevel, const int* greaterOneBits, int levelAbsBits, const uint32_t absGoRice, const uint32_t maxVlc, const uint32_t c1c2Rate)
{
X265_CHECK(absGoRice <= 4, "absGoRice check failure\n");
if (!absLevel)
{
X265_CHECK(diffLevel < 0, "diffLevel check failure\n");
return 0;
}
int rate = 0;

if (diffLevel < 0)
{
X265_CHECK(absLevel <= 2, "absLevel check failure\n");
rate += greaterOneBits[(absLevel == 2)];

if (absLevel == 2)
rate += levelAbsBits[0];
return absLevel == 2 ? greaterOneBits[1] + levelAbsBits : greaterOneBits[0];
}
else
{
int rate = 0;
uint32_t symbol = diffLevel;
bool expGolomb = (symbol > maxVlc);

Expand All @@ -90,8 +86,8 @@ inline int getICRate(uint32_t absLevel, int32_t diffLevel, const int* greaterOne

rate += numBins << 15;
rate += c1c2Rate;
return rate;
}
return rate;
}

#if CHECKED_BUILD || _DEBUG
Expand Down Expand Up @@ -130,18 +126,15 @@ inline int getICRateLessVlc(uint32_t absLevel, int32_t diffLevel, const uint32_t
}

/* Calculates the cost for specific absolute transform level */
inline uint32_t getICRateCost(uint32_t absLevel, int32_t diffLevel, const int* greaterOneBits, const int* levelAbsBits, uint32_t absGoRice, const uint32_t c1c2Rate)
inline uint32_t getICRateCost(uint32_t absLevel, int32_t diffLevel, const int* greaterOneBits, int levelAbsBits, uint32_t absGoRice, const uint32_t c1c2Rate)
{
X265_CHECK(absLevel, "absLevel should not be zero\n");

if (diffLevel < 0)
{
X265_CHECK((absLevel == 1) || (absLevel == 2), "absLevel range check failure\n");

uint32_t rate = greaterOneBits[(absLevel == 2)];
if (absLevel == 2)
rate += levelAbsBits[0];
return rate;
return absLevel == 2 ? greaterOneBits[1] + levelAbsBits : greaterOneBits[0];
}
else
{
Expand Down Expand Up @@ -767,10 +760,11 @@ uint32_t Quant::rdoQuant(const CUData &cu, int16_t *dstCoeff, TextType ttype, ui
uint32_t c1Idx = 0;
uint32_t c2Idx = 0;
/* iterate over coefficients in each group in reverse scan order */
const int lastScanPosinCG = X265_MIN(lastScanPos - (cgScanPos << MLS_CG_SIZE), (int)cgSize - 1);
const uint32_t scanPosBase = cgScanPos << MLS_CG_SIZE;
const int lastScanPosinCG = X265_MIN(lastScanPos - (int)scanPosBase, (int)cgSize - 1);
for (int scanPosinCG = lastScanPosinCG; scanPosinCG >= 0; scanPosinCG--)
{
scanPos = (cgScanPos << MLS_CG_SIZE) + scanPosinCG;
scanPos = scanPosBase + scanPosinCG;
uint32_t blkPos = scan[scanPos];
uint32_t maxAbsLevel = dstCoeff[blkPos]; /* abs(quantized coeff) */
int signCoef = m_resiDctCoeff[blkPos]; /* pre-quantization DCT coeff */
Expand Down Expand Up @@ -835,7 +829,7 @@ uint32_t Quant::rdoQuant(const CUData &cu, int16_t *dstCoeff, TextType ttype, ui
if (maxAbsLevel == 1)
{
uint32_t levelBits = (c1c2idx & 1) ? greaterOneBits[0] + IEP_RATE : ((1 + goRiceParam) << 15) + IEP_RATE;
X265_CHECK(levelBits == getICRateCost(1, 1 - baseLevel, greaterOneBits, levelAbsBits, goRiceParam, c1c2Rate) + IEP_RATE, "levelBits mistake\n");
X265_CHECK(levelBits == getICRateCost(1, 1 - baseLevel, greaterOneBits, levelAbsBits[0], goRiceParam, c1c2Rate) + IEP_RATE, "levelBits mistake\n");

int unquantAbsLevel = unQuantLevel >> unquantShift;
X265_CHECK(UNQUANT(1) == unquantAbsLevel, "DQuant check failed\n");
Expand All @@ -858,8 +852,8 @@ uint32_t Quant::rdoQuant(const CUData &cu, int16_t *dstCoeff, TextType ttype, ui
}
else if (maxAbsLevel)
{
uint32_t levelBits0 = getICRateCost(maxAbsLevel, maxAbsLevel - baseLevel, greaterOneBits, levelAbsBits, goRiceParam, c1c2Rate) + IEP_RATE;
uint32_t levelBits1 = getICRateCost(maxAbsLevel - 1, maxAbsLevel - 1 - baseLevel, greaterOneBits, levelAbsBits, goRiceParam, c1c2Rate) + IEP_RATE;
uint32_t levelBits0 = getICRateCost(maxAbsLevel, maxAbsLevel - baseLevel, greaterOneBits, levelAbsBits[0], goRiceParam, c1c2Rate) + IEP_RATE;
uint32_t levelBits1 = getICRateCost(maxAbsLevel - 1, maxAbsLevel - 1 - baseLevel, greaterOneBits, levelAbsBits[0], goRiceParam, c1c2Rate) + IEP_RATE;

const uint32_t preDQuantLevelDiff = (unquantScale[blkPos] << per);

Expand Down Expand Up @@ -934,9 +928,9 @@ uint32_t Quant::rdoQuant(const CUData &cu, int16_t *dstCoeff, TextType ttype, ui
}
else
{
rate1 = getICRate(level + 0, diff0 + 1, greaterOneBits, levelAbsBits, goRiceParam, maxVlc, c1c2Rate);
rate2 = getICRate(level + 1, diff0 + 2, greaterOneBits, levelAbsBits, goRiceParam, maxVlc, c1c2Rate);
rate0 = getICRate(level - 1, diff0 + 0, greaterOneBits, levelAbsBits, goRiceParam, maxVlc, c1c2Rate);
rate1 = getICRate(level + 0, diff0 + 1, greaterOneBits, levelAbsBits[0], goRiceParam, maxVlc, c1c2Rate);
rate2 = getICRate(level + 1, diff0 + 2, greaterOneBits, levelAbsBits[0], goRiceParam, maxVlc, c1c2Rate);
rate0 = getICRate(level - 1, diff0 + 0, greaterOneBits, levelAbsBits[0], goRiceParam, maxVlc, c1c2Rate);
}
rateIncUp[blkPos] = rate2 - rate1;
rateIncDown[blkPos] = rate0 - rate1;
Expand Down Expand Up @@ -979,7 +973,7 @@ uint32_t Quant::rdoQuant(const CUData &cu, int16_t *dstCoeff, TextType ttype, ui
cgRdStats.sigCost += costSig[scanPos];
} /* end for (scanPosinCG) */

X265_CHECK((cgScanPos << MLS_CG_SIZE) == (int)scanPos, "scanPos mistake\n");
X265_CHECK(scanPosBase == scanPos, "scanPos mistake\n");
cgRdStats.sigCost0 = costSig[scanPos];

/* nothing to do at this case */
Expand All @@ -1005,7 +999,8 @@ uint32_t Quant::rdoQuant(const CUData &cu, int16_t *dstCoeff, TextType ttype, ui

uint32_t sigCtx = getSigCoeffGroupCtxInc(sigCoeffGroupFlag64, cgPosX, cgPosY, cgBlkPos, cgStride);

int64_t costZeroCG = totalRdCost + SIGCOST(estBitsSbac.significantCoeffGroupBits[sigCtx][0]);
const int64_t sigCost0 = SIGCOST(estBitsSbac.significantCoeffGroupBits[sigCtx][0]);
int64_t costZeroCG = totalRdCost + sigCost0;
costZeroCG += cgRdStats.uncodedDist; /* add distortion for resetting non-zero levels to zero levels */
costZeroCG -= cgRdStats.codedLevelAndDist; /* remove distortion and level cost of coded coefficients */
costZeroCG -= cgRdStats.sigCost; /* remove signaling cost of significant coeff bitmap */
Expand All @@ -1017,10 +1012,10 @@ uint32_t Quant::rdoQuant(const CUData &cu, int16_t *dstCoeff, TextType ttype, ui
{
sigCoeffGroupFlag64 &= ~cgBlkPosMask;
totalRdCost = costZeroCG;
costCoeffGroupSig[cgScanPos] = SIGCOST(estBitsSbac.significantCoeffGroupBits[sigCtx][0]);
costCoeffGroupSig[cgScanPos] = sigCost0;

/* reset all coeffs to 0. UNCODE THIS COEFF GROUP! */
const uint32_t blkPos = scan[cgScanPos * cgSize];
const uint32_t blkPos = scan[scanPosBase];
memset(&dstCoeff[blkPos + 0 * trSize], 0, 4 * sizeof(*dstCoeff));
memset(&dstCoeff[blkPos + 1 * trSize], 0, 4 * sizeof(*dstCoeff));
memset(&dstCoeff[blkPos + 2 * trSize], 0, 4 * sizeof(*dstCoeff));
Expand Down
15 changes: 8 additions & 7 deletions source/encoder/entropy.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1377,17 +1377,17 @@ void Entropy::encodeTransform(const CUData& cu, uint32_t absPartIdx, uint32_t cu
}

uint32_t absPartIdxC = bSmallChroma ? absPartIdx & 0xFC : absPartIdx;
uint32_t cbfY = cu.getCbf(absPartIdx, TEXT_LUMA, curDepth);
uint32_t cbfU = cu.getCbf(absPartIdxC, TEXT_CHROMA_U, curDepth);
uint32_t cbfV = cu.getCbf(absPartIdxC, TEXT_CHROMA_V, curDepth);

if (cu.isInter(absPartIdxC) && !curDepth && !cu.getCbf(absPartIdxC, TEXT_CHROMA_U, 0) && !cu.getCbf(absPartIdxC, TEXT_CHROMA_V, 0))
if (cu.isInter(absPartIdxC) && !curDepth && !cbfU && !cbfV)
{
X265_CHECK(cu.getCbf(absPartIdxC, TEXT_LUMA, 0), "CBF should have been set\n");
}
else
codeQtCbfLuma(cu.getCbf(absPartIdx, TEXT_LUMA, curDepth), curDepth);
codeQtCbfLuma(cbfY, curDepth);

uint32_t cbfY = cu.getCbf(absPartIdx, TEXT_LUMA, curDepth);
uint32_t cbfU = cu.getCbf(absPartIdxC, TEXT_CHROMA_U, curDepth);
uint32_t cbfV = cu.getCbf(absPartIdxC, TEXT_CHROMA_V, curDepth);
if (!(cbfY || cbfU || cbfV))
return;

Expand Down Expand Up @@ -1601,9 +1601,10 @@ void Entropy::codeCoeff(const CUData& cu, uint32_t absPartIdx, bool& bCodeDQP, c
{
if (!cu.isIntra(absPartIdx))
{
bool rootCbf = cu.getQtRootCbf(absPartIdx);
if (!(cu.m_mergeFlag[absPartIdx] && cu.m_partSize[absPartIdx] == SIZE_2Nx2N))
codeQtRootCbf(cu.getQtRootCbf(absPartIdx));
if (!cu.getQtRootCbf(absPartIdx))
codeQtRootCbf(rootCbf);
if (!rootCbf)
return;
}

Expand Down
Loading