Merge pull request #3639 from ey6es/metavoxels

Fix for streaming crash.

assignment-client/src/metavoxels/MetavoxelServer.cpp

@@ -237,8 +237,7 @@ void MetavoxelSession::update() {
         
         // go back to the beginning with the current packet and note that there's a delta pending
         _sequencer.getOutputStream().getUnderlying().device()->seek(start);
-        MetavoxelDeltaPendingMessage msg = { ++_reliableDeltaID, sendRecord->getPacketNumber(),
+        MetavoxelDeltaPendingMessage msg = { ++_reliableDeltaID, sendRecord->getPacketNumber(), _lodPacketNumber };
-            _sequencer.getIncomingPacketNumber() };
         out << (_reliableDeltaMessage = QVariant::fromValue(msg));
         _sequencer.endPacket();
         
@@ -265,7 +264,8 @@ void MetavoxelSession::handleMessage(const QVariant& message) {
     if (userType == ClientStateMessage::Type) {
         ClientStateMessage state = message.value<ClientStateMessage>();
         _lod = state.lod;
-    
+        _lodPacketNumber = _sequencer.getIncomingPacketNumber();
+        
     } else if (userType == MetavoxelEditMessage::Type) {
         QMetaObject::invokeMethod(_sender->getServer(), "applyEdit", Q_ARG(const MetavoxelEditMessage&,
             message.value<MetavoxelEditMessage>()));

assignment-client/src/metavoxels/MetavoxelServer.h

@@ -127,6 +127,7 @@ private:
     MetavoxelSender* _sender;
     
     MetavoxelLOD _lod;
+    int _lodPacketNumber;
     
     ReliableChannel* _reliableDeltaChannel;
     int _reliableDeltaReceivedOffset;

libraries/metavoxels/src/DatagramSequencer.cpp

@@ -301,10 +301,10 @@ void DatagramSequencer::clearReliableChannel(QObject* object) {
 void DatagramSequencer::sendRecordAcknowledged(const SendRecord& record) {
     // stop acknowledging the recorded packets
     while (!_receiveRecords.isEmpty() && _receiveRecords.first().packetNumber <= record.lastReceivedPacketNumber) {
+        emit receiveAcknowledged(0);
         const ReceiveRecord& received = _receiveRecords.first();
         _inputStream.persistReadMappings(received.mappings);
         _receivedHighPriorityMessages -= received.newHighPriorityMessages;
-        emit receiveAcknowledged(0);
         _receiveRecords.removeFirst();
     }
     _outputStream.persistWriteMappings(record.mappings);

libraries/metavoxels/src/DatagramSequencer.h

@@ -108,6 +108,9 @@ public:
     /// Returns the intput channel at the specified index, creating it if necessary.
     ReliableChannel* getReliableInputChannel(int index = 0);
     
+    /// Returns a reference to the stored receive mappings at the specified index.
+    const Bitstream::ReadMappings& getReadMappings(int index) const { return _receiveRecords.at(index).mappings; }
+    
     /// Adds stats for all reliable channels to the referenced variables.
     void addReliableChannelStats(int& sendProgress, int& sendTotal, int& receiveProgress, int& receiveTotal) const;
     

libraries/metavoxels/src/MetavoxelClientManager.cpp

@@ -188,7 +188,9 @@ MetavoxelClient::MetavoxelClient(const SharedNodePointer& node, MetavoxelUpdater
     Endpoint(node, new PacketRecord(), new PacketRecord()),
     _updater(updater),
     _reliableDeltaChannel(NULL),
-    _reliableDeltaID(0) {
+    _reliableDeltaID(0),
+    _dummyInputStream(_dummyDataStream),
+    _dummyPacketNumber(0) {
     
     connect(_sequencer.getReliableInputChannel(RELIABLE_DELTA_CHANNEL_INDEX),
         SIGNAL(receivedMessage(const QVariant&, Bitstream&)), SLOT(handleMessage(const QVariant&, Bitstream&)));
@@ -234,9 +236,9 @@ PacketRecord* MetavoxelClient::getAcknowledgedReceiveRecord(int packetNumber) co
     if (lastAcknowledged->getPacketNumber() == packetNumber) {
         return lastAcknowledged;
     }
-    foreach (PacketRecord* record, _clearedReceiveRecords) {
+    foreach (const ClearedReceiveRecord& record, _clearedReceiveRecords) {
-        if (record->getPacketNumber() == packetNumber) {
+        if (record.first->getPacketNumber() == packetNumber) {
-            return record;
+            return record.first;
         }
     }
     return NULL;
@@ -257,8 +259,8 @@ void MetavoxelClient::recordReceive() {
     }
     _clearedSendRecords.clear();
     
-    foreach (PacketRecord* record, _clearedReceiveRecords) {
+    foreach (const ClearedReceiveRecord& record, _clearedReceiveRecords) {
-        delete record;
+        delete record.first;
     }
     _clearedReceiveRecords.clear();
 }
@@ -273,10 +275,16 @@ void MetavoxelClient::clearSendRecordsBefore(int index) {
 }
 
 void MetavoxelClient::clearReceiveRecordsBefore(int index) {
+    // copy the mappings on first call per packet
+    if (_sequencer.getIncomingPacketNumber() > _dummyPacketNumber) {
+        _dummyPacketNumber = _sequencer.getIncomingPacketNumber();
+        _dummyInputStream.copyPersistentMappings(_sequencer.getInputStream());
+    }
+    
     // move to cleared list
     QList<PacketRecord*>::iterator end = _receiveRecords.begin() + index + 1;
     for (QList<PacketRecord*>::const_iterator it = _receiveRecords.begin(); it != end; it++) {
-        _clearedReceiveRecords.append(*it);
+        _clearedReceiveRecords.append(ClearedReceiveRecord(*it, _sequencer.getReadMappings(index)));
     }
     _receiveRecords.erase(_receiveRecords.begin(), end);
 }
@@ -289,7 +297,6 @@ void MetavoxelClient::writeUpdateMessage(Bitstream& out) {
 void MetavoxelClient::handleMessage(const QVariant& message, Bitstream& in) {
     int userType = message.userType(); 
     if (userType == MetavoxelDeltaMessage::Type) {
-        PacketRecord* receiveRecord = getLastAcknowledgedReceiveRecord();
         if (_reliableDeltaChannel) {    
             MetavoxelData reference = _remoteData;
             MetavoxelLOD referenceLOD = _remoteDataLOD;
@@ -299,6 +306,7 @@ void MetavoxelClient::handleMessage(const QVariant& message, Bitstream& in) {
             _reliableDeltaChannel = NULL;
         
         } else {
+            PacketRecord* receiveRecord = getLastAcknowledgedReceiveRecord();
             _remoteData.readDelta(receiveRecord->getData(), receiveRecord->getLOD(), in,
                 _remoteDataLOD = getLastAcknowledgedSendRecord()->getLOD());
             in.reset();
@@ -319,8 +327,6 @@ void MetavoxelClient::handleMessage(const QVariant& message, Bitstream& in) {
         MetavoxelDeltaPendingMessage pending = message.value<MetavoxelDeltaPendingMessage>();
         if (pending.id > _reliableDeltaID) {
             _reliableDeltaID = pending.id;
-            _reliableDeltaChannel = _sequencer.getReliableInputChannel(RELIABLE_DELTA_CHANNEL_INDEX);
-            _reliableDeltaChannel->getBitstream().copyPersistentMappings(_sequencer.getInputStream());
             PacketRecord* sendRecord = getAcknowledgedSendRecord(pending.receivedPacketNumber);
             if (!sendRecord) {
                 qWarning() << "Missing send record for delta" << pending.receivedPacketNumber;
@@ -334,6 +340,20 @@ void MetavoxelClient::handleMessage(const QVariant& message, Bitstream& in) {
             }
             _remoteDataLOD = receiveRecord->getLOD();
             _remoteData = receiveRecord->getData();
+            
+            _reliableDeltaChannel = _sequencer.getReliableInputChannel(RELIABLE_DELTA_CHANNEL_INDEX);
+            if (receiveRecord == getLastAcknowledgedReceiveRecord()) {
+                _reliableDeltaChannel->getBitstream().copyPersistentMappings(_sequencer.getInputStream());
+                
+            } else {
+                _reliableDeltaChannel->getBitstream().copyPersistentMappings(_dummyInputStream);
+                foreach (const ClearedReceiveRecord& record, _clearedReceiveRecords) {
+                    _reliableDeltaChannel->getBitstream().persistReadMappings(record.second);
+                    if (record.first == receiveRecord) {
+                        break;
+                    }
+                }
+            }
         }
     } else {
         Endpoint::handleMessage(message, in);

libraries/metavoxels/src/MetavoxelClientManager.h

@@ -145,8 +145,13 @@ protected:
     MetavoxelData _dataCopy;
     QReadWriteLock _dataCopyLock;
     
+    QDataStream _dummyDataStream;
+    Bitstream _dummyInputStream;
+    int _dummyPacketNumber;
     QList<PacketRecord*> _clearedSendRecords;
-    QList<PacketRecord*> _clearedReceiveRecords;
+    
+    typedef QPair<PacketRecord*, Bitstream::ReadMappings> ClearedReceiveRecord;
+    QList<ClearedReceiveRecord> _clearedReceiveRecords;
 };
 
 #endif // hifi_MetavoxelClientManager_h

libraries/metavoxels/src/MetavoxelMessages.cpp

@@ -701,8 +701,7 @@ int VoxelMaterialSpannerEditVisitor::visit(MetavoxelInfo& info) {
     int sizeY = (int)overlap.maximum.y - minY + 1;
     int sizeZ = (int)overlap.maximum.z - minZ + 1;
     
-    QRgb rgb = _color.rgba();
+    bool flipped = false;
-    bool flipped = (qAlpha(rgb) == 0);
     float step = 1.0f / scale;
     glm::vec3 position(0.0f, 0.0f, info.minimum.z + minZ * step);
     if (_spanner->hasOwnColors()) {
@@ -720,6 +719,8 @@ int VoxelMaterialSpannerEditVisitor::visit(MetavoxelInfo& info) {
             }
         }
     } else {
+        QRgb rgb = _color.rgba();
+        flipped = (qAlpha(rgb) == 0);
         for (QRgb* destZ = colorContents.data() + minZ * VOXEL_BLOCK_AREA + minY * VOXEL_BLOCK_SAMPLES + minX,
                 *endZ = destZ + sizeZ * VOXEL_BLOCK_AREA; destZ != endZ; destZ += VOXEL_BLOCK_AREA, position.z += step) {
             position.y = info.minimum.y + minY * step;