GV

GeezerVison

The World Wide Web, restored to 800 pixels of glory.

Home|About|Gaming cabinet|Archives|How it works|Starter sites

On this site

  • Sign in
  • ActionsCI/CD and automation
  • CodespacesCloud development environments
  • All Features
  • Documentation
  • Training
  • Certifications
  • Build with Copilot
  • Customize Copilot
  • Integrations
  • Trending repos
  • GitHub Sponsors
  • Developer articles
  • Enterprises

This view

  • Original page
  • New address

GeezerVison is showing github.com — Use xxHash · diffscope/diffscope-project@fd1b73f

File tree

Expand file treeCollapse file tree
Open diff view settings
Filter options
  • scripts/vcpkg-manifest
    • vcpkg.json
  • src
    • libs/3rdparty
      • dspxmodel
    • plugins
      • audio
        • CMakeLists.txt
        • internal
          • addon
            • AudioClipAddOn.cpp
            • ProjectAudioAddOn.cpp
          • utils
            • HashHelper.cpp
            • HashHelper.h
        • qml/propertyeditors
          • AudioPropertyEditor.qml
      • synth
        • CMakeLists.txt
        • internal
          • parameters
            • ParameterRuntimeRegistry.cpp
          • task
            • SynthesisTaskCodec.cpp
Expand file treeCollapse file tree
Open diff view settings
Collapse file

‎scripts/vcpkg-manifest/vcpkg.json‎

