annotate src/app/waveform/waveform.component.ts @ 155:53ddfd792844

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