Formal release version

mmorise · Feb 15, 2021 · a825684 · a825684
1 parent 846ead4
commit a825684
Show file tree

Hide file tree

Showing 40 changed files with 80 additions and 109 deletions.
diff --git a/doc/readme_ENG.txt b/doc/readme_ENG.txt
@@ -4,28 +4,15 @@ WORLD is free software for high-quality speech analysis, manipulation and synthe
 It can estimate Fundamental frequency (F0), aperiodicity and spectral envelope
 and also generate the speech like input speech with only estimated parameters.
 
-2. Usage
-Please see test.cpp.
-
-(1) F0 estimation by Dio()
-(1-1) F0 is refined by StoneMask() if you need more accurate result.
-(2) Spectral envelope estimation by CheapTrick()
-(3) Aperiodicity estimation by D4C().
-(4) You can manipulation these parameters in this phase. 
-(5) Voice synthesis by Synthesis().
-
-English document is written by a Japanese poor editor.
-I willingly accept your kind indication on my English text.
-
-3. License
+1. License
 WORLD is free software, and you can redistribute it and 
 modify it under the terms of the modified BSD License.
 Please see copying.txt for more information.
 You can use this program for business, while I hope that 
 you contact me after you developed software with WORLD.
 This information is crucial to obtain a grant to develop WORLD.
 
-4. Contacts
+2. Contacts
 WORLD was written by Masanori Morise.
-You can contact him via e-mail (mmorise [at] yamanashi.ac.jp)
-or Twitter: @m_morise
+E-mail: mmorise [at] meiji.ac.jp
+Twitter: @m_morise
diff --git a/doc/readme_JP.txt b/doc/readme_JP.txt
@@ -4,19 +4,6 @@
 
 WORLD�͏C��BSD���C�Z���X�ł��D
 
