Move samples of int16_t format to sample_t, that is of type double

This prepares the correction of all levels

4 files changed, 23 insertions, 25 deletions

diff --git a/src/anetz/anetz.c b/src/anetz/anetz.c
index 77493f7..c65d6f1 100644
--- a/src/anetz/anetz.c
+++ b/src/anetz/anetz.c
@@ -24,6 +24,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
+#include "../common/sample.h"
 #include "../common/debug.h"
 #include "../common/timer.h"
 #include "../common/call.h"
@@ -492,7 +493,7 @@ void call_out_release(int callref, __attribute__((unused)) int cause)
 }
 
 /* Receive audio from call instance. */
-void call_rx_audio(int callref, int16_t *samples, int count)
+void call_rx_audio(int callref, sample_t *samples, int count)
 {
 	sender_t *sender;
 	anetz_t *anetz;
@@ -506,7 +507,7 @@ void call_rx_audio(int callref, int16_t *samples, int count)
 		return;
 
 	if (anetz->dsp_mode == DSP_MODE_AUDIO) {
-		int16_t up[(int)((double)count * anetz->sender.srstate.factor + 0.5) + 10];
+		sample_t up[(int)((double)count * anetz->sender.srstate.factor + 0.5) + 10];
 		count = samplerate_upsample(&anetz->sender.srstate, samples, count, up);
 		jitter_save(&anetz->sender.dejitter, up, count);
 	}
diff --git a/src/anetz/anetz.h b/src/anetz/anetz.h
index a464db3..05d8e50 100644
--- a/src/anetz/anetz.h
+++ b/src/anetz/anetz.h
@@ -1,3 +1,4 @@
+#include "../common/goertzel.h"
 #include "../common/sender.h"
 
 enum dsp_mode {
@@ -26,9 +27,9 @@ typedef struct anetz {
 
 	/* dsp states */
 	enum dsp_mode		dsp_mode;		/* current mode: audio, durable tone 0 or 1, paging */
-	int			fsk_tone_coeff[2];	/* coefficient k = 2*cos(2*PI*f/samplerate), k << 15 */
+	goertzel_t		fsk_tone_goertzel[2];	/* filter for tone decoding */
 	int			samples_per_chunk;	/* how many samples lasts one chunk */
-	int16_t			*fsk_filter_spl;	/* array with samples_per_chunk */
+	sample_t		*fsk_filter_spl;	/* array with samples_per_chunk */
 	int			fsk_filter_pos;		/* current sample position in filter_spl */
 	int			tone_detected;		/* what tone has been detected */
 	int			tone_count;		/* how long has that tone been detected */
diff --git a/src/anetz/dsp.c b/src/anetz/dsp.c
index a680366..1200c43 100644
--- a/src/anetz/dsp.c
+++ b/src/anetz/dsp.c
@@ -25,10 +25,10 @@
 #include <string.h>
 #include <errno.h>
 #include <math.h>
+#include "../common/sample.h"
 #include "../common/debug.h"
 #include "../common/timer.h"
 #include "../common/call.h"
-#include "../common/goertzel.h"
 #include "anetz.h"
 #include "dsp.h"
 
@@ -53,7 +53,7 @@ static double fsk_tones[2] = {
 };
 
 /* table for fast sine generation */
-int dsp_sine_tone[256];
+sample_t dsp_sine_tone[256];
 
 /* global init for audio processing */
 void dsp_init(void)
@@ -76,8 +76,7 @@ void dsp_init(void)
 /* Init transceiver instance. */
 int dsp_init_sender(anetz_t *anetz, double page_gain, int page_sequence)
 {
-	int16_t *spl;
-	double coeff;
+	sample_t *spl;
 	int i;
 	double tone;
 
@@ -98,7 +97,7 @@ int dsp_init_sender(anetz_t *anetz, double page_gain, int page_sequence)
 
 	anetz->samples_per_chunk = anetz->sender.samplerate * CHUNK_DURATION;
 	PDEBUG(DDSP, DEBUG_DEBUG, "Using %d samples per chunk duration.\n", anetz->samples_per_chunk);
-	spl = calloc(1, anetz->samples_per_chunk << 1);
+	spl = calloc(anetz->samples_per_chunk, sizeof(sample_t));
 	if (!spl) {
 		PDEBUG(DDSP, DEBUG_ERROR, "No memory!\n");
 		return -ENOMEM;
@@ -107,11 +106,8 @@ int dsp_init_sender(anetz_t *anetz, double page_gain, int page_sequence)
 
 	anetz->tone_detected = -1;
 
-	for (i = 0; i < 2; i++) {
-		coeff = 2.0 * cos(2.0 * PI * fsk_tones[i] / (double)anetz->sender.samplerate);
-		anetz->fsk_tone_coeff[i] = coeff * 32768.0;
-		PDEBUG(DDSP, DEBUG_DEBUG, "RX %.0f Hz coeff = %d\n", fsk_tones[i], (int)anetz->fsk_tone_coeff[i]);
-	}
+	for (i = 0; i < 2; i++)
+		audio_goertzel_init(&anetz->fsk_tone_goertzel[i], fsk_tones[i], anetz->sender.samplerate);
 	tone = fsk_tones[(anetz->sender.loopback == 0) ? 0 : 1];
 	anetz->tone_phaseshift256 = 256.0 / ((double)anetz->sender.samplerate / tone);
 	PDEBUG(DDSP, DEBUG_DEBUG, "TX %.0f Hz phaseshift = %.4f\n", tone, anetz->tone_phaseshift256);
@@ -159,7 +155,7 @@ static void fsk_receive_tone(anetz_t *anetz, int tone, int goodtone, double leve
 }
 
 /* Filter one chunk of audio an detect tone, quality and loss of signal. */
-static void fsk_decode_chunk(anetz_t *anetz, int16_t *spl, int max)
+static void fsk_decode_chunk(anetz_t *anetz, sample_t *spl, int max)
 {
 	double level, result[2];
 
@@ -168,7 +164,7 @@ static void fsk_decode_chunk(anetz_t *anetz, int16_t *spl, int max)
 	if (audio_detect_loss(&anetz->sender.loss, level))
 		anetz_loss_indication(anetz);
 
-	audio_goertzel(spl, max, 0, anetz->fsk_tone_coeff, result, 2);
+	audio_goertzel(anetz->fsk_tone_goertzel, spl, max, 0, result, 2);
 
 	/* show quality of tone */
 	if (anetz->sender.loopback) {
@@ -189,10 +185,10 @@ static void fsk_decode_chunk(anetz_t *anetz, int16_t *spl, int max)
 }
 
 /* Process received audio stream from radio unit. */
-void sender_receive(sender_t *sender, int16_t *samples, int length)
+void sender_receive(sender_t *sender, sample_t *samples, int length)
 {
 	anetz_t *anetz = (anetz_t *) sender;
-	int16_t *spl;
+	sample_t *spl;
 	int max, pos;
 	int i;
 
@@ -211,14 +207,13 @@ void sender_receive(sender_t *sender, int16_t *samples, int length)
 
 	/* Forward audio to network (call process). */
 	if (anetz->dsp_mode == DSP_MODE_AUDIO && anetz->callref) {
-		int16_t down[length]; /* more than enough */
 		int count;
 
-		count = samplerate_downsample(&anetz->sender.srstate, samples, length, down);
+		count = samplerate_downsample(&anetz->sender.srstate, samples, length);
 		spl = anetz->sender.rxbuf;
 		pos = anetz->sender.rxbuf_pos;
 		for (i = 0; i < count; i++) {
-			spl[pos++] = down[i];
+			spl[pos++] = samples[i];
 			if (pos == 160) {
 				call_tx_audio(anetz->callref, spl, 160);
 				pos = 0;
@@ -242,7 +237,7 @@ void dsp_set_paging(anetz_t *anetz, double *freq)
 
 /* Generate audio stream of 4 simultanious paging tones. Keep phase for next call of function.
  * Use TX_PEAK_TONE*page_gain for all tones, which gives peak of 1/4th for each individual tone. */
-static void fsk_paging_tone(anetz_t *anetz, int16_t *samples, int length)
+static void fsk_paging_tone(anetz_t *anetz, sample_t *samples, int length)
 {
 	double phaseshift[4], phase[4];
 	int i;
@@ -283,7 +278,7 @@ static void fsk_paging_tone(anetz_t *anetz, int16_t *samples, int length)
  * When tone changes to next tone, a transition of 2ms is performed. The last
  * tone is faded out and the new tone faded in.
  */
-static void fsk_paging_tone_sequence(anetz_t *anetz, int16_t *samples, int length, int numspl)
+static void fsk_paging_tone_sequence(anetz_t *anetz, sample_t *samples, int length, int numspl)
 {
 	double phaseshift[4], phase[4];
 	int i;
@@ -341,7 +336,7 @@ static void fsk_paging_tone_sequence(anetz_t *anetz, int16_t *samples, int lengt
 }
 
 /* Generate audio stream from tone. Keep phase for next call of function. */
-static void fsk_tone(anetz_t *anetz, int16_t *samples, int length)
+static void fsk_tone(anetz_t *anetz, sample_t *samples, int length)
 {
 	double phaseshift, phase;
 	int i;
@@ -360,7 +355,7 @@ static void fsk_tone(anetz_t *anetz, int16_t *samples, int length)
 }
 
 /* Provide stream of audio toward radio unit */
-void sender_send(sender_t *sender, int16_t *samples, int length)
+void sender_send(sender_t *sender, sample_t *samples, int length)
 {
 	anetz_t *anetz = (anetz_t *) sender;
 
diff --git a/src/anetz/main.c b/src/anetz/main.c
index 134807d..0511fb5 100644
--- a/src/anetz/main.c
+++ b/src/anetz/main.c
@@ -23,6 +23,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <math.h>
+#include "../common/sample.h"
 #include "../common/main.h"
 #include "../common/debug.h"
 #include "../common/timer.h"