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

render: properly defined "out of bounds time" behavior with footage

Browse Source 
If a user extends a clip beyond the footage's length, they can
choose whether they want a black frame, the last frame continued,
or for the footage to loop infinitely (same for extending earlier
than the start of footage).
This commit is contained in:
itsmattkc
2021-04-23 14:49:21 +10:00
parent 7f93ed7fc0
commit 1fca3e1767
9 changed files with 162 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/codec/waveinput.cpp
+10 -8
View File
@@ -158,38 +158,40 @@ bool WaveInput::is_open() const
return file_.isOpen();
}
QByteArray WaveInput::read(int length)
QByteArray WaveInput::read(qint64 length)
{
if (!is_open()) {
return QByteArray();
}
return file_.read(qMin(calculate_max_read(), static_cast<qint64>(length)));
return file_.read(qMin(calculate_max_read(), length));
}
QByteArray WaveInput::read(int offset, int length)
QByteArray WaveInput::read(qint64 offset, qint64 length)
{
if (!is_open()) {
return QByteArray();
}
seek(offset);
return file_.read(qMin(calculate_max_read(), static_cast<qint64>(length)));
return file_.read(qMin(calculate_max_read(), length));
}
qint64 WaveInput::read(int offset, char *buffer, int length)
qint64 WaveInput::read(qint64 offset, char *buffer, qint64 length)
{
if (!is_open()) {
return 0;
}
Q_ASSERT(length > 0);
seek(offset);
return file_.read(buffer, qMin(calculate_max_read(), static_cast<qint64>(length)));
return file_.read(buffer, qMin(calculate_max_read(), length));
}
bool WaveInput::seek(qint64 pos)
{
return file_.seek(data_position_ + qMin(pos, static_cast<qint64>(data_size_)));
return file_.seek(data_position_ + qMin(pos, qint64(data_size_)));
}
bool WaveInput::at_end() const
@@ -216,7 +218,7 @@ const quint32 &WaveInput::data_length() const
int WaveInput::sample_count() const
{
return params_.bytes_to_samples(static_cast<int>(data_size_));
return params_.bytes_to_samples(data_size_);
}
bool WaveInput::find_str(QFile *f, const char *str)