Menu
▾
▴
[SPTK-CVS] SPTK4/src acorr.cc, 1.5, 1.6 b2mc.cc, 1.2, 1.3 c2mpir.cc, 1.6, 1.7 c2ndps.cc, 1.2, 1.3 decimate.cc, 1.1, 1.2 excite.cc, 1.8, 1.9 fft.cc, 1.16, 1.17 fftr.cc, 1.7, 1.8 gnorm.cc, 1.5, 1.6 ifft.cc, 1.10, 1.11 ignorm.cc, 1.5, 1.6 iulaw.cc, 1.1, 1.2 levdur.cc, 1.9, 1.10 lpc.cc, 1.8, 1.9 lpc2c.cc, 1.4, 1.5 lpc2lsp.cc, 1.4, 1.5 lpc2par.cc, 1.4, 1.5 lsp2lpc.cc, 1.4, 1.5 ltcdf.cc, 1.5, 1.6 mc2b.cc, 1.1, 1.2 merge.cc, 1.3, 1.4 mgc2mgc.cc, 1.8, 1.9 mgc2sp.cc, 1.6, 1.7 mglsp2sp.cc, 1.3, 1.4 mseq.cc, 1.6, 1.7 nan.cc, 1.2, 1.3 ndps2c.cc, 1.1, 1.2 nrand.cc, 1.5, 1.6 par2lpc.cc, 1.1, 1.2 poledf.cc, 1.8, 1.9 ulaw.cc, 1.1, 1.2 window.cc, 1.1, 1.2 zerodf.cc, 1.6, 1.7
Update of /cvsroot/sp-tk/SPTK4/src In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv32625 Modified Files: acorr.cc b2mc.cc c2mpir.cc c2ndps.cc decimate.cc excite.cc fft.cc fftr.cc gnorm.cc ifft.cc ignorm.cc iulaw.cc levdur.cc lpc.cc lpc2c.cc lpc2lsp.cc lpc2par.cc lsp2lpc.cc ltcdf.cc mc2b.cc merge.cc mgc2mgc.cc mgc2sp.cc mglsp2sp.cc mseq.cc nan.cc ndps2c.cc nrand.cc par2lpc.cc poledf.cc ulaw.cc window.cc zerodf.cc Log Message: update usage Index: mgc2mgc.cc =================================================================== RCS file: /cvsroot/sp-tk/SPTK4/src/mgc2mgc.cc,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** mgc2mgc.cc 2 May 2017 07:25:40 -0000 1.8 --- mgc2mgc.cc 22 Jun 2017 06:25:50 -0000 1.9 *************** *** 45,48 **** --- 45,49 ---- #include <getopt.h> #include <fstream> + #include <iomanip> #include <iostream> #include <sstream> *************** *** 73,96 **** *stream << " mgc2mgc [ options ] [ infile ] > stdout" << std::endl; *stream << " options:" << std::endl; ! *stream << " -m m : order of mel-generalized cepstrum (input) [" << kDefaultInputNumOrder << "]" << std::endl; // NOLINT ! *stream << " -a a : alpha of mel-generalized cepstrum (input) [" << kDefaultInputAlpha << "]" << std::endl; // NOLINT ! *stream << " -g g : gamma of mel-generalized cepstrum (input) [" << kDefaultInputGamma << "]" << std::endl; // NOLINT ! *stream << " -c c : gamma of mel-generalized cepstrum = -1 / (int) c (input)" << std::endl; // NOLINT ! *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 ! *stream << " -U : regard output as multiplied by gamma [" << sptk::ConvertBooleanToString(kDefaultOutputMultiplicationFlag) << "]" << std::endl; // NOLINT *stream << " -h : print this message" << std::endl; *stream << " infile:" << std::endl; ! *stream << " mel-generalized cepstrum (double) [stdin]" << std::endl; // NOLINT *stream << " stdout:" << std::endl; ! *stream << " transformed mel-generalized cepstrum (double)" << std::endl; // NOLINT *stream << " notice:" << std::endl; - *stream << " value of c must be c >= 1" << std::endl; - *stream << " value of C must be C >= 1" << std::endl; *stream << " if -u is used without -n, input is regarded as 1+g*mgc[0],g*mgc[1],...,g*mgc[m]" << std::endl; // NOLINT *stream << " if -U is used without -N, output is regarded as 1+g*mgc[0],g*mgc[1],...,g*mgc[m]" << std::endl; // NOLINT --- 74,95 ---- *stream << " mgc2mgc [ options ] [ infile ] > stdout" << std::endl; *stream << " options:" << std::endl; ! *stream << " -m m : order of mel-generalized cepstrum (input) ( int)[" << std::setw(5) << std::right << kDefaultInputNumOrder << "][ 0 <= m <= ]" << std::endl; // NOLINT ! *stream << " -a a : alpha of mel-generalized cepstrum (input) (double)[" << std::setw(5) << std::right << kDefaultInputAlpha << "][ <= a <= ]" << std::endl; // NOLINT ! *stream << " -g g : gamma of mel-generalized cepstrum (input) (double)[" << std::setw(5) << std::right << kDefaultInputGamma << "][ <= g <= ]" << std::endl; // NOLINT ! *stream << " -c c : gamma of mel-generalized cepstrum = -1 / c (input) ( int)[" << std::setw(5) << std::right << "N/A" << "][ 1 <= c <= ]" << std::endl; // NOLINT ! *stream << " -n : regard input as normalized mel-generalized cepstrum ( bool)[" << std::setw(5) << std::right << sptk::ConvertBooleanToString(kDefaultInputNormalizationFlag) << "]" << std::endl; // NOLINT ! *stream << " -u : regard input as multiplied by gamma ( bool)[" << std::setw(5) << std::right << sptk::ConvertBooleanToString(kDefaultInputMultiplicationFlag) << "]" << std::endl; // NOLINT ! *stream << " -M M : order of mel-generalized cepstrum (output) ( int)[" << std::setw(5) << std::right << kDefaultOutputNumOrder << "][ 0 <= M <= ]" << std::endl; // NOLINT ! *stream << " -A A : alpha of mel-generalized cepstrum (output) (double)[" << std::setw(5) << std::right << kDefaultOutputAlpha << "][ <= A <= ]" << std::endl; // NOLINT ! *stream << " -G G : gamma of mel-generalized cepstrum (output) (double)[" << std::setw(5) << std::right << kDefaultOutputGamma << "][ <= G <= ]" << std::endl; // NOLINT ! *stream << " -C C : gamma of mel-generalized cepstrum = -1 / C (output) ( int)[" << std::setw(5) << std::right << "N/A" << "][ 1 <= C <= ]" << std::endl; // NOLINT ! *stream << " -N : regard output as normalized mel-generalized cepstrum ( bool)[" << std::setw(5) << std::right << sptk::ConvertBooleanToString(kDefaultOutputNormalizationFlag) << "]" << std::endl; // NOLINT ! *stream << " -U : regard output as multiplied by gamma ( bool)[" << std::setw(5) << std::right << sptk::ConvertBooleanToString(kDefaultOutputMultiplicationFlag) << "]" << std::endl; // NOLINT *stream << " -h : print this message" << std::endl; *stream << " infile:" << std::endl; ! *stream << " mel-generalized cepstrum (double)[stdin]" << std::endl; // NOLINT *stream << " stdout:" << std::endl; ! *stream << " transformed mel-generalized cepstrum (double)" << std::endl; // NOLINT *stream << " notice:" << std::endl; *stream << " if -u is used without -n, input is regarded as 1+g*mgc[0],g*mgc[1],...,g*mgc[m]" << std::endl; // NOLINT *stream << " if -U is used without -N, output is regarded as 1+g*mgc[0],g*mgc[1],...,g*mgc[m]" << std::endl; // NOLINT Index: lpc2par.cc =================================================================== RCS file: /cvsroot/sp-tk/SPTK4/src/lpc2par.cc,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** lpc2par.cc 2 May 2017 07:10:22 -0000 1.4 --- lpc2par.cc 22 Jun 2017 06:25:50 -0000 1.5 *************** *** 45,48 **** --- 45,49 ---- #include <getopt.h> #include <fstream> + #include <iomanip> #include <iostream> #include <sstream> *************** *** 74,81 **** *stream << " lpc2par [ options ] [ infile ] > stdout" << std::endl; *stream << " options:" << std::endl; ! *stream << " -m m : order of linear predictive coefficients [" << kDefaultNumOrder << "]" << std::endl; // NOLINT ! *stream << " -g g : gamma of generalized cepstrum [" << kDefaultGamma << "]" << std::endl; // NOLINT ! *stream << " -c c : gamma of generalized cepstrum = -1 / (int) c" << std::endl; // NOLINT ! *stream << " -e e : check whether the derived PARCOR [" << kDefaultBehaviorForUnstableCoefficients << "]" << std::endl; // NOLINT *stream << " coefficients are stable" << std::endl; *stream << " 0 (the check is not performed)" << std::endl; --- 75,82 ---- *stream << " lpc2par [ options ] [ infile ] > stdout" << std::endl; *stream << " options:" << std::endl; ! *stream << " -m m : order of linear predictive coefficients ( int)[" << std::setw(5) << std::right << kDefaultNumOrder << "][ 0 <= m <= ]" << std::endl; // NOLINT ! *stream << " -g g : gamma of generalized cepstrum (double)[" << std::setw(5) << std::right << kDefaultGamma << "][ <= g <= ]" << std::endl; // NOLINT ! *stream << " -c c : gamma of generalized cepstrum = -1 / c ( int)[" << std::setw(5) << std::right << "N/A" << "][ 1 <= c <= ]" << std::endl; // NOLINT ! *stream << " -e e : check whether the derived PARCOR ( int)[" << std::setw(5) << std::right << kDefaultBehaviorForUnstableCoefficients << "][ 0 <= e <= 2 ]" << std::endl; // NOLINT *stream << " coefficients are stable" << std::endl; *stream << " 0 (the check is not performed)" << std::endl; *************** *** 87,95 **** *stream << " -h : print this message" << std::endl; *stream << " infile:" << std::endl; ! *stream << " linear predictive coefficients (double) [stdin]" << std::endl; // NOLINT *stream << " stdout:" << std::endl; ! *stream << " PARCOR coefficients (double)" << std::endl; ! *stream << " notice:" << std::endl; ! *stream << " value of c must be c >= 1" << std::endl; *stream << std::endl; *stream << " SPTK: version " << sptk::kVersion << std::endl; --- 88,94 ---- *stream << " -h : print this message" << std::endl; *stream << " infile:" << std::endl; ! *stream << " linear predictive coefficients (double)[stdin]" << std::endl; // NOLINT *stream << " stdout:" << std::endl; ! *stream << " PARCOR coefficients (double)" << std::endl; // NOLINT *stream << std::endl; *stream << " SPTK: version " << sptk::kVersion << std::endl; Index: par2lpc.cc =================================================================== RCS file: /cvsroot/sp-tk/SPTK4/src/par2lpc.cc,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** par2lpc.cc 23 Jan 2017 05:19:34 -0000 1.1 --- par2lpc.cc 22 Jun 2017 06:25:50 -0000 1.2 *************** *** 45,48 **** --- 45,49 ---- #include <unistd.h> #include <fstream> + #include <iomanip> #include <iostream> #include <sstream> *************** *** 64,73 **** *stream << " par2lpc [ options ] [ infile ] > stdout" << std::endl; *stream << " options:" << std::endl; ! *stream << " -m m : order of linear predictive coefficients [" << kDefaultNumOrder << "]" << std::endl; // NOLINT *stream << " -h : print this message" << std::endl; *stream << " infile:" << std::endl; ! *stream << " PARCOR coefficients (double) [stdin]" << std::endl; // NOLINT *stream << " stdout:" << std::endl; ! *stream << " linear predictive coefficients (double)" << std::endl; *stream << std::endl; *stream << " SPTK: version " << sptk::kVersion << std::endl; --- 65,74 ---- *stream << " par2lpc [ options ] [ infile ] > stdout" << std::endl; *stream << " options:" << std::endl; ! *stream << " -m m : order of linear predictive coefficients ( int)[" << std::setw(5) << std::right << kDefaultNumOrder << "][ 0 <= m <= ]" << std::endl; // NOLINT *stream << " -h : print this message" << std::endl; *stream << " infile:" << std::endl; ! *stream << " PARCOR coefficients (double)[stdin]" << std::endl; // NOLINT *stream << " stdout:" << std::endl; ! *stream << " linear predictive coefficients (double)" << std::endl; // NOLINT *stream << std::endl; *stream << " SPTK: version " << sptk::kVersion << std::endl; *************** *** 136,141 **** std::vector<double> linear_predictive_coefficients(length); ! for (int frame_index(0); ! sptk::ReadStream(false, length, &parcor_coefficients, &input_stream); ++frame_index) { if (!parcor_coefficients_to_linear_predictive_coefficients.Run( --- 137,142 ---- std::vector<double> linear_predictive_coefficients(length); ! for (int frame_index(0); sptk::ReadStream( ! false, 0, 0, length, &parcor_coefficients, &input_stream); ++frame_index) { if (!parcor_coefficients_to_linear_predictive_coefficients.Run( *************** *** 148,152 **** } ! if (!sptk::WriteStream(length, linear_predictive_coefficients, &std::cout)) { std::ostringstream error_message; --- 149,153 ---- } ! if (!sptk::WriteStream(0, length, linear_predictive_coefficients, &std::cout)) { std::ostringstream error_message; Index: nrand.cc =================================================================== RCS file: /cvsroot/sp-tk/SPTK4/src/nrand.cc,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** nrand.cc 15 Mar 2017 13:38:04 -0000 1.5 --- nrand.cc 22 Jun 2017 06:25:50 -0000 1.6 *************** *** 45,48 **** --- 45,49 ---- #include <getopt.h> #include <cmath> // std::sqrt + #include <iomanip> #include <iostream> #include <sstream> *************** *** 66,77 **** *stream << " nrand [ options ] > stdout" << std::endl; *stream << " options:" << std::endl; ! *stream << " -l l : output length [" << kDefaultOutputLength << "]" << std::endl; // NOLINT ! *stream << " -s s : seed [" << kDefaultSeed << "]" << std::endl; // NOLINT ! *stream << " -m m : mean [" << kDefaultMean << "]" << std::endl; // NOLINT ! *stream << " -v v : variance [" << kDefaultStandardDeviation * kDefaultStandardDeviation << "]" << std::endl; // NOLINT ! *stream << " -d d : standard deviation [" << kDefaultStandardDeviation << "]" << std::endl; // NOLINT *stream << " -h : print this message" << std::endl; *stream << " stdout:" << std::endl; ! *stream << " random values (double)" << std::endl; *stream << " notice:" << std::endl; *stream << " if l < 0, generate infinite sequence" << std::endl; --- 67,78 ---- *stream << " nrand [ options ] > stdout" << std::endl; *stream << " options:" << std::endl; ! *stream << " -l l : output length ( int)[" << std::setw(5) << std::right << kDefaultOutputLength << "][ <= l <= ]" << std::endl; // NOLINT ! *stream << " -s s : seed ( int)[" << std::setw(5) << std::right << kDefaultSeed << "][ <= s <= ]" << std::endl; // NOLINT ! *stream << " -m m : mean (double)[" << std::setw(5) << std::right << kDefaultMean << "][ <= m <= ]" << std::endl; // NOLINT ! *stream << " -v v : variance (double)[" << std::setw(5) << std::right << kDefaultStandardDeviation * kDefaultStandardDeviation << "][ <= v <= ]" << std::endl; // NOLINT ! *stream << " -d d : standard deviation (double)[" << std::setw(5) << std::right << kDefaultStandardDeviation << "][ <= d <= ]" << std::endl; // NOLINT *stream << " -h : print this message" << std::endl; *stream << " stdout:" << std::endl; ! *stream << " random values (double)" << std::endl; *stream << " notice:" << std::endl; *stream << " if l < 0, generate infinite sequence" << std::endl; Index: acorr.cc =================================================================== RCS file: /cvsroot/sp-tk/SPTK4/src/acorr.cc,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** acorr.cc 15 Mar 2017 13:38:04 -0000 1.5 --- acorr.cc 22 Jun 2017 06:25:50 -0000 1.6 *************** *** 45,48 **** --- 45,49 ---- #include <getopt.h> #include <fstream> + #include <iomanip> #include <iostream> #include <sstream> *************** *** 65,75 **** *stream << " acorr [ options ] [ infile ] > stdout" << std::endl; *stream << " options:" << std::endl; ! *stream << " -l l : frame length [" << kDefaultFrameLength << "]" << std::endl; // NOLINT ! *stream << " -m m : order of sequence [" << kDefaultNumOrder << "]" << std::endl; // NOLINT *stream << " -h : print this message" << std::endl; *stream << " infile:" << std::endl; ! *stream << " data sequence (double) [stdin]" << std::endl; *stream << " stdout:" << std::endl; ! *stream << " autocorrelation sequence (double)" << std::endl; *stream << std::endl; *stream << " SPTK: version " << sptk::kVersion << std::endl; --- 66,76 ---- *stream << " acorr [ options ] [ infile ] > stdout" << std::endl; *stream << " options:" << std::endl; ! *stream << " -l l : frame length ( int)[" << std::setw(5) << std::right << kDefaultFrameLength << "][ 0 < l <= ]" << std::endl; // NOLINT ! *stream << " -m m : order of sequence ( int)[" << std::setw(5) << std::right << kDefaultNumOrder << "][ 0 <= m <= ]" << std::endl; // NOLINT *stream << " -h : print this message" << std::endl; *stream << " infile:" << std::endl; ! *stream << " data sequence (double)[stdin]" << std::endl; *stream << " stdout:" << std::endl; ! *stream << " autocorrelation sequence (double)" << std::endl; *stream << std::endl; *stream << " SPTK: version " << sptk::kVersion << std::endl; Index: levdur.cc =================================================================== RCS file: /cvsroot/sp-tk/SPTK4/src/levdur.cc,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** levdur.cc 15 Mar 2017 13:38:04 -0000 1.9 --- levdur.cc 22 Jun 2017 06:25:50 -0000 1.10 *************** *** 45,48 **** --- 45,49 ---- #include <getopt.h> #include <fstream> + #include <iomanip> #include <iostream> #include <sstream> *************** *** 75,82 **** *stream << " levdur [ options ] [ infile ] > stdout" << std::endl; *stream << " options:" << std::endl; ! *stream << " -m m : order of autocorrelation [" << kDefaultNumOrder << "]" << std::endl; // NOLINT ! *stream << " -f f : minimum value of the determinant of [" << kDefaultEpsilon << "]" << std::endl; // NOLINT *stream << " normal matrix" << std::endl; ! *stream << " -e e : check whether the derived linear [" << kDefaultBehaviorForUnstableCoefficients << "]" << std::endl; // NOLINT *stream << " predictive coefficients are stable" << std::endl; *stream << " 0 (the check is not performed)" << std::endl; --- 76,83 ---- *stream << " levdur [ options ] [ infile ] > stdout" << std::endl; *stream << " options:" << std::endl; ! *stream << " -m m : order of autocorrelation ( int)[" << std::setw(5) << std::right << kDefaultNumOrder << "][ 0 <= m <= ]" << std::endl; // NOLINT ! *stream << " -f f : minimum value of the determinant of (double)[" << std::setw(5) << std::right << kDefaultEpsilon << "][ 0.0 <= f <= ]" << std::endl; // NOLINT *stream << " normal matrix" << std::endl; ! *stream << " -e e : check whether the derived linear ( int)[" << std::setw(5) << std::right << kDefaultBehaviorForUnstableCoefficients << "][ 0 <= e <= 2 ]" << std::endl; // NOLINT *stream << " predictive coefficients are stable" << std::endl; *stream << " 0 (the check is not performed)" << std::endl; *************** *** 88,94 **** *stream << " -h : print this message" << std::endl; *stream << " infile:" << std::endl; ! *stream << " autocorrelation sequence (double) [stdin]" << std::endl; // NOLINT *stream << " stdout:" << std::endl; ! *stream << " linear predictive coefficients (double)" << std::endl; *stream << std::endl; *stream << " SPTK: version " << sptk::kVersion << std::endl; --- 89,95 ---- *stream << " -h : print this message" << std::endl; *stream << " infile:" << std::endl; ! *stream << " autocorrelation sequence (double)[stdin]" << std::endl; // NOLINT *stream << " stdout:" << std::endl; ! *stream << " linear predictive coefficients (double)" << std::endl; // NOLINT *stream << std::endl; *stream << " SPTK: version " << sptk::kVersion << std::endl; Index: ndps2c.cc =================================================================== RCS file: /cvsroot/sp-tk/SPTK4/src/ndps2c.cc,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ndps2c.cc 19 Jun 2017 04:52:58 -0000 1.1 --- ndps2c.cc 22 Jun 2017 06:25:50 -0000 1.2 *************** *** 66,70 **** *stream << " ndps2c [ options ] [ infile ] > stdout" << std::endl; *stream << " options:" << std::endl; ! *stream << " -l l : FFT size ( int)[" << std::setw(5) << std::right << kDefaultFftSize << "][ 4 <= l <= ]" << std::endl; // NOLINT *stream << " -m m : order of cepstrum ( int)[" << std::setw(5) << std::right << kDefaultNumOrder << "][ 0 <= m <= l/2 ]" << std::endl; // NOLINT *stream << " -h : print this message" << std::endl; --- 66,70 ---- *stream << " ndps2c [ options ] [ infile ] > stdout" << std::endl; *stream << " options:" << std::endl; ! *stream << " -l l : FFT size ( int)[" << std::setw(5) << std::right << kDefaultFftSize << "][ 8 <= l <= ]" << std::endl; // NOLINT *stream << " -m m : order of cepstrum ( int)[" << std::setw(5) << std::right << kDefaultNumOrder << "][ 0 <= m <= l/2 ]" << std::endl; // NOLINT *stream << " -h : print this message" << std::endl; Index: iulaw.cc =================================================================== RCS file: /cvsroot/sp-tk/SPTK4/src/iulaw.cc,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** iulaw.cc 22 May 2017 03:44:10 -0000 1.1 --- iulaw.cc 22 Jun 2017 06:25:50 -0000 1.2 *************** *** 45,48 **** --- 45,49 ---- #include <getopt.h> #include <fstream> + #include <iomanip> #include <iostream> #include <sstream> *************** *** 65,75 **** *stream << " iulaw [ options ] [ infile ] > stdout" << std::endl; *stream << " options:" << std::endl; ! *stream << " -v v : absolute maximum of input [" << kDefaultAbsoluteMaxValue << "]" << std::endl; // NOLINT ! *stream << " -u u : compression factor [" << kDefaultCompressionFactor << "]" << std::endl; // NOLINT *stream << " -h : print this message" << std::endl; *stream << " infile:" << std::endl; ! *stream << " input sequence (double) [stdin]" << std::endl; *stream << " stdout:" << std::endl; ! *stream << " decompressed sequence (double)" << std::endl; *stream << std::endl; *stream << " SPTK: version " << sptk::kVersion << std::endl; --- 66,76 ---- *stream << " iulaw [ options ] [ infile ] > stdout" << std::endl; *stream << " options:" << std::endl; ! *stream << " -v v : absolute maximum of input (double)[" << std::setw(5) << std::right << kDefaultAbsoluteMaxValue << "][ 0.0 < v <= ]" << std::endl; // NOLINT ! *stream << " -u u : compression factor ( int)[" << std::setw(5) << std::right << kDefaultCompressionFactor << "][ 0 < u <= ]" << std::endl; // NOLINT *stream << " -h : print this message" << std::endl; *stream << " infile:" << std::endl; ! *stream << " input sequence (double)[stdin]" << std::endl; // NOLINT *stream << " stdout:" << std::endl; ! *stream << " decompressed sequence (double)" << std::endl; *stream << std::endl; *stream << " SPTK: version " << sptk::kVersion << std::endl; Index: lpc.cc =================================================================== RCS file: /cvsroot/sp-tk/SPTK4/src/lpc.cc,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** lpc.cc 15 Mar 2017 13:38:04 -0000 1.8 --- lpc.cc 22 Jun 2017 06:25:50 -0000 1.9 *************** *** 45,48 **** --- 45,49 ---- #include <getopt.h> #include <fstream> + #include <iomanip> #include <iostream> #include <sstream> *************** *** 76,84 **** *stream << " lpc [ options ] [ infile ] > stdout" << std::endl; *stream << " options:" << std::endl; ! *stream << " -l l : frame length [" << kDefaultFrameLength << "]" << std::endl; // NOLINT ! *stream << " -m m : order of linear predictive coefficients [" << kDefaultNumOrder << "]" << std::endl; // NOLINT ! *stream << " -f f : minimum value of the determinant of [" << kDefaultEpsilon << "]" << std::endl; // NOLINT *stream << " the normal matrix" << std::endl; ! *stream << " -e e : check whether the derived linear [" << kDefaultBehaviorForUnstableCoefficients << "]" << std::endl; // NOLINT *stream << " predictive coefficients are stable" << std::endl; *stream << " 0 (the check is not performed)" << std::endl; --- 77,85 ---- *stream << " lpc [ options ] [ infile ] > stdout" << std::endl; *stream << " options:" << std::endl; ! *stream << " -l l : frame length ( int)[" << std::setw(5) << std::right << kDefaultFrameLength << "][ 0 < l <= ]" << std::endl; // NOLINT ! *stream << " -m m : order of linear predictive coefficients ( int)[" << std::setw(5) << std::right << kDefaultNumOrder << "][ 0 <= m <= ]" << std::endl; // NOLINT ! *stream << " -f f : minimum value of the determinant of (double)[" << std::setw(5) << std::right << kDefaultEpsilon << "][ 0.0 <= f <= ]" << std::endl; // NOLINT *stream << " the normal matrix" << std::endl; ! *stream << " -e e : check whether the derived linear ( int)[" << std::setw(5) << std::right << kDefaultBehaviorForUnstableCoefficients << "][ 0 <= e <= 2 ]" << std::endl; // NOLINT *stream << " predictive coefficients are stable" << std::endl; *stream << " 0 (the check is not performed)" << std::endl; *************** *** 90,96 **** *stream << " -h : print this message" << std::endl; *stream << " infile:" << std::endl; ! *stream << " windowed sequence (double) [stdin]" << std::endl; // NOLINT *stream << " stdout:" << std::endl; ! *stream << " linear predictive coefficients (double)" << std::endl; *stream << std::endl; *stream << " SPTK: version " << sptk::kVersion << std::endl; --- 91,97 ---- *stream << " -h : print this message" << std::endl; *stream << " infile:" << std::endl; ! *stream << " windowed sequence (double)[stdin]" << std::endl; // NOLINT *stream << " stdout:" << std::endl; ! *stream << " linear predictive coefficients (double)" << std::endl; // NOLINT *stream << std::endl; *stream << " SPTK: version " << sptk::kVersion << std::endl; Index: ifft.cc =================================================================== RCS file: /cvsroot/sp-tk/SPTK4/src/ifft.cc,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** ifft.cc 19 Jun 2017 04:52:58 -0000 1.10 --- ifft.cc 22 Jun 2017 06:25:50 -0000 1.11 *************** *** 45,48 **** --- 45,49 ---- #include <getopt.h> #include <fstream> + #include <iomanip> #include <iostream> #include <sstream> *************** *** 72,77 **** *stream << " ifft [ options ] [ infile ] > stdout" << std::endl; *stream << " options:" << std::endl; ! *stream << " -l l : FFT size [" << kDefaultFftSize << "]" << std::endl; // NOLINT ! *stream << " -o o : output format [" << kDefaultOutputFormat << "]" << std::endl; // NOLINT *stream << " 0 (real and imaginary parts)" << std::endl; *stream << " 1 (real part)" << std::endl; --- 73,78 ---- *stream << " ifft [ options ] [ infile ] > stdout" << std::endl; *stream << " options:" << std::endl; ! *stream << " -l l : FFT size ( int)[" << std::setw(5) << std::right << kDefaultFftSize << "][ 4 <= l <= ]" << std::endl; // NOLINT ! *stream << " -o o : output format ( int)[" << std::setw(5) << std::right << kDefaultOutputFormat << "][ 0 <= o <= 2 ]" << std::endl; // NOLINT *stream << " 0 (real and imaginary parts)" << std::endl; *stream << " 1 (real part)" << std::endl; *************** *** 79,85 **** *stream << " -h : print this message" << std::endl; *stream << " infile:" << std::endl; ! *stream << " data sequence (double) [stdin]" << std::endl; // NOLINT *stream << " stdout:" << std::endl; ! *stream << " inverse FFT sequence (double)" << std::endl; *stream << " notice:" << std::endl; *stream << " value of l must be a power of 2" << std::endl; --- 80,86 ---- *stream << " -h : print this message" << std::endl; *stream << " infile:" << std::endl; ! *stream << " data sequence (double)[stdin]" << std::endl; // NOLINT *stream << " stdout:" << std::endl; ! *stream << " inverse FFT sequence (double)" << std::endl; // NOLINT *stream << " notice:" << std::endl; *stream << " value of l must be a power of 2" << std::endl; Index: c2mpir.cc =================================================================== RCS file: /cvsroot/sp-tk/SPTK4/src/c2mpir.cc,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** c2mpir.cc 2 May 2017 07:25:40 -0000 1.6 --- c2mpir.cc 22 Jun 2017 06:25:50 -0000 1.7 *************** *** 45,48 **** --- 45,49 ---- #include <getopt.h> #include <fstream> + #include <iomanip> #include <iostream> #include <sstream> *************** *** 65,76 **** *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 *stream << " -h : print this message" << std::endl; *stream << " infile:" << std::endl; ! *stream << " cepstrum (double) [stdin]" << std::endl; // NOLINT *stream << " stdout:" << std::endl; ! *stream << " minimum phase impulse response (double)" << std::endl; *stream << std::endl; *stream << " SPTK: version " << sptk::kVersion << std::endl; --- 66,77 ---- *stream << " c2mpir [ options ] [ infile ] > stdout" << std::endl; *stream << " options:" << std::endl; ! *stream << " -m m : order of cepstrum ( int)[" << std::setw(5) << std::right << kDefaultNumInputOrder << "][ 0 <= m <= ]" << std::endl; // NOLINT ! *stream << " -M M : order of minimum phase impulse response ( int)[" << std::setw(5) << std::right << kDefaultNumOutputOrder << "][ 0 <= M <= ]" << std::endl; // NOLINT ! *stream << " -l l : length of minimum phase impulse response ( int)[" << std::setw(5) << std::right << kDefaultNumOutputOrder + 1 << "][ 0 < l <= ]" << std::endl; // NOLINT *stream << " -h : print this message" << std::endl; *stream << " infile:" << std::endl; ! *stream << " cepstrum (double)[stdin]" << std::endl; // NOLINT *stream << " stdout:" << std::endl; ! *stream << " minimum phase impulse response (double)" << std::endl; // NOLINT *stream << std::endl; *stream << " SPTK: version " << sptk::kVersion << std::endl; *************** *** 117,121 **** std::ostringstream error_message; error_message ! << "The argument for the -M option must be bigger than 0"; sptk::PrintErrorMessage("c2mpir", error_message); return 1; --- 118,122 ---- std::ostringstream error_message; error_message ! << "The argument for the -l option must be a positive integer"; sptk::PrintErrorMessage("c2mpir", error_message); return 1; Index: excite.cc =================================================================== RCS file: /cvsroot/sp-tk/SPTK4/src/excite.cc,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** excite.cc 10 May 2017 11:36:20 -0000 1.8 --- excite.cc 22 Jun 2017 06:25:50 -0000 1.9 *************** *** 45,48 **** --- 45,49 ---- #include <getopt.h> #include <fstream> + #include <iomanip> #include <iostream> #include <sstream> *************** *** 70,85 **** *stream << " excite [ options ] [ infile ] > stdout" << std::endl; *stream << " options:" << std::endl; ! *stream << " -p p : frame period [" << kDefaultFramePeriod << "]" << std::endl; // NOLINT ! *stream << " -i i : interpolation period [" << kDefaultInterpolationPeriod << "]" << std::endl; // NOLINT ! *stream << " -n : use gauss noise for unvoiced frame [" << sptk::ConvertBooleanToString(kDefaultFlagToUseNormalDistributedRandomValue) << "]" << std::endl; // NOLINT *stream << " default is M-sequence" << std::endl; ! *stream << " -s : seed for random generation [" << kDefaultSeed << "]" << std::endl; // NOLINT *stream << " -h : print this message" << std::endl; *stream << " infile:" << std::endl; ! *stream << " pitch period (double) [stdin]" << std::endl; // NOLINT *stream << " stdout:" << std::endl; ! *stream << " excitation (double)" << std::endl; *stream << " notice:" << std::endl; ! *stream << " if i < 0, don't interpolate pitch" << std::endl; *stream << " magic number for unvoiced frame is " << kMagicNumberForUnvoicedFrame << std::endl; // NOLINT *stream << std::endl; --- 71,86 ---- *stream << " excite [ options ] [ infile ] > stdout" << std::endl; *stream << " options:" << std::endl; ! *stream << " -p p : frame period ( int)[" << std::setw(5) << std::right << kDefaultFramePeriod << "][ 0 < p <= ]" << std::endl; // NOLINT ! *stream << " -i i : interpolation period ( int)[" << std::setw(5) << std::right << kDefaultInterpolationPeriod << "][ 0 <= i <= p/2 ]" << std::endl; // NOLINT ! *stream << " -n : use gauss noise for unvoiced frame ( bool)[" << std::setw(5) << std::right << sptk::ConvertBooleanToString(kDefaultFlagToUseNormalDistributedRandomValue) << "]" << std::endl; // NOLINT *stream << " default is M-sequence" << std::endl; ! *stream << " -s s : seed for random generation ( int)[" << std::setw(5) << std::right << kDefaultSeed << "][ <= s <= ]" << std::endl; // NOLINT *stream << " -h : print this message" << std::endl; *stream << " infile:" << std::endl; ! *stream << " pitch period (double)[stdin]" << std::endl; // NOLINT *stream << " stdout:" << std::endl; ! *stream << " excitation (double)" << std::endl; // NOLINT *stream << " notice:" << std::endl; ! *stream << " if i = 0, don't interpolate pitch" << std::endl; *stream << " magic number for unvoiced frame is " << kMagicNumberForUnvoicedFrame << std::endl; // NOLINT *stream << std::endl; Index: merge.cc =================================================================== RCS file: /cvsroot/sp-tk/SPTK4/src/merge.cc,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** merge.cc 10 May 2017 11:36:20 -0000 1.3 --- merge.cc 22 Jun 2017 06:25:50 -0000 1.4 *************** *** 96,106 **** *stream << " merge [ options ] file1 [ infile ] > stdout" << std::endl; *stream << " options:" << std::endl; ! *stream << " -s s : insert point [" << kDefaultInsertPoint << "]" << std::endl; // NOLINT ! *stream << " -l l : frame length of input data [" << kDefaultFrameLengthOfInputData << "]" << std::endl; // NOLINT ! *stream << " -n n : order of input data [l-1]" << std::endl; ! *stream << " -L L : frame length of insert data [" << kDefaultFrameLengthOfInsertData << "]" << std::endl; // NOLINT ! *stream << " -N N : order of insert data [L-1]" << std::endl; ! *stream << " -w : overwrite mode [" << sptk::ConvertBooleanToString(kDefaultOverwriteMode) << "]" << std::endl; // NOLINT ! *stream << " +type : data type [" << kDefaultDataType << "]" << std::endl; // NOLINT *stream << " "; PrintDataType("c", "char", stream); PrintDataType("C", "unsigned char", stream); *stream << std::endl; // NOLINT *stream << " "; PrintDataType("s", "short", stream); PrintDataType("S", "unsigned short", stream); *stream << std::endl; // NOLINT --- 96,106 ---- *stream << " merge [ options ] file1 [ infile ] > stdout" << std::endl; *stream << " options:" << std::endl; ! *stream << " -s s : insert point ( int)[" << std::setw(5) << std::right << kDefaultInsertPoint << "][ 0 <= s <= l ]" << std::endl; // NOLINT ! *stream << " -l l : frame length of input data ( int)[" << std::setw(5) << std::right << kDefaultFrameLengthOfInputData << "][ 0 < l <= ]" << std::endl; // NOLINT ! *stream << " -n n : order of input data ( int)[" << std::setw(5) << std::right << "l-1" << "][ 0 <= n <= ]" << std::endl; // NOLINT ! *stream << " -L L : frame length of insert data ( int)[" << std::setw(5) << std::right << kDefaultFrameLengthOfInsertData << "][ 0 < L <= ]" << std::endl; // NOLINT ! *stream << " -N N : order of insert data ( int)[" << std::setw(5) << std::right << "L-1" << "][ 0 <= N <= ]" << std::endl; // NOLINT ! *stream << " -w : overwrite mode ( bool)[" << std::setw(5) << std::right << sptk::ConvertBooleanToString(kDefaultOverwriteMode) << "]" << std::endl; // NOLINT ! *stream << " +type : data type [" << std::setw(5) << std::right << kDefaultDataType << "]" << std::endl; // NOLINT *stream << " "; PrintDataType("c", "char", stream); PrintDataType("C", "unsigned char", stream); *stream << std::endl; // NOLINT *stream << " "; PrintDataType("s", "short", stream); PrintDataType("S", "unsigned short", stream); *stream << std::endl; // NOLINT *************** *** 114,118 **** *stream << " insert data sequence" << std::endl; *stream << " infile:" << std::endl; ! *stream << " input data sequence [stdin]" << std::endl; *stream << " stdout:" << std::endl; *stream << " merged data sequence" << std::endl; --- 114,118 ---- *stream << " insert data sequence" << std::endl; *stream << " infile:" << std::endl; ! *stream << " input data sequence [stdin]" << std::endl; // NOLINT *stream << " stdout:" << std::endl; *stream << " merged data sequence" << std::endl; Index: mgc2sp.cc =================================================================== RCS file: /cvsroot/sp-tk/SPTK4/src/mgc2sp.cc,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** mgc2sp.cc 19 Jun 2017 04:52:58 -0000 1.6 --- mgc2sp.cc 22 Jun 2017 06:25:50 -0000 1.7 *************** *** 48,51 **** --- 48,52 ---- #include <fstream> #include <functional> + #include <iomanip> #include <iostream> #include <sstream> *************** *** 84,96 **** *stream << " mgc2sp [ options ] [ infile ] > stdout" << std::endl; *stream << " options:" << std::endl; ! *stream << " -m m : order of mel-generalized cepstrum [" << kDefaultNumOrder << "]" << std::endl; // NOLINT ! *stream << " -a a : alpha of mel-generalized cepstrum [" << kDefaultAlpha << "]" << std::endl; // NOLINT ! *stream << " -g g : gamma of mel-generalized cepstrum [" << kDefaultGamma << "]" << std::endl; // NOLINT ! *stream << " -c c : gamma of mel-generalized cepstrum = -1 / (int) c" << std::endl; // NOLINT ! *stream << " -n : regard input as normalized [" << sptk::ConvertBooleanToString(kDefaultNormalizationFlag) << "]" << std::endl; // NOLINT *stream << " mel-generalized cepstrum" << std::endl; ! *stream << " -u : regard input as multiplied by gamma [" << sptk::ConvertBooleanToString(kDefaultMultiplicationFlag) << "]" << std::endl; // NOLINT ! *stream << " -l l : FFT size [" << kDefaultFftSize << "]" << std::endl; // NOLINT ! *stream << " -o o : output format [" << kDefaultOutputFormat << "]" << std::endl; // NOLINT *stream << " 0 (20*log|H(z)|)" << std::endl; *stream << " 1 (ln|H(z)|)" << std::endl; --- 85,97 ---- *stream << " mgc2sp [ options ] [ infile ] > stdout" << std::endl; *stream << " options:" << std::endl; ! *stream << " -m m : order of mel-generalized cepstrum ( int)[" << std::setw(5) << std::right << kDefaultNumOrder << "][ 0 <= m <= ]" << std::endl; // NOLINT ! *stream << " -a a : alpha of mel-generalized cepstrum (double)[" << std::setw(5) << std::right << kDefaultAlpha << "][ <= a <= ]" << std::endl; // NOLINT ! *stream << " -g g : gamma of mel-generalized cepstrum (double)[" << std::setw(5) << std::right << kDefaultGamma << "][ <= g <= ]" << std::endl; // NOLINT ! *stream << " -c c : gamma of mel-generalized cepstrum = -1 / c ( int)[" << std::setw(5) << std::right << "N/A" << "][ 1 <= c <= ]" << std::endl; // NOLINT ! *stream << " -n : regard input as normalized ( bool)[" << std::setw(5) << std::right << sptk::ConvertBooleanToString(kDefaultNormalizationFlag) << "]" << std::endl; // NOLINT *stream << " mel-generalized cepstrum" << std::endl; ! *stream << " -u : regard input as multiplied by gamma ( bool)[" << std::setw(5) << std::right << sptk::ConvertBooleanToString(kDefaultMultiplicationFlag) << "]" << std::endl; // NOLINT ! *stream << " -l l : FFT size ( int)[" << std::setw(5) << std::right << kDefaultFftSize << "][ <= l <= ]" << std::endl; // NOLINT ! *stream << " -o o : output format ( int)[" << std::setw(5) << std::right << kDefaultOutputFormat << "][ 0 <= o <= 6 ]" << std::endl; // NOLINT *stream << " 0 (20*log|H(z)|)" << std::endl; *stream << " 1 (ln|H(z)|)" << std::endl; *************** *** 102,111 **** *stream << " -h : print this message" << std::endl; *stream << " infile:" << std::endl; ! *stream << " mel-generalized cepstrum (double) [stdin]" << std::endl; // NOLINT *stream << " stdout:" << std::endl; ! *stream << " spectrum (double)" << std::endl; *stream << " notice:" << std::endl; *stream << " value of l must be a power of 2" << std::endl; - *stream << " value of c must be c >= 1" << std::endl; *stream << " if -u is used without -n, input is regarded as 1+g/mgc[0],g*mgc[1],...,g*mgc[m]" << std::endl; // NOLINT *stream << std::endl; --- 103,111 ---- *stream << " -h : print this message" << std::endl; *stream << " infile:" << std::endl; ! *stream << " mel-generalized cepstrum (double)[stdin]" << std::endl; // NOLINT *stream << " stdout:" << std::endl; ! *stream << " spectrum (double)" << std::endl; // NOLINT *stream << " notice:" << std::endl; *stream << " value of l must be a power of 2" << std::endl; *stream << " if -u is used without -n, input is regarded as 1+g/mgc[0],g*mgc[1],...,g*mgc[m]" << std::endl; // NOLINT *stream << std::endl; Index: ltcdf.cc =================================================================== RCS file: /cvsroot/sp-tk/SPTK4/src/ltcdf.cc,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** ltcdf.cc 10 May 2017 11:36:20 -0000 1.5 --- ltcdf.cc 22 Jun 2017 06:25:50 -0000 1.6 *************** *** 45,48 **** --- 45,49 ---- #include <getopt.h> #include <fstream> + #include <iomanip> #include <iostream> #include <sstream> *************** *** 70,84 **** *stream << " ltcdf [ options ] kfile [ infile ] > stdout" << std::endl; *stream << " options:" << std::endl; ! *stream << " -m m : order of filter coefficients [" << kDefaultNumFilterOrder << "]" << std::endl; // NOLINT ! *stream << " -p p : frame period [" << kDefaultFramePeriod << "]" << std::endl; // NOLINT ! *stream << " -i i : interpolation period [" << kDefaultInterpolationPeriod << "]" << std::endl; // NOLINT ! *stream << " -k : filtering without gain [" << sptk::ConvertBooleanToString(!kDefaultGainFlag) << "]" << std::endl; // NOLINT *stream << " -h : print this message" << std::endl; *stream << " infile:" << std::endl; ! *stream << " filter input (double) [stdin]" << std::endl; *stream << " stdout:" << std::endl; ! *stream << " filter output (double)" << std::endl; *stream << " kfile:" << std::endl; ! *stream << " filter (PARCOR) coefficients (double)" << std::endl; *stream << std::endl; *stream << " SPTK: version " << sptk::kVersion << std::endl; --- 71,87 ---- *stream << " ltcdf [ options ] kfile [ infile ] > stdout" << std::endl; *stream << " options:" << std::endl; ! *stream << " -m m : order of filter coefficients ( int)[" << std::setw(5) << std::right << kDefaultNumFilterOrder << "][ 0 <= m <= ]" << std::endl; // NOLINT ! *stream << " -p p : frame period ( int)[" << std::setw(5) << std::right << kDefaultFramePeriod << "][ 0 < p <= ]" << std::endl; // NOLINT ! *stream << " -i i : interpolation period ( int)[" << std::setw(5) << std::right << kDefaultInterpolationPeriod << "][ 0 <= i <= p/2 ]" << std::endl; // NOLINT ! *stream << " -k : filtering without gain ( bool)[" << std::setw(5) << std::right << sptk::ConvertBooleanToString(!kDefaultGainFlag) << "]" << std::endl; // NOLINT *stream << " -h : print this message" << std::endl; *stream << " infile:" << std::endl; ! *stream << " filter input (double)[stdin]" << std::endl; // NOLINT *stream << " stdout:" << std::endl; ! *stream << " filter output (double)" << std::endl; // NOLINT *stream << " kfile:" << std::endl; ! *stream << " filter (PARCOR) coefficients (double)" << std::endl; // NOLINT ! *stream << " notice:" << std::endl; ! *stream << " if i = 0, don't interpolate filter coefficients" << std::endl; // NOLINT *stream << std::endl; *stream << " SPTK: version " << sptk::kVersion << std::endl; Index: c2ndps.cc =================================================================== RCS file: /cvsroot/sp-tk/SPTK4/src/c2ndps.cc,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** c2ndps.cc 19 Jun 2017 04:52:58 -0000 1.2 --- c2ndps.cc 22 Jun 2017 06:25:50 -0000 1.3 *************** *** 75,79 **** *stream << " options:" << std::endl; *stream << " -m m : order of cepstrum ( int)[" << std::setw(5) << std::right << kDefaultNumOrder << "][ 0 <= m <= l/2 ]" << std::endl; // NOLINT ! *stream << " -l l : FFT size ( int)[" << std::setw(5) << std::right << kDefaultFftSize << "][ 4 <= l <= ]" << std::endl; // NOLINT *stream << " -o o : output format ( int)[" << std::setw(5) << std::right << kDefaultOutputFormat << "][ 0 <= o <= 2 ]" << std::endl; // NOLINT *stream << " 0 (pole and zero parts)" << std::endl; --- 75,79 ---- *stream << " options:" << std::endl; *stream << " -m m : order of cepstrum ( int)[" << std::setw(5) << std::right << kDefaultNumOrder << "][ 0 <= m <= l/2 ]" << std::endl; // NOLINT ! *stream << " -l l : FFT size ( int)[" << std::setw(5) << std::right << kDefaultFftSize << "][ 8 <= l <= ]" << std::endl; // NOLINT *stream << " -o o : output format ( int)[" << std::setw(5) << std::right << kDefaultOutputFormat << "][ 0 <= o <= 2 ]" << std::endl; // NOLINT *stream << " 0 (pole and zero parts)" << std::endl; Index: mglsp2sp.cc =================================================================== RCS file: /cvsroot/sp-tk/SPTK4/src/mglsp2sp.cc,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** mglsp2sp.cc 2 May 2017 07:25:40 -0000 1.3 --- mglsp2sp.cc 22 Jun 2017 06:25:50 -0000 1.4 *************** *** 48,51 **** --- 48,52 ---- #include <fstream> #include <functional> + #include <iomanip> #include <iostream> #include <sstream> *************** *** 97,116 **** *stream << " mglsp2sp [ options ] [ infile ] > stdout" << std::endl; *stream << " options:" << std::endl; ! *stream << " -m m : order of mel-generalized line spectral pairs [" << kDefaultNumOrder << "]" << std::endl; // NOLINT ! *stream << " -a a : alpha of mel-generalized line spectral pairs [" << kDefaultAlpha << "]" << std::endl; // NOLINT ! *stream << " -g g : gamma of mel-generalized line spectral pairs [" << kDefaultGamma << "]" << std::endl; // NOLINT ! *stream << " -c c : gamma of mel-generalized line spectral pairs = -1 / (int) c" << std::endl; // NOLINT ! *stream << " -l l : spectrum legnth [" << kDefaultSpectrumLength << "]" << std::endl; // NOLINT ! *stream << " -s s : sampling frequency [" << kDefaultSamplingFrequency << "]" << std::endl; // NOLINT ! *stream << " -k k : input gain type [" << kDefaultInputGainType << "]" << std::endl; // NOLINT *stream << " 0 (linear gain)" << std::endl; *stream << " 1 (log gain)" << std::endl; *stream << " 2 (without gain)" << std::endl; ! *stream << " -q q : input format [" << kDefaultInputFormat << "]" << std::endl; // NOLINT *stream << " 0 (normalized frequency [0...pi])" << std::endl; *stream << " 1 (normalized frequency [0...1/2])" << std::endl; *stream << " 2 (frequency [kHz])" << std::endl; *stream << " 3 (frequency [Hz])" << std::endl; ! *stream << " -o o : output format [" << kDefaultOutputFormat << "]" << std::endl; // NOLINT *stream << " 0 (20*log|H(z)|)" << std::endl; *stream << " 1 (ln|H(z)|)" << std::endl; --- 98,117 ---- *stream << " mglsp2sp [ options ] [ infile ] > stdout" << std::endl; *stream << " options:" << std::endl; ! *stream << " -m m : order of mel-generalized line spectral pairs ( int)[" << std::setw(5) << std::right << kDefaultNumOrder << "][ 0 <= m <= ]" << std::endl; // NOLINT ! *stream << " -a a : alpha of mel-generalized line spectral pairs (double)[" << std::setw(5) << std::right << kDefaultAlpha << "][ <= a <= ]" << std::endl; // NOLINT ! *stream << " -g g : gamma of mel-generalized line spectral pairs (double)[" << std::setw(5) << std::right << kDefaultGamma << "][ -1.0 <= g <= 0.0 ]" << std::endl; // NOLINT ! *stream << " -c c : gamma of mel-generalized line spectral pairs = -1 / c ( int)[" << std::setw(5) << std::right << "N/A" << "][ 1 <= c <= ]" << std::endl; // NOLINT ! *stream << " -l l : spectrum legnth ( int)[" << std::setw(5) << std::right << kDefaultSpectrumLength << "][ 0 < l <= ]" << std::endl; // NOLINT ! *stream << " -s s : sampling frequency (double)[" << std::setw(5) << std::right << kDefaultSamplingFrequency << "][ 0.0 < s <= ]" << std::endl; // NOLINT ! *stream << " -k k : input gain type ( int)[" << std::setw(5) << std::right << kDefaultInputGainType << "][ 0 <= k <= 2 ]" << std::endl; // NOLINT *stream << " 0 (linear gain)" << std::endl; *stream << " 1 (log gain)" << std::endl; *stream << " 2 (without gain)" << std::endl; ! *stream << " -q q : input format ( int)[" << std::setw(5) << std::right << kDefaultInputFormat << "][ 0 <= q <= 3 ]" << std::endl; // NOLINT *stream << " 0 (normalized frequency [0...pi])" << std::endl; *stream << " 1 (normalized frequency [0...1/2])" << std::endl; *stream << " 2 (frequency [kHz])" << std::endl; *stream << " 3 (frequency [Hz])" << std::endl; ! *stream << " -o o : output format ( int)[" << std::setw(5) << std::right << kDefaultOutputFormat << "][ 0 <= o <= 3 ]" << std::endl; // NOLINT *stream << " 0 (20*log|H(z)|)" << std::endl; *stream << " 1 (ln|H(z)|)" << std::endl; *************** *** 119,129 **** *stream << " -h : print this message" << std::endl; *stream << " infile:" << std::endl; ! *stream << " mel-generalized line spectral pairs (double) [stdin]" << std::endl; // NOLINT *stream << " stdout:" << std::endl; ! *stream << " spectrum (double)" << std::endl; *stream << " notice:" << std::endl; *stream << " if k is 2, input length in a frame is assumed to be m instead of m+1" << std::endl; // NOLINT - *stream << " value of c must be c >= 1" << std::endl; - *stream << " value of g must be 0 > g >= -1" << std::endl; *stream << std::endl; *stream << " SPTK: version " << sptk::kVersion << std::endl; --- 120,128 ---- *stream << " -h : print this message" << std::endl; *stream << " infile:" << std::endl; ! *stream << " mel-generalized line spectral pairs (double)[stdin]" << std::endl; // NOLINT *stream << " stdout:" << std::endl; ! *stream << " spectrum (double)" << std::endl; // NOLINT *stream << " notice:" << std::endl; *stream << " if k is 2, input length in a frame is assumed to be m instead of m+1" << std::endl; // NOLINT *stream << std::endl; *stream << " SPTK: version " << sptk::kVersion << std::endl; Index: decimate.cc =================================================================== RCS file: /cvsroot/sp-tk/SPTK4/src/decimate.cc,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** decimate.cc 12 May 2017 08:29:28 -0000 1.1 --- decimate.cc 22 Jun 2017 06:25:50 -0000 1.2 *************** *** 45,48 **** --- 45,49 ---- #include <getopt.h> #include <fstream> + #include <iomanip> #include <iostream> #include <sstream> *************** *** 65,76 **** *stream << " decimate [ options ] [ infile ] > stdout" << std::endl; *stream << " options:" << std::endl; ! *stream << " -s s : start index [" << kDefaultStartIndex << "]" << std::endl; // NOLINT ! *stream << " -l l : length of vector [" << kDefaultVectorLength << "]" << std::endl; // NOLINT ! *stream << " -p p : decimation period [" << kDefaultDecimationPeriod << "]" << std::endl; // NOLINT *stream << " -h : print this message" << std::endl; *stream << " infile:" << std::endl; ! *stream << " data sequence [stdin]" << std::endl; *stream << " stdout:" << std::endl; ! *stream << " decimated data sequence" << std::endl; *stream << std::endl; *stream << " SPTK: version " << sptk::kVersion << std::endl; --- 66,77 ---- *stream << " decimate [ options ] [ infile ] > stdout" << std::endl; *stream << " options:" << std::endl; ! *stream << " -s s : start index ( int)[" << std::setw(5) << std::right << kDefaultStartIndex << "][ 0 <= s <= ]" << std::endl; // NOLINT ! *stream << " -l l : length of vector ( int)[" << std::setw(5) << std::right << kDefaultVectorLength << "][ 0 < l <= ]" << std::endl; // NOLINT ! *stream << " -p p : decimation period ( int)[" << std::setw(5) << std::right << kDefaultDecimationPeriod << "][ 0 < p <= ]" << std::endl; // NOLINT *stream << " -h : print this message" << std::endl; *stream << " infile:" << std::endl; ! *stream << " data sequence (double)[stdin]" << std::endl; *stream << " stdout:" << std::endl; ! *stream << " decimated data sequence (double)" << std::endl; *stream << std::endl; *stream << " SPTK: version " << sptk::kVersion << std::endl; Index: lsp2lpc.cc =================================================================== RCS file: /cvsroot/sp-tk/SPTK4/src/lsp2lpc.cc,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** lsp2lpc.cc 2 May 2017 07:10:22 -0000 1.4 --- lsp2lpc.cc 22 Jun 2017 06:25:50 -0000 1.5 *************** *** 48,51 **** --- 48,52 ---- #include <fstream> #include <functional> + #include <iomanip> #include <iostream> #include <sstream> *************** *** 86,96 **** *stream << " lsp2lpc [ options ] [ infile ] > stdout" << std::endl; *stream << " options:" << std::endl; ! *stream << " -m m : order of line spectral pairs [" << kDefaultNumOrder << "]" << std::endl; // NOLINT ! *stream << " -s s : sampling frequency [" << kDefaultSamplingFrequency << "]" << std::endl; // NOLINT ! *stream << " -k k : input gain type [" << kDefaultInputGainType << "]" << std::endl; // NOLINT *stream << " 0 (linear gain)" <... [truncated message content] |
