From dd25d9cb7fcd2f3582a63168f317b373bcd91645 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Thu, 4 Nov 2021 13:41:11 +1100 Subject: [PATCH] fix flickering of video stream on mute/unmute --- ts/components/session/calling/DraggableCallContainer.tsx | 8 ++++++-- .../session/calling/InConversationCallContainer.tsx | 8 ++++++-- ts/session/utils/CallManager.ts | 3 ++- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/ts/components/session/calling/DraggableCallContainer.tsx b/ts/components/session/calling/DraggableCallContainer.tsx index 610841251..0d2071f51 100644 --- a/ts/components/session/calling/DraggableCallContainer.tsx +++ b/ts/components/session/calling/DraggableCallContainer.tsx @@ -97,13 +97,17 @@ export const DraggableCallContainer = () => { }, [positionX, positionY]); if (videoRefRemote?.current?.srcObject && remoteStream) { - videoRefRemote.current.srcObject = remoteStream; + if (videoRefRemote.current.srcObject !== remoteStream) { + videoRefRemote.current.srcObject = remoteStream; + } videoRefRemote.current.load(); } useEffect(() => { if (videoRefRemote?.current) { - videoRefRemote.current.srcObject = remoteStream; + if (videoRefRemote?.current?.srcObject && remoteStream) { + videoRefRemote.current.srcObject = remoteStream; + } videoRefRemote.current.load(); } diff --git a/ts/components/session/calling/InConversationCallContainer.tsx b/ts/components/session/calling/InConversationCallContainer.tsx index bf92757ae..ea76e8640 100644 --- a/ts/components/session/calling/InConversationCallContainer.tsx +++ b/ts/components/session/calling/InConversationCallContainer.tsx @@ -272,8 +272,12 @@ export const InConversationCallContainer = () => { } = useVideoCallEventsListener('InConversationCallContainer', true); if (videoRefRemote?.current && videoRefLocal?.current) { - videoRefRemote.current.srcObject = remoteStream; - videoRefLocal.current.srcObject = localStream; + if (videoRefRemote.current.srcObject !== remoteStream) { + videoRefRemote.current.srcObject = remoteStream; + } + if (videoRefLocal.current.srcObject !== localStream) { + videoRefLocal.current.srcObject = localStream; + } } if (!ongoingCallWithFocused) { diff --git a/ts/session/utils/CallManager.ts b/ts/session/utils/CallManager.ts index a5f06c15b..bccad954c 100644 --- a/ts/session/utils/CallManager.ts +++ b/ts/session/utils/CallManager.ts @@ -10,6 +10,7 @@ import { callConnected, endCall, incomingCall, + openConversationWithMessages, setFullScreenCall, startingCallWith, } from '../../state/ducks/conversations'; @@ -611,7 +612,7 @@ export async function USER_acceptIncomingCallRequest(fromSender: string) { return; } window.inboxStore?.dispatch(answerCall({ pubkey: fromSender })); - + await openConversationWithMessages({ conversationKey: fromSender }); if (peerConnection) { throw new Error('USER_acceptIncomingCallRequest: peerConnection is already set.'); }