diff options
| author | Jeremy Lainé <jeremy.laine@m4x.org> | 2015-08-28 11:25:13 +0200 |
|---|---|---|
| committer | Jeremy Lainé <jeremy.laine@m4x.org> | 2015-08-28 11:25:27 +0200 |
| commit | 31ce5f6dd5bd21dfb299096cc914bf9869eea4e2 (patch) | |
| tree | 7fff238c066a96023f777fb92aa6c5d33a91b889 | |
| parent | 5f144d0f0a10e2f55de00f838bea43748a27d8ab (diff) | |
| download | qxmpp-31ce5f6dd5bd21dfb299096cc914bf9869eea4e2.tar.gz | |
don't write SDP header
| -rw-r--r-- | src/base/QXmppJingleIq.cpp | 10 | ||||
| -rw-r--r-- | tests/qxmppjingleiq/tst_qxmppjingleiq.cpp | 12 |
2 files changed, 2 insertions, 20 deletions
diff --git a/src/base/QXmppJingleIq.cpp b/src/base/QXmppJingleIq.cpp index f2dd6a95..ebbab5ca 100644 --- a/src/base/QXmppJingleIq.cpp +++ b/src/base/QXmppJingleIq.cpp @@ -401,8 +401,6 @@ bool QXmppJingleIq::Content::parseSdp(const QString &sdp) QString QXmppJingleIq::Content::toSdp() const { - const quint32 ntpSeconds = QDateTime(QDate(1900, 1, 1)).secsTo(QDateTime::currentDateTime()); - // get default candidate QHostAddress localRtpAddress = QHostAddress::Any; quint16 localRtpPort = 0; @@ -415,14 +413,6 @@ QString QXmppJingleIq::Content::toSdp() const } QStringList sdp; - sdp << "v=0"; - sdp << QString("o=- %1 %2 %3").arg( - QString::number(ntpSeconds), - QString::number(ntpSeconds), - addressToSdp(QHostAddress::Any) - ); - sdp << "s=-"; - sdp << "t=0 0"; // media QString payloads; diff --git a/tests/qxmppjingleiq/tst_qxmppjingleiq.cpp b/tests/qxmppjingleiq/tst_qxmppjingleiq.cpp index 26b11c35..69274739 100644 --- a/tests/qxmppjingleiq/tst_qxmppjingleiq.cpp +++ b/tests/qxmppjingleiq/tst_qxmppjingleiq.cpp @@ -162,10 +162,6 @@ void tst_QXmppJingleIq::testRtpSession() void tst_QXmppJingleIq::testRtpSessionSdp() { const QString sdp( - "v=0\r\n" - "o=- NTPSTAMP NTPSTAMP IN IP4 0.0.0.0\r\n" - "s=-\r\n" - "t=0 0\r\n" "m=audio 8998 RTP/AVP 96 97 18 0 103 98\r\n" "c=IN IP4 10.0.1.1\r\n" "a=rtpmap:96 speex/16000\r\n" @@ -209,16 +205,12 @@ void tst_QXmppJingleIq::testRtpSessionSdp() QCOMPARE(content.transportUser(), QLatin1String("8hhy")); QCOMPARE(content.transportPassword(), QLatin1String("asd88fgpdd777uzjYhagZg")); - QCOMPARE(content.toSdp().replace(QRegExp("o=- [0-9]+ [0-9]+"), "o=- NTPSTAMP NTPSTAMP"), sdp); + QCOMPARE(content.toSdp(), sdp); } void tst_QXmppJingleIq::testRtpSessionSdpParameters() { const QString sdp( - "v=0\r\n" - "o=- NTPSTAMP NTPSTAMP IN IP4 0.0.0.0\r\n" - "s=-\r\n" - "t=0 0\r\n" "m=audio 8998 RTP/AVP 96 100\r\n" "c=IN IP4 10.0.1.1\r\n" "a=rtpmap:96 speex/16000\r\n" @@ -247,7 +239,7 @@ void tst_QXmppJingleIq::testRtpSessionSdpParameters() QCOMPARE(content.transportCandidates()[0].protocol(), QLatin1String("udp")); QCOMPARE(content.transportCandidates()[0].type(), QXmppJingleCandidate::HostType); - QCOMPARE(content.toSdp().replace(QRegExp("o=- [0-9]+ [0-9]+"), "o=- NTPSTAMP NTPSTAMP"), sdp); + QCOMPARE(content.toSdp(), sdp); } void tst_QXmppJingleIq::testSession() |