Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bugfix/uni 77 fix call deserialization enum mapping #132

Merged
merged 2 commits into from
Feb 13, 2025
Merged

Bugfix/uni 77 fix call deserialization enum mapping #132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
65635fb
Fix OwnCapability to map all entries from OwnCapabilityInternalEnum
sierpinskid Feb 13, 2025
6e1b9f2
Add missing enum mappings between RecordSettingsQualityInternalEnum a…
sierpinskid Feb 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions Packages/StreamVideo/Runtime/Core/Models/BackstageSettings.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using StreamVideo.Core.InternalDTO.Models;
using StreamVideo.Core.InternalDTO.Responses;
using StreamVideo.Core.InternalDTO.Responses;
using StreamVideo.Core.State;
using StreamVideo.Core.State.Caches;

Expand Down
3 changes: 1 addition & 2 deletions Packages/StreamVideo/Runtime/Core/Models/BroadcastSettings.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using StreamVideo.Core.InternalDTO.Models;
using StreamVideo.Core.InternalDTO.Requests;
using StreamVideo.Core.InternalDTO.Requests;
using StreamVideo.Core.InternalDTO.Responses;
using StreamVideo.Core.State;
using StreamVideo.Core.State.Caches;
Expand Down
76 changes: 41 additions & 35 deletions Packages/StreamVideo/Runtime/Core/Models/OwnCapability.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,33 +6,35 @@ namespace StreamVideo.Core.Models
public enum OwnCapability
{
BlockUsers = 0,
CreateCall = 1,
CreateReaction = 2,
EndCall = 3,
JoinBackstage = 4,
JoinCall = 5,
JoinEndedCall = 6,
MuteUsers = 7,
PinForEveryone = 8,
ReadCall = 9,
RemoveCallMember = 10,
Screenshare = 11,
SendAudio = 12,
SendVideo = 13,
StartBroadcastCall = 14,
StartRecordCall = 15,
StartTranscriptionCall = 16,
StopBroadcastCall = 17,
StopRecordCall = 18,
StopTranscriptionCall = 19,
UpdateCall = 20,
UpdateCallMember = 21,
UpdateCallPermissions = 22,
UpdateCallSettings = 23,
EnableNoiseCancellation = 24,
ChangeMaxDuration = 25,
StartClosedCaptionsCall = 26,
StopClosedCaptionsCall = 27,
ChangeMaxDuration = 1,
CreateCall = 2,
CreateReaction = 3,
EnableNoiseCancellation = 4,
EndCall = 5,
JoinBackstage = 6,
JoinCall = 7,
JoinEndedCall = 8,
MuteUsers = 9,
PinForEveryone = 10,
ReadCall = 11,
RemoveCallMember = 12,
Screenshare = 13,
SendAudio = 14,
SendVideo = 15,
StartBroadcastCall = 16,
StartClosedCaptionsCall = 17,
StartFrameRecordCall = 18,
StartRecordCall = 19,
StartTranscriptionCall = 20,
StopBroadcastCall = 21,
StopClosedCaptionsCall = 22,
StopFrameRecordCall = 23,
StopRecordCall = 24,
StopTranscriptionCall = 25,
UpdateCall = 26,
UpdateCallMember = 27,
UpdateCallPermissions = 28,
UpdateCallSettings = 29,
}

