Silence buffer before processing, fixes noise while rendering wav

falkTX · falkTX · commit af044d916912 · 2013-10-29T01:25:36.000Z
diff --git a/release/distrib/replay/lib/sounddriver/sounddriver_linux.cpp b/release/distrib/replay/lib/sounddriver/sounddriver_linux.cpp
@@ -66,6 +66,9 @@ static int jaudio_process_callback(jack_nframes_t nframes, void*)
     float* audioBuf1 = (float*)jack_port_get_buffer(jaudio_port1, nframes);
     float* audioBuf2 = (float*)jack_port_get_buffer(jaudio_port2, nframes);
 
+    memset(audioBuf1, 0, sizeof(float)*nframes);
+    memset(audioBuf2, 0, sizeof(float)*nframes);
+
     AUDIO_Acknowledge = FALSE;
 
     if (AUDIO_Play_Flag && (AUDIO_MixerFloat || AUDIO_Mixer))
@@ -75,7 +78,7 @@ static int jaudio_process_callback(jack_nframes_t nframes, void*)
             AUDIO_MixerFloat(audioBuf1, audioBuf2, nframes);
         }
         else
-	{
+        {
             Uint8 mixerBuf[nframes*2];
             AUDIO_Mixer(mixerBuf, nframes*2);
 
@@ -88,8 +91,8 @@ static int jaudio_process_callback(jack_nframes_t nframes, void*)
     }
     else
     {
-        for (jack_nframes_t i=0; i < nframes; ++i)
-            *audioBuf1++ = *audioBuf2++ = 0.0f;
+        //for (jack_nframes_t i=0; i < nframes; ++i)
+        //    *audioBuf1++ = *audioBuf2++ = 0.0f;
 
         AUDIO_Acknowledge = TRUE;
     }

Original file line number	Diff line number	Diff line change
`@@ -66,6 +66,9 @@ static int jaudio_process_callback(jack_nframes_t nframes, void*)`
`66`	`66`	`float* audioBuf1 = (float*)jack_port_get_buffer(jaudio_port1, nframes);`
`67`	`67`	`float* audioBuf2 = (float*)jack_port_get_buffer(jaudio_port2, nframes);`
`68`	`68`
	`69`	`+ memset(audioBuf1, 0, sizeof(float)*nframes);`
	`70`	`+ memset(audioBuf2, 0, sizeof(float)*nframes);`
	`71`	`+`
`69`	`72`	`AUDIO_Acknowledge = FALSE;`
`70`	`73`
`71`	`74`	`if (AUDIO_Play_Flag && (AUDIO_MixerFloat \|\| AUDIO_Mixer))`
`@@ -75,7 +78,7 @@ static int jaudio_process_callback(jack_nframes_t nframes, void*)`
`75`	`78`	`AUDIO_MixerFloat(audioBuf1, audioBuf2, nframes);`
`76`	`79`	`}`
`77`	`80`	`else`
`78`		`- {`
	`81`	`+ {`
`79`	`82`	`Uint8 mixerBuf[nframes*2];`
`80`	`83`	`AUDIO_Mixer(mixerBuf, nframes*2);`
`81`	`84`
`@@ -88,8 +91,8 @@ static int jaudio_process_callback(jack_nframes_t nframes, void*)`
`88`	`91`	`}`
`89`	`92`	`else`
`90`	`93`	`{`
`91`		`- for (jack_nframes_t i=0; i < nframes; ++i)`
`92`		`- audioBuf1++ = audioBuf2++ = 0.0f;`
	`94`	`+ //for (jack_nframes_t i=0; i < nframes; ++i)`
	`95`	`+ // audioBuf1++ = audioBuf2++ = 0.0f;`
`93`	`96`
`94`	`97`	`AUDIO_Acknowledge = TRUE;`
`95`	`98`	`}`