Compare commits
1
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
acc17f422b |
@@ -86,6 +86,7 @@ import { CallAvatarAnimation } from '../styles/Animations.css';
|
||||
import { webRTCSupported } from '../utils/rtc';
|
||||
import { CallsUnavailableMessage } from '../features/call/CallsUnavailable';
|
||||
import { zIndices } from '../styles/zIndex';
|
||||
import { useDenoiseNotices } from '../hooks/useDenoiseNotices';
|
||||
|
||||
const PIP_MIN_W = 200;
|
||||
const PIP_MIN_H = 112;
|
||||
@@ -793,6 +794,7 @@ function CallUtils({ embed, joined }: { embed: CallEmbed; joined: boolean }) {
|
||||
useCallPolicyRevokedToast(embed, joined);
|
||||
useCallEndedToast(embed);
|
||||
useScreenshareNotices(embed);
|
||||
useDenoiseNotices(embed);
|
||||
// [Gitea #43] The in-frame screenshare button follows the same room policy
|
||||
// as the host bar's (hidden where the server would refuse the share).
|
||||
const { allowScreenshare } = useRoomCallPolicy(embed.room);
|
||||
|
||||
@@ -0,0 +1,38 @@
|
||||
import { useEffect, useRef } from 'react';
|
||||
import { useSetAtom } from 'jotai';
|
||||
import { Icons } from 'folds';
|
||||
import { CallEmbed } from '../plugins/call';
|
||||
import { toastQueueAtom } from '../state/toast';
|
||||
import { useSetting } from '../state/hooks/settings';
|
||||
import { settingsAtom } from '../state/settings';
|
||||
import { denoiseNotice, DenoiseStateReport } from '../utils/denoiseNotice';
|
||||
|
||||
/**
|
||||
* [Gitea #260] Tell the user when ML noise suppression didn't attach (raw mic)
|
||||
* or fell back to another model. The fork's `io.lotus.denoise_state` used to
|
||||
* go unanswered ("unsupported action"), so failures were silent.
|
||||
*/
|
||||
export function useDenoiseNotices(embed: CallEmbed): void {
|
||||
const setToast = useSetAtom(toastQueueAtom);
|
||||
const [mode] = useSetting(settingsAtom, 'callNoiseSuppression');
|
||||
const [model] = useSetting(settingsAtom, 'callDenoiseModel');
|
||||
const latest = useRef({ mode, model });
|
||||
latest.current = { mode, model };
|
||||
useEffect(
|
||||
() =>
|
||||
embed.listenAction<{ data?: DenoiseStateReport }>('io.lotus.denoise_state', (evt) => {
|
||||
if (latest.current.mode !== 'ml') return;
|
||||
const body = denoiseNotice(latest.current.model, evt.detail?.data);
|
||||
if (!body) return;
|
||||
setToast({
|
||||
id: `denoise-state-${Date.now()}`,
|
||||
iconSrc: Icons.Mic,
|
||||
displayName: 'Noise suppression',
|
||||
body,
|
||||
roomName: embed.room.name ?? 'Voice call',
|
||||
roomId: embed.roomId,
|
||||
});
|
||||
}),
|
||||
[embed, setToast],
|
||||
);
|
||||
}
|
||||
@@ -1060,32 +1060,6 @@ function TauriUpdateFeature() {
|
||||
return null;
|
||||
}
|
||||
|
||||
function LotusDenoiseFeature() {
|
||||
const setToast = useSetAtom(toastQueueAtom);
|
||||
|
||||
useEffect(() => {
|
||||
const handleMessage = (event: MessageEvent) => {
|
||||
if (event.data?.type === 'lotus-denoise-status') {
|
||||
const { active, error } = event.data;
|
||||
if (!active) {
|
||||
setToast({
|
||||
id: `denoise-fail-${Date.now()}`,
|
||||
displayName: 'Audio Quality',
|
||||
body: `ML Noise Suppression failed: ${error || 'Unknown error'}. Falling back to raw mic.`,
|
||||
roomName: 'System',
|
||||
roomId: '',
|
||||
});
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
window.addEventListener('message', handleMessage);
|
||||
return () => window.removeEventListener('message', handleMessage);
|
||||
}, [setToast]);
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
// Registers the global `?` shortcut (ignored while typing) and renders the
|
||||
// keyboard-shortcuts help dialog. Headless — the dialog self-gates on its atom.
|
||||
function KeyboardShortcutsFeature() {
|
||||
@@ -1167,7 +1141,6 @@ export function ClientNonUIFeatures({ children }: ClientNonUIFeaturesProps) {
|
||||
<CloseBehaviorPrompt />
|
||||
<ConsentRequiredPrompt />
|
||||
<OutboxFeature />
|
||||
<LotusDenoiseFeature />
|
||||
<DeepLinkNavigator />
|
||||
<KeyboardShortcutsFeature />
|
||||
{children}
|
||||
|
||||
@@ -0,0 +1,17 @@
|
||||
import { test } from 'node:test';
|
||||
import assert from 'node:assert/strict';
|
||||
import { denoiseNotice } from './denoiseNotice';
|
||||
|
||||
test('denoiseNotice: says when ML is off or fell back (#260)', () => {
|
||||
assert.equal(denoiseNotice('deepfilternet', { active: true, model: 'deepfilternet' }), undefined);
|
||||
assert.match(
|
||||
denoiseNotice('deepfilternet', { active: true, model: 'rnnoise' }) ?? '',
|
||||
/^DeepFilterNet 3 couldn't start, so noise suppression is using RNNoise instead\.$/,
|
||||
);
|
||||
assert.match(
|
||||
denoiseNotice('rnnoise', { active: false, error: 'boom' }) ?? '',
|
||||
/unfiltered audio/,
|
||||
);
|
||||
assert.equal(denoiseNotice('rnnoise', undefined), undefined);
|
||||
assert.equal(denoiseNotice('rnnoise', { model: 'x' }), undefined);
|
||||
});
|
||||
@@ -0,0 +1,29 @@
|
||||
/**
|
||||
* [Gitea #260] The fork reports what noise suppression actually runs as
|
||||
* `io.lotus.denoise_state { active, model, error? }`. Pure: the toast text for
|
||||
* a report, or undefined when what runs is what the user picked.
|
||||
*/
|
||||
export type DenoiseStateReport = { active?: unknown; model?: unknown; error?: unknown };
|
||||
|
||||
const MODEL_NAMES: Record<string, string> = {
|
||||
rnnoise: 'RNNoise',
|
||||
speex: 'Speex',
|
||||
dtln: 'DTLN',
|
||||
deepfilternet: 'DeepFilterNet 3',
|
||||
};
|
||||
const modelName = (m: unknown): string =>
|
||||
typeof m === 'string' ? (MODEL_NAMES[m] ?? m) : 'the selected model';
|
||||
|
||||
export function denoiseNotice(
|
||||
requestedModel: string,
|
||||
report: DenoiseStateReport | undefined,
|
||||
): string | undefined {
|
||||
if (!report || typeof report.active !== 'boolean') return undefined;
|
||||
if (!report.active) {
|
||||
return `ML noise suppression couldn't start, so your microphone is sending unfiltered audio. You can pick another model in Settings → Calls.`;
|
||||
}
|
||||
if (typeof report.model === 'string' && report.model !== requestedModel) {
|
||||
return `${modelName(requestedModel)} couldn't start, so noise suppression is using ${modelName(report.model)} instead.`;
|
||||
}
|
||||
return undefined;
|
||||
}
|
||||
@@ -1,11 +1,6 @@
|
||||
import { test } from 'node:test';
|
||||
import assert from 'node:assert/strict';
|
||||
import {
|
||||
formatFileSize,
|
||||
hasTransparency,
|
||||
isAnimatedWebp,
|
||||
isCompressible,
|
||||
} from './imageCompression';
|
||||
import { formatFileSize, isCompressible } from './imageCompression';
|
||||
|
||||
test('formatFileSize formats bytes below 1KB as B', () => {
|
||||
assert.equal(formatFileSize(0), '0 B');
|
||||
@@ -30,38 +25,14 @@ test('formatFileSize formats values in the MB range', () => {
|
||||
test('isCompressible accepts raster image types', () => {
|
||||
assert.equal(isCompressible({ type: 'image/png' } as Blob), true);
|
||||
assert.equal(isCompressible({ type: 'image/jpeg' } as Blob), true);
|
||||
assert.equal(isCompressible({ type: 'image/gif' } as Blob), true);
|
||||
assert.equal(isCompressible({ type: 'image/webp' } as Blob), true);
|
||||
});
|
||||
|
||||
test('isCompressible rejects svg, empty type, and non-images', () => {
|
||||
assert.equal(isCompressible({ type: 'image/svg+xml' } as Blob), false);
|
||||
// [Gitea #331] usually animated; a canvas keeps one frame
|
||||
assert.equal(isCompressible({ type: 'image/gif' } as Blob), false);
|
||||
assert.equal(isCompressible({ type: 'image/apng' } as Blob), false);
|
||||
assert.equal(isCompressible({ type: '' } as Blob), false);
|
||||
assert.equal(isCompressible({ type: 'application/pdf' } as Blob), false);
|
||||
assert.equal(isCompressible({ type: 'text/plain' } as Blob), false);
|
||||
assert.equal(isCompressible({ type: 'video/mp4' } as Blob), false);
|
||||
});
|
||||
|
||||
const webpHeader = (chunk: string, flags = 0) => {
|
||||
const b = new Uint8Array(32);
|
||||
const put = (at: number, str: string) => b.set(new TextEncoder().encode(str), at);
|
||||
put(0, 'RIFF');
|
||||
put(8, 'WEBP');
|
||||
put(12, chunk);
|
||||
b[20] = flags;
|
||||
return b;
|
||||
};
|
||||
|
||||
test('isAnimatedWebp: VP8X with the animation flag (#331)', () => {
|
||||
assert.equal(isAnimatedWebp(webpHeader('VP8X', 0x02)), true);
|
||||
assert.equal(isAnimatedWebp(webpHeader('VP8X', 0x10)), false, 'alpha flag only');
|
||||
assert.equal(isAnimatedWebp(webpHeader('VP8 ')), false, 'simple lossy');
|
||||
assert.equal(isAnimatedWebp(new Uint8Array(8)), false);
|
||||
});
|
||||
|
||||
test('hasTransparency (#331)', () => {
|
||||
assert.equal(hasTransparency(new Uint8ClampedArray([1, 2, 3, 255, 4, 5, 6, 255])), false);
|
||||
assert.equal(hasTransparency(new Uint8ClampedArray([1, 2, 3, 255, 0, 0, 0, 0])), true);
|
||||
});
|
||||
|
||||
@@ -8,32 +8,11 @@ export type CompressionResult = {
|
||||
height: number;
|
||||
};
|
||||
|
||||
// Raster images the browser can render to canvas can be compressed to JPEG.
|
||||
// SVG is vector and must stay as-is. [Gitea #331] GIF and APNG are usually
|
||||
// animated, and a canvas keeps only the first frame, so they aren't offered.
|
||||
// Empty type string (undetected MIME) is excluded.
|
||||
const NOT_COMPRESSIBLE = new Set(['image/svg+xml', 'image/gif', 'image/apng']);
|
||||
// Any raster image the browser can render to canvas can be compressed to JPEG.
|
||||
// SVG is vector and must stay as-is; GIF animation is lost on canvas but static
|
||||
// frames compress fine. Empty type string (undetected MIME) is excluded.
|
||||
const isCompressibleType = (type: string): boolean =>
|
||||
type.startsWith('image/') && !NOT_COMPRESSIBLE.has(type);
|
||||
|
||||
/**
|
||||
* Pure: whether a WebP file is animated. An animated WebP is a VP8X file
|
||||
* whose header has the animation flag (byte 20, bit 0x02) and an ANIM chunk.
|
||||
*/
|
||||
export function isAnimatedWebp(bytes: Uint8Array): boolean {
|
||||
const ascii = (at: number, len: number) => String.fromCharCode(...bytes.subarray(at, at + len));
|
||||
if (bytes.length < 21 || ascii(0, 4) !== 'RIFF' || ascii(8, 4) !== 'WEBP') return false;
|
||||
// Bit 0x02 of the VP8X flags byte (no-bitwise: test it arithmetically).
|
||||
return ascii(12, 4) === 'VP8X' && Math.floor(bytes[20] / 2) % 2 === 1;
|
||||
}
|
||||
|
||||
/** Pure: whether RGBA pixel data has any pixel that isn't fully opaque. */
|
||||
export function hasTransparency(rgba: Uint8ClampedArray): boolean {
|
||||
for (let i = 3; i < rgba.length; i += 4) {
|
||||
if (rgba[i] !== 255) return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
type.startsWith('image/') && type !== 'image/svg+xml' && type !== '';
|
||||
|
||||
/** Returns true if this file can be compressed via canvas (any raster image type). */
|
||||
export function isCompressible(file: File | Blob): boolean {
|
||||
@@ -49,8 +28,7 @@ const JPEG_OUTPUT_TYPE = 'image/jpeg';
|
||||
*
|
||||
* PNG is skipped entirely: it may carry an alpha channel, and re-encoding to
|
||||
* JPEG composites transparency onto an opaque (black) background, corrupting the
|
||||
* image. Any other image with transparent pixels, and animated WebP, are left
|
||||
* alone for the same reason (#331). Returning null makes callers fall back to uploading the lossless
|
||||
* image. Returning null makes callers fall back to uploading the lossless
|
||||
* original. The image is decoded with `imageOrientation: 'from-image'` so any
|
||||
* EXIF orientation is baked into the pixels instead of being silently dropped.
|
||||
*/
|
||||
@@ -61,15 +39,6 @@ export async function compressImage(
|
||||
if (!isCompressibleType(file.type)) return null;
|
||||
// Skip PNG (potential alpha) — re-encoding to JPEG would flatten transparency.
|
||||
if (file.type === 'image/png') return null;
|
||||
// [Gitea #331] An animated WebP would become a single still frame.
|
||||
if (file.type === 'image/webp') {
|
||||
try {
|
||||
const head = new Uint8Array(await file.slice(0, 32).arrayBuffer());
|
||||
if (isAnimatedWebp(head)) return null;
|
||||
} catch {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
let bitmap: ImageBitmap;
|
||||
try {
|
||||
@@ -91,13 +60,6 @@ export async function compressImage(
|
||||
}
|
||||
ctx.drawImage(bitmap, 0, 0);
|
||||
bitmap.close();
|
||||
// [Gitea #331] JPEG has no alpha: a transparent WebP (sticker, logo) came out
|
||||
// with a black background. Keep any image with transparency as the original.
|
||||
try {
|
||||
if (hasTransparency(ctx.getImageData(0, 0, width, height).data)) return null;
|
||||
} catch {
|
||||
return null;
|
||||
}
|
||||
|
||||
return new Promise((resolve) => {
|
||||
canvas.toBlob(
|
||||
|
||||
Reference in New Issue
Block a user