internal static class OwnCapabilityExt
Expand All @@ -42,8 +44,10 @@ public static OwnCapabilityInternalEnum ToInternalEnum(this OwnCapability ownCap
switch (ownCapability)
{
case OwnCapability.BlockUsers: return OwnCapabilityInternalEnum.BlockUsers;
case OwnCapability.ChangeMaxDuration: return OwnCapabilityInternalEnum.ChangeMaxDuration;
case OwnCapability.CreateCall: return OwnCapabilityInternalEnum.CreateCall;
case OwnCapability.CreateReaction: return OwnCapabilityInternalEnum.CreateReaction;
case OwnCapability.EnableNoiseCancellation: return OwnCapabilityInternalEnum.EnableNoiseCancellation;
case OwnCapability.EndCall: return OwnCapabilityInternalEnum.EndCall;
case OwnCapability.JoinBackstage: return OwnCapabilityInternalEnum.JoinBackstage;
case OwnCapability.JoinCall: return OwnCapabilityInternalEnum.JoinCall;
Expand All @@ -56,19 +60,19 @@ public static OwnCapabilityInternalEnum ToInternalEnum(this OwnCapability ownCap
case OwnCapability.SendAudio: return OwnCapabilityInternalEnum.SendAudio;
case OwnCapability.SendVideo: return OwnCapabilityInternalEnum.SendVideo;
case OwnCapability.StartBroadcastCall: return OwnCapabilityInternalEnum.StartBroadcastCall;
case OwnCapability.StartClosedCaptionsCall: return OwnCapabilityInternalEnum.StartClosedCaptionsCall;
case OwnCapability.StartFrameRecordCall: return OwnCapabilityInternalEnum.StartFrameRecordCall;
case OwnCapability.StartRecordCall: return OwnCapabilityInternalEnum.StartRecordCall;
case OwnCapability.StartTranscriptionCall: return OwnCapabilityInternalEnum.StartTranscriptionCall;
case OwnCapability.StopBroadcastCall: return OwnCapabilityInternalEnum.StopBroadcastCall;
case OwnCapability.StopClosedCaptionsCall: return OwnCapabilityInternalEnum.StopClosedCaptionsCall;
case OwnCapability.StopFrameRecordCall: return OwnCapabilityInternalEnum.StopFrameRecordCall;
case OwnCapability.StopRecordCall: return OwnCapabilityInternalEnum.StopRecordCall;
case OwnCapability.StopTranscriptionCall: return OwnCapabilityInternalEnum.StopTranscriptionCall;
case OwnCapability.UpdateCall: return OwnCapabilityInternalEnum.UpdateCall;
case OwnCapability.UpdateCallMember: return OwnCapabilityInternalEnum.UpdateCallMember;
case OwnCapability.UpdateCallPermissions: return OwnCapabilityInternalEnum.UpdateCallPermissions;
case OwnCapability.UpdateCallSettings: return OwnCapabilityInternalEnum.UpdateCallSettings;
case OwnCapability.EnableNoiseCancellation: return OwnCapabilityInternalEnum.EnableNoiseCancellation;
case OwnCapability.ChangeMaxDuration: return OwnCapabilityInternalEnum.ChangeMaxDuration;
case OwnCapability.StartClosedCaptionsCall: return OwnCapabilityInternalEnum.StartClosedCaptionsCall;
case OwnCapability.StopClosedCaptionsCall: return OwnCapabilityInternalEnum.StopClosedCaptionsCall;
default: throw new ArgumentOutOfRangeException(nameof(ownCapability), ownCapability, null);
}
}
Expand All @@ -78,8 +82,10 @@ public static OwnCapability ToPublicEnum(this OwnCapabilityInternalEnum ownCapab
switch (ownCapability)
{
case OwnCapabilityInternalEnum.BlockUsers: return OwnCapability.BlockUsers;
case OwnCapabilityInternalEnum.ChangeMaxDuration: return OwnCapability.ChangeMaxDuration;
case OwnCapabilityInternalEnum.CreateCall: return OwnCapability.CreateCall;
case OwnCapabilityInternalEnum.CreateReaction: return OwnCapability.CreateReaction;
case OwnCapabilityInternalEnum.EnableNoiseCancellation: return OwnCapability.EnableNoiseCancellation;
case OwnCapabilityInternalEnum.EndCall: return OwnCapability.EndCall;
case OwnCapabilityInternalEnum.JoinBackstage: return OwnCapability.JoinBackstage;
case OwnCapabilityInternalEnum.JoinCall: return OwnCapability.JoinCall;
Expand All @@ -92,19 +98,19 @@ public static OwnCapability ToPublicEnum(this OwnCapabilityInternalEnum ownCapab
case OwnCapabilityInternalEnum.SendAudio: return OwnCapability.SendAudio;
case OwnCapabilityInternalEnum.SendVideo: return OwnCapability.SendVideo;
case OwnCapabilityInternalEnum.StartBroadcastCall: return OwnCapability.StartBroadcastCall;
case OwnCapabilityInternalEnum.StartClosedCaptionsCall: return OwnCapability.StartClosedCaptionsCall;
case OwnCapabilityInternalEnum.StartFrameRecordCall: return OwnCapability.StartFrameRecordCall;
case OwnCapabilityInternalEnum.StartRecordCall: return OwnCapability.StartRecordCall;
case OwnCapabilityInternalEnum.StartTranscriptionCall: return OwnCapability.StartTranscriptionCall;
case OwnCapabilityInternalEnum.StopBroadcastCall: return OwnCapability.StopBroadcastCall;
case OwnCapabilityInternalEnum.StopClosedCaptionsCall: return OwnCapability.StopClosedCaptionsCall;
case OwnCapabilityInternalEnum.StopFrameRecordCall: return OwnCapability.StopFrameRecordCall;
case OwnCapabilityInternalEnum.StopRecordCall: return OwnCapability.StopRecordCall;
case OwnCapabilityInternalEnum.StopTranscriptionCall: return OwnCapability.StopTranscriptionCall;
case OwnCapabilityInternalEnum.UpdateCall: return OwnCapability.UpdateCall;
case OwnCapabilityInternalEnum.UpdateCallMember: return OwnCapability.UpdateCallMember;
case OwnCapabilityInternalEnum.UpdateCallPermissions: return OwnCapability.UpdateCallPermissions;
case OwnCapabilityInternalEnum.UpdateCallSettings: return OwnCapability.UpdateCallSettings;
case OwnCapabilityInternalEnum.EnableNoiseCancellation: return OwnCapability.EnableNoiseCancellation;
case OwnCapabilityInternalEnum.ChangeMaxDuration: return OwnCapability.ChangeMaxDuration;
case OwnCapabilityInternalEnum.StartClosedCaptionsCall: return OwnCapability.StartClosedCaptionsCall;
case OwnCapabilityInternalEnum.StopClosedCaptionsCall: return OwnCapability.StopClosedCaptionsCall;
default: throw new ArgumentOutOfRangeException(nameof(ownCapability), ownCapability, null);
}
}
Expand Down
21 changes: 20 additions & 1 deletion Packages/StreamVideo/Runtime/Core/Models/RecordSettingsQuality.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,11 @@ public enum RecordSettingsQuality
_720p = 2,
_1080p = 3,
_1440p = 4,
Portrait360x640 = 5,
Portrait480x854 = 6,
Portrait720x1280 = 7,
Portrait1080x1920 = 8,
Portrait1440x2560 = 9
}

internal static class RecordSettingsQualityInternalEnumExt
Expand All @@ -23,6 +28,11 @@ public static RecordSettingsQuality ToPublicEnum(this RecordSettingsQualityInter
case RecordSettingsQualityInternalEnum._720p: return RecordSettingsQuality._720p;
case RecordSettingsQualityInternalEnum._1080p: return RecordSettingsQuality._1080p;
case RecordSettingsQualityInternalEnum._1440p: return RecordSettingsQuality._1440p;
case RecordSettingsQualityInternalEnum.Portrait360x640: return RecordSettingsQuality.Portrait360x640;
case RecordSettingsQualityInternalEnum.Portrait480x854: return RecordSettingsQuality.Portrait480x854;
case RecordSettingsQualityInternalEnum.Portrait720x1280: return RecordSettingsQuality.Portrait720x1280;
case RecordSettingsQualityInternalEnum.Portrait1080x1920: return RecordSettingsQuality.Portrait1080x1920;
case RecordSettingsQualityInternalEnum.Portrait1440x2560: return RecordSettingsQuality.Portrait1440x2560;
default:
throw new ArgumentOutOfRangeException(nameof(internalValue), internalValue, null);
}
Expand All @@ -37,6 +47,11 @@ public static RecordSettingsQualityInternalEnum ToInternalEnum(this RecordSettin
case RecordSettingsQuality._720p: return RecordSettingsQualityInternalEnum._720p;
case RecordSettingsQuality._1080p: return RecordSettingsQualityInternalEnum._1080p;
case RecordSettingsQuality._1440p: return RecordSettingsQualityInternalEnum._1440p;
case RecordSettingsQuality.Portrait360x640: return RecordSettingsQualityInternalEnum.Portrait360x640;
case RecordSettingsQuality.Portrait480x854: return RecordSettingsQualityInternalEnum.Portrait480x854;
case RecordSettingsQuality.Portrait720x1280: return RecordSettingsQualityInternalEnum.Portrait720x1280;
case RecordSettingsQuality.Portrait1080x1920: return RecordSettingsQualityInternalEnum.Portrait1080x1920;
case RecordSettingsQuality.Portrait1440x2560: return RecordSettingsQualityInternalEnum.Portrait1440x2560;
default:
throw new ArgumentOutOfRangeException(nameof(publicValue), publicValue, null);
}
Expand All @@ -51,10 +66,14 @@ public static RecordSettingsQuality ParseToPublicEnum(string internalValue)
case "720p": return RecordSettingsQuality._720p;
case "1080p": return RecordSettingsQuality._1080p;
case "1440p": return RecordSettingsQuality._1440p;
case "portrait-360x640": return RecordSettingsQuality.Portrait360x640;
case "portrait-480x854": return RecordSettingsQuality.Portrait480x854;
case "portrait-720x1280": return RecordSettingsQuality.Portrait720x1280;
case "portrait-1080x1920": return RecordSettingsQuality.Portrait1080x1920;
case "portrait-1440x2560": return RecordSettingsQuality.Portrait1440x2560;
default:
throw new ArgumentOutOfRangeException(nameof(internalValue), internalValue, null);
}
}

}
}
3 changes: 1 addition & 2 deletions Packages/StreamVideo/Runtime/Core/Models/RingSettings.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using StreamVideo.Core.InternalDTO.Models;
using StreamVideo.Core.InternalDTO.Responses;
using StreamVideo.Core.InternalDTO.Responses;
using StreamVideo.Core.State;
using StreamVideo.Core.State.Caches;

