Merge pull request #164 from GetStream/feature/uni-122-fix-black-screen-issue

Feature/uni 122 fix black screen issue

Author: sierpinskid

Packages/StreamVideo/Runtime/Core/LowLevelClient/RtcSession.cs

@@ -601,6 +601,15 @@ private void TryExecuteSubscribeToTracks()
         /// </summary>
         private async Task SubscribeToTracksAsync()
         {
+            if (ActiveCall.Participants == null || !ActiveCall.Participants.Any())
+            {
+#if STREAM_DEBUG_ENABLED
+                _logs.Info($"{nameof(SubscribeToTracksAsync)} Ignored - No participants in the call to subscribe tracks for");
+#endif
+
+                return;
+            }
+
             if (_trackSubscriptionRequestInProgress)
             {
                 QueueTracksSubscriptionRequest();
@@ -609,6 +618,7 @@ private async Task SubscribeToTracksAsync()
 
             _trackSubscriptionRequestInProgress = true;
 
+            // StreamTodo: validate that the very first call to SubscribeToTracksAsync is correct because ActiveCall.Participants may not have been updated yet
             var tracks = GetDesiredTracksDetails();
 
             var request = new UpdateSubscriptionsRequest
@@ -953,7 +963,7 @@ private void UpdateParticipantTracksState(string userId, string sessionId, Track
                 return;
             }
 
-            participant.SetTrackEnabled(trackType, isEnabled);
+            participant.NotifyTrackEnabled(trackType, isEnabled);
 
             ActiveCall.NotifyTrackStateChanged(participant, trackType, isEnabled);
         }

Packages/StreamVideo/Runtime/Core/LowLevelClient/StreamPeerConnection.cs

@@ -230,14 +230,6 @@ public void Dispose()
             _logs.Warning($"Disposing PeerConnection [{_peerType}]");
 #endif
 
-#if STREAM_NATIVE_AUDIO
-            if (PublisherAudioTrack != null)
-            {
-                //StreamTODO: call this when PublisherAudioTrack is set to null
-                PublisherAudioTrack.StopLocalAudioCapture();
-            }
-#endif
-
             _mediaInputProvider.AudioInputChanged -= OnAudioInputChanged;
             _mediaInputProvider.VideoSceneInputChanged -= OnVideoSceneInputChanged;
             _mediaInputProvider.VideoInputChanged -= OnVideoInputChanged;
@@ -252,13 +244,28 @@ public void Dispose()
             _peerConnection.OnConnectionStateChange -= OnConnectionStateChange;
             _peerConnection.OnTrack -= OnTrack;
 
+#if STREAM_NATIVE_AUDIO
+            if (PublisherAudioTrack != null)
+            {
+                //StreamTODO: call this when PublisherAudioTrack is set to null
+                PublisherAudioTrack.StopLocalAudioCapture();
+            }
+#endif
+
+            if (_publisherVideoTrackTexture != null)
+            {
+                _publisherVideoTrackTexture.Release();
+                _publisherVideoTrackTexture = null;
+            }
+            
             PublisherAudioTrack?.Stop();
             PublisherVideoTrack?.Stop();
             PublisherAudioTrack = null;
             PublisherVideoTrack = null;
 
             _tracer?.Trace(PeerConnectionTraceKey.Close, null);
             _peerConnection.Close();
+            _peerConnection.Dispose();
 
 #if STREAM_DEBUG_ENABLED
             _logs.Warning($"Disposed PeerConnection [{_peerType}]");

Packages/StreamVideo/Runtime/Core/StatefulModels/IStreamVideoCallParticipant.cs

@@ -17,6 +17,11 @@ public interface IStreamVideoCallParticipant : IStreamStatefulModel, IHasCustomD
         /// </summary>
         event ParticipantTrackChangedHandler TrackAdded;
 
+        /// <summary>
+        /// A track <see cref="IStreamTrack.IsEnabled"/> state changed for this participant.
+        /// </summary>
+        event ParticipantTrackChangedHandler TrackIsEnabledChanged;
+        
         /// <summary>
         /// Is this participant "pinned" in the call meaning it will have precedence in <see cref="IStreamCall.SortedParticipants"/> list
         /// </summary>

Packages/StreamVideo/Runtime/Core/StatefulModels/StreamVideoCallParticipant.cs

@@ -21,6 +21,7 @@ internal sealed class StreamVideoCallParticipant : StreamStatefulModelBase<Strea
         IStreamVideoCallParticipant
     {
         public event ParticipantTrackChangedHandler TrackAdded;
+        public event ParticipantTrackChangedHandler TrackIsEnabledChanged;
 
         public bool IsLocalParticipant => UserSessionId == Client.InternalLowLevelClient.RtcSession.SessionId;
 
@@ -244,7 +245,8 @@ internal void SetTrack(TrackType type, MediaStreamTrack mediaStreamTrack, out IS
             TrackAdded?.Invoke(this, streamTrack);
         }
 
-        internal void SetTrackEnabled(TrackType type, bool enabled)
+        // This is only called for remote participants
+        internal void NotifyTrackEnabled(TrackType type, bool enabled)
         {
             var streamTrack = GetStreamTrack(type);
             if (streamTrack == null)
@@ -258,9 +260,15 @@ internal void SetTrackEnabled(TrackType type, bool enabled)
                 $"[Participant] Local: {IsLocalParticipant}, Session ID: {SessionId} set track enabled of type {type} to {enabled}");
 #endif
 
-            streamTrack.SetEnabled(enabled);
+            //StreamTodo: this would break a track in the following scenario:
+            // Host tracks are auto-enabled when joining the call -> VideoDeviceManager.SetEnabled(true) right after JoinCallAsync)
+            // Join call by host and watcher
+            // Disable track on host -> this causes watcher to disable the track as well
+            // Leave the call as host and re-join -> the track is re-enabled on host side but watcher still has it disabled
+            //streamTrack.SetEnabled(enabled);
 
             //StreamTodo: we should trigger some event that track status changed
+            TrackIsEnabledChanged?.Invoke(this, streamTrack);
         }
 
         internal void SetIsPinned(bool isPinned) => IsPinned = isPinned;