Another round of tweaks for spandsp. There should be no functional changes,

although quite a few things have changed in the test suite
This commit is contained in:
Steve Underwood
2011-07-02 21:16:52 +08:00
parent d30e82e226
commit 4a7bbf4ec6
77 changed files with 966 additions and 357 deletions
+9 -9
View File
@@ -212,7 +212,7 @@ static void signal_load(signal_source_t *sig, const char *name)
static void signal_free(signal_source_t *sig)
{
if (sf_close(sig->handle) != 0)
if (sf_close_telephony(sig->handle))
{
fprintf(stderr, " Cannot close sound file '%s'\n", sig->name);
exit(2);
@@ -324,7 +324,7 @@ static float level_measurement_device(level_measurement_device_t *dev, int16_t a
}
if (signal <= 0.0f)
return -99.0f;
power = DBM0_MAX_POWER + 20.0f*log10f(signal/32767.0f);
power = DBM0_MAX_POWER + 20.0f*log10f(signal/32767.0f + 1.0e-10f);
if (power > dev->peak)
dev->peak = power;
return power;
@@ -368,7 +368,7 @@ static void print_results(void)
printf("%-4s %-1d %-5.1f%6.2fs%9.2f%9.2f%9.2f%9.2f%9.2f\n",
test_name,
chan_model.model_no,
20.0f*log10f(-chan_model.erl),
20.0f*log10f(-chan_model.erl + 1.0e-10f),
0.0f, //test_clock,
level_measurement_device_get_peak(rin_power_meter),
level_measurement_device_get_peak(rout_power_meter),
@@ -1559,14 +1559,14 @@ static void simulate_ec(char *argv[], int two_channel_file, int mode)
if (two_channel_file)
{
sf_close(rxtxfile);
sf_close_telephony(rxtxfile);
}
else
{
sf_close(txfile);
sf_close(rxfile);
sf_close_telephony(txfile);
sf_close_telephony(rxfile);
}
sf_close(ecfile);
sf_close_telephony(ecfile);
}
/*- End of function --------------------------------------------------------*/
@@ -1703,7 +1703,7 @@ int main(int argc, char *argv[])
}
match_test_name(argv[i]);
}
if (sf_close(result_handle) != 0)
if (sf_close_telephony(result_handle))
{
fprintf(stderr, " Cannot close speech file '%s'\n", "result_sound.wav");
exit(2);
@@ -1712,7 +1712,7 @@ int main(int argc, char *argv[])
}
signal_free(&local_css);
signal_free(&far_css);
if (sf_close(residue_handle) != 0)
if (sf_close_telephony(residue_handle))
{
fprintf(stderr, " Cannot close speech file '%s'\n", RESIDUE_FILE_NAME);
exit(2);