Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 13:18:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Back to JPG compression for heightfield colors.

Browse source
This commit is contained in:
Andrzej Kapolka 2015-01-19 14:59:28 -08:00
parent 215e3b732e
commit f8f9c25d38
3 changed files with 20 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
assignment-client/src/metavoxels/MetavoxelServer.cpp
View file

@ -311,7 +311,7 @@ MetavoxelPersister::MetavoxelPersister(MetavoxelServer* server) :
const char* SAVE_FILE = "/resources/metavoxels.dat"; const char* SAVE_FILE = "/resources/metavoxels.dat";
const int FILE_MAGIC = 0xDADAFACE; const int FILE_MAGIC = 0xDADAFACE;
const int FILE_VERSION = 3; const int FILE_VERSION = 4;
void MetavoxelPersister::load() { void MetavoxelPersister::load() {
QString path = QCoreApplication::applicationDirPath() + SAVE_FILE; QString path = QCoreApplication::applicationDirPath() + SAVE_FILE;

76
libraries/metavoxels/src/Spanner.cpp
View file

@ -681,41 +681,17 @@ void HeightfieldHeightEditor::clear() {
} }
static QByteArray encodeHeightfieldColor(int offsetX, int offsetY, int width, int height, const QByteArray& contents) { static QByteArray encodeHeightfieldColor(int offsetX, int offsetY, int width, int height, const QByteArray& contents) {
QByteArray inflated(HEIGHTFIELD_DATA_HEADER_SIZE + contents.size(), 0); QByteArray inflated(HEIGHTFIELD_DATA_HEADER_SIZE, 0);
qint32* header = (qint32*)inflated.data(); qint32* header = (qint32*)inflated.data();
*header++ = offsetX; *header++ = offsetX;
*header++ = offsetY; *header++ = offsetY;
*header++ = width; *header++ = width;
*header++ = height; *header++ = height;
if (!contents.isEmpty()) { if (!contents.isEmpty()) {
// encode with Paeth filter (see http://en.wikipedia.org/wiki/Portable_Network_Graphics#Filtering) QBuffer buffer(&inflated);
const uchar* src = (const uchar*)contents.constData(); buffer.open(QIODevice::WriteOnly | QIODevice::Append);
uchar* dest = (uchar*)inflated.data() + HEIGHTFIELD_DATA_HEADER_SIZE; QImage((const uchar*)contents.constData(), width, height, width * DataBlock::COLOR_BYTES,
*dest++ = *src++; QImage::Format_RGB888).save(&buffer, "JPG");
*dest++ = *src++;
*dest++ = *src++;
int stride = width * DataBlock::COLOR_BYTES;
for (uchar* end = dest + stride - DataBlock::COLOR_BYTES; dest != end; dest++, src++) {
*dest = *src - src[-DataBlock::COLOR_BYTES];
}
for (int y = 1; y < height; y++) {
*dest++ = *src - src[-stride];
src++;
*dest++ = *src - src[-stride];
src++;
*dest++ = *src - src[-stride];
src++;
for (uchar* end = dest + stride - DataBlock::COLOR_BYTES; dest != end; dest++, src++) {
int a = src[-DataBlock::COLOR_BYTES];
int b = src[-stride];
int c = src[-stride - DataBlock::COLOR_BYTES];
int p = a + b - c;
int ad = abs(a - p);
int bd = abs(b - p);
int cd = abs(c - p);
*dest = *src - (ad < bd ? (ad < cd ? a : c) : (bd < cd ? b : c));
}
}
} }
return qCompress(inflated); return qCompress(inflated);
} }
@ -727,35 +703,19 @@ static QByteArray decodeHeightfieldColor(const QByteArray& encoded, int& offsetX
offsetY = *header++; offsetY = *header++;
width = *header++; width = *header++;
height = *header++; height = *header++;
QByteArray contents(inflated.size() - HEIGHTFIELD_DATA_HEADER_SIZE, 0); int payloadSize = inflated.size() - HEIGHTFIELD_DATA_HEADER_SIZE;
if (!contents.isEmpty()) { if (payloadSize == 0) {
const uchar* src = (const uchar*)inflated.constData() + HEIGHTFIELD_DATA_HEADER_SIZE; return QByteArray();
uchar* dest = (uchar*)contents.data(); }
*dest++ = *src++; QImage image = QImage::fromData((const uchar*)inflated.constData() + HEIGHTFIELD_DATA_HEADER_SIZE, payloadSize, "JPG");
*dest++ = *src++; if (image.format() != QImage::Format_RGB888) {
*dest++ = *src++; image = image.convertToFormat(QImage::Format_RGB888);
int stride = width * DataBlock::COLOR_BYTES; }
for (uchar* end = dest + stride - DataBlock::COLOR_BYTES; dest != end; dest++, src++) { QByteArray contents(width * height * DataBlock::COLOR_BYTES, 0);
*dest = *src + dest[-DataBlock::COLOR_BYTES]; char* dest = contents.data();
} int stride = width * DataBlock::COLOR_BYTES;
for (int y = 1; y < height; y++) { for (int y = 0; y < height; y++, dest += stride) {
*dest = (*src++) + dest[-stride]; memcpy(dest, image.constScanLine(y), stride);
dest++;
*dest = (*src++) + dest[-stride];
dest++;
*dest = (*src++) + dest[-stride];
dest++;
for (uchar* end = dest + stride - DataBlock::COLOR_BYTES; dest != end; dest++, src++) {
int a = dest[-DataBlock::COLOR_BYTES];
int b = dest[-stride];
int c = dest[-stride - DataBlock::COLOR_BYTES];
int p = a + b - c;
int ad = abs(a - p);
int bd = abs(b - p);
int cd = abs(c - p);
*dest = *src + (ad < bd ? (ad < cd ? a : c) : (bd < cd ? b : c));
}
}
} }
return contents; return contents;
} }

2
libraries/networking/src/PacketHeaders.cpp
View file

@ -78,7 +78,7 @@ PacketVersion versionForPacketType(PacketType type) {
case PacketTypeAudioStreamStats: case PacketTypeAudioStreamStats:
return 1; return 1;
case PacketTypeMetavoxelData: case PacketTypeMetavoxelData:
return 11; return 12;
default: default:
return 0; return 0;
} }