Move samples of int16_t format to sample_t, that is of type double
This prepares the correction of all levels
This commit is contained in:
@@ -2,6 +2,7 @@
|
||||
#include <stdint.h>
|
||||
#include <math.h>
|
||||
#include <string.h>
|
||||
#include "../common/sample.h"
|
||||
#include "../common/compandor.h"
|
||||
|
||||
#define level2db(level) (20 * log10(level))
|
||||
@@ -14,11 +15,11 @@
|
||||
|
||||
static double test_frequency[3] = { 2000.0, 4000.0, 1000.0 };
|
||||
|
||||
static int16_t samples_4db[SAMPLERATE];
|
||||
static int16_t samples_16db[SAMPLERATE];
|
||||
static int16_t samples_2db[SAMPLERATE];
|
||||
static int16_t samples_8db[SAMPLERATE];
|
||||
static int16_t samples_0db[SAMPLERATE];
|
||||
static sample_t samples_4db[SAMPLERATE];
|
||||
static sample_t samples_16db[SAMPLERATE];
|
||||
static sample_t samples_2db[SAMPLERATE];
|
||||
static sample_t samples_8db[SAMPLERATE];
|
||||
static sample_t samples_0db[SAMPLERATE];
|
||||
|
||||
/* generate 2 samples: one with -4 dB, the other with -16 dB */
|
||||
static void generate_test_sample(double test_frequency)
|
||||
@@ -36,7 +37,7 @@ static void generate_test_sample(double test_frequency)
|
||||
}
|
||||
}
|
||||
|
||||
static void check_level(int16_t *samples, double duration, const char *desc, double target_db)
|
||||
static void check_level(sample_t *samples, double duration, const char *desc, double target_db)
|
||||
{
|
||||
int i;
|
||||
int last = 0, envelop = 0;
|
||||
@@ -67,7 +68,7 @@ static void check_level(int16_t *samples, double duration, const char *desc, dou
|
||||
int main(void)
|
||||
{
|
||||
compandor_t cstate;
|
||||
int16_t samples[SAMPLERATE * 2];
|
||||
sample_t samples[SAMPLERATE * 2];
|
||||
int f;
|
||||
|
||||
init_compandor(&cstate, SAMPLERATE, ATTACK_MS, RECOVERY_MS, UNAFFECTED);
|
||||
|
@@ -4,6 +4,7 @@
|
||||
#include <math.h>
|
||||
#include <string.h>
|
||||
#include <unistd.h>
|
||||
#include "../common/sample.h"
|
||||
#include "../common/debug.h"
|
||||
#include "../common/timer.h"
|
||||
#include "../nmt/nmt.h"
|
||||
@@ -55,7 +56,7 @@ void dms_all_sent(nmt_t *nmt)
|
||||
}
|
||||
|
||||
/* receive bits from DMS */
|
||||
int fsk_render_frame(nmt_t *nmt, const char *frame, int length, int16_t *sample)
|
||||
int fsk_render_frame(nmt_t *nmt, const char *frame, int length, sample_t *sample)
|
||||
{
|
||||
printf("(getting %d bits from DMS layer)\n", length);
|
||||
|
||||
@@ -92,7 +93,7 @@ int main(void)
|
||||
nmt_t *nmt;
|
||||
dms_t *dms;
|
||||
int i, j;
|
||||
int16_t sample = 0;
|
||||
sample_t sample = 0;
|
||||
|
||||
debuglevel = DEBUG_DEBUG;
|
||||
dms_allow_loopback = 1;
|
||||
|
@@ -2,6 +2,7 @@
|
||||
#include <stdint.h>
|
||||
#include <math.h>
|
||||
#include <string.h>
|
||||
#include "../common/sample.h"
|
||||
#include "../common/emphasis.h"
|
||||
#include "../common/debug.h"
|
||||
|
||||
@@ -13,7 +14,7 @@
|
||||
|
||||
static double test_freq[] = { 25, 50, 100, 200, 250, 300, 400, 500, 1000, 2000, 4000, 0 };
|
||||
|
||||
static void check_level(int16_t *samples, double freq, const char *desc)
|
||||
static void check_level(sample_t *samples, double freq, const char *desc)
|
||||
{
|
||||
int i;
|
||||
int last = 0, envelope = 0;
|
||||
@@ -34,7 +35,7 @@ static void check_level(int16_t *samples, double freq, const char *desc)
|
||||
printf("%s: f = %.0f envelop = %.4f\n", desc, freq, level2db((double)envelope / DEVIATION));
|
||||
}
|
||||
|
||||
static void gen_samples(int16_t *samples, double freq)
|
||||
static void gen_samples(double *samples, double freq)
|
||||
{
|
||||
int i;
|
||||
double value;
|
||||
@@ -48,7 +49,7 @@ static void gen_samples(int16_t *samples, double freq)
|
||||
int main(void)
|
||||
{
|
||||
emphasis_t estate;
|
||||
int16_t samples[SAMPLERATE];
|
||||
double samples[SAMPLERATE];
|
||||
int i;
|
||||
|
||||
debuglevel = DEBUG_DEBUG;
|
||||
|
@@ -2,6 +2,7 @@
|
||||
#include <stdint.h>
|
||||
#include <math.h>
|
||||
#include <string.h>
|
||||
#include "../common/sample.h"
|
||||
#include "../common/filter.h"
|
||||
#include "../common/debug.h"
|
||||
|
||||
|
@@ -4,6 +4,7 @@
|
||||
#include <math.h>
|
||||
#include <string.h>
|
||||
#include <unistd.h>
|
||||
#include "../common/sample.h"
|
||||
#include "../common/debug.h"
|
||||
#include "../common/timer.h"
|
||||
#include "../nmt/nmt.h"
|
||||
|
Reference in New Issue
Block a user