oss/FrankerFaceZ
oss/FrankerFaceZ
1
0
Fork 0
mirror of https://github.com/FrankerFaceZ/FrankerFaceZ.git synced 2025-07-04 01:58:31 +00:00
Code Wiki Activity

3.5.248. Use stats.playback_bytes_per_second to calculate the current bitrate. Update the bitrate tooltip in real time.

Browse source
This commit is contained in:
SirStendec 2016-07-13 03:54:42 -04:00
parent 4b11c2f591
commit 25eadeb89a
3 changed files with 36 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

5
changelog.html
View file

@ -1,3 +1,8 @@
<div class="list-header">3.5.248</div>
<ul class="chat-menu-content menu-side-padding">
<li>Changed: Start using <code>playback_bytes_per_second</code> to calculate the current bitrate, as the other bitrate statistics don't update properly.</li>
</ul>
<div class="list-header">3.5.247</div> <div class="list-header">3.5.247</div>
<ul class="chat-menu-content menu-side-padding"> <ul class="chat-menu-content menu-side-padding">
<li>Changed: Refactor how Ember components and views are modified.</li> <li>Changed: Refactor how Ember components and views are modified.</li>

41
src/ember/channel.js
View file

@ -487,6 +487,7 @@ FFZ.prototype.modify_channel_index = function(view) {
var container = el && el.querySelector('.stats-and-actions .channel-stats'), var container = el && el.querySelector('.stats-and-actions .channel-stats'),
stat_el = container && container.querySelector('#ffz-ui-player-stats'), stat_el = container && container.querySelector('#ffz-ui-player-stats'),
el = stat_el && stat_el.querySelector('span'), el = stat_el && stat_el.querySelector('span'),
je,
player_cont = f.players && f.players[channel_id], player_cont = f.players && f.players[channel_id],
player = undefined, stats = undefined; player = undefined, stats = undefined;
@ -517,18 +518,24 @@ FFZ.prototype.modify_channel_index = function(view) {
else else
container.appendChild(stat_el); container.appendChild(stat_el);
jQuery(stat_el).tipsy({html: true, gravity: utils.tooltip_placement(constants.TOOLTIP_DISTANCE, 'n')}); je = jQuery(stat_el);
} je.hover(
function() { je.data("hover", true).tipsy("show") },
function() { je.data("hover", false).tipsy("hide") })
.data("hover", false)
.tipsy({trigger: 'manual', html: true, gravity: utils.tooltip_placement(constants.TOOLTIP_DISTANCE, 'n')});
} else
je = jQuery(stat_el);
var delay = Math.round(stats.hls_latency_broadcaster / 10) / 100, var delay = Math.round(stats.hls_latency_broadcaster / 10) / 100,
bitrate = Math.round(stats.current_bitrate * 1000) / 1000; bitrate = Math.round(stats.playback_bytes_per_second * 8 / 10.24) / 100;
if ( delay > 180 ) { if ( delay > 180 ) {
delay = Math.floor(delay); delay = Math.floor(delay);
stat_el.setAttribute('original-title', 'Video Information<br>Broadcast ' + utils.time_to_string(delay, true) + ' Ago<br><br>Video: ' + stats.vid_width + 'x' + stats.vid_height + 'p @ ' + stats.current_fps + '<br>Playback Rate: ' + bitrate + ' Kbps') stat_el.setAttribute('original-title', 'Video Information<br>Broadcast ' + utils.time_to_string(delay, true) + ' Ago<br><br>Video: ' + stats.vid_width + 'x' + stats.vid_height + 'p @ ' + stats.current_fps + '<br>Playback Rate: ' + bitrate + ' Kbps')
el.textContent = utils.time_to_string(Math.floor(delay), true, delay > 172800) + ' old'; el.textContent = utils.time_to_string(Math.floor(delay), true, delay > 172800) + ' old';
} else { } else {
stat_el.setAttribute('original-title', 'Stream Latency<br>Video: ' + stats.vid_width + 'x' + stats.vid_height + 'p @ ' + stats.current_fps + '<br>Playback Rate: ' + stats.current_bitrate + ' Kbps'); stat_el.setAttribute('original-title', 'Stream Latency<br>Video: ' + stats.vid_width + 'x' + stats.vid_height + 'p @ ' + stats.current_fps + '<br>Playback Rate: ' + bitrate + ' Kbps');
delay = delay.toString(); delay = delay.toString();
var ind = delay.indexOf('.'); var ind = delay.indexOf('.');
if ( ind === -1 ) if ( ind === -1 )
@ -538,6 +545,9 @@ FFZ.prototype.modify_channel_index = function(view) {
el.textContent = delay + 's'; el.textContent = delay + 's';
} }
if ( je.data("hover") )
je.tipsy("hide").tipsy("show");
} }
} }
@ -546,18 +556,18 @@ FFZ.prototype.modify_channel_index = function(view) {
var container = el && el.querySelector('#hostmode .channel-stats'), var container = el && el.querySelector('#hostmode .channel-stats'),
stat_el = container && container.querySelector('#ffz-ui-player-stats'), stat_el = container && container.querySelector('#ffz-ui-player-stats'),
el = stat_el && stat_el.querySelector('span'), el = stat_el && stat_el.querySelector('span'),
je,
player_cont = f.players && f.players[hosted_id], player_cont = f.players && f.players[hosted_id],
player = undefined, stats = undefined; player = undefined, stats = undefined;
try { try {
player = player_cont && player_cont.ffz_player; player = player_cont && player_cont.ffz_player;
stats = player && player.stats; stats = player && player.getVideoInfo();
} catch(err) { } catch(err) {
f.error("Channel ffzUpdatePlayerStats: player.stats: " + err); f.error("Channel ffzUpdatePlayerStats: player.getVideoInfo: " + err);
} }
if ( ! container || ! f.settings.player_stats || ! stats || ! stats.hls_latency_broadcaster || Number.isNaN(stats.hls_latency_broadcaster) ) { if ( ! container || ! f.settings.player_stats || ! stats || ! stats.hls_latency_broadcaster || Number.isNaN(stats.hls_latency_broadcaster) ) {
if ( stat_el ) if ( stat_el )
stat_el.parentElement.removeChild(stat_el); stat_el.parentElement.removeChild(stat_el);
@ -577,18 +587,24 @@ FFZ.prototype.modify_channel_index = function(view) {
else else
container.appendChild(stat_el); container.appendChild(stat_el);
jQuery(stat_el).tipsy({html: true, gravity: utils.tooltip_placement(constants.TOOLTIP_DISTANCE, 'n')}); je = jQuery(stat_el);
} je.hover(
function() { je.data("hover", true).tipsy("show") },
function() { je.data("hover", false).tipsy("hide") })
.data("hover", false)
.tipsy({trigger: 'manual', html: true, gravity: utils.tooltip_placement(constants.TOOLTIP_DISTANCE, 'n')});
} else
je = jQuery(stat_el);
var delay = Math.round(stats.hls_latency_broadcaster / 10) / 100, var delay = Math.round(stats.hls_latency_broadcaster / 10) / 100,
bitrate = Math.round(stats.current_bitrate * 1000) / 1000; bitrate = Math.round(stats.playback_bytes_per_second * 8 / 10.24) / 100;
if ( delay > 180 ) { if ( delay > 180 ) {
delay = Math.floor(delay); delay = Math.floor(delay);
stat_el.setAttribute('original-title', 'Video Information<br>Broadcast ' + utils.time_to_string(delay, true) + ' Ago<br><br>Video: ' + stats.vid_width + 'x' + stats.vid_height + 'p @ ' + stats.current_fps + '<br>Playback Rate: ' + bitrate + ' Kbps') stat_el.setAttribute('original-title', 'Video Information<br>Broadcast ' + utils.time_to_string(delay, true) + ' Ago<br><br>Video: ' + stats.vid_width + 'x' + stats.vid_height + 'p @ ' + stats.current_fps + '<br>Playback Rate: ' + bitrate + ' Kbps')
el.textContent = utils.time_to_string(Math.floor(delay), true, delay > 172800) + ' old'; el.textContent = utils.time_to_string(Math.floor(delay), true, delay > 172800) + ' old';
} else { } else {
stat_el.setAttribute('original-title', 'Stream Latency<br>Video: ' + stats.vid_width + 'x' + stats.vid_height + 'p @ ' + stats.current_fps + '<br>Playback Rate: ' + stats.current_bitrate + ' Kbps'); stat_el.setAttribute('original-title', 'Stream Latency<br>Video: ' + stats.vid_width + 'x' + stats.vid_height + 'p @ ' + stats.current_fps + '<br>Playback Rate: ' + bitrate + ' Kbps');
delay = delay.toString(); delay = delay.toString();
var ind = delay.indexOf('.'); var ind = delay.indexOf('.');
if ( ind === -1 ) if ( ind === -1 )
@ -598,6 +614,9 @@ FFZ.prototype.modify_channel_index = function(view) {
el.textContent = delay + 's'; el.textContent = delay + 's';
} }
if ( je.data("hover") )
je.tipsy("hide").tipsy("show");
} }
} }
}, },

2
src/main.js
View file

@ -37,7 +37,7 @@ FFZ.msg_commands = {};
// Version // Version
var VER = FFZ.version_info = { var VER = FFZ.version_info = {
major: 3, minor: 5, revision: 247, major: 3, minor: 5, revision: 248,
toString: function() { toString: function() {
return [VER.major, VER.minor, VER.revision].join(".") + (VER.extra || ""); return [VER.major, VER.minor, VER.revision].join(".") + (VER.extra || "");
} }