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

Add lobby for dial-in #300

Merged
merged 12 commits into from
Sep 15, 2020
Merged

Add lobby for dial-in #300

merged 12 commits into from
Sep 15, 2020

Conversation

theunafraid
Copy link
Contributor

@theunafraid theunafraid commented Jul 2, 2020 •
edited
Loading

Overall ready to be merged, there might be cases where lobby listeners are not cleared, maybe on hangup.

@theunafraid theunafraid marked this pull request as ready for review July 3, 2020 12:10
damencho
damencho reviewed Jul 3, 2020
View reviewed changes
src/main/java/org/jitsi/jigasi/lobby/Lobby.java Outdated

String region = JigasiBundleActivator.getConfigurationService()
.getString(LOCAL_REGION_PNAME);
if(!StringUtils.isNullOrEmpty(region))
Copy link
Member

Choose a reason for hiding this comment

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

We do not need this. This is for the main room so we inform jicofo for our region to select us appropriate jvb. We do not have media for lobby room so no need.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Removed

damencho
damencho reviewed Jul 3, 2020
View reviewed changes
src/main/java/org/jitsi/jigasi/lobby/Lobby.java Outdated
new ColibriStatsExtension.Stat(
ColibriStatsExtension.VERSION,
CurrentVersionImpl.VERSION.getApplicationName()
+ " " + CurrentVersionImpl.VERSION));
Copy link
Member

Choose a reason for hiding this comment

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

Same here, we do not need this in lobby.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Removed

damencho
damencho reviewed Jul 3, 2020
View reviewed changes
src/main/java/org/jitsi/jigasi/lobby/Lobby.java Outdated
if (initiator.getChildExtensions().size() > 0)
{
((ChatRoomJabberImpl)mucRoom)
.addPresencePacketExtensions(initiator);
Copy link
Member

Choose a reason for hiding this comment

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

This also can be dropped for lobby.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Removed code

damencho
damencho reviewed Jul 3, 2020
View reviewed changes
src/main/java/org/jitsi/jigasi/lobby/Lobby.java
}

private void approve(ChatRoomInvitationReceivedEvent chatRoomInvitationReceivedEvent)
{
Copy link
Member

Choose a reason for hiding this comment

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

This is not "approve" ... it just adds a listener for access approved. You can move it directly under invitationReceived.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Removed approve and reject and moved the code in the listener methods

damencho
damencho reviewed Jul 3, 2020
View reviewed changes
src/main/java/org/jitsi/jigasi/lobby/Lobby.java
}

private void reject()
{
Copy link
Member

Choose a reason for hiding this comment

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

This can also be moved ... or at least renamed as "rejected".

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Removed

@theunafraid theunafraid changed the title [WIP] Add lobby for dial-in Add lobby for dial-in Jul 7, 2020
damencho
damencho reviewed Jul 7, 2020
View reviewed changes
src/main/java/org/jitsi/jigasi/lobby/Lobby.java
@@ -0,0 +1,213 @@
package org.jitsi.jigasi.lobby;
Copy link
Member

Choose a reason for hiding this comment

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

Missing license header.

Copy link
Member

Choose a reason for hiding this comment

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

And in general missing javadocs for this class.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Added javadocs.

@theunafraid theunafraid force-pushed the dial-in-lobby branch 4 times, most recently from 72d918d to 42309f6 Compare July 14, 2020 11:37
damencho
damencho reviewed Jul 16, 2020
View reviewed changes
src/main/java/org/jitsi/jigasi/lobby/Lobby.java Outdated

if (alternateAddress != null)
{
String mainRoomIdentifier = alternateAddress;
Copy link
Member

Choose a reason for hiding this comment

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

You don't need this extra variable, right?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Removed.

@theunafraid theunafraid force-pushed the dial-in-lobby branch 3 times, most recently from 3263043 to 4c27a84 Compare July 17, 2020 14:01
damencho
damencho reviewed Sep 14, 2020
View reviewed changes
src/main/java/org/jitsi/jigasi/SoundNotificationManager.java Outdated
@@ -22,18 +22,24 @@
import net.java.sip.communicator.util.*;
import org.gagravarr.ogg.*;
import org.gagravarr.opus.*;
import org.glassfish.hk2.api.Operation;
Copy link
Member

Choose a reason for hiding this comment

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

Do we need this?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Sorry forgot about imports

bgrozev
bgrozev reviewed Sep 15, 2020
View reviewed changes
src/main/java/org/jitsi/jigasi/SoundNotificationManager.java Outdated
@@ -386,12 +387,13 @@ private static void injectSoundFileInStream(
System.arraycopy(
data, 0, rtp.getBuffer(), rtp.getPayloadOffset(), data.length);

long sleepTime = nSamples/48 - (System.currentTimeMillis() - timePushPreviousData);
Copy link
Member

Choose a reason for hiding this comment

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

timePushPreviousData would have been set on the previous iteration after the sleep() call, so it doesn't take into account how long sleep took. Or am I missing something?

Copy link
Member

Choose a reason for hiding this comment

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

Yes, that's true, but we count how long it took since we last sent a packet so we can sleep the rest of the time of that interval.

@damencho
squash: Further improve sending audio notifications.
5412823 
Make sure we not over sleep and send the first 200ms directly. Thanks to @bgrozev.
@damencho damencho mentioned this pull request Sep 15, 2020
Merged
@damencho damencho merged commit 2fb10fe into jitsi:master Sep 15, 2020
@bgrozev bgrozev mentioned this pull request Jul 6, 2022
Open
@bgrozev bgrozev mentioned this pull request Oct 5, 2022
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bgrozev bgrozev bgrozev left review comments

@damencho damencho damencho approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@theunafraid @damencho @bgrozev @cristifg