diff options
| author | Jeremy Lainé <jeremy.laine@m4x.org> | 2015-08-20 13:26:19 +0200 |
|---|---|---|
| committer | Jeremy Lainé <jeremy.laine@m4x.org> | 2015-08-24 08:32:00 +0200 |
| commit | 1c28cc6f1cca7c1cd941e6402027be2ee2c8c42b (patch) | |
| tree | 0a1f058bf4e4b5f88ae11d672ccf9666bbfea6e8 /src/base/QXmppCodec.cpp | |
| parent | f87d817c2f3390d80a038007dcfaf588375319dd (diff) | |
| download | qxmpp-1c28cc6f1cca7c1cd941e6402027be2ee2c8c42b.tar.gz | |
use PIMPL + accessors for QXmppRtpPacket
Diffstat (limited to 'src/base/QXmppCodec.cpp')
| -rw-r--r-- | src/base/QXmppCodec.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/base/QXmppCodec.cpp b/src/base/QXmppCodec.cpp index 97de1996..328fd043 100644 --- a/src/base/QXmppCodec.cpp +++ b/src/base/QXmppCodec.cpp @@ -676,7 +676,7 @@ QList<QXmppVideoFrame> QXmppTheoraDecoder::handlePacket(const QXmppRtpPacket &pa QList<QXmppVideoFrame> frames; // theora deframing: draft-ietf-avt-rtp-theora-00 - QDataStream stream(packet.payload); + QDataStream stream(packet.payload()); quint32 theora_header; stream >> theora_header; @@ -1185,9 +1185,10 @@ QXmppVideoFormat QXmppVpxDecoder::format() const QList<QXmppVideoFrame> QXmppVpxDecoder::handlePacket(const QXmppRtpPacket &packet) { QList<QXmppVideoFrame> frames; + const QByteArray payload = packet.payload(); // vp8 deframing: http://tools.ietf.org/html/draft-westin-payload-vp8-00 - QDataStream stream(packet.payload); + QDataStream stream(payload); quint8 vpx_header; stream >> vpx_header; @@ -1198,7 +1199,7 @@ QList<QXmppVideoFrame> QXmppVpxDecoder::handlePacket(const QXmppRtpPacket &packe return frames; } - const int packetLength = packet.payload.size() - 1; + const int packetLength = payload.size() - 1; #ifdef QXMPP_DEBUG_VPX qDebug("Vpx fragment FI: %d, size %d", frag_type, packetLength); #endif @@ -1216,9 +1217,9 @@ QList<QXmppVideoFrame> QXmppVpxDecoder::handlePacket(const QXmppRtpPacket &packe if (frag_type == NoFragment) { // unfragmented packet - if ((packet.payload[1] & 0x1) == 0 // is key frame + if ((payload[1] & 0x1) == 0 // is key frame || packet.sequence == sequence) { - if (d->decodeFrame(packet.payload.mid(1), &frame)) + if (d->decodeFrame(payload.mid(1), &frame)) frames << frame; sequence = packet.sequence + 1; @@ -1229,9 +1230,9 @@ QList<QXmppVideoFrame> QXmppVpxDecoder::handlePacket(const QXmppRtpPacket &packe // fragments if (frag_type == StartFragment) { // start fragment - if ((packet.payload[1] & 0x1) == 0 // is key frame + if ((payload[1] & 0x1) == 0 // is key frame || packet.sequence == sequence) { - d->packetBuffer = packet.payload.mid(1); + d->packetBuffer = payload.mid(1); sequence = packet.sequence + 1; } } else { |