Merge branch 'blender-v3.1-release'

1 files changed, 11 insertions, 65 deletions

diff --git a/source/blender/editors/space_sequencer/sequencer_add.c b/source/blender/editors/space_sequencer/sequencer_add.c
index d9d801b56ac..15ee35f375d 100644
--- a/source/blender/editors/space_sequencer/sequencer_add.c
+++ b/source/blender/editors/space_sequencer/sequencer_add.c
@@ -637,6 +637,7 @@ static void sequencer_add_movie_clamp_sound_strip_length(Scene *scene,
   }
 
   SEQ_transform_set_right_handle_frame(seq_sound, SEQ_transform_get_right_handle_frame(seq_movie));
+  SEQ_transform_set_left_handle_frame(seq_sound, SEQ_transform_get_left_handle_frame(seq_movie));
   SEQ_time_update_sequence(scene, seqbase, seq_sound);
 }
 
@@ -658,52 +659,20 @@ static void sequencer_add_movie_multiple_strips(bContext *C,
     BLI_strncpy(load_data->name, file_only, sizeof(load_data->name));
     Sequence *seq_movie = NULL;
     Sequence *seq_sound = NULL;
-    double video_start_offset = -1;
-    double audio_start_offset = 0;
-
-    if (RNA_boolean_get(op->ptr, "sound")) {
-      SoundStreamInfo sound_info;
-      if (BKE_sound_stream_info_get(bmain, load_data->path, 0, &sound_info)) {
-        audio_start_offset = video_start_offset = sound_info.start;
-      }
-    }
 
     load_data->channel++;
-    seq_movie = SEQ_add_movie_strip(bmain, scene, ed->seqbasep, load_data, &video_start_offset);
+    seq_movie = SEQ_add_movie_strip(bmain, scene, ed->seqbasep, load_data);
     load_data->channel--;
     if (seq_movie == NULL) {
       BKE_reportf(op->reports, RPT_ERROR, "File '%s' could not be loaded", load_data->path);
     }
     else {
       if (RNA_boolean_get(op->ptr, "sound")) {
-        int minimum_frame_offset = MIN2(video_start_offset, audio_start_offset) * FPS;
-
-        int video_frame_offset = video_start_offset * FPS;
-        int audio_frame_offset = audio_start_offset * FPS;
-
-        double video_frame_remainder = video_start_offset * FPS - video_frame_offset;
-        double audio_frame_remainder = audio_start_offset * FPS - audio_frame_offset;
-
-        double audio_skip = (video_frame_remainder - audio_frame_remainder) / FPS;
-
-        video_frame_offset -= minimum_frame_offset;
-        audio_frame_offset -= minimum_frame_offset;
-
-        load_data->start_frame += audio_frame_offset;
-        seq_sound = SEQ_add_sound_strip(bmain, scene, ed->seqbasep, load_data, audio_skip);
-
-        int min_startdisp = 0, max_enddisp = 0;
-        if (seq_sound != NULL) {
-          min_startdisp = MIN2(seq_movie->startdisp, seq_sound->startdisp);
-          max_enddisp = MAX2(seq_movie->enddisp, seq_sound->enddisp);
-        }
-
-        load_data->start_frame += max_enddisp - min_startdisp - audio_frame_offset;
+        seq_sound = SEQ_add_sound_strip(bmain, scene, ed->seqbasep, load_data);
+        sequencer_add_movie_clamp_sound_strip_length(scene, ed->seqbasep, seq_movie, seq_sound);
       }
-      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);
+
+      load_data->start_frame += seq_movie->enddisp - seq_movie->startdisp;
       seq_load_apply_generic_options(C, op, seq_sound);
       seq_load_apply_generic_options(C, op, seq_movie);
       SEQ_collection_append_strip(seq_movie, r_movie_strips);
@@ -723,18 +692,9 @@ static bool sequencer_add_movie_single_strip(bContext *C,
 
   Sequence *seq_movie = NULL;
   Sequence *seq_sound = NULL;
-  double video_start_offset = -1;
-  double audio_start_offset = 0;
-
-  if (RNA_boolean_get(op->ptr, "sound")) {
-    SoundStreamInfo sound_info;
-    if (BKE_sound_stream_info_get(bmain, load_data->path, 0, &sound_info)) {
-      audio_start_offset = video_start_offset = sound_info.start;
-    }
-  }
 
   load_data->channel++;
-  seq_movie = SEQ_add_movie_strip(bmain, scene, ed->seqbasep, load_data, &video_start_offset);
+  seq_movie = SEQ_add_movie_strip(bmain, scene, ed->seqbasep, load_data);
   load_data->channel--;
 
   if (seq_movie == NULL) {
@@ -742,23 +702,9 @@ static bool sequencer_add_movie_single_strip(bContext *C,
     return false;
   }
   if (RNA_boolean_get(op->ptr, "sound")) {
-    int minimum_frame_offset = MIN2(video_start_offset, audio_start_offset) * FPS;
-
-    int video_frame_offset = video_start_offset * FPS;
-    int audio_frame_offset = audio_start_offset * FPS;
-
-    double video_frame_remainder = video_start_offset * FPS - video_frame_offset;
-    double audio_frame_remainder = audio_start_offset * FPS - audio_frame_offset;
-
-    double audio_skip = (video_frame_remainder - audio_frame_remainder) / FPS;
-
-    video_frame_offset -= minimum_frame_offset;
-    audio_frame_offset -= minimum_frame_offset;
-
-    load_data->start_frame += audio_frame_offset;
-    seq_sound = SEQ_add_sound_strip(bmain, scene, ed->seqbasep, load_data, audio_skip);
+    seq_sound = SEQ_add_sound_strip(bmain, scene, ed->seqbasep, load_data);
+    sequencer_add_movie_clamp_sound_strip_length(scene, ed->seqbasep, seq_movie, seq_sound);
   }
-  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_collection_append_strip(seq_movie, r_movie_strips);
@@ -905,7 +851,7 @@ static void sequencer_add_sound_multiple_strips(bContext *C,
     RNA_string_get(&itemptr, "name", file_only);
     BLI_join_dirfile(load_data->path, sizeof(load_data->path), dir_only, file_only);
     BLI_strncpy(load_data->name, file_only, sizeof(load_data->name));
-    Sequence *seq = SEQ_add_sound_strip(bmain, scene, ed->seqbasep, load_data, 0.0f);
+    Sequence *seq = SEQ_add_sound_strip(bmain, scene, ed->seqbasep, load_data);
     if (seq == NULL) {
       BKE_reportf(op->reports, RPT_ERROR, "File '%s' could not be loaded", load_data->path);
     }
@@ -923,7 +869,7 @@ static bool sequencer_add_sound_single_strip(bContext *C, wmOperator *op, SeqLoa
   Scene *scene = CTX_data_scene(C);
   Editing *ed = SEQ_editing_ensure(scene);
 
-  Sequence *seq = SEQ_add_sound_strip(bmain, scene, ed->seqbasep, load_data, 0.0f);
+  Sequence *seq = SEQ_add_sound_strip(bmain, scene, ed->seqbasep, load_data);
   if (seq == NULL) {
     BKE_reportf(op->reports, RPT_ERROR, "File '%s' could not be loaded", load_data->path);
     return false;