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

audioplaybackcache: fixed bug in one of the shift operations

Browse Source
This commit is contained in:
itsmattkc
2020-10-24 14:18:59 +11:00
parent 921608e1df
commit 5f5d6e82ab
2 changed files with 24 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/render/audioplaybackcache.cpp
+15 -15
View File
@@ -66,10 +66,11 @@ void AudioPlaybackCache::WritePCM(const TimeRange &range, SampleBufferPtr sample
}
// Determine if we have enough segments to pull this off
qint64 range_out_in_bytes = params_.time_to_bytes(range.out());
while (playlist_.GetLength() < range_out_in_bytes) {
qint64 seg_sz = qMin(kDefaultSegmentSize, range_out_in_bytes - playlist_.GetLength());
qint64 length_diff = params_.time_to_bytes(range.out()) - playlist_.GetLength();
while (length_diff > 0) {
qint64 seg_sz = qMin(kDefaultSegmentSize, length_diff);
playlist_.push_back(CreateSegment(seg_sz, playlist_.GetLength()));
length_diff -= seg_sz;
}
QByteArray a;
@@ -179,29 +180,28 @@ void AudioPlaybackCache::ShiftEvent(const rational &from_in_time, const rational
insert_index = from_index;
} else {
insert_index = from_index + 1;
}
if (from < from_end) {
// Split from segment into two
Segment second = CloneSegment(playlist_.at(from_index));
if (from < from_end) {
// Split from segment into two
Segment second = CloneSegment(playlist_.at(from_index));
TrimSegmentOut(&playlist_[from_index], from - from_start);
TrimSegmentIn(&second, from_end - from);
TrimSegmentOut(&playlist_[from_index], from - from_start);
TrimSegmentIn(&second, from_end - from);
playlist_.insert(insert_index, second);
playlist_.insert(insert_index, second);
}
}
// Insert silent segments
qint64 time_to_insert = params_.time_to_bytes(to - from);
qint64 inserted_time = 0;
qint64 time_to_insert = to - from;
while (inserted_time < time_to_insert) {
qint64 new_seg_sz = qMin(kDefaultSegmentSize, time_to_insert - inserted_time);
while (time_to_insert) {
qint64 new_seg_sz = qMin(kDefaultSegmentSize, time_to_insert);
// Set offset to 0 for now and fill it in later
playlist_.insert(insert_index, CreateSegment(new_seg_sz, 0));
inserted_time += new_seg_sz;
time_to_insert -= new_seg_sz;
}
UpdateOffsetsFrom(insert_index);
app/render/audioplaybackcache.h
+9
View File
@@ -170,6 +170,15 @@ public:
};
/**
* @brief Create a QIODevice that can play whatever's in the cache currently
*
* This device will act very much like a QFile, transparently linking together various segments
* into what will appear to be a single contiguous file.
*
* The caller becomes responsible for ownership of the device, though the parent can be set
* automatically as an optional parameter to this function.
*/
PlaybackDevice* CreatePlaybackDevice(QObject *parent = nullptr) const;
signals: