Menu
▾
▴
[SPTK-CVS] SPTK4/src window.cc, NONE, 1.1 data_windowing.cc, 1.1, 1.2 fft.cc, 1.13, 1.14 fftr.cc, 1.4, 1.5
|
From: Takenori Y. <tak...@us...> - 2017-05-11 01:30:45
|
Update of /cvsroot/sp-tk/SPTK4/src In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv18881 Modified Files: data_windowing.cc fft.cc fftr.cc Added Files: window.cc Log Message: add window command Index: data_windowing.cc =================================================================== RCS file: /cvsroot/sp-tk/SPTK4/src/data_windowing.cc,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** data_windowing.cc 9 May 2017 07:18:07 -0000 1.1 --- data_windowing.cc 11 May 2017 01:30:43 -0000 1.2 *************** *** 59,63 **** num_output_order_(num_output_order), is_valid_(true) { ! if (num_input_order_ < 0 || num_output_order_ < 0) { is_valid_ = false; return; --- 59,63 ---- num_output_order_(num_output_order), is_valid_(true) { ! if (num_input_order_ < 0 || num_output_order_ < num_input_order_) { is_valid_ = false; return; *************** *** 145,158 **** } - const int valid_length(input_length <= output_length ? input_length - : output_length); - // apply window ! std::transform(data_sequence.begin(), data_sequence.begin() + valid_length, window_.begin(), windowed_data_sequence->begin(), std::multiplies<double>()); // fill zero ! std::fill(windowed_data_sequence->begin() + valid_length, windowed_data_sequence->end(), 0.0); --- 145,155 ---- } // apply window ! std::transform(data_sequence.begin(), data_sequence.begin() + input_length, window_.begin(), windowed_data_sequence->begin(), std::multiplies<double>()); // fill zero ! std::fill(windowed_data_sequence->begin() + input_length, windowed_data_sequence->end(), 0.0); --- NEW FILE: window.cc --- // ----------------------------------------------------------------- // // The Speech Signal Processing Toolkit (SPTK) // // developed by SPTK Working Group // // http://sp-tk.sourceforge.net/ // // ----------------------------------------------------------------- // // // // Copyright (c) 1984-2007 Tokyo Institute of Technology // // Interdisciplinary Graduate School of // // Science and Engineering // // // // 1996-2017 Nagoya Institute of Technology // // Department of Computer Science // // // // All rights reserved. // // // // Redistribution and use in source and binary forms, with or // // without modification, are permitted provided that the following // // conditions are met: // // // // - Redistributions of source code must retain the above copyright // // notice, this list of conditions and the following disclaimer. // // - Redistributions in binary form must reproduce the above // // copyright notice, this list of conditions and the following // // disclaimer in the documentation and/or other materials provided // // with the distribution. // // - Neither the name of the SPTK working group nor the names of its // // contributors may be used to endorse or promote products derived // // from this software without specific prior written permission. // // // // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND // // CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, // // INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF // // MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE // // DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS // // BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, // // EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED // // TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, // // DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON // // ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, // // OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY // // OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE // // POSSIBILITY OF SUCH DAMAGE. // // ----------------------------------------------------------------- // #include <getopt.h> #include <fstream> #include <iostream> #include <sstream> #include <vector> #include "data_windowing.h" #include "sptk_utils.h" namespace { const int kDefaultFrameLength(256); const sptk::DataWindowing::NormalizationType kDefaultNormalizationType( sptk::DataWindowing::NormalizationType::kPower); const sptk::DataWindowing::WindowType kDefaultWindowType( sptk::DataWindowing::WindowType::kBlackman); void PrintUsage(std::ostream* stream) { // clang-format off *stream << std::endl; *stream << " window - data windowing" << std::endl; *stream << std::endl; *stream << " usage:" << std::endl; *stream << " window [ options ] [ infile ] > stdout" << std::endl; *stream << " options:" << std::endl; *stream << " -l l : frame length of data sequence [" << kDefaultFrameLength << "]" << std::endl; // NOLINT *stream << " -L L : frame length of windowed data sequence [l]" << std::endl; // NOLINT *stream << " -n n : normalization type [" << kDefaultNormalizationType << "]" << std::endl; // NOLINT *stream << " 0 (none)" << std::endl; *stream << " 1 (power)" << std::endl; *stream << " 2 (magnitude)" << std::endl; *stream << " -w w : window type [" << kDefaultWindowType << "]" << std::endl; // NOLINT *stream << " 0 (Blackman)" << std::endl; *stream << " 1 (Hamming)" << std::endl; *stream << " 2 (Hanning)" << std::endl; *stream << " 3 (Bartlett)" << std::endl; *stream << " 4 (trapezoidal)" << std::endl; *stream << " 5 (rectangular)" << std::endl; *stream << " -h : print this message" << std::endl; *stream << " infile:" << std::endl; *stream << " data sequence (double) [stdin]" << std::endl; // NOLINT *stream << " stdout:" << std::endl; *stream << " windowed data sequence (double)" << std::endl; *stream << " notice:" << std::endl; *stream << " if -L is specified, the given frame length must satisfy L >= l" << std::endl; // NOLINT *stream << std::endl; *stream << " SPTK: version " << sptk::kVersion << std::endl; *stream << std::endl; // clang-format on } } // namespace int main(int argc, char* argv[]) { int input_length(kDefaultFrameLength); int output_length(kDefaultFrameLength); bool is_output_length_specified(false); sptk::DataWindowing::NormalizationType normalization_type( kDefaultNormalizationType); sptk::DataWindowing::WindowType window_type(kDefaultWindowType); for (;;) { const int option_char(getopt_long(argc, argv, "l:L:n:w:h", NULL, NULL)); if (-1 == option_char) break; switch (option_char) { case 'l': { if (!sptk::ConvertStringToInteger(optarg, &input_length) || input_length <= 0) { std::ostringstream error_message; error_message << "The argument for the -l option must be a positive integer"; sptk::PrintErrorMessage("window", error_message); return 1; } break; } case 'L': { if (!sptk::ConvertStringToInteger(optarg, &output_length) || output_length <= 0) { std::ostringstream error_message; error_message << "The argument for the -L option must be a positive integer"; sptk::PrintErrorMessage("window", error_message); return 1; } is_output_length_specified = true; break; } case 'n': { const int min(0); const int max(static_cast<int>(sptk::DataWindowing::NormalizationType:: kNumNormalizationTypes) - 1); int tmp; if (!sptk::ConvertStringToInteger(optarg, &tmp) || !sptk::IsInRange(tmp, min, max)) { std::ostringstream error_message; error_message << "The argument for the -n option must be an integer " << "in the range of " << min << " to " << max; sptk::PrintErrorMessage("window", error_message); return 1; } normalization_type = static_cast<sptk::DataWindowing::NormalizationType>(tmp); break; } case 'w': { const int min(0); const int max( static_cast<int>(sptk::DataWindowing::WindowType::kNumWindowTypes) - 1); int tmp; if (!sptk::ConvertStringToInteger(optarg, &tmp) || !sptk::IsInRange(tmp, min, max)) { std::ostringstream error_message; error_message << "The argument for the -w option must be an integer " << "in the range of " << min << " to " << max; sptk::PrintErrorMessage("window", error_message); return 1; } window_type = static_cast<sptk::DataWindowing::WindowType>(tmp); break; } case 'h': { PrintUsage(&std::cout); return 0; } default: { PrintUsage(&std::cerr); return 1; } } } // check length if (!is_output_length_specified) { output_length = input_length; } else if (output_length < input_length) { std::ostringstream error_message; error_message << "The length of data sequence " << input_length << " must be equal to or less than that of windowed one " << output_length; sptk::PrintErrorMessage("window", error_message); return 1; } // get input file const char* input_file((optind < argc) ? argv[argc - 1] : NULL); // open stream std::ifstream ifs; ifs.open(input_file, std::ios::in | std::ios::binary); if (ifs.fail() && NULL != input_file) { std::ostringstream error_message; error_message << "Cannot open file " << input_file; sptk::PrintErrorMessage("window", error_message); return 1; } std::istream& input_stream(ifs.fail() ? std::cin : ifs); sptk::DataWindowing data_windowing(input_length - 1, output_length - 1, normalization_type, window_type); if (!data_windowing.IsValid()) { std::ostringstream error_message; error_message << "Failed to set condition for data windowing"; sptk::PrintErrorMessage("window", error_message); return 1; } std::vector<double> data_sequence(input_length); std::vector<double> windowed_data_sequence(output_length); while (sptk::ReadStream(false, 0, 0, input_length, &data_sequence, &input_stream)) { if (!data_windowing.Run(data_sequence, &windowed_data_sequence)) { std::ostringstream error_message; error_message << "Failed to apply a window function"; sptk::PrintErrorMessage("window", error_message); return 1; } if (!sptk::WriteStream(0, output_length, windowed_data_sequence, &std::cout)) { std::ostringstream error_message; error_message << "Failed to write windowed data sequence"; sptk::PrintErrorMessage("window", error_message); return 1; } } return 0; } Index: fft.cc =================================================================== RCS file: /cvsroot/sp-tk/SPTK4/src/fft.cc,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** fft.cc 2 May 2017 07:10:22 -0000 1.13 --- fft.cc 11 May 2017 01:30:43 -0000 1.14 *************** *** 155,168 **** // check order ! if (is_num_order_specified) { ! if (fft_size <= num_order) { ! std::ostringstream error_message; ! error_message << "The order of data sequence " << num_order ! << " must be less than FFT size " << fft_size; ! sptk::PrintErrorMessage("fft", error_message); ! return 1; ! } ! } else { num_order = fft_size - 1; } --- 155,166 ---- // check order ! if (!is_num_order_specified) { num_order = fft_size - 1; + } else if (fft_size <= num_order) { + std::ostringstream error_message; + error_message << "The order of data sequence " << num_order + << " must be less than FFT size " << fft_size; + sptk::PrintErrorMessage("fft", error_message); + return 1; } Index: fftr.cc =================================================================== RCS file: /cvsroot/sp-tk/SPTK4/src/fftr.cc,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** fftr.cc 2 May 2017 07:10:22 -0000 1.4 --- fftr.cc 11 May 2017 01:30:43 -0000 1.5 *************** *** 162,175 **** // check order ! if (is_num_order_specified) { ! if (fft_size <= num_order) { ! std::ostringstream error_message; ! error_message << "The order of data sequence " << num_order ! << " must be less than FFT size " << fft_size; ! sptk::PrintErrorMessage("fftr", error_message); ! return 1; ! } ! } else { num_order = fft_size - 1; } --- 162,173 ---- // check order ! if (!is_num_order_specified) { num_order = fft_size - 1; + } else if (fft_size <= num_order) { + std::ostringstream error_message; + error_message << "The order of data sequence " << num_order + << " must be less than FFT size " << fft_size; + sptk::PrintErrorMessage("fftr", error_message); + return 1; } |
