Blender Git Commit Log
Git Commits -> Revision 40f8615
Revision 40f8615 by Sebastian Parborg (temp-VSE-fixes) August 13, 2021, 14:42 (GMT) |
VSE: Fix audaspace not reading ffmpeg files with start offset correctly The duration and start time for audio strips were not correctly read in audaspace. Some video files have a "lead in" section of audio that plays before the video starts playing back. Before this patch, we would play this lead in audio at the same time as the video started and thus the audio would not be in sync anymore. Now the lead in audio is cut off and the duration should be correctly calculated with this in mind. If the audio starts after the video, the audio strip is shifted to account for this, but it will also lead to cut off audio which might not be wanted. However we don't have a simple way to solve this at this point. Differential Revision: https://developer.blender.org/D11917 |
Commit Details:
Full Hash: 40f8615598bcc9ab70d8edbd9eb07651af31e9e5
Parent Commit: 81ba6f2
Lines Changed: +281, -62
46 Modified Paths:
/extern/audaspace/bindings/C/AUD_Special.cpp (+2, -0) (Diff)
/extern/audaspace/bindings/C/AUD_Types.h (+1, -0) (Diff)
/extern/audaspace/include/fx/EffectReader.h (+1, -0) (Diff)
/extern/audaspace/include/fx/ModulatorReader.h (+1, -0) (Diff)
/extern/audaspace/include/fx/MutableReader.h (+1, -0) (Diff)
/extern/audaspace/include/fx/VolumeReader.h (+2, -1) (Diff)
/extern/audaspace/include/generator/SawtoothReader.h (+1, -0) (Diff)
/extern/audaspace/include/generator/SilenceReader.h (+1, -0) (Diff)
/extern/audaspace/include/generator/SineReader.h (+1, -0) (Diff)
/extern/audaspace/include/generator/SquareReader.h (+1, -0) (Diff)
/extern/audaspace/include/generator/TriangleReader.h (+1, -0) (Diff)
/extern/audaspace/include/IReader.h (+6, -0) (Diff)
/extern/audaspace/include/sequence/DoubleReader.h (+1, -0) (Diff)
/extern/audaspace/include/sequence/SequenceReader.h (+1, -0) (Diff)
/extern/audaspace/include/sequence/SuperposeReader.h (+1, -0) (Diff)
/extern/audaspace/include/util/BufferReader.h (+1, -0) (Diff)
/extern/audaspace/plugins/ffmpeg/FFMPEGReader.cpp (+56, -24) (Diff)
/extern/audaspace/plugins/ffmpeg/FFMPEGReader.h (+17, -0) (Diff)
/extern/audaspace/plugins/libsndfile/SndFileReader.cpp (+5, -0) (Diff)
/extern/audaspace/plugins/libsndfile/SndFileReader.h (+1, -0) (Diff)
/extern/audaspace/src/fx/EffectReader.cpp (+5, -0) (Diff)
/extern/audaspace/src/fx/ModulatorReader.cpp (+5, -0) (Diff)
/extern/audaspace/src/fx/MutableReader.cpp (+5, -0) (Diff)
/extern/audaspace/src/fx/VolumeReader.cpp (+6, -1) (Diff)
/extern/audaspace/src/generator/SawtoothReader.cpp (+5, -0) (Diff)
/extern/audaspace/src/generator/SilenceReader.cpp (+5, -0) (Diff)
/extern/audaspace/src/generator/SineReader.cpp (+5, -0) (Diff)
/extern/audaspace/src/generator/SquareReader.cpp (+5, -0) (Diff)
/extern/audaspace/src/generator/TriangleReader.cpp (+5, -0) (Diff)
/extern/audaspace/src/sequence/DoubleReader.cpp (+5, -0) (Diff)
/extern/audaspace/src/sequence/SequenceReader.cpp (+5, -0) (Diff)
/extern/audaspace/src/sequence/SuperposeReader.cpp (+5, -0) (Diff)
/extern/audaspace/src/util/BufferReader.cpp (+5, -0) (Diff)
/source/blender/blenkernel/BKE_sound.h (+7, -2) (Diff)
/source/blender/blenkernel/intern/sound.c (+7, -5) (Diff)
/source/blender/editors/space_sequencer/sequencer_add.c (+10, -6) (Diff)
/source/blender/editors/space_sequencer/sequencer_draw.c (+6, -4) (Diff)
/source/blender/imbuf/IMB_imbuf.h (+5, -0) (Diff)
/source/blender/imbuf/intern/anim_movie.c (+21, -6) (Diff)
/source/blender/imbuf/intern/IMB_anim.h (+1, -0) (Diff)
/source/blender/makesdna/DNA_sound_types.h (+1, -0) (Diff)
/source/blender/makesrna/intern/rna_sequencer_api.c (+3, -2) (Diff)
/source/blender/sequencer/intern/sound.c (+6, -1) (Diff)
/source/blender/sequencer/intern/strip_add.c (+39, -7) (Diff)
/source/blender/sequencer/intern/strip_time.c (+3, -1) (Diff)
/source/blender/sequencer/SEQ_add.h (+4, -2) (Diff)
/extern/audaspace/bindings/C/AUD_Types.h (+1, -0) (Diff)
/extern/audaspace/include/fx/EffectReader.h (+1, -0) (Diff)
/extern/audaspace/include/fx/ModulatorReader.h (+1, -0) (Diff)
/extern/audaspace/include/fx/MutableReader.h (+1, -0) (Diff)
/extern/audaspace/include/fx/VolumeReader.h (+2, -1) (Diff)
/extern/audaspace/include/generator/SawtoothReader.h (+1, -0) (Diff)
/extern/audaspace/include/generator/SilenceReader.h (+1, -0) (Diff)
/extern/audaspace/include/generator/SineReader.h (+1, -0) (Diff)
/extern/audaspace/include/generator/SquareReader.h (+1, -0) (Diff)
/extern/audaspace/include/generator/TriangleReader.h (+1, -0) (Diff)
/extern/audaspace/include/IReader.h (+6, -0) (Diff)
/extern/audaspace/include/sequence/DoubleReader.h (+1, -0) (Diff)
/extern/audaspace/include/sequence/SequenceReader.h (+1, -0) (Diff)
/extern/audaspace/include/sequence/SuperposeReader.h (+1, -0) (Diff)
/extern/audaspace/include/util/BufferReader.h (+1, -0) (Diff)
/extern/audaspace/plugins/ffmpeg/FFMPEGReader.cpp (+56, -24) (Diff)
/extern/audaspace/plugins/ffmpeg/FFMPEGReader.h (+17, -0) (Diff)
/extern/audaspace/plugins/libsndfile/SndFileReader.cpp (+5, -0) (Diff)
/extern/audaspace/plugins/libsndfile/SndFileReader.h (+1, -0) (Diff)
/extern/audaspace/src/fx/EffectReader.cpp (+5, -0) (Diff)
/extern/audaspace/src/fx/ModulatorReader.cpp (+5, -0) (Diff)
/extern/audaspace/src/fx/MutableReader.cpp (+5, -0) (Diff)
/extern/audaspace/src/fx/VolumeReader.cpp (+6, -1) (Diff)
/extern/audaspace/src/generator/SawtoothReader.cpp (+5, -0) (Diff)
/extern/audaspace/src/generator/SilenceReader.cpp (+5, -0) (Diff)
/extern/audaspace/src/generator/SineReader.cpp (+5, -0) (Diff)
/extern/audaspace/src/generator/SquareReader.cpp (+5, -0) (Diff)
/extern/audaspace/src/generator/TriangleReader.cpp (+5, -0) (Diff)
/extern/audaspace/src/sequence/DoubleReader.cpp (+5, -0) (Diff)
/extern/audaspace/src/sequence/SequenceReader.cpp (+5, -0) (Diff)
/extern/audaspace/src/sequence/SuperposeReader.cpp (+5, -0) (Diff)
/extern/audaspace/src/util/BufferReader.cpp (+5, -0) (Diff)
/source/blender/blenkernel/BKE_sound.h (+7, -2) (Diff)
/source/blender/blenkernel/intern/sound.c (+7, -5) (Diff)
/source/blender/editors/space_sequencer/sequencer_add.c (+10, -6) (Diff)
/source/blender/editors/space_sequencer/sequencer_draw.c (+6, -4) (Diff)
/source/blender/imbuf/IMB_imbuf.h (+5, -0) (Diff)
/source/blender/imbuf/intern/anim_movie.c (+21, -6) (Diff)
/source/blender/imbuf/intern/IMB_anim.h (+1, -0) (Diff)
/source/blender/makesdna/DNA_sound_types.h (+1, -0) (Diff)
/source/blender/makesrna/intern/rna_sequencer_api.c (+3, -2) (Diff)
/source/blender/sequencer/intern/sound.c (+6, -1) (Diff)
/source/blender/sequencer/intern/strip_add.c (+39, -7) (Diff)
/source/blender/sequencer/intern/strip_time.c (+3, -1) (Diff)
/source/blender/sequencer/SEQ_add.h (+4, -2) (Diff)