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

fixed shared cross dissolve frozen at start frame

Browse Source
This commit is contained in:
itsmattkc
2019-04-06 11:08:39 +11:00
parent 6c826a7e16
commit 9833634815
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rendering/renderfunctions.cpp
+1 -1
View File
@@ -397,7 +397,7 @@ GLuint olive::rendering::compose_sequence(ComposeSequenceParams &params) {
if (c->media() != nullptr && c->media()->get_type() == MEDIA_TYPE_FOOTAGE) {
// retrieve video frame from cache and store it in c->texture
c->Cache(qMax(playhead, c->timeline_in()), false, params.nests, params.playback_speed);
c->Cache(qMax(playhead, c->timeline_in(true)), false, params.nests, params.playback_speed);
if (!c->Retrieve()) {
params.texture_failed = true;
} else {
timeline/clip.cpp
+2 -2
View File
@@ -318,7 +318,7 @@ void Clip::Save(QXmlStreamWriter &stream)
long Clip::clip_in(bool with_transition) {
if (with_transition && opening_transition != nullptr && opening_transition->secondary_clip != nullptr) {
// we must be the secondary clip, so return (timeline in - length)
// we must be the secondary clip, so return (clip in - length)
return clip_in_ - opening_transition->get_true_length();
}
return clip_in_;
@@ -344,7 +344,7 @@ void Clip::set_timeline_in(long t)
long Clip::timeline_out(bool with_transitions) {
if (with_transitions && closing_transition != nullptr && closing_transition->secondary_clip != nullptr) {
// we must be the primary clip, so return (timeline out + length2)
// we must be the primary clip, so return (timeline out + length)
return timeline_out_ + closing_transition->get_true_length();
} else {
return timeline_out_;