Sync package samples with imported samples

sierpinskid · sierpinskid · commit 0ce9e16053b2 · 2025-11-22T19:54:19.000+01:00
diff --git a/Assets/Samples/Stream Video & Audio Chat SDK/0.8.11.meta b/Assets/Samples/Stream Video & Audio Chat SDK/0.8.11.meta
diff --git a/Packages/StreamVideo/Samples~/VideoChat/Scripts/StreamVideoManager.cs b/Packages/StreamVideo/Samples~/VideoChat/Scripts/StreamVideoManager.cs
@@ -66,6 +66,16 @@ public async Task JoinAsync(string callId, bool create = true)
 
             Debug.Log($"Join call, create: {create}, callId: {callId}");
             await Client.JoinCallAsync(StreamCallType.Default, callId, create, ring: true, notify: false);
+            
+            if (_autoEnableMicrophone)
+            {
+                Client.AudioDeviceManager.SetEnabled(true);
+            }
+
+            if (_autoEnableCamera)
+            {
+                Client.VideoDeviceManager.SetEnabled(true);
+            }
 
             if (_playOnCallStart)
             {
@@ -209,6 +219,13 @@ private string _info
         
         [SerializeField]
         private bool _playOnCallStart = false;
+        
+        [Header("Auto-enable devices on joining a call")]
+        [SerializeField]
+        private bool _autoEnableCamera = false;
+        
+        [SerializeField]
+        private bool _autoEnableMicrophone = false;
 
         private StreamClientConfig _clientConfig;
         private IStreamCall _activeCall;
diff --git a/Packages/StreamVideo/Samples~/VideoChat/Scripts/UI/ParticipantView.cs b/Packages/StreamVideo/Samples~/VideoChat/Scripts/UI/ParticipantView.cs
@@ -64,10 +64,13 @@ protected void Update()
         {
             var rect = _videoRectTransform.rect;
             var videoRenderedSize = new Vector2(rect.width, rect.height);
-            if (videoRenderedSize != _lastVideoRenderedSize)
+            var forcedRequestedSize = new Vector2(_forceRequestedResolutionWidth, _forceRequestedResolutionHeight);
+            var finalRequestedSize = _forceRequestedResolution ? forcedRequestedSize : videoRenderedSize;
+            
+            if (_lastRequestedResolution != finalRequestedSize)
             {
-                _lastVideoRenderedSize = videoRenderedSize;
-                var videoResolution = new VideoResolution((int)videoRenderedSize.x, (int)videoRenderedSize.y);
+                _lastRequestedResolution = finalRequestedSize;
+                var videoResolution = new VideoResolution((int)finalRequestedSize.x, (int)finalRequestedSize.y);
                 
                 // To optimize bandwidth we always request the video resolution that matches what we're actually rendering
                 Participant.UpdateRequestedVideoResolution(videoResolution);
@@ -119,9 +122,18 @@ protected void OnDestroy()
         [SerializeField]
         private Color32 _defaultSpeakerFrameColor;
 
+        [SerializeField]
+        private bool _forceRequestedResolution = false;
+        
+        [SerializeField]
+        private int _forceRequestedResolutionWidth = 300;
+        
+        [SerializeField]
+        private int _forceRequestedResolutionHeight = 300;
+
         private AudioSource _audioSource;
         private RectTransform _videoRectTransform;
-        private Vector2 _lastVideoRenderedSize;
+        private Vector2 _lastRequestedResolution;
         private Quaternion _baseVideoRotation;
 
         private void OnParticipantTrackAdded(IStreamVideoCallParticipant participant, IStreamTrack track)
diff --git a/Packages/StreamVideo/Samples~/VideoChat/Scripts/UI/Screens/MainScreenView.cs b/Packages/StreamVideo/Samples~/VideoChat/Scripts/UI/Screens/MainScreenView.cs
@@ -140,10 +140,11 @@ private void OnLocalCameraChanged(WebCamTexture activeCamera)
 
         private async Task<string> CreateRandomCallId()
         {
-            var length = 4;
+            var length = 3;
+            var smallSet = true;
             for (var i = 0; i < 10; i++)
             {
-                var callId = GenerateShortId(length);
+                var callId = GenerateShortId(length, smallSet);
                 var isAvailable = await VideoManager.IsCallIdAvailableToTake(callId);
                 if (isAvailable)
                 {
@@ -162,20 +163,24 @@ private async Task<string> CreateRandomCallId()
                 if (i > 5)
                 {
                     length = 8;
+                    smallSet = false;
                 }
                 
             }
             
             throw new Exception("Failed to generate a unique call ID");
         }
 
-        public static string GenerateShortId(int length = 8)
+        public static string GenerateShortId(int length = 8, bool smallSet = false)
         {
             // Some symbols, very close visually, are removed like: (1, l, I) or (O, 0)
             const string chars = "ABCDEFGHJKMNPQRSTUVWXYZabcdefghjkmnpqrstuvwxyz23456789SBZGUV";
+            const string charsSmallSet = "abcdefghjkmnpqrstuvwxyz1234567890";
+
+            var symbols = smallSet ? charsSmallSet : chars;
             var random = new System.Random();
     
-            return new string(Enumerable.Repeat(chars, length)
+            return new string(Enumerable.Repeat(symbols, length)
                 .Select(s => s[random.Next(s.Length)]).ToArray());
         }
     }
diff --git a/Packages/StreamVideo/Samples~/VideoChat/Scripts/UI/UIManager.cs b/Packages/StreamVideo/Samples~/VideoChat/Scripts/UI/UIManager.cs
@@ -133,7 +133,7 @@ private async Task SelectFirstWorkingCameraOrDefaultAsync()
                 var isWorking = await _videoManager.Client.VideoDeviceManager.TestDeviceAsync(device);
                 if (isWorking)
                 {
-                    _videoManager.Client.VideoDeviceManager.SelectDevice(device, enable: false);
+                    _videoManager.Client.VideoDeviceManager.SelectDevice(device, SenderVideoResolution, enable: false, _senderVideoFps);
                     return;
                 }
             }
@@ -142,7 +142,7 @@ private async Task SelectFirstWorkingCameraOrDefaultAsync()
             var workingDevice = await _videoManager.Client.VideoDeviceManager.TryFindFirstWorkingDeviceAsync();
             if (workingDevice.HasValue)
             {
-                _videoManager.Client.VideoDeviceManager.SelectDevice(workingDevice.Value, enable: false);
+                _videoManager.Client.VideoDeviceManager.SelectDevice(workingDevice.Value, SenderVideoResolution, enable: false, _senderVideoFps);
                 return;
             }
 
@@ -156,7 +156,7 @@ private async Task SelectFirstWorkingCameraOrDefaultAsync()
                 return;
             }
 
-            _videoManager.Client.VideoDeviceManager.SelectDevice(firstDevice, enable: false);
+            _videoManager.Client.VideoDeviceManager.SelectDevice(firstDevice, SenderVideoResolution, enable: false, _senderVideoFps);
         }
 
         private void SelectFirstMicrophone()

Original file line number	Diff line number	Diff line change
`@@ -140,10 +140,11 @@ private void OnLocalCameraChanged(WebCamTexture activeCamera)`
`140`	`140`
`141`	`141`	`private async Task<string> CreateRandomCallId()`
`142`	`142`	`{`
`143`		`- var length = 4;`
	`143`	`+ var length = 3;`
	`144`	`+ var smallSet = true;`
`144`	`145`	`for (var i = 0; i < 10; i++)`
`145`	`146`	`{`
`146`		`- var callId = GenerateShortId(length);`
	`147`	`+ var callId = GenerateShortId(length, smallSet);`
`147`	`148`	`var isAvailable = await VideoManager.IsCallIdAvailableToTake(callId);`
`148`	`149`	`if (isAvailable)`
`149`	`150`	`{`
`@@ -162,20 +163,24 @@ private async Task<string> CreateRandomCallId()`
`162`	`163`	`if (i > 5)`
`163`	`164`	`{`
`164`	`165`	`length = 8;`
	`166`	`+ smallSet = false;`
`165`	`167`	`}`
`166`	`168`
`167`	`169`	`}`
`168`	`170`
`169`	`171`	`throw new Exception("Failed to generate a unique call ID");`
`170`	`172`	`}`
`171`	`173`
`172`		`- public static string GenerateShortId(int length = 8)`
	`174`	`+ public static string GenerateShortId(int length = 8, bool smallSet = false)`
`173`	`175`	`{`
`174`	`176`	`// Some symbols, very close visually, are removed like: (1, l, I) or (O, 0)`
`175`	`177`	`const string chars = "ABCDEFGHJKMNPQRSTUVWXYZabcdefghjkmnpqrstuvwxyz23456789SBZGUV";`
	`178`	`+ const string charsSmallSet = "abcdefghjkmnpqrstuvwxyz1234567890";`
	`179`	`+`
	`180`	`+ var symbols = smallSet ? charsSmallSet : chars;`
`176`	`181`	`var random = new System.Random();`
`177`	`182`
`178`		`- return new string(Enumerable.Repeat(chars, length)`
	`183`	`+ return new string(Enumerable.Repeat(symbols, length)`
`179`	`184`	`.Select(s => s[random.Next(s.Length)]).ToArray());`
`180`	`185`	`}`
`181`	`186`	`}`
Original file line number	Diff line number	Diff line change
`@@ -133,7 +133,7 @@ private async Task SelectFirstWorkingCameraOrDefaultAsync()`
`133`	`133`	`var isWorking = await _videoManager.Client.VideoDeviceManager.TestDeviceAsync(device);`
`134`	`134`	`if (isWorking)`
`135`	`135`	`{`
`136`		`- _videoManager.Client.VideoDeviceManager.SelectDevice(device, enable: false);`
	`136`	`+ _videoManager.Client.VideoDeviceManager.SelectDevice(device, SenderVideoResolution, enable: false, _senderVideoFps);`
`137`	`137`	`return;`
`138`	`138`	`}`
`139`	`139`	`}`
`@@ -142,7 +142,7 @@ private async Task SelectFirstWorkingCameraOrDefaultAsync()`
`142`	`142`	`var workingDevice = await _videoManager.Client.VideoDeviceManager.TryFindFirstWorkingDeviceAsync();`
`143`	`143`	`if (workingDevice.HasValue)`
`144`	`144`	`{`
`145`		`- _videoManager.Client.VideoDeviceManager.SelectDevice(workingDevice.Value, enable: false);`
	`145`	`+ _videoManager.Client.VideoDeviceManager.SelectDevice(workingDevice.Value, SenderVideoResolution, enable: false, _senderVideoFps);`
`146`	`146`	`return;`
`147`	`147`	`}`
`148`	`148`
`@@ -156,7 +156,7 @@ private async Task SelectFirstWorkingCameraOrDefaultAsync()`
`156`	`156`	`return;`
`157`	`157`	`}`
`158`	`158`
`159`		`- _videoManager.Client.VideoDeviceManager.SelectDevice(firstDevice, enable: false);`
	`159`	`+ _videoManager.Client.VideoDeviceManager.SelectDevice(firstDevice, SenderVideoResolution, enable: false, _senderVideoFps);`
`160`	`160`	`}`
`161`	`161`
`162`	`162`	`private void SelectFirstMicrophone()`