---------------------------------------------------------------------
-��{�I�ȍl�����F
-�����́C�����Ɖ��F�ɂ��\���ł���Ƃ����܂��D
-�ŐV�łł́C������F0�C��������w�W�C�X�y�N�g����ŕ\�����܂��D
-����́CVocoder�Ɠ���̍l�����ł��D
-
-(1) Dio() �ɂ�艹���̊�{���g���𐄒�
-(1-1) �K�v�ɉ�����StoneMask() �ɂ���{���g����␳
-(2) CheapTrick() �ɂ�艹���̃X�y�N�g����𐄒�
-(3) D4C() �ɂ�艹���̔�������w�W�𐄒�
-(4) �K�v�ɉ����ĉ����≹�F�̐���
-(5) Synthesis() �ɂ�艹��������
-
 --------------------------------------------------------------------
 ���肢�F
 WORLD�𗘗p�����ꍇ�́C���p/�񏤗p�Ɋւ�炸�X����
@@ -25,5 +12,5 @@ WORLD
 �����̌��������́C����WORLD�𔭓W�����邽�߂ɗ��p���܂��D
 
 ��҂֘A��
-mmorise [at] yamanashi.ac.jp
+mmorise [at] meiji.ac.jp
 Twitter: @m_morise 
diff --git a/examples/codec_test/apanalysis.cpp b/examples/codec_test/apanalysis.cpp
@@ -1,7 +1,7 @@
 //-----------------------------------------------------------------------------
 // Copyright 2017 Masanori Morise
-// Author: mmorise [at] yamanashi.ac.jp (Masanori Morise)
-// Last update: 2017/05/01
+// Author: mmorise [at] meiji.ac.jp (Masanori Morise)
+// Last update: 2021/02/15
 //
 // Summary:
 // This example estimates the aperiodicity from an audio file

diff --git a/examples/codec_test/f0analysis.cpp b/examples/codec_test/f0analysis.cpp
@@ -1,7 +1,7 @@
 //-----------------------------------------------------------------------------
 // Copyright 2017 Masanori Morise
-// Author: mmorise [at] yamanashi.ac.jp (Masanori Morise)
-// Last update: 2017/04/29
+// Author: mmorise [at] meiji.ac.jp (Masanori Morise)
+// Last update: 2021/02/15
 //
 // Summary:
 // This example estimates F0 from an audio file and saves it to a file.

diff --git a/examples/codec_test/readandsynthesis.cpp b/examples/codec_test/readandsynthesis.cpp
@@ -1,7 +1,7 @@
 //-----------------------------------------------------------------------------
 // Copyright 2017 Masanori Morise
-// Author: mmorise [at] yamanashi.ac.jp (Masanori Morise)
-// Last update: 2017/04/29
+// Author: mmorise [at] meiji.ac.jp (Masanori Morise)
+// Last update: 2021/02/15
 //
 // Summary:
 // This example reads three parameters and generates a waveform from them.

diff --git a/examples/codec_test/spanalysis.cpp b/examples/codec_test/spanalysis.cpp
@@ -1,7 +1,7 @@
 //-----------------------------------------------------------------------------
 // Copyright 2017 Masanori Morise
-// Author: mmorise [at] yamanashi.ac.jp (Masanori Morise)
-// Last update: 2017/04/01
+// Author: mmorise [at] meiji.ac.jp (Masanori Morise)
+// Last update: 2021/02/15
 //
 // Summary:
 // This example estimates the spectral envelope from an audio file

diff --git a/examples/parameter_io/apanalysis.cpp b/examples/parameter_io/apanalysis.cpp
@@ -1,7 +1,7 @@
 //-----------------------------------------------------------------------------
 // Copyright 2017 Masanori Morise
-// Author: mmorise [at] yamanashi.ac.jp (Masanori Morise)
-// Last update: 2017/03/12
+// Author: mmorise [at] meiji.ac.jp (Masanori Morise)
+// Last update: 2021/02/15
 //
 // Summary:
 // This example estimates the aperiodicity from an audio file

diff --git a/examples/parameter_io/f0analysis.cpp b/examples/parameter_io/f0analysis.cpp
@@ -1,7 +1,7 @@
 //-----------------------------------------------------------------------------
 // Copyright 2017 Masanori Morise
-// Author: mmorise [at] yamanashi.ac.jp (Masanori Morise)
-// Last update: 2017/03/12
+// Author: mmorise [at] meiji.ac.jp (Masanori Morise)
+// Last update: 2021/02/15
 //
 // Summary:
 // This example estimates F0 from an audio file and saves it to a file.

diff --git a/examples/parameter_io/readandsynthesis.cpp b/examples/parameter_io/readandsynthesis.cpp
@@ -1,7 +1,7 @@
 //-----------------------------------------------------------------------------
 // Copyright 2017 Masanori Morise
-// Author: mmorise [at] yamanashi.ac.jp (Masanori Morise)
-// Last update: 2017/03/12
+// Author: mmorise [at] meiji.ac.jp (Masanori Morise)
+// Last update: 2021/02/15
 //
 // Summary:
 // This example reads three parameters and generates a waveform from them.

diff --git a/examples/parameter_io/spanalysis.cpp b/examples/parameter_io/spanalysis.cpp
@@ -1,7 +1,7 @@
 //-----------------------------------------------------------------------------
 // Copyright 2017 Masanori Morise
-// Author: mmorise [at] yamanashi.ac.jp (Masanori Morise)
-// Last update: 2017/03/12
+// Author: mmorise [at] meiji.ac.jp (Masanori Morise)
+// Last update: 2021/02/15
 //
 // Summary:
 // This example estimates the spectral envelope from an audio file

diff --git a/src/cheaptrick.cpp b/src/cheaptrick.cpp
@@ -1,7 +1,7 @@
 //-----------------------------------------------------------------------------
 // Copyright 2012 Masanori Morise
-// Author: mmorise [at] yamanashi.ac.jp (Masanori Morise)
-// Last update: 2017/02/01
+// Author: mmorise [at] meiji.ac.jp (Masanori Morise)
+// Last update: 2021/02/15
 //
 // Spectral envelope estimation on the basis of the idea of CheapTrick.
 //-----------------------------------------------------------------------------

diff --git a/src/codec.cpp b/src/codec.cpp
@@ -1,7 +1,7 @@
 //-----------------------------------------------------------------------------
 // Copyright 2017 Masanori Morise
-// Author: mmorise [at] yamanashi.ac.jp (Masanori Morise)
-// Last update: 2017/05/09
+// Author: mmorise [at] meiji.ac.jp (Masanori Morise)
+// Last update: 2021/02/15
 //
 // Coder/decoder functions for the spectral envelope and aperiodicity.
 //-----------------------------------------------------------------------------

diff --git a/src/common.cpp b/src/common.cpp
@@ -1,7 +1,7 @@
 //-----------------------------------------------------------------------------
 // Copyright 2012 Masanori Morise
-// Author: mmorise [at] yamanashi.ac.jp (Masanori Morise)
-// Last update: 2017/04/29
+// Author: mmorise [at] meiji.ac.jp (Masanori Morise)
+// Last update: 2021/02/15
 //
 // common.cpp includes functions used in at least two files.
 // (1) Common functions

diff --git a/src/d4c.cpp b/src/d4c.cpp
@@ -1,7 +1,7 @@
 //-----------------------------------------------------------------------------
 // Copyright 2012 Masanori Morise
-// Author: mmorise [at] yamanashi.ac.jp (Masanori Morise)
-// Last update: 2017/02/01
+// Author: mmorise [at] meiji.ac.jp (Masanori Morise)
+// Last update: 2021/02/15
 //
 // Band-aperiodicity estimation on the basis of the idea of D4C.
 //-----------------------------------------------------------------------------

diff --git a/src/dio.cpp b/src/dio.cpp
@@ -1,7 +1,7 @@
 //-----------------------------------------------------------------------------
 // Copyright 2012 Masanori Morise
-// Author: mmorise [at] yamanashi.ac.jp (Masanori Morise)
-// Last update: 2019/04/11
+// Author: mmorise [at] meiji.ac.jp (Masanori Morise)
+// Last update: 2021/02/15
 //
 // F0 estimation based on DIO (Distributed Inline-filter Operation).
 //-----------------------------------------------------------------------------

diff --git a/src/fft.cpp b/src/fft.cpp
@@ -1,7 +1,7 @@
 //-----------------------------------------------------------------------------
 // Copyright 2012 Masanori Morise
-// Author: mmorise [at] yamanashi.ac.jp (Masanori Morise)
-// Last update: 2018/01/21
+// Author: mmorise [at] meiji.ac.jp (Masanori Morise)
+// Last update: 2021/02/15
 //
 // This file represents the functions about FFT (Fast Fourier Transform)
 // implemented by Mr. Ooura, and wrapper functions implemented by M. Morise.

diff --git a/src/harvest.cpp b/src/harvest.cpp
@@ -1,7 +1,7 @@
 //-----------------------------------------------------------------------------
 // Copyright 2012 Masanori Morise
-// Author: mmorise [at] yamanashi.ac.jp (Masanori Morise)
-// Last update: 2018/01/21
+// Author: mmorise [at] meiji.ac.jp (Masanori Morise)
+// Last update: 2021/02/15
 //
 // F0 estimation based on Harvest.
 //-----------------------------------------------------------------------------

diff --git a/src/matlabfunctions.cpp b/src/matlabfunctions.cpp
@@ -1,7 +1,7 @@
 //-----------------------------------------------------------------------------
 // Copyright 2012 Masanori Morise
-// Author: mmorise [at] yamanashi.ac.jp (Masanori Morise)
-// Last update: 2017/02/01
+// Author: mmorise [at] meiji.ac.jp (Masanori Morise)
+// Last update: 2021/02/15
 //
 // Matlab functions implemented for WORLD
 // Since these functions are implemented as the same function of Matlab,

diff --git a/src/stonemask.cpp b/src/stonemask.cpp
@@ -1,7 +1,7 @@
 //-----------------------------------------------------------------------------
 // Copyright 2012 Masanori Morise
-// Author: mmorise [at] yamanashi.ac.jp (Masanori Morise)
-// Last update: 2017/02/01
+// Author: mmorise [at] meiji.ac.jp (Masanori Morise)
+// Last update: 2021/02/15
 //
 // F0 estimation based on instantaneous frequency.
 // This method is carried out by using the output of Dio().

diff --git a/src/synthesis.cpp b/src/synthesis.cpp
@@ -1,7 +1,7 @@
 //-----------------------------------------------------------------------------
 // Copyright 2012 Masanori Morise
-// Author: mmorise [at] yamanashi.ac.jp (Masanori Morise)
-// Last update: 2018/12/13
+// Author: mmorise [at] meiji.ac.jp (Masanori Morise)
+// Last update: 2021/02/15
 //
 // Voice synthesis based on f0, spectrogram and aperiodicity.
 // forward_real_fft, inverse_real_fft and minimum_phase are used to speed up.

diff --git a/src/synthesisrealtime.cpp b/src/synthesisrealtime.cpp
@@ -1,7 +1,7 @@
 //-----------------------------------------------------------------------------
 // Copyright 2012 Masanori Morise
-// Author: mmorise [at] yamanashi.ac.jp (Masanori Morise)
-// Last update: 2018/12/13
+// Author: mmorise [at] meiji.ac.jp (Masanori Morise)
+// Last update: 2021/02/15
 //
 // Voice synthesis based on f0, spectrogram and aperiodicity.
 // This is an implementation for real-time applications.

diff --git a/src/world/cheaptrick.h b/src/world/cheaptrick.h
@@ -1,7 +1,7 @@
 //-----------------------------------------------------------------------------
 // Copyright 2012 Masanori Morise
-// Author: mmorise [at] yamanashi.ac.jp (Masanori Morise)
-// Last update: 2017/02/01
+// Author: mmorise [at] meiji.ac.jp (Masanori Morise)
+// Last update: 2021/02/15
 //-----------------------------------------------------------------------------
 #ifndef WORLD_CHEAPTRICK_H_
 #define WORLD_CHEAPTRICK_H_

diff --git a/src/world/codec.h b/src/world/codec.h
@@ -1,7 +1,7 @@
 //-----------------------------------------------------------------------------
 // Copyright 2017 Masanori Morise
-// Author: mmorise [at] yamanashi.ac.jp (Masanori Morise)
-// Last update: 2017/04/29
+// Author: mmorise [at] meiji.ac.jp (Masanori Morise)
+// Last update: 2021/02/15
 //-----------------------------------------------------------------------------
 #ifndef WORLD_CODEC_H_
 #define WORLD_CODEC_H_

diff --git a/src/world/common.h b/src/world/common.h
@@ -1,7 +1,7 @@
 //-----------------------------------------------------------------------------
 // Copyright 2012 Masanori Morise
-// Author: mmorise [at] yamanashi.ac.jp (Masanori Morise)
-// Last update: 2017/04/29
+// Author: mmorise [at] meiji.ac.jp (Masanori Morise)
+// Last update: 2021/02/15
 //-----------------------------------------------------------------------------
 #ifndef WORLD_COMMON_H_
 #define WORLD_COMMON_H_

diff --git a/src/world/constantnumbers.h b/src/world/constantnumbers.h
@@ -1,7 +1,7 @@
 //-----------------------------------------------------------------------------
 // Copyright 2012 Masanori Morise
-// Author: mmorise [at] yamanashi.ac.jp (Masanori Morise)
-// Last update: 2019/04/11
+// Author: mmorise [at] meiji.ac.jp (Masanori Morise)
+// Last update: 2021/02/15
 //
 // This header file only defines constant numbers used for several function.
 //-----------------------------------------------------------------------------

diff --git a/src/world/d4c.h b/src/world/d4c.h
@@ -1,7 +1,7 @@
 //-----------------------------------------------------------------------------
 // Copyright 2012 Masanori Morise
-// Author: mmorise [at] yamanashi.ac.jp (Masanori Morise)
-// Last update: 2017/02/01
+// Author: mmorise [at] meiji.ac.jp (Masanori Morise)
+// Last update: 2021/02/15
 //-----------------------------------------------------------------------------
 #ifndef WORLD_D4C_H_
 #define WORLD_D4C_H_

diff --git a/src/world/dio.h b/src/world/dio.h
@@ -1,7 +1,7 @@
 //-----------------------------------------------------------------------------
 // Copyright 2012 Masanori Morise
-// Author: mmorise [at] yamanashi.ac.jp (Masanori Morise)
-// Last update: 2017/02/01
+// Author: mmorise [at] meiji.ac.jp (Masanori Morise)
+// Last update: 2021/02/15
 //-----------------------------------------------------------------------------
 #ifndef WORLD_DIO_H_
 #define WORLD_DIO_H_

diff --git a/src/world/fft.h b/src/world/fft.h
@@ -1,7 +1,7 @@
 //-----------------------------------------------------------------------------
 // Copyright 2012 Masanori Morise
-// Author: mmorise [at] yamanashi.ac.jp (Masanori Morise)
-// Last update: 2017/02/01
+// Author: mmorise [at] meiji.ac.jp (Masanori Morise)
+// Last update: 2021/02/15
 //
 // These functions and variables are defined to use FFT as well as FFTW
 // Please see fft.cpp to show the detailed information

diff --git a/src/world/harvest.h b/src/world/harvest.h
@@ -1,7 +1,7 @@
 //-----------------------------------------------------------------------------
 // Copyright 2012 Masanori Morise
-// Author: mmorise [at] yamanashi.ac.jp (Masanori Morise)
-// Last update: 2017/03/04
+// Author: mmorise [at] meiji.ac.jp (Masanori Morise)
+// Last update: 2021/02/15
 //-----------------------------------------------------------------------------
 #ifndef WORLD_HARVEST_H_
 #define WORLD_HARVEST_H_

diff --git a/src/world/matlabfunctions.h b/src/world/matlabfunctions.h
@@ -1,7 +1,7 @@
 //-----------------------------------------------------------------------------
 // Copyright 2012 Masanori Morise
-// Author: mmorise [at] yamanashi.ac.jp (Masanori Morise)
-// Last update: 2017/02/01
+// Author: mmorise [at] meiji.ac.jp (Masanori Morise)
+// Last update: 2021/02/15
 //-----------------------------------------------------------------------------
 #ifndef WORLD_MATLABFUNCTIONS_H_
 #define WORLD_MATLABFUNCTIONS_H_

diff --git a/src/world/stonemask.h b/src/world/stonemask.h
@@ -1,7 +1,7 @@
 //-----------------------------------------------------------------------------
 // Copyright 2012 Masanori Morise
-// Author: mmorise [at] yamanashi.ac.jp (Masanori Morise)
-// Last update: 2017/02/01
+// Author: mmorise [at] meiji.ac.jp (Masanori Morise)
+// Last update: 2021/02/15
 //-----------------------------------------------------------------------------
 #ifndef WORLD_STONEMASK_H_
 #define WORLD_STONEMASK_H_

diff --git a/src/world/synthesis.h b/src/world/synthesis.h
@@ -1,7 +1,7 @@
 //-----------------------------------------------------------------------------
 // Copyright 2012 Masanori Morise
-// Author: mmorise [at] yamanashi.ac.jp (Masanori Morise)
-// Last update: 2017/03/04
+// Author: mmorise [at] meiji.ac.jp (Masanori Morise)
+// Last update: 2021/02/15
 //-----------------------------------------------------------------------------
 #ifndef WORLD_SYNTHESIS_H_
 #define WORLD_SYNTHESIS_H_

diff --git a/src/world/synthesisrealtime.h b/src/world/synthesisrealtime.h
@@ -1,7 +1,7 @@
 //-----------------------------------------------------------------------------
 // Copyright 2012 Masanori Morise
-// Author: mmorise [at] yamanashi.ac.jp (Masanori Morise)
-// Last update: 2017/05/09
+// Author: mmorise [at] meiji.ac.jp (Masanori Morise)
+// Last update: 2021/02/15
 //-----------------------------------------------------------------------------
 #ifndef WORLD_SYNTHESISREALTIME_H_
 #define WORLD_SYNTHESISREALTIME_H_

diff --git a/styleguide.txt b/styleguide.txt
@@ -1,8 +1,5 @@
 WORLD follows the Google C++ Style Guide
-Japanese:
-http://www.textdrop.net/google-styleguide-ja/cppguide.xml
-English:
-http://google-styleguide.googlecode.com/svn/trunk/cppguide.xml
+https://github.com/google/styleguide
 
 However, there are several exceptions about variable names.
 Since these names are generally used in the acoustic signal processing,

diff --git a/test/ctest.c b/test/ctest.c
@@ -1,7 +1,7 @@
 //-----------------------------------------------------------------------------
 // Copyright 2012 Masanori Morise
-// Author: mmorise [at] yamanashi.ac.jp (Masanori Morise)
-// Last update: 2017/02/01
+// Author: mmorise [at] meiji.ac.jp (Masanori Morise)
+// Last update: 2021/02/15
 //
 // test.exe input.wav outout.wav f0 spec
 // input.wav  : Input file