annotate src/app/waveform/waveform.component.ts @ 152:1c6ef6170056

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