diff options
| author | Jeremy Lainé <jeremy.laine@m4x.org> | 2015-09-03 16:34:36 +0200 |
|---|---|---|
| committer | Jeremy Lainé <jeremy.laine@m4x.org> | 2015-09-03 16:34:36 +0200 |
| commit | cb16b3abb805c02c103237155e2ee624325f5dd6 (patch) | |
| tree | 4e52159289e6048f07b5d079ef2eaa70e2e2f73e /src/base/QXmppCodec.cpp | |
| parent | aa3e0a2d41f25b05aef08df3d8b8cf698e9045c8 (diff) | |
| parent | a159e4c4afc62628ec5b753829e1a023b6ae5dea (diff) | |
| download | qxmpp-cb16b3abb805c02c103237155e2ee624325f5dd6.tar.gz | |
Merge branch 'master' of github.com:qxmpp-project/qxmpp
Diffstat (limited to 'src/base/QXmppCodec.cpp')
| -rw-r--r-- | src/base/QXmppCodec.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/base/QXmppCodec.cpp b/src/base/QXmppCodec.cpp index 328fd043..98b6934a 100644 --- a/src/base/QXmppCodec.cpp +++ b/src/base/QXmppCodec.cpp @@ -1218,11 +1218,11 @@ QList<QXmppVideoFrame> QXmppVpxDecoder::handlePacket(const QXmppRtpPacket &packe if (frag_type == NoFragment) { // unfragmented packet if ((payload[1] & 0x1) == 0 // is key frame - || packet.sequence == sequence) { + || packet.sequence() == sequence) { if (d->decodeFrame(payload.mid(1), &frame)) frames << frame; - sequence = packet.sequence + 1; + sequence = packet.sequence() + 1; } d->packetBuffer.resize(0); @@ -1231,13 +1231,13 @@ QList<QXmppVideoFrame> QXmppVpxDecoder::handlePacket(const QXmppRtpPacket &packe if (frag_type == StartFragment) { // start fragment if ((payload[1] & 0x1) == 0 // is key frame - || packet.sequence == sequence) { + || packet.sequence() == sequence) { d->packetBuffer = payload.mid(1); - sequence = packet.sequence + 1; + sequence = packet.sequence() + 1; } } else { // continuation or end fragment - if (packet.sequence == sequence) { + if (packet.sequence() == sequence) { const int packetPos = d->packetBuffer.size(); d->packetBuffer.resize(packetPos + packetLength); stream.readRawData(d->packetBuffer.data() + packetPos, packetLength); @@ -1260,6 +1260,7 @@ QList<QXmppVideoFrame> QXmppVpxDecoder::handlePacket(const QXmppRtpPacket &packe bool QXmppVpxDecoder::setParameters(const QMap<QString, QString> ¶meters) { + Q_UNUSED(parameters); return true; } |