[Bf-blender-cvs] [9511009438d] blender-v2.93-release: VSE: Fix "off by one" error when encoding audio

Sebastian Parborg noreply at git.blender.org
Mon Aug 23 11:56:27 CEST 2021


Commit: 9511009438deba9b5ca453f3a14b9cd67b6852a5
Author: Sebastian Parborg
Date:   Fri Jul 9 15:06:06 2021 +0200
Branches: blender-v2.93-release
https://developer.blender.org/rB9511009438deba9b5ca453f3a14b9cd67b6852a5

VSE: Fix "off by one" error when encoding audio

Before we didn't encode the audio up until the current frame.
This lead to us not encoding the last video frame of audio.

Reviewed By: Richard Antalik

Differential Revision: http://developer.blender.org/D11918

===================================================================

M	source/blender/blenkernel/intern/writeffmpeg.c

===================================================================

diff --git a/source/blender/blenkernel/intern/writeffmpeg.c b/source/blender/blenkernel/intern/writeffmpeg.c
index be90660983b..5ab9bdcbee6 100644
--- a/source/blender/blenkernel/intern/writeffmpeg.c
+++ b/source/blender/blenkernel/intern/writeffmpeg.c
@@ -1433,8 +1433,9 @@ int BKE_ffmpeg_append(void *context_v,
   }
 
 #  ifdef WITH_AUDASPACE
-  write_audio_frames(context,
-                     (frame - start_frame) / (((double)rd->frs_sec) / (double)rd->frs_sec_base));
+  /* Add +1 frame because we want to encode audio up until the next video frame. */
+  write_audio_frames(
+      context, (frame - start_frame + 1) / (((double)rd->frs_sec) / (double)rd->frs_sec_base));
 #  endif
   return success;
 }



More information about the Bf-blender-cvs mailing list