Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'source/blender/blenkernel/intern/sound.c')
-rw-r--r--source/blender/blenkernel/intern/sound.c12
1 files changed, 10 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/sound.c b/source/blender/blenkernel/intern/sound.c
index 97a643e88b6..64fe396d6a3 100644
--- a/source/blender/blenkernel/intern/sound.c
+++ b/source/blender/blenkernel/intern/sound.c
@@ -751,12 +751,20 @@ static void sound_start_play_scene(Scene *scene)
}
}
+static float get_cur_time(Scene *scene)
+{
+ /* We divide by the current framelen to take into account time remapping.
+ * Otherwise we will get the wrong starting time which will break A/V sync.
+ * See T74111 for further details. */
+ return FRA2TIME((CFRA + SUBFRA) / scene->r.framelen);
+}
+
void BKE_sound_play_scene(Scene *scene)
{
sound_verify_evaluated_id(&scene->id);
AUD_Status status;
- const float cur_time = (float)((double)CFRA / FPS);
+ const float cur_time = get_cur_time(scene);
AUD_Device_lock(sound_device);
@@ -804,7 +812,7 @@ void BKE_sound_seek_scene(Main *bmain, Scene *scene)
int animation_playing;
const float one_frame = (float)(1.0 / FPS);
- const float cur_time = (float)((double)CFRA / FPS);
+ const float cur_time = FRA2TIME(CFRA);
AUD_Device_lock(sound_device);