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

Enforce checksums equality

Browse source
This commit is contained in:
Atlante45 2014-09-16 13:59:30 -07:00
parent 1c5c9cb31b
commit 96995e3aed
1 changed files with 83 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

118
libraries/avatars/src/Recorder.cpp
View file

@ -455,7 +455,7 @@ void writeRecordingToFile(RecordingPointer recording, QString filename) {
QElapsedTimer timer; QElapsedTimer timer;
QFile file(filename); QFile file(filename);
if (!file.open(QIODevice::WriteOnly | QIODevice::Truncate)){ if (!file.open(QIODevice::ReadWrite | QIODevice::Truncate)){
qDebug() << "Couldn't open " << filename; qDebug() << "Couldn't open " << filename;
return; return;
} }
@ -472,7 +472,7 @@ void writeRecordingToFile(RecordingPointer recording, QString filename) {
const qint64 dataLengthPos = file.pos(); const qint64 dataLengthPos = file.pos();
fileStream << (quint32)0; // Save four empty bytes for the data offset fileStream << (quint32)0; // Save four empty bytes for the data offset
const quint64 crc16Pos = file.pos(); const quint64 crc16Pos = file.pos();
fileStream << (quint32)0; // Save four empty bytes for the CRC-16 fileStream << (quint16)0; // Save two empty bytes for the CRC-16
// METADATA // METADATA
@ -640,15 +640,47 @@ void writeRecordingToFile(RecordingPointer recording, QString filename) {
qint64 writtingTime = timer.restart(); qint64 writtingTime = timer.restart();
// Write data length and CRC-16 // Write data length and CRC-16
quint16 dataLength = file.pos() - dataOffset; quint32 dataLength = file.pos() - dataOffset;
quint16 crc16= qChecksum(file.readAll().constData() + dataOffset, file.seek(dataOffset); // Go to beginning of data for checksum
dataLength); quint16 crc16 = qChecksum(file.readAll().constData(), dataLength);
file.seek(dataLengthPos); file.seek(dataLengthPos);
fileStream << dataLength; fileStream << dataLength;
file.seek(crc16Pos); file.seek(crc16Pos);
fileStream << crc16; fileStream << crc16;
file.seek(dataOffset + dataLength); file.seek(dataOffset + dataLength);
bool wantDebug = true;
if (wantDebug) {
qDebug() << "Header:";
qDebug() << "File Format version:" << VERSION;
qDebug() << "Data length:" << dataLength;
qDebug() << "Data offset:" << dataOffset;
qDebug() << "CRC-16:" << crc16;
qDebug() << "Context block:";
qDebug() << "Global timestamp:" << context.globalTimestamp;
qDebug() << "Domain:" << context.domain;
qDebug() << "Position:" << context.position;
qDebug() << "Orientation:" << context.orientation;
qDebug() << "Scale:" << context.scale;
qDebug() << "Head Model:" << context.headModel;
qDebug() << "Skeleton Model:" << context.skeletonModel;
qDebug() << "Display Name:" << context.displayName;
qDebug() << "Num Attachments:" << context.attachments.size();
for (int i = 0; i < context.attachments.size(); ++i) {
qDebug() << "Model URL:" << context.attachments[i].modelURL;
qDebug() << "Joint Name:" << context.attachments[i].jointName;
qDebug() << "Translation:" << context.attachments[i].translation;
qDebug() << "Rotation:" << context.attachments[i].rotation;
qDebug() << "Scale:" << context.attachments[i].scale;
}
qDebug() << "Recording:";
qDebug() << "Total frames:" << recording->getFrameNumber();
qDebug() << "Audio array:" << recording->getAudio()->getByteArray().size();
}
qint64 checksumTime = timer.elapsed(); qint64 checksumTime = timer.elapsed();
qDebug() << "Wrote" << file.size() << "bytes in" << writtingTime + checksumTime << "ms. (" << checksumTime << "ms for checksum)"; qDebug() << "Wrote" << file.size() << "bytes in" << writtingTime + checksumTime << "ms. (" << checksumTime << "ms for checksum)";
} }
@ -712,13 +744,23 @@ RecordingPointer readRecordingFromFile(RecordingPointer recording, QString filen
return recording; return recording;
} }
quint16 dataLength = 0; quint16 dataOffset = 0;
fileStream >> dataLength;
quint32 dataOffset = 0;
fileStream >> dataOffset; fileStream >> dataOffset;
quint32 crc16 = 0; quint32 dataLength = 0;
fileStream >> dataLength;
quint16 crc16 = 0;
fileStream >> crc16; fileStream >> crc16;
// Check checksum
quint16 computedCRC16 = qChecksum(byteArray.constData() + dataOffset, dataLength);
if (computedCRC16 != crc16) {
qDebug() << "Checksum does not match. Bailling!";
recording.clear();
return recording;
}
// METADATA // METADATA
// TODO // TODO
@ -784,32 +826,6 @@ RecordingPointer readRecordingFromFile(RecordingPointer recording, QString filen
context.attachments << data; context.attachments << data;
} }
bool wantDebug = false;
if (wantDebug) {
qDebug() << "File Format version:" << VERSION;
qDebug() << "Data length:" << dataLength;
qDebug() << "Data offset:" << dataOffset;
qDebug() << "CRC-16:" << crc16;
qDebug() << "Context block:";
qDebug() << "Domain:" << context.domain;
qDebug() << "Position:" << context.position;
qDebug() << "Orientation:" << context.orientation;
qDebug() << "Scale:" << context.scale;
qDebug() << "Head Model:" << context.headModel;
qDebug() << "Skeleton Model:" << context.skeletonModel;
qDebug() << "Display Name:" << context.displayName;
qDebug() << "Num Attachments:" << numAttachments;
for (int i = 0; i < numAttachments; ++i) {
qDebug() << "Model URL:" << context.attachments[i].modelURL;
qDebug() << "Joint Name:" << context.attachments[i].jointName;
qDebug() << "Translation:" << context.attachments[i].translation;
qDebug() << "Rotation:" << context.attachments[i].rotation;
qDebug() << "Scale:" << context.attachments[i].scale;
}
}
// RECORDING // RECORDING
fileStream >> recording->_timestamps; fileStream >> recording->_timestamps;
@ -879,6 +895,38 @@ RecordingPointer readRecordingFromFile(RecordingPointer recording, QString filen
fileStream >> audioArray; fileStream >> audioArray;
recording->addAudioPacket(audioArray); recording->addAudioPacket(audioArray);
bool wantDebug = true;
if (wantDebug) {
qDebug() << "Header:";
qDebug() << "File Format version:" << VERSION;
qDebug() << "Data length:" << dataLength;
qDebug() << "Data offset:" << dataOffset;
qDebug() << "CRC-16:" << crc16;
qDebug() << "Context block:";
qDebug() << "Global timestamp:" << context.globalTimestamp;
qDebug() << "Domain:" << context.domain;
qDebug() << "Position:" << context.position;
qDebug() << "Orientation:" << context.orientation;
qDebug() << "Scale:" << context.scale;
qDebug() << "Head Model:" << context.headModel;
qDebug() << "Skeleton Model:" << context.skeletonModel;
qDebug() << "Display Name:" << context.displayName;
qDebug() << "Num Attachments:" << numAttachments;
for (int i = 0; i < numAttachments; ++i) {
qDebug() << "Model URL:" << context.attachments[i].modelURL;
qDebug() << "Joint Name:" << context.attachments[i].jointName;
qDebug() << "Translation:" << context.attachments[i].translation;
qDebug() << "Rotation:" << context.attachments[i].rotation;
qDebug() << "Scale:" << context.attachments[i].scale;
}
qDebug() << "Recording:";
qDebug() << "Total frames:" << recording->getFrameNumber();
qDebug() << "Audio array:" << recording->getAudio()->getByteArray().size();
}
qDebug() << "Read " << byteArray.size() << " bytes in " << timer.elapsed() << " ms."; qDebug() << "Read " << byteArray.size() << " bytes in " << timer.elapsed() << " ms.";
return recording; return recording;
} }