Merge pull request #2967 from PaulBoersma/master

quick fix to solve crash in Sound-to-Formant-robust

Author: PaulBoersma

LPC/LPCFrameIntoFormantFrame.cpp

@@ -110,7 +110,7 @@ void LPCFrameIntoFormantFrame_init(LPCFrameIntoFormantFrame me, constLPC input,
 autoLPCFrameIntoFormantFrame LPCFrameIntoFormantFrame_create (constLPC input, mutableFormant output, double margin) {
 	try {
 		autoLPCFrameIntoFormantFrame me = Thing_new (LPCFrameIntoFormantFrame);
-		LPCFrameIntoFormantFrame_init(me.get(), input, output, margin);
+		LPCFrameIntoFormantFrame_init (me.get(), input, output, margin);
 		return me;
 	} catch (MelderError) {
 		Melder_throw (U"LPCFrameIntoFormantFrame not created.");

LPC/SoundFrameIntoFormantFrame.cpp

@@ -64,8 +64,8 @@ void structSoundFrameIntoFormantFrame :: saveOutputFrame () {
 autoSoundFrameIntoFormantFrame SoundFrameIntoFormantFrame_create (autoSoundFrameIntoLPCFrame silpc, autoLPCFrameIntoFormantFrame lpcif) {
 	try {
 		autoSoundFrameIntoFormantFrame me = Thing_new (SoundFrameIntoFormantFrame);
-		my soundIntoLPC.adoptFromAmbiguousOwner (silpc.releaseToAmbiguousOwner());
-		my lpcIntoFormant.adoptFromAmbiguousOwner (lpcif.releaseToAmbiguousOwner());
+		my soundIntoLPC = silpc.move();
+		my lpcIntoFormant = lpcif.move();
 		return me;
 	} catch (MelderError) {
 		Melder_throw (U"Cannot create SoundFrameIntoFormantFrame.");

LPC/SoundFrameIntoLPCFrame.cpp

@@ -41,6 +41,7 @@
 Thing_implement (SoundFrameIntoLPCFrame, SoundFrameIntoSampledFrame, 0);
 
 void structSoundFrameIntoLPCFrame :: allocateOutputFrames () {
+	Melder_assert (our outputlpc);
 	for (integer iframe = 1; iframe <= outputlpc -> nx; iframe ++)
 		LPC_Frame_init (& outputlpc -> d_frames [iframe], outputlpc -> maxnCoefficients);
 }
@@ -88,7 +89,7 @@ bool structSoundFrameIntoLPCFrameAuto :: inputFrameToOutputFrame ()  {
 	frameAnalysisInfo = 0;
 	Melder_assert (lpcf -> nCoefficients > 0);
 
-	VEC  x = soundFrame;
+	VEC x = soundFrame;
 
 	/*
 		Compute the autocorrelations

LPC/Sound_and_LPC.cpp

@@ -34,7 +34,7 @@ void checkLPCAnalysisParameters_e (double sound_dx, integer sound_nx, double phy
 		"Either your sound is too short or your window is too long.");
 	// we round the minimum duration to be able to use asserterror in testing scripts.
 	conststring32 minimumDurationRounded = Melder_fixed (predictionOrder * sound_dx , 5);
-	const integer approximateNumberOfSamplesPerWindow = Melder_roundDown (physicalAnalysisWidth / sound_dx);
+	const integer approximateNumberOfSamplesPerWindow = Melder_iroundDown (physicalAnalysisWidth / sound_dx);
 	Melder_require (approximateNumberOfSamplesPerWindow > predictionOrder,
 		U"Analysis window duration too short. For a prediction order of ", predictionOrder,
 		U", the analysis window duration should be greater than ", minimumDurationRounded,
@@ -197,7 +197,8 @@ void Sound_into_LPCrobust_common (constSound me, mutableLPC outputlpc, autoSound
 }
 
 autoLPC Sound_to_LPC_robust (constSound me, int predictionOrder, double effectiveAnalysisWidth, double dt, double preEmphasisFrequency,
-	double k_stdev,	integer itermax, double tol, bool wantlocation) {
+	double k_stdev, integer itermax, double tol, bool wantlocation)
+{
 	try {
 		const double physicalAnalysisWidth = getPhysicalAnalysisWidth (effectiveAnalysisWidth, kSound_windowShape::GAUSSIAN_2);
 		autoSound emphasized = Sound_resampleAndOrPreemphasize (me, 0.0, 0, preEmphasisFrequency);

LPC/Sound_to_Formant_mt.cpp

@@ -20,6 +20,7 @@
 #include "Sound_to_Formant_mt.h"
 #include "SoundFrameIntoFormantFrame.h"
 #include "Sound_extensions.h"
+#include "LPC_and_Formant.h"
 /*
 	Precondition:
 		Sound already has the 'right' sampling frequency and has been pre-emphasized
@@ -95,6 +96,7 @@ autoFormant Sound_to_Formant_robust_mt (constSound me, double dt_in, double numb
 		autoLPCAndSoundFramesIntoLPCFrameRobust lpcAndSoundIntoLPC = LPCAndSoundFramesIntoLPCFrameRobust_create (lpc.get(), me, outputLPC.get(),
 			effectiveAnalysisWidth, windowShape, k_stdev, itermax, tol, location, wantlocation);
 		autoSoundFrameIntoLPCFrame soundIntoLPC2 = SoundFrameIntoLPCFrameRobust_create (soundIntoLPC1.move(), lpcAndSoundIntoLPC.move());
+		Melder_assert (soundIntoLPC2 -> outputlpc);
 		autoLPCFrameIntoFormantFrame lpcFrameIntoFormant = LPCFrameIntoFormantFrame_create (outputLPC.get(), formant.get(), safetyMargin);
 		autoSoundFrameIntoFormantFrame sif = SoundFrameIntoFormantFrame_create (soundIntoLPC2.move(), lpcFrameIntoFormant.move());
 		autoSoundIntoFormantRobustStatus status = SoundIntoFormantRobustStatus_create (formant -> nx);
@@ -105,6 +107,33 @@ autoFormant Sound_to_Formant_robust_mt (constSound me, double dt_in, double numb
 		Melder_throw (me, U": no robust Formant created.");
 	}
 }
+
+autoFormant Sound_to_Formant_robust (Sound me, double dt_in, double numberOfFormants, double maximumFrequency,
+	double effectiveAnalysisWidth, double preEmphasisFrequency, double safetyMargin,
+	double numberOfStandardDeviations, integer maximumNumberOfIterations, double tolerance,
+	double location, bool wantlocation)
+{
+	const double dt = dt_in > 0.0 ? dt_in : effectiveAnalysisWidth / 4.0;
+	const double nyquist = 0.5 / my dx;
+	const integer predictionOrder = Melder_ifloor (2 * numberOfFormants);
+	try {
+		autoSound sound;
+		if (maximumFrequency <= 0.0 || fabs (maximumFrequency / nyquist - 1.0) < 1.0e-12)
+			sound = Data_copy (me);   // will be modified
+		else
+			sound = Sound_resample (me, maximumFrequency * 2.0, 50);
+
+		autoLPC lpc = Sound_to_LPC_auto (sound.get(), predictionOrder, effectiveAnalysisWidth, dt, preEmphasisFrequency);
+		autoLPC lpcRobust = LPC_and_Sound_to_LPC_robust (lpc.get(), sound.get(), effectiveAnalysisWidth, preEmphasisFrequency,
+				numberOfStandardDeviations, maximumNumberOfIterations, tolerance, wantlocation);
+		autoFormant thee = LPC_to_Formant (lpcRobust.get(), safetyMargin);
+		return thee;
+	} catch (MelderError) {
+		Melder_throw (me, U": no robust Formant created.");
+	}
+}
+
+
 /*
 void Sound_into_Formant_robust_mt (constSound me, mutableFormant thee, double effectiveAnalysisWidth, integer numberOfPoles, double safetyMargin,
 	double k_stdev, integer itermax, double tol, double location, bool wantlocation)

LPC/Sound_to_Formant_mt.h

@@ -18,10 +18,6 @@
  * along with this work. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/*
- djmw 20030815 GPL header
-*/
-
 #include "LPC.h"
 #include "Formant.h"
 #include "Sound_and_LPC.h"
@@ -30,8 +26,15 @@ void Sound_into_Formant_robust_mt (constSound me, Formant out,	double windowLeng
 	integer numberOfPoles, double safetyMargin, double k, integer itermax, double tol, double location, bool wantlocation
 );
 
+autoFormant Sound_to_Formant_robust (Sound me, double dt_in, double numberOfFormants, double maximumFrequency,
+	double effectiveAnalysisWidth, double preEmphasisFrequency, double safetyMargin,
+	double numberOfStandardDeviations, integer maximumNumberOfIterations, double tolerance,
+	double location, bool wantlocation
+);
+
 autoFormant Sound_to_Formant_robust_mt (constSound me, double dt, double numberOfFormants, double maximumFrequency,
-	double windowLength, double preemphasisFrequency, double safetyMargin, double k, integer itermax, double tol,
+	double windowLength, double preemphasisFrequency, double safetyMargin,
+	double numberOfStandardDeviations, integer maximumNumberOfIterations, double tolerance,
 	double location, bool wantlocation
 );
 

LPC/praat_LPC_init.cpp

@@ -1254,7 +1254,7 @@ FORM (CONVERT_EACH_TO_ONE__Sound_to_Formant_robust, U"Sound: To Formant (robust)
 	OK
 DO
 	CONVERT_EACH_TO_ONE (Sound)
-		autoFormant result = Sound_to_Formant_robust_mt (me, timeStep, maximumNumberOfFormants, formantCeiling, windowLength, 
+		autoFormant result = Sound_to_Formant_robust (me, timeStep, maximumNumberOfFormants, formantCeiling, windowLength, 
 				preEmphasisFrequency, 50.0, numberOfStandardDeviations, maximumNumberOfIterations, tolerance, 0.0, true);
 	CONVERT_EACH_TO_ONE_END (my name.get())
 }

fon/Sound.cpp

@@ -1228,7 +1228,7 @@ autoSound Sound_filter_oneFormant (constSound me, double frequency, double bandw
 
 void Sound_filterWithOneFormantInplace (mutableSound me, double frequency, double bandwidth) {
 	for (integer ichan = 1; ichan <= my ny; ichan ++) {
-		VEC channel = my z.row (ichan);
+		const VEC channel = my z.row (ichan);
 		VECfilterSecondOrderSection_fb_inplace (channel, my dx, frequency, bandwidth);
 	}
 	Matrix_scaleAbsoluteExtremum (me, 0.99);
@@ -1242,7 +1242,7 @@ void Sound_preEmphasize_inplace (mutableSound me, double cutoffFrequency) {
 	const double emphasisFactor = Sound_computeEmphasisFactor (me, cutoffFrequency);
 	if (emphasisFactor != 0.0)   // OPTIMIZE; will happen for cut-off frequencies above 119 times the sampling frequency
 		for (integer channel = 1; channel <= my ny; channel ++) {
-			VEC s = my z.row (channel);
+			const VEC s = my z.row (channel);
 			for (integer i = my nx; i >= 2; i --)
 				s [i] -= emphasisFactor * s [i - 1];
 		}
@@ -1252,7 +1252,7 @@ void Sound_deEmphasize_inplace (Sound me, double cutoffFrequency) {
 	const double emphasisFactor = Sound_computeEmphasisFactor (me, cutoffFrequency);
 	if (emphasisFactor != 0.0)   // OPTIMIZE; will happen for cut-off frequencies above 119 times the sampling frequency
 		for (integer channel = 1; channel <= my ny; channel ++) {
-			VEC s = my z.row (channel);
+			const VEC s = my z.row (channel);
 			for (integer i = 2; i <= my nx; i ++)
 				s [i] += emphasisFactor * s [i - 1];
 		}
@@ -1285,7 +1285,7 @@ void Sound_reverse (mutableSound me, double tmin, double tmax) {
 	integer itmin, itmax;
 	const integer n = Sampled_getWindowSamples (me, tmin, tmax, & itmin, & itmax) / 2;
 	for (integer channel = 1; channel <= my ny; channel ++) {
-		double *amp = & my z [channel] [0];
+		double * const amp = & my z [channel] [0];
 		for (integer i = 0; i < n; i ++)
 			std::swap (amp [itmin + i], amp [itmax - i]);
 	}
@@ -1331,7 +1331,7 @@ autoSound Sounds_crossCorrelate_short (constSound me, constSound thee, double tm
 				}
 			}
 			if (mypower != 0.0 && thypower != 0.0) {
-				double factor = 1.0 / (sqrt (double (mypower)) * sqrt (double (thypower)));
+				const double factor = 1.0 / (sqrt (double (mypower)) * sqrt (double (thypower)));
 				for (integer i = 1; i <= nt; i ++) {
 					his z [1] [i] *= factor;
 				}

fon/Sound_to_Formant.cpp

@@ -1,6 +1,6 @@
 /* Sound_to_Formant.cpp
  *
- * Copyright (C) 1992-2008,2010-2012,2014-2021 Paul Boersma
+ * Copyright (C) 1992-2008,2010-2012,2014-2021,2024,2025 Paul Boersma
  *
  * This code is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -397,7 +397,7 @@ autoFormant Sound_to_Formant_willems (Sound me, double dt, double nFormants, dou
 	try {
 		return Sound_to_Formant_any (me, dt, Melder_iround (2.0 * nFormants), maximumFrequency, halfdt_window, 2, preemphasisFrequency, 50.0);
 	} catch (MelderError) {
-		Melder_throw (me, U": formant analysis (Burg) not performed.");
+		Melder_throw (me, U": formant analysis (Willems) not performed.");
 	}
 }
 

sys/Thing.h

@@ -6,7 +6,7 @@
  *
  * This code is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or (at
+ * the Free Software Foundation; either version 3 of the License, or (at
  * your option) any later version.
  *
  * This code is distributed in the hope that it will be useful, but
@@ -86,8 +86,8 @@ struct structThing {
 	void operator delete (void *ptr, size_t /* size */) { Melder_free (ptr); }
 
 	/*
-		If a Thing has members of type autoThing,
-		then we want the destructors of autoThing to be called automatically whenever a Thing is `delete`d.
+		If a Thing has members of type autoThing and/or autovector and/or automatrix and/or autostring,
+		then we want the destructors of those objects to be called automatically whenever a Thing is `delete`d.
 		For this to happen, it is necessary that every Thing itself has a destructor.
 		We therefore define a destructor here,
 		and we make it virtual to ensure that every subclass has its own automatic version.
@@ -97,7 +97,8 @@ struct structThing {
 	virtual void v9_destroy () noexcept { }
 		/*
 			This method should destroy all members that are not destroyed automatically
-			(any autoThing is destroyed automatically), and to remove dangling links to self.
+			(any autoThing or autovector or automatrix or autostring is destroyed automatically),
+			and to remove dangling links to self.
 			Destroying *all* members means that we have to destroy all members that the
 			derived class has added, as well as all members of the base class,
 			and so on recursively; v9_destroy therefore has to call the inherited v9_destroy.