From 680bc46768c668decca1f628af09071c2fa0cfca Mon Sep 17 00:00:00 2001
From: Travis Cross <tc@traviscross.com>
Date: Mon, 3 Mar 2014 20:03:22 +0000
Subject: [PATCH] Avoid repeating ourselves in generating silence
We were handling the "send silence but not comfort noise" case in both
silence_stream_file_read and switch_generate_sln_silence. This
changes the former to rely on the latter.
---
src/mod/formats/mod_tone_stream/mod_tone_stream.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/src/mod/formats/mod_tone_stream/mod_tone_stream.c b/src/mod/formats/mod_tone_stream/mod_tone_stream.c
index 9005f5ee8b..3c6e69ac8e 100644
--- a/src/mod/formats/mod_tone_stream/mod_tone_stream.c
+++ b/src/mod/formats/mod_tone_stream/mod_tone_stream.c
@@ -93,11 +93,8 @@ static switch_status_t silence_stream_file_read(switch_file_handle_t *handle, vo
sh->samples -= (int32_t)*len;
}
- if (sh->silence) {
- switch_generate_sln_silence((int16_t *) data, (uint32_t)*len, sh->silence);
- } else {
- memset(data, 0, *len * 2);
- }
+ switch_generate_sln_silence((int16_t *) data, (uint32_t)*len,
+ sh->silence ? sh->silence : (uint32_t)-1);
return SWITCH_STATUS_SUCCESS;
}