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

audiovisualwaveform: allow only partial sum overwrite

Browse Source
This commit is contained in:
itsmattkc
2020-06-05 15:02:44 +10:00
parent 5ce508a1da
commit a29de7cea0
2 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/audio/audiovisualwaveform.cpp
+13 -6
View File
@@ -51,22 +51,29 @@ void AudioVisualWaveform::OverwriteSamples(SampleBufferPtr samples, int sample_r
overwrite_samples_internal(samples, sample_rate, time_to_samples(start));
}
void AudioVisualWaveform::OverwriteSums(const AudioVisualWaveform &sums, const rational &start)
void AudioVisualWaveform::OverwriteSums(const AudioVisualWaveform &sums, const rational &dest, const rational& offset, const rational& length)
{
if (sums.data_.isEmpty()) {
return;
}
int start_index = time_to_samples(start);
int end_index = start_index + sums.data_.size();
int start_index = time_to_samples(dest);
int sample_start = time_to_samples(offset);
int copy_len = sums.data_.size() - sample_start;
if (!length.isNull()) {
copy_len = qMin(copy_len, time_to_samples(length));
}
int end_index = start_index + copy_len;
if (data_.size() < end_index) {
data_.resize(end_index);
}
memcpy(&data_[start_index],
sums.data_.constData(),
sums.data_.size() * sizeof(SamplePerChannel));
memcpy(reinterpret_cast<char*>(data_.data()) + start_index * sizeof(SamplePerChannel),
reinterpret_cast<const char*>(sums.data_.constData()) + time_to_samples(offset) * sizeof(SamplePerChannel),
copy_len * sizeof(SamplePerChannel));
}
AudioVisualWaveform AudioVisualWaveform::Mid(const rational &time) const
app/audio/audiovisualwaveform.h
+1 -1
View File
@@ -70,7 +70,7 @@ public:
void AddSum(const float* samples, int nb_samples, int nb_channels);
void OverwriteSamples(SampleBufferPtr samples, int sample_rate, const rational& start);
void OverwriteSums(const AudioVisualWaveform& sums, const rational& start);
void OverwriteSums(const AudioVisualWaveform& sums, const rational& dest, const rational& offset = rational(), const rational &length = rational());
AudioVisualWaveform Mid(const rational& time) const;
void Append(const AudioVisualWaveform& waveform);