Commit Graph
39 Commits
Author SHA1 Message Date
freddii 61efed30fa fixed spelling mistakes 2021-01-13 01:55:34 +01:00
datajake1999 5e502661d6 Add speechPlayer Klatt implementation as Klatt 6. 2020-12-06 08:34:38 -08:00
datajake1999 a90a0fb2bd Applied Klatt fixes from NV Access and added Edward variant. 2020-11-20 02:59:43 -08:00
Juho Hiltunen ee944700f8 code cleanup: Check all local includes with include-what-you-use
Going through files in src/libespeak-ng/, include-what-you-use removed a
few unnecessary includes and included explanations on why a certain
header should be included. This makes tracking globals and dependencies easier.

Running the codebase through IWYU should be repeated after each major
code restIncludes to standard c library weren't checked to avoid
breaking builds with other platforms.

See https://github.com/include-what-you-use/include-what-you-use
2020-07-24 07:29:47 +03:00
Juho Hiltunen 9232f1911e code cleanup: remove unnecessary references to out_start.
Unsigned char *out_start is a global only used in speech.c.
2020-07-21 12:39:20 +03:00
Juho Hiltunen 388be80da7 code cleanup: pass voice_t wvoice as a parameter instead of using a global
SetSynth_Klatt() was using wvoice in two ways:
1) global wvoice was used directly
2) global wvoice was also passed in Wavegen_Klatt() as an argument "v"

Now the code only uses the function argument wvoice

Contributes to #68.
2020-07-21 12:39:12 +03:00
Juho Hiltunen 1b7c3303ef code cleanup: pass WGEN_DATA wdata as a parameter instead of using a global
Contributes to #68.
2020-07-21 12:39:03 +03:00
Juho Hiltunen 516144d63a code cleanup: combine Wavegen_Klatt() and Wavegen_Klatt2().
Wavegen_Klatt2() only had one if-statement and then called
Wavegen_Klatt(). Wavegen_Klatt() was never called directly.
2020-07-21 12:38:54 +03:00
Samuel Thibault f75c5ccbe3 Fix out of bound access when buffer size is odd
Valgrind reports

==20307== Invalid write of size 1
==20307==    at 0x4E856FE: Wavegen.part.1 (wavegen.c:880)
==20307==    by 0x4E86682: Wavegen (wavegen.c:670)
==20307==    by 0x4E86682: Wavegen2 (wavegen.c:1235)
==20307==    by 0x4E86682: WavegenFill2 (wavegen.c:1317)
==20307==    by 0x4E86CA7: WavegenFill (wavegen.c:1398)
==20307==    by 0x4E7093F: Synthesize (speech.c:442)
==20307==    by 0x4E712E0: sync_espeak_Synth (speech.c:549)
==20307==    by 0x4E8A5C0: process_espeak_command (espeak_command.c:317)
==20307==    by 0x4E8B387: say_thread (fifo.c:333)
==20307==    by 0x50E85A9: start_thread (pthread_create.c:463)
==20307==    by 0x53F5CBE: clone (clone.S:95)
==20307==  Address 0xad5e1bd is 0 bytes after a block of size 2,205 alloc'd
==20307==    at 0x4C2CABF: malloc (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so)
==20307==    by 0x4C2EE04: realloc (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so)
==20307==    by 0x4E70CFC: espeak_ng_InitializeOutput (speech.c:286)
==20307==    by 0x4E6176E: espeak_Initialize (espeak_api.c:67)
==20307==    by 0x10A5D8: initialize_espeak (espeak.c:303)
==20307==    by 0x109D1D: main (espeakup.c:201)
==20307==

