From a6185618582db4c50df5ea6bb4f60f456059e756 Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Sat, 17 Nov 2007 23:23:14 +0000 Subject: [PATCH] set actual default git-svn-id: http://svn.openzap.org/svn/openzap/trunk@337 a93c3328-9c30-0410-af19-c9cd2b2d52af --- libs/freetdm/conf/pika.conf | 57 ++++++++++++++++++------------------- libs/freetdm/src/zap_pika.c | 32 ++++++++++++++++++++- 2 files changed, 59 insertions(+), 30 deletions(-) diff --git a/libs/freetdm/conf/pika.conf b/libs/freetdm/conf/pika.conf index 5073305da1..b44cedabbf 100644 --- a/libs/freetdm/conf/pika.conf +++ b/libs/freetdm/conf/pika.conf @@ -8,32 +8,31 @@ ; fxs-channel => 1:0:1-12@default [default] -;rx-gain => 0 -;rx-agc-enabled => 0 -;rx-agc-targetPower => 0 -;rx-agc-minGain => 0 -;rx-agc-maxGain => 0 -;rx-agc-attackRate => 0 -;rx-agc-decayRate => 0 -;rx-agc-speechThreshold => 0 -;rx-vad-enabled => 0 -;rx-vad-activationThreshold => 0 -;rx-vad-activationDebounceTime => 0 -;rx-vad-deactivationThreshold => 0 -;rx-vad-deactivationDebounceTime => 0 -;rx-vad-preSpeechBufferSize => 0 -;tx-gain => 0 -;tx-agc-enabled => 0 -;tx-agc-targetPower => 0 -;tx-agc-minGain => 0 -;tx-agc-maxGain => 0 -;tx-agc-attackRate => 0 -;tx-agc-decayRate => 0 -;tx-agc-speechThreshold => 0 -;ec-enabled => 0 -;ec-doubleTalkerThreshold => 0 -;ec-speechPresentThreshold => 0 -;ec-echoSuppressionThreshold => 0 -;ec-echoSuppressionEnabled => 0 -;ec-comfortNoiseEnabled => 0 -;ec-adaptationModeEnabled => 0 +;rx-gain => 0.00 +;rx-agc-enabled => false +;rx-agc-targetPower => -15.00 +;rx-agc-minGain => -6.00 +;rx-agc-maxGain => 18.00 +;rx-agc-attackRate => 170 +;rx-agc-decayRate => 750 +;rx-agc-speechThreshold => -36.00 +;rx-vad-enabled => false +;rx-vad-activationThreshold => -40.00 +;rx-vad-activationDebounceTime => 72 +;rx-vad-deactivationThreshold => -40.00 +;rx-vad-deactivationDebounceTime => 984 +;rx-vad-preSpeechBufferSize => 240 +;tx-gain => 0.00 +;tx-agc-enabled => true +;tx-agc-targetPower => -15.00 +;tx-agc-minGain => -6.00 +;tx-agc-maxGain => 18.00 +;tx-agc-attackRate => 170 +;tx-agc-decayRate => 750 +;tx-agc-speechThreshold => -36.00 +;ec-doubleTalkerThreshold => -6.00 +;ec-speechPresentThreshold => -40.00 +;ec-echoSuppressionThreshold => -18.00 +;ec-echoSuppressionEnabled => true +;ec-comfortNoiseEnabled => true +;ec-adaptationModeEnabled => true diff --git a/libs/freetdm/src/zap_pika.c b/libs/freetdm/src/zap_pika.c index aa6109c36e..60cb333828 100644 --- a/libs/freetdm/src/zap_pika.c +++ b/libs/freetdm/src/zap_pika.c @@ -912,7 +912,37 @@ zap_status_t pika_init(zap_io_interface_t **zint) pika_interface.get_alarms = pika_get_alarms; *zint = &pika_interface; - + + zap_log(ZAP_LOG_INFO, "Dumping Default configs:\n"); + zap_log(ZAP_LOG_INFO, "rx-gain => %0.2f\n", (float)globals.record_config.gain); + zap_log(ZAP_LOG_INFO, "rx-agc-enabled => %s\n", globals.record_config.AGC.enabled ? "true" : "false"); + zap_log(ZAP_LOG_INFO, "rx-agc-targetPower => %0.2f\n", (float)globals.record_config.AGC.targetPower); + zap_log(ZAP_LOG_INFO, "rx-agc-minGain => %0.2f\n", (float)globals.record_config.AGC.minGain); + zap_log(ZAP_LOG_INFO, "rx-agc-maxGain => %0.2f\n", (float)globals.record_config.AGC.maxGain); + zap_log(ZAP_LOG_INFO, "rx-agc-attackRate => %d\n", (int)globals.record_config.AGC.attackRate); + zap_log(ZAP_LOG_INFO, "rx-agc-decayRate => %d\n", (int)globals.record_config.AGC.decayRate); + zap_log(ZAP_LOG_INFO, "rx-agc-speechThreshold => %0.2f\n", (float)globals.record_config.AGC.speechThreshold); + zap_log(ZAP_LOG_INFO, "rx-vad-enabled => %s\n", globals.record_config.VAD.enabled ? "true" : "false"); + zap_log(ZAP_LOG_INFO, "rx-vad-activationThreshold => %0.2f\n", (float)globals.record_config.VAD.activationThreshold); + zap_log(ZAP_LOG_INFO, "rx-vad-activationDebounceTime => %d\n", (int)globals.record_config.VAD.activationDebounceTime); + zap_log(ZAP_LOG_INFO, "rx-vad-deactivationThreshold => %0.2f\n", (float)globals.record_config.VAD.deactivationThreshold); + zap_log(ZAP_LOG_INFO, "rx-vad-deactivationDebounceTime => %d\n", (int)globals.record_config.VAD.deactivationDebounceTime); + zap_log(ZAP_LOG_INFO, "rx-vad-preSpeechBufferSize => %d\n", (int)globals.record_config.VAD.preSpeechBufferSize); + zap_log(ZAP_LOG_INFO, "tx-gain => %0.2f\n", (float)globals.play_config.gain); + zap_log(ZAP_LOG_INFO, "tx-agc-enabled => %s\n", globals.play_config.AGC.enabled ? "true" : "false"); + zap_log(ZAP_LOG_INFO, "tx-agc-targetPower => %0.2f\n", (float)globals.play_config.AGC.targetPower); + zap_log(ZAP_LOG_INFO, "tx-agc-minGain => %0.2f\n", (float)globals.play_config.AGC.minGain); + zap_log(ZAP_LOG_INFO, "tx-agc-maxGain => %0.2f\n", (float)globals.play_config.AGC.maxGain); + zap_log(ZAP_LOG_INFO, "tx-agc-attackRate => %d\n", (int)globals.play_config.AGC.attackRate); + zap_log(ZAP_LOG_INFO, "tx-agc-decayRate => %d\n", (int)globals.play_config.AGC.decayRate); + zap_log(ZAP_LOG_INFO, "tx-agc-speechThreshold => %0.2f\n", (float)globals.play_config.AGC.speechThreshold); + zap_log(ZAP_LOG_INFO, "ec-doubleTalkerThreshold => %0.2f\n", (float)globals.ec_config.doubleTalkerThreshold); + zap_log(ZAP_LOG_INFO, "ec-speechPresentThreshold => %0.2f\n", (float)globals.ec_config.speechPresentThreshold); + zap_log(ZAP_LOG_INFO, "ec-echoSuppressionThreshold => %0.2f\n", (float)globals.ec_config.echoSuppressionThreshold); + zap_log(ZAP_LOG_INFO, "ec-echoSuppressionEnabled => %s\n", globals.ec_config.echoSuppressionEnabled ? "true" : "false"); + zap_log(ZAP_LOG_INFO, "ec-comfortNoiseEnabled => %s\n", globals.ec_config.comfortNoiseEnabled ? "true" : "false"); + zap_log(ZAP_LOG_INFO, "ec-adaptationModeEnabled => %s\n", globals.ec_config.adaptationModeEnabled ? "true" : "false"); + memset(&m, 0, sizeof(m));