Skip to content

Handle stream change during camera switch #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bm12 merged 1 commit into from
Sep 22, 2025
Merged

Handle stream change during camera switch #21

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 22 additions & 5 deletions frontend/src/features/call/hooks/useLocalMedia.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,13 +285,13 @@ export const useLocalMedia = ({ roomId, messageApi }: UseLocalMediaOptions) => {
}, [messageApi, updateCameraState]);

const switchCamera = useCallback(async () => {
const localStream = localStreamRef.current;
if (!localStream) {
const capturedStream = localStreamRef.current;
if (!capturedStream) {
messageApi.error('Локальный поток недоступен. Попробуйте переподключиться.');
return;
}

const [currentTrack] = localStream.getVideoTracks();
const [currentTrack] = capturedStream.getVideoTracks();
if (!currentTrack) {
messageApi.warning('Камера неактивна или недоступна.');
return;
Expand Down Expand Up @@ -337,11 +337,11 @@ export const useLocalMedia = ({ roomId, messageApi }: UseLocalMediaOptions) => {
attempts.push({ constraint: { facingMode: { exact: fallbackFacing } }, facingMode: fallbackFacing });
}

localStream.removeTrack(currentTrack);
capturedStream.removeTrack(currentTrack);
currentTrack.stop();

if (localVideoRef.current) {
localVideoRef.current.srcObject = localStream;
localVideoRef.current.srcObject = capturedStream;
await localVideoRef.current.play().catch(() => undefined);
}

Expand Down Expand Up @@ -413,6 +413,23 @@ export const useLocalMedia = ({ roomId, messageApi }: UseLocalMediaOptions) => {
return;
}

const refreshedStream = localStreamRef.current;
if (!refreshedStream) {
console.warn('[call] Локальный поток стал недоступен во время переключения камеры. Отменяем замену трека.');
newTrack.stop();
await refreshDevices();
return;
}

if (refreshedStream !== capturedStream) {
console.warn('[call] Локальный поток был обновлен во время переключения камеры. Отменяем замену трека.');
newTrack.stop();
await refreshDevices();
return;
}

const localStream = refreshedStream;

newTrack.enabled = isCameraEnabled;
newTrack.onended = () => {
console.warn('[call] Локальный видеотрек остановлен браузером', { readyState: newTrack?.readyState });
Expand Down