Merge branch 'master' into libconfig

Author: lminiero

README.md

@@ -1,6 +1,6 @@
 {
   "name": "janus-gateway",
-  "version": "0.4.5",
+  "version": "0.5.0",
   "homepage": "https://github.com/meetecho/janus-gateway",
   "authors": [
     "Lorenzo Miniero <lorenzo@meetecho.com>",

bower.json

@@ -66,8 +66,8 @@ general: {
 									# be considered an invalid value and ignored.
 	#reclaim_session_timeout = 0	# How long (in seconds) we should wait for a
 									# janus session to be reclaimed after the transport
-									# is gone. After the transport is gone, a session 
-									# times out when no request is received for 
+									# is gone. After the transport is gone, a session
+									# times out when no request is received for
 									# reclaim_session_timeout seconds (default=0s).
 									# Setting this to 0 will disable the timeout
 									# mechanism, and sessions will be destroyed immediately
@@ -82,6 +82,23 @@ general: {
 									# external scripts), then uncomment and set the
 									# recordings_tmp_ext property to the extension
 									# to add to the base (e.g., tmp --> .mjr.tmp).
+	#event_loops = 8				# By default, Janus handles each have their own
+									# event loop and related thread for all the media
+									# routing and management. If for some reason you'd
+									# rather limit the number of loop/threads, and
+									# you want handles to share those, you can do that
+									# configuring the event_loops property: this will
+									# spawn the specified amount of threads at startup,
+									# run a separate event loop on each of them, and
+									# add new handles to one of them when attaching.
+									# Notice that, while cutting the number of threads
+									# and possibly reducing context switching, this
+									# might have an impact on the media delivery,
+									# especially if the available loops can't take
+									# care of all the handles and their media in time.
+									# As such, if you want to use this you should
+									# provision the correct value according to the
+									# available resources (e.g., CPUs available).
 }
 
 # Certificate and key to use for DTLS (and passphrase if needed).
@@ -130,7 +147,7 @@ media: {
 # you can also enable ICE-TCP support (beware that it currently *only*
 # works if you enable ICE Lite as well), choose which interfaces should
 # be used for gathering candidates, and enable or disable the
-# internal libnice debugging, if needed. 
+# internal libnice debugging, if needed.
 nat: {
 	#stun_server = "stun.voip.eutelia.it"
 	#stun_port = 3478

conf/janus.jcfg.sample.in

@@ -1,4 +1,4 @@
-AC_INIT([Janus WebRTC Server],[0.4.5],[https://github.com/meetecho/janus-gateway],[janus-gateway],[https://janus.conf.meetecho.com])
+AC_INIT([Janus WebRTC Server],[0.5.0],[https://github.com/meetecho/janus-gateway],[janus-gateway],[https://janus.conf.meetecho.com])
 AC_CONFIG_AUX_DIR([.])
 AC_CONFIG_MACRO_DIR([m4])
 
@@ -15,9 +15,9 @@ AC_PROG_CC
 LT_PREREQ([2.2])
 LT_INIT
 
-JANUS_VERSION=45
+JANUS_VERSION=50
 AC_SUBST(JANUS_VERSION)
-JANUS_VERSION_STRING="0.4.5"
+JANUS_VERSION_STRING="0.5.0"
 AC_SUBST(JANUS_VERSION_STRING)
 
 case "$host_os" in
@@ -76,6 +76,12 @@ AC_ARG_ENABLE([dtls-settimeout],
               [],
               [enable_dtls_settimeout=no])
 
+AC_ARG_ENABLE([pthread-mutex],
+              [AS_HELP_STRING([--enable-pthread-mutex],
+                              [Use pthread_mutex instead of GMutex (see #1397)])],
+              [],
+              [enable_pthread_mutex=no])
+
 AC_ARG_ENABLE([turn-rest-api],
               [AS_HELP_STRING([--disable-turn-rest-api],
                               [Disable TURN REST API client (via libcurl)])],
@@ -260,6 +266,13 @@ AS_IF([test "x$enable_dtls_settimeout" = "xyes"],
       ])
 AM_CONDITIONAL([ENABLE_DTLS_SETTIMEOUT], [test "x$enable_dtls_settimeout" = "xyes"])
 
+AS_IF([test "x$enable_pthread_mutex" = "xyes"],
+      [
+      AC_DEFINE(USE_PTHREAD_MUTEX)
+      AC_MSG_NOTICE([Will use pthread_mutex instead of GMutex])
+      ])
+AM_CONDITIONAL([ENABLE_PTHREAD_MUTEX], [test "x$enable_pthread_mutex" = "xyes"])
+
 AC_SEARCH_LIBS([tls_config_set_ca_mem],[tls],
              [AM_CONDITIONAL([LIBRESSL_DETECTED], true)],
              [AM_CONDITIONAL([LIBRESSL_DETECTED], false)]
@@ -866,6 +879,9 @@ AM_COND_IF([ENABLE_BORINGSSL],
 		[echo "SSL/crypto library:        LibreSSL"],
 		[echo "SSL/crypto library:        OpenSSL"])
 	 echo "DTLS set-timeout:          not available"])
+AM_COND_IF([ENABLE_PTHREAD_MUTEX],
+	[echo "Mutex implementation:      pthread mutex"],
+	[echo "Mutex implementation:      GMutex (native futex on Linux)"])
 AM_COND_IF([ENABLE_SCTP],
 	[echo "DataChannels support:      yes"],
 	[echo "DataChannels support:      no"])

configure.ac

@@ -32,7 +32,7 @@ PROJECT_NAME           = "Janus"
 # This could be handy for archiving the generated documentation or
 # if some version control system is used.
 
-PROJECT_NUMBER         = 0.4.5
+PROJECT_NUMBER         = 0.5.0
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer
@@ -52,7 +52,7 @@ PROJECT_LOGO           =
 # If a relative path is entered, it will be relative to the location
 # where doxygen was started. If left blank the current directory will be used.
 
-OUTPUT_DIRECTORY       = 
+OUTPUT_DIRECTORY       =
 
 # If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
 # 4096 sub-directories (in 2 levels) under the output directory of each output

docs/janus-doxygen.cfg

@@ -146,7 +146,7 @@ gchar *janus_dtls_get_local_fingerprint(void) {
  * which does indeed implement the callbacks the OpenSSL docs suggest.
  *
  */
-static janus_mutex *janus_dtls_locks;
+static pthread_mutex_t *janus_dtls_locks;
 
 static void janus_dtls_cb_openssl_threadid(CRYPTO_THREADID *tid) {
 	/* FIXME Assuming pthread, which is fine as GLib wraps pthread and
@@ -162,9 +162,9 @@ static void janus_dtls_cb_openssl_threadid(CRYPTO_THREADID *tid) {
 
 static void janus_dtls_cb_openssl_lock(int mode, int type, const char *file, int line) {
 	if((mode & CRYPTO_LOCK)) {
-		janus_mutex_lock(&janus_dtls_locks[type]);
+		pthread_mutex_lock(&janus_dtls_locks[type]);
 	} else {
-		janus_mutex_unlock(&janus_dtls_locks[type]);
+		pthread_mutex_unlock(&janus_dtls_locks[type]);
 	}
 }
 #endif
@@ -334,7 +334,7 @@ gint janus_dtls_srtp_init(const char *server_pem, const char *server_key, const
 	janus_dtls_locks = g_malloc0(sizeof(*janus_dtls_locks) * CRYPTO_num_locks());
 	int l=0;
 	for(l = 0; l < CRYPTO_num_locks(); l++) {
-		janus_mutex_init(&janus_dtls_locks[l]);
+		pthread_mutex_init(&janus_dtls_locks[l], NULL);
 	}
 	CRYPTO_THREADID_set_callback(janus_dtls_cb_openssl_threadid);
 	CRYPTO_set_locking_callback(janus_dtls_cb_openssl_lock);

dtls.c

@@ -97,3 +97,11 @@ div.no-video-container {
 .meetecho-logo > img {
 	height: 26px;
 }
+
+pre {
+	white-space: pre-wrap;
+	white-space: -moz-pre-wrap;
+	white-space: -pre-wrap;
+	white-space: -o-pre-wrap;
+	word-wrap: break-word;
+}

html/css/demo.css

@@ -293,7 +293,7 @@ Janus.init = function(options) {
 		Janus.attachMediaStream = function(element, stream) {
 			if(Janus.webRTCAdapter.browserDetails.browser === 'chrome') {
 				var chromever = Janus.webRTCAdapter.browserDetails.version;
-				if(chromever >= 43) {
+				if(chromever >= 52) {
 					element.srcObject = stream;
 				} else if(typeof element.src !== 'undefined') {
 					element.src = URL.createObjectURL(stream);
@@ -307,7 +307,7 @@ Janus.init = function(options) {
 		Janus.reattachMediaStream = function(to, from) {
 			if(Janus.webRTCAdapter.browserDetails.browser === 'chrome') {
 				var chromever = Janus.webRTCAdapter.browserDetails.version;
-				if(chromever >= 43) {
+				if(chromever >= 52) {
 					to.srcObject = from.srcObject;
 				} else if(typeof to.src !== 'undefined') {
 					to.src = from.src;

html/janus.js

@@ -19,7 +19,7 @@
 <link rel="stylesheet" href="css/demo.css" type="text/css"/>
 </head>
 <body>
-	
+
 <a href="https://github.com/meetecho/janus-gateway"><img style="position: absolute; top: 0; left: 0; border: 0; z-index: 1001;" src="https://s3.amazonaws.com/github/ribbons/forkme_left_darkblue_121621.png" alt="Fork me on GitHub"></a>
 
 <nav class="navbar navbar-default navbar-static-top">
@@ -39,7 +39,7 @@ <h1>Support</h1>
 			<a target="_blank" href="http://groups.google.com/d/forum/meetecho-janus">Community</a>
 			you can interact with (e.g., to discuss deployment or runtime issues,
 			potential new features, ideas and so on). Besides, our
-			<a target="_blank" href="https://github.com/meetecho/janus-gateway/blob/master/CONTRIBUTING.md">GitHub repo</a>
+			<a target="_blank" href="https://github.com/meetecho/janus-gateway/blob/master/.github/CONTRIBUTING.md">GitHub repo</a>
 			is the place to go when you find issues you think need to be solved,
 			or whenever you've implemented something and want to contribute
 			it back to the project.</p>