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

fix: Fix audio/video limits since muted stated was moved to SourceInfo. #1090

Merged
merged 3 commits into from
Aug 16, 2023

Conversation

bgrozev
Copy link
Member

@bgrozev bgrozev commented May 5, 2023

No description provided.

import org.jitsi.utils.OrderedJsonObject
import org.jitsi.utils.logging2.Logger
import org.jitsi.utils.logging2.createChildLogger
import org.jitsi.xmpp.extensions.jitsimeet.AudioMutedExtension
import org.jitsi.xmpp.extensions.jitsimeet.FeaturesExtension
Copy link
Member

Choose a reason for hiding this comment

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

Does it matter what jigasi is sending? As It still uses those extensions?

@codecov
Copy link

codecov bot commented May 5, 2023

Codecov Report

Merging #1090 (9fdba67) into master (e05f8da) will increase coverage by 0.09%.
The diff coverage is 37.50%.

Additional details and impacted files

Impacted file tree graph

@@             Coverage Diff              @@
##             master    #1090      +/-   ##
============================================
+ Coverage     27.58%   27.68%   +0.09%     
- Complexity      493      494       +1     
============================================
  Files           129      129              
  Lines          7728     7748      +20     
  Branches       1087     1097      +10     
============================================
+ Hits           2132     2145      +13     
- Misses         5323     5329       +6     
- Partials        273      274       +1     
Files Changed Coverage Δ
...in/org/jitsi/jicofo/xmpp/muc/ChatRoomMemberImpl.kt 0.00% <0.00%> (ø)
...ain/kotlin/org/jitsi/jicofo/xmpp/muc/SourceInfo.kt 86.20% <93.75%> (+6.20%) ⬆️

Continue to review full report in Codecov by Sentry.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update e05f8da...9fdba67. Read the comment docs.

@@ -175,22 +188,6 @@ class ChatRoomMemberImpl(
presence.getExtension(StatsId::class.java)?.let {
statsId = it.statsId
}

Copy link
Member

Choose a reason for hiding this comment

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

Should we not leave this in if the endpoint doesn't support source-names ?

Copy link
Member Author

Choose a reason for hiding this comment

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

Do endpoints with source name support always include SourceInfo (even when they don't have any tracks)?

Copy link
Member

Choose a reason for hiding this comment

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

Nope, SourceInfo gets added only if there are local tracks.

Copy link
Member

@jallamsetty1 jallamsetty1 May 8, 2023

Choose a reason for hiding this comment

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

Sorry, just realized that we send an empty SourceInfo on join if the endpoint doesn't have any local tracks.
"<SourceInfo>{}</SourceInfo>"

JonathanLennox
JonathanLennox previously approved these changes May 8, 2023
/** The information about a source contained in a jitsi-meet SourceInfo extension. */
data class SourceInfo(
val name: String,
val muted: Boolean,
val videoType: VideoType?
)
) {
val mediaType: MediaType? = name.indexOf('-').let { indexOfDash ->
Copy link
Member

Choose a reason for hiding this comment

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

I'd rather we signal this explicitly rather than implicitly as here, though that can potentially be a separate PR (and would require client changes).

@bgrozev bgrozev merged commit 42cb648 into jitsi:master Aug 16, 2023
4 checks passed
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.

4 participants