williamp/osmocom-analog
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Jollycom: Fix initial voice sample resampling

Browse Source
This commit is contained in:
Andreas Eversberg
2024-01-14 13:57:46 +01:00
parent 26c348411c
commit 7e5663a709
1 changed files with 16 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/jolly/voice.c
View File

@@ -11065,15 +11065,11 @@ static int16_t released[] = {
jolly_voice_t jolly_voice; jolly_voice_t jolly_voice;
#define CHUNK 8
#define GAIN 2.5 #define GAIN 2.5
int init_voice(int samplerate) int init_voice(int samplerate)
{ {
samplerate_t srstate; int i;
sample_t spl_in[CHUNK], *spl_out;
int i, s, j, chunk, count, output_num;
int rc;
jolly_voice.spl[0] = (sample_t *)digit_0; jolly_voice.spl[0] = (sample_t *)digit_0;
jolly_voice.size[0] = sizeof(digit_0) / sizeof(int16_t); jolly_voice.size[0] = sizeof(digit_0) / sizeof(int16_t);
@@ -11102,27 +11098,25 @@ int init_voice(int samplerate)
jolly_voice.spl[12] = (sample_t *)released; jolly_voice.spl[12] = (sample_t *)released;
jolly_voice.size[12] = sizeof(released) / sizeof(int16_t); jolly_voice.size[12] = sizeof(released) / sizeof(int16_t);
for (i = 0; i < 13; i++) {
samplerate_t srstate;
sample_t spl_in[jolly_voice.size[i]], *spl_out;
int s, output_num;
int rc;
rc = init_samplerate(&srstate, 8000.0, (double)samplerate, 3300.0); rc = init_samplerate(&srstate, 8000.0, (double)samplerate, 3300.0);
if (rc < 0) { if (rc < 0) {
fprintf(stderr, "Failed to init sample rate conversion!\n"); fprintf(stderr, "Failed to init sample rate conversion!\n");
return -1; return -1;
} }
for (i = 0; i < 13; i++) {
output_num = samplerate_upsample_output_num(&srstate, jolly_voice.size[i]); output_num = samplerate_upsample_output_num(&srstate, jolly_voice.size[i]);
spl_out = calloc(output_num, sizeof(*spl_out)); spl_out = calloc(output_num, sizeof(*spl_out));
count = 0; for (s = 0; s < jolly_voice.size[i]; s ++)
for (s = 0; s < jolly_voice.size[i]; s += CHUNK) { spl_in[s] = (double)(((int16_t *)(jolly_voice.spl[i]))[s]) / 32767.0 * GAIN;
chunk = jolly_voice.size[i] - s; samplerate_upsample(&srstate, spl_in, jolly_voice.size[i], spl_out, output_num);
if (chunk > CHUNK)
chunk = CHUNK;
for (j = 0; j < chunk; j++)
spl_in[j] = (double)(((int16_t *)(jolly_voice.spl[i]))[s + j]) / 32767.0 * GAIN;
samplerate_upsample(&srstate, spl_in, chunk, spl_out + count, output_num);
count += output_num;
}
jolly_voice.spl[i] = spl_out; jolly_voice.spl[i] = spl_out;
jolly_voice.size[i] = count; jolly_voice.size[i] = output_num;
} }
return 0; return 0;