Open source video conferencing app powered by LiveKit. Built with Django and React.
✨(frontend) add custom virtual background feature
Florent Chehab16daf7b8d3a0
diff --git a/CHANGELOG.md b/CHANGELOG.mdindex 7dcef235..66eda099 100644--- a/CHANGELOG.md+++ b/CHANGELOG.md@@ -65,6 +65,7 @@ and this project adheres to### Added- ✨(backend) add file upload feature #1030+- ✨(frontend) custom background #1067## [1.9.0] - 2026-03-02diff --git a/env.d/development/common.dist b/env.d/development/common.distindex f3fe3e00..4dcc335c 100644--- a/env.d/development/common.dist+++ b/env.d/development/common.dist@@ -27,7 +27,7 @@ AWS_S3_DOMAIN_REPLACE=http://localhost:9000AWS_S3_ENDPOINT_URL=http://minio:9000AWS_S3_ACCESS_KEY_ID=meetAWS_S3_SECRET_ACCESS_KEY=password-MEDIA_BASE_URL=http://localhost:8083+MEDIA_BASE_URL=http://localhost:3000FILE_UPLOAD_ENABLED=True# OIDCdiff --git a/src/frontend/src/api/fetchApi.ts b/src/frontend/src/api/fetchApi.tsindex 3514b9b9..a3c5039d 100644--- a/src/frontend/src/api/fetchApi.ts+++ b/src/frontend/src/api/fetchApi.ts@@ -15,7 +15,19 @@ export const fetchApi = async <T = Record<string, unknown>>(...options?.headers,},})- const result = await response.json()++ let result: T+ if (response.status === 204) {+ result = undefined as T+ } else {+ const contentType = response.headers.get('content-type') ?? ''+ if (!contentType.includes('application/json')) {+ result = undefined as T+ } else {+ result = (await response.json()) as T+ }+ }+if (!response.ok) {throw new ApiError(response.status, result)}diff --git a/src/frontend/src/api/queryKeys.ts b/src/frontend/src/api/queryKeys.tsindex ccb21d29..13f2805e 100644--- a/src/frontend/src/api/queryKeys.ts+++ b/src/frontend/src/api/queryKeys.ts@@ -5,4 +5,5 @@ export const keys = {requestEntry: 'requestEntry',waitingParticipants: 'waitingParticipants',roomCreationCallback: 'roomCreationCallback',+ files: 'files',}diff --git a/src/frontend/src/api/useConfig.ts b/src/frontend/src/api/useConfig.tsindex 67a67738..e2a255e9 100644--- a/src/frontend/src/api/useConfig.ts+++ b/src/frontend/src/api/useConfig.ts@@ -30,6 +30,13 @@ export interface ApiConfig {expiration_days?: numbermax_duration?: number}+ background_image: {+ upload_is_enabled: boolean+ max_size: number+ max_count_by_user: number+ allowed_extensions: string[]+ allowed_mimetypes: string[]+ }subtitle: {enabled: boolean}diff --git a/src/frontend/src/features/files/api/createFile.ts b/src/frontend/src/features/files/api/createFile.tsnew file mode 100644index 00000000..3ffc6d39--- /dev/null+++ b/src/frontend/src/features/files/api/createFile.ts@@ -0,0 +1,90 @@+import { fetchApi } from '@/api/fetchApi'+import { useMutation, useQueryClient } from '@tanstack/react-query'+import { ApiFileItem } from '@/features/files/api/types.ts'+import { keys } from '@/api/queryKeys.ts'++/**+ * Upload a file, using XHR so we can report on progress through a handler.+ *+ * @param url The URL to PUT the file to.+ * @param file The file to upload.+ * @param progressHandler A handler that receives progress updates as a single integer `0 <= x <= 100`.+ */+export const uploadFile = (+ url: string,+ file: File,+ progressHandler: (progress: number) => void+) =>+ new Promise((resolve, reject) => {+ const xhr = new XMLHttpRequest()+ xhr.open('PUT', url)+ xhr.setRequestHeader('X-amz-acl', 'private')+ xhr.setRequestHeader('Content-Type', file.type)++ xhr.addEventListener('error', reject)+ xhr.addEventListener('abort', reject)++ xhr.addEventListener('readystatechange', () => {+ if (xhr.readyState === 4) {+ if (xhr.status === 200) {+ // Make sure to always set the progress to 100% when the upload is done.+ // Because 'progress' event listener is not called when the file size is 0.+ progressHandler(100)+ return resolve(true)+ }+ reject(new Error(`Failed to perform the upload on ${url}.`))+ }+ })++ xhr.upload.addEventListener('progress', (progressEvent) => {+ if (progressEvent.lengthComputable) {+ progressHandler(+ Math.floor((progressEvent.loaded / progressEvent.total) * 100)+ )+ }+ })++ xhr.send(file)+ })++/**+ * Asynchronously creates a new file and uploads it to the server.+ *+ * @param {object} params - The parameters for the file creation and upload process.+ * @param {File} params.file - The file object to be uploaded.+ * @param {function} params.onProgress - A callback function that receives the upload progress as a number (0 to 100).+ * @returns {Promise<ApiFileItem>} A promise that resolves when the file has been successfully uploaded and the server process is completed.+ */+export const createFile = async ({+ file,+ onProgress,+}: {+ file: File+ onProgress: (progress: number) => void+}): Promise<ApiFileItem> => {+ const res = await fetchApi<ApiFileItem>(`/files/`, {+ method: 'POST',+ body: JSON.stringify({ filename: file.name, type: 'background_image' }),+ })+ if (res.upload_state !== 'pending') {+ throw new Error('State should be pending right after creation')+ }+ const policy = res.policy+ await uploadFile(policy, file, onProgress)+ return await fetchApi<ApiFileItem>(`/files/${res.id}/upload-ended/`, {+ method: 'POST',+ })+}++export const useCreateFile = () => {+ const queryClient = useQueryClient()++ return useMutation({+ mutationFn: createFile,+ onSuccess: () => {+ queryClient.invalidateQueries({+ queryKey: [keys.files],+ })+ },+ })+}diff --git a/src/frontend/src/features/files/api/deleteFile.ts b/src/frontend/src/features/files/api/deleteFile.tsnew file mode 100644index 00000000..0fdd2bdc--- /dev/null+++ b/src/frontend/src/features/files/api/deleteFile.ts@@ -0,0 +1,33 @@+import { fetchApi } from '@/api/fetchApi'+import { useMutation, useQueryClient } from '@tanstack/react-query'+import { keys } from '@/api/queryKeys.ts'++/**+ * Deletes a file specified by its unique identifier.+ *+ * @param {Object} params - The parameters required for deleting the file.+ * @param {string} params.fileId - The unique identifier of the file to be deleted.+ * @returns {Promise<void>} A promise that resolves when the file is successfully deleted.+ */+export const deleteFile = async ({+ fileId,+}: {+ fileId: string+}): Promise<void> => {+ await fetchApi<void>(`/files/${fileId}/`, {+ method: 'DELETE',+ })+}++export const useDeleteFile = () => {+ const queryClient = useQueryClient()++ return useMutation({+ mutationFn: deleteFile,+ onSuccess: async () => {+ await queryClient.invalidateQueries({+ queryKey: [keys.files],+ })+ },+ })+}diff --git a/src/frontend/src/features/files/api/listFiles.ts b/src/frontend/src/features/files/api/listFiles.tsnew file mode 100644index 00000000..db57a4a1--- /dev/null+++ b/src/frontend/src/features/files/api/listFiles.ts@@ -0,0 +1,70 @@+import { fetchApi } from '@/api/fetchApi'+import { keepPreviousData, useQuery } from '@tanstack/react-query'+import { keys } from '@/api/queryKeys'+import {+ ApiFileItem,+ ApiFileType,+ ApiFileUploadState,+} from '@/features/files/api/types.ts'+import { useUser } from '@/features/auth'+import { useConfig } from '@/api/useConfig.ts'++type ListFilesResponse = {+ count: number+ next: string | null+ previous: string | null+ results: ApiFileItem[]+}++type ListFilesFilters = {+ is_creator_me?: boolean+ type?: ApiFileType+ upload_state?: ApiFileUploadState+ is_deleted?: boolean+}++export type ListFilesParams = {+ filters?: ListFilesFilters+ pagination: {+ page: number+ pageSize: number+ }+}++export const listMyFiles = async ({+ filters = {},+ pagination: { page, pageSize },+}: ListFilesParams): Promise<ListFilesResponse> => {+ const query = new URLSearchParams()+ query.append('page', page.toString())+ query.append('page_size', pageSize.toString())+ if (filters?.is_creator_me ?? true) {+ query.append('is_creator_me', 'true')+ }+ if (filters?.type) {+ query.append('type', filters.type)+ }+ if (filters?.upload_state) {+ query.append('upload_state', filters.upload_state)+ }+ if (typeof filters?.is_deleted === 'boolean') {+ query.append('is_deleted', filters.is_deleted ? 'true' : 'false')+ }++ return fetchApi<ListFilesResponse>(`/files?${query.toString()}`, {+ method: 'GET',+ })+}++export const useListMyFiles = (params: Parameters<typeof listMyFiles>[0]) => {+ const { isLoggedIn } = useUser()+ const { data: appConfig } = useConfig()+ return useQuery({+ queryKey: [keys.files, params],+ queryFn: () => listMyFiles(params),+ refetchOnMount: 'always',+ placeholderData: keepPreviousData,+ enabled:+ isLoggedIn && appConfig?.background_image?.upload_is_enabled === true,+ })+}diff --git a/src/frontend/src/features/files/api/types.ts b/src/frontend/src/features/files/api/types.tsnew file mode 100644index 00000000..5c7891d6--- /dev/null+++ b/src/frontend/src/features/files/api/types.ts@@ -0,0 +1,34 @@+export type ApiFileCreator = {+ id: string // UUID+ full_name: string | null+ short_name: string | null+}++export type ApiFileType = 'background_image'+export type ApiFileUploadState = 'pending' | 'ready'++export type ApiFileItem = {+ id: string // UUID+ created_at: string // ISO datetime string+ updated_at: string // ISO datetime string+ title: string+ type: ApiFileType+ creator: ApiFileCreator+ deleted_at: string | null+ hard_deleted_at: string | null+ filename: string+ upload_state: ApiFileUploadState+ mimetype: string // e.g. "image/png"+ size: number // file size in bytes+ description: string | null+} & (+ | {+ upload_state: 'ready'+ url: string+ }+ | {+ upload_state: 'pending'+ policy: string+ url: null+ }+)diff --git a/src/frontend/src/features/rooms/components/Conference.tsx b/src/frontend/src/features/rooms/components/Conference.tsxindex 496cce6d..d7c5b5f1 100644--- a/src/frontend/src/features/rooms/components/Conference.tsx+++ b/src/frontend/src/features/rooms/components/Conference.tsx@@ -215,8 +215,8 @@ export const Conference = ({audio={userConfig.audioEnabled}video={userConfig.videoEnabled && {- processor: BackgroundProcessorFactory.deserializeProcessor(- userConfig.processorSerialized+ processor: BackgroundProcessorFactory.fromProcessorConfig(+ userConfig.processorConfig),}}diff --git a/src/frontend/src/features/rooms/components/Join.tsx b/src/frontend/src/features/rooms/components/Join.tsxindex 09668b09..77b99785 100644--- a/src/frontend/src/features/rooms/components/Join.tsx+++ b/src/frontend/src/features/rooms/components/Join.tsx@@ -4,15 +4,15 @@ import { css } from '@/styled-system/css'import { Screen } from '@/layout/Screen'import { useEffect, useMemo, useRef, useState } from 'react'import {- createLocalVideoTrack,createLocalAudioTrack,+ createLocalVideoTrack,LocalAudioTrack,LocalVideoTrack,Track,} from 'livekit-client'import { H } from '@/primitives/H'import { Field } from '@/primitives/Field'-import { Button, Dialog, Text, Form } from '@/primitives'+import { Button, Dialog, Form, Text } from '@/primitives'import { VStack } from '@/styled-system/jsx'import { Heading } from 'react-aria-components'import { RiImageCircleAiFill } from '@remixicon/react'@@ -44,8 +44,7 @@ const onError = (e: Error) => console.error('ERROR', e)const Effects = ({videoTrack,- onSubmit,-}: Pick<EffectsConfigurationProps, 'videoTrack' | 'onSubmit'>) => {+}: Pick<EffectsConfigurationProps, 'videoTrack'>) => {const { t } = useTranslation('rooms', { keyPrefix: 'join.effects' })const [isDialogOpen, setIsDialogOpen] = useState(false)const openDialog = () => setIsDialogOpen(true)@@ -81,7 +80,7 @@ const Effects = ({>{t('subTitle')}</Text>- <EffectsConfiguration videoTrack={videoTrack} onSubmit={onSubmit} />+ <EffectsConfiguration videoTrack={videoTrack} /></Dialog><Buttonvariant="whiteCircle"@@ -111,7 +110,7 @@ export const Join = ({audioDeviceId,audioOutputDeviceId,videoDeviceId,- processorSerialized,+ processorConfig,username,},saveAudioInputEnabled,@@ -120,7 +119,6 @@ export const Join = ({saveAudioInputDeviceId,saveVideoInputDeviceId,saveUsername,- saveProcessorSerialized,} = usePersistentUserChoices()const initialUserChoices = useRef<LocalUserChoices | null>(null)@@ -132,7 +130,7 @@ export const Join = ({audioDeviceId,audioOutputDeviceId,videoDeviceId,- processorSerialized,+ processorConfig,username,}}@@ -146,8 +144,8 @@ export const Join = ({video: !!initialUserChoices.current &&initialUserChoices.current?.videoEnabled && {deviceId: initialUserChoices.current.videoDeviceId,- processor: BackgroundProcessorFactory.deserializeProcessor(- initialUserChoices.current.processorSerialized+ processor: BackgroundProcessorFactory.fromProcessorConfig(+ initialUserChoices.current.processorConfig),},},@@ -186,9 +184,7 @@ export const Join = ({const track = await createLocalVideoTrack({deviceId: { exact: videoDeviceId },processor:- BackgroundProcessorFactory.deserializeProcessor(- processorSerialized- ),+ BackgroundProcessorFactory.fromProcessorConfig(processorConfig),})setDynamicVideoTrack(track)} catch (error) {@@ -207,7 +203,7 @@ export const Join = ({}, [videoEnabled,videoDeviceId,- processorSerialized,+ processorConfig,previewVideoTrack,dynamicVideoTrack,])@@ -690,12 +686,7 @@ export const Join = ({zIndex: '1',})}>- <Effects- videoTrack={videoTrack}- onSubmit={(processor) =>- saveProcessorSerialized(processor?.serialize())- }- />+ <Effects videoTrack={videoTrack} /></div></div></div>diff --git a/src/frontend/src/features/rooms/livekit/components/blur/BackgroundCustomProcessor.ts b/src/frontend/src/features/rooms/livekit/components/blur/BackgroundCustomProcessor.tsindex 4b1e1ce1..fd460218 100644--- a/src/frontend/src/features/rooms/livekit/components/blur/BackgroundCustomProcessor.ts+++ b/src/frontend/src/features/rooms/livekit/components/blur/BackgroundCustomProcessor.ts@@ -11,11 +11,7 @@ import {TIMEOUT_TICK,timerWorkerScript,} from './TimerWorker'-import {- BackgroundProcessorInterface,- BackgroundOptions,- ProcessorType,-} from '.'+import { BackgroundProcessorInterface, ProcessorConfig, ProcessorType } from '.'const PROCESSING_WIDTH = 256const PROCESSING_HEIGHT = 144@@ -33,7 +29,7 @@ const DEFAULT_BLUR = '10'* MediaStreamTrackProcessor.*/export class BackgroundCustomProcessor implements BackgroundProcessorInterface {- options: BackgroundOptions+ options: ProcessorConfigname: stringprocessedTrack?: MediaStreamTrack | undefined@@ -64,15 +60,10 @@ export class BackgroundCustomProcessor implements BackgroundProcessorInterface {type: ProcessorTypevirtualBackgroundImage?: HTMLImageElement- constructor(opts: BackgroundOptions) {+ constructor(opts: ProcessorConfig) {this.name = 'blur'this.options = opts-- if (this.options.blurRadius) {- this.type = ProcessorType.BLUR- } else {- this.type = ProcessorType.VIRTUAL- }+ this.type = opts.type}static get isSupported() {@@ -107,6 +98,12 @@ export class BackgroundCustomProcessor implements BackgroundProcessorInterface {}_initVirtualBackgroundImage() {+ if (this.options.type !== 'virtual') {+ throw new Error(+ 'Virtual background is only supported for virtual background'+ )+ }+const needsUpdate =this.options.imagePath &&this.virtualBackgroundImage &&@@ -118,7 +115,7 @@ export class BackgroundCustomProcessor implements BackgroundProcessorInterface {}}- async update(opts: BackgroundOptions): Promise<void> {+ async update(opts: ProcessorConfig): Promise<void> {this.options = optsthis._initVirtualBackgroundImage()}@@ -212,6 +209,9 @@ export class BackgroundCustomProcessor implements BackgroundProcessorInterface {* TODO: future improvement with WebGL.*/async blur() {+ if (this.options.type !== 'blur') {+ throw new Error('Blurring is only supported for blur background')+ }const mask = this.imageSegmenterResult!.categoryMask!.getAsUint8Array()for (let i = 0; i < mask.length; ++i) {this.segmentationMask!.data[i * 4 + 3] = 255 - mask[i]@@ -293,7 +293,7 @@ export class BackgroundCustomProcessor implements BackgroundProcessorInterface {await this.sizeSource()await this.segment()- if (this.options.blurRadius) {+ if (this.options.type === 'blur') {await this.blur()} else {await this.drawVirtualBackground()@@ -354,15 +354,4 @@ export class BackgroundCustomProcessor implements BackgroundProcessorInterface {this.timerWorker?.terminate()this.imageSegmenter?.close()}-- clone() {- return new BackgroundCustomProcessor(this.options)- }-- serialize() {- return {- type: this.type,- options: this.options,- }- }}diff --git a/src/frontend/src/features/rooms/livekit/components/blur/FaceLandmarksProcessor.ts b/src/frontend/src/features/rooms/livekit/components/blur/FaceLandmarksProcessor.tsindex 7e59d334..887e2e0a 100644--- a/src/frontend/src/features/rooms/livekit/components/blur/FaceLandmarksProcessor.ts+++ b/src/frontend/src/features/rooms/livekit/components/blur/FaceLandmarksProcessor.ts@@ -332,15 +332,4 @@ export class FaceLandmarksProcessor implements TrackProcessor<Track.Kind> {this.timerWorker?.terminate()this.faceLandmarker?.close()}-- clone() {- return new FaceLandmarksProcessor(this.options)- }-- serialize() {- return {- type: this.type,- options: this.options,- }- }}diff --git a/src/frontend/src/features/rooms/livekit/components/blur/UnifiedBackgroundTrackProcessor.ts b/src/frontend/src/features/rooms/livekit/components/blur/UnifiedBackgroundTrackProcessor.tsindex a51c47f4..4d2f30f7 100644--- a/src/frontend/src/features/rooms/livekit/components/blur/UnifiedBackgroundTrackProcessor.ts+++ b/src/frontend/src/features/rooms/livekit/components/blur/UnifiedBackgroundTrackProcessor.ts@@ -1,28 +1,23 @@import { ProcessorOptions, Track } from 'livekit-client'import {BackgroundBlur,- BackgroundTransformer,ProcessorWrapper,VirtualBackground,} from '@livekit/track-processors'-import {- BackgroundOptions,- BackgroundProcessorInterface,- ProcessorType,-} from '.'+import { ProcessorConfig, BackgroundProcessorInterface, ProcessorType } from '.'export class UnifiedBackgroundTrackProcessor implements BackgroundProcessorInterface {- processor: ProcessorWrapper<BackgroundOptions>- opts: BackgroundOptions+ processor: ProcessorWrapper<{ imagePath?: string; blurRadius?: number }>+ opts: ProcessorConfigprocessorType: ProcessorType- constructor(opts: BackgroundOptions) {+ constructor(opts: ProcessorConfig) {this.opts = opts- if (opts.imagePath) {+ if (opts.type === 'virtual') {this.processorType = ProcessorType.VIRTUALthis.processor = VirtualBackground(opts.imagePath)- } else if (opts.blurRadius !== undefined) {+ } else if (opts.type === 'blur') {this.processorType = ProcessorType.BLURthis.processor = BackgroundBlur(opts.blurRadius)} else {@@ -44,24 +39,23 @@ export class UnifiedBackgroundTrackProcessor implements BackgroundProcessorInterreturn this.processor.destroy()}- async update(opts: BackgroundOptions): Promise<void> {- const newProcessorType = opts.imagePath- ? ProcessorType.VIRTUAL- : ProcessorType.BLUR+ async update(opts: ProcessorConfig): Promise<void> {+ this.opts = opts++ const newProcessorType =+ opts.type === 'virtual' ? ProcessorType.VIRTUAL : ProcessorType.BLUR- let processedOpts = optsif (newProcessorType !== this.processorType) {this.processorType = newProcessorTypeif (newProcessorType === ProcessorType.VIRTUAL) {this.processor.name = 'virtual-background'- processedOpts = { ...opts, blurRadius: undefined }} else {this.processor.name = 'background-blur'- processedOpts = { ...opts, imagePath: undefined }}}- await this.processor.updateTransformerOptions(processedOpts)- this.opts = processedOpts+ await this.processor.updateTransformerOptions(+ opts as { imagePath?: string; blurRadius?: number }+ )}get name() {@@ -73,17 +67,6 @@ export class UnifiedBackgroundTrackProcessor implements BackgroundProcessorInter}get options() {- return (this.processor.transformer as BackgroundTransformer).options- }-- clone() {- return new UnifiedBackgroundTrackProcessor(this.options || this.opts)- }-- serialize() {- return {- type: this.processorType,- options: this.options,- }+ return this.opts}}diff --git a/src/frontend/src/features/rooms/livekit/components/blur/index.ts b/src/frontend/src/features/rooms/livekit/components/blur/index.tsindex 9d5526a1..13271b31 100644--- a/src/frontend/src/features/rooms/livekit/components/blur/index.ts+++ b/src/frontend/src/features/rooms/livekit/components/blur/index.ts@@ -2,23 +2,7 @@ import { ProcessorWrapper } from '@livekit/track-processors'import { Track, TrackProcessor } from 'livekit-client'import { BackgroundCustomProcessor } from './BackgroundCustomProcessor'import { UnifiedBackgroundTrackProcessor } from './UnifiedBackgroundTrackProcessor'--export type BackgroundOptions = {- blurRadius?: number- imagePath?: string-}--export interface ProcessorSerialized {- type: ProcessorType- options: BackgroundOptions-}--export interface BackgroundProcessorInterface extends TrackProcessor<Track.Kind> {- update(opts: BackgroundOptions): Promise<void>- options: BackgroundOptions- clone(): BackgroundProcessorInterface- serialize(): ProcessorSerialized-}+import { FaceLandmarksOptions } from './FaceLandmarksProcessor'export enum ProcessorType {BLUR = 'blur',@@ -26,6 +10,16 @@ export enum ProcessorType {FACE_LANDMARKS = 'faceLandmarks',}+export type ProcessorConfig =+ | { type: ProcessorType.BLUR; blurRadius: number }+ | { type: ProcessorType.VIRTUAL; imagePath: string; fileId?: string }+ | ({ type: ProcessorType.FACE_LANDMARKS } & FaceLandmarksOptions)++export interface BackgroundProcessorInterface extends TrackProcessor<Track.Kind> {+ update(opts: ProcessorConfig): Promise<void>+ options: ProcessorConfig+}+export class BackgroundProcessorFactory {static hasModernApiSupport() {return ProcessorWrapper.hasModernApiSupport@@ -36,28 +30,27 @@ export class BackgroundProcessorFactory {}static getProcessor(- type: ProcessorType,- opts: BackgroundOptions+ config: ProcessorConfig): BackgroundProcessorInterface | undefined {- const isBlur = type === ProcessorType.BLUR- const isVirtual = type === ProcessorType.VIRTUAL+ const isBlur = config.type === ProcessorType.BLUR+ const isVirtual = config.type === ProcessorType.VIRTUALif (!isBlur && !isVirtual) return undefinedif (ProcessorWrapper.isSupported) {- return new UnifiedBackgroundTrackProcessor(opts)+ return new UnifiedBackgroundTrackProcessor(config)}if (BackgroundCustomProcessor.isSupported) {- return new BackgroundCustomProcessor(opts)+ return new BackgroundCustomProcessor(config)}return undefined}- static deserializeProcessor(data?: ProcessorSerialized) {- if (data?.type) {- return BackgroundProcessorFactory.getProcessor(data?.type, data?.options)+ static fromProcessorConfig(data?: ProcessorConfig) {+ if (data) {+ return BackgroundProcessorFactory.getProcessor(data)}return undefined}diff --git a/src/frontend/src/features/rooms/livekit/components/controls/Device/VideoDeviceControl.tsx b/src/frontend/src/features/rooms/livekit/components/controls/Device/VideoDeviceControl.tsxindex 918bab5e..4c1a92d8 100644--- a/src/frontend/src/features/rooms/livekit/components/controls/Device/VideoDeviceControl.tsx+++ b/src/frontend/src/features/rooms/livekit/components/controls/Device/VideoDeviceControl.tsx@@ -82,8 +82,8 @@ export const VideoDeviceControl = ({** See https://github.com/numerique-gouv/meet/pull/309#issuecomment-2622404121*/- const processor = BackgroundProcessorFactory.deserializeProcessor(- userChoices.processorSerialized+ const processor = BackgroundProcessorFactory.fromProcessorConfig(+ userChoices.processorConfig)const toggle = trackProps.toggle as (diff --git a/src/frontend/src/features/rooms/livekit/components/effects/Effects.tsx b/src/frontend/src/features/rooms/livekit/components/effects/Effects.tsxindex 0fe7a432..31d595dd 100644--- a/src/frontend/src/features/rooms/livekit/components/effects/Effects.tsx+++ b/src/frontend/src/features/rooms/livekit/components/effects/Effects.tsx@@ -2,14 +2,12 @@ import { useLocalParticipant } from '@livekit/components-react'import { LocalVideoTrack } from 'livekit-client'import { css } from '@/styled-system/css'import { EffectsConfiguration } from './EffectsConfiguration'-import { usePersistentUserChoices } from '../../hooks/usePersistentUserChoices'import { useCanPublishTrack } from '@/features/rooms/livekit/hooks/useCanPublishTrack'import { TrackSource } from '@livekit/protocol'export const Effects = () => {const { cameraTrack } = useLocalParticipant()const localCameraTrack = cameraTrack?.track as LocalVideoTrack- const { saveProcessorSerialized } = usePersistentUserChoices()const canPublishCamera = useCanPublishTrack(TrackSource.CAMERA)@@ -24,9 +22,6 @@ export const Effects = () => {isDisabled={!canPublishCamera}videoTrack={localCameraTrack}layout="vertical"- onSubmit={(processor) =>- saveProcessorSerialized(processor?.serialize())- }/></div>)diff --git a/src/frontend/src/features/rooms/livekit/components/effects/EffectsConfiguration.tsx b/src/frontend/src/features/rooms/livekit/components/effects/EffectsConfiguration.tsxindex 9f301eae..01db78b6 100644--- a/src/frontend/src/features/rooms/livekit/components/effects/EffectsConfiguration.tsx+++ b/src/frontend/src/features/rooms/livekit/components/effects/EffectsConfiguration.tsx@@ -1,16 +1,16 @@import { LocalVideoTrack, Track } from 'livekit-client'-import { useEffect, useRef, useState } from 'react'+import { useCallback, useEffect, useMemo, useRef, useState } from 'react'import { useTranslation } from 'react-i18next'import {- BackgroundOptions,BackgroundProcessorFactory,BackgroundProcessorInterface,+ ProcessorConfig,ProcessorType,} from '../blur'import { css } from '@/styled-system/css'-import { H, P, Text, ToggleButton } from '@/primitives'+import { Button, Dialog, H, P, Text, ToggleButton } from '@/primitives'import { VisualOnlyTooltip } from '@/primitives/VisualOnlyTooltip'-import { styled } from '@/styled-system/jsx'+import { HStack, styled } from '@/styled-system/jsx'import { BlurOn } from '@/components/icons/BlurOn'import { BlurOnStrong } from '@/components/icons/BlurOnStrong'import { useTrackToggle } from '@livekit/components-react'@@ -19,6 +19,19 @@ import { useSyncAfterDelay } from '@/hooks/useSyncAfterDelay'import { FunnyEffects } from './FunnyEffects'import { useHasFunnyEffectsAccess } from '../../hooks/useHasFunnyEffectsAccess'import { useScreenReaderAnnounce } from '@/hooks/useScreenReaderAnnounce'+import {+ ListFilesParams,+ useListMyFiles,+} from '@/features/files/api/listFiles.ts'+import { useCreateFile } from '@/features/files/api/createFile.ts'+import { FileTrigger } from 'react-aria-components'+import { RiDeleteBinLine, RiImageAddFill } from '@remixicon/react'+import { useDeleteFile } from '@/features/files/api/deleteFile.ts'+import { useUser } from '@/features/auth'+import { ApiFileItem } from '@/features/files/api/types.ts'+import { useConfig } from '@/api/useConfig.ts'+import { usePersistentUserChoices } from '@/features/rooms/livekit/hooks/usePersistentUserChoices.ts'+import { proxy, useSnapshot } from 'valtio'enum BlurRadius {NONE = 0,@@ -40,14 +53,51 @@ const Information = styled('div', {export type EffectsConfigurationProps = {isDisabled?: booleanvideoTrack: LocalVideoTrack- onSubmit?: (processor?: BackgroundProcessorInterface) => voidlayout?: 'vertical' | 'horizontal'}+const listFilesQueryParams: ListFilesParams = {+ filters: {+ type: 'background_image',+ upload_state: 'ready',+ is_creator_me: true,+ is_deleted: false,+ },+ pagination: {+ page: 1,+ pageSize: 20,+ },+}++function deriveIdFromProcessorConfig(config: ProcessorConfig) {+ if (config.type === ProcessorType.BLUR) {+ return `blur-${config.blurRadius}`+ } else if (config.type === ProcessorType.VIRTUAL) {+ // the imagePath is not stable for custom backgrounds+ // so we try first with the fileId+ if (config.fileId) {+ return `virtual-${config.fileId}`+ }+ return `virtual-${config.imagePath}`+ } else if (config.type === ProcessorType.FACE_LANDMARKS) {+ return 'face-landmarks'+ }+ throw new Error(`Unknown config type in config: ${config}`)+}++// We use a valtio store so that the state is persisted between the join room+// and the actual room+const uploadNotPossibleLocalState = proxy({+ imageBackgroundConfig: null as null | {+ type: ProcessorType.VIRTUAL+ imagePath: string+ label: string+ },+})+export const EffectsConfiguration = ({isDisabled,videoTrack,- onSubmit,layout = 'horizontal',}: EffectsConfigurationProps) => {const videoRef = useRef<HTMLVideoElement>(null)@@ -63,204 +113,398 @@ export const EffectsConfiguration = ({> | null>(null)const effectAnnouncementId = useRef(0)- useEffect(() => {- const videoElement = videoRef.current- if (!videoElement) return+ const {+ saveProcessorConfig,+ userChoices: { processorConfig },+ } = usePersistentUserChoices()- const attachVideoTrack = async () => videoTrack?.attach(videoElement)- attachVideoTrack()-- return () => {- if (!videoElement) return- videoTrack.detach(videoElement)- }- }, [videoTrack, videoTrack?.isMuted])+ const selectedId = useMemo(+ () =>+ processorConfig ? deriveIdFromProcessorConfig(processorConfig) : 'none',+ [processorConfig]+ )- useEffect(() => {- if (!blurLightRef.current) return+ const uploadNotPossibleSnap = useSnapshot(uploadNotPossibleLocalState)- const rafId = requestAnimationFrame(() => {- blurLightRef.current?.focus({ preventScroll: true })- })+ const announceEffectStatusMessage = useCallback(+ (message: string) => {+ effectAnnouncementId.current += 1+ const currentId = effectAnnouncementId.current- return () => {- cancelAnimationFrame(rafId)- }- }, [])-- useEffect(- () => () => {if (effectAnnouncementTimeout.current) {clearTimeout(effectAnnouncementTimeout.current)}++ effectAnnouncementTimeout.current = setTimeout(() => {+ if (currentId !== effectAnnouncementId.current) return+ announce(message)+ }, 80)},- []+ [announce])- const announceEffectStatusMessage = (message: string) => {- effectAnnouncementId.current += 1- const currentId = effectAnnouncementId.current+ const getVirtualBackgroundName = useCallback(+ (imagePath?: string) => {+ if (!imagePath) return ''+ const match = imagePath.match(/\/backgrounds\/(\d+)\.jpg$/)+ if (!match) return ''+ const index = Number(match[1]) - 1+ if (Number.isNaN(index)) return ''+ return t(`virtual.presets.descriptions.${index}`)+ },+ [t]+ )- if (effectAnnouncementTimeout.current) {- clearTimeout(effectAnnouncementTimeout.current)- }+ const updateEffectStatusMessage = useCallback(+ (config: ProcessorConfig, wasSelectedBeforeToggle: boolean) => {+ if (wasSelectedBeforeToggle) {+ announceEffectStatusMessage(t('blur.status.none'))+ return+ }- effectAnnouncementTimeout.current = setTimeout(() => {- if (currentId !== effectAnnouncementId.current) return- announce(message)- }, 80)- }+ if (config.type === ProcessorType.BLUR) {+ const message =+ config.blurRadius === BlurRadius.LIGHT+ ? t('blur.status.light')+ : t('blur.status.strong')+ announceEffectStatusMessage(message)+ return+ }- const clearEffect = async () => {- await videoTrack.stopProcessor()- onSubmit?.(undefined)- }+ if (config.type === ProcessorType.VIRTUAL) {+ const backgroundName = getVirtualBackgroundName(config.imagePath)+ if (backgroundName) {+ announceEffectStatusMessage(+ `${t('virtual.selectedLabel')} ${backgroundName}`+ )+ return+ }+ }+ },+ [announceEffectStatusMessage, getVirtualBackgroundName, t]+ )- const getVirtualBackgroundName = (imagePath?: string) => {- if (!imagePath) return ''- const match = imagePath.match(/\/backgrounds\/(\d+)\.jpg$/)- if (!match) return ''- const index = Number(match[1]) - 1- if (Number.isNaN(index)) return ''- return t(`virtual.descriptions.${index}`)- }+ const toggleEffect = useCallback(+ async (config: ProcessorConfig) => {+ setProcessorPending(true)+ const wasSelectedBeforeToggle =+ selectedId === deriveIdFromProcessorConfig(config)++ if (!videoTrack) {+ /**+ * Special case: if no video track is available, then we must pass directly the processor into the+ * toggle call. Otherwise, the rest of the function below would not have a videoTrack to call+ * setProcessor on.+ *+ * We arrive in this condition when we enter the room with the camera already off.+ */+ const newProcessorTmp = BackgroundProcessorFactory.getProcessor(config)!+ await toggle(true, {+ processor: newProcessorTmp,+ })+ setTimeout(() => setProcessorPending(false))+ return+ }- const updateEffectStatusMessage = (- type: ProcessorType,- options: BackgroundOptions,- wasSelectedBeforeToggle: boolean- ) => {- if (wasSelectedBeforeToggle) {- announceEffectStatusMessage(t('blur.status.none'))- return- }+ if (!enabled) {+ await toggle(true)+ }- if (type === ProcessorType.BLUR) {- const message =- options.blurRadius === BlurRadius.LIGHT- ? t('blur.status.light')- : t('blur.status.strong')- announceEffectStatusMessage(message)- return- }+ const processor =+ videoTrack?.getProcessor() as BackgroundProcessorInterface+ try {+ if (wasSelectedBeforeToggle) {+ // Stop processor.+ await videoTrack.stopProcessor()+ saveProcessorConfig(undefined)+ } else if (+ !processor ||+ (processor.options.type !== config.type &&+ !BackgroundProcessorFactory.hasModernApiSupport())+ ) {+ // Change processor.+ const newProcessor = BackgroundProcessorFactory.getProcessor(config)!+ // IMPORTANT: Must explicitly stop previous processor before setting a new one+ // in browsers without modern API support to prevent UI crashes.+ // This workaround is needed until this issue is resolved:+ // https://github.com/livekit/track-processors-js/issues/85+ if (!BackgroundProcessorFactory.hasModernApiSupport()) {+ await videoTrack.stopProcessor()+ }+ await videoTrack.setProcessor(newProcessor)+ saveProcessorConfig(config)+ } else {+ await processor?.update(config)+ saveProcessorConfig(config)+ }- if (type === ProcessorType.VIRTUAL) {- const backgroundName = getVirtualBackgroundName(options.imagePath)- if (backgroundName) {- announceEffectStatusMessage(- `${t('virtual.selectedLabel')} ${backgroundName}`- )- return+ updateEffectStatusMessage(config, wasSelectedBeforeToggle)+ } catch (error) {+ console.error('Error applying effect:', error)+ } finally {+ // Without setTimeout the DOM is not refreshing when updating the options.+ setTimeout(() => setProcessorPending(false))}- }- }-- const toggleEffect = async (- type: ProcessorType,- options: BackgroundOptions- ) => {- setProcessorPending(true)- const wasSelectedBeforeToggle = isSelected(type, options)-- if (!videoTrack) {- /**- * Special case: if no video track is available, then we must pass directly the processor into the- * toggle call. Otherwise, the rest of the function below would not have a videoTrack to call- * setProcessor on.- *- * We arrive in this condition when we enter the room with the camera already off.- */- const newProcessorTmp = BackgroundProcessorFactory.getProcessor(- type,- options- )!- await toggle(true, {- processor: newProcessorTmp,- })- setTimeout(() => setProcessorPending(false))- return- }+ },+ [+ enabled,+ saveProcessorConfig,+ selectedId,+ toggle,+ updateEffectStatusMessage,+ videoTrack,+ ]+ )- if (!enabled) {- await toggle(true)- }+ const { data: appConfig } = useConfig()+ const { isLoggedIn } = useUser()+ const canUploadBackground =+ isLoggedIn === true &&+ appConfig?.background_image?.upload_is_enabled === true+ // We split the error state in 2 parts so that there are no visual glitches when closing the alert+ const [personalBackgroundHasError, setPersonalBackgroundHasError] =+ useState<boolean>(false)+ const [personalBackgroundError, setPersonalBackgroundError] = useState<+ 'file_too_large' | 'invalid_file_type' | null+ >(null)+ const createFileMutation = useCreateFile()+ const deleteFileMutation = useDeleteFile()+ const filesQ = useListMyFiles(listFilesQueryParams)+ const hasReachedMaxNbBackgrounds =+ (canUploadBackground &&+ appConfig &&+ filesQ.data &&+ filesQ.data.count >= appConfig.background_image.max_count_by_user) ??+ false++ const getHandleSelectChangeFile = useCallback(+ (file: ApiFileItem) => {+ return async () => {+ await toggleEffect({+ type: ProcessorType.VIRTUAL,+ imagePath: file.url!,+ fileId: file.id,+ })+ }+ },+ [toggleEffect]+ )- const processor = getProcessor()- try {- if (wasSelectedBeforeToggle) {- // Stop processor.- await clearEffect()- } else if (- !processor ||- (processor.serialize().type !== type &&- !BackgroundProcessorFactory.hasModernApiSupport())+ const handleNewBackgroundFilePicked = useCallback(+ async (file: File) => {+ if (+ !(+ appConfig?.background_image?.allowed_mimetypes?.includes(file.type) ??+ false+ )) {- // Change processor.- const newProcessor = BackgroundProcessorFactory.getProcessor(- type,- options- )!- // IMPORTANT: Must explicitly stop previous processor before setting a new one- // in browsers without modern API support to prevent UI crashes.- // This workaround is needed until this issue is resolved:- // https://github.com/livekit/track-processors-js/issues/85- if (!BackgroundProcessorFactory.hasModernApiSupport()) {- await videoTrack.stopProcessor()+ setPersonalBackgroundError('invalid_file_type')+ setPersonalBackgroundHasError(true)+ return+ }+ if (file.size > (appConfig?.background_image?.max_size ?? 0)) {+ setPersonalBackgroundError('file_too_large')+ setPersonalBackgroundHasError(true)+ return+ }++ // When the user is not logged in, we fallback to just loading that image+ if (!canUploadBackground) {+ // For the preview to work, we somehow need to create a data URL from the raw file.+ // revoking is handled with userChoicesStore+ if (uploadNotPossibleSnap.imageBackgroundConfig) {+ URL.revokeObjectURL(+ uploadNotPossibleSnap.imageBackgroundConfig.imagePath+ )+ }+ const imagePath = URL.createObjectURL(file)++ const fileId = `local-image`+ await toggleEffect({+ type: ProcessorType.VIRTUAL,+ imagePath,+ fileId,+ })+ uploadNotPossibleLocalState.imageBackgroundConfig = {+ type: ProcessorType.VIRTUAL,+ label: file.name.split('.')[0],+ imagePath,}- await videoTrack.setProcessor(newProcessor)- onSubmit?.(newProcessor)} else {- await processor?.update(options)- // We want to trigger onSubmit when options changes so the parent component is aware of it.- onSubmit?.(processor)+ // Otherwise we create the file in the backend and automatically select it+ // when it's uploaded.+ createFileMutation.mutate(+ {+ file,+ onProgress: (progress) => {+ console.debug('upload-progress', progress)+ },+ },+ {+ onSuccess: (file) => {+ // We automatically select that created file+ getHandleSelectChangeFile(file)()+ },+ }+ )}+ },+ [+ appConfig?.background_image?.allowed_mimetypes,+ appConfig?.background_image?.max_size,+ canUploadBackground,+ createFileMutation,+ getHandleSelectChangeFile,+ toggleEffect,+ uploadNotPossibleSnap.imageBackgroundConfig,+ ]+ )- updateEffectStatusMessage(type, options, wasSelectedBeforeToggle)- } catch (error) {- console.error('Error applying effect:', error)- } finally {- // Without setTimeout the DOM is not refreshing when updating the options.- setTimeout(() => setProcessorPending(false))+ const filePickerErrorContext = useMemo(+ () => ({+ allowedExtension: appConfig?.background_image?.allowed_extensions ?? [],+ maxSize: (appConfig?.background_image?.max_size ?? 0) / (1024 * 1024),+ }),+ [appConfig?.background_image]+ )++ const processorOptions = useMemo<{+ isDisabled: boolean+ blurBased: {+ radius: BlurRadius+ Icon: React.FC+ ref?: React.Ref<HTMLButtonElement>+ tooltip: string+ id: string+ config: ProcessorConfig+ isSelected: boolean+ }[]+ virtualBackgrounds: {+ id: string+ config: ProcessorConfig+ isSelected: boolean+ tooltip: string+ ariaLabel: string+ thumbnailPath: string+ index: number+ }[]+ remoteCustomVirtualBackgrounds: {+ id: string+ config: ProcessorConfig+ isSelected: boolean+ tooltip: string+ file: ApiFileItem+ }[]+ }>(() => {+ return {+ isDisabled: (processorPendingReveal || isDisabled) ?? false,+ blurBased: [+ {+ key: 'light',+ radius: BlurRadius.LIGHT,+ icon: BlurOn,+ ref: blurLightRef,+ },+ {+ key: 'normal',+ radius: BlurRadius.NORMAL,+ icon: BlurOnStrong,+ ref: undefined,+ },+ ].map((item) => {+ const config: ProcessorConfig = {+ type: ProcessorType.BLUR,+ blurRadius: item.radius,+ }+ const id = deriveIdFromProcessorConfig(config)+ return {+ id,+ tooltip: t(`blur.light.${selectedId === id ? 'clear' : 'apply'}`),+ radius: item.radius,+ isSelected: selectedId === id,+ Icon: item.icon,+ ref: item.ref,+ config,+ }+ }),+ virtualBackgrounds: [...Array(8).keys()].map((index) => {+ const imagePath = `/assets/backgrounds/${index + 1}.jpg`+ const thumbnailPath = `/assets/backgrounds/thumbnails/${index + 1}.jpg`+ const config: ProcessorConfig = {+ type: ProcessorType.VIRTUAL,+ imagePath,+ }+ const id = deriveIdFromProcessorConfig(config)+ const isSelected = selectedId === id+ const prefix = isSelected ? 'selectedLabel' : 'apply'+ const backgroundName = t(`virtual.presets.descriptions.${index}`)+ const ariaLabel = `${t(`virtual.presets.${prefix}`)} ${backgroundName}`++ return {+ tooltip: backgroundName,+ id,+ config,+ isSelected: selectedId === id,+ thumbnailPath,+ ariaLabel,+ index,+ }+ }),+ remoteCustomVirtualBackgrounds: (filesQ.data?.results ?? [])+ .filter((file) => file.url)+ .map((file) => {+ const config: ProcessorConfig = {+ type: ProcessorType.VIRTUAL,+ imagePath: file.url!,+ fileId: file.id,+ }++ const id = deriveIdFromProcessorConfig(config)++ return {+ tooltip: file.title,+ id,+ config,+ isSelected: selectedId === id,+ file,+ }+ }),}- }+ }, [processorPendingReveal, isDisabled, filesQ.data?.results, t, selectedId])- const getProcessor = () => {- return videoTrack?.getProcessor() as BackgroundProcessorInterface- }+ useEffect(() => {+ const videoElement = videoRef.current+ if (!videoElement) return- const isSelected = (type: ProcessorType, options: BackgroundOptions) => {- const processor = getProcessor()- const processorSerialized = processor?.serialize()- return (- !!processor &&- processorSerialized.type === type &&- JSON.stringify(processorSerialized.options) === JSON.stringify(options)- )- }+ const attachVideoTrack = async () => videoTrack?.attach(videoElement)+ attachVideoTrack()- const tooltipBlur = (type: ProcessorType, options: BackgroundOptions) => {- const strength =- options.blurRadius === BlurRadius.LIGHT ? 'light' : 'normal'- const action = isSelected(type, options) ? 'clear' : 'apply'+ return () => {+ if (!videoElement) return+ videoTrack.detach(videoElement)+ }+ }, [videoTrack, videoTrack?.isMuted])- return t(`${type}.${strength}.${action}`)- }+ useEffect(() => {+ if (!blurLightRef.current) return- const ariaLabelVirtualBackground = (- index: number,- imagePath: string- ): string => {- const isSelectedBackground = isSelected(ProcessorType.VIRTUAL, {- imagePath,+ const rafId = requestAnimationFrame(() => {+ blurLightRef.current?.focus({ preventScroll: true })})- const prefix = isSelectedBackground ? 'selectedLabel' : 'apply'- const backgroundName = t(`virtual.descriptions.${index}`)- return `${t(`virtual.${prefix}`)} ${backgroundName}`- }- const tooltipVirtualBackground = (index: number): string => {- return t(`virtual.descriptions.${index}`)- }+ return () => {+ cancelAnimationFrame(rafId)+ }+ }, [])++ useEffect(+ () => () => {+ if (effectAnnouncementTimeout.current) {+ clearTimeout(effectAnnouncementTimeout.current)+ }+ },+ []+ )return (<div@@ -362,7 +606,7 @@ export const EffectsConfiguration = ({<div><div><H- lvl={3}+ lvl={2}style={{marginBottom: '1rem',}}@@ -377,65 +621,51 @@ export const EffectsConfiguration = ({gap: '1.25rem',})}>- <ToggleButton- ref={blurLightRef}- variant="bigSquare"- aria-label={tooltipBlur(ProcessorType.BLUR, {- blurRadius: BlurRadius.LIGHT,- })}- tooltip={tooltipBlur(ProcessorType.BLUR, {- blurRadius: BlurRadius.LIGHT,- })}- isDisabled={processorPendingReveal || isDisabled}- onChange={async () =>- await toggleEffect(ProcessorType.BLUR, {- blurRadius: BlurRadius.LIGHT,- })- }- isSelected={isSelected(ProcessorType.BLUR, {- blurRadius: BlurRadius.LIGHT,- })}- data-attr="toggle-blur-light"- >- <BlurOn />- </ToggleButton>- <ToggleButton- variant="bigSquare"- aria-label={tooltipBlur(ProcessorType.BLUR, {- blurRadius: BlurRadius.NORMAL,- })}- tooltip={tooltipBlur(ProcessorType.BLUR, {- blurRadius: BlurRadius.NORMAL,- })}- isDisabled={processorPendingReveal || isDisabled}- onChange={async () =>- await toggleEffect(ProcessorType.BLUR, {- blurRadius: BlurRadius.NORMAL,- })- }- isSelected={isSelected(ProcessorType.BLUR, {- blurRadius: BlurRadius.NORMAL,- })}- data-attr="toggle-blur-normal"- >- <BlurOnStrong />- </ToggleButton>+ {processorOptions.blurBased.map(({ Icon, ...option }) => (+ <ToggleButton+ key={option.id}+ ref={option.ref}+ variant="bigSquare"+ aria-label={option.tooltip}+ tooltip={option.tooltip}+ isDisabled={processorOptions.isDisabled}+ onChange={() => toggleEffect(option.config)}+ isSelected={option.isSelected}+ data-attr={`toggle-${option.id}`}+ >+ <Icon />+ </ToggleButton>+ ))}</div></div>++ <div className={css({ marginTop: '1.5rem' })}>+ <H+ lvl={2}+ style={{+ marginBottom: '0.6rem',+ }}+ variant="bodyXsBold"+ >+ {t('virtual.title')}+ </H>+ </div>+<divclassName={css({- marginTop: '1.5rem',+ marginBottom: '1rem',})}><H- lvl={3}+ lvl={2}style={{- marginBottom: '1rem',+ marginBottom: '0.4rem',}}- variant="bodyXsBold"+ variant="bodyXsMedium">- {t('virtual.title')}+ {t('virtual.personal.title')}</H>+<divclassName={css({display: 'flex',@@ -444,35 +674,181 @@ export const EffectsConfiguration = ({flexWrap: 'wrap',})}>- {[...Array(8).keys()].map((i) => {- const imagePath = `/assets/backgrounds/${i + 1}.jpg`- const thumbnailPath = `/assets/backgrounds/thumbnails/${i + 1}.jpg`- const tooltipText = tooltipVirtualBackground(i)- return (- <VisualOnlyTooltip key={i} tooltip={tooltipText}>+ {canUploadBackground &&+ processorOptions.remoteCustomVirtualBackgrounds.map(+ (option) => (+ <div+ key={option.id}+ className={+ 'hoverGroup ' + css({ position: 'relative' })+ }+ >+ <VisualOnlyTooltip tooltip={option.tooltip}>+ <ToggleButton+ variant="bigSquare"+ aria-label={option.tooltip}+ isDisabled={processorOptions.isDisabled}+ onChange={getHandleSelectChangeFile(option.file)}+ isSelected={option.isSelected}+ className={css({+ bgSize: 'cover',+ })}+ style={{+ backgroundImage: `url(${option.file.url!})`,+ }}+ data-attr={`toggle-virtual-${option.file.id}`}+ />+ </VisualOnlyTooltip>+ <Button+ className={+ 'hoverGroupChild ' ++ css({+ position: 'absolute',+ top: '-8px',+ right: '-8px',+ transition: 'opacity 0.2s ease-in-out',+ })+ }+ size={'xs'}+ variant={'tertiary'}+ onClick={() => {+ if (option.isSelected) {+ // we remove the current effect+ toggleEffect(option.config)+ }+ deleteFileMutation.mutate({+ fileId: option.file.id,+ })+ }}+ isDisabled={deleteFileMutation.isPending}+ >+ <RiDeleteBinLine size={16} />+ </Button>+ </div>+ )+ )}+ {!canUploadBackground &&+ uploadNotPossibleSnap.imageBackgroundConfig && (+ <VisualOnlyTooltip+ tooltip={+ uploadNotPossibleSnap.imageBackgroundConfig.label+ }+ ><ToggleButtonvariant="bigSquare"- aria-label={ariaLabelVirtualBackground(i, imagePath)}- isDisabled={processorPendingReveal || isDisabled}- onChange={async () =>- await toggleEffect(ProcessorType.VIRTUAL, {- imagePath,- })+ aria-label={+ uploadNotPossibleSnap.imageBackgroundConfig.label+ }+ isDisabled={processorOptions.isDisabled}+ onChange={() => {+ toggleEffect(+ uploadNotPossibleSnap.imageBackgroundConfig!+ )+ }}+ isSelected={+ deriveIdFromProcessorConfig(+ uploadNotPossibleSnap.imageBackgroundConfig+ ) === selectedId}- isSelected={isSelected(ProcessorType.VIRTUAL, {- imagePath,- })}className={css({bgSize: 'cover',})}style={{- backgroundImage: `url(${thumbnailPath})`,+ backgroundImage: `url(${uploadNotPossibleSnap.imageBackgroundConfig.imagePath})`,}}- data-attr={`toggle-virtual-${i}`}+ data-attr={`toggle-virtual-local`}/></VisualOnlyTooltip>- )+ )}+ <FileTrigger+ acceptedFileTypes={+ appConfig?.background_image?.allowed_mimetypes ?? [+ 'image/png',+ 'image/jpeg',+ ]+ }+ onSelect={(e) => {+ if (e && e.item(0)) {+ const file = e.item(0) as File+ handleNewBackgroundFilePicked(file)+ }+ }}+ >+ <Button+ variant="bigSquare"+ aria-label={t('virtual.personal.selectFileTooltip')}+ tooltip={t('virtual.personal.selectFileTooltip')}+ isDisabled={+ (canUploadBackground &&+ filesQ.data &&+ filesQ.data.count >=+ (appConfig?.background_image?.max_count_by_user ??+ 0)) ||+ processorOptions.isDisabled ||+ createFileMutation.isPending+ }+ data-attr="input-file-select-personal-background"+ >+ <RiImageAddFill />+ </Button>+ </FileTrigger>+ </div>+ {!isLoggedIn && (+ <Text variant="xsNote">+ {t('virtual.personal.notLoggedInWarning')}+ </Text>+ )}+ {!canUploadBackground && isLoggedIn && (+ <Text variant="xsNote">+ {t('virtual.personal.warningUploadDisabled')}+ </Text>+ )}+ {hasReachedMaxNbBackgrounds && (+ <Text variant="xsNote">+ {t('virtual.personal.uploadLimitReached')}+ </Text>+ )}+ </div>+ <div+ className={css({+ marginTop: '0.4rem',+ })}+ >+ <H+ lvl={2}+ style={{+ marginBottom: '0.4rem',+ }}+ variant="bodyXsMedium"+ >+ {t('virtual.presets.title')}+ </H>+ <div+ className={css({+ display: 'flex',+ gap: '1.25rem',+ paddingBottom: '0.5rem',+ flexWrap: 'wrap',})}+ >+ {processorOptions.virtualBackgrounds.map((option) => (+ <VisualOnlyTooltip key={option.id} tooltip={option.tooltip}>+ <ToggleButton+ variant="bigSquare"+ aria-label={option.ariaLabel}+ isDisabled={processorOptions.isDisabled}+ onChange={() => toggleEffect(option.config)}+ isSelected={option.isSelected}+ className={css({+ bgSize: 'cover',+ })}+ style={{+ backgroundImage: `url(${option.thumbnailPath})`,+ }}+ data-attr={`toggle-virtual-preset-${option.index}`}+ />+ </VisualOnlyTooltip>+ ))}</div></div></div>@@ -483,6 +859,32 @@ export const EffectsConfiguration = ({</Information>)}</div>+ <Dialog+ isOpen={personalBackgroundHasError}+ type="alert"+ title={t(`virtual.personal.errors.${personalBackgroundError}.title`)}+ aria-label={t(+ `virtual.personal.errors.${personalBackgroundError}.title`+ )}+ onClose={() => setPersonalBackgroundHasError(false)}+ onOpenChange={() => setPersonalBackgroundHasError(false)}+ >+ <P>+ {t(+ `virtual.personal.errors.${personalBackgroundError}.description`,+ filePickerErrorContext+ )}+ </P>+ <HStack justifyContent="end" direction="row">+ <Button+ variant="text"+ size="sm"+ onPress={() => setPersonalBackgroundHasError(false)}+ >+ {t('virtual.personal.errors.close')}+ </Button>+ </HStack>+ </Dialog></div>)}diff --git a/src/frontend/src/features/rooms/livekit/components/effects/FunnyEffects.tsx b/src/frontend/src/features/rooms/livekit/components/effects/FunnyEffects.tsxindex c19eb43a..c2d7bba6 100644--- a/src/frontend/src/features/rooms/livekit/components/effects/FunnyEffects.tsx+++ b/src/frontend/src/features/rooms/livekit/components/effects/FunnyEffects.tsx@@ -27,7 +27,7 @@ export const FunnyEffects = ({showFrench: false,}}- return processor.serialize().options+ return { ...processor.options }}const options = getOptions()diff --git a/src/frontend/src/features/rooms/livekit/hooks/usePersistentUserChoices.ts b/src/frontend/src/features/rooms/livekit/hooks/usePersistentUserChoices.tsindex 445b38ee..8edc2b82 100644--- a/src/frontend/src/features/rooms/livekit/hooks/usePersistentUserChoices.ts+++ b/src/frontend/src/features/rooms/livekit/hooks/usePersistentUserChoices.ts@@ -1,7 +1,7 @@import { useSnapshot } from 'valtio'import { userChoicesStore } from '@/stores/userChoices'import type { VideoResolution } from '@/stores/userChoices'-import { ProcessorSerialized } from '@/features/rooms/livekit/components/blur'+import { ProcessorConfig } from '@/features/rooms/livekit/components/blur'import type { VideoQuality } from 'livekit-client'export function usePersistentUserChoices() {@@ -36,10 +36,8 @@ export function usePersistentUserChoices() {saveNoiseReductionEnabled: (enabled: boolean) => {userChoicesStore.noiseReductionEnabled = enabled},- saveProcessorSerialized: (- processorSerialized: ProcessorSerialized | undefined- ) => {- userChoicesStore.processorSerialized = processorSerialized+ saveProcessorConfig: (processorConfig: ProcessorConfig | undefined) => {+ userChoicesStore.processorConfig = processorConfig},}}diff --git a/src/frontend/src/features/settings/components/tabs/VideoTab.tsx b/src/frontend/src/features/settings/components/tabs/VideoTab.tsxindex 7a9dbedd..101da4a8 100644--- a/src/frontend/src/features/settings/components/tabs/VideoTab.tsx+++ b/src/frontend/src/features/settings/components/tabs/VideoTab.tsx@@ -31,7 +31,7 @@ export const VideoTab = ({ id }: VideoTabProps) => {const {userChoices: {videoDeviceId,- processorSerialized,+ processorConfig,videoPublishResolution,videoSubscribeQuality,},@@ -78,7 +78,7 @@ export const VideoTab = ({ id }: VideoTabProps) => {resolution: VideoPresets[key].resolution,deviceId: { exact: videoDeviceId },processor:- BackgroundProcessorFactory.deserializeProcessor(processorSerialized),+ BackgroundProcessorFactory.fromProcessorConfig(processorConfig),})}}diff --git a/src/frontend/src/locales/de/rooms.json b/src/frontend/src/locales/de/rooms.jsonindex df9821d2..c58078ad 100644--- a/src/frontend/src/locales/de/rooms.json+++ b/src/frontend/src/locales/de/rooms.json@@ -273,17 +273,39 @@"title": "Virtueller Hintergrund","selectedLabel": "Hintergrund angewendet:","apply": "Ersetze deinen Hintergrund:",- "descriptions": {- "0": "Gerilltes Holzmöbel",- "1": "Besprechungsraum",- "2": "Loft mit schwarzer Glaswand",- "3": "Esszimmer",- "4": "Holzregale",- "5": "Holztreppe",- "6": "Graue Bibliothek",- "7": "Kaffeetheke"+ "personal": {+ "title": "Meine Hintergründe",+ "selectFileTooltip": "Wähle ein Bild aus, das als persönlicher Hintergrund verwendet werden soll",+ "notLoggedInWarning": "Du bist nicht angemeldet, der persönliche Hintergrund wird nicht von einem Meeting zum anderen gespeichert.",+ "warningUploadDisabled": "Persönliche Hintergründe werden derzeit nicht von einem Meeting zum anderen gespeichert.",+ "uploadLimitReached": "Du kannst keine weiteren persönlichen Hintergründe hinzufügen.",+ "errors": {+ "close": "Schließen",+ "file_too_large": {+ "title": "Datei zu groß",+ "description": "Die Datei ist zu groß. Bitte wähle eine Datei mit weniger als {{maxSize, number}} MB."+ },+ "invalid_file_type": {+ "title": "Ungültiger Dateityp",+ "description": "Der Dateityp wird nicht unterstützt. Bitte wähle eine {{allowedExtension}}-Datei."+ }+ }+ },+ "presets": {+ "title": "Vorschläge",+ "descriptions": {+ "0": "Gerilltes Holzmöbel",+ "1": "Besprechungsraum",+ "2": "Loft mit schwarzer Glaswand",+ "3": "Esszimmer",+ "4": "Holzregale",+ "5": "Holztreppe",+ "6": "Graue Bibliothek",+ "7": "Kaffeetheke"+ }}},+"faceLandmarks": {"title": "Visuelle Effekte","glasses": {diff --git a/src/frontend/src/locales/en/rooms.json b/src/frontend/src/locales/en/rooms.jsonindex 034246b6..0210fd36 100644--- a/src/frontend/src/locales/en/rooms.json+++ b/src/frontend/src/locales/en/rooms.json@@ -270,18 +270,39 @@}},"virtual": {- "title": "Virtual background",+ "title": "Virtual backgrounds","selectedLabel": "Background applied:","apply": "Replace your background:",- "descriptions": {- "0": "Fluted wooden furniture",- "1": "Meeting room",- "2": "Loft with black glass partition",- "3": "Dining room",- "4": "Wooden shelves",- "5": "Wooden staircase",- "6": "Gray library",- "7": "Coffee counter"+ "personal": {+ "title": "My backgrounds",+ "selectFileTooltip": "Select an image file to use as a personal background",+ "notLoggedInWarning": "You are not logged-in, personal backgrounds won't be saved from one meeting to the other.",+ "warningUploadDisabled": "Personal backgrounds are currently not saved from one meeting to the other.",+ "uploadLimitReached": "You cannot upload more personal backgrounds.",+ "errors": {+ "close": "Close",+ "file_too_large": {+ "title": "File too large",+ "description": "The file is too large. Please choose a file smaller than {{maxSize, number}} MB."+ },+ "invalid_file_type": {+ "title": "Invalid file type",+ "description": "The file type is not supported. Please choose a {{allowedExtension, list(type: 'disjunction')}} file."+ }+ }+ },+ "presets": {+ "title": "Suggestions",+ "descriptions": {+ "0": "Fluted wooden furniture",+ "1": "Meeting room",+ "2": "Loft with black glass partition",+ "3": "Dining room",+ "4": "Wooden shelves",+ "5": "Wooden staircase",+ "6": "Gray library",+ "7": "Coffee counter"+ }}},"faceLandmarks": {diff --git a/src/frontend/src/locales/fr/rooms.json b/src/frontend/src/locales/fr/rooms.jsonindex f06afb32..242d6bff 100644--- a/src/frontend/src/locales/fr/rooms.json+++ b/src/frontend/src/locales/fr/rooms.json@@ -270,18 +270,39 @@}},"virtual": {- "title": "Arrière-plan virtuel",+ "title": "Arrière-plans virtuels","selectedLabel": "Arrière-plan appliqué :","apply": "Remplacer votre arrière plan :",- "descriptions": {- "0": "Meuble cannelé en bois",- "1": "Salle de réunion",- "2": "Loft avec verrière noire",- "3": "Salle à manger",- "4": "Étagères en bois",- "5": "Escalier en bois",- "6": "Bibliothèque grise",- "7": "Comptoir de café"+ "personal": {+ "title": "Mes arrière-plans",+ "selectFileTooltip": "Sélectionnez une image à utiliser comme arrière-plan",+ "notLoggedInWarning": "Vous n'êtes pas connecté, l'arrière-plan personnel ne sera pas sauvegardé d'une réunion à l'autre.",+ "warningUploadDisabled": "Les arrière-plans personnels ne sont actuellement pas sauvegardés d'une réunion à l'autre.",+ "uploadLimitReached": "Vous ne pouvez pas ajouter plus d'arrière-plans personnels.",+ "errors": {+ "close": "Fermer",+ "file_too_large": {+ "title": "Fichier trop volumineux",+ "description": "Le fichier est trop volumineux. Veuillez choisir un fichier de moins de {{maxSize, number}} Mo."+ },+ "invalid_file_type": {+ "title": "Type de fichier non valide",+ "description": "Le type de fichier n'est pas pris en charge. Veuillez choisir un fichier {{allowedExtension}}."+ }+ }+ },+ "presets": {+ "title": "Suggestions",+ "descriptions": {+ "0": "Meuble cannelé en bois",+ "1": "Salle de réunion",+ "2": "Loft avec verrière noire",+ "3": "Salle à manger",+ "4": "Étagères en bois",+ "5": "Escalier en bois",+ "6": "Bibliothèque grise",+ "7": "Comptoir de café"+ }}},"faceLandmarks": {diff --git a/src/frontend/src/locales/nl/rooms.json b/src/frontend/src/locales/nl/rooms.jsonindex 4979c86c..bdae2c6c 100644--- a/src/frontend/src/locales/nl/rooms.json+++ b/src/frontend/src/locales/nl/rooms.json@@ -273,15 +273,36 @@"title": "Virtuele achtergrond","selectedLabel": "Achtergrond toegepast:","apply": "Vervang je achtergrond:",- "descriptions": {- "0": "Geprofileerd houten meubel",- "1": "Vergaderruimte",- "2": "Loft met zwarte glaswand",- "3": "Eetkamer",- "4": "Houten planken",- "5": "Houten trap",- "6": "Grijze bibliotheek",- "7": "Koffiebar"+ "personal": {+ "title": "Mijn achtergronden",+ "selectFileTooltip": "Selecteer een afbeeldingsbestand om te gebruiken als persoonlijke achtergrond",+ "notLoggedInWarning": "U bent niet ingelogd, persoonlijke achtergronden worden niet opgeslagen van de ene vergadering naar de andere.",+ "warningUploadDisabled": "Persoonlijke achtergronden worden momenteel niet opgeslagen van de ene vergadering naar de andere.",+ "uploadLimitReached": "U kunt geen persoonlijke achtergronden meer uploaden.",+ "errors": {+ "close": "Sluiten",+ "file_too_large": {+ "title": "Bestand te groot",+ "description": "Het bestand is te groot. Kies een bestand kleiner dan {{maxSize, number}} MB."+ },+ "invalid_file_type": {+ "title": "Ongeldig bestandstype",+ "description": "Het bestandstype wordt niet ondersteund. Kies een {{allowedExtension, list(type: 'disjunction')}} bestand."+ }+ }+ },+ "presets": {+ "title": "Suggesties",+ "descriptions": {+ "0": "Geprofileerd houten meubel",+ "1": "Vergaderruimte",+ "2": "Loft met zwarte glaswand",+ "3": "Eetkamer",+ "4": "Houten planken",+ "5": "Houten trap",+ "6": "Grijze bibliotheek",+ "7": "Koffiebar"+ }}},"faceLandmarks": {diff --git a/src/frontend/src/primitives/Text.tsx b/src/frontend/src/primitives/Text.tsxindex fea0f9d5..dfb8c915 100644--- a/src/frontend/src/primitives/Text.tsx+++ b/src/frontend/src/primitives/Text.tsx@@ -36,6 +36,10 @@ export const text = cva({textStyle: 'body',fontWeight: 'bold',},+ bodyXsMedium: {+ textStyle: 'body',+ fontWeight: 'medium',+ },body: {textStyle: 'body',},diff --git a/src/frontend/src/stores/userChoices.ts b/src/frontend/src/stores/userChoices.tsindex 345838cb..3ab607ef 100644--- a/src/frontend/src/stores/userChoices.ts+++ b/src/frontend/src/stores/userChoices.ts@@ -1,16 +1,19 @@import { proxy, subscribe } from 'valtio'-import { ProcessorSerialized } from '@/features/rooms/livekit/components/blur'+import {+ ProcessorConfig,+ ProcessorType,+} from '@/features/rooms/livekit/components/blur'import {loadUserChoices,- saveUserChoices,LocalUserChoices as LocalUserChoicesLK,+ saveUserChoices,} from '@livekit/components-core'import { VideoQuality } from 'livekit-client'export type VideoResolution = 'h720' | 'h360' | 'h180'export type LocalUserChoices = LocalUserChoicesLK & {- processorSerialized?: ProcessorSerialized+ processorConfig?: ProcessorConfignoiseReductionEnabled?: booleanaudioOutputDeviceId?: stringvideoPublishResolution?: VideoResolution@@ -28,7 +31,14 @@ function getUserChoicesState(): LocalUserChoices {}export const userChoicesStore = proxy<LocalUserChoices>(getUserChoicesState())-subscribe(userChoicesStore, () => {saveUserChoices(userChoicesStore, false)})++if (userChoicesStore.processorConfig?.type === ProcessorType.VIRTUAL) {+ if (userChoicesStore.processorConfig.imagePath.startsWith('blob:')) {+ // this happens when a not authenticated user had changed their background image+ // we restore their last processor config to avoid displaying a black screen.+ userChoicesStore.processorConfig = undefined+ }+}diff --git a/src/frontend/src/styles/index.css b/src/frontend/src/styles/index.cssindex 900d7a3a..39504da3 100644--- a/src/frontend/src/styles/index.css+++ b/src/frontend/src/styles/index.css@@ -95,3 +95,14 @@ html:has(.lk-video-conference) {U+0304, U+0308, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193,U+2212, U+2215, U+FEFF, U+FFFD;}++.hoverGroup .hoverGroupChild {+ opacity: 0;+ pointer-events: none;+}++.hoverGroup:hover .hoverGroupChild,+.hoverGroup:focus-within .hoverGroupChild {+ opacity: 1;+ pointer-events: auto;+}diff --git a/src/frontend/vite.config.ts b/src/frontend/vite.config.tsindex fd6b5d5c..0887b027 100644--- a/src/frontend/vite.config.ts+++ b/src/frontend/vite.config.ts@@ -14,6 +14,14 @@ export default defineConfig(({ mode }) => {port: parseInt(env.VITE_PORT) || 3000,host: env.VITE_HOST ?? 'localhost',allowedHosts: ['.nip.io'],+ // In a local dev setup, we proxy the media server ourselves to avoid CORS issues+ proxy: {+ '/media': {+ target: 'http://localhost:8083',+ changeOrigin: true,+ secure: false+ }+ }},}})