Indeed, the out_ptr >= out_end test is not enough: it only checks that
one byte can fit the buffer, while klatt and wavegen produce two bytes.
2018-05-03 21:04:53 +02:00
Juho Hiltunen d1fd650219 Replace references to USHORT, DOUBLEX and UCHAR with unsigned short, double and unsigned char.
This makes the codebase more consistent. Including speech.h is not necessary anymore in some files. Includes have been removed.
2018-03-09 21:08:38 +02:00
Reece H. Dunn 90d53e145f Move the klatt methods from synthesize.h to klatt.h. 2017-10-25 07:12:45 +01:00
Reece H. Dunn 74f9f5e34b wavegen.c: Fix -Wmissing-prototypes warnings. 2017-10-10 21:37:46 +01:00
Reece H. Dunn 66a53cce02 klatt.c: Fix -Wmissing-prototypes warnings. 2017-10-06 07:17:31 +01:00
Ondřej Lysoněk 3817ee1e16 Moved speak_lib.h to espeak-ng directory
Moved include/espeak/speak_lib.h to include/espeak-ng/speak_lib.h and
created a symlink from the original location.
2016-08-28 10:57:10 +01:00
Reece H. Dunn 4b61d38551 Use M_PI instead of PI. 2016-01-18 07:01:19 +00:00
Reece H. Dunn 96c43f3eb2 Clean up the include files to make them consistent. 2016-01-16 17:54:39 +00:00
Reece H. Dunn 0ca520a4ec Revert the gcc sign conversion warning fixes.
This reverts commits 0cc0300328 to
38d15f8f90.

The 0cc03003 commit breaks MBROLA voice support. As such, there
may be other breakages in those commits.
2016-01-11 07:03:00 +00:00
Reece H. Dunn caebc926ef Fix gcc sign conversion warnings in klatt.c. 2016-01-10 18:22:23 +00:00
Reece H. Dunn 9c7179189b Add a stdint.h compatibility shim. 2016-01-09 13:09:50 +00:00
Reece H. Dunn cdeb1d042d Remove a dead assignment in parwave(klatt.c) [clang scan-build] 2016-01-06 20:12:47 +00:00
Reece H. Dunn 72db232ec3 Move include/espeak{-ng => }/speak_lib.h. 2016-01-04 19:45:23 +00:00
Reece H. Dunn c2811d074e Make LoadPhData return an espeak_ng_STATUS code. 2016-01-01 13:17:11 +00:00
Reece H. Dunn 8771b1c29c The modn parameter of SetSynth_Klatt is not used, so remove it. 2015-12-30 09:18:22 +00:00
Reece H. Dunn 522e7c4d51 Revert commit 14a2fb39cf
This commit has been reported to cause distortions in phoneme
pitches and speeds.
2015-12-28 17:54:17 +00:00
Fredrik Nyqvist 14a2fb39cf Declare variables at their first point of use
Also use size_t instead of int in some places
where it make sense
2015-12-28 12:05:17 +01:00
Reece H. Dunn 3e99752d0c Check and fix source code formatting. 2015-12-27 22:34:53 +00:00
Reece H. Dunn f0c2c4cca2 Remove extra newlines from the files to provide consistent spacing. 2015-12-23 11:32:03 +00:00
Reece H. Dunn d345d74f64 Remove braces around single-line if/while/for/etc. and related cleanup. 2015-12-22 20:40:10 +00:00
Reece H. Dunn 9a837c8182 Remove parentheses around return statements. 2015-12-22 16:24:01 +00:00
Reece H. Dunn 12e0bb122b Reformat the code using the uncrustify program. 2015-12-22 15:06:50 +00:00
Reece H. Dunn 85c87e83a9 Remove the LOG_FRAMES code which was only used in espeakedit. 2015-12-20 19:49:20 +00:00
Reece H. Dunn 66c2831bed Use intptr_t from stdint.h instead of a custom long64 typedef. 2015-12-18 21:41:28 +00:00
Reece H. Dunn c71b24a9a5 Use a consistent license notice in the source files. 2015-12-18 07:06:29 +00:00
Reece H. Dunn cbe8695fcb Remove the * box around the file headers. 2015-12-17 23:45:36 +00:00
Reece H. Dunn 36be9ac13f Use the default uncrustify config (with indentation changes) to reformat the code. 2015-12-17 07:40:24 +00:00
Reece H. Dunn 5e0050419d Remove comments that deliniate the start and end of functions, etc.. 2015-12-15 22:26:02 +00:00
Reece H. Dunn 08821f262f Remove commented out code. 2015-12-14 23:13:56 +00:00
Reece H. Dunn 186916afb6 Remove the code within '#ifdef deleted' statements. 2015-12-12 09:46:03 +00:00
Reece H. Dunn f7dfc38dd7 Use the C compiler to build C files; restructuring.
This moves the libespeak source (*.cpp) files to src/libespeak-ng
and renames the C files (libespeak, espeak, speak) so they have
a .c file extension.
2015-12-09 23:33:00 +00:00