diff options
| -rw-r--r-- | src/base/QXmppRtpPacket.cpp | 4 | ||||
| -rw-r--r-- | tests/qxmpprtppacket/tst_qxmpprtppacket.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/base/QXmppRtpPacket.cpp b/src/base/QXmppRtpPacket.cpp index 4f1ed17b..558086a2 100644 --- a/src/base/QXmppRtpPacket.cpp +++ b/src/base/QXmppRtpPacket.cpp @@ -101,7 +101,7 @@ bool QXmppRtpPacket::decode(const QByteArray &ba) quint8 tmp; QDataStream stream(ba); stream >> tmp; - const quint8 cc = (tmp >> 1) & 0xf; + const quint8 cc = (tmp & 0xf); const int hlen = 12 + 4 * cc; if ((tmp >> 6) != RTP_VERSION || ba.size() < hlen) return false; @@ -136,7 +136,7 @@ QByteArray QXmppRtpPacket::encode() const ba.resize(d->payload.size() + 12 + 4 * d->csrc.size()); QDataStream stream(&ba, QIODevice::WriteOnly); stream << quint8((RTP_VERSION << 6) | - ((d->csrc.size() & 0xf) << 1)); + (d->csrc.size() & 0xf)); stream << quint8((d->type & 0x7f) | (d->marker << 7)); stream << d->sequence; stream << d->stamp; diff --git a/tests/qxmpprtppacket/tst_qxmpprtppacket.cpp b/tests/qxmpprtppacket/tst_qxmpprtppacket.cpp index 401ee3fd..c48bd3e2 100644 --- a/tests/qxmpprtppacket/tst_qxmpprtppacket.cpp +++ b/tests/qxmpprtppacket/tst_qxmpprtppacket.cpp @@ -65,7 +65,7 @@ void tst_QXmppRtpPacket::testSimple() void tst_QXmppRtpPacket::testWithCsrc() { - QByteArray data("\x84\x00\x3e\xd2\x00\x00\x00\x90\x5f\xbd\x16\x9e\xab\xcd\xef\x01\xde\xad\xbe\xef\x12\x34\x56", 23); + QByteArray data("\x82\x00\x3e\xd2\x00\x00\x00\x90\x5f\xbd\x16\x9e\xab\xcd\xef\x01\xde\xad\xbe\xef\x12\x34\x56", 23); QXmppRtpPacket packet; QCOMPARE(packet.decode(data), true); QCOMPARE(packet.marker(), false); |