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

editorial changes

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

10
src/lib/tempAnalysis.cpp
View File

@ -193,10 +193,10 @@ unsigned TempAnalyzer::temporalAnalysis (const int32_t* const timeSignals[USAC_M
m_tempAnaStats[ch] = 0; // flat/stationary frame m_tempAnaStats[ch] = 0; // flat/stationary frame
m_transientLoc[ch] = -1; m_transientLoc[ch] = -1;
// re-init stats history for this channel // re-init stats history for this channel
m_avgAbsHpPrev[ch] = 0; // sumAbsValR >> 9 m_avgAbsHpPrev[ch] = 0;
m_maxAbsHpPrev[ch] = 0; // maxAbsValR m_maxAbsHpPrev[ch] = 0; // maxAbsValR
m_maxIdxHpPrev[ch] = 1; // (unsigned) maxAbsIdxR m_maxIdxHpPrev[ch] = 1; // maxAbsIdxR
m_pitchLagPrev[ch] = 0; // (unsigned) pLagBestR m_pitchLagPrev[ch] = 0; // pLagBestR
} }
else // nonzero signal in the current frame else // nonzero signal in the current frame
{ {
@ -249,9 +249,9 @@ unsigned TempAnalyzer::temporalAnalysis (const int32_t* const timeSignals[USAC_M
pLagBestR = pLag; pLagBestR = pLag;
} }
#if TA_MORE_PITCH_TESTS #if TA_MORE_PITCH_TESTS
if (pLagBestR > 0) // try half or double if (pLagBestR >= halfFrameOffset) // half
{ {
pLag = (pLagBestR < halfFrameOffset ? pLagBestR << 1 : pLagBestR >> 1); pLag = 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)