digitalartifex/komplex
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug fixes for audio textures

Browse Source
This commit is contained in:
Digital Artifex
2025-08-10 05:06:15 -04:00
parent 396b1cb104
commit 49ae3bb429
7 changed files with 73 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

122
package/contents/ui/ShaderChannel.qml
View File

@@ -42,8 +42,8 @@ Item
ImageChannel,
VideoChannel,
ShaderChannel,
CubeMapChannel
// AudioChannel
CubeMapChannel,
AudioChannel
}
property int type: ShaderChannel.Type.ImageChannel
@@ -133,15 +133,15 @@ Item
{
loader.sourceComponent: channelShader
}
},
State
{
when: channel.type === ShaderChannel.Type.AudioChannel
PropertyChanges
{
loader.sourceComponent: channelAudio
}
}
// State
// {
// when: channel.type === ShaderChannel.Type.AudioChannel
// PropertyChanges
// {
// loader.sourceComponent: channelAudio
// }
// }
]
transform: Rotation
@@ -373,80 +373,40 @@ Item
// Supporting this as an mp3 feels kinda silly. Should really figure out how to capture desktop audio with qml
// UPDATE: This is not currently supported in QML, so we will need to implement this in C++ later
// Component
// {
// id: channelAudio
// Rectangle
// {
// anchors.fill: parent
// color: "black"
Component
{
id: audioChannel
// property var audioData: new Array(512).fill(0)
// property alias texture: audioTexture
Item
{
// MediaDevices
// {
// id: devices
// }
Image
{
id: textureImage
source: "image://audiotexture/frame"
anchors.fill: parent
fillMode: Image.PreserveAspectFit
}
// AudioInput
// {
// id: audioInput
// device: devices.defaultAudioInput
// }
Timer
{
property int frame: 0
interval: 16
repeat: true
triggeredOnStart: true
running: true
// CaptureSession
// {
// id: captureSession
// audioInput: audioInput
// }
onTriggered:
{
frame++
textureImage.source = "image://audiotexture/frame" + frame
}
}
// Timer
// {
// interval: 16 // ~60fps update
// running: true
// repeat: true
// onTriggered:
// {
// // Get audio levels and update texture
// // let buffer = audioInput.probe.audioBuffer()
// // if (buffer)
// // {
// // for (let i = 0; i < Math.min(buffer.length, 512); i++) {
// // audioData[i] = Math.abs(buffer[i])
// // }
// // audioTexture.update()
// // }
// }
// }
// ShaderEffectSource
// {
// id: audioTexture
// width: 512
// height: 1
// format: ShaderEffectSource.Alpha
// smooth: false
// hideSource: true
// sourceItem: Row
// {
// Repeater
// {
// model: 512
// Rectangle
// {
// width: 1
// height: 1
// color: Qt.rgba(1, 1, 1, root.audioData[index])
// }
// }
// }
// }
// Component.onCompleted:
// {
// //captureSession.start()
// }
// }
// }
Component.onCompleted:
{
Komplex.AudioModel.startCapture()
}
}
}
}

20
package/contents/ui/ShaderChannelConfiguration.qml
View File

@@ -88,16 +88,13 @@ Item
{
id: selectionModel
// Commented out Audio channel as it is not implemented yet
// ListElement
// {
// file: true
// name: "Audio"
// icon: "qrc:/icons/audio.svg"
// title: "Select an Audio File"
// filter: "MP3 Files (*.mp3):WAV Files (*.wav)"
// type: ShaderChannel.Type.AudioChannel
// }
ListElement
{
file: true
name: "Audio"
icon: "./icons/audio.svg"
type: ShaderChannel.Type.AudioChannel
}
ListElement
{
@@ -271,6 +268,7 @@ Item
RowLayout
{
visible: window.tmp_type != ShaderChannel.Type.AudioChannel
Layout.alignment: Qt.AlignTop
Label
@@ -611,6 +609,8 @@ Item
case ShaderChannel.Type.VideoChannel:
window.currentFolder = window.videoFolder
break;
case ShaderChannel.Type.AudioChannel:
break;
}
// Set the current selection index

3
plugin/AudioImageProvider.h
View File

@@ -5,8 +5,9 @@
#include <QQuickImageProvider>
#include "AudioModel.h"
#include "Komplex_global.h"
class AudioImageProvider : public QQuickImageProvider
class KOMPLEX_EXPORT AudioImageProvider : public QQuickImageProvider
{
public:
explicit AudioImageProvider();

9
plugin/AudioModel.cpp
View File

@@ -120,6 +120,9 @@ AudioModel::~AudioModel()
void AudioModel::startCapture()
{
if(!m_instance)
m_instance = new AudioModel();
if(m_thread->isRunning())
return;
@@ -139,6 +142,9 @@ void AudioModel::startCaptureAsync()
QPixmap AudioModel::frame()
{
if(!m_instance)
return QPixmap();
return m_instance->m_frame;
}
@@ -319,7 +325,8 @@ void AudioModel::on_process(void *userdata)
}
// Blackman window function
std::vector<double> AudioModel::createBlackmanWindow(int size) {
std::vector<double> AudioModel::createBlackmanWindow(int size)
{
std::vector<double> window(size);
const double a0 = 0.42;
const double a1 = 0.5;

2
plugin/AudioModel.h
View File

@@ -12,7 +12,7 @@
* https://webaudio.github.io/web-audio-api/#smoothing-over-time
*
* The described smoothing method was resulting in inconsistent data. This
* is likely to a poor implementation. A linear smoothing algo seems to work
* is likely due to a poor implementation. A linear smoothing algo seems to work
* (at least visually). Will need to revisit the temporal implementation if
* things do not work as expected.
*

11
plugin/plugin.cpp
View File

@@ -7,6 +7,15 @@
#include "ShaderPackModel.h"
#include "Komplex_global.h"
AudioModel *komplexAudioSingletonProvider(QQmlEngine *engine, QJSEngine *scriptEngine)
{
Q_UNUSED(engine)
Q_UNUSED(scriptEngine)
AudioModel *model = new AudioModel();
return model;
}
class KOMPLEX_EXPORT KomplexPlugin : public QQmlExtensionPlugin
{
Q_OBJECT
@@ -16,7 +25,7 @@ public:
{
Q_ASSERT(QLatin1String(uri) == QLatin1String("com.github.digitalartifex.komplex"));
qmlRegisterType<AudioModel>(uri, 1, 0, "AudioModel");
qmlRegisterSingletonType<AudioModel*>(uri, 1, 0, "AudioModel", komplexAudioSingletonProvider);
qmlRegisterType<ShaderPackModel>(uri, 1, 0, "ShaderPackModel");
}