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

Jump to bottom

ForwardingFilter に version と metadata を追加する #45

Merged
merged 2 commits into from
Jan 19, 2024
Merged

ForwardingFilter に version と metadata を追加する #45

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
38181e8
ForwardingFilter に version と metadata を追加する
miosakuma Jan 17, 2024
3e19d45
Merge branch 'develop' into feature/add-forwardingfilter-version-meta…
miosakuma Jan 19, 2024
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
5 changes: 4 additions & 1 deletion CHANGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,17 @@
- @tnoho
- [ADD] AudioStreamSink が返す音声フレームとして pickel が可能な AudioFrame を追加
- @tnoho
- [UPDATE] Sora C++ SDK のバージョンを 2023.17.0 に上げる
- [UPDATE] Sora C++ SDK のバージョンを 2024.1.0 に上げる
- WebRTC m116 で cricket::Codec は protected になったので cricket::CreateVideoCodec に修正する
- WebRTC m118 でパッケージディレクトリが変更されたためそれに追従する
- WebRTC m120 の webrtc::EncodedImage API の変更に追従する
- WEBRTC_BUILD_VERSION を `m120.6099.1.2` に上げる
- BOOST_VERSION を `1.83.0` に上げる
- CMAKE_VERSION を `3.27.7` に上げる
- @voluntas @miosakuma
- [UPDATE] ForwardingFilter に version と metadata を追加する
- Sora 2023.2.0, C++ SDK 2024.1.0 への追従
- @miosakuma

## 2023.3.1

Expand Down
6 changes: 6 additions & 0 deletions src/sora.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,6 +286,12 @@ Sora::ConvertForwardingFilter(const nb::handle value) {
}
filter.rules.push_back(rules);
}
if (!object["version"].is_null()) {
filter.version = std::string(object["version"].as_string());
}
if (!object["metadata"].is_null()) {
filter.metadata = object["metadata"];
Copy link
Contributor

@torikizi torikizi Jan 17, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

metadata は他の項目のように ConvertJsonValue をつけなくて良いですか？
signaling_notify_metadata だとこんな感じで設定していたので念のため確認です

  config.signaling_notify_metadata =
      ConvertJsonValue(signaling_notify_metadata,
                       "Invalid JSON value in signaling_notify_metadata");

Copy link
Contributor Author

@miosakuma miosakuma Jan 17, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

確認ありがとうございます。少し前で全体に ConvertJsonValue をかけて変換済みなので問題ない、という理解です。

https://github.com/shiguredo/sora-python-sdk/pull/45/files#diff-0d0290172945fad8d0dd9acd4abac6c388328a3e562f311fcfa83efb79896beaR263

Copy link
Contributor

Choose a reason for hiding this comment

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

おっと見落としておりました。失礼しました。
それであれば大丈夫です。🙏

}
} catch (std::exception&) {
throw nb::type_error("Invalid forwarding_filter");
}
Expand Down