annotate src/app/waveform/waveform.component.ts @ 122:3e19908d4c8b

Remove some unused code and fix the removing of layers to work with the additional tracks.
author Lucas Thompson <dev@lucas.im>
date Tue, 14 Mar 2017 19:27:24 +0000
parents 7170e6ca2206
children 161af71c80d4
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@8 18
dev@20 19 type Timeline = any; // TODO what type actually is it.. start a .d.ts for waves-ui?
dev@54 20 type Layer = any;
dev@54 21 type Track = any;
dev@59 22 type Colour = string;
dev@6 23
dev@6 24 @Component({
dev@6 25 selector: 'app-waveform',
dev@6 26 templateUrl: './waveform.component.html',
dev@6 27 styleUrls: ['./waveform.component.css']
dev@6 28 })
dev@51 29 export class WaveformComponent implements OnInit, AfterViewInit, OnDestroy {
dev@20 30
dev@8 31 @ViewChild('track') trackDiv: ElementRef;
dev@6 32
dev@54 33 private _audioBuffer: AudioBuffer;
dev@54 34 private timeline: Timeline;
dev@54 35 private cursorLayer: any;
dev@16 36
dev@16 37 @Input()
dev@16 38 set audioBuffer(buffer: AudioBuffer) {
dev@16 39 this._audioBuffer = buffer || undefined;
cannam@117 40 if (this.audioBuffer) {
dev@20 41 this.renderWaveform(this.audioBuffer);
cannam@117 42 this.renderSpectrogram(this.audioBuffer);
cannam@117 43 }
dev@16 44 }
dev@16 45
dev@16 46 get audioBuffer(): AudioBuffer {
dev@16 47 return this._audioBuffer;
dev@16 48 }
dev@16 49
dev@51 50 private featureExtractionSubscription: Subscription;
dev@53 51 private playingStateSubscription: Subscription;
dev@53 52 private seekedSubscription: Subscription;
dev@53 53 private isPlaying: boolean;
dev@110 54 private offsetAtPanStart: number;
dev@110 55 private initialZoom: number;
dev@110 56 private initialDistance: number;
dev@51 57
dev@31 58 constructor(private audioService: AudioPlayerService,
dev@51 59 private piperService: FeatureExtractionService,
dev@51 60 public ngZone: NgZone) {
dev@54 61 this._audioBuffer = undefined;
dev@54 62 this.timeline = undefined;
dev@54 63 this.cursorLayer = undefined;
dev@53 64 this.isPlaying = false;
dev@59 65 const colours = function* () {
dev@59 66 const circularColours = [
dev@59 67 'black',
dev@59 68 'red',
dev@59 69 'green',
dev@59 70 'purple',
dev@59 71 'orange'
dev@59 72 ];
dev@59 73 let index = 0;
dev@59 74 const nColours = circularColours.length;
dev@59 75 while (true) {
dev@59 76 yield circularColours[index = ++index % nColours];
dev@59 77 }
dev@59 78 }();
dev@59 79
dev@51 80 this.featureExtractionSubscription = piperService.featuresExtracted$.subscribe(
dev@51 81 features => {
dev@59 82 this.renderFeatures(features, colours.next().value);
dev@51 83 });
dev@53 84 this.playingStateSubscription = audioService.playingStateChange$.subscribe(
dev@53 85 isPlaying => {
dev@53 86 this.isPlaying = isPlaying;
dev@53 87 if (this.isPlaying)
dev@53 88 this.animate();
dev@53 89 });
dev@53 90 this.seekedSubscription = audioService.seeked$.subscribe(() => {
dev@53 91 if (!this.isPlaying)
dev@53 92 this.animate();
dev@53 93 });
dev@51 94 }
dev@51 95
dev@53 96 ngOnInit() {
dev@53 97 }
dev@10 98
dev@10 99 ngAfterViewInit(): void {
dev@51 100 this.timeline = this.renderTimeline();
dev@20 101 }
dev@20 102
dev@20 103 renderTimeline(duration: number = 1.0): Timeline {
dev@18 104 const track: HTMLElement = this.trackDiv.nativeElement;
dev@20 105 track.innerHTML = "";
dev@18 106 const height: number = track.getBoundingClientRect().height;
dev@18 107 const width: number = track.getBoundingClientRect().width;
dev@18 108 const pixelsPerSecond = width / duration;
dev@18 109 const timeline = new wavesUI.core.Timeline(pixelsPerSecond, width);
cannam@117 110 timeline.createTrack(track, height/2, 'wave');
cannam@117 111 timeline.createTrack(track, height/2, 'grid');
dev@54 112 return timeline;
dev@54 113 }
dev@18 114
cannam@108 115 estimatePercentile(matrix, percentile) {
cannam@108 116 // our sample is not evenly distributed across the whole data set:
cannam@108 117 // it is guaranteed to include at least one sample from every
cannam@108 118 // column, and could sample some values more than once. But it
cannam@108 119 // should be good enough in most cases (todo: show this)
cannam@109 120 if (matrix.length === 0) {
cannam@109 121 return 0.0;
cannam@109 122 }
cannam@108 123 const w = matrix.length;
cannam@108 124 const h = matrix[0].length;
cannam@108 125 const n = w * h;
cannam@109 126 const m = (n > 50000 ? 50000 : n); // should base that on the %ile
cannam@108 127 let m_per = Math.floor(m / w);
cannam@108 128 if (m_per < 1) m_per = 1;
cannam@108 129 let sample = [];
cannam@108 130 for (let x = 0; x < w; ++x) {
cannam@108 131 for (let i = 0; i < m_per; ++i) {
cannam@108 132 const y = Math.floor(Math.random() * h);
cannam@109 133 const value = matrix[x][y];
cannam@109 134 if (!isNaN(value) && value !== Infinity) {
cannam@109 135 sample.push(value);
cannam@109 136 }
cannam@108 137 }
cannam@108 138 }
cannam@109 139 if (sample.length === 0) {
cannam@109 140 console.log("WARNING: No samples gathered, even though we hoped for " +
cannam@109 141 (m_per * w) + " of them");
cannam@109 142 return 0.0;
cannam@109 143 }
cannam@108 144 sample.sort((a,b) => { return a - b; });
cannam@108 145 const ix = Math.floor((sample.length * percentile) / 100);
cannam@108 146 console.log("Estimating " + percentile + "-%ile of " +
cannam@108 147 n + "-sample dataset (" + w + " x " + h + ") as value " + ix +
cannam@108 148 " of sorted " + sample.length + "-sample subset");
cannam@108 149 const estimate = sample[ix];
cannam@108 150 console.log("Estimate is: " + estimate + " (where min sampled value = " +
cannam@108 151 sample[0] + " and max = " + sample[sample.length-1] + ")");
cannam@108 152 return estimate;
cannam@108 153 }
cannam@108 154
cannam@108 155 interpolatingMapper(hexColours) {
cannam@108 156 const colours = hexColours.map(n => {
cannam@108 157 const i = parseInt(n, 16);
cannam@118 158 return [ ((i >> 16) & 255) / 255.0,
cannam@118 159 ((i >> 8) & 255) / 255.0,
cannam@118 160 ((i) & 255) / 255.0 ];
cannam@108 161 });
cannam@108 162 const last = colours.length - 1;
cannam@108 163 return (value => {
cannam@108 164 const m = value * last;
cannam@108 165 if (m >= last) {
cannam@108 166 return colours[last];
cannam@108 167 }
cannam@108 168 if (m <= 0) {
cannam@108 169 return colours[0];
cannam@108 170 }
cannam@108 171 const base = Math.floor(m);
cannam@108 172 const prop0 = base + 1.0 - m;
cannam@108 173 const prop1 = m - base;
cannam@108 174 const c0 = colours[base];
cannam@108 175 const c1 = colours[base+1];
cannam@118 176 return [ c0[0] * prop0 + c1[0] * prop1,
cannam@118 177 c0[1] * prop0 + c1[1] * prop1,
cannam@118 178 c0[2] * prop0 + c1[2] * prop1 ];
cannam@108 179 });
cannam@108 180 }
dev@110 181
cannam@108 182 iceMapper() {
dev@110 183 let hexColours = [
cannam@108 184 // Based on ColorBrewer ylGnBu
cannam@108 185 "ffffff", "ffff00", "f7fcf0", "e0f3db", "ccebc5", "a8ddb5",
cannam@108 186 "7bccc4", "4eb3d3", "2b8cbe", "0868ac", "084081", "042040"
cannam@108 187 ];
cannam@108 188 hexColours.reverse();
cannam@108 189 return this.interpolatingMapper(hexColours);
cannam@108 190 }
dev@110 191
cannam@118 192 hsv2rgb(h, s, v) { // all values in range [0, 1]
cannam@118 193 const i = Math.floor(h * 6);
cannam@118 194 const f = h * 6 - i;
cannam@118 195 const p = v * (1 - s);
cannam@118 196 const q = v * (1 - f * s);
cannam@118 197 const t = v * (1 - (1 - f) * s);
cannam@118 198 let r = 0, g = 0, b = 0;
cannam@118 199 switch (i % 6) {
cannam@118 200 case 0: r = v, g = t, b = p; break;
cannam@118 201 case 1: r = q, g = v, b = p; break;
cannam@118 202 case 2: r = p, g = v, b = t; break;
cannam@118 203 case 3: r = p, g = q, b = v; break;
cannam@118 204 case 4: r = t, g = p, b = v; break;
cannam@118 205 case 5: r = v, g = p, b = q; break;
cannam@118 206 }
cannam@118 207 return [ r, g, b ];
cannam@118 208 }
dev@122 209
cannam@118 210 greenMapper() {
cannam@118 211 const blue = 0.6666;
cannam@118 212 const pieslice = 0.3333;
cannam@118 213 return (value => {
cannam@118 214 const h = blue - value * 2.0 * pieslice;
cannam@118 215 const s = 0.5 + value / 2.0;
cannam@118 216 const v = value;
cannam@118 217 return this.hsv2rgb(h, s, v);
cannam@118 218 });
cannam@118 219 }
cannam@118 220
cannam@118 221 sunsetMapper() {
cannam@118 222 return (value => {
cannam@118 223 let r = (value - 0.24) * 2.38;
cannam@118 224 let g = (value - 0.64) * 2.777;
cannam@118 225 let b = (3.6 * value);
cannam@118 226 if (value > 0.277) b = 2.0 - b;
cannam@118 227 return [ r, g, b ];
cannam@118 228 });
cannam@118 229 }
cannam@118 230
dev@122 231 clearTimeline(): void {
dev@122 232 // loop through layers and remove them, waves-ui provides methods for this but it seems to not work properly
dev@122 233 const timeContextChildren = this.timeline.timeContext._children;
dev@122 234 for (let track of this.timeline.tracks) {
dev@122 235 if (track.layers.length === 0) { continue; }
dev@122 236 const trackLayers = Array.from(track.layers);
dev@122 237 while (trackLayers.length) {
dev@122 238 let layer: Layer = trackLayers.pop();
dev@122 239 track.remove(layer);
dev@122 240
dev@122 241 const index = timeContextChildren.indexOf(layer.timeContext);
dev@122 242 if (index >= 0) {
dev@122 243 timeContextChildren.splice(index, 1);
dev@122 244 }
dev@122 245 layer.destroy();
dev@122 246 }
dev@122 247 }
dev@122 248 }
dev@122 249
dev@54 250 renderWaveform(buffer: AudioBuffer): void {
cannam@117 251 const height: number = this.trackDiv.nativeElement.getBoundingClientRect().height / 2;
cannam@117 252 const waveTrack = this.timeline.getTrackById('wave');
dev@54 253 if (this.timeline) {
dev@54 254 // resize
dev@54 255 const width = this.trackDiv.nativeElement.getBoundingClientRect().width;
dev@55 256
dev@122 257 this.clearTimeline();
dev@59 258
dev@54 259 this.timeline.visibleWidth = width;
dev@54 260 this.timeline.pixelsPerSecond = width / buffer.duration;
cannam@117 261 waveTrack.height = height;
dev@54 262 } else {
dev@54 263 this.timeline = this.renderTimeline(buffer.duration)
dev@54 264 }
dev@83 265 this.timeline.timeContext.offset = 0.5 * this.timeline.timeContext.visibleDuration;
cannam@106 266
dev@18 267 // time axis
dev@18 268 const timeAxis = new wavesUI.helpers.TimeAxisLayer({
dev@18 269 height: height,
cannam@106 270 color: '#b0b0b0'
dev@18 271 });
cannam@117 272 this.addLayer(timeAxis, waveTrack, this.timeline.timeContext, true);
dev@18 273
dev@20 274 const waveformLayer = new wavesUI.helpers.WaveformLayer(buffer, {
dev@10 275 top: 10,
dev@20 276 height: height * 0.9,
dev@16 277 color: 'darkblue'
dev@16 278 });
cannam@117 279 this.addLayer(waveformLayer, waveTrack, this.timeline.timeContext);
cannam@117 280
dev@53 281 this.cursorLayer = new wavesUI.helpers.CursorLayer({
dev@31 282 height: height
dev@31 283 });
cannam@117 284 this.addLayer(this.cursorLayer, waveTrack, this.timeline.timeContext);
dev@51 285 this.timeline.state = new wavesUI.states.CenteredZoomState(this.timeline);
cannam@117 286 waveTrack.render();
cannam@117 287 waveTrack.update();
dev@81 288
dev@81 289
dev@81 290 if ('ontouchstart' in window) {
dev@110 291 interface Point {
dev@110 292 x: number;
dev@110 293 y: number;
dev@110 294 }
dev@110 295
dev@113 296 let zoomGestureJustEnded: boolean = false;
dev@113 297
dev@110 298 const pixelToExponent: Function = wavesUI.utils.scales.linear()
dev@110 299 .domain([0, 100]) // 100px => factor 2
dev@110 300 .range([0, 1]);
dev@110 301
dev@110 302 const calculateDistance: (p1: Point, p2: Point) => number = (p1, p2) => {
dev@110 303 return Math.pow(
dev@110 304 Math.pow(p2.x - p1.x, 2) +
dev@110 305 Math.pow(p2.y - p1.y, 2), 0.5);
dev@110 306 };
dev@110 307
dev@84 308 const hammertime = new Hammer(this.trackDiv.nativeElement);
dev@81 309 const scroll = (ev) => {
dev@113 310 if (zoomGestureJustEnded) {
dev@113 311 zoomGestureJustEnded = false;
dev@113 312 console.log("Skip this event: likely a single touch dangling from pinch");
dev@113 313 return;
dev@113 314 }
dev@110 315 this.timeline.timeContext.offset = this.offsetAtPanStart +
dev@110 316 this.timeline.timeContext.timeToPixel.invert(ev.deltaX);
dev@81 317 this.timeline.tracks.update();
dev@81 318 };
dev@84 319
dev@81 320 const zoom = (ev) => {
dev@81 321 const minZoom = this.timeline.state.minZoom;
dev@81 322 const maxZoom = this.timeline.state.maxZoom;
dev@110 323 const distance = calculateDistance({
dev@110 324 x: ev.pointers[0].clientX,
dev@110 325 y: ev.pointers[0].clientY
dev@110 326 }, {
dev@110 327 x: ev.pointers[1].clientX,
dev@110 328 y: ev.pointers[1].clientY
dev@110 329 });
dev@110 330
dev@110 331 const lastCenterTime =
dev@110 332 this.timeline.timeContext.timeToPixel.invert(ev.center.x);
dev@110 333
dev@110 334 const exponent = pixelToExponent(distance - this.initialDistance);
dev@110 335 const targetZoom = this.initialZoom * Math.pow(2, exponent);
dev@110 336
dev@110 337 this.timeline.timeContext.zoom =
dev@110 338 Math.min(Math.max(targetZoom, minZoom), maxZoom);
dev@110 339
dev@110 340 const newCenterTime =
dev@110 341 this.timeline.timeContext.timeToPixel.invert(ev.center.x);
dev@110 342
dev@96 343 this.timeline.timeContext.offset += newCenterTime - lastCenterTime;
dev@81 344 this.timeline.tracks.update();
dev@81 345 };
dev@84 346 const seek = (ev) => {
dev@84 347 this.audioService.seekTo(
dev@84 348 this.timeline.timeContext.timeToPixel.invert(ev.center.x) - this.timeline.timeContext.offset
dev@84 349 );
dev@84 350 };
dev@81 351 hammertime.get('pinch').set({ enable: true });
dev@110 352 hammertime.on('panstart', () => {
dev@110 353 this.offsetAtPanStart = this.timeline.timeContext.offset;
dev@110 354 });
dev@81 355 hammertime.on('panleft', scroll);
dev@81 356 hammertime.on('panright', scroll);
dev@110 357 hammertime.on('pinchstart', (e) => {
dev@110 358 this.initialZoom = this.timeline.timeContext.zoom;
dev@110 359
dev@110 360 this.initialDistance = calculateDistance({
dev@110 361 x: e.pointers[0].clientX,
dev@110 362 y: e.pointers[0].clientY
dev@110 363 }, {
dev@110 364 x: e.pointers[1].clientX,
dev@110 365 y: e.pointers[1].clientY
dev@110 366 });
dev@110 367 });
dev@81 368 hammertime.on('pinch', zoom);
dev@113 369 hammertime.on('pinchend', () => {
dev@113 370 zoomGestureJustEnded = true;
dev@113 371 });
dev@84 372 hammertime.on('tap', seek);
dev@81 373 }
dev@81 374
dev@53 375 this.animate();
dev@53 376 }
dev@53 377
cannam@117 378 renderSpectrogram(buffer: AudioBuffer): void {
cannam@117 379 const height: number = this.trackDiv.nativeElement.getBoundingClientRect().height / 2;
cannam@117 380 const gridTrack = this.timeline.getTrackById('grid');
cannam@117 381
cannam@117 382 const spectrogramLayer = new wavesUI.helpers.SpectrogramLayer(buffer, {
cannam@118 383 top: height * 0.05,
cannam@117 384 height: height * 0.9,
cannam@117 385 stepSize: 512,
cannam@118 386 fftSize: 1024,
cannam@118 387 normalise: 'none',
cannam@118 388 mapper: this.sunsetMapper()
cannam@117 389 });
cannam@117 390 this.addLayer(spectrogramLayer, gridTrack, this.timeline.timeContext);
cannam@117 391
cannam@117 392 this.timeline.tracks.update();
cannam@117 393 }
cannam@117 394
dev@53 395 // TODO refactor - this doesn't belong here
dev@64 396 private renderFeatures(extracted: SimpleResponse, colour: Colour): void {
dev@64 397 if (!extracted.hasOwnProperty('features') || !extracted.hasOwnProperty('outputDescriptor')) return;
dev@64 398 if (!extracted.features.hasOwnProperty('shape') || !extracted.features.hasOwnProperty('data')) return;
dev@64 399 const features: FeatureCollection = (extracted.features as FeatureCollection);
dev@64 400 const outputDescriptor = extracted.outputDescriptor;
cannam@118 401 const height = this.trackDiv.nativeElement.getBoundingClientRect().height / 2;
cannam@118 402 const waveTrack = this.timeline.getTrackById('wave');
dev@64 403
dev@64 404 // TODO refactor all of this
dev@63 405 switch (features.shape) {
dev@64 406 case 'vector': {
dev@63 407 const stepDuration = (features as FixedSpacedFeatures).stepDuration;
dev@63 408 const featureData = (features.data as Float32Array);
dev@68 409 if (featureData.length === 0) return;
dev@63 410 const normalisationFactor = 1.0 /
dev@63 411 featureData.reduce(
dev@63 412 (currentMax, feature) => Math.max(currentMax, feature),
dev@63 413 -Infinity
dev@63 414 );
dev@67 415
dev@63 416 const plotData = [...featureData].map((feature, i) => {
dev@63 417 return {
dev@63 418 cx: i * stepDuration,
dev@63 419 cy: feature * normalisationFactor
dev@63 420 };
dev@63 421 });
dev@67 422
dev@105 423 let lineLayer = new wavesUI.helpers.LineLayer(plotData, {
dev@63 424 color: colour,
dev@64 425 height: height
dev@63 426 });
dev@122 427 this.addLayer(
dev@105 428 lineLayer,
cannam@117 429 waveTrack,
dev@63 430 this.timeline.timeContext
dev@122 431 );
dev@63 432 break;
dev@64 433 }
dev@64 434 case 'list': {
dev@64 435 const featureData = (features.data as FeatureList);
dev@68 436 if (featureData.length === 0) return;
dev@64 437 // TODO look at output descriptor instead of directly inspecting features
dev@64 438 const hasDuration = outputDescriptor.configured.hasDuration;
dev@64 439 const isMarker = !hasDuration
dev@64 440 && outputDescriptor.configured.binCount === 0
dev@64 441 && featureData[0].featureValues == null;
dev@64 442 const isRegion = hasDuration
dev@64 443 && featureData[0].timestamp != null;
dev@64 444 // TODO refactor, this is incomprehensible
dev@64 445 if (isMarker) {
dev@64 446 const plotData = featureData.map(feature => {
dev@64 447 return {x: toSeconds(feature.timestamp)}
dev@64 448 });
dev@64 449 let markerLayer = new wavesUI.helpers.MarkerLayer(plotData, {
dev@64 450 height: height,
dev@64 451 color: colour,
dev@64 452 });
dev@122 453 this.addLayer(
dev@64 454 markerLayer,
cannam@117 455 waveTrack,
dev@64 456 this.timeline.timeContext
dev@122 457 );
dev@64 458 } else if (isRegion) {
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@6 639 }