Stop video stream for audio only calls

Close video tag when video stream stopped
GPTOG · Apr 8, 2021 · b7d1c74 · b7d1c74
1 parent af281d9
commit b7d1c74
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 18 deletions.
diff --git a/src/Components/Calls/CallPanel.css b/src/Components/Calls/CallPanel.css
@@ -5,6 +5,10 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+.call-video-inactive {
+    display: none;
+}
+
 .call-panel-microphone-hint {
     display: flex;
     align-items: center;

diff --git a/src/Components/Calls/CallPanel.js b/src/Components/Calls/CallPanel.js
@@ -330,8 +330,8 @@ class CallPanel extends React.Component {
                     </Popover>
                 </div>
                 <div className='call-panel-content scrollbars-hidden' onDoubleClick={this.handleFullScreen}>
-                    <video id='call-output-video' autoPlay={true} muted={false}/>
-                    <video id='call-input-video' autoPlay={true} muted={true}/>
+                    <video id='call-output-video' className={outputMediaState && outputMediaState.videoState === 'active' ? 'call-video-active' : 'call-video-inactive'} autoPlay={true} muted={false}/>
+                    <video id='call-input-video' className={inputMediaState && inputMediaState.videoState === 'active' ? 'call-video-active' : 'call-video-inactive'} autoPlay={true} muted={true}/>
                 </div>
                 { outputMediaState && outputMediaState.muted && (
                     <div className='call-panel-microphone-hint'>

diff --git a/src/Stores/CallStore.js b/src/Stores/CallStore.js
@@ -1799,6 +1799,13 @@ class CallStore extends EventEmitter {
             video: true,
             audio: true
         });
+
+        if (mediaState && mediaState.videoState === 'inactive') {
+            inputStream.getVideoTracks().forEach(x => {
+                x.enabled = false;
+            });
+        }
+
         this.currentCall.inputStream = inputStream;
 
         const inputVideo = document.getElementById('call-input-video');
@@ -1807,14 +1814,6 @@ class CallStore extends EventEmitter {
         }
         if (TG_CALLS_SDP) {
             this.p2pAppendInputStream(inputStream);
-            // if (is_outgoing) {
-            //     this.p2pAppendInputStream(inputStream);
-            // } else {
-            //     LOG_P2P_CALL('try invoke p2pAppendInputStream', connection.localDescription, connection.remoteDescription);
-            //     if (connection.localDescription && connection.remoteDescription) {
-            //         this.p2pAppendInputStream(inputStream);
-            //     }
-            // }
         } else {
             if (is_outgoing) {
                 this.p2pAppendInputStream(inputStream);
@@ -2217,7 +2216,7 @@ class CallStore extends EventEmitter {
         const { currentCall } = this;
         if (!currentCall) return;
 
-        const { connection } = currentCall;
+        const { callId, connection } = currentCall;
         if (!connection) return;
 
         const options = {
@@ -2243,6 +2242,11 @@ class CallStore extends EventEmitter {
             inputVideo.srcObject = screenStream;
         }
 
+        const inputMediaState = this.p2pGetMediaState(callId, 'input');
+        if (inputMediaState && inputMediaState.videoState !== 'active') {
+            this.p2pVideoEnabled(true);
+        }
+
         currentCall.screenStream = screenStream;
     }
 
@@ -2255,15 +2259,11 @@ class CallStore extends EventEmitter {
         if (!screenStream) return;
 
         const videoTracks = inputStream.getVideoTracks();
-        if (videoTracks.length > 0)
+        const videoTrack = videoTracks.length > 0 ? videoTracks[0] : null
 
         connection.getSenders().forEach(x => {
             if (x.track.kind === 'video') {
-                if (videoTracks.length > 0) {
-                    x.replaceTrack(videoTracks[0]);
-                } else {
-                    x.replaceTrack(null);
-                }
+                x.replaceTrack(videoTrack);
             }
         })
 
@@ -2277,6 +2277,10 @@ class CallStore extends EventEmitter {
         }
 
         currentCall.screenStream = null;
+
+        if (!videoTrack || videoTrack.readyState !== 'live') {
+            this.p2pVideoEnabled(false);
+        }
     }
 
     p2pCloseConnectionAndStream(connection, inputStream, outputStream, screenStream) {
@@ -2352,7 +2356,7 @@ class CallStore extends EventEmitter {
         }
     }
 
-    p2pVideoEnabled(enabled) {
+    async p2pVideoEnabled(enabled) {
         const { currentCall } = this;
         if (!currentCall) return;