blender
/
blender
130
397
Fork 571
Code Issues 6.2k Pull Requests 754 Projects 19 Wiki Activity

VSE: Clamp sound strip when adding movie strip 

When adding multiple movie strips and sound stream is longer than video,
this results in gaps between video strips, which is undesirable.
This commit is contained in:
Richard Antalik 2021-12-20 01:30:19 +01:00
parent c27d0cb7b9
commit 0966eab8e9
Notes: blender-bot 2023-02-14 02:43:21 +01:00 
Referenced by issue #94287, There is a gap in front of the video clip
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
source/blender/editors/space_sequencer/sequencer_add.c
View File

@ -627,6 +627,19 @@ static void seq_build_proxy(bContext *C, Sequence *seq)
ED_area_tag_redraw(CTX_wm_area(C));
}
static void sequencer_add_movie_clamp_sound_strip_length(Scene *scene,
ListBase *seqbase,
Sequence *seq_movie,
Sequence *seq_sound)
{
if (ELEM(NULL, seq_movie, seq_sound) || seq_sound->len <= seq_movie->len) {
return;
}
SEQ_transform_set_right_handle_frame(seq_sound, SEQ_transform_get_right_handle_frame(seq_movie));
SEQ_time_update_sequence(scene, seqbase, seq_sound);
}
static void sequencer_add_movie_multiple_strips(bContext *C,
wmOperator *op,
SeqLoadData *load_data)
@ -689,6 +702,7 @@ static void sequencer_add_movie_multiple_strips(bContext *C,
else {
load_data->start_frame += seq_movie->enddisp - seq_movie->startdisp;
}
sequencer_add_movie_clamp_sound_strip_length(scene, ed->seqbasep, seq_movie, seq_sound);
seq_load_apply_generic_options(C, op, seq_sound);
seq_load_apply_generic_options(C, op, seq_movie);
seq_build_proxy(C, seq_movie);
@ -740,6 +754,7 @@ static bool sequencer_add_movie_single_strip(bContext *C, wmOperator *op, SeqLoa
load_data->start_frame += audio_frame_offset;
seq_sound = SEQ_add_sound_strip(bmain, scene, ed->seqbasep, load_data, audio_skip);
}
sequencer_add_movie_clamp_sound_strip_length(scene, ed->seqbasep, seq_movie, seq_sound);
seq_load_apply_generic_options(C, op, seq_sound);
seq_load_apply_generic_options(C, op, seq_movie);
seq_build_proxy(C, seq_movie);