Menu
▾
▴
[SPTK-CVS] SPTK4/src c2mpir.cc, 1.5, 1.6 freqt.cc, 1.8, 1.9 lpc2c.cc, 1.2, 1.3 mgc2mgc.cc, 1.7, 1.8 mglsp2sp.cc, 1.2, 1.3
|
From: Takenori Y. <tak...@us...> - 2017-05-02 07:25:42
|
Update of /cvsroot/sp-tk/SPTK4/src In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv28326 Modified Files: c2mpir.cc freqt.cc lpc2c.cc mgc2mgc.cc mglsp2sp.cc Log Message: format codes Index: mgc2mgc.cc =================================================================== RCS file: /cvsroot/sp-tk/SPTK4/src/mgc2mgc.cc,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** mgc2mgc.cc 2 May 2017 07:10:22 -0000 1.7 --- mgc2mgc.cc 2 May 2017 07:25:40 -0000 1.8 *************** *** 79,85 **** *stream << " -n : regard input as normalized mel-generalized cepstrum [" << sptk::ConvertBooleanToString(kDefaultInputNormalizationFlag) << "]" << std::endl; // NOLINT *stream << " -u : regard input as multiplied by gamma [" << sptk::ConvertBooleanToString(kDefaultInputMultiplicationFlag) << "]" << std::endl; // NOLINT ! *stream << " -M M : order of mel-generalized cepstrum (output) [" << kDefaultOutputNumOrder << "]" << std::endl; // NOLINT ! *stream << " -A A : alpha of mel-generalized cepstrum (output) [" << kDefaultOutputAlpha << "]" << std::endl; // NOLINT ! *stream << " -G G : gamma of mel-generalized cepstrum (output) [" << kDefaultOutputGamma << "]" << std::endl; // NOLINT *stream << " -C C : gamma of mel-generalized cepstrum = -1 / (int) C (output)" << std::endl; // NOLINT *stream << " -N : regard output as normalized mel-generalized cepstrum [" << sptk::ConvertBooleanToString(kDefaultOutputNormalizationFlag) << "]" << std::endl; // NOLINT --- 79,85 ---- *stream << " -n : regard input as normalized mel-generalized cepstrum [" << sptk::ConvertBooleanToString(kDefaultInputNormalizationFlag) << "]" << std::endl; // NOLINT *stream << " -u : regard input as multiplied by gamma [" << sptk::ConvertBooleanToString(kDefaultInputMultiplicationFlag) << "]" << std::endl; // NOLINT ! *stream << " -M M : order of mel-generalized cepstrum (output) [" << kDefaultOutputNumOrder << "]" << std::endl; // NOLINT ! *stream << " -A A : alpha of mel-generalized cepstrum (output) [" << kDefaultOutputAlpha << "]" << std::endl; // NOLINT ! *stream << " -G G : gamma of mel-generalized cepstrum (output) [" << kDefaultOutputGamma << "]" << std::endl; // NOLINT *stream << " -C C : gamma of mel-generalized cepstrum = -1 / (int) C (output)" << std::endl; // NOLINT *stream << " -N : regard output as normalized mel-generalized cepstrum [" << sptk::ConvertBooleanToString(kDefaultOutputNormalizationFlag) << "]" << std::endl; // NOLINT Index: c2mpir.cc =================================================================== RCS file: /cvsroot/sp-tk/SPTK4/src/c2mpir.cc,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** c2mpir.cc 15 Mar 2017 13:38:04 -0000 1.5 --- c2mpir.cc 2 May 2017 07:25:40 -0000 1.6 *************** *** 65,69 **** *stream << " c2mpir [ options ] [ infile ] > stdout" << std::endl; *stream << " options:" << std::endl; ! *stream << " -m m : order of cepstrum [" << kDefaultNumInputOrder << "]" << std::endl; // NOLINT *stream << " -M M : order of minimum phase impulse response [" << kDefaultNumOutputOrder << "]" << std::endl; // NOLINT *stream << " -l l : length of minimum phase impulse response [" << kDefaultNumOutputOrder + 1 << "]" << std::endl; // NOLINT --- 65,69 ---- *stream << " c2mpir [ options ] [ infile ] > stdout" << std::endl; *stream << " options:" << std::endl; ! *stream << " -m m : order of cepstrum [" << kDefaultNumInputOrder << "]" << std::endl; // NOLINT *stream << " -M M : order of minimum phase impulse response [" << kDefaultNumOutputOrder << "]" << std::endl; // NOLINT *stream << " -l l : length of minimum phase impulse response [" << kDefaultNumOutputOrder + 1 << "]" << std::endl; // NOLINT Index: freqt.cc =================================================================== RCS file: /cvsroot/sp-tk/SPTK4/src/freqt.cc,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** freqt.cc 15 Mar 2017 13:38:04 -0000 1.8 --- freqt.cc 2 May 2017 07:25:40 -0000 1.9 *************** *** 67,73 **** *stream << " freqt [ options ] [ infile ] > stdout" << std::endl; *stream << " options:" << std::endl; ! *stream << " -m m : order of minimum phase sequence [" << kDefaultNumInputOrder << "]" << std::endl; // NOLINT *stream << " -M M : order of warped sequence [" << kDefaultNumOutputOrder << "]" << std::endl; // NOLINT ! *stream << " -a a : all-pass constant of input sequence [" << kDefaultInputAlpha << "]" << std::endl; // NOLINT *stream << " -A A : all-pass constant of output sequence [" << kDefaultOutputAlpha << "]" << std::endl; // NOLINT *stream << " -h : print this message" << std::endl; --- 67,73 ---- *stream << " freqt [ options ] [ infile ] > stdout" << std::endl; *stream << " options:" << std::endl; ! *stream << " -m m : order of minimum phase sequence [" << kDefaultNumInputOrder << "]" << std::endl; // NOLINT *stream << " -M M : order of warped sequence [" << kDefaultNumOutputOrder << "]" << std::endl; // NOLINT ! *stream << " -a a : all-pass constant of input sequence [" << kDefaultInputAlpha << "]" << std::endl; // NOLINT *stream << " -A A : all-pass constant of output sequence [" << kDefaultOutputAlpha << "]" << std::endl; // NOLINT *stream << " -h : print this message" << std::endl; Index: lpc2c.cc =================================================================== RCS file: /cvsroot/sp-tk/SPTK4/src/lpc2c.cc,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** lpc2c.cc 15 Mar 2017 13:38:04 -0000 1.2 --- lpc2c.cc 2 May 2017 07:25:40 -0000 1.3 *************** *** 65,69 **** *stream << " lpc2c [ options ] [ infile ] > stdout" << std::endl; *stream << " options:" << std::endl; ! *stream << " -m m : order of linear predictive [" << kDefaultNumInputOrder << "]" << std::endl; // NOLINT *stream << " coefficients" << std::endl; *stream << " -M M : order of cepstrum [" << kDefaultNumOutputOrder << "]" << std::endl; // NOLINT --- 65,69 ---- *stream << " lpc2c [ options ] [ infile ] > stdout" << std::endl; *stream << " options:" << std::endl; ! *stream << " -m m : order of linear predictive [" << kDefaultNumInputOrder << "]" << std::endl; // NOLINT *stream << " coefficients" << std::endl; *stream << " -M M : order of cepstrum [" << kDefaultNumOutputOrder << "]" << std::endl; // NOLINT Index: mglsp2sp.cc =================================================================== RCS file: /cvsroot/sp-tk/SPTK4/src/mglsp2sp.cc,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** mglsp2sp.cc 2 May 2017 07:10:22 -0000 1.2 --- mglsp2sp.cc 2 May 2017 07:25:40 -0000 1.3 *************** *** 171,176 **** } case 'g': { ! const int min(-1.0); ! const int max(0.0); if (!sptk::ConvertStringToDouble(optarg, &gamma) || gamma < min || max <= gamma) { --- 171,176 ---- } case 'g': { ! const double min(-1.0); ! const double max(0.0); if (!sptk::ConvertStringToDouble(optarg, &gamma) || gamma < min || max <= gamma) { |
