fenix/exhale
1
0
Fork 0
mirror of https://gitlab.com/ecodis/exhale.git synced 2025-02-03 00:47:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

add missing code

Browse Source
This commit is contained in:
Christian R. Helmrich 2020-02-28 20:00:39 +01:00
parent c5ce8708f7
commit c3f793aaeb
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/lib/quantization.cpp
View File

@ -694,8 +694,12 @@ uint8_t SfbQuantizer::quantizeSpecSfb (EntropyCoder& entropyCoder, const int32_t
numQCurr += getBitCount (entropyCoder, sfCurr, sfIndexPred, grpLength, &quantCoeffs[grpStart], sfbStart - grpStart, sfbWidth); numQCurr += getBitCount (entropyCoder, sfCurr, sfIndexPred, grpLength, &quantCoeffs[grpStart], sfbStart - grpStart, sfbWidth);
} }
// rate-distortion decision with empirical rate threshold // rate-distortion decision with empirical Lagrange value
#if EC_TRELLIS_OPT_CODING
if (distCurr + getLagrangeValue (m_rateIndex) * numQCurr < distBest + getLagrangeValue (m_rateIndex) * numQBest)
#else
if ((numQCurr <= numQBest + (distCurr >= distBest ? -1 : short (0.5 + distBest / __max (1.0, distCurr))))) if ((numQCurr <= numQBest + (distCurr >= distBest ? -1 : short (0.5 + distBest / __max (1.0, distCurr)))))
#endif
{ {
uint8_t* ptrTemp = ptrBest; uint8_t* ptrTemp = ptrBest;
@ -967,10 +971,11 @@ unsigned SfbQuantizer::quantizeSpecRDOC (EntropyCoder& entropyCoder, uint8_t* co
const uint16_t sfbStart = grpOffsets[sfb]; const uint16_t sfbStart = grpOffsets[sfb];
const uint16_t sfbWidth = grpOffsets[sfb + 1] - sfbStart; const uint16_t sfbWidth = grpOffsets[sfb + 1] - sfbStart;
if (inScaleFac[sfb] == UCHAR_MAX) // forced zero-quantized if ((inScaleFac[sfb] == UCHAR_MAX) || (sfIndexPred <= m_maxSfIndex && inScaleFac[sfb] + INDEX_OFFSET < sfIndexPred))
{ {
optimalSf[sfb] = sfIndexPred; memset (&quantCoeffs[sfbStart], 0, sfbWidth * sizeof (uint8_t)); // zero SFB output
memset (&quantCoeffs[sfbStart], 0, sfbWidth * sizeof (uint8_t));
optimalSf[sfb] = sfIndexPred - (inScaleFac[sfb] == UCHAR_MAX ? 0 : INDEX_OFFSET);
} }
else if (inScaleFac[sfb] != m_quantInSf[sfb][1]) // speedup else if (inScaleFac[sfb] != m_quantInSf[sfb][1]) // speedup
{ {