[Bf-blender-cvs] [8af8bab] master: Fix T45726: Wrong handling of 'failed to generate' audio waveform data in VSE strip draw code.
Bastien Montagne
noreply at git.blender.org
Fri Aug 7 23:43:21 CEST 2015
Commit: 8af8bab0c5acc1cf59c507f28cf5c349782932e6
Author: Bastien Montagne
Date: Fri Aug 7 23:42:32 2015 +0200
Branches: master
https://developer.blender.org/rB8af8bab0c5acc1cf59c507f28cf5c349782932e6
Fix T45726: Wrong handling of 'failed to generate' audio waveform data in VSE strip draw code.
===================================================================
M source/blender/editors/space_sequencer/sequencer_draw.c
===================================================================
diff --git a/source/blender/editors/space_sequencer/sequencer_draw.c b/source/blender/editors/space_sequencer/sequencer_draw.c
index 7aa6550..afa5987 100644
--- a/source/blender/editors/space_sequencer/sequencer_draw.c
+++ b/source/blender/editors/space_sequencer/sequencer_draw.c
@@ -224,7 +224,13 @@ static void drawseqwave(const bContext *C, SpaceSeq *sseq, Scene *scene, Sequenc
BLI_spin_unlock(sound->spinlock);
waveform = seq->sound->waveform;
-
+
+ if (waveform->length == 0) {
+ /* BKE_sound_read_waveform() set an empty SoundWaveform data in case it cannot generate a valid one...
+ * See T45726. */
+ return;
+ }
+
startsample = floor((seq->startofs + seq->anim_startofs) / FPS * SOUND_WAVE_SAMPLES_PER_SECOND);
endsample = ceil((seq->startofs + seq->anim_startofs + seq->enddisp - seq->startdisp) / FPS * SOUND_WAVE_SAMPLES_PER_SECOND);
samplestep = (endsample - startsample) * stepsize / (x2 - x1);
More information about the Bf-blender-cvs
mailing list