From c497a38a5fd5d5e60257113c9acbad744e2769c2 Mon Sep 17 00:00:00 2001 From: "Christian R. Helmrich" Date: Tue, 10 Mar 2020 00:00:53 +0100 Subject: [PATCH] revert some changes --- src/lib/quantization.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/lib/quantization.cpp b/src/lib/quantization.cpp index 6391553..f28514c 100644 --- a/src/lib/quantization.cpp +++ b/src/lib/quantization.cpp @@ -808,6 +808,7 @@ unsigned SfbQuantizer::quantizeSpecRDOC (EntropyCoder& entropyCoder, uint8_t* co uint8_t* const tempQuant = &m_coeffTemp[sfbStart - grpStart]; bool maxSnrReached = false; + if (refQuantDist < 0.0) memset (tempQuant, 0, sfbWidth * sizeof (uint8_t)); #if EC_TRAIN else refGrpDist += refQuantDist; #endif @@ -853,7 +854,7 @@ unsigned SfbQuantizer::quantizeSpecRDOC (EntropyCoder& entropyCoder, uint8_t* co currDist = getQuantDist (coeffMagn, sfBest, tempQuant, sfbWidth) * refQuantNorm; } } - // if (currDist < 0.0) memset (tempQuant, 0, sfbWidth * sizeof (uint8_t)); + if (currDist < 0.0) memset (tempQuant, 0, sfbWidth * sizeof (uint8_t)); m_quantInSf[sfb][is] = sfCurr; // store initial scale fac } else // is == 1, quant. & dist. computed with quantizeSfb() @@ -861,8 +862,6 @@ unsigned SfbQuantizer::quantizeSpecRDOC (EntropyCoder& entropyCoder, uint8_t* co numQCurr = refNumQ; } - if ((currDist < 0.0) || (numQCurr == 0)) mag = nullptr; // to accelerate getBitCount() - if (sfb == 0) // first SFB, having sfbStart - grpStart == 0 { entropyCoder.arithSetCodState (codStart); // group start