Remove (unused) jitter buffer reporting code

6 files changed, 0 insertions, 72 deletions

diff --git a/src/mumble/AudioOutputSpeech.cpp b/src/mumble/AudioOutputSpeech.cpp
index 968fefe30..2724accf7 100644
--- a/src/mumble/AudioOutputSpeech.cpp
+++ b/src/mumble/AudioOutputSpeech.cpp
@@ -177,26 +177,6 @@ void AudioOutputSpeech::addFrameToBuffer(const QByteArray &qbaPacket, unsigned i
 		jbp.span = samples;
 		jbp.timestamp = iFrameSize * iSeq;
 
-#ifdef REPORT_JITTER
-		if (g.s.bUsage && (umtType != MessageTypes::UDPVoiceSpeex) && p && ! p->qsHash.isEmpty() && (p->qlTiming.count() < 3000)) {
-			QMutexLocker qml(& p->qmTiming);
-
-			ClientUser::JitterRecord jr;
-			jr.iSequence = iSeq;
-			jr.iFrames = frames;
-			jr.uiElapsed = p->tTiming.restart();
-
-			if (! p->qlTiming.isEmpty()) {
-				jr.iFrames -= p->iFrames;
-				jr.iSequence -= p->iSequence + p->iFrames;
-			}
-			p->iFrames = frames;
-			p->iSequence = iSeq;
-
-			p->qlTiming.append(jr);
-		}
-#endif
-
 		jitter_buffer_put(jbJitter, &jbp);
 	}
 }
diff --git a/src/mumble/ClientUser.cpp b/src/mumble/ClientUser.cpp
index 34c816a55..10ce6cc30 100644
--- a/src/mumble/ClientUser.cpp
+++ b/src/mumble/ClientUser.cpp
@@ -310,10 +310,3 @@ void Channel::addClientUser(ClientUser *p) {
 	addUser(p);
 	p->setParent(this);
 }
-
-QDataStream &operator<<(QDataStream &qds, const ClientUser::JitterRecord &jr) {
-	qds << static_cast<qint8>(qBound(-128, jr.iSequence, 127));
-	qds << static_cast<qint8>(qBound(-128, jr.iFrames, 127));
-	qds << static_cast<quint32>(qMin(4294967295ULL, jr.uiElapsed));
-	return qds;
-}
diff --git a/src/mumble/ClientUser.h b/src/mumble/ClientUser.h
index eab13c245..edac16cb5 100644
--- a/src/mumble/ClientUser.h
+++ b/src/mumble/ClientUser.h
@@ -56,11 +56,6 @@ class ClientUser : public QObject, public User {
 		float fPowerMin, fPowerMax;
 		float fAverageAvailable;
 
-#ifdef REPORT_JITTER
-		QMutex qmTiming;
-		Timer tTiming;
-		QList<JitterRecord> qlTiming;
-#endif
 		int iFrames;
 		int iSequence;
 
diff --git a/src/mumble/Usage.cpp b/src/mumble/Usage.cpp
index e1f9255df..adc82264e 100644
--- a/src/mumble/Usage.cpp
+++ b/src/mumble/Usage.cpp
@@ -47,19 +47,8 @@ Usage::Usage(QObject *p) : QObject(p) {
 
 	// Wait 10 minutes (so we know they're actually using this), then...
 	QTimer::singleShot(60 * 10 * 1000, this, SLOT(registerUsage()));
-	QTimer::singleShot(60 * 10 * 1000, this, SLOT(reportJitter()));
 }
 
-#ifdef REPORT_JITTER
-void Usage::addJitter(ClientUser *cu) {
-	QMutexLocker qml(& cu->qmTiming);
-	if (! cu->qlTiming.isEmpty()) {
-		qdsReport << QByteArray::fromHex(cu->qsHash.toUtf8());
-		qdsReport << cu->qlTiming;
-	}
-}
-#endif
-
 void Usage::registerUsage() {
 	if (! g.s.bUsage || g.s.uiUpdateCounter == 0) // Only register usage if allowed by the user and first wizard run has finished
 		return;
@@ -101,27 +90,3 @@ void Usage::registerUsage() {
 
 	connect(rep, SIGNAL(finished()), rep, SLOT(deleteLater()));
 }
-
-void Usage::reportJitter() {
-#ifdef REPORT_JITTER
-	QTimer::singleShot(60 * 10 * 1000, this, SLOT(reportJitter()));
-
-	if (qbReport.size() < 1024)
-		return;
-
-	QNetworkRequest req(QUrl(QLatin1String("http://mumble.info/jitter.cgi")));
-	Network::prepareRequest(req);
-	req.setHeader(QNetworkRequest::ContentTypeHeader, QLatin1String("application/octet-stream"));
-
-	QNetworkReply *rep = g.nam->post(req, qCompress(qbReport.buffer(), 9));
-	connect(rep, SIGNAL(finished()), rep, SLOT(deleteLater()));
-
-	qbReport.close();
-	qbReport.setData(QByteArray());
-
-	qbReport.open(QBuffer::ReadWrite);
-	qdsReport.setDevice(&qbReport);
-	qdsReport.setVersion(QDataStream::Qt_4_4);
-	qdsReport << static_cast<unsigned int>(2);
-#endif
-}
diff --git a/src/mumble/Usage.h b/src/mumble/Usage.h
index 6b5d79d83..d84506855 100644
--- a/src/mumble/Usage.h
+++ b/src/mumble/Usage.h
@@ -47,7 +47,6 @@ class Usage : public QObject {
 		void addJitter(ClientUser *cu);
 	public slots:
 		void registerUsage();
-		void reportJitter();
 };
 
 #endif
diff --git a/src/mumble/UserModel.cpp b/src/mumble/UserModel.cpp
index d95cd4d1f..1b1c74414 100644
--- a/src/mumble/UserModel.cpp
+++ b/src/mumble/UserModel.cpp
@@ -898,10 +898,6 @@ void UserModel::removeUser(ClientUser *p) {
 
 	updateOverlay();
 
-#ifdef REPORT_JITTER
-	g.mw->uUsage.addJitter(p);
-#endif
-
 	delete p;
 	delete item;
 }