Qt: fix generation of silence samples
authorPascal Quantin <pascal.quantin@gmail.com>
Tue, 1 Dec 2015 18:40:41 +0000 (19:40 +0100)
committerAnders Broman <a.broman58@gmail.com>
Tue, 1 Dec 2015 21:19:25 +0000 (21:19 +0000)
The current code generates a shrill noise at least on Windows.
Presumably memccpy does not behave as initially expected :)

Change-Id: Id23a35d1d41ef4044b6a96c093a8fa927828f8b3
Reviewed-on: https://code.wireshark.org/review/12337
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
ui/qt/rtp_audio_stream.cpp

index 44bad62e2e955d61da5981ce58e80a1457eb39ff..99381e6509e5c01bf35d8b13d31ef6692429f434 100644 (file)
@@ -552,11 +552,9 @@ void RtpAudioStream::writeSilence(int samples)
     if (samples < 1 || audio_out_rate_ == 0) return;
 
     unsigned silence_bytes = samples * sample_bytes_;
-    char *silence_buff = (char *) g_malloc(silence_bytes);
-    SAMPLE silence = 0;
+    char *silence_buff = (char *) g_malloc0(silence_bytes);
 
     RTP_STREAM_DEBUG("Writing %u silence samples", samples);
-    memccpy(silence_buff, &silence, samples, sample_bytes_);
     tempfile_->write(silence_buff, silence_bytes);
     g_free(silence_buff);