From 8176d60d96d9e135fbe4102eb47310be16ee12e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=A0imon=20Brandner?= <simon.bra.ag@gmail.com>
Date: Fri, 12 Aug 2022 10:33:59 +0200
Subject: [PATCH] Show name in 1:1 calls
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
---
 src/room/InCallView.tsx               |  1 -
 src/video-grid/VideoTile.jsx          | 17 ++++++-----------
 src/video-grid/VideoTileContainer.jsx |  4 ----
 src/video-grid/useCallFeed.js         |  3 ---
 4 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/src/room/InCallView.tsx b/src/room/InCallView.tsx
index 5ff3924..d9598f2 100644
--- a/src/room/InCallView.tsx
+++ b/src/room/InCallView.tsx
@@ -197,7 +197,6 @@ export function InCallView({
             key={item.id}
             item={item}
             getAvatar={renderAvatar}
-            showName={items.length > 2 || item.focused}
             audioOutputDevice={audioOutput}
             audioContext={audioContext}
             audioDestination={audioDestination}
diff --git a/src/video-grid/VideoTile.jsx b/src/video-grid/VideoTile.jsx
index 0d58a7b..7001d76 100644
--- a/src/video-grid/VideoTile.jsx
+++ b/src/video-grid/VideoTile.jsx
@@ -29,12 +29,10 @@ export const VideoTile = forwardRef(
       isLocal,
       speaking,
       audioMuted,
-      noVideo,
       videoMuted,
       screenshare,
       avatar,
       name,
-      showName,
       mediaRef,
       onOptionsPress,
       showOptions,
@@ -75,7 +73,7 @@ export const VideoTile = forwardRef(
             )}
           </div>
         )}
-        {(videoMuted || noVideo) && (
+        {videoMuted && (
           <>
             <div className={styles.videoMutedOverlay} />
             {avatar}
@@ -86,15 +84,12 @@ export const VideoTile = forwardRef(
             <span>{`${name} is presenting`}</span>
           </div>
         ) : (
-          (showName || audioMuted || (videoMuted && !noVideo)) && (
-            <div className={classNames(styles.infoBubble, styles.memberName)}>
-              {audioMuted && !(videoMuted && !noVideo) && <MicMutedIcon />}
-              {videoMuted && !noVideo && <VideoMutedIcon />}
-              {showName && <span title={name}>{name}</span>}
-            </div>
-          )
+          <div className={classNames(styles.infoBubble, styles.memberName)}>
+            {audioMuted && !videoMuted && <MicMutedIcon />}
+            {videoMuted && <VideoMutedIcon />}
+            <span title={name}>{name}</span>
+          </div>
         )}
-
         <video ref={mediaRef} playsInline disablePictureInPicture />
       </animated.div>
     );
diff --git a/src/video-grid/VideoTileContainer.jsx b/src/video-grid/VideoTileContainer.jsx
index 55de199..87fab54 100644
--- a/src/video-grid/VideoTileContainer.jsx
+++ b/src/video-grid/VideoTileContainer.jsx
@@ -29,7 +29,6 @@ export function VideoTileContainer({
   width,
   height,
   getAvatar,
-  showName,
   audioOutputDevice,
   audioContext,
   audioDestination,
@@ -43,7 +42,6 @@ export function VideoTileContainer({
     audioMuted,
     videoMuted,
     localVolume,
-    noVideo,
     speaking,
     stream,
     purpose,
@@ -79,11 +77,9 @@ export function VideoTileContainer({
         isLocal={isLocal}
         speaking={speaking && !disableSpeakingIndicator}
         audioMuted={audioMuted}
-        noVideo={noVideo}
         videoMuted={videoMuted}
         screenshare={purpose === SDPStreamMetadataPurpose.Screenshare}
         name={rawDisplayName}
-        showName={showName}
         ref={tileRef}
         mediaRef={mediaRef}
         avatar={getAvatar && getAvatar(member, width, height)}
diff --git a/src/video-grid/useCallFeed.js b/src/video-grid/useCallFeed.js
index 963d48a..3c533c5 100644
--- a/src/video-grid/useCallFeed.js
+++ b/src/video-grid/useCallFeed.js
@@ -22,9 +22,6 @@ function getCallFeedState(callFeed) {
     member: callFeed ? callFeed.getMember() : null,
     isLocal: callFeed ? callFeed.isLocal() : false,
     speaking: callFeed ? callFeed.isSpeaking() : false,
-    noVideo: callFeed
-      ? !callFeed.stream || callFeed.stream.getVideoTracks().length === 0
-      : true,
     videoMuted: callFeed ? callFeed.isVideoMuted() : true,
     audioMuted: callFeed ? callFeed.isAudioMuted() : true,
     localVolume: callFeed ? callFeed.getLocalVolume() : 0,