]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
Avoid repeating ourselves in generating silence
authorTravis Cross <tc@traviscross.com>
Mon, 3 Mar 2014 20:03:22 +0000 (20:03 +0000)
committerTravis Cross <tc@traviscross.com>
Tue, 4 Mar 2014 02:09:28 +0000 (02:09 +0000)
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

index 2aafff129fee6bf2d27d718107f00e33b6df1546..3495d0578f53c48c6891bb24282842b93db59c16 100644 (file)
@@ -93,11 +93,8 @@ static switch_status_t silence_stream_file_read(switch_file_handle_t *handle, vo
                sh->samples -= *len;
        }
 
-       if (sh->silence) {
-               switch_generate_sln_silence((int16_t *) data, *len, sh->silence);
-       } else {
-               memset(data, 0, *len * 2);
-       }
+       switch_generate_sln_silence((int16_t *) data, *len,
+                                                               sh->silence ? sh->silence : (uint32_t)-1);
 
        return SWITCH_STATUS_SUCCESS;
 }