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.

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

マルチ転送フィルターを設定可能にする #62

Merged
merged 18 commits into from
Dec 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,12 @@

## develop

- [ADD] forwardingfilters を設定可能にする
- マルチ転送フィルターを設定できるように項目を追加
- @torikizi
- [ADD] forwardingfilter に name と priority を追加
- @torikizi

## sora-unity-sdk-2024.4.0

- [UPDATE] Sora Unity SDK 2024.4.0 にあげる
Expand Down
111 changes: 68 additions & 43 deletions SoraUnitySdkSamples/Assets/SoraSample.cs
Original file line number Diff line number Diff line change
Expand Up @@ -123,15 +123,66 @@ public class RuleList
{
public Rule[] data;
}
[System.Serializable]
public class ForwardingFilter
{
public bool enableAction = false;
public string action;
public bool enableName = false;
public string name;
public bool enablePriority = false;
public int priority;
public RuleList[] ruleLists;
public bool enableVersion = false;
public string version = "";
public bool enableMetadata = false;
public ForwardingFilterMetadata metadata;
}

[Serializable]
public class ForwardingFilterMetadata
{
public string metadata;
}
public static Sora.ForwardingFilter ConvertToSoraForwardingFilter(ForwardingFilter forwardingFilter)
{
var filter = new Sora.ForwardingFilter();

if (forwardingFilter.enableAction) filter.Action = forwardingFilter.action;
if (forwardingFilter.enableName) filter.Name = forwardingFilter.name;
if (forwardingFilter.enablePriority) filter.Priority = forwardingFilter.priority;

foreach (var ruleListData in forwardingFilter.ruleLists)
{
var ruleList = new List<Sora.ForwardingFilter.Rule>();
foreach (var rule in ruleListData.data)
{
var newRule = new Sora.ForwardingFilter.Rule
{
Field = rule.field,
Operator = rule.op
};
newRule.Values.AddRange(rule.values);
ruleList.Add(newRule);
}
filter.Rules.Add(ruleList);
}

if (forwardingFilter.enableVersion) filter.Version = forwardingFilter.version;
if (forwardingFilter.enableMetadata) filter.Metadata = JsonUtility.ToJson(forwardingFilter.metadata);

return filter;
}

[Header("ForwardingFilter の設定")]
public bool enableForwardingFilterAction = false;
public string forwardingFilterAction;
public RuleList[] forwardingFilter;
public bool enableForwardingFilterVersion = false;
public string forwardingFilterVersion = "";
public bool enableForwardingFilterMetadata = false;
public string forwardingFilterMetadataMessage = "";
[System.Obsolete("forwardingFilter は非推奨です。代わりに forwardingFilters を使用してください。")]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

これはもう1行下で設定するのが正しそう?もしかしたら両方の変数に必要かも

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

対象としては両方あった方が良さそうですね。両方設定します。
Image from Gyazo

public bool enableForwardingFilter = false;
[System.Obsolete("forwardingFilter は非推奨です。代わりに forwardingFilters を使用してください。")]
public ForwardingFilter forwardingFilter;

[Header("ForwardingFilters の設定")]
public bool enableForwardingFilters = false;
public ForwardingFilter[] forwardingFilters;

[Header("DataChannel シグナリングの設定")]
public bool dataChannelSignaling = false;
Expand Down Expand Up @@ -597,12 +648,6 @@ class VideoH264Params
public string profile_level_id;
}

[Serializable]
class ForwardingFilterMetadata
{
public string forwarding_filter_metadata;
}

public void OnClickStart()
{

Expand Down Expand Up @@ -677,16 +722,6 @@ public void OnClickStart()
};
videoH264ParamsJson = JsonUtility.ToJson(h264Params);
}
// enableForwardingFilterMetadata が true の場合はメタデータを設定する
string forwardingFilterMetadataJson = "";
if (enableForwardingFilterMetadata)
{
var ffm = new ForwardingFilterMetadata()
{
forwarding_filter_metadata = forwardingFilterMetadataMessage
};
forwardingFilterMetadataJson = JsonUtility.ToJson(ffm);
}

InitSora();

Expand Down Expand Up @@ -777,30 +812,20 @@ public void OnClickStart()
}
fixedDataChannelLabels = config.DataChannels.Select(x => x.Label).ToArray();
}
if (forwardingFilter.Length != 0)
if (enableForwardingFilter)
{
config.ForwardingFilter = new Sora.ForwardingFilter();
if (enableForwardingFilterAction) config.ForwardingFilter.Action = forwardingFilterAction;
foreach (var rs in forwardingFilter)
config.ForwardingFilter = ConvertToSoraForwardingFilter(forwardingFilter);
}
if (enableForwardingFilters)
{
config.ForwardingFilters = new List<Sora.ForwardingFilter>();

foreach (var filter in forwardingFilters)
{
var ccrs = new List<Sora.ForwardingFilter.Rule>();
foreach (var r in rs.data)
{
var ccr = new Sora.ForwardingFilter.Rule();
ccr.Field = r.field;
ccr.Operator = r.op;
foreach (var v in r.values)
{
ccr.Values.Add(v);
}
ccrs.Add(ccr);
}
config.ForwardingFilter.Rules.Add(ccrs);
var newFilter = ConvertToSoraForwardingFilter(filter);
config.ForwardingFilters.Add(newFilter);
}
if (enableForwardingFilterVersion) config.ForwardingFilter.Version = forwardingFilterVersion;
if (enableForwardingFilterMetadata) config.ForwardingFilter.Metadata = forwardingFilterMetadataJson;
}

sora.Connect(config);
SetState(State.Started);
Debug.LogFormat("Sora is Created: signalingUrl={0}, channelId={1}", signalingUrl, channelId);
Expand Down