[Pkg-voip-commits] [janus] 46/163: Merge branch 'master' into js-track
Jonas Smedegaard
dr at jones.dk
Sat Oct 28 01:22:08 UTC 2017
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 5b8434f7db61b39dffea31a238fd6b01dfefbd6c
Merge: 7fc64a5 073a486
Author: Lorenzo Miniero <lminiero at gmail.com>
Date: Fri Jul 28 12:15:27 2017 +0200
Merge branch 'master' into js-track
README.md | 2 +-
apierror.c | 1 -
conf/janus.plugin.streaming.cfg.sample.in | 3 +
conf/janus.plugin.videoroom.cfg.sample | 16 +
conf/janus.transport.http.cfg.sample.in | 9 +
config.c | 31 +-
configure.ac | 6 +-
docs/janus-doxygen.cfg | 2 +-
dtls-bio.c | 2 +-
events.c | 1 +
html/demos.html | 4 +
html/devicetest.html | 8 +-
html/devicetest.js | 155 +++++-
html/echotest.html | 10 +-
html/echotest.js | 155 ++++++
html/janus.js | 245 +++++++-
html/janus.nojquery.js | 245 +++++++-
html/navbar.html | 1 +
html/streamingtest.html | 8 +-
html/streamingtest.js | 185 ++++++
html/videocalltest.html | 14 +
html/videocalltest.js | 152 +++++
html/videoroomtest.html | 32 +-
html/videoroomtest.js | 167 ++++++
html/{videoroomtest.html => vp9svctest.html} | 67 ++-
html/{videoroomtest.js => vp9svctest.js} | 180 ++++--
ice.c | 101 +++-
ice.h | 14 +
ip-utils.c | 3 +-
janus.c | 56 +-
janus.ggo | 2 +-
plugins/janus_audiobridge.c | 24 +-
plugins/janus_echotest.c | 348 +++++++++++-
plugins/janus_recordplay.c | 56 +-
plugins/janus_sip.c | 127 ++++-
plugins/janus_streaming.c | 803 ++++++++++++++++-----------
plugins/janus_textroom.c | 18 +-
plugins/janus_videocall.c | 273 ++++++++-
plugins/janus_videoroom.c | 652 +++++++++++++++++++---
plugins/janus_voicemail.c | 2 +-
postprocessing/pp-g711.c | 1 +
postprocessing/pp-webm.c | 4 +-
rtcp.c | 50 +-
rtcp.h | 20 +-
rtp.c | 51 +-
rtp.h | 13 +
sdp-utils.c | 6 -
sdp.c | 130 ++++-
sdp.h | 8 +
transports/janus_http.c | 160 ++----
transports/janus_pfunix.c | 3 +-
transports/janus_rabbitmq.c | 2 +-
transports/janus_websockets.c | 4 +
utils.c | 441 +++++++++++++++
utils.h | 63 +++
55 files changed, 4373 insertions(+), 763 deletions(-)
diff --cc html/streamingtest.js
index 29f61de,65905da..46b829f
--- a/html/streamingtest.js
+++ b/html/streamingtest.js
@@@ -165,24 -171,54 +181,65 @@@ $(document).ready(function()
if(spinner !== null && spinner !== undefined)
spinner.stop();
spinner = null;
+ var videoTracks = stream.getVideoTracks();
+ if(videoTracks === null || videoTracks === undefined || videoTracks.length === 0)
+ return;
+ var width = this.videoWidth;
+ var height = this.videoHeight;
+ $('#curres').removeClass('hide').text(width+'x'+height).show();
+ if(adapter.browserDetails.browser === "firefox") {
+ // Firefox Stable has a bug: width and height are not immediately available after a playing
+ setTimeout(function() {
+ var width = $("#remotevideo").get(0).videoWidth;
+ var height = $("#remotevideo").get(0).videoHeight;
+ $('#curres').removeClass('hide').text(width+'x'+height).show();
+ }, 2000);
+ }
});
+ var videoTracks = stream.getVideoTracks();
+ if(videoTracks && videoTracks.length &&
+ (adapter.browserDetails.browser === "chrome" ||
+ adapter.browserDetails.browser === "firefox" ||
+ adapter.browserDetails.browser === "safari")) {
+ $('#curbitrate').removeClass('hide').show();
+ bitrateTimer = setInterval(function() {
+ // Display updated bitrate, if supported
+ var bitrate = streaming.getBitrate();
+ //~ Janus.debug("Current bitrate is " + streaming.getBitrate());
+ $('#curbitrate').text(bitrate);
+ // Check if the resolution changed too
+ var width = $("#remotevideo").get(0).videoWidth;
+ var height = $("#remotevideo").get(0).videoHeight;
+ if(width > 0 && height > 0)
+ $('#curres').removeClass('hide').text(width+'x'+height).show();
+ }, 1000);
+ }
Janus.attachMediaStream($('#remotevideo').get(0), stream);
+ var videoTracks = stream.getVideoTracks();
+ if(videoTracks === null || videoTracks === undefined || videoTracks.length === 0 || videoTracks[0].muted) {
+ // No remote video
+ $('#remotevideo').hide();
+ $('#stream').append(
+ '<div id="novideo" class="no-video-container">' +
+ '<i class="fa fa-video-camera fa-5 no-video-icon"></i>' +
+ '<span class="no-video-text">No remote video available</span>' +
+ '</div>');
+ }
},
oncleanup: function() {
Janus.log(" ::: Got a cleanup notification :::");
$('#waitingvideo').remove();
$('#remotevideo').remove();
+ $('.no-video-container').remove();
+ $('#bitrate').attr('disabled', true);
+ $('#bitrateset').html('Bandwidth<span class="caret"></span>');
+ $('#curbitrate').hide();
+ if(bitrateTimer !== null && bitrateTimer !== undefined)
+ clearInterval(bitrateTimer);
+ bitrateTimer = null;
+ $('#curres').hide();
+ $('#simulcast').remove();
+ simulcastStarted = false;
}
});
},
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/janus.git
More information about the Pkg-voip-commits
mailing list