timeline/renderer: implemented basic waveform display support

This commit is contained in:
itsmattkc
2020-03-06 16:18:07 +11:00
parent a41c0e65ac
commit c75a0e8498
13 changed files with 230 additions and 14 deletions
+3 -2
View File
@@ -24,7 +24,7 @@ bool AudioBackend::InitInternal()
// Initiate one thread per CPU core
for (int i=0;i<threads().size();i++) {
// Create one processor object for each thread
AudioWorker* processor = new AudioWorker(decoder_cache());
AudioWorker* processor = new AudioWorker(decoder_cache(), &copy_map_);
processor->SetParameters(params());
processors_.append(processor);
}
@@ -39,12 +39,13 @@ void AudioBackend::CloseInternal()
bool AudioBackend::CompileInternal()
{
// This backend doesn't compile anything yet
return true;
return AudioRenderBackend::CompileInternal();
}
void AudioBackend::DecompileInternal()
{
// This backend doesn't compile anything yet
AudioRenderBackend::DecompileInternal();
}
void AudioBackend::ConnectWorkerToThis(RenderWorker *worker)
+2 -2
View File
@@ -1,7 +1,7 @@
#include "audioworker.h"
AudioWorker::AudioWorker(DecoderCache* decoder_cache, QObject *parent) :
AudioRenderWorker(decoder_cache, parent)
AudioWorker::AudioWorker(DecoderCache* decoder_cache, QHash<Node *, Node *> *copy_map, QObject *parent) :
AudioRenderWorker(decoder_cache, copy_map, parent)
{
}
+1 -1
View File
@@ -6,7 +6,7 @@
class AudioWorker : public AudioRenderWorker
{
public:
AudioWorker(DecoderCache* decoder_cache, QObject* parent = nullptr);
AudioWorker(DecoderCache* decoder_cache, QHash<Node*, Node*>* copy_map, QObject* parent = nullptr);
protected:
virtual void FrameToValue(DecoderPtr decoder, StreamPtr stream, const TimeRange &range, NodeValueTable* table) override;
+14
View File
@@ -41,6 +41,20 @@ void AudioRenderBackend::DisconnectViewer(ViewerOutput *node)
disconnect(node, &ViewerOutput::AudioGraphChanged, this, &AudioRenderBackend::QueueRecompile);
}
bool AudioRenderBackend::CompileInternal()
{
for (int i=0;i<copied_graph_.nodes().size();i++) {
copy_map_.insert(copied_graph_.nodes().at(i), source_node_list_.at(i));
}
return true;
}
void AudioRenderBackend::DecompileInternal()
{
copy_map_.clear();
}
bool AudioRenderBackend::GenerateCacheIDInternal(QCryptographicHash &hash)
{
if (!params_.is_valid()) {
+6
View File
@@ -29,6 +29,10 @@ protected:
virtual void DisconnectViewer(ViewerOutput* node) override;
virtual bool CompileInternal() override;
virtual void DecompileInternal() override;
/**
* @brief Internal function for generating the cache ID
*/
@@ -40,6 +44,8 @@ protected:
virtual void ConnectWorkerToThis(RenderWorker* worker) override;
QHash<Node*, Node*> copy_map_;
private:
struct ConformWaitInfo {
StreamPtr stream;
+46 -3
View File
@@ -1,9 +1,15 @@
#include "audiorenderworker.h"
#include "audio/audiomanager.h"
#include <QDir>
#include <QFloat16>
AudioRenderWorker::AudioRenderWorker(DecoderCache* decoder_cache, QObject *parent) :
RenderWorker(decoder_cache, parent)
#include "audio/audiomanager.h"
#include "audio/sumsamples.h"
#include "config/config.h"
AudioRenderWorker::AudioRenderWorker(DecoderCache* decoder_cache, QHash<Node *, Node *> *copy_map, QObject *parent) :
RenderWorker(decoder_cache, parent),
copy_map_(copy_map)
{
}
@@ -82,6 +88,43 @@ NodeValueTable AudioRenderWorker::RenderBlock(const TrackOutput *track, const Ti
memcpy(block_range_buffer.data()+destination_offset,
samples_from_this_block.data(),
actual_copy_size);
// Save waveform to file
QDir local_appdata_dir(Config::Current()["DiskCachePath"].toString());
QDir waveform_loc = local_appdata_dir.filePath("waveform");
waveform_loc.mkpath(".");
QFile wave_file(waveform_loc.filePath(QString::number(reinterpret_cast<quintptr>(copy_map_->value(b)))));
wave_file.open(QFile::ReadWrite);
// FIXME: Assumes 32-bit float
float* flt_samples = reinterpret_cast<float*>(samples_from_this_block.data());
int nb_sample = samples_from_this_block.size() / sizeof(float);
// FIXME: Hardcoded sample rate
// We use S16 here as a size-compatible substitute for qfloat16/half
AudioRenderingParams waveform_params(SampleSummer::kSumSampleRate, audio_params_.channel_layout(), SampleFormat::SAMPLE_FMT_S16);
int chunk_size = (audio_params().sample_rate() / waveform_params.sample_rate()) * waveform_params.channel_count();
qint64 start_offset = waveform_params.time_to_bytes(range_for_block.in() - b->in()) * 2;
qint64 length_offset = waveform_params.time_to_bytes(range_for_block.length()) * 2;
qint64 end_offset = start_offset + length_offset;
if (wave_file.size() < end_offset) {
wave_file.resize(end_offset);
}
wave_file.seek(start_offset);
for (int i=0;i<nb_sample;i+=chunk_size) {
QVector<SampleSummer::Sum> summary = SampleSummer::SumSamples(&flt_samples[i],
qMin(chunk_size, nb_sample - i),
audio_params().channel_count());
wave_file.write(reinterpret_cast<const char*>(summary.constData()),
summary.size() * sizeof(SampleSummer::Sum));
}
wave_file.close();
}
}
+3 -1
View File
@@ -7,7 +7,7 @@ class AudioRenderWorker : public RenderWorker
{
Q_OBJECT
public:
AudioRenderWorker(DecoderCache* decoder_cache, QObject* parent = nullptr);
AudioRenderWorker(DecoderCache* decoder_cache, QHash<Node*, Node*>* copy_map, QObject* parent = nullptr);
void SetParameters(const AudioRenderingParams& audio_params);
@@ -26,6 +26,8 @@ protected:
private:
AudioRenderingParams audio_params_;
QHash<Node*, Node*>* copy_map_;
};
#endif // AUDIORENDERWORKER_H
+4 -3
View File
@@ -108,6 +108,10 @@ protected:
QHash<TimeRange, qint64> render_job_info_;
QList<Node*> source_node_list_;
NodeGraph copied_graph_;
protected slots:
void QueueRecompile();
@@ -139,9 +143,6 @@ private:
QString cache_id_;
QList<Node*> source_node_list_;
NodeGraph copied_graph_;
bool recompile_queued_;
bool input_update_queued_;