Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 10:07:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

more VoxelPacket compression tuning

Browse source
This commit is contained in:
ZappoMan 2013-11-24 14:41:50 -08:00
parent 57633f8b92
commit e2f5069e6a
5 changed files with 46 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
interface/src/VoxelSystem.cpp
View file

@ -597,7 +597,7 @@ int VoxelSystem::parseData(unsigned char* sourceBuffer, int numBytes) {
// ask the VoxelTree to read the bitstream into the tree // ask the VoxelTree to read the bitstream into the tree
ReadBitstreamToTreeParams args(WANT_COLOR, WANT_EXISTS_BITS, NULL, getDataSourceUUID()); ReadBitstreamToTreeParams args(WANT_COLOR, WANT_EXISTS_BITS, NULL, getDataSourceUUID());
lockTree(); lockTree();
VoxelPacket packet; VoxelPacket packet(VOXEL_PACKET_COMPRESSION_DEFAULT);
int compressedSize = numBytes - numBytesPacketHeader; int compressedSize = numBytes - numBytesPacketHeader;
packet.loadCompressedContent(voxelData, compressedSize); packet.loadCompressedContent(voxelData, compressedSize);
printf("got packet numBytes=%d compressed size %d uncompressed size %d\n",numBytes, compressedSize, packet.getUncompressedSize()); printf("got packet numBytes=%d compressed size %d uncompressed size %d\n",numBytes, compressedSize, packet.getUncompressedSize());
@ -611,7 +611,7 @@ printf("got packet numBytes=%d compressed size %d uncompressed size %d\n",numByt
// ask the VoxelTree to read the MONOCHROME bitstream into the tree // ask the VoxelTree to read the MONOCHROME bitstream into the tree
ReadBitstreamToTreeParams args(NO_COLOR, WANT_EXISTS_BITS, NULL, getDataSourceUUID()); ReadBitstreamToTreeParams args(NO_COLOR, WANT_EXISTS_BITS, NULL, getDataSourceUUID());
lockTree(); lockTree();
VoxelPacket packet; VoxelPacket packet(VOXEL_PACKET_COMPRESSION_DEFAULT);
int compressedSize = numBytes - numBytesPacketHeader; int compressedSize = numBytes - numBytesPacketHeader;
packet.loadCompressedContent(voxelData, compressedSize); packet.loadCompressedContent(voxelData, compressedSize);
printf("got packet numBytes=%d compressed size %d uncompressed size %d\n",numBytes, compressedSize, packet.getUncompressedSize()); printf("got packet numBytes=%d compressed size %d uncompressed size %d\n",numBytes, compressedSize, packet.getUncompressedSize());

25
libraries/voxel-server-library/src/VoxelSendThread.cpp
View file

@ -21,7 +21,9 @@ extern EnvironmentData environmentData[3];
VoxelSendThread::VoxelSendThread(const QUuid& nodeUUID, VoxelServer* myServer) : VoxelSendThread::VoxelSendThread(const QUuid& nodeUUID, VoxelServer* myServer) :
_nodeUUID(nodeUUID), _nodeUUID(nodeUUID),
_myServer(myServer), _myServer(myServer),
_encodedSomething(false) { _tempPacket(VOXEL_PACKET_COMPRESSION_DEFAULT),
_encodedSomething(false)
{
} }
bool VoxelSendThread::process() { bool VoxelSendThread::process() {
@ -422,22 +424,25 @@ int VoxelSendThread::deepestLevelVoxelDistributor(Node* node, VoxelNodeData* nod
uint64_t end = usecTimestampNow(); uint64_t end = usecTimestampNow();
int elapsedmsec = (end - start)/1000; int elapsedmsec = (end - start)/1000;
uint64_t endCompressCalls = VoxelPacket::_checkCompressCalls;
int elapsedCompressCalls = endCompressCalls - startCompressCalls;
uint64_t endCompressTimeMsecs = VoxelPacket::_checkCompressTime / 1000;
int elapsedCompressTimeMsecs = endCompressTimeMsecs - startCompressTimeMsecs;
if (elapsedmsec > 100) { if (elapsedmsec > 100) {
if (elapsedmsec > 1000) { if (elapsedmsec > 1000) {
int elapsedsec = (end - start)/1000000; int elapsedsec = (end - start)/1000000;
printf("WARNING! packetLoop() took %d seconds to generate %d bytes in %d packets %d nodes still to send\n", printf("WARNING! packetLoop() took %d seconds [%d milliseconds %d calls in compress] to generate %d bytes in %d packets %d nodes still to send\n",
elapsedsec, trueBytesSent, truePacketsSent, nodeData->nodeBag.count()); elapsedsec, elapsedCompressTimeMsecs, elapsedCompressCalls, trueBytesSent, truePacketsSent, nodeData->nodeBag.count());
} else { } else {
printf("WARNING! packetLoop() took %d milliseconds to generate %d bytes in %d packets, %d nodes still to send\n", printf("WARNING! packetLoop() took %d milliseconds [%d milliseconds %d calls in compress] to generate %d bytes in %d packets, %d nodes still to send\n",
elapsedmsec, trueBytesSent, truePacketsSent, nodeData->nodeBag.count()); elapsedmsec, elapsedCompressTimeMsecs, elapsedCompressCalls, trueBytesSent, truePacketsSent, nodeData->nodeBag.count());
} }
} else if (truePacketsSent > 0 /*_myServer->wantsDebugVoxelSending() && _myServer->wantsVerboseDebug()*/) { } else if (truePacketsSent > 0 /*_myServer->wantsDebugVoxelSending() && _myServer->wantsVerboseDebug()*/) {
uint64_t endCompressCalls = VoxelPacket::_checkCompressCalls;
int elapsedCompressCalls = endCompressCalls - startCompressCalls;
uint64_t endCompressTimeMsecs = VoxelPacket::_checkCompressTime / 1000;
int elapsedCompressTimeMsecs = endCompressTimeMsecs - startCompressTimeMsecs;
printf("packetLoop() took %d milliseconds [%d milliseconds %d calls in compress] to generate %d bytes in %d packets, %d nodes still to send\n", printf("packetLoop() took %d milliseconds [%d milliseconds %d calls in compress] to generate %d bytes in %d packets, %d nodes still to send\n",
elapsedmsec, elapsedCompressTimeMsecs, elapsedCompressCalls, trueBytesSent, truePacketsSent, nodeData->nodeBag.count()); elapsedmsec, elapsedCompressTimeMsecs, elapsedCompressCalls, trueBytesSent, truePacketsSent, nodeData->nodeBag.count());
} }

8
libraries/voxels/src/VoxelConstants.h
View file

@ -35,9 +35,11 @@ const float MAX_LOD_SIZE_MULTIPLIER = 2000.0f;
const int NUMBER_OF_CHILDREN = 8; const int NUMBER_OF_CHILDREN = 8;
const int MAX_VOXEL_PACKET_SIZE = MAX_PACKET_SIZE - (sizeof(PACKET_TYPE) + sizeof(PACKET_VERSION)); const int MAX_VOXEL_PACKET_SIZE = MAX_PACKET_SIZE - (sizeof(PACKET_TYPE) + sizeof(PACKET_VERSION));
const int MAX_VOXEL_PACKET_COMPRESSION_RATIO = 3; const int MAX_VOXEL_UNCOMRESSED_PACKET_SIZE = 4500;
const int MAX_VOXEL_UNCOMRESSED_PACKET_SIZE = 3000; // MAX_VOXEL_PACKET_SIZE * MAX_VOXEL_PACKET_COMPRESSION_RATIO; const int VOXEL_PACKET_ALWAYS_TEST_COMPRESSED_THRESHOLD = 1400;
const int COMPRESSION_TEST_THRESHOLD = 2000; const int VOXEL_PACKET_TEST_UNCOMPRESSED_THRESHOLD = 4000;
const int VOXEL_PACKET_TEST_UNCOMPRESSED_CHANGE_THRESHOLD = 20;
const int VOXEL_PACKET_COMPRESSION_DEFAULT = true;
const int MAX_TREE_SLICE_BYTES = 26; const int MAX_TREE_SLICE_BYTES = 26;
const int DEFAULT_MAX_VOXELS_PER_SYSTEM = 200000; const int DEFAULT_MAX_VOXELS_PER_SYSTEM = 200000;

30
libraries/voxels/src/VoxelPacket.cpp
View file

@ -27,6 +27,7 @@ void VoxelPacket::reset() {
} }
_subTreeAt = 0; _subTreeAt = 0;
_compressedBytes = 0; _compressedBytes = 0;
_bytesInUseLastCheck = 0;
_dirty = false; _dirty = false;
} }
@ -101,7 +102,9 @@ const unsigned char* VoxelPacket::getFinalizedData() {
} }
if (_dirty) { if (_dirty) {
if (_debug) printf("getFinalizedData() _compressedBytes=%d _bytesInUse=%d\n",_compressedBytes, _bytesInUse); if (_debug) {
printf("getFinalizedData() _compressedBytes=%d _bytesInUse=%d\n",_compressedBytes, _bytesInUse);
}
checkCompress(); checkCompress();
} }
@ -114,7 +117,9 @@ int VoxelPacket::getFinalizedSize() {
} }
if (_dirty) { if (_dirty) {
if (_debug) printf("getFinalizedSize() _compressedBytes=%d _bytesInUse=%d\n",_compressedBytes, _bytesInUse); if (_debug) {
printf("getFinalizedSize() _compressedBytes=%d _bytesInUse=%d\n",_compressedBytes, _bytesInUse);
}
checkCompress(); checkCompress();
} }
@ -156,11 +161,21 @@ if (_debug) printf("discardLevel() AFTER _dirty=%s bytesInLevel=%d _compressedBy
bool VoxelPacket::endLevel(int key) { bool VoxelPacket::endLevel(int key) {
bool success = true; bool success = true;
// if we've never compressed, then compress to see our size // if we are dirty (something has changed) then try a compression test in the following cases...
// or, if we're within 50% of our MAX_VOXEL_PACKET_SIZE then check... // 1) If we've previously compressed and our _compressedBytes are "close enough to our limit" that we want to keep
// otherwise assume it's safe... // testing to make sure we don't overflow... VOXEL_PACKET_ALWAYS_TEST_COMPRESSION_THRESHOLD
if (_dirty && (_compressedBytes == 0 || _bytesInUse > COMPRESSION_TEST_THRESHOLD)) { // 2) If we've passed the uncompressed size where we believe we might pass the compressed threshold, and we've added
if (_debug) printf("endLevel() _dirty=%s _compressedBytes=%d _bytesInUse=%d\n",debug::valueOf(_dirty), _compressedBytes, _bytesInUse); // a sufficient number of uncompressed bytes
if (_dirty && (
(_compressedBytes > VOXEL_PACKET_ALWAYS_TEST_COMPRESSED_THRESHOLD) ||
( (_bytesInUse > VOXEL_PACKET_TEST_UNCOMPRESSED_THRESHOLD) &&
(_bytesInUse - _bytesInUseLastCheck > VOXEL_PACKET_TEST_UNCOMPRESSED_CHANGE_THRESHOLD)
)
)) {
if (_debug) {
printf("endLevel() _dirty=%s _compressedBytes=%d _bytesInUse=%d\n",
debug::valueOf(_dirty), _compressedBytes, _bytesInUse);
}
success = checkCompress(); success = checkCompress();
} }
if (!success) { if (!success) {
@ -201,6 +216,7 @@ bool VoxelPacket::checkCompress() {
return true; return true;
} }
_bytesInUseLastCheck = _bytesInUse;
bool success = false; bool success = false;
const int MAX_COMPRESSION = 2; const int MAX_COMPRESSION = 2;

1
libraries/voxels/src/VoxelPacket.h
View file

@ -109,6 +109,7 @@ private:
unsigned char _compressed[MAX_VOXEL_UNCOMRESSED_PACKET_SIZE]; unsigned char _compressed[MAX_VOXEL_UNCOMRESSED_PACKET_SIZE];
int _compressedBytes; int _compressedBytes;
int _bytesInUseLastCheck;
bool _dirty; bool _dirty;
static bool _debug; static bool _debug;