Copy file name to clipboardExpand all lines: scripts/vcpkg-manifest/vcpkg.json
+2-1Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,8 @@
3434
{
3535
"name": "libarchive",
3636
"default-features": false
37-
}
37+
},
38+
"xxhash"
3839
],
3940
"vcpkg-configuration": {
4041
"overlay-ports": [
Collapse file

‎src/libs/3rdparty/dspxmodel‎

Copy file name to clipboard
Submodule dspxmodel updated 9 files
  • benchmarks/model_edit_benchmark.cpp
    +31
  • lib/dini
    +1
    -1
  • src/orm/AudioClip.cpp
    +5
    -5
  • src/orm/AudioClip.h
    +2
    -2
  • src/orm/FreeValueDataArray.cpp
    +21
    -9
  • src/orm/Model.cpp
    +3
    -5
  • src/orm/VibratoPointDataArray.cpp
    +10
    -5
  • tests/orm/tst_orm_properties.cpp
    +1
    -1
  • tests/orm/tst_orm_smoke.cpp
    +1
    -1
Collapse file

‎src/plugins/audio/CMakeLists.txt‎

Copy file name to clipboardExpand all lines: src/plugins/audio/CMakeLists.txt
+3Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ project(audio
33
DESCRIPTION ${CURRENT_PLUGIN_DESC}
44
)
55

6+
find_package(xxHash CONFIG REQUIRED)
7+
68
diffscope_add_builtin_plugin(${PROJECT_NAME}
79
NAME org.diffscope.audio
810
DISPLAY_NAME Audio
@@ -29,6 +31,7 @@ diffscope_add_builtin_plugin(${PROJECT_NAME}
2931
talcs::Dspx
3032
talcs::Format
3133
talcs::Widgets
34+
xxHash::xxhash
3235
INCLUDE_PRIVATE
3336
internal/**
3437
)
Collapse file

‎src/plugins/audio/internal/addon/AudioClipAddOn.cpp‎

Copy file name to clipboardExpand all lines: src/plugins/audio/internal/addon/AudioClipAddOn.cpp
+3-3Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ namespace Audio::Internal {
172172
updateAudioPathLocation(&path, filePath);
173173
path.formatEntryClassName = entryClassName;
174174
path.userData = userData;
175-
path.sha512 = HashHelper::sha512(QFileInfo(filePath).absoluteFilePath());
175+
path.digest = HashHelper::digest(QFileInfo(filePath).absoluteFilePath());
176176
return path;
177177
}
178178

@@ -341,13 +341,13 @@ namespace Audio::Internal {
341341

342342
auto path = clip->path();
343343
const auto filePath = QDir(path.absoluteDir).filePath(path.fileName);
344-
const auto sha512 = HashHelper::sha512(filePath);
344+
const auto sha512 = HashHelper::digest(filePath);
345345
if (sha512.isEmpty()) {
346346
qCWarning(lcAudioClipAddOn) << "Failed to update audio clip digest from absolute path" << clip << filePath;
347347
return;
348348
}
349349

350-
path.sha512 = sha512;
350+
path.digest = sha512;
351351
document->transactionController()->beginScopedTransaction(tr("Updating audio clip digest"), [=] {
352352
clip->setPath(path);
353353
return true;
Collapse file

‎src/plugins/audio/internal/addon/ProjectAudioAddOn.cpp‎

Copy file name to clipboardExpand all lines: src/plugins/audio/internal/addon/ProjectAudioAddOn.cpp
+5-5Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ namespace Audio::Internal {
5252
}
5353

5454
static bool sha512Matches(const QString &filePath, const QString &expected) {
55-
return !expected.isEmpty() && HashHelper::sha512(filePath).compare(expected, Qt::CaseInsensitive) == 0;
55+
return !expected.isEmpty() && HashHelper::digest(filePath).compare(expected, Qt::CaseInsensitive) == 0;
5656
}
5757

5858
ProjectAudioAddOn::ProjectAudioAddOn(QObject *parent)
@@ -507,7 +507,7 @@ namespace Audio::Internal {
507507

508508
if (QFileInfo(absoluteFilePath).isFile()) {
509509
filePath = absoluteFilePath;
510-
if (!sha512Matches(filePath, path.sha512)) {
510+
if (!sha512Matches(filePath, path.digest)) {
511511
status = AudioClipAudioContext::FileContentChanged;
512512
}
513513
} else {
@@ -517,11 +517,11 @@ namespace Audio::Internal {
517517
if (!projectFilePath.isEmpty()) {
518518
const auto projectDir = QFileInfo(projectFilePath).absoluteDir();
519519
const auto relativeFilePath = normalizedAbsolutePath(projectDir.filePath(QDir(path.relativeDir).filePath(path.fileName)));
520-
if (QFileInfo(relativeFilePath).isFile() && sha512Matches(relativeFilePath, path.sha512)) {
520+
if (QFileInfo(relativeFilePath).isFile() && sha512Matches(relativeFilePath, path.digest)) {
521521
filePath = relativeFilePath;
522522
} else {
523523
const auto siblingFilePath = normalizedAbsolutePath(projectDir.filePath(path.fileName));
524-
if (QFileInfo(siblingFilePath).isFile() && sha512Matches(siblingFilePath, path.sha512)) {
524+
if (QFileInfo(siblingFilePath).isFile() && sha512Matches(siblingFilePath, path.digest)) {
525525
filePath = siblingFilePath;
526526
}
527527
}
@@ -584,7 +584,7 @@ namespace Audio::Internal {
584584
windowInterface->sendNotification(SVS::SVSCraft::Warning, tr("Audio file moved"), tr("The file in audio clip \"%1\" has been moved.\nFrom: %2\nTo: %3").arg(clip->name(), path, QDir::toNativeSeparators(context->realAudioPath())));
585585
} else if (context->status() == AudioClipAudioContext::FileContentChanged) {
586586
qCWarning(lcProjectAudioAddOn) << "Audio clip file content changed:" << clip->name() << clip->path().absoluteDir << clip->path().relativeDir << clip->path().fileName;
587-
if (!clip->path().sha512.isEmpty()) {
587+
if (!clip->path().digest.isEmpty()) {
588588
// Empty file digest suggests that the project file might be created by another editor. We do not explicitly notify user in this case.
589589
windowInterface->sendNotification(SVS::SVSCraft::Warning, tr("Audio file content changed"), tr("The file in audio clip \"%1\" has been changed:\n%2").arg(clip->name(), path));
590590
}
Collapse file

‎src/plugins/audio/internal/utils/HashHelper.cpp‎

Copy file name to clipboard
+31-6Lines changed: 31 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,46 @@
11
#include "HashHelper.h"
22

3-
#include <QCryptographicHash>
3+
#include <xxhash.h>
4+
45
#include <QFile>
56

67
namespace Audio::Internal {
78

8-
QString HashHelper::sha512(const QString &filePath) {
9+
namespace {
10+
struct XXH3StateDeleter {
11+
void operator()(XXH3_state_t* state) const noexcept {
12+
XXH3_freeState(state);
13+
}
14+
};
15+
using XXH3StatePtr = std::unique_ptr<XXH3_state_t, XXH3StateDeleter>;
16+
17+
}
18+
19+
QString HashHelper::digest(const QString &filePath) {
920
QFile file(filePath);
1021
if (!file.open(QIODevice::ReadOnly)) {
1122
return {};
1223
}
13-
14-
QCryptographicHash hash(QCryptographicHash::Sha512);
15-
if (!hash.addData(&file)) {
24+
XXH3StatePtr state{XXH3_createState()};
25+
if (XXH3_128bits_reset(state.get()) != XXH_OK) {
1626
return {};
1727
}
18-
return QString::fromLatin1(hash.result().toHex());
28+
constexpr std::size_t BufferSize = 256 * 1024;
29+
std::array<char, BufferSize> buffer;
30+
while (true) {
31+
const qint64 size = file.read(buffer.data(),static_cast<qint64>(buffer.size()));
32+
if (size < 0) {
33+
return {};
34+
}
35+
if (size == 0) {
36+
break;
37+
}
38+
if (XXH3_128bits_update(state.get(), buffer.data(), static_cast<std::size_t>(size)) != XXH_OK) {
39+
return {};
40+
}
41+
}
42+
const auto result = XXH3_128bits_digest(state.get());
43+
return QString::fromLatin1(QByteArray(reinterpret_cast<const char*>(&result), sizeof(result)).toBase64(QByteArray::Base64UrlEncoding));
1944
}
2045

2146
}
Collapse file

‎src/plugins/audio/internal/utils/HashHelper.h‎

Copy file name to clipboardExpand all lines: src/plugins/audio/internal/utils/HashHelper.h
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ namespace Audio::Internal {
77

88
class HashHelper {
99
public:
10-
static QString sha512(const QString &filePath);
10+
static QString digest(const QString &filePath);
1111
};
1212

1313
}
Collapse file

‎src/plugins/audio/qml/propertyeditors/AudioPropertyEditor.qml‎

Copy file name to clipboardExpand all lines: src/plugins/audio/qml/propertyeditors/AudioPropertyEditor.qml
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ PropertyEditorGroupBox {
102102
ThemedItem.controlType: SVS.CT_Warning
103103
label: qsTr("Audio file content changed")
104104
visible: groupBox.audioClipAudioContext?.status === AudioClipAudioContext.FileContentChanged
105-
&& Boolean(groupBox.audioClip?.path.sha512)
105+
&& Boolean(groupBox.audioClip?.path.digest)
106106
display: AbstractButton.TextBesideIcon
107107
action: Action {
108108
text: qsTr("Confirm the Change")
@@ -116,7 +116,7 @@ PropertyEditorGroupBox {
116116
ThemedItem.controlType: SVS.CT_Warning
117117
label: qsTr("Audio file content consistency unknown")
118118
visible: groupBox.audioClipAudioContext?.status === AudioClipAudioContext.FileContentChanged
119-
&& !groupBox.audioClip?.path.sha512
119+
&& !groupBox.audioClip?.path.digest
120120
display: AbstractButton.TextBesideIcon
121121
action: Action {
122122
text: qsTr("Confirm Current File")
Collapse file

‎src/plugins/synth/CMakeLists.txt‎

Copy file name to clipboardExpand all lines: src/plugins/synth/CMakeLists.txt
+3Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ project(synth
33
DESCRIPTION ${CURRENT_PLUGIN_DESC}
44
)
55

6+
find_package(xxHash CONFIG REQUIRED)
7+
68
diffscope_add_builtin_plugin(${PROJECT_NAME}
79
NAME org.diffscope.synth
810
DISPLAY_NAME Synthesis
@@ -38,6 +40,7 @@ diffscope_add_builtin_plugin(${PROJECT_NAME}
3840
svscraft::Quick
3941
svscraft::QmlExtras
4042
SVSCraft3rdParty_tinyexpr
43+
xxHash::xxhash
4144
INCLUDE_PRIVATE
4245
internal/**
4346
)
Collapse file

‎src/plugins/synth/internal/parameters/ParameterRuntimeRegistry.cpp‎

Copy file name to clipboardExpand all lines: src/plugins/synth/internal/parameters/ParameterRuntimeRegistry.cpp
+12-23Lines changed: 12 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,13 @@
22

33
#include <tinyexpr.h>
44

5+
#include <xxhash.h>
6+
57
#include <algorithm>
68
#include <cmath>
79
#include <mutex>
810

911
#include <QCoreApplication>
10-
#include <QCryptographicHash>
1112
#include <QJsonDocument>
1213
#include <QLocale>
1314

@@ -86,8 +87,8 @@ namespace Synth::Internal {
8687
}
8788

8889
struct ParameterRuntimeRegistry::Context {
89-
explicit Context(const ParameterConfiguration &source, const QByteArray &json)
90-
: configuration(source), normalizedJson(json) {
90+
explicit Context(const ParameterConfiguration &source)
91+
: configuration(source) {
9192
}
9293

9394
bool compile(QString *errorMessage) {
@@ -109,7 +110,6 @@ namespace Synth::Internal {
109110
}
110111

111112
ParameterConfiguration configuration;
112-
QByteArray normalizedJson;
113113
CompiledExpression normalization;
114114
CompiledExpression denormalization;
115115
CompiledExpression display;
@@ -137,28 +137,17 @@ namespace Synth::Internal {
137137
}
138138

139139
const auto normalizedJson = QJsonDocument(configuration.toJson()).toJson(QJsonDocument::Compact);
140-
auto handle = QCryptographicHash::hash(normalizedJson, QCryptographicHash::Sha512);
140+
const auto hashResult = XXH3_128bits(normalizedJson.data(), normalizedJson.size());
141+
const auto handle = QByteArray(reinterpret_cast<const char *>(&hashResult), sizeof(hashResult));
141142
std::shared_ptr<Context> runtime;
142143
{
143144
std::lock_guard lock(m_mutex);
144-
quint32 collisionIndex{};
145-
while (true) {
146-
const auto existing = m_contexts.value(handle);
147-
if (!existing) {
148-
runtime = std::make_shared<Context>(configuration, normalizedJson);
149-
if (!runtime->compile(errorMessage))
150-
return false;
151-
m_contexts.insert(handle, runtime);
152-
break;
153-
}
154-
if (existing->normalizedJson == normalizedJson) {
155-
runtime = existing;
156-
break;
157-
}
158-
++collisionIndex;
159-
handle = QCryptographicHash::hash(
160-
normalizedJson + QByteArray::number(collisionIndex), QCryptographicHash::Sha512
161-
);
145+
runtime = m_contexts.value(handle);
146+
if (!runtime) {
147+
runtime = std::make_shared<Context>(configuration);
148+
if (!runtime->compile(errorMessage))
149+
return false;
150+
m_contexts.insert(handle, runtime);
162151
}
163152
}
164153

0 commit comments

Comments
0 (0)
You are visitor 01402520 — GeezerVison does not store the pages you look up.
Best viewed with Netscape Navigator 4.7 or Internet Explorer 6 at 800×600. No cookies required.