@@ -15,8 +15,8 @@ use crate::visuals::render::common::{
1515 ClipTransform , GeometryScratch , amplitude_y, extend_filled_line, quad_instance,
1616} ;
1717use crate :: visuals:: waveform:: processor:: {
18- BAND_COUNT , MAX_COLUMN_CAPACITY , WAVEFORM_SILENCE_AMPLITUDE , WaveColumn , WaveFrame ,
19- WaveformPreview ,
18+ BAND_COUNT , DERIVED_CHANNELS , MAX_COLUMN_CAPACITY , WAVEFORM_SILENCE_AMPLITUDE , WaveColumn ,
19+ WaveFrame , WaveformPreview ,
2020} ;
2121
2222const COLUMN_WIDTH_PIXELS : f32 = 1.0 ;
@@ -32,7 +32,7 @@ const LOUDNESS_STOPS: [f32; BAND_COUNT] = [0.0, 0.5, 1.0];
3232pub struct WaveformParams {
3333 pub bounds : Rectangle ,
3434 pub lane : usize ,
35- pub data : Arc < Mutex < VecDeque < WaveFrame > > > ,
35+ pub data : Arc < Mutex < WaveHistory > > ,
3636 pub preview : WaveformPreview ,
3737 pub color_mode : WaveformColorMode ,
3838 pub history_mode : WaveformHistoryMode ,
@@ -41,6 +41,14 @@ pub struct WaveformParams {
4141 pub key : u64 ,
4242}
4343
44+ // Frames, oldest first, each with its lanes' column colors once drawn. A column's color depends
45+ // only on it, the palette and the color mode, so it is kept until they change.
46+ #[ derive( Debug , Default ) ]
47+ pub struct WaveHistory {
48+ pub ( super ) frames : VecDeque < ( WaveFrame , Option < [ [ f32 ; 4 ] ; DERIVED_CHANNELS ] > ) > ,
49+ colored_with : Option < ( WaveformColorMode , [ [ f32 ; 4 ] ; BAND_COUNT ] ) > ,
50+ }
51+
4452impl WaveformParams {
4553 fn column_color ( & self , column : WaveColumn ) -> [ f32 ; 4 ] {
4654 match self . color_mode {
@@ -98,7 +106,14 @@ fn sample_y_span(lane: Rectangle, min: f32, max: f32) -> Option<(f32, f32)> {
98106
99107impl WaveformParams {
100108 fn build_vertices ( & self , scratch : & mut GeometryScratch ) {
101- let data = crate :: util:: unpoison ( self . data . lock ( ) ) ;
109+ let mut stored = crate :: util:: unpoison ( self . data . lock ( ) ) ;
110+ let colored_with = Some ( ( self . color_mode , self . palette ) ) ;
111+ if std:: mem:: replace ( & mut stored. colored_with , colored_with) != colored_with {
112+ for ( _, colors) in & mut stored. frames {
113+ * colors = None ;
114+ }
115+ }
116+ let data = & mut stored. frames ;
102117 let columns = column_count ( self . bounds . width ) . min ( data. len ( ) ) ;
103118 let start = data. len ( ) . saturating_sub ( columns) ;
104119 let preview_columns = self . preview . columns . filter ( |_| self . preview . progress > 0.0 ) ;
@@ -123,22 +138,25 @@ impl WaveformParams {
123138 let dist_steps = ( columns - 1 - i) as f32 ;
124139 right_edge - dist_steps * col_width - scroll_offset - col_width
125140 } ;
126- let push_column = |vertices : & mut Vec < _ > , x0, x1, column : WaveColumn | {
141+ let push_column = |vertices : & mut Vec < _ > , x0, x1, column : WaveColumn , color | {
127142 if let Some ( ( y0, y1) ) = sample_y_span ( self . bounds , column. min , column. max ) {
128- let color = self . column_color ( column) ;
129143 vertices. push ( quad_instance ( x0, y0, x1, y1, clip, color) ) ;
130144 }
131145 } ;
132146
133- for ( i, frame) in data. range ( start..start + columns) . enumerate ( ) {
147+ for ( i, ( frame, colors) ) in data. range_mut ( start..start + columns) . enumerate ( ) {
148+ let colors =
149+ colors. get_or_insert_with ( || frame. map ( |column| self . column_color ( column) ) ) ;
134150 let column = frame[ self . lane ] ;
135151 let x = column_x ( i) ;
136- push_column ( vertices, x, x + col_width, column) ;
152+ push_column ( vertices, x, x + col_width, column, colors [ self . lane ] ) ;
137153 }
138154
139155 if let Some ( preview_columns) = preview_columns {
140156 let start_x = right_edge - scroll_offset;
141- push_column ( vertices, start_x, right_edge, preview_columns[ self . lane ] ) ;
157+ let column = preview_columns[ self . lane ] ;
158+ let color = self . column_color ( column) ;
159+ push_column ( vertices, start_x, right_edge, column, color) ;
142160 }
143161
144162 if let Some ( history) = history {
@@ -150,16 +168,14 @@ impl WaveformParams {
150168 let fill_color = rgba_scale_alpha ( color, BAND_FILL_ALPHA ) ;
151169
152170 pts. clear ( ) ;
153- pts. extend (
154- data. range ( start..start + columns)
155- . enumerate ( )
156- . map ( |( i, frame) | {
157- let column = frame[ self . lane ] ;
158- let db = column. rms_db [ history] [ band] ;
159- let level = ( ( db - floor) / -floor) . clamp ( 0.0 , 1.0 ) ;
160- ( column_x ( i) , baseline - level * band_height)
161- } ) ,
162- ) ;
171+ pts. extend ( data. range ( start..start + columns) . enumerate ( ) . map (
172+ |( i, ( frame, _) ) | {
173+ let column = frame[ self . lane ] ;
174+ let db = column. rms_db [ history] [ band] ;
175+ let level = ( ( db - floor) / -floor) . clamp ( 0.0 , 1.0 ) ;
176+ ( column_x ( i) , baseline - level * band_height)
177+ } ,
178+ ) ) ;
163179 let last_y = pts. last ( ) . expect ( "nonempty waveform history" ) . 1 ;
164180 pts. push ( ( right_edge, last_y) ) ;
165181 extend_filled_line (
0 commit comments