libwebrtc: replace MS_ASSERT with MS_ERROR #988
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- Fixes #986 - Let's use `MS_ERROR` instead of `MS_WARN_TAG(bwe)` to make these errors as visible as possible. - Sometimes use more modern libwebrtc code such as the usage of `absl::optional` somewhere in code diff. - Original `RTC_DCHECK` is supposed to not abort in libwebrtc Release mode, which means that code below keeps running with inconsistent data. I've tried to return eariler as much as possible but it's not always possible.
ibc
commented
Jan 24, 2023
Comment on lines
+206
to
+208
| if (clusters_.empty() || probing_state_ != ProbingState::kActive) { | ||
| return absl::nullopt; | ||
| } |
There was a problem hiding this comment.
This is how modern libwebrtc code looks.
ibc
commented
Jan 24, 2023
ibc
commented
Jan 24, 2023
| @@ -66,7 +66,7 @@ class BitrateProber { | |||
| int TimeUntilNextProbe(int64_t now_ms); | |||
|
|
|||
| // Information about the current probing cluster. | |||
| PacedPacketInfo CurrentCluster() const; | |||
| absl::optional<PacedPacketInfo> CurrentCluster() const; | |||
There was a problem hiding this comment.
Copied from modern libwebrtc version.
ibc
commented
Jan 24, 2023
| @@ -185,7 +194,7 @@ void PacedSender::Process() { | |||
| PacedPacketInfo pacing_info; | |||
| absl::optional<size_t> recommended_probe_size; | |||
|
|
|||
| pacing_info = prober_.CurrentCluster(); | |||
| pacing_info = prober_.CurrentCluster().value_or(PacedPacketInfo()); | |||
There was a problem hiding this comment.
Hope this is ok. Used in libwebrtc modern version somewhere.
Pull reviewers statsStats of the last 365 days for mediasoup:
|
jmillan
reviewed
Jan 24, 2023
| if (!positive_semi_definite) { | ||
| MS_ERROR("The over-use estimator's covariance matrix is no longer " | ||
| "semi-definite."); | ||
| MS_ERROR("the over-use estimator's covariance matrix is no longer semi-definite"); |
There was a problem hiding this comment.
There is no such a return in libwebrtc.
ibc
commented
Jan 24, 2023
Comment on lines
271
to
281
| int64_t BitrateProber::GetNextProbeTime(const ProbeCluster& cluster) { | ||
| // RTC_CHECK_GT(cluster.pace_info.send_bitrate_bps, 0); | ||
| // RTC_CHECK_GE(cluster.time_started_ms, 0); | ||
| MS_ASSERT(cluster.pace_info.send_bitrate_bps > 0, "cluster.pace_info.send_bitrate_bps must be > 0"); | ||
| MS_ASSERT(cluster.time_started_ms > 0, "cluster.time_started_ms must be > 0"); | ||
| if (cluster.pace_info.send_bitrate_bps <= 0) { | ||
| MS_ERROR("cluster.pace_info.send_bitrate_bps must be > 0"); | ||
| return 0; | ||
| } | ||
| if (cluster.time_started_ms <= 0) { | ||
| MS_ERROR("cluster.time_started_ms must be > 0"); | ||
| return 0; | ||
| } |
There was a problem hiding this comment.
@jmillan I'm gonna revert these changes because those were RTC_CHECK so assertion is needed.
jmillan
approved these changes
Jan 25, 2023
This was referenced Jan 26, 2023
piranna
pushed a commit
to dyte-in/mediasoup
that referenced
this pull request
Feb 9, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
MS_ERRORinstead ofMS_WARN_TAG(bwe)to make these errors as visible as possible.absl::optionalsomewhere in code diff.RTC_DCHECKin libwebrtc does NOT abort so we must only show error logs and, depending on each case, do early return or not. If not, it means that code below keeps running with inconsistent data. I've tried to return earlier as much as possible but it's not always possible. In fact,RTC_CHECK*does abort even in Release mode. However,RTC_DCHECKjust logs it.