Added option to dump the audio streams to debug the echo canceller

src/mumble/AudioInput.cpp

@@ -76,6 +76,15 @@ bool AudioInputRegistrar::canExclusive() const {
 }
 
 AudioInput::AudioInput() : opusBuffer(g.s.iFramesPerPacket * (SAMPLE_RATE / 100)) {
+
+	bDebugDumpInput = g.bDebugDumpInput;
+	if(bDebugDumpInput)
+	{
+		outMic.open("raw_microphone_dump", std::ios::binary);
+		outSpeaker.open("speaker_dump", std::ios::binary);
+		outProcessed.open("processed_microphone_dump", std::ios::binary);
+	}
+
 	adjustBandwidth(g.iMaxBandwidth, iAudioQuality, iAudioFrames, bAllowLowDelay);
 
 	g.iAudioBandwidth = getNetworkBandwidth(iAudioQuality, iAudioFrames);
@@ -555,10 +564,15 @@ void AudioInput::addEcho(const void *data, unsigned int nsamp) {
 				outbuff[j] = static_cast<short>(ptr[j] * mul);
 
 			// Push frame into the echo chancellers jitter buffer
-			QMutexLocker l(&qmEcho);
+			int queueLength;
+			{
+				QMutexLocker l(&qmEcho);
 
-			iJitterSeq = qMin(iJitterSeq + 1,10000U);
-			qlEchoFrames.append(outbuff);
+				iJitterSeq = qMin(iJitterSeq + 1,10000U);
+				qlEchoFrames.append(outbuff);
+				queueLength = qlEchoFrames.size();
+			}
+			if(bDebugDumpInput) printf("Queue=%d\n",queueLength);
 		}
 	}
 }
@@ -869,6 +883,14 @@ void AudioInput::encodeAudioFrame() {
 		sum += static_cast<float>(psSource[i] * psSource[i]);
 	float micLevel = sqrtf(sum / static_cast<float>(iFrameSize));
 	dPeakSignal = qMax(20.0f*log10f(micLevel / 32768.0f), -96.0f);
+
+	if(bDebugDumpInput)
+	{
+		outMic.write(reinterpret_cast<const char*>(psMic),iFrameSize*sizeof(short));
+		if(psSpeaker)
+			outSpeaker.write(reinterpret_cast<const char*>(psSpeaker),iFrameSize*sizeof(short));
+		outProcessed.write(reinterpret_cast<const char*>(psSource),iFrameSize*sizeof(short));
+	}
 
 	spx_int32_t prob = 0;
 	speex_preprocess_ctl(sppPreprocess, SPEEX_PREPROCESS_GET_PROB, &prob);

src/mumble/AudioInput.h

@@ -15,6 +15,7 @@
 #include <QtCore/QObject>
 #include <QtCore/QThread>
 #include <vector>
+#include <fstream>
 
 #include "Audio.h"
 #include "Settings.h"
@@ -62,6 +63,10 @@ class AudioInput : public QThread {
 		typedef enum { SampleShort, SampleFloat } SampleFormat;
 		typedef void (*inMixerFunc)(float * RESTRICT, const void * RESTRICT, unsigned int, unsigned int, quint64);
 	private:
+
+		bool bDebugDumpInput;
+		std::ofstream outMic, outSpeaker, outProcessed;
+
 		SpeexResamplerState *srsMic, *srsEcho;
 
 		QMutex qmEcho;

src/mumble/Global.cpp

@@ -113,6 +113,7 @@ Global::Global() {
 	bHappyEaster = false;
 
 	bQuit = false;
+	bDebugDumpInput = false;
 
 	QStringList qsl;
 	qsl << QCoreApplication::instance()->applicationDirPath();

src/mumble/Global.h

@@ -97,6 +97,7 @@ struct Global Q_DECL_FINAL {
 	unsigned int uiImageLength;
 	unsigned int uiMaxUsers;
 	bool bQuit;
+	bool bDebugDumpInput;
 
 	bool bHappyEaster;
 	static const char ccHappyEaster[];

src/mumble/main.cpp

@@ -170,6 +170,12 @@ int main(int argc, char **argv) {
 					"                Show the Mumble authors.\n"
 					"  --third-party-licenses\n"
 					"                Show licenses for third-party software used by Mumble.\n"
+					"  --dump-input-streams\n"
+					"                Dump pcm streams at various parts of the input chain\n"
+					"                (useful for debugging purposes)\n"
+					"                - raw microphone input\n"
+					"                - speaker readback for echo cancelling\n"
+					"                - processed microphone input\n"
 					"\n"
 				);
 				QString rpcHelpBanner = MainWindow::tr(
@@ -240,6 +246,8 @@ int main(int argc, char **argv) {
 #endif
 					return 1;
 				}
+			} else if (args.at(i) == QLatin1String("--dump-input-streams")) {
+				 g.bDebugDumpInput = true;
 			} else {
 				if (!bRpcMode) {
 					QUrl u = QUrl::fromEncoded(args.at(i).toUtf8());