oak-team/oak-editor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

audiovisualwaveform: removed templates

Browse Source 
I'm not sure if this will make any difference performance-wise,
but we don't need them anymore so yeah.
This commit is contained in:
itsmattkc
2021-04-14 15:27:34 +10:00
parent 3ffb2fde1c
commit 6b7412aff6
2 changed files with 10 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/audio/audiovisualwaveform.cpp
+9 -16
View File
@@ -218,7 +218,13 @@ AudioVisualWaveform::Sample AudioVisualWaveform::GetSummaryFromTime(const ration
AudioVisualWaveform::Sample AudioVisualWaveform::SumSamples(const float *samples, int nb_samples, int nb_channels)
{
return SumSamplesInternal(samples, nb_samples, nb_channels);
AudioVisualWaveform::Sample summed_samples(nb_channels);
for (int i=0;i<nb_samples;i++) {
ExpandMinMax(summed_samples[i%nb_channels], samples[i]);
}
return summed_samples;
}
AudioVisualWaveform::Sample AudioVisualWaveform::SumSamples(SampleBufferPtr samples, int start_index, int length)
@@ -229,7 +235,7 @@ AudioVisualWaveform::Sample AudioVisualWaveform::SumSamples(SampleBufferPtr samp
for (int i=start_index; i<end_index; i++) {
for (int channel=0; channel<samples->audio_params().channel_count(); channel++) {
ExpandMinMax<float>(summed_samples[channel], samples->data(channel)[i]);
ExpandMinMax(summed_samples[channel], samples->data(channel)[i]);
}
}
@@ -369,20 +375,7 @@ std::map<rational, AudioVisualWaveform::Sample>::const_iterator AudioVisualWavef
return using_mipmap;
}
template<typename T>
AudioVisualWaveform::Sample AudioVisualWaveform::SumSamplesInternal(const T *samples, int nb_samples, int nb_channels)
{
AudioVisualWaveform::Sample summed_samples(nb_channels);
for (int i=0;i<nb_samples;i++) {
ExpandMinMax<T>(summed_samples[i%nb_channels], samples[i]);
}
return summed_samples;
}
template<typename T>
void AudioVisualWaveform::ExpandMinMax(AudioVisualWaveform::SamplePerChannel &sum, T value)
void AudioVisualWaveform::ExpandMinMax(AudioVisualWaveform::SamplePerChannel &sum, float value)
{
if (value < sum.min) {
sum.min = value;
app/audio/audiovisualwaveform.h
+1 -5
View File
@@ -97,11 +97,7 @@ public:
static void DrawWaveform(QPainter* painter, const QRect &rect, const double &scale, const AudioVisualWaveform& samples, const rational &start_time);
private:
template <typename T>
static Sample SumSamplesInternal(const T* samples, int nb_samples, int nb_channels);
template <typename T>
static void ExpandMinMax(SamplePerChannel &sum, T value);
static void ExpandMinMax(SamplePerChannel &sum, float value);
void OverwriteSamplesFromBuffer(SampleBufferPtr samples, int sample_rate, const rational& start, double target_rate, Sample &data, int &start_index, int &samples_length);