Loading lib_dec/TonalComponentDetection_fx.c 100755 → 100644 +43 −49 Original line number Diff line number Diff line Loading @@ -24,13 +24,11 @@ static void calcPseudoSpec( const Word32 *mdctSpec, const Word16 mdctSpec_exp, const Word16 nSamples, Word16 floorPowerSpectrum, Word32 *powerSpec, Word16 *powerSpec_exp ); static void getEnvelope( const Word16 nSamples, const Word32 *powerSpec, Word16 F0, Word32 *envelope, Word32 *smoothedSpectrum ); static void GetF0( Word16 const nSamples, Word16 const nSamplesCore, Word32 const *const powerSpectrum, Word32 const pitchLag, Word16 *const pOrigF0, Word32 *const pOrigF0_32, Word16 *const pF0, Word32 *const pF0_32, const Word16 element_mode ); static void GetF0( Word16 const nSamples, Word16 const nSamplesCore, Word32 const *const powerSpectrum, Word32 const pitchLag, Word16 *const pOrigF0, Word32 *const pOrigF0_32, Word16 *const pF0, Word32 *const pF0_32, const Word16 element_mode ); static void findStrongestHarmonics( const Word16 nSamples, const Word32 *powerSpectrum, const Word16 F0, const Word16 nTotalHarmonics, Word16 *pHarmonicIndexes, Word16 *pnHarmonics ); static void CorrectF0( const Word16 *pHarmonicIndexes, const Word16 nHarmonics, Word16 *pF0, Word32 *pF0_32, const Word16 element_mode ); static void findCandidates( const Word16 nSamples, const Word32 *MDCTSpectrum, const Word16 MDCTSpectrum_exp, Word16 *thresholdModificationNew, Word32 *thresholdModificationNew32, Word16 floorPowerSpectrum, const Word16 element_mode ); static void modifyThreshold( Word16 i, Word16 F0, Word32 F0_32, Word16 threshold, Word32 threshold_32, Word16 *thresholdModification, Word32 *thresholdModification32, const Word16 element_mode ); static void modifyThreshold( Word16 i, Word16 F0, Word32 F0_32, Word16 threshold, Word32 threshold_32, Word16 *thresholdModification, Word32 *thresholdModification32, const Word16 element_mode ); static void modifyThresholds( Word16 F0, Word32 F0_32, Word16 origF0, Word32 origF0_32, Word16 *thresholdModification, Word32 *thresholdModification32, const Word16 element_mode ); static void RefineThresholdsUsingPitch_fx( const Word16 nSamples, const Word16 nSamplesCore, const Word32 powerSpectrum[], const Word32 lastPitchLag, const Word32 currentPitchLag, Word16 *pF0, Word32 *pF0_32, Word16 *thresholdModification, Word32 *thresholdModification32, const Word16 element_mode ); static void findTonalComponents_fx( Word16 *indexOfTonalPeak, Word16 *lowerIndex, Word16 *upperIndex, Word16 *numIndexes, Word16 nSamples, const Word32 *powerSpectrum, const Word16 powerSpectrum_e, Word16 F0, Word16 *thresholdModification, Word32 *thresholdModification32, const Word16 element_mode ); Loading Loading @@ -412,8 +410,7 @@ static void GetF0( Word32 *const pOrigF0_32, /*o - Q10+16*/ Word16 /*short*/ *const pF0, /*o - Q10*/ Word32 *const pF0_32, /*o - Q10+16*/ const Word16 element_mode ) const Word16 element_mode ) { Word16 /*short*/ tmpPitchLag; Word16 /*short*/ rgiStrongHarmonics[MAX_PEAKS_FROM_PITCH]; /*Q0*/ Loading Loading @@ -790,8 +787,7 @@ static void modifyThreshold( Word32 threshold_32, /*I - Q26*/ Word16 * /*short*/ thresholdModification, /*I - Q10*/ Word32 * /*long*/ thresholdModification32, /*I - Q26*/ const Word16 element_mode ) /*I/O - Q10*/ const Word16 element_mode ) /*I/O - Q10*/ { Word32 harmonic; Word16 fractional /*Q15*/; Loading Loading @@ -838,8 +834,7 @@ static void modifyThresholds( Word32 origF0_32, /*I - Q26*/ Word16 * /*short*/ thresholdModification, /*Q10*/ Word32 * /*short*/ thresholdModification32, /*Q26*/ const Word16 element_mode ) /*I/O - Q10*/ const Word16 element_mode ) /*I/O - Q10*/ { Word16 /*int*/ i, /*int*/ nHarmonics; Word16 tmp, tmpM, tmpE; Loading Loading @@ -1253,8 +1248,7 @@ static void RefineThresholdsUsingPitch_fx( Word32 *pF0_32, /*Q10+Q16, NULL in EVS_MONO mode */ Word16 *thresholdModification, /*Q10*/ Word32 *thresholdModification32, /*Q10+Q16, NULL in EVS_MONO mode */ const Word16 element_mode ) const Word16 element_mode ) { Word16 pitchIsStable; Word16 origF0; Loading Loading
lib_dec/TonalComponentDetection_fx.c 100755 → 100644 +43 −49 Original line number Diff line number Diff line Loading @@ -24,13 +24,11 @@ static void calcPseudoSpec( const Word32 *mdctSpec, const Word16 mdctSpec_exp, const Word16 nSamples, Word16 floorPowerSpectrum, Word32 *powerSpec, Word16 *powerSpec_exp ); static void getEnvelope( const Word16 nSamples, const Word32 *powerSpec, Word16 F0, Word32 *envelope, Word32 *smoothedSpectrum ); static void GetF0( Word16 const nSamples, Word16 const nSamplesCore, Word32 const *const powerSpectrum, Word32 const pitchLag, Word16 *const pOrigF0, Word32 *const pOrigF0_32, Word16 *const pF0, Word32 *const pF0_32, const Word16 element_mode ); static void GetF0( Word16 const nSamples, Word16 const nSamplesCore, Word32 const *const powerSpectrum, Word32 const pitchLag, Word16 *const pOrigF0, Word32 *const pOrigF0_32, Word16 *const pF0, Word32 *const pF0_32, const Word16 element_mode ); static void findStrongestHarmonics( const Word16 nSamples, const Word32 *powerSpectrum, const Word16 F0, const Word16 nTotalHarmonics, Word16 *pHarmonicIndexes, Word16 *pnHarmonics ); static void CorrectF0( const Word16 *pHarmonicIndexes, const Word16 nHarmonics, Word16 *pF0, Word32 *pF0_32, const Word16 element_mode ); static void findCandidates( const Word16 nSamples, const Word32 *MDCTSpectrum, const Word16 MDCTSpectrum_exp, Word16 *thresholdModificationNew, Word32 *thresholdModificationNew32, Word16 floorPowerSpectrum, const Word16 element_mode ); static void modifyThreshold( Word16 i, Word16 F0, Word32 F0_32, Word16 threshold, Word32 threshold_32, Word16 *thresholdModification, Word32 *thresholdModification32, const Word16 element_mode ); static void modifyThreshold( Word16 i, Word16 F0, Word32 F0_32, Word16 threshold, Word32 threshold_32, Word16 *thresholdModification, Word32 *thresholdModification32, const Word16 element_mode ); static void modifyThresholds( Word16 F0, Word32 F0_32, Word16 origF0, Word32 origF0_32, Word16 *thresholdModification, Word32 *thresholdModification32, const Word16 element_mode ); static void RefineThresholdsUsingPitch_fx( const Word16 nSamples, const Word16 nSamplesCore, const Word32 powerSpectrum[], const Word32 lastPitchLag, const Word32 currentPitchLag, Word16 *pF0, Word32 *pF0_32, Word16 *thresholdModification, Word32 *thresholdModification32, const Word16 element_mode ); static void findTonalComponents_fx( Word16 *indexOfTonalPeak, Word16 *lowerIndex, Word16 *upperIndex, Word16 *numIndexes, Word16 nSamples, const Word32 *powerSpectrum, const Word16 powerSpectrum_e, Word16 F0, Word16 *thresholdModification, Word32 *thresholdModification32, const Word16 element_mode ); Loading Loading @@ -412,8 +410,7 @@ static void GetF0( Word32 *const pOrigF0_32, /*o - Q10+16*/ Word16 /*short*/ *const pF0, /*o - Q10*/ Word32 *const pF0_32, /*o - Q10+16*/ const Word16 element_mode ) const Word16 element_mode ) { Word16 /*short*/ tmpPitchLag; Word16 /*short*/ rgiStrongHarmonics[MAX_PEAKS_FROM_PITCH]; /*Q0*/ Loading Loading @@ -790,8 +787,7 @@ static void modifyThreshold( Word32 threshold_32, /*I - Q26*/ Word16 * /*short*/ thresholdModification, /*I - Q10*/ Word32 * /*long*/ thresholdModification32, /*I - Q26*/ const Word16 element_mode ) /*I/O - Q10*/ const Word16 element_mode ) /*I/O - Q10*/ { Word32 harmonic; Word16 fractional /*Q15*/; Loading Loading @@ -838,8 +834,7 @@ static void modifyThresholds( Word32 origF0_32, /*I - Q26*/ Word16 * /*short*/ thresholdModification, /*Q10*/ Word32 * /*short*/ thresholdModification32, /*Q26*/ const Word16 element_mode ) /*I/O - Q10*/ const Word16 element_mode ) /*I/O - Q10*/ { Word16 /*int*/ i, /*int*/ nHarmonics; Word16 tmp, tmpM, tmpE; Loading Loading @@ -1253,8 +1248,7 @@ static void RefineThresholdsUsingPitch_fx( Word32 *pF0_32, /*Q10+Q16, NULL in EVS_MONO mode */ Word16 *thresholdModification, /*Q10*/ Word32 *thresholdModification32, /*Q10+Q16, NULL in EVS_MONO mode */ const Word16 element_mode ) const Word16 element_mode ) { Word16 pitchIsStable; Word16 origF0; Loading