bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'blender-v4.2-release'

Browse Source
This commit is contained in:
Campbell Barton 2024-06-21 10:53:06 +10:00
commit b4213141c2
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
source/blender/editors/space_sequencer/sequencer_timeline_draw.cc
View File

@ -475,19 +475,20 @@ static void draw_seq_waveform_overlay(TimelineDrawContext *timeline_ctx,
const float frames_per_pixel = BLI_rctf_size_x(&v2d->cur) / timeline_ctx->region->winx;
const float samples_per_frame = SOUND_WAVE_SAMPLES_PER_SECOND / FPS;
const float samples_per_pixel = samples_per_frame * frames_per_pixel;
const float bottom = strip_ctx->bottom + timeline_ctx->pixely * 2.0f;
const float top = strip_ctx->strip_content_top;
/* The y coordinate of signal level zero. */
const float y_zero = half_style ? strip_ctx->bottom :
(strip_ctx->bottom + strip_ctx->strip_content_top) / 2.0f;
const float y_zero = half_style ? bottom : (bottom + top) / 2.0f;
/* The y range of unit signal level. */
const float y_scale = half_style ? strip_ctx->strip_content_top - strip_ctx->bottom :
(strip_ctx->strip_content_top - strip_ctx->bottom) / 2.0f;
const float y_scale = half_style ? top - bottom : (top - bottom) / 2.0f;
/* Align strip start with nearest pixel to prevent waveform flickering. */
const float strip_start_aligned = align_frame_with_pixel(strip_ctx->left_handle,
frames_per_pixel);
const float strip_start_aligned = align_frame_with_pixel(
strip_ctx->left_handle + timeline_ctx->pixelx * 3.0f, frames_per_pixel);
/* Offset x1 and x2 values, to match view min/max, if strip is out of bounds. */
const float draw_start_frame = max_ff(v2d->cur.xmin, strip_start_aligned);
const float draw_end_frame = min_ff(v2d->cur.xmax, strip_ctx->right_handle);
const float draw_end_frame = min_ff(v2d->cur.xmax,
strip_ctx->right_handle - timeline_ctx->pixelx * 3.0f);
/* Offset must be also aligned, otherwise waveform flickers when moving left handle. */
float sample_start_frame = draw_start_frame + seq->sound->offset_time / FPS;