diff options
author | Richard Antalik <richardantalik@gmail.com> | 2021-08-24 01:46:34 +0300 |
---|---|---|
committer | Richard Antalik <richardantalik@gmail.com> | 2021-08-24 01:46:34 +0300 |
commit | 24a3446787d31f9b32e6759f91349b598c8e9774 (patch) | |
tree | f4fd2f2a09ebacc67d4194ef00a4e87578f095a5 /source/blender/sequencer | |
parent | a0c8ee057a59b8b514706a12257a6dc0f9bb3b69 (diff) |
Fix T90646: VSE hangs when strips overlap
When all strips are selected and overlap is caused, this causes VSE to
hang in infinite loop, because such situation should never happen.
To prevent infinite loop, ensure, that strip overlap is not tested
against single overlapping strip itself.
Prevent overlap that can not be handled because of issue described above
by moving overlapping strip between channels.
Reviewed By: campbellbarton
Differential Revision: D12209
Diffstat (limited to 'source/blender/sequencer')
-rw-r--r-- | source/blender/sequencer/CMakeLists.txt | 1 | ||||
-rw-r--r-- | source/blender/sequencer/SEQ_iterator.h | 1 | ||||
-rw-r--r-- | source/blender/sequencer/intern/iterator.c | 8 | ||||
-rw-r--r-- | source/blender/sequencer/intern/strip_transform.c | 10 |
4 files changed, 20 insertions, 0 deletions
diff --git a/source/blender/sequencer/CMakeLists.txt b/source/blender/sequencer/CMakeLists.txt index e324bc8b407..f060e6ad69b 100644 --- a/source/blender/sequencer/CMakeLists.txt +++ b/source/blender/sequencer/CMakeLists.txt @@ -33,6 +33,7 @@ set(INC ../render ../windowmanager ../../../intern/atomic + ../../../intern/clog ../../../intern/guardedalloc # dna_type_offsets.h diff --git a/source/blender/sequencer/SEQ_iterator.h b/source/blender/sequencer/SEQ_iterator.h index cb2091511a9..3ade7309f89 100644 --- a/source/blender/sequencer/SEQ_iterator.h +++ b/source/blender/sequencer/SEQ_iterator.h @@ -73,6 +73,7 @@ struct Sequence *SEQ_iterator_yield(SeqIterator *iterator); SeqCollection *SEQ_collection_create(const char *name); SeqCollection *SEQ_collection_duplicate(SeqCollection *collection); uint SEQ_collection_len(const SeqCollection *collection); +bool SEQ_collection_has_strip(const struct Sequence *seq, const SeqCollection *collection); bool SEQ_collection_append_strip(struct Sequence *seq, SeqCollection *data); bool SEQ_collection_remove_strip(struct Sequence *seq, SeqCollection *data); void SEQ_collection_free(SeqCollection *collection); diff --git a/source/blender/sequencer/intern/iterator.c b/source/blender/sequencer/intern/iterator.c index 09f033e70fb..333a8e46c44 100644 --- a/source/blender/sequencer/intern/iterator.c +++ b/source/blender/sequencer/intern/iterator.c @@ -123,6 +123,14 @@ uint SEQ_collection_len(const SeqCollection *collection) } /** + * Check if seq is in collection. + */ +bool SEQ_collection_has_strip(const Sequence *seq, const SeqCollection *collection) +{ + return BLI_gset_haskey(collection->set, seq); +} + +/** * Query strips from seqbase. seq_reference is used by query function as filter condition. * * \param seq_reference: reference strip for query function diff --git a/source/blender/sequencer/intern/strip_transform.c b/source/blender/sequencer/intern/strip_transform.c index c9af2fced65..9f69f434ca0 100644 --- a/source/blender/sequencer/intern/strip_transform.c +++ b/source/blender/sequencer/intern/strip_transform.c @@ -40,6 +40,10 @@ #include "SEQ_time.h" #include "SEQ_transform.h" +#include "CLG_log.h" + +static CLG_LogRef LOG = {"seq.strip_transform"}; + static int seq_tx_get_start(Sequence *seq) { return seq->start; @@ -315,6 +319,12 @@ static int shuffle_seq_time_offset_test(SeqCollection *strips_to_shuffle, if (!seq_overlap(seq, seq_other)) { continue; } + if (UNLIKELY(SEQ_collection_has_strip(seq_other, strips_to_shuffle))) { + CLOG_WARN(&LOG, + "Strip overlaps with itself or another strip, that is to be shuffled." + "This should never happen."); + continue; + } if (dir == 'L') { offset = min_ii(offset, seq_other->startdisp - seq->enddisp); } |