PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Merge pull request #5956 from matrix-org/travis/voicemessages/waveform2

Browse source 
Calculate the real waveform in the Playback class for voice messages
This commit is contained in:
Travis Ralston 2021-05-04 09:04:08 -06:00 committed by GitHub
commit 34c735e4d9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/voice/Playback.ts
View file

@ -20,6 +20,7 @@ import {arrayFastResample, arraySeed} from "../utils/arrays";
import {SimpleObservable} from "matrix-widget-api"; import {SimpleObservable} from "matrix-widget-api";
import {IDestroyable} from "../utils/IDestroyable"; import {IDestroyable} from "../utils/IDestroyable";
import {PlaybackClock} from "./PlaybackClock"; import {PlaybackClock} from "./PlaybackClock";
import {clamp} from "../utils/numbers";
export enum PlaybackState { export enum PlaybackState {
Decoding = "decoding", Decoding = "decoding",
@ -52,8 +53,6 @@ export class Playback extends EventEmitter implements IDestroyable {
this.resampledWaveform = arrayFastResample(seedWaveform, PLAYBACK_WAVEFORM_SAMPLES); this.resampledWaveform = arrayFastResample(seedWaveform, PLAYBACK_WAVEFORM_SAMPLES);
this.waveformObservable.update(this.resampledWaveform); this.waveformObservable.update(this.resampledWaveform);
this.clock = new PlaybackClock(this.context); this.clock = new PlaybackClock(this.context);
// TODO: @@ TR: Calculate real waveform
} }
public get waveform(): number[] { public get waveform(): number[] {
@ -93,6 +92,13 @@ export class Playback extends EventEmitter implements IDestroyable {
public async prepare() { public async prepare() {
this.audioBuf = await this.context.decodeAudioData(this.buf); this.audioBuf = await this.context.decodeAudioData(this.buf);
// Update the waveform to the real waveform once we have channel data to use. We don't
// exactly trust the user-provided waveform to be accurate...
const waveform = Array.from(this.audioBuf.getChannelData(0)).map(v => clamp(v, 0, 1));
this.resampledWaveform = arrayFastResample(waveform, PLAYBACK_WAVEFORM_SAMPLES);
this.waveformObservable.update(this.resampledWaveform);
this.emit(PlaybackState.Stopped); // signal that we're not decoding anymore this.emit(PlaybackState.Stopped); // signal that we're not decoding anymore
this.clock.durationSeconds = this.audioBuf.duration; this.clock.durationSeconds = this.audioBuf.duration;
} }