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

SoraSignalingObserver に OnSwitched を追加する #63

Merged
merged 6 commits into from
Feb 19, 2024

Conversation

enm10k
Copy link
Contributor

@enm10k enm10k commented Feb 19, 2024

No description provided.

@enm10k enm10k marked this pull request as ready for review February 19, 2024 06:22
@enm10k enm10k requested a review from melpon February 19, 2024 06:22
@@ -48,6 +48,7 @@ class SoraSignalingObserver {
virtual void OnNotify(std::string text) = 0;
virtual void OnPush(std::string text) = 0;
virtual void OnMessage(std::string label, std::string data) = 0;
virtual void OnSwitched(std::string text) = 0;
Copy link
Contributor

Choose a reason for hiding this comment

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

これだと既存のコードが破壊的変更になるので、空実装を入れておいてください

Copy link
Contributor Author

Choose a reason for hiding this comment

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

空の関数に差し替えました

また、修正前は OnSwitched を hello に実装していましたが、 datachannel に変えました
(元から data_channel_signaling = true が設定されており、動作を確認しやすいためです)

CHANGES.md Outdated
@@ -26,6 +26,8 @@
- force_i420_conversion_for_simulcast_adapter のデフォルト値は true で I420 への変換を行う
- 変換を行わない場合、エンコードの性能が向上するが、バッファーの実装によってはサイマルキャストが利用できなくなる
- @enm10k
- [UPDATE] SoraSignalingObserver に OnSwitched を追加する
Copy link
Contributor

Choose a reason for hiding this comment

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

UPDATE ではなく ADD ですね

Copy link
Contributor Author

Choose a reason for hiding this comment

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

修正しました

@@ -66,7 +66,7 @@ class SoraClient : public std::enable_shared_from_this<SoraClient>,
[this](const boost::system::error_code&, int) { conn_->Disconnect(); });

timer_.reset(new boost::asio::deadline_timer(*ioc_));
timer_->expires_from_now(boost::posix_time::seconds(1));
timer_->expires_from_now(boost::posix_time::seconds(3));
Copy link
Contributor Author

Choose a reason for hiding this comment

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

@melpon 私が利用した環境では動作が安定しなかったため、秒数を伸ばしました

@enm10k enm10k requested a review from melpon February 19, 2024 08:04
@@ -48,6 +48,7 @@ class SoraSignalingObserver {
virtual void OnNotify(std::string text) = 0;
virtual void OnPush(std::string text) = 0;
virtual void OnMessage(std::string label, std::string data) = 0;
virtual void OnSwitched(std::string text){};
Copy link
Contributor

Choose a reason for hiding this comment

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

フォーマッタを掛けて下さい

Copy link
Contributor Author

Choose a reason for hiding this comment

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

322f545 の修正で正常にフォーマットされるようになったようです

@melpon
Copy link
Contributor

melpon commented Feb 19, 2024

よさそう

@enm10k
Copy link
Contributor Author

enm10k commented Feb 19, 2024

レビューありがとうございます
マージします

@enm10k enm10k merged commit 764b3d5 into develop Feb 19, 2024
8 checks passed
@enm10k enm10k deleted the feature/on-switched branch February 19, 2024 15:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants