mirror of
https://github.com/vector-im/element-call.git
synced 2026-11-16 01:22:29 +00:00
fix Config.get before ready
This commit is contained in:
@@ -83,10 +83,14 @@ describe("BackgroundEffectTransformer", () => {
|
||||
.spyOn(FilesetResolver, "forVisionTasks")
|
||||
.mockResolvedValue(served);
|
||||
|
||||
await new BackgroundEffectTransformer(
|
||||
const wasmBaseUrl = vi.fn(() => "https://cdn.example.org/mediapipe");
|
||||
const transformer = new BackgroundEffectTransformer(
|
||||
{ backgroundDisabled: true },
|
||||
{ wasmBaseUrl: "https://cdn.example.org/mediapipe" },
|
||||
).init({} as VideoTransformerInitOptions);
|
||||
{ wasmBaseUrl },
|
||||
);
|
||||
expect(wasmBaseUrl).not.toHaveBeenCalled();
|
||||
|
||||
await transformer.init({} as VideoTransformerInitOptions);
|
||||
|
||||
expect(resolve).toHaveBeenCalledWith("https://cdn.example.org/mediapipe");
|
||||
expect(create.mock.calls[0][0]).toBe(served);
|
||||
|
||||
@@ -37,8 +37,10 @@ export interface BackgroundEffectTransformerSources {
|
||||
/**
|
||||
* Where to fetch MediaPipe's runtime from instead of the bundled copy: a
|
||||
* directory holding its `vision_wasm_internal.js` and `.wasm` files.
|
||||
* Consulted only when the runtime is about to load, so a transformer can be
|
||||
* built before the deployment's config has arrived.
|
||||
*/
|
||||
wasmBaseUrl?: string;
|
||||
wasmBaseUrl?: () => string | undefined;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -155,10 +157,11 @@ async function createSegmenter(
|
||||
canvas: HTMLCanvasElement | OffscreenCanvas | undefined,
|
||||
segmenterOptions?: SegmenterOptions,
|
||||
): Promise<ImageSegmenter> {
|
||||
const wasmBaseUrl = sources.wasmBaseUrl?.();
|
||||
const fileset =
|
||||
sources.wasmBaseUrl === undefined
|
||||
wasmBaseUrl === undefined
|
||||
? bundledFileset
|
||||
: await FilesetResolver.forVisionTasks(sources.wasmBaseUrl);
|
||||
: await FilesetResolver.forVisionTasks(wasmBaseUrl);
|
||||
const build = async (delegate: "GPU" | "CPU"): Promise<ImageSegmenter> =>
|
||||
ImageSegmenter.createFromOptions(fileset, {
|
||||
baseOptions: { modelAssetPath, delegate, ...segmenterOptions },
|
||||
|
||||
@@ -53,7 +53,8 @@ export function createAppBackgroundEffects(
|
||||
scope: ObservableScope,
|
||||
): BackgroundEffects {
|
||||
const sources = {
|
||||
wasmBaseUrl: Config.get().background_effects?.mediapipe_wasm_url,
|
||||
wasmBaseUrl: (): string | undefined =>
|
||||
Config.get().background_effects?.mediapipe_wasm_url,
|
||||
};
|
||||
const transformer = new BackgroundEffectTransformer(
|
||||
{ backgroundDisabled: true },
|
||||
|
||||
Reference in New Issue
Block a user