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

more TNS tuning

Browse Source
This commit is contained in:
Christian R. Helmrich 2020-05-20 01:00:00 +02:00
parent 417513811c
commit a89fb49e9c
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/lib/linearPrediction.cpp
View File

@ -274,7 +274,7 @@ uint8_t LinearPredictor::calcOptTnsCoeffs (short* const parCorCoeffs, int8_t* co
return 0; // LPC prediction gain is too low return 0; // LPC prediction gain is too low
} }
d = (7 << (LP_DEPTH - 1)) >> 3; d = (3 << (LP_DEPTH - 1)) >> 2;
if (i > d) // apply direct-form filter damping if (i > d) // apply direct-form filter damping
{ {

12
src/lib/stereoProcessing.cpp
View File

@ -264,7 +264,9 @@ unsigned StereoProcessor::applyPredJointStereo (int32_t* const mdctSpectrum1, in
const int32_t* mdstA = (alterPredDir ? &mdstSpectrum2[offEv] : &mdstSpectrum1[offEv]); const int32_t* mdstA = (alterPredDir ? &mdstSpectrum2[offEv] : &mdstSpectrum1[offEv]);
const int32_t* mdstB = (alterPredDir ? &mdstSpectrum1[offEv] : &mdstSpectrum2[offEv]); const int32_t* mdstB = (alterPredDir ? &mdstSpectrum1[offEv] : &mdstSpectrum2[offEv]);
int64_t sumPrdReAReB = 0, sumPrdReAReA = SP_EPS; // stabilizes the division below int64_t sumPrdReAReB = 0, sumPrdReAReA = SP_EPS; // stabilizes the division below
int64_t sumPrdImAReB = 0, sumPrdImAImA = SP_EPS; #if SP_MDST_PRED
int64_t sumPrdImAReB = 0;
#endif
double d, alphaLimit = 1.5; // max alpha_q magnitude double d, alphaLimit = 1.5; // max alpha_q magnitude
for (uint16_t s = width; s > 0; s--, mdctA++, mdctB++, mdstA++, mdstB++) for (uint16_t s = width; s > 0; s--, mdctA++, mdctB++, mdstA++, mdstB++)
@ -274,13 +276,15 @@ unsigned StereoProcessor::applyPredJointStereo (int32_t* const mdctSpectrum1, in
sumPrdReAReB += ((int64_t) *mdctA * (int64_t) *mdctB + SA_BW) >> (SA_BW_SHIFT + 1); sumPrdReAReB += ((int64_t) *mdctA * (int64_t) *mdctB + SA_BW) >> (SA_BW_SHIFT + 1);
sumPrdReAReA += prdReAReA; sumPrdReAReA += prdReAReA;
#if SP_MDST_PRED
sumPrdImAReB += ((int64_t) *mdstA * (int64_t) *mdctB + SA_BW) >> (SA_BW_SHIFT + 1); sumPrdImAReB += ((int64_t) *mdstA * (int64_t) *mdctB + SA_BW) >> (SA_BW_SHIFT + 1);
sumPrdImAImA += prdImAImA; #endif
// add complex conjugate part, increases stability // add complex conjugate part, increases stability
sumPrdReAReB += ((int64_t) *mdstA * (int64_t) *mdstB + SA_BW) >> (SA_BW_SHIFT + 1); sumPrdReAReB += ((int64_t) *mdstA * (int64_t) *mdstB + SA_BW) >> (SA_BW_SHIFT + 1);
sumPrdReAReA += prdImAImA; sumPrdReAReA += prdImAImA;
#if SP_MDST_PRED
sumPrdImAReB -= ((int64_t) *mdctA * (int64_t) *mdstB + SA_BW) >> (SA_BW_SHIFT + 1); sumPrdImAReB -= ((int64_t) *mdctA * (int64_t) *mdstB + SA_BW) >> (SA_BW_SHIFT + 1);
sumPrdImAImA += prdReAReA; #endif
} }
for (b = sfbIsOdd; b >= 0; b--) // limit alpha_q to prevent residual RMS increases for (b = sfbIsOdd; b >= 0; b--) // limit alpha_q to prevent residual RMS increases
{ {
@ -309,7 +313,7 @@ unsigned StereoProcessor::applyPredJointStereo (int32_t* const mdctSpectrum1, in
#endif #endif
sfbStereoData[sfbEv + grOffset] = uint8_t (b + 16); // save SFB's final alpha_q_re sfbStereoData[sfbEv + grOffset] = uint8_t (b + 16); // save SFB's final alpha_q_re
#if SP_MDST_PRED #if SP_MDST_PRED
alphaLimit = CLIP_PM ((double) sumPrdImAReB / (double) sumPrdImAImA, alphaLimit); alphaLimit = CLIP_PM ((double) sumPrdImAReB / (double) sumPrdReAReA, alphaLimit);
# if SP_OPT_ALPHA_QUANT # if SP_OPT_ALPHA_QUANT
b = __max (512, 524 - int32_t (abs (10.0 * alphaLimit))); // rounding optimization b = __max (512, 524 - int32_t (abs (10.0 * alphaLimit))); // rounding optimization
# if 1 # if 1