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

for completeness

Browse Source
This commit is contained in:
Christian R. Helmrich 2020-04-13 22:00:36 +02:00
parent edaf2299ac
commit ae36f449ae
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/lib/tempAnalysis.cpp
View File

@ -120,6 +120,7 @@ unsigned TempAnalyzer::temporalAnalysis (const int32_t* const timeSignals[USAC_M
{ {
const int32_t* const chSig = &timeSignals[ch][lookaheadOffset]; const int32_t* const chSig = &timeSignals[ch][lookaheadOffset];
const int32_t* const chSigM1 = chSig - 1; // for first-order high-pass const int32_t* const chSigM1 = chSig - 1; // for first-order high-pass
const int32_t* const chSigPH = chSig + halfFrameOffset;
// --- get L1 norm and pitch lag of both sides // --- get L1 norm and pitch lag of both sides
unsigned sumAbsValL = 0, sumAbsValR = 0; unsigned sumAbsValL = 0, sumAbsValR = 0;
unsigned maxAbsValL = 0, maxAbsValR = 0; unsigned maxAbsValL = 0, maxAbsValR = 0;
@ -213,7 +214,7 @@ unsigned TempAnalyzer::temporalAnalysis (const int32_t* const timeSignals[USAC_M
sumAbsPpL = sumAbsValL; // left side sumAbsPpL = sumAbsValL; // left side
} }
#if TA_MORE_PITCH_TESTS #if TA_MORE_PITCH_TESTS
if ((sumAbsValR = applyPitchPred (chSig + halfFrameOffset, halfFrameOffset, pLag, pSgn)) < sumAbsPpR) if ((sumAbsValR = applyPitchPred (chSigPH, halfFrameOffset, pLag, pSgn)) < sumAbsPpR)
{ {
sumAbsPpR = sumAbsValR; // right side sumAbsPpR = sumAbsValR; // right side
pLagBestR = pLag; pLagBestR = pLag;
@ -229,7 +230,7 @@ unsigned TempAnalyzer::temporalAnalysis (const int32_t* const timeSignals[USAC_M
sumAbsPpL = sumAbsValL; // left side sumAbsPpL = sumAbsValL; // left side
} }
#endif #endif
if ((sumAbsValR = applyPitchPred (chSig + halfFrameOffset, halfFrameOffset, pLag, pSgn)) < sumAbsPpR) if ((sumAbsValR = applyPitchPred (chSigPH, halfFrameOffset, pLag, pSgn)) < sumAbsPpR)
{ {
sumAbsPpR = sumAbsValR; // right side sumAbsPpR = sumAbsValR; // right side
pLagBestR = pLag; pLagBestR = pLag;
@ -242,29 +243,28 @@ unsigned TempAnalyzer::temporalAnalysis (const int32_t* const timeSignals[USAC_M
{ {
sumAbsPpL = sumAbsValL; // left side sumAbsPpL = sumAbsValL; // left side
} }
if ((sumAbsValR = applyPitchPred (chSig + halfFrameOffset, halfFrameOffset, pLag, pSgn)) < sumAbsPpR) if ((sumAbsValR = applyPitchPred (chSigPH, halfFrameOffset, pLag, pSgn)) < sumAbsPpR)
{ {
sumAbsPpR = sumAbsValR; // right side sumAbsPpR = sumAbsValR; // right side
pLagBestR = pLag; pLagBestR = pLag;
} }
#if 1 // TA_MORE_PITCH_TESTS #if TA_MORE_PITCH_TESTS
if (pLagBestR > halfFrameOffset) // try ½ if (pLagBestR > 0) // try half or double
{ {
pLag = pLagBestR >> 1; pLag = (pLagBestR < halfFrameOffset ? pLagBestR << 1 : pLagBestR >> 1);
pSgn = (((chSig[maxAbsIdxR] - chSigM1[maxAbsIdxR] > 0) && (chSig[maxAbsIdxR-pLag] - chSigM1[maxAbsIdxR-pLag] < 0)) || pSgn = (((chSig[maxAbsIdxR] - chSigM1[maxAbsIdxR] > 0) && (chSig[maxAbsIdxR-pLag] - chSigM1[maxAbsIdxR-pLag] < 0)) ||
((chSig[maxAbsIdxR] - chSigM1[maxAbsIdxR] < 0) && (chSig[maxAbsIdxR-pLag] - chSigM1[maxAbsIdxR-pLag] > 0)) ? -1 : 1); ((chSig[maxAbsIdxR] - chSigM1[maxAbsIdxR] < 0) && (chSig[maxAbsIdxR-pLag] - chSigM1[maxAbsIdxR-pLag] > 0)) ? -1 : 1);
if ((sumAbsValL = applyPitchPred (chSig, halfFrameOffset, pLag, pSgn)) < sumAbsPpL) if ((sumAbsValL = applyPitchPred (chSig, halfFrameOffset, pLag, pSgn)) < sumAbsPpL)
{ {
sumAbsPpL = sumAbsValL; // left side sumAbsPpL = sumAbsValL; // left side
} }
if ((sumAbsValR = applyPitchPred (chSig + halfFrameOffset, halfFrameOffset, pLag, pSgn)) < sumAbsPpR) if ((sumAbsValR = applyPitchPred (chSigPH, halfFrameOffset, pLag, pSgn)) < sumAbsPpR)
{ {
sumAbsPpR = sumAbsValR; // right side sumAbsPpR = sumAbsValR; // right side
pLagBestR = pLag; pLagBestR = pLag;
} }
} }
#endif #endif
// convert L1 norms into average values // convert L1 norms into average values
sumAbsHpL = (sumAbsHpL + unsigned (halfFrameOffset >> 1)) / unsigned (halfFrameOffset); sumAbsHpL = (sumAbsHpL + unsigned (halfFrameOffset >> 1)) / unsigned (halfFrameOffset);
sumAbsHpR = (sumAbsHpR + unsigned (halfFrameOffset >> 1)) / unsigned (halfFrameOffset); sumAbsHpR = (sumAbsHpR + unsigned (halfFrameOffset >> 1)) / unsigned (halfFrameOffset);