annotate src/app/waveform/waveform.component.ts @ 96:42b29cdff5ef

Keep the time centered when zooming from where the pinch starts, and stop panning being so fast. Panning still isn't doing anything sensible.
author Lucas Thompson <dev@lucas.im>
date Fri, 24 Feb 2017 13:54:53 +0000
parents a335107e5246
children f8436dd53e7f
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 DisposableIndex = number;
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@54 37 private disposableLayers: Layer[];
dev@59 38 private colouredLayers: Map<DisposableIndex, Colour>;
dev@16 39
dev@16 40 @Input()
dev@16 41 set audioBuffer(buffer: AudioBuffer) {
dev@16 42 this._audioBuffer = buffer || undefined;
dev@20 43 if (this.audioBuffer)
dev@20 44 this.renderWaveform(this.audioBuffer);
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@51 55
dev@31 56 constructor(private audioService: AudioPlayerService,
dev@51 57 private piperService: FeatureExtractionService,
dev@51 58 public ngZone: NgZone) {
dev@59 59 this.colouredLayers = new Map();
dev@54 60 this.disposableLayers = [];
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);
dev@18 110 timeline.createTrack(track, height, 'main');
dev@54 111 return timeline;
dev@54 112 }
dev@18 113
dev@54 114 renderWaveform(buffer: AudioBuffer): void {
dev@54 115 const height: number = this.trackDiv.nativeElement.getBoundingClientRect().height;
dev@54 116 const mainTrack = this.timeline.getTrackById('main');
dev@54 117 if (this.timeline) {
dev@54 118 // resize
dev@54 119 const width = this.trackDiv.nativeElement.getBoundingClientRect().width;
dev@55 120
dev@54 121 // loop through layers and remove them, waves-ui provides methods for this but it seems to not work properly
dev@55 122 const timeContextChildren = this.timeline.timeContext._children;
dev@55 123
dev@60 124 for (let i = 0, length = this.disposableLayers.length; i < length; ++i) {
dev@54 125 let layer = this.disposableLayers.pop();
dev@54 126 mainTrack.remove(layer);
dev@55 127
dev@55 128 const index = timeContextChildren.indexOf(layer.timeContext);
dev@55 129 if (index >= 0)
dev@55 130 timeContextChildren.splice(index, 1);
dev@54 131 layer.destroy();
dev@54 132 }
dev@59 133 this.colouredLayers.clear();
dev@59 134
dev@54 135 this.timeline.visibleWidth = width;
dev@54 136 this.timeline.pixelsPerSecond = width / buffer.duration;
dev@54 137 mainTrack.height = height;
dev@54 138 } else {
dev@54 139 this.timeline = this.renderTimeline(buffer.duration)
dev@54 140 }
dev@83 141 this.timeline.timeContext.offset = 0.5 * this.timeline.timeContext.visibleDuration;
dev@18 142 // time axis
dev@18 143 const timeAxis = new wavesUI.helpers.TimeAxisLayer({
dev@18 144 height: height,
dev@18 145 color: 'gray'
dev@18 146 });
dev@54 147 this.addLayer(timeAxis, mainTrack, this.timeline.timeContext, true);
dev@18 148
dev@20 149 const waveformLayer = new wavesUI.helpers.WaveformLayer(buffer, {
dev@10 150 top: 10,
dev@20 151 height: height * 0.9,
dev@16 152 color: 'darkblue'
dev@16 153 });
dev@54 154 this.addLayer(waveformLayer, mainTrack, this.timeline.timeContext);
dev@31 155
dev@53 156 this.cursorLayer = new wavesUI.helpers.CursorLayer({
dev@31 157 height: height
dev@31 158 });
dev@54 159 this.addLayer(this.cursorLayer, mainTrack, this.timeline.timeContext);
dev@51 160 this.timeline.state = new wavesUI.states.CenteredZoomState(this.timeline);
dev@54 161 mainTrack.render();
dev@54 162 mainTrack.update();
dev@81 163
dev@81 164
dev@81 165 if ('ontouchstart' in window) {
dev@84 166 const hammertime = new Hammer(this.trackDiv.nativeElement);
dev@81 167 const scroll = (ev) => {
dev@81 168 const sign = ev.direction === Hammer.DIRECTION_LEFT ? -1 : 1;
dev@81 169 let delta = this.timeline.timeContext.timeToPixel.invert(sign * ev.distance);
dev@96 170 const speed: number = Math.abs(ev.velocityX);
dev@96 171 delta *= (speed > 0.075 ? 0.075 : speed); // this is completely made up to limit the max speed, TODO something sensible
dev@81 172 this.timeline.timeContext.offset += delta;
dev@81 173 this.timeline.tracks.update();
dev@81 174 };
dev@84 175
dev@81 176 const zoom = (ev) => {
dev@81 177 const minZoom = this.timeline.state.minZoom;
dev@81 178 const maxZoom = this.timeline.state.maxZoom;
dev@81 179 const initialZoom = this.timeline.timeContext.zoom;
dev@81 180 const targetZoom = initialZoom * ev.scale;
dev@96 181 const lastCenterTime = this.timeline.timeContext.timeToPixel.invert(ev.center.x);
dev@81 182 this.timeline.timeContext.zoom = Math.min(Math.max(targetZoom, minZoom), maxZoom);
dev@96 183 const newCenterTime = this.timeline.timeContext.timeToPixel.invert(ev.center.x);
dev@96 184 this.timeline.timeContext.offset += newCenterTime - lastCenterTime;
dev@81 185 this.timeline.tracks.update();
dev@81 186 };
dev@84 187 const seek = (ev) => {
dev@84 188 this.audioService.seekTo(
dev@84 189 this.timeline.timeContext.timeToPixel.invert(ev.center.x) - this.timeline.timeContext.offset
dev@84 190 );
dev@84 191 };
dev@81 192 hammertime.get('pinch').set({ enable: true });
dev@81 193 hammertime.on('panleft', scroll);
dev@81 194 hammertime.on('panright', scroll);
dev@81 195 hammertime.on('pinch', zoom);
dev@84 196 hammertime.on('tap', seek);
dev@81 197 }
dev@81 198
dev@53 199 this.animate();
dev@53 200 }
dev@53 201
dev@53 202 // TODO refactor - this doesn't belong here
dev@64 203 private renderFeatures(extracted: SimpleResponse, colour: Colour): void {
dev@64 204 if (!extracted.hasOwnProperty('features') || !extracted.hasOwnProperty('outputDescriptor')) return;
dev@64 205 if (!extracted.features.hasOwnProperty('shape') || !extracted.features.hasOwnProperty('data')) return;
dev@64 206 const features: FeatureCollection = (extracted.features as FeatureCollection);
dev@64 207 const outputDescriptor = extracted.outputDescriptor;
dev@64 208 const height = this.trackDiv.nativeElement.getBoundingClientRect().height;
dev@64 209 const mainTrack = this.timeline.getTrackById('main');
dev@64 210
dev@64 211 // TODO refactor all of this
dev@63 212 switch (features.shape) {
dev@64 213 case 'vector': {
dev@63 214 const stepDuration = (features as FixedSpacedFeatures).stepDuration;
dev@63 215 const featureData = (features.data as Float32Array);
dev@68 216 if (featureData.length === 0) return;
dev@63 217 const normalisationFactor = 1.0 /
dev@63 218 featureData.reduce(
dev@63 219 (currentMax, feature) => Math.max(currentMax, feature),
dev@63 220 -Infinity
dev@63 221 );
dev@67 222
dev@63 223 const plotData = [...featureData].map((feature, i) => {
dev@63 224 return {
dev@63 225 cx: i * stepDuration,
dev@63 226 cy: feature * normalisationFactor
dev@63 227 };
dev@63 228 });
dev@67 229
dev@63 230 let breakpointLayer = new wavesUI.helpers.BreakpointLayer(plotData, {
dev@63 231 color: colour,
dev@64 232 height: height
dev@63 233 });
dev@63 234 this.colouredLayers.set(this.addLayer(
dev@63 235 breakpointLayer,
dev@64 236 mainTrack,
dev@63 237 this.timeline.timeContext
dev@63 238 ), colour);
dev@63 239 break;
dev@64 240 }
dev@64 241 case 'list': {
dev@64 242 const featureData = (features.data as FeatureList);
dev@68 243 if (featureData.length === 0) return;
dev@64 244 // TODO look at output descriptor instead of directly inspecting features
dev@64 245 const hasDuration = outputDescriptor.configured.hasDuration;
dev@64 246 const isMarker = !hasDuration
dev@64 247 && outputDescriptor.configured.binCount === 0
dev@64 248 && featureData[0].featureValues == null;
dev@64 249 const isRegion = hasDuration
dev@64 250 && featureData[0].timestamp != null;
dev@64 251 // TODO refactor, this is incomprehensible
dev@64 252 if (isMarker) {
dev@64 253 const plotData = featureData.map(feature => {
dev@64 254 return {x: toSeconds(feature.timestamp)}
dev@64 255 });
dev@64 256 let markerLayer = new wavesUI.helpers.MarkerLayer(plotData, {
dev@64 257 height: height,
dev@64 258 color: colour,
dev@64 259 });
dev@64 260 this.colouredLayers.set(this.addLayer(
dev@64 261 markerLayer,
dev@64 262 mainTrack,
dev@64 263 this.timeline.timeContext
dev@64 264 ), colour);
dev@64 265 } else if (isRegion) {
dev@67 266 const binCount = outputDescriptor.configured.binCount || 0;
dev@67 267 const isBarRegion = featureData[0].featureValues.length >= 1 || binCount >= 1 ;
dev@64 268 const getSegmentArgs = () => {
dev@64 269 if (isBarRegion) {
dev@64 270
dev@67 271 // TODO refactor - this is messy
dev@67 272 interface FoldsToNumber<T> {
dev@67 273 reduce(fn: (previousValue: number,
dev@67 274 currentValue: T,
dev@67 275 currentIndex: number,
dev@67 276 array: ArrayLike<T>) => number,
dev@67 277 initialValue?: number): number;
dev@67 278 }
dev@64 279
dev@67 280 // TODO potentially change impl., i.e avoid reduce
dev@67 281 const findMin = <T>(arr: FoldsToNumber<T>, getElement: (x: T) => number): number => {
dev@67 282 return arr.reduce((min, val) => Math.min(min, getElement(val)), Infinity);
dev@67 283 };
dev@67 284
dev@67 285 const findMax = <T>(arr: FoldsToNumber<T>, getElement: (x: T) => number): number => {
dev@67 286 return arr.reduce((min, val) => Math.max(min, getElement(val)), -Infinity);
dev@67 287 };
dev@67 288
dev@67 289 const min = findMin<Feature>(featureData, (x: Feature) => {
dev@67 290 return findMin<number>(x.featureValues, y => y);
dev@67 291 });
dev@67 292
dev@67 293 const max = findMax<Feature>(featureData, (x: Feature) => {
dev@67 294 return findMax<number>(x.featureValues, y => y);
dev@67 295 });
dev@67 296
dev@67 297 const barHeight = 1.0 / height;
dev@64 298 return [
dev@67 299 featureData.reduce((bars, feature) => {
dev@67 300 const staticProperties = {
dev@64 301 x: toSeconds(feature.timestamp),
dev@64 302 width: toSeconds(feature.duration),
dev@67 303 height: min + barHeight,
dev@64 304 color: colour,
dev@64 305 opacity: 0.8
dev@67 306 };
dev@67 307 // TODO avoid copying Float32Array to an array - map is problematic here
dev@67 308 return bars.concat([...feature.featureValues]
dev@67 309 .map(val => Object.assign({}, staticProperties, {y: val})))
dev@67 310 }, []),
dev@67 311 {yDomain: [min, max + barHeight], height: height} as any
dev@67 312 ];
dev@64 313 } else {
dev@64 314 return [featureData.map(feature => {
dev@64 315 return {
dev@64 316 x: toSeconds(feature.timestamp),
dev@64 317 width: toSeconds(feature.duration),
dev@64 318 color: colour,
dev@64 319 opacity: 0.8
dev@64 320 }
dev@64 321 }), {height: height}];
dev@64 322 }
dev@64 323 };
dev@64 324
dev@64 325 let segmentLayer = new wavesUI.helpers.SegmentLayer(
dev@64 326 ...getSegmentArgs()
dev@64 327 );
dev@64 328 this.colouredLayers.set(this.addLayer(
dev@64 329 segmentLayer,
dev@64 330 mainTrack,
dev@64 331 this.timeline.timeContext
dev@64 332 ), colour);
dev@64 333 }
dev@64 334
dev@64 335 break;
dev@64 336 }
dev@67 337 default:
dev@67 338 console.log('Cannot render an appropriate layer.');
dev@63 339 }
dev@59 340
dev@56 341 this.timeline.tracks.update();
dev@53 342 }
dev@53 343
dev@53 344 private animate(): void {
dev@31 345 this.ngZone.runOutsideAngular(() => {
dev@31 346 // listen for time passing...
dev@31 347 const updateSeekingCursor = () => {
dev@53 348 const currentTime = this.audioService.getCurrentTime();
dev@53 349 this.cursorLayer.currentPosition = currentTime;
dev@53 350 this.cursorLayer.update();
dev@53 351
dev@53 352 const currentOffset = this.timeline.timeContext.offset;
dev@53 353 const offsetTimestamp = currentOffset
dev@53 354 + currentTime;
dev@53 355
dev@53 356 const visibleDuration = this.timeline.timeContext.visibleDuration;
dev@53 357 // TODO reduce duplication between directions and make more declarative
dev@53 358 // this kinda logic should also be tested
dev@53 359 const mustPageForward = offsetTimestamp > visibleDuration;
dev@53 360 const mustPageBackward = currentTime < -currentOffset;
dev@53 361
dev@53 362 if (mustPageForward) {
dev@53 363 const hasSkippedMultiplePages = offsetTimestamp - visibleDuration > visibleDuration;
dev@53 364
dev@53 365 this.timeline.timeContext.offset = hasSkippedMultiplePages
dev@53 366 ? -currentTime + 0.5 * visibleDuration
dev@53 367 : currentOffset - visibleDuration;
dev@51 368 this.timeline.tracks.update();
dev@34 369 }
dev@53 370
dev@53 371 if (mustPageBackward) {
dev@53 372 const hasSkippedMultiplePages = currentTime + visibleDuration < -currentOffset;
dev@53 373 this.timeline.timeContext.offset = hasSkippedMultiplePages
dev@53 374 ? -currentTime + 0.5 * visibleDuration
dev@53 375 : currentOffset + visibleDuration;
dev@51 376 this.timeline.tracks.update();
dev@34 377 }
dev@53 378
dev@53 379 if (this.isPlaying)
dev@53 380 requestAnimationFrame(updateSeekingCursor);
dev@31 381 };
dev@31 382 updateSeekingCursor();
dev@31 383 });
dev@6 384 }
dev@16 385
dev@59 386 private addLayer(layer: Layer, track: Track, timeContext: any, isAxis: boolean = false): DisposableIndex {
dev@54 387 timeContext.zoom = 1.0;
dev@54 388 if (!layer.timeContext) {
dev@54 389 layer.setTimeContext(isAxis ?
dev@54 390 timeContext : new wavesUI.core.LayerTimeContext(timeContext));
dev@54 391 }
dev@54 392 track.add(layer);
dev@54 393 layer.render();
dev@54 394 layer.update();
dev@59 395 return this.disposableLayers.push(layer) - 1;
dev@59 396 }
dev@59 397
dev@59 398 private static changeColour(layer: Layer, colour: string): void {
dev@59 399 const butcherShapes = (shape) => {
dev@59 400 shape.install({color: () => colour});
dev@59 401 shape.params.color = colour;
dev@59 402 shape.update(layer._renderingContext, layer.data);
dev@59 403 };
dev@59 404
dev@59 405 layer._$itemCommonShapeMap.forEach(butcherShapes);
dev@59 406 layer._$itemShapeMap.forEach(butcherShapes);
dev@59 407 layer.render();
dev@59 408 layer.update();
dev@54 409 }
dev@54 410
dev@51 411 ngOnDestroy(): void {
dev@51 412 this.featureExtractionSubscription.unsubscribe();
dev@53 413 this.playingStateSubscription.unsubscribe();
dev@53 414 this.seekedSubscription.unsubscribe();
dev@51 415 }
dev@6 416 }