hotfix: update Livekit to latest version/Fix black screen streaming in Mac (#7276)

Author: mihakrajnc

Explorer/Assets/DCL/Multiplayer/Connections/Rooms/Interior/InteriorAudioTracks.cs

@@ -0,0 +1,26 @@
+using DCL.Multiplayer.Connections.Rooms.Nulls;
+using LiveKit;
+using LiveKit.Rooms.Tracks;
+using LiveKit.RtcSources.Video;
+
+namespace DCL.Multiplayer.Connections.Rooms.Interior
+{
+    public class InteriorLocalTracks: ILocalTracks, IInterior<ILocalTracks>
+    {
+        private ILocalTracks assigned = NullLocalTracks.INSTANCE;
+
+        public ITrack CreateAudioTrack(string name, IRtcAudioSource source) =>
+            assigned.EnsureAssigned().CreateAudioTrack(name, source);
+
+        public ITrack CreateVideoTrack(string name, RtcVideoSource source) =>
+            assigned.EnsureAssigned().CreateVideoTrack(name, source);
+
+        public void Assign(ILocalTracks value, out ILocalTracks? previous)
+        {
+            previous = assigned;
+            assigned = value;
+
+            previous = previous is NullLocalTracks ? null : previous;
+        }
+    }
+}

Explorer/Assets/DCL/Multiplayer/Connections/Rooms/Interior/InteriorAudioTracks.cs.meta

@@ -28,7 +28,7 @@ public class InteriorRoom : IRoom, IInterior<IRoom>
         private readonly InteriorDataPipe dataPipe = new ();
         private readonly InteriorVideoStreams videoStreams = new ();
         private readonly InteriorAudioStreams audioStreams = new ();
-        private readonly InteriorAudioTracks audioTracks = new ();
+        private readonly InteriorLocalTracks localTracks = new ();
 
         private const int RESET_ROOM_TIMEOUT_SECONDS = 5;
 
@@ -38,7 +38,7 @@ public class InteriorRoom : IRoom, IInterior<IRoom>
         public IRoomInfo Info => assigned.Info;
         public IVideoStreams VideoStreams => videoStreams;
         public IAudioStreams AudioStreams => audioStreams;
-        public IAudioTracks AudioTracks => audioTracks;
+        public ILocalTracks LocalTracks => localTracks;
 
         internal IRoom assigned { get; private set; } = NullRoom.INSTANCE;
 
@@ -156,7 +156,7 @@ private void Subscribe(IRoom room)
             dataPipe.Assign(room.DataPipe);
             videoStreams.Assign(room.VideoStreams);
             audioStreams.Assign(room.AudioStreams);
-            audioTracks.Assign(room.AudioTracks);
+            localTracks.Assign(room.LocalTracks);
 
             room.RoomMetadataChanged += RoomOnRoomMetadataChanged;
             room.RoomSidChanged += RoomOnRoomSidChanged;

Explorer/Assets/DCL/Multiplayer/Connections/Rooms/Interior/InteriorLocalTracks.cs

@@ -9,6 +9,7 @@
 using LiveKit.Rooms.Streaming.Audio;
 using LiveKit.Rooms.TrackPublications;
 using LiveKit.Rooms.Tracks;
+using LiveKit.Rooms.Tracks.Factory;
 using LiveKit.Rooms.Tracks.Hub;
 using LiveKit.Rooms.VideoStreaming;
 using System.Threading;
@@ -30,7 +31,7 @@ public class LogRoom : IRoom
         public IRoomInfo Info { get; }
         public IVideoStreams VideoStreams { get; }
         public IAudioStreams AudioStreams { get; }
-        public IAudioTracks AudioTracks { get; }
+        public ILocalTracks LocalTracks { get; }
 
         public event LocalPublishDelegate? LocalTrackPublished;
         public event LocalPublishDelegate? LocalTrackUnpublished;
@@ -62,7 +63,7 @@ public LogRoom(IRoom origin, string roomName)
             Info = new LogRoomInfo(origin.Info);
             VideoStreams = new LogVideoStreams(origin.VideoStreams);
             AudioStreams = new LogAudioStreams(origin.AudioStreams);
-            AudioTracks = new LogAudioTracks(origin.AudioTracks);
+            LocalTracks = new LogLocalTracks(origin.LocalTracks);
 
             this.origin.LocalTrackPublished += OriginOnLocalTrackPublished;
             this.origin.LocalTrackUnpublished += OriginOnLocalTrackUnpublished;

Explorer/Assets/DCL/Multiplayer/Connections/Rooms/Interior/InteriorLocalTracks.cs.meta

@@ -0,0 +1,49 @@
+using DCL.Diagnostics;
+using LiveKit;
+using LiveKit.Rooms.Tracks;
+using LiveKit.RtcSources.Video;
+
+namespace DCL.Multiplayer.Connections.Rooms.Logs
+{
+    public class LogLocalTracks: ILocalTracks
+    {
+        private const string PREFIX = "LogLocalTracks:";
+
+        private readonly ILocalTracks origin;
+
+        public LogLocalTracks(ILocalTracks origin)
+        {
+            this.origin = origin;
+        }
+
+        public ITrack CreateAudioTrack(string name, IRtcAudioSource source)
+        {
+            ReportHub
+               .WithReport(ReportCategory.LIVEKIT)
+               .Log($"{PREFIX} {nameof(CreateAudioTrack)} called name:{name} sourceType:{source.GetType().Name}");
+
+            ITrack track = origin.CreateAudioTrack(name, source);
+
+            ReportHub
+               .WithReport(ReportCategory.LIVEKIT)
+               .Log($"{PREFIX} {nameof(CreateAudioTrack)} result trackType:{track.GetType().Name}");
+
+            return track;
+        }
+
+        public ITrack CreateVideoTrack(string name, RtcVideoSource source)
+        {
+            ReportHub
+               .WithReport(ReportCategory.LIVEKIT)
+               .Log($"{PREFIX} {nameof(CreateVideoTrack)} called name:{name} sourceType:{source.GetType().Name}");
+
+            ITrack track = origin.CreateVideoTrack(name, source);
+
+            ReportHub
+               .WithReport(ReportCategory.LIVEKIT)
+               .Log($"{PREFIX} {nameof(CreateVideoTrack)} result trackType:{track.GetType().Name}");
+
+            return track;
+        }
+    }
+}