diff options
author | Daniil Cherednik <dan.cherednik@gmail.com> | 2018-11-03 21:17:03 +0300 |
---|---|---|
committer | Daniil Cherednik <dan.cherednik@gmail.com> | 2018-11-03 21:17:03 +0300 |
commit | d8502a297b556cb06bf59bd00b2524931a8f034a (patch) | |
tree | d2633c73f96b0e05f0dcc246d4465cee35aa4a43 /test | |
parent | f054da2e4b4138c987c0b4f760b16c092664cb98 (diff) | |
download | libgha-d8502a297b556cb06bf59bd00b2524931a8f034a.tar.gz |
A bit more clean api
Diffstat (limited to 'test')
-rw-r--r-- | test/dtmf.c | 10 | ||||
-rw-r--r-- | test/main.c | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/test/dtmf.c b/test/dtmf.c index c98164b..54fcb6d 100644 --- a/test/dtmf.c +++ b/test/dtmf.c @@ -20,7 +20,7 @@ int main(int argc, char** argv) { long long len = atoll(argv[3]); - gha_ctx* ctx; + gha_ctx_t ctx; float* buf = malloc(len * sizeof(float)); if (!buf) @@ -44,7 +44,7 @@ int main(int argc, char** argv) { gha_extract_one(buf, &res[0], ctx); gha_extract_one(buf, &res[1], ctx); - if (res[0].freq > res[1].freq) { + if (res[0].frequency > res[1].frequency) { struct gha_info tmp; memcpy(&tmp, &res[0], sizeof(struct gha_info)); memcpy(&res[0], &res[1], sizeof(struct gha_info)); @@ -61,14 +61,14 @@ int main(int argc, char** argv) { magn[0] = atof(argv[5]); freq[1] = atof(argv[6]); magn[1] = atof(argv[7]); - if (fabs(freq[0] - res[0].freq) > 0.001 || fabs(magn[0] - res[0].magnitude) > 0.001 || - fabs(freq[1] - res[1].freq) > 0.001 || fabs(magn[1] - res[1].magnitude) > 0.001) + if (fabs(freq[0] - res[0].frequency) > 0.001 || fabs(magn[0] - res[0].magnitude) > 0.001 || + fabs(freq[1] - res[1].frequency) > 0.001 || fabs(magn[1] - res[1].magnitude) > 0.001) return 1; return 0; } else { fprintf(stderr, "dtmf result: low freq: %f, magn: %f, high freq: %f, magn: %f\n", - res[0].freq, res[0].magnitude, res[1].freq, res[1].magnitude); + res[0].frequency, res[0].magnitude, res[1].frequency, res[1].magnitude); } } diff --git a/test/main.c b/test/main.c index 703cbf5..6d730f2 100644 --- a/test/main.c +++ b/test/main.c @@ -22,7 +22,7 @@ int main(int argc, char** argv) { long long len = atoll(argv[3]); - gha_ctx* ctx; + gha_ctx_t ctx; float* buf = malloc(len * sizeof(float)); if (!buf) @@ -51,11 +51,11 @@ int main(int argc, char** argv) { double freq = atof(argv[4]); double phase = atof(argv[5]); double magn = atof(argv[6]); - if (fabs(freq - res.freq) > 0.001 || compare_phase(phase, res.phase, 0.001) || fabs(magn - res.magnitude) > 0.001) + if (fabs(freq - res.frequency) > 0.001 || compare_phase(phase, res.phase, 0.001) || fabs(magn - res.magnitude) > 0.001) return 1; return 0; } else { - fprintf(stderr, "Result: freq: %f, phase: %f, magn: %f\n", res.freq, res.phase, res.magnitude); + fprintf(stderr, "Result: freq: %f, phase: %f, magn: %f\n", res.frequency, res.phase, res.magnitude); } return 0; |