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

oiiodecoder: always add 1 frame to image sequences so the end frame is shown

Browse Source
This commit is contained in:
itsmattkc
2020-03-28 11:29:51 +11:00
parent 3399227b3a
commit 84aab543ca
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/codec/oiio/oiiodecoder.cpp
+1 -1
View File
@@ -108,7 +108,7 @@ bool OIIODecoder::Probe(Footage *f, const QAtomicInt *cancelled)
video_stream->set_start_time(start_index); video_stream->set_start_time(start_index);
video_stream->set_duration(end_index - start_index); video_stream->set_duration(end_index - start_index + 1);
} else { } else {
image_stream = std::make_shared<ImageStream>(); image_stream = std::make_shared<ImageStream>();
} }
app/dialog/footageproperties/streamproperties/videostreamproperties.cpp
+2 -2
View File
@@ -86,7 +86,7 @@ VideoStreamProperties::VideoStreamProperties(ImageStreamPtr stream) :
imgseq_end_time_ = new IntegerSlider(); imgseq_end_time_ = new IntegerSlider();
imgseq_end_time_->SetMinimum(0); imgseq_end_time_->SetMinimum(0);
imgseq_end_time_->SetValue(video_stream->start_time() + video_stream->duration()); imgseq_end_time_->SetValue(video_stream->start_time() + video_stream->duration() - 1);
imgseq_layout->addWidget(imgseq_end_time_, imgseq_row, 1); imgseq_layout->addWidget(imgseq_end_time_, imgseq_row, 1);
video_layout->addWidget(imgseq_group, row, 0, 1, 2); video_layout->addWidget(imgseq_group, row, 0, 1, 2);
@@ -113,7 +113,7 @@ void VideoStreamProperties::Accept(QUndoCommand *parent)
if (IsImageSequence(stream_.get())) { if (IsImageSequence(stream_.get())) {
VideoStreamPtr video_stream = std::static_pointer_cast<VideoStream>(stream_); VideoStreamPtr video_stream = std::static_pointer_cast<VideoStream>(stream_);
int64_t new_dur = imgseq_end_time_->GetValue() - imgseq_start_time_->GetValue(); int64_t new_dur = imgseq_end_time_->GetValue() - imgseq_start_time_->GetValue() + 1;
if (video_stream->start_time() != imgseq_start_time_->GetValue() if (video_stream->start_time() != imgseq_start_time_->GetValue()
|| video_stream->duration() != new_dur) { || video_stream->duration() != new_dur) {