dev@10
|
1 import {
|
dev@51
|
2 Component, OnInit, ViewChild, ElementRef, Input, AfterViewInit, NgZone,
|
dev@51
|
3 OnDestroy
|
dev@10
|
4 } from '@angular/core';
|
dev@39
|
5 import {AudioPlayerService} from "../services/audio-player/audio-player.service";
|
dev@36
|
6 import wavesUI from 'waves-ui';
|
dev@63
|
7 import {
|
dev@64
|
8 FeatureExtractionService
|
dev@63
|
9 } from "../services/feature-extraction/feature-extraction.service";
|
dev@51
|
10 import {Subscription} from "rxjs";
|
dev@63
|
11 import {
|
dev@63
|
12 FeatureCollection,
|
dev@64
|
13 FixedSpacedFeatures, SimpleResponse
|
dev@63
|
14 } from "piper/HigherLevelUtilities";
|
dev@53
|
15 import {toSeconds} from "piper";
|
dev@67
|
16 import {FeatureList, Feature} from "piper/Feature";
|
dev@81
|
17 import * as Hammer from 'hammerjs';
|
dev@129
|
18 import {WavesSpectrogramLayer} from "../spectrogram/Spectrogram";
|
dev@8
|
19
|
dev@20
|
20 type Timeline = any; // TODO what type actually is it.. start a .d.ts for waves-ui?
|
dev@54
|
21 type Layer = any;
|
dev@54
|
22 type Track = any;
|
dev@59
|
23 type Colour = string;
|
dev@6
|
24
|
dev@6
|
25 @Component({
|
dev@6
|
26 selector: 'app-waveform',
|
dev@6
|
27 templateUrl: './waveform.component.html',
|
dev@6
|
28 styleUrls: ['./waveform.component.css']
|
dev@6
|
29 })
|
dev@51
|
30 export class WaveformComponent implements OnInit, AfterViewInit, OnDestroy {
|
dev@20
|
31
|
dev@8
|
32 @ViewChild('track') trackDiv: ElementRef;
|
dev@6
|
33
|
dev@54
|
34 private _audioBuffer: AudioBuffer;
|
dev@54
|
35 private timeline: Timeline;
|
dev@54
|
36 private cursorLayer: any;
|
dev@16
|
37
|
dev@16
|
38 @Input()
|
dev@16
|
39 set audioBuffer(buffer: AudioBuffer) {
|
dev@16
|
40 this._audioBuffer = buffer || undefined;
|
cannam@117
|
41 if (this.audioBuffer) {
|
dev@20
|
42 this.renderWaveform(this.audioBuffer);
|
cannam@117
|
43 this.renderSpectrogram(this.audioBuffer);
|
cannam@117
|
44 }
|
dev@16
|
45 }
|
dev@16
|
46
|
dev@16
|
47 get audioBuffer(): AudioBuffer {
|
dev@16
|
48 return this._audioBuffer;
|
dev@16
|
49 }
|
dev@16
|
50
|
dev@51
|
51 private featureExtractionSubscription: Subscription;
|
dev@53
|
52 private playingStateSubscription: Subscription;
|
dev@53
|
53 private seekedSubscription: Subscription;
|
dev@53
|
54 private isPlaying: boolean;
|
dev@110
|
55 private offsetAtPanStart: number;
|
dev@110
|
56 private initialZoom: number;
|
dev@110
|
57 private initialDistance: number;
|
dev@155
|
58 private zoomOnMouseDown: number;
|
dev@157
|
59 private offsetOnMouseDown: number;
|
dev@51
|
60
|
dev@31
|
61 constructor(private audioService: AudioPlayerService,
|
dev@51
|
62 private piperService: FeatureExtractionService,
|
dev@51
|
63 public ngZone: NgZone) {
|
dev@54
|
64 this._audioBuffer = undefined;
|
dev@54
|
65 this.timeline = undefined;
|
dev@54
|
66 this.cursorLayer = undefined;
|
dev@53
|
67 this.isPlaying = false;
|
dev@59
|
68 const colours = function* () {
|
dev@59
|
69 const circularColours = [
|
dev@59
|
70 'black',
|
dev@59
|
71 'red',
|
dev@59
|
72 'green',
|
dev@59
|
73 'purple',
|
dev@59
|
74 'orange'
|
dev@59
|
75 ];
|
dev@59
|
76 let index = 0;
|
dev@59
|
77 const nColours = circularColours.length;
|
dev@59
|
78 while (true) {
|
dev@59
|
79 yield circularColours[index = ++index % nColours];
|
dev@59
|
80 }
|
dev@59
|
81 }();
|
dev@59
|
82
|
dev@51
|
83 this.featureExtractionSubscription = piperService.featuresExtracted$.subscribe(
|
dev@51
|
84 features => {
|
dev@59
|
85 this.renderFeatures(features, colours.next().value);
|
dev@51
|
86 });
|
dev@53
|
87 this.playingStateSubscription = audioService.playingStateChange$.subscribe(
|
dev@53
|
88 isPlaying => {
|
dev@53
|
89 this.isPlaying = isPlaying;
|
dev@53
|
90 if (this.isPlaying)
|
dev@53
|
91 this.animate();
|
dev@53
|
92 });
|
dev@53
|
93 this.seekedSubscription = audioService.seeked$.subscribe(() => {
|
dev@53
|
94 if (!this.isPlaying)
|
dev@53
|
95 this.animate();
|
dev@53
|
96 });
|
dev@51
|
97 }
|
dev@51
|
98
|
dev@53
|
99 ngOnInit() {
|
dev@53
|
100 }
|
dev@10
|
101
|
dev@10
|
102 ngAfterViewInit(): void {
|
dev@51
|
103 this.timeline = this.renderTimeline();
|
dev@20
|
104 }
|
dev@20
|
105
|
dev@20
|
106 renderTimeline(duration: number = 1.0): Timeline {
|
dev@18
|
107 const track: HTMLElement = this.trackDiv.nativeElement;
|
dev@20
|
108 track.innerHTML = "";
|
dev@18
|
109 const height: number = track.getBoundingClientRect().height;
|
dev@18
|
110 const width: number = track.getBoundingClientRect().width;
|
dev@18
|
111 const pixelsPerSecond = width / duration;
|
dev@18
|
112 const timeline = new wavesUI.core.Timeline(pixelsPerSecond, width);
|
cannam@117
|
113 timeline.createTrack(track, height/2, 'wave');
|
cannam@117
|
114 timeline.createTrack(track, height/2, 'grid');
|
dev@54
|
115 return timeline;
|
dev@54
|
116 }
|
dev@18
|
117
|
cannam@108
|
118 estimatePercentile(matrix, percentile) {
|
cannam@108
|
119 // our sample is not evenly distributed across the whole data set:
|
cannam@108
|
120 // it is guaranteed to include at least one sample from every
|
cannam@108
|
121 // column, and could sample some values more than once. But it
|
cannam@108
|
122 // should be good enough in most cases (todo: show this)
|
cannam@109
|
123 if (matrix.length === 0) {
|
cannam@109
|
124 return 0.0;
|
cannam@109
|
125 }
|
cannam@108
|
126 const w = matrix.length;
|
cannam@108
|
127 const h = matrix[0].length;
|
cannam@108
|
128 const n = w * h;
|
cannam@109
|
129 const m = (n > 50000 ? 50000 : n); // should base that on the %ile
|
cannam@108
|
130 let m_per = Math.floor(m / w);
|
cannam@108
|
131 if (m_per < 1) m_per = 1;
|
cannam@108
|
132 let sample = [];
|
cannam@108
|
133 for (let x = 0; x < w; ++x) {
|
cannam@108
|
134 for (let i = 0; i < m_per; ++i) {
|
cannam@108
|
135 const y = Math.floor(Math.random() * h);
|
cannam@109
|
136 const value = matrix[x][y];
|
cannam@109
|
137 if (!isNaN(value) && value !== Infinity) {
|
cannam@109
|
138 sample.push(value);
|
cannam@109
|
139 }
|
cannam@108
|
140 }
|
cannam@108
|
141 }
|
cannam@109
|
142 if (sample.length === 0) {
|
cannam@109
|
143 console.log("WARNING: No samples gathered, even though we hoped for " +
|
cannam@109
|
144 (m_per * w) + " of them");
|
cannam@109
|
145 return 0.0;
|
cannam@109
|
146 }
|
cannam@108
|
147 sample.sort((a,b) => { return a - b; });
|
cannam@108
|
148 const ix = Math.floor((sample.length * percentile) / 100);
|
cannam@108
|
149 console.log("Estimating " + percentile + "-%ile of " +
|
cannam@108
|
150 n + "-sample dataset (" + w + " x " + h + ") as value " + ix +
|
cannam@108
|
151 " of sorted " + sample.length + "-sample subset");
|
cannam@108
|
152 const estimate = sample[ix];
|
cannam@108
|
153 console.log("Estimate is: " + estimate + " (where min sampled value = " +
|
cannam@108
|
154 sample[0] + " and max = " + sample[sample.length-1] + ")");
|
cannam@108
|
155 return estimate;
|
cannam@108
|
156 }
|
cannam@108
|
157
|
cannam@108
|
158 interpolatingMapper(hexColours) {
|
cannam@108
|
159 const colours = hexColours.map(n => {
|
cannam@108
|
160 const i = parseInt(n, 16);
|
cannam@118
|
161 return [ ((i >> 16) & 255) / 255.0,
|
cannam@118
|
162 ((i >> 8) & 255) / 255.0,
|
cannam@118
|
163 ((i) & 255) / 255.0 ];
|
cannam@108
|
164 });
|
cannam@108
|
165 const last = colours.length - 1;
|
cannam@108
|
166 return (value => {
|
cannam@108
|
167 const m = value * last;
|
cannam@108
|
168 if (m >= last) {
|
cannam@108
|
169 return colours[last];
|
cannam@108
|
170 }
|
cannam@108
|
171 if (m <= 0) {
|
cannam@108
|
172 return colours[0];
|
cannam@108
|
173 }
|
cannam@108
|
174 const base = Math.floor(m);
|
cannam@108
|
175 const prop0 = base + 1.0 - m;
|
cannam@108
|
176 const prop1 = m - base;
|
cannam@108
|
177 const c0 = colours[base];
|
cannam@108
|
178 const c1 = colours[base+1];
|
cannam@118
|
179 return [ c0[0] * prop0 + c1[0] * prop1,
|
cannam@118
|
180 c0[1] * prop0 + c1[1] * prop1,
|
cannam@118
|
181 c0[2] * prop0 + c1[2] * prop1 ];
|
cannam@108
|
182 });
|
cannam@108
|
183 }
|
dev@110
|
184
|
cannam@108
|
185 iceMapper() {
|
dev@110
|
186 let hexColours = [
|
cannam@108
|
187 // Based on ColorBrewer ylGnBu
|
cannam@108
|
188 "ffffff", "ffff00", "f7fcf0", "e0f3db", "ccebc5", "a8ddb5",
|
cannam@108
|
189 "7bccc4", "4eb3d3", "2b8cbe", "0868ac", "084081", "042040"
|
cannam@108
|
190 ];
|
cannam@108
|
191 hexColours.reverse();
|
cannam@108
|
192 return this.interpolatingMapper(hexColours);
|
cannam@108
|
193 }
|
dev@110
|
194
|
cannam@118
|
195 hsv2rgb(h, s, v) { // all values in range [0, 1]
|
cannam@118
|
196 const i = Math.floor(h * 6);
|
cannam@118
|
197 const f = h * 6 - i;
|
cannam@118
|
198 const p = v * (1 - s);
|
cannam@118
|
199 const q = v * (1 - f * s);
|
cannam@118
|
200 const t = v * (1 - (1 - f) * s);
|
cannam@118
|
201 let r = 0, g = 0, b = 0;
|
cannam@118
|
202 switch (i % 6) {
|
cannam@118
|
203 case 0: r = v, g = t, b = p; break;
|
cannam@118
|
204 case 1: r = q, g = v, b = p; break;
|
cannam@118
|
205 case 2: r = p, g = v, b = t; break;
|
cannam@118
|
206 case 3: r = p, g = q, b = v; break;
|
cannam@118
|
207 case 4: r = t, g = p, b = v; break;
|
cannam@118
|
208 case 5: r = v, g = p, b = q; break;
|
cannam@118
|
209 }
|
cannam@118
|
210 return [ r, g, b ];
|
cannam@118
|
211 }
|
dev@122
|
212
|
cannam@118
|
213 greenMapper() {
|
cannam@118
|
214 const blue = 0.6666;
|
cannam@118
|
215 const pieslice = 0.3333;
|
cannam@118
|
216 return (value => {
|
cannam@118
|
217 const h = blue - value * 2.0 * pieslice;
|
cannam@118
|
218 const s = 0.5 + value / 2.0;
|
cannam@118
|
219 const v = value;
|
cannam@118
|
220 return this.hsv2rgb(h, s, v);
|
cannam@118
|
221 });
|
cannam@118
|
222 }
|
cannam@118
|
223
|
cannam@118
|
224 sunsetMapper() {
|
cannam@118
|
225 return (value => {
|
cannam@118
|
226 let r = (value - 0.24) * 2.38;
|
cannam@118
|
227 let g = (value - 0.64) * 2.777;
|
cannam@118
|
228 let b = (3.6 * value);
|
cannam@118
|
229 if (value > 0.277) b = 2.0 - b;
|
cannam@118
|
230 return [ r, g, b ];
|
cannam@118
|
231 });
|
cannam@118
|
232 }
|
cannam@118
|
233
|
dev@122
|
234 clearTimeline(): void {
|
dev@122
|
235 // loop through layers and remove them, waves-ui provides methods for this but it seems to not work properly
|
dev@122
|
236 const timeContextChildren = this.timeline.timeContext._children;
|
dev@122
|
237 for (let track of this.timeline.tracks) {
|
dev@122
|
238 if (track.layers.length === 0) { continue; }
|
dev@122
|
239 const trackLayers = Array.from(track.layers);
|
dev@122
|
240 while (trackLayers.length) {
|
dev@122
|
241 let layer: Layer = trackLayers.pop();
|
dev@122
|
242 track.remove(layer);
|
dev@122
|
243
|
dev@122
|
244 const index = timeContextChildren.indexOf(layer.timeContext);
|
dev@122
|
245 if (index >= 0) {
|
dev@122
|
246 timeContextChildren.splice(index, 1);
|
dev@122
|
247 }
|
dev@122
|
248 layer.destroy();
|
dev@122
|
249 }
|
dev@122
|
250 }
|
dev@122
|
251 }
|
dev@122
|
252
|
dev@54
|
253 renderWaveform(buffer: AudioBuffer): void {
|
cannam@117
|
254 const height: number = this.trackDiv.nativeElement.getBoundingClientRect().height / 2;
|
cannam@117
|
255 const waveTrack = this.timeline.getTrackById('wave');
|
dev@54
|
256 if (this.timeline) {
|
dev@54
|
257 // resize
|
dev@54
|
258 const width = this.trackDiv.nativeElement.getBoundingClientRect().width;
|
dev@55
|
259
|
dev@122
|
260 this.clearTimeline();
|
dev@59
|
261
|
dev@54
|
262 this.timeline.visibleWidth = width;
|
dev@54
|
263 this.timeline.pixelsPerSecond = width / buffer.duration;
|
cannam@117
|
264 waveTrack.height = height;
|
dev@54
|
265 } else {
|
dev@54
|
266 this.timeline = this.renderTimeline(buffer.duration)
|
dev@54
|
267 }
|
dev@83
|
268 this.timeline.timeContext.offset = 0.5 * this.timeline.timeContext.visibleDuration;
|
cannam@106
|
269
|
dev@18
|
270 // time axis
|
dev@18
|
271 const timeAxis = new wavesUI.helpers.TimeAxisLayer({
|
dev@18
|
272 height: height,
|
cannam@106
|
273 color: '#b0b0b0'
|
dev@18
|
274 });
|
cannam@117
|
275 this.addLayer(timeAxis, waveTrack, this.timeline.timeContext, true);
|
dev@18
|
276
|
cannam@161
|
277 const nchannels = buffer.numberOfChannels;
|
cannam@161
|
278 const totalWaveHeight = height * 0.9;
|
cannam@161
|
279 const waveHeight = totalWaveHeight / nchannels;
|
cannam@161
|
280
|
cannam@161
|
281 for (let ch = 0; ch < nchannels; ++ch) {
|
cannam@161
|
282 console.log("about to construct a waveform layer for channel " + ch);
|
cannam@161
|
283 const waveformLayer = new wavesUI.helpers.WaveformLayer(buffer, {
|
cannam@161
|
284 top: (height - totalWaveHeight)/2 + waveHeight * ch,
|
cannam@161
|
285 height: waveHeight,
|
cannam@161
|
286 color: 'darkblue',
|
cannam@161
|
287 channel: ch
|
cannam@161
|
288 });
|
cannam@161
|
289 this.addLayer(waveformLayer, waveTrack, this.timeline.timeContext);
|
cannam@161
|
290 }
|
cannam@117
|
291
|
dev@53
|
292 this.cursorLayer = new wavesUI.helpers.CursorLayer({
|
dev@31
|
293 height: height
|
dev@31
|
294 });
|
cannam@117
|
295 this.addLayer(this.cursorLayer, waveTrack, this.timeline.timeContext);
|
dev@51
|
296 this.timeline.state = new wavesUI.states.CenteredZoomState(this.timeline);
|
cannam@117
|
297 waveTrack.render();
|
cannam@117
|
298 waveTrack.update();
|
dev@81
|
299
|
dev@81
|
300
|
dev@81
|
301 if ('ontouchstart' in window) {
|
dev@110
|
302 interface Point {
|
dev@110
|
303 x: number;
|
dev@110
|
304 y: number;
|
dev@110
|
305 }
|
dev@110
|
306
|
dev@113
|
307 let zoomGestureJustEnded: boolean = false;
|
dev@113
|
308
|
dev@110
|
309 const pixelToExponent: Function = wavesUI.utils.scales.linear()
|
dev@110
|
310 .domain([0, 100]) // 100px => factor 2
|
dev@110
|
311 .range([0, 1]);
|
dev@110
|
312
|
dev@110
|
313 const calculateDistance: (p1: Point, p2: Point) => number = (p1, p2) => {
|
dev@110
|
314 return Math.pow(
|
dev@110
|
315 Math.pow(p2.x - p1.x, 2) +
|
dev@110
|
316 Math.pow(p2.y - p1.y, 2), 0.5);
|
dev@110
|
317 };
|
dev@110
|
318
|
dev@84
|
319 const hammertime = new Hammer(this.trackDiv.nativeElement);
|
dev@81
|
320 const scroll = (ev) => {
|
dev@113
|
321 if (zoomGestureJustEnded) {
|
dev@113
|
322 zoomGestureJustEnded = false;
|
dev@113
|
323 console.log("Skip this event: likely a single touch dangling from pinch");
|
dev@113
|
324 return;
|
dev@113
|
325 }
|
dev@110
|
326 this.timeline.timeContext.offset = this.offsetAtPanStart +
|
dev@110
|
327 this.timeline.timeContext.timeToPixel.invert(ev.deltaX);
|
dev@81
|
328 this.timeline.tracks.update();
|
dev@81
|
329 };
|
dev@84
|
330
|
dev@81
|
331 const zoom = (ev) => {
|
dev@81
|
332 const minZoom = this.timeline.state.minZoom;
|
dev@81
|
333 const maxZoom = this.timeline.state.maxZoom;
|
dev@110
|
334 const distance = calculateDistance({
|
dev@110
|
335 x: ev.pointers[0].clientX,
|
dev@110
|
336 y: ev.pointers[0].clientY
|
dev@110
|
337 }, {
|
dev@110
|
338 x: ev.pointers[1].clientX,
|
dev@110
|
339 y: ev.pointers[1].clientY
|
dev@110
|
340 });
|
dev@110
|
341
|
dev@110
|
342 const lastCenterTime =
|
dev@110
|
343 this.timeline.timeContext.timeToPixel.invert(ev.center.x);
|
dev@110
|
344
|
dev@110
|
345 const exponent = pixelToExponent(distance - this.initialDistance);
|
dev@110
|
346 const targetZoom = this.initialZoom * Math.pow(2, exponent);
|
dev@110
|
347
|
dev@110
|
348 this.timeline.timeContext.zoom =
|
dev@110
|
349 Math.min(Math.max(targetZoom, minZoom), maxZoom);
|
dev@110
|
350
|
dev@110
|
351 const newCenterTime =
|
dev@110
|
352 this.timeline.timeContext.timeToPixel.invert(ev.center.x);
|
dev@110
|
353
|
dev@96
|
354 this.timeline.timeContext.offset += newCenterTime - lastCenterTime;
|
dev@81
|
355 this.timeline.tracks.update();
|
dev@81
|
356 };
|
dev@81
|
357 hammertime.get('pinch').set({ enable: true });
|
dev@110
|
358 hammertime.on('panstart', () => {
|
dev@110
|
359 this.offsetAtPanStart = this.timeline.timeContext.offset;
|
dev@110
|
360 });
|
dev@81
|
361 hammertime.on('panleft', scroll);
|
dev@81
|
362 hammertime.on('panright', scroll);
|
dev@110
|
363 hammertime.on('pinchstart', (e) => {
|
dev@110
|
364 this.initialZoom = this.timeline.timeContext.zoom;
|
dev@110
|
365
|
dev@110
|
366 this.initialDistance = calculateDistance({
|
dev@110
|
367 x: e.pointers[0].clientX,
|
dev@110
|
368 y: e.pointers[0].clientY
|
dev@110
|
369 }, {
|
dev@110
|
370 x: e.pointers[1].clientX,
|
dev@110
|
371 y: e.pointers[1].clientY
|
dev@110
|
372 });
|
dev@110
|
373 });
|
dev@81
|
374 hammertime.on('pinch', zoom);
|
dev@113
|
375 hammertime.on('pinchend', () => {
|
dev@113
|
376 zoomGestureJustEnded = true;
|
dev@113
|
377 });
|
dev@81
|
378 }
|
dev@81
|
379
|
dev@53
|
380 this.animate();
|
dev@53
|
381 }
|
dev@53
|
382
|
cannam@117
|
383 renderSpectrogram(buffer: AudioBuffer): void {
|
cannam@117
|
384 const height: number = this.trackDiv.nativeElement.getBoundingClientRect().height / 2;
|
cannam@117
|
385 const gridTrack = this.timeline.getTrackById('grid');
|
cannam@117
|
386
|
dev@129
|
387 const spectrogramLayer = new WavesSpectrogramLayer(buffer, {
|
cannam@118
|
388 top: height * 0.05,
|
cannam@117
|
389 height: height * 0.9,
|
cannam@117
|
390 stepSize: 512,
|
dev@129
|
391 blockSize: 1024,
|
cannam@118
|
392 normalise: 'none',
|
cannam@118
|
393 mapper: this.sunsetMapper()
|
cannam@117
|
394 });
|
cannam@117
|
395 this.addLayer(spectrogramLayer, gridTrack, this.timeline.timeContext);
|
cannam@117
|
396
|
cannam@117
|
397 this.timeline.tracks.update();
|
cannam@117
|
398 }
|
cannam@117
|
399
|
dev@53
|
400 // TODO refactor - this doesn't belong here
|
dev@64
|
401 private renderFeatures(extracted: SimpleResponse, colour: Colour): void {
|
dev@64
|
402 if (!extracted.hasOwnProperty('features') || !extracted.hasOwnProperty('outputDescriptor')) return;
|
dev@64
|
403 if (!extracted.features.hasOwnProperty('shape') || !extracted.features.hasOwnProperty('data')) return;
|
dev@64
|
404 const features: FeatureCollection = (extracted.features as FeatureCollection);
|
dev@64
|
405 const outputDescriptor = extracted.outputDescriptor;
|
cannam@118
|
406 const height = this.trackDiv.nativeElement.getBoundingClientRect().height / 2;
|
cannam@118
|
407 const waveTrack = this.timeline.getTrackById('wave');
|
dev@64
|
408
|
dev@64
|
409 // TODO refactor all of this
|
dev@63
|
410 switch (features.shape) {
|
dev@64
|
411 case 'vector': {
|
dev@63
|
412 const stepDuration = (features as FixedSpacedFeatures).stepDuration;
|
dev@63
|
413 const featureData = (features.data as Float32Array);
|
dev@68
|
414 if (featureData.length === 0) return;
|
dev@63
|
415 const normalisationFactor = 1.0 /
|
dev@63
|
416 featureData.reduce(
|
dev@63
|
417 (currentMax, feature) => Math.max(currentMax, feature),
|
dev@63
|
418 -Infinity
|
dev@63
|
419 );
|
dev@67
|
420
|
dev@63
|
421 const plotData = [...featureData].map((feature, i) => {
|
dev@63
|
422 return {
|
dev@63
|
423 cx: i * stepDuration,
|
dev@63
|
424 cy: feature * normalisationFactor
|
dev@63
|
425 };
|
dev@63
|
426 });
|
dev@67
|
427
|
dev@105
|
428 let lineLayer = new wavesUI.helpers.LineLayer(plotData, {
|
dev@63
|
429 color: colour,
|
dev@64
|
430 height: height
|
dev@63
|
431 });
|
dev@122
|
432 this.addLayer(
|
dev@105
|
433 lineLayer,
|
cannam@117
|
434 waveTrack,
|
dev@63
|
435 this.timeline.timeContext
|
dev@122
|
436 );
|
dev@63
|
437 break;
|
dev@64
|
438 }
|
dev@64
|
439 case 'list': {
|
dev@64
|
440 const featureData = (features.data as FeatureList);
|
dev@68
|
441 if (featureData.length === 0) return;
|
dev@64
|
442 // TODO look at output descriptor instead of directly inspecting features
|
dev@64
|
443 const hasDuration = outputDescriptor.configured.hasDuration;
|
dev@64
|
444 const isMarker = !hasDuration
|
dev@64
|
445 && outputDescriptor.configured.binCount === 0
|
dev@64
|
446 && featureData[0].featureValues == null;
|
dev@64
|
447 const isRegion = hasDuration
|
dev@64
|
448 && featureData[0].timestamp != null;
|
cannam@149
|
449 console.log("Have list features: length " + featureData.length +
|
cannam@149
|
450 ", isMarker " + isMarker + ", isRegion " + isRegion +
|
cannam@149
|
451 ", hasDuration " + hasDuration);
|
dev@64
|
452 // TODO refactor, this is incomprehensible
|
dev@64
|
453 if (isMarker) {
|
dev@64
|
454 const plotData = featureData.map(feature => {
|
cannam@152
|
455 return {
|
cannam@152
|
456 time: toSeconds(feature.timestamp),
|
cannam@152
|
457 label: feature.label
|
cannam@152
|
458 }
|
dev@64
|
459 });
|
cannam@149
|
460 let featureLayer = new wavesUI.helpers.TickLayer(plotData, {
|
dev@64
|
461 height: height,
|
dev@64
|
462 color: colour,
|
cannam@152
|
463 labelPosition: 'bottom',
|
cannam@152
|
464 shadeSegments: true
|
dev@64
|
465 });
|
dev@122
|
466 this.addLayer(
|
cannam@149
|
467 featureLayer,
|
cannam@117
|
468 waveTrack,
|
dev@64
|
469 this.timeline.timeContext
|
dev@122
|
470 );
|
dev@64
|
471 } else if (isRegion) {
|
cannam@149
|
472 console.log("Output is of region type");
|
dev@67
|
473 const binCount = outputDescriptor.configured.binCount || 0;
|
dev@67
|
474 const isBarRegion = featureData[0].featureValues.length >= 1 || binCount >= 1 ;
|
dev@64
|
475 const getSegmentArgs = () => {
|
dev@64
|
476 if (isBarRegion) {
|
dev@64
|
477
|
dev@67
|
478 // TODO refactor - this is messy
|
dev@67
|
479 interface FoldsToNumber<T> {
|
dev@67
|
480 reduce(fn: (previousValue: number,
|
dev@67
|
481 currentValue: T,
|
dev@67
|
482 currentIndex: number,
|
dev@67
|
483 array: ArrayLike<T>) => number,
|
dev@67
|
484 initialValue?: number): number;
|
dev@67
|
485 }
|
dev@64
|
486
|
dev@67
|
487 // TODO potentially change impl., i.e avoid reduce
|
dev@67
|
488 const findMin = <T>(arr: FoldsToNumber<T>, getElement: (x: T) => number): number => {
|
dev@67
|
489 return arr.reduce((min, val) => Math.min(min, getElement(val)), Infinity);
|
dev@67
|
490 };
|
dev@67
|
491
|
dev@67
|
492 const findMax = <T>(arr: FoldsToNumber<T>, getElement: (x: T) => number): number => {
|
dev@67
|
493 return arr.reduce((min, val) => Math.max(min, getElement(val)), -Infinity);
|
dev@67
|
494 };
|
dev@67
|
495
|
dev@67
|
496 const min = findMin<Feature>(featureData, (x: Feature) => {
|
dev@67
|
497 return findMin<number>(x.featureValues, y => y);
|
dev@67
|
498 });
|
dev@67
|
499
|
dev@67
|
500 const max = findMax<Feature>(featureData, (x: Feature) => {
|
dev@67
|
501 return findMax<number>(x.featureValues, y => y);
|
dev@67
|
502 });
|
dev@67
|
503
|
dev@67
|
504 const barHeight = 1.0 / height;
|
dev@64
|
505 return [
|
dev@67
|
506 featureData.reduce((bars, feature) => {
|
dev@67
|
507 const staticProperties = {
|
dev@64
|
508 x: toSeconds(feature.timestamp),
|
dev@64
|
509 width: toSeconds(feature.duration),
|
dev@67
|
510 height: min + barHeight,
|
dev@64
|
511 color: colour,
|
dev@64
|
512 opacity: 0.8
|
dev@67
|
513 };
|
dev@67
|
514 // TODO avoid copying Float32Array to an array - map is problematic here
|
dev@67
|
515 return bars.concat([...feature.featureValues]
|
dev@67
|
516 .map(val => Object.assign({}, staticProperties, {y: val})))
|
dev@67
|
517 }, []),
|
dev@67
|
518 {yDomain: [min, max + barHeight], height: height} as any
|
dev@67
|
519 ];
|
dev@64
|
520 } else {
|
dev@64
|
521 return [featureData.map(feature => {
|
dev@64
|
522 return {
|
dev@64
|
523 x: toSeconds(feature.timestamp),
|
dev@64
|
524 width: toSeconds(feature.duration),
|
dev@64
|
525 color: colour,
|
dev@64
|
526 opacity: 0.8
|
dev@64
|
527 }
|
dev@64
|
528 }), {height: height}];
|
dev@64
|
529 }
|
dev@64
|
530 };
|
dev@64
|
531
|
dev@64
|
532 let segmentLayer = new wavesUI.helpers.SegmentLayer(
|
dev@64
|
533 ...getSegmentArgs()
|
dev@64
|
534 );
|
dev@122
|
535 this.addLayer(
|
dev@64
|
536 segmentLayer,
|
cannam@117
|
537 waveTrack,
|
dev@64
|
538 this.timeline.timeContext
|
dev@122
|
539 );
|
dev@64
|
540 }
|
dev@64
|
541 break;
|
dev@64
|
542 }
|
cannam@106
|
543 case 'matrix': {
|
cannam@108
|
544 const stepDuration = (features as FixedSpacedFeatures).stepDuration;
|
cannam@120
|
545 //!!! + start time
|
cannam@108
|
546 const matrixData = (features.data as Float32Array[]);
|
cannam@108
|
547 if (matrixData.length === 0) return;
|
cannam@109
|
548 console.log("matrix data length = " + matrixData.length);
|
cannam@109
|
549 console.log("height of first column = " + matrixData[0].length);
|
cannam@109
|
550 const targetValue = this.estimatePercentile(matrixData, 95);
|
cannam@108
|
551 const gain = (targetValue > 0.0 ? (1.0 / targetValue) : 1.0);
|
cannam@108
|
552 console.log("setting gain to " + gain);
|
cannam@120
|
553 const matrixEntity =
|
cannam@120
|
554 new wavesUI.utils.PrefilledMatrixEntity(matrixData,
|
cannam@120
|
555 0, // startTime
|
cannam@120
|
556 stepDuration);
|
cannam@108
|
557 let matrixLayer = new wavesUI.helpers.MatrixLayer(matrixEntity, {
|
cannam@108
|
558 gain,
|
cannam@118
|
559 height: height * 0.9,
|
cannam@118
|
560 top: height * 0.05,
|
cannam@109
|
561 normalise: 'none',
|
cannam@108
|
562 mapper: this.iceMapper()
|
cannam@108
|
563 });
|
dev@122
|
564 this.addLayer(
|
cannam@108
|
565 matrixLayer,
|
cannam@117
|
566 waveTrack,
|
cannam@108
|
567 this.timeline.timeContext
|
dev@122
|
568 );
|
cannam@108
|
569 break;
|
cannam@106
|
570 }
|
dev@67
|
571 default:
|
cannam@106
|
572 console.log("Cannot render an appropriate layer for feature shape '" +
|
cannam@106
|
573 features.shape + "'");
|
dev@63
|
574 }
|
dev@59
|
575
|
dev@56
|
576 this.timeline.tracks.update();
|
dev@53
|
577 }
|
dev@53
|
578
|
dev@53
|
579 private animate(): void {
|
dev@31
|
580 this.ngZone.runOutsideAngular(() => {
|
dev@31
|
581 // listen for time passing...
|
dev@31
|
582 const updateSeekingCursor = () => {
|
dev@53
|
583 const currentTime = this.audioService.getCurrentTime();
|
dev@53
|
584 this.cursorLayer.currentPosition = currentTime;
|
dev@53
|
585 this.cursorLayer.update();
|
dev@53
|
586
|
dev@53
|
587 const currentOffset = this.timeline.timeContext.offset;
|
dev@53
|
588 const offsetTimestamp = currentOffset
|
dev@53
|
589 + currentTime;
|
dev@53
|
590
|
dev@53
|
591 const visibleDuration = this.timeline.timeContext.visibleDuration;
|
dev@53
|
592 // TODO reduce duplication between directions and make more declarative
|
dev@53
|
593 // this kinda logic should also be tested
|
dev@53
|
594 const mustPageForward = offsetTimestamp > visibleDuration;
|
dev@53
|
595 const mustPageBackward = currentTime < -currentOffset;
|
dev@53
|
596
|
dev@53
|
597 if (mustPageForward) {
|
dev@53
|
598 const hasSkippedMultiplePages = offsetTimestamp - visibleDuration > visibleDuration;
|
dev@53
|
599
|
cannam@106
|
600 this.timeline.timeContext.offset = hasSkippedMultiplePages ?
|
cannam@106
|
601 -currentTime + 0.5 * visibleDuration :
|
cannam@106
|
602 currentOffset - visibleDuration;
|
dev@51
|
603 this.timeline.tracks.update();
|
dev@34
|
604 }
|
dev@53
|
605
|
dev@53
|
606 if (mustPageBackward) {
|
dev@53
|
607 const hasSkippedMultiplePages = currentTime + visibleDuration < -currentOffset;
|
cannam@106
|
608 this.timeline.timeContext.offset = hasSkippedMultiplePages ?
|
cannam@106
|
609 -currentTime + 0.5 * visibleDuration :
|
cannam@106
|
610 currentOffset + visibleDuration;
|
dev@51
|
611 this.timeline.tracks.update();
|
dev@34
|
612 }
|
dev@53
|
613
|
dev@53
|
614 if (this.isPlaying)
|
dev@53
|
615 requestAnimationFrame(updateSeekingCursor);
|
dev@31
|
616 };
|
dev@31
|
617 updateSeekingCursor();
|
dev@31
|
618 });
|
dev@6
|
619 }
|
dev@16
|
620
|
dev@122
|
621 private addLayer(layer: Layer, track: Track, timeContext: any, isAxis: boolean = false): void {
|
dev@54
|
622 timeContext.zoom = 1.0;
|
dev@54
|
623 if (!layer.timeContext) {
|
dev@54
|
624 layer.setTimeContext(isAxis ?
|
dev@54
|
625 timeContext : new wavesUI.core.LayerTimeContext(timeContext));
|
dev@54
|
626 }
|
dev@54
|
627 track.add(layer);
|
dev@54
|
628 layer.render();
|
dev@54
|
629 layer.update();
|
dev@122
|
630 if (this.cursorLayer && track.$layout.contains(this.cursorLayer.$el)) {
|
dev@112
|
631 track.$layout.appendChild(this.cursorLayer.$el);
|
dev@112
|
632 }
|
dev@59
|
633 }
|
dev@59
|
634
|
dev@59
|
635 private static changeColour(layer: Layer, colour: string): void {
|
dev@59
|
636 const butcherShapes = (shape) => {
|
dev@59
|
637 shape.install({color: () => colour});
|
dev@59
|
638 shape.params.color = colour;
|
dev@59
|
639 shape.update(layer._renderingContext, layer.data);
|
dev@59
|
640 };
|
dev@59
|
641
|
dev@59
|
642 layer._$itemCommonShapeMap.forEach(butcherShapes);
|
dev@59
|
643 layer._$itemShapeMap.forEach(butcherShapes);
|
dev@59
|
644 layer.render();
|
dev@59
|
645 layer.update();
|
dev@54
|
646 }
|
dev@54
|
647
|
dev@51
|
648 ngOnDestroy(): void {
|
dev@51
|
649 this.featureExtractionSubscription.unsubscribe();
|
dev@53
|
650 this.playingStateSubscription.unsubscribe();
|
dev@53
|
651 this.seekedSubscription.unsubscribe();
|
dev@51
|
652 }
|
dev@154
|
653
|
dev@155
|
654 seekStart(): void {
|
dev@155
|
655 this.zoomOnMouseDown = this.timeline.timeContext.zoom;
|
dev@157
|
656 this.offsetOnMouseDown = this.timeline.timeContext.offset;
|
dev@155
|
657 }
|
dev@155
|
658
|
dev@155
|
659 seekEnd(x: number): void {
|
dev@157
|
660 const hasSameZoom: boolean = this.zoomOnMouseDown ===
|
dev@157
|
661 this.timeline.timeContext.zoom;
|
dev@157
|
662 const hasSameOffset: boolean = this.offsetOnMouseDown ===
|
dev@157
|
663 this.timeline.timeContext.offset;
|
dev@157
|
664 if (hasSameZoom && hasSameOffset) {
|
dev@155
|
665 this.seek(x);
|
dev@155
|
666 }
|
dev@155
|
667 }
|
dev@155
|
668
|
dev@154
|
669 seek(x: number): void {
|
dev@154
|
670 if (this.timeline) {
|
dev@154
|
671 const timeContext: any = this.timeline.timeContext;
|
dev@154
|
672 this.audioService.seekTo(
|
dev@154
|
673 timeContext.timeToPixel.invert(x)- timeContext.offset
|
dev@154
|
674 );
|
dev@154
|
675 }
|
dev@154
|
676 }
|
dev@6
|
677 }
|