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

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

Commits on Nov 15, 2019

  1. Adds user and pass params. 

    Changes capture device id.
    @damencho
    damencho committed Nov 15, 2019
    Copy the full SHA
    fe571f1 View commit details
    Browse the repository at this point in the history

Commits on Nov 26, 2019

  1. Updates asoundrc with one that can be used by pjsua. 

    Chrome uses default audio device.
    @damencho
    damencho committed Nov 26, 2019
    Copy the full SHA
    2edb630 View commit details
    Browse the repository at this point in the history

Commits on Nov 27, 2019

  1. Removes hard coded capture and playback devices. 

    These can be configured in pjsua.config.
    @damencho
    damencho committed Nov 27, 2019
    Copy the full SHA
    798ea8d View commit details
    Browse the repository at this point in the history

  2. Adds pjsua config to /etc/jitsi/jibri. 

    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)
    @damencho
    damencho committed Nov 27, 2019
    Copy the full SHA
    05ca329 View commit details
    Browse the repository at this point in the history

  3. Moves static pjsua config to the config file.

    @damencho
    damencho committed Nov 27, 2019
    Copy the full SHA
    b254f2c View commit details
    Browse the repository at this point in the history

Commits on Nov 28, 2019

  1. Introduces a script that will start pjsua to avoid blocking stdout. 

    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.
    @damencho
    damencho committed Nov 28, 2019
    Copy the full SHA
    3e15014 View commit details
    Browse the repository at this point in the history

  2. Drop asoundrc outdated comments.

    @damencho
    damencho committed Nov 28, 2019
    Copy the full SHA
    93cbab5 View commit details
    Browse the repository at this point in the history

  3. Updates log files location.

    @damencho
    damencho committed Nov 28, 2019
    Copy the full SHA
    203ce85 View commit details
    Browse the repository at this point in the history

  4. Passes auto-answer parameters from code.

    @damencho
    damencho committed Nov 28, 2019
    Copy the full SHA
    17eeb95 View commit details
    Browse the repository at this point in the history