[Pkg-voip-commits] [janus] 32/163: Merge branch 'master' into vp8-simulcast

[Jonas Smedegaard]

This is an automated email from the git hooks/post-receive script.

js pushed a commit to annotated tag debian/0.2.5-1
in repository janus.

commit 2320be4949fd38db26cec9db3215ba6653a10c34
Merge: 833fbe8 ad2c131
Author: Lorenzo Miniero <lminiero at gmail.com>
Date:   Tue Jul 25 13:00:26 2017 +0200

    Merge branch 'master' into vp8-simulcast

 configure.ac                | 10 +++++++++-
 dtls-bio.c                  | 18 +++++++++---------
 dtls.c                      |  8 ++++++--
 html/janus.js               | 27 ++++++++++++++-------------
 html/janus.nojquery.js      | 25 ++++++++++++-------------
 ice.c                       | 39 ++++++++++++++++++++++++++++++++-------
 ice.h                       | 44 +-------------------------------------------
 plugins/janus_audiobridge.c |  4 +++-
 plugins/janus_echotest.c    |  4 +++-
 plugins/janus_recordplay.c  |  4 +++-
 plugins/janus_sip.c         | 42 +++++++++++++++++++++++++++++++++++++++---
 plugins/janus_streaming.c   |  4 +++-
 plugins/janus_textroom.c    |  4 +++-
 plugins/janus_videocall.c   |  4 ++++
 plugins/janus_videoroom.c   |  8 +++++++-
 plugins/janus_voicemail.c   |  4 +++-
 sdp.c                       | 11 +++++++++++
 17 files changed, 162 insertions(+), 98 deletions(-)

diff --cc plugins/janus_sip.c
index 02170b8,9c5b774..1cf0d8c
--- a/plugins/janus_sip.c
+++ b/plugins/janus_sip.c
@@@ -1920,12 -1927,23 +1939,29 @@@ static void *janus_sip_handler(void *da
  				json_object_set_new(info, "sdp", json_string(sdp));
  				gateway->notify_event(&janus_sip_plugin, session->handle, info);
  			}
 +			/* If the user negotiated simulcasting, just stick with the base substream */
 +			json_t *msg_simulcast = json_object_get(msg->jsep, "simulcast");
 +			if(msg_simulcast) {
 +				JANUS_LOG(LOG_WARN, "Client negotiated simulcasting, falling back to base substream...\n");
 +				session->media.simulcast_ssrc = json_integer_value(json_object_get(msg_simulcast, "ssrc-0"));
 +			}
+ 			/* Check if there are new credentials to authenticate the INVITE */
+ 			if(authuser) {
+ 				JANUS_LOG(LOG_VERB, "Updating credentials (authuser) for authenticating the INVITE\n");
+ 				g_free(session->account.authuser);
+ 				session->account.authuser = g_strdup(json_string_value(authuser));
+ 			}
+ 			if(secret) {
+ 				JANUS_LOG(LOG_VERB, "Updating credentials (secret) for authenticating the INVITE\n");
+ 				g_free(session->account.secret);
+ 				session->account.secret = g_strdup(json_string_value(secret));
+ 				session->account.secret_type = janus_sip_secret_type_plaintext;
+ 			} else if(ha1_secret) {
+ 				JANUS_LOG(LOG_VERB, "Updating credentials (ha1_secret) for authenticating the INVITE\n");
+ 				g_free(session->account.secret);
+ 				session->account.secret = g_strdup(json_string_value(ha1_secret));
+ 				session->account.secret_type = janus_sip_secret_type_hashed;
+ 			}
  			/* Send INVITE */
  			session->callee = g_strdup(uri_text);
  			session->callid = g_strdup(callid);
diff --cc plugins/janus_videoroom.c
index d3f685e,967204c..8b1c5f5
--- a/plugins/janus_videoroom.c
+++ b/plugins/janus_videoroom.c
@@@ -2486,8 -2400,10 +2486,10 @@@ void janus_videoroom_incoming_rtp(janus
  		/* Backup the actual timestamp and sequence number set by the publisher, in case switching is involved */
  		packet.timestamp = ntohl(packet.data->timestamp);
  		packet.seq_number = ntohs(packet.data->seq_number);
 -		/* Go */
 +		/* Go: some viewers may decide to drop the packet, but that's up to them */
+ 		janus_mutex_lock_nodebug(&participant->listeners_mutex);
  		g_slist_foreach(participant->listeners, janus_videoroom_relay_rtp_packet, &packet);
+ 		janus_mutex_unlock_nodebug(&participant->listeners_mutex);
  		
  		/* Check if we need to send any REMB, FIR or PLI back to this publisher */
  		if(video && participant->video_active) {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/janus.git