Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Commit

Permalink
Reuse single PlaybackWorker between Playback instances (#12520)
Browse files Browse the repository at this point in the history
* Terminate playback worker on destroy

Signed-off-by: Michael Telatynski <[email protected]>

* Reuse single PlaybackWorker between all Playbacks

Signed-off-by: Michael Telatynski <[email protected]>

* ...

Signed-off-by: Michael Telatynski <[email protected]>

---------

Signed-off-by: Michael Telatynski <[email protected]>
  • Loading branch information
t3chguy authored May 14, 2024
1 parent 51f7156 commit 6e31f69
Show file tree
Hide file tree
Showing 2 changed files with 38 additions and 10 deletions.
34 changes: 34 additions & 0 deletions src/PlaybackEncoder.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
/*
Copyright 2024 The Matrix.org Foundation C.I.C.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/

// @ts-ignore - `.ts` is needed here to make TS happy
import { Request, Response } from "./workers/playback.worker";
import { WorkerManager } from "./WorkerManager";
import playbackWorkerFactory from "./workers/playbackWorkerFactory";

export class PlaybackEncoder {
private static internalInstance = new PlaybackEncoder();

public static get instance(): PlaybackEncoder {
return PlaybackEncoder.internalInstance;
}

private readonly worker = new WorkerManager<Request, Response>(playbackWorkerFactory());

public getPlaybackWaveform(input: Float32Array): Promise<number[]> {
return this.worker.call({ data: Array.from(input) }).then((resp) => resp.waveform);
}
}
14 changes: 4 additions & 10 deletions src/audio/Playback.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,14 @@ import { SimpleObservable } from "matrix-widget-api";
import { logger } from "matrix-js-sdk/src/logger";
import { defer } from "matrix-js-sdk/src/utils";

// @ts-ignore - `.ts` is needed here to make TS happy
import { Request, Response } from "../workers/playback.worker.ts";
import { UPDATE_EVENT } from "../stores/AsyncStore";
import { arrayFastResample } from "../utils/arrays";
import { IDestroyable } from "../utils/IDestroyable";
import { PlaybackClock } from "./PlaybackClock";
import { createAudioContext, decodeOgg } from "./compat";
import { clamp } from "../utils/numbers";
import { WorkerManager } from "../WorkerManager";
import { DEFAULT_WAVEFORM, PLAYBACK_WAVEFORM_SAMPLES } from "./consts";
import playbackWorkerFactory from "../workers/playbackWorkerFactory";
import { PlaybackEncoder } from "../PlaybackEncoder";

export enum PlaybackState {
Decoding = "decoding",
Expand Down Expand Up @@ -64,7 +61,6 @@ export class Playback extends EventEmitter implements IDestroyable, PlaybackInte
private waveformObservable = new SimpleObservable<number[]>();
private readonly clock: PlaybackClock;
private readonly fileSize: number;
private readonly worker = new WorkerManager<Request, Response>(playbackWorkerFactory());

/**
* Creates a new playback instance from a buffer.
Expand Down Expand Up @@ -209,7 +205,9 @@ export class Playback extends EventEmitter implements IDestroyable, PlaybackInte

// 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...
this.resampledWaveform = await this.makePlaybackWaveform(this.audioBuf.getChannelData(0));
this.resampledWaveform = await PlaybackEncoder.instance.getPlaybackWaveform(
this.audioBuf.getChannelData(0),
);
}

this.waveformObservable.update(this.resampledWaveform);
Expand All @@ -222,10 +220,6 @@ export class Playback extends EventEmitter implements IDestroyable, PlaybackInte
this.emit(PlaybackState.Stopped); // signal that we're not decoding anymore
}

private makePlaybackWaveform(input: Float32Array): Promise<number[]> {
return this.worker.call({ data: Array.from(input) }).then((resp) => resp.waveform);
}

private onPlaybackEnd = async (): Promise<void> => {
await this.context.suspend();
this.emit(PlaybackState.Stopped);
Expand Down

0 comments on commit 6e31f69

Please sign in to comment.