mjohnson/espeak-ng
1
0
Fork 0
mirror of https://github.com/rhasspy/espeak-ng.git synced 2026-10-31 05:35:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

code cleanup: reduce duplication with new function CalculateSample()

Browse Source
This commit is contained in:
Juho Hiltunen
2022-11-20 18:22:27 +02:00
parent bbfef6a269
commit c496da5bf6
1 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libespeak-ng/compiledata.c
+12 -11
View File
@@ -47,6 +47,8 @@
#include "voice.h" // for LoadVoice, voice
#include "wavegen.h" // for WavegenInit, WavegenSetVoice
static int CalculateSample(unsigned char c3, int c1);
#define N_ITEM_STRING 256
typedef struct {
@@ -1088,8 +1090,6 @@ static int LoadWavefile(CompileContext *ctx, FILE *f, const char *fname)
{
int displ;
unsigned char c1;
unsigned char c3;
int c2;
int sample;
int sample2;
float x;
@@ -1125,12 +1125,8 @@ static int LoadWavefile(CompileContext *ctx, FILE *f, const char *fname)
if ((c = fgetc(f)) == EOF)
break;
c3 = (unsigned char)c;
c2 = c3 << 24;
c2 = c2 >> 16; // sign extend
sample = (c1 & 0xff) + c2;
sample = CalculateSample((unsigned char) c, c1);
if (sample > max)
max = sample;
@@ -1150,11 +1146,9 @@ static int LoadWavefile(CompileContext *ctx, FILE *f, const char *fname)
while (!feof(f)) {
c1 = fgetc(f);
c3 = fgetc(f);
c2 = c3 << 24;
c2 = c2 >> 16; // sign extend
unsigned char c3 = fgetc(f);
sample = (c1 & 0xff) + c2;
sample = CalculateSample(c3, c1);
if (feof(f)) break;
@@ -2807,3 +2801,10 @@ espeak_ng_CompileIntonationPath(const char *source_path,
}
#pragma GCC visibility pop
static int CalculateSample(unsigned char c3, int c1) {
int c2 = c3 << 24;
c2 = c2 >> 16; // sign extend
return (c1 & 0xff) + c2;
}