Skip to content

Commit 1b703bf

Browse files
Merge pull request #1 from meetecho/master
Fast forwarding to latest version
2 parents d5af913 + 641d048 commit 1b703bf

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+2462
-3768
lines changed

.github/CONTRIBUTING.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@ welcome to make it better.
88
If you want to open an issue, please make sure that:
99

1010
1. you actually found a bug: for generic questions, use the
11-
[meetecho-janus](http://groups.google.com/d/forum/meetecho-janus)
11+
[Discourse](https://janus.discourse.group/)
1212
group instead;
1313
2. nobody opened the same bug already (do a search);
1414
3. the issue wasn't already solved;
1515
4. you don't paste a huge amount of text in the issue or comments: use
16-
a service like [pastebin](http://pastebin.com/) or similar;
16+
a service like [pastebin](https://pastebin.com/) or similar;
1717
5. you provide a GDB stacktrace if Janus crashed on you, and/or output
1818
from AddressSanitizer or Valgrind (more details available
19-
[here](http://janus.conf.meetecho.com/docs/debug.html)).
19+
[here](https://janus.conf.meetecho.com/docs/debug.html)).
2020

2121
If you want to contribute to the project by providing fixes, enhancements,
2222
new features or other materials, then just clone the repo, make your changes, push to

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
blank_issues_enabled: false
22
contact_links:
3-
- name: 💬 Janus Community (Google Group)
4-
url: https://groups.google.com/g/meetecho-janus
5-
about: Please ask questions or discuss runtime problems on the group, not GitHub
3+
- name: 💬 Janus Community (Discourse)
4+
url: https://janus.discourse.group/
5+
about: Please ask questions or discuss runtime problems on the group, not GitHub

.gitignore

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,15 +46,13 @@ p2m-cmdline.h
4646
/conf/janus.plugin.lua.cfg.sample
4747
/conf/janus.plugin.recordplay.cfg.sample
4848
/conf/janus.plugin.streaming.cfg.sample
49-
/conf/janus.plugin.voicemail.cfg.sample
5049
/conf/janus.transport.http.cfg.sample
5150
/conf/janus.transport.websockets.cfg.sample
5251
/conf/janus.jcfg.sample
5352
/conf/janus.plugin.duktape.jcfg.sample
5453
/conf/janus.plugin.lua.jcfg.sample
5554
/conf/janus.plugin.recordplay.jcfg.sample
5655
/conf/janus.plugin.streaming.jcfg.sample
57-
/conf/janus.plugin.voicemail.jcfg.sample
5856

5957
.deps
6058
.dirstamp

CHANGELOG.md

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,22 @@
33
All notable changes to this project will be documented in this file.
44

55

6+
## [v1.1.3] - 2023-03-06
7+
8+
- Use getaddrinfo instead of gethostbyname [[PR-3159](https://github.com/meetecho/janus-gateway/pull/3159)]
9+
- Removed VoiceMail plugin and demo [[PR-3172](https://github.com/meetecho/janus-gateway/pull/3172)]
10+
- Added configurable cap to number of queued events when reconnecting WebSocket event handler [[PR-3148](https://github.com/meetecho/janus-gateway/pull/3148)]
11+
- Fixed broken support for text datachannels in Streaming plugin
12+
- Add option to manually insert SPS/PPS RTP packets for H.264 mountpoints [[PR-3168](https://github.com/meetecho/janus-gateway/pull/3168)]
13+
- Fixed From/To checks when getting a SIP INVITE [[Issue-3164](https://github.com/meetecho/janus-gateway/issues/3164)]
14+
- Allow changing mjrs dir also when stopping recordings in AudioBridge [[Issue-3171](https://github.com/meetecho/janus-gateway/issues/3171)]
15+
- Allow Lua and Duktape plugins to relay extensions when relaying RTP packets [[PR-3162](https://github.com/meetecho/janus-gateway/pull/3162)]
16+
- Optionally support X-Forwarded-For in both HTTP and WebSocket transports [[PR-3160](https://github.com/meetecho/janus-gateway/pull/3160)]
17+
- Add reason of track being added/removed in onremotetrack in janus.js (thanks @marekpiechut!) [[PR-3150](https://github.com/meetecho/janus-gateway/pull/3150)]
18+
- Fixed broken VP9-SVC demo room [[Issue-3169](https://github.com/meetecho/janus-gateway/issues/3169)]
19+
- Linted whole JS demo codebase [[PR-3170](https://github.com/meetecho/janus-gateway/pull/3170)]
20+
- Other smaller fixes and improvements (thanks to all who contributed pull requests and reported issues!)
21+
622
## [v1.1.2] - 2023-01-17
723

824
- Always add mid to the SDP, even for disabled m-lines

README.md

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -11,21 +11,21 @@ For some online demos and documentations, make sure you pay the [project website
1111

1212
> **Note well:** this is the main branch for the `multistream` version of Janus, which is the new version. If you want to check the legacy version of Janus instead (i.e., `0.x`, a.k.a. "legacy") click [here](https://github.com/meetecho/janus-gateway/tree/0.x) instead.
1313
14-
If you have questions on Janus, or wish to discuss Janus with us and other users, please join our [meetecho-janus](https://groups.google.com/forum/#!forum/meetecho-janus) Google Group. If you encounter bugs, please submit an issue on [GitHub](https://github.com/meetecho/janus-gateway/issues): make sure you read the [guidelines](.github/CONTRIBUTING.md) before opening an issue or a pull request, though.
14+
If you have questions on Janus, or wish to discuss Janus with us and other users, please join our [Community](https://janus.discourse.group/). If you encounter bugs, please submit an issue on [GitHub](https://github.com/meetecho/janus-gateway/issues): make sure you read the [guidelines](.github/CONTRIBUTING.md) before opening an issue or a pull request, though.
1515

1616

1717
## Dependencies
1818
To install it, you'll need to satisfy the following dependencies:
1919

20-
* [Jansson](http://www.digip.org/jansson/)
20+
* [Jansson](https://github.com/akheron/jansson)
2121
* [libconfig](https://hyperrealm.github.io/libconfig/)
2222
* [libnice](https://libnice.freedesktop.org/) (at least v0.1.16 suggested, v0.1.18 recommended)
23-
* [OpenSSL](http://www.openssl.org/) (at least v1.0.1e)
23+
* [OpenSSL](https://www.openssl.org/) (at least v1.0.1e)
2424
* [libsrtp](https://github.com/cisco/libsrtp) (at least v2.x suggested)
2525
* [usrsctp](https://github.com/sctplab/usrsctp) (only needed if you are interested in Data Channels)
26-
* [libmicrohttpd](http://www.gnu.org/software/libmicrohttpd/) (at least v0.9.59; only needed if you are interested in REST support for the Janus API)
27-
* [libwebsockets](https://libwebsockets.org/) (only needed if you are interested in WebSockets support for the Janus API)
28-
* [cmake](http://www.cmake.org/) (only needed if you are interested in WebSockets and/or BoringSSL support, as they make use of it)
26+
* [libmicrohttpd](https://www.gnu.org/software/libmicrohttpd/) (at least v0.9.59; only needed if you are interested in REST support for the Janus API)
27+
* [libwebsockets](https://libwebsockets.org/) (at least v4.x suggested; only needed if you are interested in WebSockets support for the Janus API)
28+
* [cmake](https://www.cmake.org/) (only needed if you are interested in WebSockets and/or BoringSSL support, as they make use of it)
2929
* [rabbitmq-c](https://github.com/alanxz/rabbitmq-c) (only needed if you are interested in RabbitMQ support for the Janus API or events)
3030
* [paho.mqtt.c](https://eclipse.org/paho/clients/c) (only needed if you are interested in MQTT support for the Janus API or events)
3131
* [nanomsg](https://nanomsg.org/) (only needed if you are interested in Nanomsg support for the Janus API)
@@ -34,17 +34,17 @@ To install it, you'll need to satisfy the following dependencies:
3434
A couple of plugins depend on a few more libraries:
3535

3636
* [Sofia-SIP](https://github.com/freeswitch/sofia-sip) (only needed for the SIP plugin)
37-
* [libopus](http://opus-codec.org/) (only needed for the AudioBridge plugin)
38-
* [libogg](http://xiph.org/ogg/) (needed for the VoiceMail plugin and/or post-processor, and optionally AudioBridge and Streaming plugins)
37+
* [libopus](https://opus-codec.org/) (only needed for the AudioBridge plugin)
38+
* [libogg](https://xiph.org/ogg/) (needed for the VoiceMail plugin and/or post-processor, and optionally AudioBridge and Streaming plugins)
3939
* [libcurl](https://curl.haxx.se/libcurl/) (only needed if you are interested in RTSP support in the Streaming plugin or in the sample Event Handler plugin)
4040
* [Lua](https://www.lua.org/download.html) (only needed for the Lua plugin)
4141
* [Duktape](https://duktape.org/) (only needed for the Duktape plugin)
4242

4343
Additionally, you'll need the following libraries and tools:
4444

45-
* [GLib](http://library.gnome.org/devel/glib/)
45+
* [GLib](https://docs.gtk.org/glib/)
4646
* [zlib](https://zlib.net/)
47-
* [pkg-config](http://www.freedesktop.org/wiki/Software/pkg-config/)
47+
* [pkg-config](https://www.freedesktop.org/wiki/Software/pkg-config/)
4848

4949
All of those libraries are usually available on most of the most common distributions. Installing these libraries on a recent Fedora, for instance, is very simple:
5050

@@ -62,7 +62,7 @@ On Ubuntu or Debian, it would require something like this:
6262
libopus-dev libogg-dev libcurl4-openssl-dev liblua5.3-dev \
6363
libconfig-dev pkg-config libtool automake
6464

65-
* *Note:* please notice that libopus may not be available out of the box on your distro. In that case, you'll have to [install it manually](http://www.opus-codec.org).
65+
* *Note:* please notice that libopus may not be available out of the box on your distro. In that case, you'll have to [install it manually](https://www.opus-codec.org).
6666

6767
While `libnice` is typically available in most distros as a package, the version available out of the box in Ubuntu is known to cause problems. As such, we always recommend manually compiling and installing the master version of libnice.
6868
To build libnice, you need Python 3, Meson and Ninja:
@@ -163,8 +163,8 @@ Finally, the same can be said for rabbitmq-c as well, which is needed for the op
163163

164164
To conclude, should you be interested in building the Janus documentation as well, you'll need some additional tools too:
165165

166-
* [Doxygen](http://www.doxygen.org)
167-
* [Graphviz](http://www.graphviz.org/)
166+
* [Doxygen](https://www.doxygen.org)
167+
* [Graphviz](https://www.graphviz.org/)
168168

169169
On Fedora:
170170

bower.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "janus-gateway",
3-
"version": "1.1.3",
3+
"version": "1.1.4",
44
"homepage": "https://github.com/meetecho/janus-gateway",
55
"authors": [
66
"Lorenzo Miniero <lorenzo@meetecho.com>",
@@ -33,6 +33,6 @@
3333
"tests"
3434
],
3535
"dependencies": {
36-
"webrtc-adapter": "8.2.0"
36+
"webrtc-adapter": "8.2.2"
3737
}
3838
}

conf/janus.jcfg.sample.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -401,7 +401,7 @@ nat: {
401401
# names to identify the plugins to disable. By default all available
402402
# plugins are enabled and loaded at startup.
403403
plugins: {
404-
#disable = "libjanus_voicemail.so,libjanus_recordplay.so"
404+
#disable = "libjanus_echotest.so,libjanus_recordplay.so"
405405
}
406406

407407
# You can choose which of the available transports should be enabled or

conf/janus.plugin.videoroom.jcfg.sample

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
# h264_profile = H.264-specific profile to prefer (e.g., "42e01f" for "profile-level-id=42e01f")
2222
# opus_fec = true|false (whether inband FEC must be negotiated; only works for Opus, default=true)
2323
# opus_dtx = true|false (whether DTX must be negotiated; only works for Opus, default=false)
24-
# video_svc = true|false (whether SVC support must be enabled; only works for VP9, default=false)
2524
# audiolevel_ext = true|false (whether the ssrc-audio-level RTP extension must
2625
# be negotiated/used or not for new publishers, default=true)
2726
# audiolevel_event = true|false (whether to emit event to other users or not, default=false)
@@ -71,25 +70,10 @@ room-1234: {
7170
description = "Demo Room"
7271
secret = "adminpwd"
7372
publishers = 6
74-
bitrate = 128000
73+
bitrate = 128000 # This is a low cap, increase if you want to use simulcast or SVC
7574
fir_freq = 10
7675
#audiocodec = "opus"
7776
#videocodec = "vp8"
7877
record = false
7978
#rec_dir = "/path/to/recordings-folder"
8079
}
81-
82-
# This other demo room here is only there in case you want to play with
83-
# the VP9 SVC support. Notice that you'll need a Chrome launched with
84-
# the flag that enables that support, or otherwise you'll be using just
85-
# plain VP9 (which is good if you want to test how this indeed affect
86-
# what receivers will get, whether they're encoding SVC or not).
87-
room-5678: {
88-
description = "VP9-SVC Demo Room"
89-
secret = "adminpwd"
90-
publishers = 6
91-
bitrate = 0 # No limit, to give room for all layers
92-
fir_freq = 10
93-
videocodec = "vp9"
94-
video_svc = true
95-
}

conf/janus.plugin.voicemail.jcfg.sample.in

Lines changed: 0 additions & 11 deletions
This file was deleted.

configure.ac

Lines changed: 4 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
AC_INIT([Janus WebRTC Server],[1.1.3],[https://github.com/meetecho/janus-gateway],[janus-gateway],[https://janus.conf.meetecho.com])
1+
AC_INIT([Janus WebRTC Server],[1.1.4],[https://github.com/meetecho/janus-gateway],[janus-gateway],[https://janus.conf.meetecho.com])
22
AC_LANG(C)
33
AC_CONFIG_AUX_DIR([.])
44
AC_CONFIG_MACRO_DIR([m4])
@@ -70,11 +70,11 @@ cc*)
7070
-Wunused-but-set-variable"
7171
esac
7272

73-
JANUS_VERSION=1103
73+
JANUS_VERSION=1104
7474
AC_SUBST(JANUS_VERSION)
75-
JANUS_VERSION_STRING="1.1.3"
75+
JANUS_VERSION_STRING="1.1.4"
7676
AC_SUBST(JANUS_VERSION_STRING)
77-
JANUS_VERSION_SO="2:3:1"
77+
JANUS_VERSION_SO="2:4:1"
7878
AC_SUBST(JANUS_VERSION_SO)
7979

8080
case "$host_os" in
@@ -185,8 +185,6 @@ AC_ARG_ENABLE([all-plugins],
185185
[enable_plugin_videocall=no])
186186
AS_IF([test "x$enable_plugin_videoroom" != "xyes"],
187187
[enable_plugin_videoroom=no])
188-
AS_IF([test "x$enable_plugin_voicemail" != "xyes"],
189-
[enable_plugin_voicemail=no])
190188
],
191189
[])
192190

@@ -770,13 +768,6 @@ AC_ARG_ENABLE([plugin-videoroom],
770768
[enable_plugin_videoroom=no])],
771769
[enable_plugin_videoroom=yes])
772770

773-
AC_ARG_ENABLE([plugin-voicemail],
774-
[AS_HELP_STRING([--disable-plugin-voicemail],
775-
[Disable voicemail plugin])],
776-
[AS_IF([test "x$enable_plugin_voicemail" != "xyes"],
777-
[enable_plugin_voicemail=no])],
778-
[enable_plugin_voicemail=maybe])
779-
780771
PKG_CHECK_MODULES([SOFIA],
781772
[sofia-sip-ua],
782773
[
@@ -807,12 +798,8 @@ PKG_CHECK_MODULES([OGG],
807798
[ogg],
808799
[
809800
AC_DEFINE(HAVE_LIBOGG)
810-
AS_IF([test "x$enable_plugin_voicemail" = "xmaybe"],
811-
[enable_plugin_voicemail=yes])
812801
],
813802
[
814-
AS_IF([test "x$enable_plugin_voicemail" = "xyes"],
815-
[AC_MSG_ERROR([libogg not found. See README.md for installation instructions or use --disable-plugin-voicemail])])
816803
])
817804
AC_SUBST([OGG_CFLAGS])
818805
AC_SUBST([OGG_LIBS])
@@ -860,7 +847,6 @@ AM_CONDITIONAL([ENABLE_PLUGIN_NOSIP], [test "x$enable_plugin_nosip" = "xyes"])
860847
AM_CONDITIONAL([ENABLE_PLUGIN_STREAMING], [test "x$enable_plugin_streaming" = "xyes"])
861848
AM_CONDITIONAL([ENABLE_PLUGIN_VIDEOCALL], [test "x$enable_plugin_videocall" = "xyes"])
862849
AM_CONDITIONAL([ENABLE_PLUGIN_VIDEOROOM], [test "x$enable_plugin_videoroom" = "xyes"])
863-
AM_CONDITIONAL([ENABLE_PLUGIN_VOICEMAIL], [test "x$enable_plugin_voicemail" = "xyes"])
864850
AM_CONDITIONAL([ENABLE_PLUGIN_TEXTROOM], [test "x$enable_plugin_textroom" = "xyes"])
865851

866852

@@ -1065,9 +1051,6 @@ AM_COND_IF([ENABLE_PLUGIN_AUDIOBRIDGE],
10651051
AM_COND_IF([ENABLE_PLUGIN_VIDEOROOM],
10661052
[echo " Video Room: yes"],
10671053
[echo " Video Room: no"])
1068-
AM_COND_IF([ENABLE_PLUGIN_VOICEMAIL],
1069-
[echo " Voice Mail: yes"],
1070-
[echo " Voice Mail: no"])
10711054
AM_COND_IF([ENABLE_PLUGIN_RECORDPLAY],
10721055
[echo " Record&Play: yes"],
10731056
[echo " Record&Play: no"])

0 commit comments

Comments
 (0)