Merge pull request #84 from sp-nitech/raw2wav [skip ci]

Add raw2wav and wav2raw

Author: takenori-y

.github/workflows/check-build.yml

@@ -19,7 +19,7 @@ jobs:
       - name: Dependencies
         run: |
           sudo apt-get update
-          sudo apt-get install csh parallel valgrind libpcre3-dev
+          sudo apt-get install csh parallel valgrind libpcre3-dev ffmpeg
 
       - name: Tool
         run: cd tools && make check -j 4 PYTHON_VERSION=3

CMakeLists.txt

@@ -25,7 +25,8 @@ endif()
 
 set(CMAKE_CXX_STANDARD 11)
 if(MSVC)
-  set(CMAKE_CXX_FLAGS "/O2 /W4 /wd4100 /wd4456 /EHsc /D_CRT_SECURE_NO_WARNINGS")
+  set(CMAKE_CXX_FLAGS
+      "/O2 /W4 /wd4100 /wd4456 /wd4706 /EHsc /D_CRT_SECURE_NO_WARNINGS")
 else()
   set(CMAKE_CXX_FLAGS "-O2 -Wall -Wno-deprecated-register")
 endif()
@@ -371,6 +372,7 @@ set(MAIN_SOURCES
     ${SOURCE_DIR}/main/quantize.cc
     ${SOURCE_DIR}/main/ramp.cc
     ${SOURCE_DIR}/main/rand.cc
+    ${SOURCE_DIR}/main/raw2wav.cc
     ${SOURCE_DIR}/main/reverse.cc
     ${SOURCE_DIR}/main/rlevdur.cc
     ${SOURCE_DIR}/main/rmse.cc
@@ -391,6 +393,7 @@ set(MAIN_SOURCES
     ${SOURCE_DIR}/main/vprod.cc
     ${SOURCE_DIR}/main/vstat.cc
     ${SOURCE_DIR}/main/vsum.cc
+    ${SOURCE_DIR}/main/wav2raw.cc
     ${SOURCE_DIR}/main/window.cc
     ${SOURCE_DIR}/main/world_synth.cc
     ${SOURCE_DIR}/main/x2x.cc

Makefile

@@ -126,7 +126,7 @@ format-cc:
 	./tools/cppcheck/cppcheck -j $(JOBS) --enable=all --check-level=exhaustive --std=c++11 \
 		--suppress=checkersReport --suppress=constParameterPointer --suppress=missingIncludeSystem \
 		--suppress=unmatchedSuppression --suppress=unusedFunction --suppress=useStlAlgorithm \
-		--suppress=variableScope --inline-suppr --error-exitcode=1 \
+		--suppress=variableScope --inline-suppr --error-exitcode=1 -DCPPCHECK \
 		--cppcheck-build-dir=$(BUILDDIR)/cppcheck --checkers-report=$(BUILDDIR)/cppcheck/report.txt \
 		-Iinclude -Ithird_party src
 
@@ -140,7 +140,7 @@ format-misc:
 	fi
 	./tools/venv/bin/cmake-format -i CMakeLists.txt
 	./tools/venv/bin/mdformat *.md
-	cd $(DOCDIR) && ../tools/venv/bin/docstrfmt .
+	./tools/venv/bin/docstrfmt docs
 
 test:
 	@if [ ! -x ./tools/bats/bin/bats ]; then \

README.md

@@ -97,12 +97,9 @@ cd egs/analysis_synthesis/mgc
 ```
 
 The below is a simple example that decreases the volume of input audio in `input.wav`.
-You may need to install `sox` command on your system.
 
 ```sh
-sox -t wav input.wav -c 1 -t s16 -r 16000 - |
-    x2x +sd | sopr -m 0.5 | x2x +ds -r |
-    sox -c 1 -t s16 -r 16000 - -t wav output.wav
+wav2raw +s input.wav | x2x +sd | sopr -m 0.5 | x2x +ds -r | raw2wav +s -s 16 > output.wav
 ```
 
 If you would like to draw figures, please prepare a python environment.
@@ -142,7 +139,7 @@ deactivate
   - `c2sp` -> `mgc2sp`
   - `cat2` and `echo2`
   - `da`
-  - `ds`, `us`, `us16`, and `uscd` -> `sox`
+  - `ds`, `us`, `us16`, and `uscd` -> `sox` or `ffmpeg`
   - `fig`
   - `gc2gc` -> `mgc2mgc`
   - `gcep`, `mcep`, and `uels` -> `mgcep`
@@ -151,7 +148,7 @@ deactivate
   - `lsp2sp` -> `mglsp2sp`
   - `mgc2mgclsp` and `mgclsp2mgc`
   - `psgr` and `xgr`
-  - `raw2wav`, `wav2raw`, `wavjoin`, and `wavsplit` -> `sox`
+  - `wavjoin` and `wavsplit`
 - Separated commands:
   - `c2ir` -> `c2mpir` and `mpir2c`
   - `dtw` -> `dtw` and `dtw_merge`

doc/Doxyfile

@@ -1121,7 +1121,7 @@ EXCLUDE_PATTERNS       = *int24_t.h
 # wildcard * is used, a substring. Examples: ANamespace, AClass,
 # ANamespace::AClass, ANamespace::*Test
 
-EXCLUDE_SYMBOLS        =
+EXCLUDE_SYMBOLS        = DR_* STB_*
 
 # The EXAMPLE_PATH tag can be used to specify one or more files or directories
 # that contain example code fragments that are included (see the \include

doc/main/raw2wav.rst

@@ -0,0 +1,10 @@
+.. _raw2wav:
+
+raw2wav
+=======
+
+.. doxygenfile:: raw2wav.cc
+
+.. seealso::
+
+    :ref:`wav2raw` :ref:`x2x`

doc/main/wav2raw.rst

@@ -0,0 +1,10 @@
+.. _wav2raw:
+
+wav2raw
+=======
+
+.. doxygenfile:: wav2raw.cc
+
+.. seealso::
+
+    :ref:`raw2wav` :ref:`x2x`