Expand Down
3 changes: 1 addition & 2 deletions Packages/StreamVideo/Runtime/Core/Models/SFU.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using StreamVideo.Core.InternalDTO.Responses;
using StreamVideo.Core.LowLevelClient;
using StreamVideo.Core.State;
using StreamVideo.Core.State.Caches;

Expand All @@ -10,7 +9,7 @@ public sealed class SFU : IStateLoadableFrom<SFUResponseInternalDTO, SFU>
public string EdgeName { get; private set; }

#if STREAM_LOCAL_SFU
public string Url => StreamVideoLowLevelClient.LocalSfuWebSocketUri.ToString();
public string Url => StreamVideo.Core.LowLevelClient.StreamVideoLowLevelClient.LocalSfuWebSocketUri.ToString();
#else
public string Url { get; private set; }
#endif
Expand Down
3 changes: 1 addition & 2 deletions Packages/StreamVideo/Runtime/Core/Models/ScreensharingSettings.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using StreamVideo.Core.InternalDTO.Models;
using StreamVideo.Core.InternalDTO.Responses;
using StreamVideo.Core.InternalDTO.Responses;
using StreamVideo.Core.State;
using StreamVideo.Core.State.Caches;

Expand Down
3 changes: 1 addition & 2 deletions Packages/StreamVideo/Runtime/Core/Models/VideoSettings.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using StreamVideo.Core.InternalDTO.Models;
using StreamVideo.Core.InternalDTO.Responses;
using StreamVideo.Core.InternalDTO.Responses;
using StreamVideo.Core.State;
using StreamVideo.Core.State.Caches;

Expand Down
Loading