Improved handling of filters for extracting voicing strengths in mixe…

…d excitation, now it is posible to define a filter file name and the script for extracting voicing strengths can handle n number of filters (before it was allowed just five). This is useful for tunning filters according to the sampling frequency of the database. Under testing.

git-svn-id: https://mary.opendfki.de/repos/trunk@3120 953a6561-930b-0410-b2a6-db37d1b2ae63

lib/external/hts-adapt/configure

@@ -626,6 +626,7 @@ F0_RANGES
 MAGVSIZE
 STRVSIZE
 MGCVSIZE
+STRFILTERNAME
 SAMPFREQ
 IMPLEN
 PSTFILTER
@@ -764,6 +765,7 @@ NOISEMASK
 PSTFILTER
 IMPLEN
 SAMPFREQ
+STRFILTERNAME
 F0_RANGES
 NMGCWIN
 NSTRWIN
@@ -1470,6 +1472,10 @@ Some influential environment variables:
   PSTFILTER   Postfiltering factor (default=1.4)
   IMPLEN      Length of impulse response (default=4096)
   SAMPFREQ    Sampling frequency in Hz (default=48000)
+  STRFILTERNAME
+              Name of file containig the filters for voicing strengths
+              analysis in mixed excitation
+              (default=filters/mix_excitation_5filters_199taps_48Kz.txt)
   F0_RANGES   F0 search ranges (spkr1 lower1 upper1 spkr2 lower2 upper2...).
               Order of speakers in F0_RANGES should be equal to that in
               ALLSPKR (default='bdl 40 210 clb 130 260 jmk 50 180 rms 40 200
@@ -4239,6 +4245,7 @@ fi
 
 
 
+
 # default values
 if test -z "$FRAMELEN"; then
 	FRAMELEN=1200
@@ -4328,6 +4335,11 @@ if test -z "$MAGVSIZE"; then
 	MAGVSIZE=$MAGORDER
 fi
 
+if test -z "$STRFILTERNAME"; then
+	STRFILTERNAME=filters/mix_excitation_5filters_199taps_48Kz.txt
+fi
+
+
 # substitute variables
 
 
@@ -4348,6 +4360,7 @@ fi
 
 
 
+
 # F0 search range
 
 

lib/external/hts-adapt/configure.ac

@@ -420,6 +420,7 @@ AC_ARG_VAR([NOISEMASK],[Standard deviation of white noise to mask noise in f0 ex
 AC_ARG_VAR([PSTFILTER],[Postfiltering factor (default=1.4)])
 AC_ARG_VAR([IMPLEN],[Length of impulse response (default=4096)])
 AC_ARG_VAR([SAMPFREQ],[Sampling frequency in Hz (default=48000)])
+AC_ARG_VAR([STRFILTERNAME],[Name of file containig the filters for voicing strengths analysis in mixed excitation (default=filters/mix_excitation_5filters_199taps_48Kz.txt)])
 
 # default values
 if test -z "$FRAMELEN"; then
@@ -510,6 +511,11 @@ if test -z "$MAGVSIZE"; then
 	MAGVSIZE=$MAGORDER
 fi
 
+if test -z "$STRFILTERNAME"; then
+	STRFILTERNAME=filters/mix_excitation_5filters_199taps_48Kz.txt
+fi
+
+
 # substitute variables
 AC_SUBST(FRAMELEN)
 AC_SUBST(FRAMESHIFT)
@@ -528,6 +534,7 @@ AC_SUBST(SAMPFREQ)
 AC_SUBST(MGCVSIZE)
 AC_SUBST(STRVSIZE)
 AC_SUBST(MAGVSIZE)
+AC_SUBST(STRFILTERNAME)
 
 
 # F0 search range

lib/external/hts-adapt/data/Makefile.in

@@ -102,6 +102,9 @@ NSTRWIN = @NSTRWIN@   # Mary added str for mixed excitation
 NMAGWIN = @NMAGWIN@   # Mary added mag for pulse excitation generation out of Fourier magnitudes
 NLF0WIN = @NLF0WIN@
 
+# filter taps filename for voicing strengths analysis in mixed excitation
+STRFILTERNAME = @STRFILTERNAME@
+
 # list of speakers
 TRAINSPKR = @TRAINSPKR@
 ADAPTSPKR = @ADAPTSPKR@
@@ -234,7 +237,7 @@ str-mary:
 				$(STEP) -l `printf "%.0f" $${count}` -v 0.0 | \
 				$(X2X) +fs > tmp.tail; \
 				cat tmp.head $${raw} tmp.tail > tmp; \
-				$(TCLSH) scripts/get_str.tcl -l -H $${upperf0} -L $${lowerf0} -p $(FRAMESHIFT) -r $(SAMPFREQ) -f $(STRORDER) tmp | \
+				$(TCLSH) scripts/get_str.tcl -l -H $${upperf0} -L $${lowerf0} -p $(FRAMESHIFT) -r $(SAMPFREQ) -f $(STRFILTERNAME) -n $(STRORDER) tmp | \
 				$(X2X) +af > str/$${spkr}/$${base}.str; \
 			fi; \
 		done; \