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

Updates jibri pjsua part #233

Merged
merged 9 commits into from Nov 28, 2019
Merged

Updates jibri pjsua part #233

merged 9 commits into from Nov 28, 2019

Conversation

damencho
Copy link
Member

No description provided.

Changes capture device id.
Chrome uses default audio device.
These can be configured in pjsua.config.
The capture and playback devices indexes are based on latest asoundrc
config:
Found 16 devices
  0: ALSA [amix] (0/1)
  1: ALSA [asnoop] (1/0)
  2: ALSA [aduplex] (1/1)
  3: ALSA [bmix] (0/1)
  4: ALSA [bsnoop] (1/0)
  5: ALSA [bduplex] (1/1)
  6: ALSA [pjsua] (1/1)
  7: ALSA [default] (1/1)
  8: ALSA [hw:CARD=Loopback,DEV=0] (1/1)
  9: ALSA [hw:CARD=Loopback,DEV=1] (1/1)
 10: ALSA [plughw:CARD=Loopback,DEV=0] (1/1)
 11: ALSA [plughw:CARD=Loopback,DEV=1] (1/1)
 12: ALSA [hw:CARD=Loopback_1,DEV=0] (1/1)
 13: ALSA [hw:CARD=Loopback_1,DEV=1] (1/1)
 14: ALSA [plughw:CARD=Loopback_1,DEV=0] (1/1)
 15: ALSA [plughw:CARD=Loopback_1,DEV=1] (1/1)
saghul
saghul previously approved these changes Nov 28, 2019
Copy link
Member

@saghul saghul left a comment

Choose a reason for hiding this comment

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

LGTM with a couple of comments.

resources/debian-package/etc/jitsi/jibri/asoundrc Outdated Show resolved Hide resolved
--no-vad
--ec-tail 0
--quality 10
#--auto-answer-timer=30
Copy link
Member

Choose a reason for hiding this comment

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

why are these commened out?

Copy link
Member Author

Choose a reason for hiding this comment

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

If you use sip-jibri from the xmpp side, not sure how it will act ...

Copy link
Member

Choose a reason for hiding this comment

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

But then it won't work on the other case... I guess it's ok for now, but maybe we should move those to back the Java side so it can be made functional both ways without changes?

--max-calls can stay

#--auto-answer=200
#--max-calls=1
--no-stderr
--log-file=/tmp/pjsua.out
Copy link
Member

Choose a reason for hiding this comment

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

/var/log/jibri/pjsua.log while we are at it?

@@ -34,7 +34,17 @@ data class SipClientParams(
* Whether auto-answer is enabled, if it is, the client will listen for
* incoming invites and will auto answer the first one.
*/
val autoAnswer: Boolean = false
val autoAnswer: Boolean = false,
Copy link
Member

Choose a reason for hiding this comment

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

Are we planning on supporting the non auto-answer case?

Copy link
Member Author

Choose a reason for hiding this comment

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

This is the xmpp side triggering this, as it creates a sip call.

When running from java we seems to block the stdout writing of pjsua and
 hang the app, launching it from a script seems to avoid that.
@@ -6,7 +6,7 @@ After=network.target
User=jibri
Group=jibri
Environment=DISPLAY=:0
ExecStart=/usr/bin/Xorg -nocursor -noreset +extension RANDR +extension RENDER -logfile /tmp/xorg.log -config /etc/jitsi/jibri/xorg-video-dummy.conf :0
ExecStart=/usr/bin/Xorg -nocursor -noreset +extension RANDR +extension RENDER -logfile /var/log/xorg.log -config /etc/jitsi/jibri/xorg-video-dummy.conf :0
Copy link
Member

Choose a reason for hiding this comment

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

Since this X server is for Jibri I'd put the log file in /var/log/jitsi/jibri

saghul
saghul previously approved these changes Nov 28, 2019
@damencho damencho merged commit 5a71969 into master Nov 28, 2019
@damencho damencho deleted the upass-pjsua branch November 28, 2019 16:10
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.

None yet

2 participants