Fix spelling mistakes identified by Lintian
Co-authored-by: Thulinma <jaron@vietors.com>
This commit is contained in:
parent
a1fbb9e186
commit
ea47e19129
14 changed files with 24 additions and 24 deletions
File diff suppressed because one or more lines are too long
|
@ -1617,7 +1617,7 @@ MistSkins["default"] = {
|
|||
//gather what tracks we should use
|
||||
var usetracks = {};
|
||||
for (var i in selections) {
|
||||
if ((i == "subtitle") || (selections[i].value == "")) { continue; } //subtitle tracks are handled seperately
|
||||
if ((i == "subtitle") || (selections[i].value == "")) { continue; } //subtitle tracks are handled separately
|
||||
usetracks[i] = selections[i].value;
|
||||
}
|
||||
if (value != ""){ usetracks[type] = value; }
|
||||
|
@ -2709,7 +2709,7 @@ MistSkins["default"] = {
|
|||
forcePriority: MistVideo.options.forcePriority,
|
||||
setTracks: MistVideo.options.setTracks, //when the track selection is changed through the UI, the selected track is saved in the options, so this passes on the currently enforced tracks
|
||||
controls: false,
|
||||
skin: "default" //TODO: right now the skin can't really be transfered because there are functions in there that won't be in the JSON. At some point we should fix this, probably by having the Mist backend include a custom skin definition with the player code.
|
||||
skin: "default" //TODO: right now the skin can't really be transferred because there are functions in there that won't be in the JSON. At some point we should fix this, probably by having the Mist backend include a custom skin definition with the player code.
|
||||
},
|
||||
stream: MistVideo.stream
|
||||
};
|
||||
|
|
|
@ -359,9 +359,9 @@ p.prototype.build = function (MistVideo,callback) {
|
|||
}
|
||||
player.msgqueue.shift();
|
||||
if (player.msgqueue.length == 0) { player.msgqueue = false; }
|
||||
MistVideo.log("The newly initialized source buffer was filled with data from a seperate message queue."+(player.msgqueue ? " "+player.msgqueue.length+" more message queue(s) remain." : ""));
|
||||
MistVideo.log("The newly initialized source buffer was filled with data from a separate message queue."+(player.msgqueue ? " "+player.msgqueue.length+" more message queue(s) remain." : ""));
|
||||
if (do_do) {
|
||||
MistVideo.log("The seperate message queue was empty; manually triggering any onupdateend functions");
|
||||
MistVideo.log("The separate message queue was empty; manually triggering any onupdateend functions");
|
||||
player.sb.dispatchEvent(new Event("updateend"));
|
||||
}
|
||||
}
|
||||
|
@ -817,9 +817,9 @@ p.prototype.build = function (MistVideo,callback) {
|
|||
}
|
||||
else {
|
||||
//There is no active source buffer or we're preparing for a track switch.
|
||||
//Any data is kept in a seperate buffer and won't be appended to the source buffer until it is reinitialised.
|
||||
//Any data is kept in a separate buffer and won't be appended to the source buffer until it is reinitialised.
|
||||
if (!player.msgqueue) { player.msgqueue = [[]]; }
|
||||
//There may be more than one seperate buffer (in case of rapid track switches), always append to the last of the buffers
|
||||
//There may be more than one separate buffer (in case of rapid track switches), always append to the last of the buffers
|
||||
player.msgqueue[player.msgqueue.length-1].push(data);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -566,7 +566,7 @@ namespace h264{
|
|||
<< payload.size() << " bytes long" << std::endl;
|
||||
out << " profile_idc: 0x" << std::setw(2) << std::setfill('0') << std::hex << (int)profileIdc
|
||||
<< std::dec << " (" << (int)profileIdc << ") = " << profile() << std::endl;
|
||||
out << " contraints: " << (constraintSet0Flag ? "0 " : "") << (constraintSet1Flag ? "1 " : "")
|
||||
out << " constraints: " << (constraintSet0Flag ? "0 " : "") << (constraintSet1Flag ? "1 " : "")
|
||||
<< (constraintSet2Flag ? "2 " : "") << (constraintSet3Flag ? "3 " : "")
|
||||
<< (constraintSet4Flag ? "4 " : "") << (constraintSet5Flag ? "5" : "") << std::endl;
|
||||
out << " level_idc: 0x" << std::setw(2) << std::setfill('0') << std::hex << (int)levelIdc
|
||||
|
|
|
@ -254,7 +254,7 @@ namespace HLS{
|
|||
result << "#EXT-X-TARGETDURATION:" << targetDurationMax << "\r\n";
|
||||
}
|
||||
|
||||
/// Appends result with encrytion / drm data
|
||||
/// Appends result with encryption / drm data
|
||||
void addEncriptionTags(std::stringstream &result, const std::string &encryptMethod){
|
||||
// TODO: Add support for media encryption
|
||||
if (encryptMethod.size()){
|
||||
|
|
|
@ -754,8 +754,8 @@ int Socket::Connection::getPureSocket(){
|
|||
return sSend;
|
||||
}
|
||||
|
||||
/// Returns a string describing the last error that occured.
|
||||
/// Only reports errors if an error actually occured - returns the host address or empty string
|
||||
/// Returns a string describing the last error that occurred.
|
||||
/// Only reports errors if an error actually occurred - returns the host address or empty string
|
||||
/// otherwise.
|
||||
std::string Socket::Connection::getError(){
|
||||
return lastErr;
|
||||
|
|
|
@ -154,7 +154,7 @@ namespace Socket{
|
|||
std::string getBoundAddress() const;
|
||||
int getSocket(); ///< Returns internal socket number.
|
||||
int getPureSocket(); ///< Returns non-piped internal socket number.
|
||||
std::string getError(); ///< Returns a string describing the last error that occured.
|
||||
std::string getError(); ///< Returns a string describing the last error that occurred.
|
||||
bool connected() const; ///< Returns the connected-state for this socket.
|
||||
bool isAddress(const std::string &addr);
|
||||
bool isLocal(); ///< Returns true if remote address is a local address.
|
||||
|
@ -191,7 +191,7 @@ namespace Socket{
|
|||
/// This class is for easily setting up listening socket, either TCP or Unix.
|
||||
class Server{
|
||||
private:
|
||||
std::string errors; ///< Stores errors that may have occured.
|
||||
std::string errors; ///< Stores errors that may have occurred.
|
||||
int sock; ///< Internally saved socket number.
|
||||
bool IPv6bind(int port, std::string hostname, bool nonblock); ///< Attempt to bind an IPv6 socket
|
||||
bool IPv4bind(int port, std::string hostname, bool nonblock); ///< Attempt to bind an IPv4 socket
|
||||
|
|
|
@ -277,7 +277,7 @@ namespace Socket{
|
|||
sock = -1;
|
||||
ERROR_MSG("Can not listen on Socket");
|
||||
}
|
||||
INFO_MSG("Listener SRT socket sucess @ %s:%u", _host.c_str(), _port);
|
||||
INFO_MSG("Listener SRT socket success @ %s:%u", _host.c_str(), _port);
|
||||
lastGood = Util::bootMS();
|
||||
return;
|
||||
}
|
||||
|
@ -309,7 +309,7 @@ namespace Socket{
|
|||
ERROR_MSG("Error during postconfigure socket");
|
||||
return;
|
||||
}
|
||||
INFO_MSG("Rendezvous SRT socket sucess @ %s:%u", _host.c_str(), _port);
|
||||
INFO_MSG("Rendezvous SRT socket success @ %s:%u", _host.c_str(), _port);
|
||||
lastGood = Util::bootMS();
|
||||
return;
|
||||
}
|
||||
|
|
|
@ -205,7 +205,7 @@ case 12:a=a+("< (numerical) "+c);break;case 13:a=a+("<= (numerical) "+c);break;c
|
|||
f.length>=8&&f[5]&&h.append($("<span>").text(", starts if "+k(f[5],f[6],f[7])));f.length>=11&&f[8]&&h.append($("<span>").text(", stops if "+k(f[8],f[9],f[10])))}else f.length>=4&&f[2]!=f[3]?h.append($("<span>").text(f[2])).append($("<span>").html("»").addClass("unit").css("margin","0 0.5em")).append($("<span>").text(f[3])):h.append($("<span>").text(f[2]));k=$("<td>").append($("<button>").text(g=="Automatic"?"Remove":"Stop").click(function(){if(confirm("Are you sure you want to "+$(this).text().toLowerCase()+
|
||||
" this push?\n"+f[1]+" to "+f[2])){var a=$(this).closest("tr");a.html($("<td colspan=99>").html($("<span>").addClass("red").text(g=="Automatic"?"Removing..":"Stopping..")));if(g=="Automatic"){var c=f.slice(1);mist.send(function(){a.remove()},{push_auto_remove:[c]})}else mist.send(function(){b([f[0]])},{push_stop:[f[0]]})}}));if(g=="Automatic"){k.prepend($("<button>").text("Edit").click(function(){UI.navto("Start Push","auto_"+($(this).closest("tr").index()-1))}));k.append($("<button>").text("Stop pushes").click(function(){if(confirm('Are you sure you want to stop all pushes matching \n"'+
|
||||
f[1]+" to "+f[2]+'"?'+(d.wait!=0?"\n\nRetrying is enabled. You'll probably want to set that to 0.":""))){var c=$(this);c.text("Stopping pushes..");var g=[],h;for(h in a.push_list)if(f[1]==a.push_list[h][1]&&f[2]==a.push_list[h][2]){g.push(a.push_list[h][0]);e.find("tr[data-pushid="+a.push_list[h][0]+"]").html($("<td colspan=99>").html($("<span>").addClass("red").text("Stopping..")))}mist.send(function(){c.text("Stop pushes");b(g)},{push_stop:g,push_settings:{wait:0}})}}))}else{if(f.length>=6){var l=
|
||||
f[5];i.append($("<div>").append("Active for: "+UI.format.duration(l.active_seconds))).append($("<div>").append("Data transfered: "+UI.format.bytes(l.bytes))).append($("<div>").append("Media time transfered: "+UI.format.duration(l.mediatime*0.001)));"pkt_retrans_count"in l&&i.append($("<div>").append("Packets retransmitted: "+UI.format.number(l.pkt_retrans_count||0)));"pkt_loss_count"in l&&i.append($("<div>").append("Packets lost: "+UI.format.number(l.pkt_loss_count||0)+" ("+UI.format.addUnit(UI.format.number(l.pkt_loss_perc||
|
||||
f[5];i.append($("<div>").append("Active for: "+UI.format.duration(l.active_seconds))).append($("<div>").append("Data transferred: "+UI.format.bytes(l.bytes))).append($("<div>").append("Media time transferred: "+UI.format.duration(l.mediatime*0.001)));"pkt_retrans_count"in l&&i.append($("<div>").append("Packets retransmitted: "+UI.format.number(l.pkt_retrans_count||0)));"pkt_loss_count"in l&&i.append($("<div>").append("Packets lost: "+UI.format.number(l.pkt_loss_count||0)+" ("+UI.format.addUnit(UI.format.number(l.pkt_loss_perc||
|
||||
0),"%")+" over the last "+UI.format.addUnit(5,"s")+")"))}if(f.length>=5)for(var j in f[4]){l=f[4][j];i.append($("<div>").append(UI.format.time(l[0])+" ["+l[1]+"] "+l[2]))}}return $("<tr>").css("vertical-align","top").attr("data-pushid",f[0]).append($("<td>").text(f[1])).append($("<td>").append(h.children())).append($("<td>").addClass("logs").append(i.children())).append(k)}L.html(UI.buildUI([{type:"help",help:"You can push streams to files or other servers, allowing them to broadcast your stream as well."}]));
|
||||
var d=a.push_settings;d||(d={});var e=$("<table>").append($("<tr>").append($("<th>").text("Stream")).append($("<th>").text("Target")).append($("<th>")).append($("<th>"))),f=e.clone();if("push_list"in a)for(var g in a.push_list)e.append(c(a.push_list[g],"Manual"));if("push_auto_list"in a)for(g in a.push_auto_list){var h=a.push_auto_list[g].slice();h.unshift(-1);f.append(c(h,"Automatic"))}L.append($("<h3>").text("Automatic push settings")).append(UI.buildUI([{label:"Delay before retry",unit:"s",type:"int",
|
||||
min:0,help:"How long the delay should be before MistServer retries an automatic push.<br>If set to 0, it does not retry.","default":3,pointer:{main:d,index:"wait"}},{label:"Maximum retries",unit:"/s",type:"int",min:0,help:"The maximum amount of retries per second (for all automatic pushes).<br>If set to 0, there is no limit.","default":0,pointer:{main:d,index:"maxspeed"}},{type:"buttons",buttons:[{type:"save",label:"Save","function":function(){mist.send(function(){UI.navto("Push")},{push_settings:d})}}]}])).append($("<h3>").text("Automatic push settings")).append($("<button>").text("Add an automatic push").click(function(){UI.navto("Start Push",
|
||||
|
|
|
@ -5974,11 +5974,11 @@ var UI = {
|
|||
)
|
||||
).append(
|
||||
$("<div>").append(
|
||||
"Data transfered: "+UI.format.bytes(stats.bytes)
|
||||
"Data transferred: "+UI.format.bytes(stats.bytes)
|
||||
)
|
||||
).append(
|
||||
$("<div>").append(
|
||||
"Media time transfered: "+UI.format.duration(stats.mediatime*1e-3)
|
||||
"Media time transferred: "+UI.format.duration(stats.mediatime*1e-3)
|
||||
)
|
||||
);
|
||||
if ("pkt_retrans_count" in stats) {
|
||||
|
@ -6729,7 +6729,7 @@ var UI = {
|
|||
saveas.target += append;
|
||||
}
|
||||
}
|
||||
delete saveas.params; //these are now part of the target url and we don't need them seperately
|
||||
delete saveas.params; //these are now part of the target url and we don't need them separately
|
||||
delete saveas.custom_url_params;
|
||||
|
||||
var obj = {};
|
||||
|
|
|
@ -262,11 +262,11 @@ namespace Mist{
|
|||
addIntOpt(pp, "buffer", "Buffer size", "Sets the buffer size in milliseconds. The buffer size will work best at four to seven times the ping time.");
|
||||
addIntOpt(pp, "bandwidth", "Bandwidth", "Sets the maximum bandwidth in Kbps. It is necessary to configure the bandwidth to be higher than the max bandwidth of your stream(s). This is in order to allow room for messaging headroom, plus the re-requested packets. When tuning a connection for the first time, analyze your stream statistics locally at first, then start at 10% higher for a constant bitrate, 100% higher for variable bitrate. Especially for VBR, provide generous \"headroom\" in your bandwidth. You can always reduce it when configuring and tuning the connection.");
|
||||
addIntOpt(pp, "return-bandwidth", "Return bandwidth", "Sets the maximum bandwidth in Kbps for just the receiver-to-sender direction. This is an option which may sometimes help avoid congestion insofar as it may limit re-request messages in poor network conditions.");
|
||||
addIntOpt(pp, "reorder-buffer", "Reorder buffer", "Sets the size for a secondary buffer in which after all re=requested packets have been received, the out-of-order packets are released in the correct order. in most cases there should be no need to adjust this setting, but it may be helpful in conjuction with very long distance/large buffer/poor network conditions.");
|
||||
addIntOpt(pp, "reorder-buffer", "Reorder buffer", "Sets the size for a secondary buffer in which after all re=requested packets have been received, the out-of-order packets are released in the correct order. in most cases there should be no need to adjust this setting, but it may be helpful in conjunction with very long distance/large buffer/poor network conditions.");
|
||||
addStrOpt(pp, "cname", "Cacnonical name", "Provides a canonical name for the media. If multi-plexing more than one stream through a tunnel, this provides a convenient way to identify a particular stream within the log. You should make it standard practice to assign a cononical name whenever multi-plexing.");
|
||||
addIntOpt(pp, "rtt-min", "Minimum Round Trip Time", "Sets the minimum rtt setting in milliseconds. This can help reduce congestion by reducing the number of repeated re-requests in poor network conditions. More importantly, for very long-distance or connections that traverse under-sea cables, it may be important to adjust this setting.");
|
||||
addIntOpt(pp, "rtt-max", "Maximum Round Trip Time", "Sets the maximum rtt setting in milliseconds. See rtt-min for a more complete description. in most cases, minimum and maximum should be set to be equal to one another.");
|
||||
addIntOpt(pp, "aes-type", "AES Type", "Specifies the specific encrytion. Specify \"128\" for AES-128 or \"256\" for AES-256. Remember that you must also specify the pass phrase, and that encryption is not supported for the simple protocol at all.");
|
||||
addIntOpt(pp, "aes-type", "AES Type", "Specifies the specific encryption. Specify \"128\" for AES-128 or \"256\" for AES-256. Remember that you must also specify the pass phrase, and that encryption is not supported for the simple protocol at all.");
|
||||
addIntOpt(pp, "session-timeout", "Session timeout", "Terminates the RIST connection after inactivity/lack of keepalive response for the limit (in milliseconds) which you set with this parameter.");
|
||||
addStrOpt(pp, "secret", "Passphrase", "Sets the specified passphrase for Main or Advanced profile encryption. Note that simple protocol does not support encryption, and that you must in addition to the passphrase specify the \"AES Type\" parameter. The rotating keys shall be placed inside the rtcp messages, using your passphrase as the pre-shared key. Be sure that the passphrase for sender and receiver match!");
|
||||
addIntOpt(pp, "virt-dst-port", "Virtual destination port", "The port within the GRE tunnel. This has nothing to do with the media port(s). If the GRE is device /dev/tun11, having an address of 1.1.1.2, and the virtual destination port is 10000, and your media is using port 8193/4, the operating system will use 1.1.1.2:10000 as the destination from the sender's point of view, or the inbound on the receiver's point of view. libRIST will make use of that device/IP/port. As far as your media source and media player are concerned, the media is on ports 8193/4 on their respective interfaces. The media knows nothing of the tunnel.");
|
||||
|
|
|
@ -338,7 +338,7 @@ int main(int argc, char *argv[]){
|
|||
capa["optional"]["source_mask"]["default"] = "";
|
||||
|
||||
capa["optional"]["target_mask"]["name"] = "Output track mask";
|
||||
capa["optional"]["target_mask"]["help"] = "What internal processes should have access to the ouput track(s)";
|
||||
capa["optional"]["target_mask"]["help"] = "What internal processes should have access to the output track(s)";
|
||||
capa["optional"]["target_mask"]["type"] = "select";
|
||||
capa["optional"]["target_mask"]["select"][0u][0u] = "";
|
||||
capa["optional"]["target_mask"]["select"][0u][1u] = "Keep original value";
|
||||
|
|
|
@ -114,7 +114,7 @@ int main(int argc, char *argv[]){
|
|||
capa["optional"]["source_mask"]["default"] = "";
|
||||
|
||||
capa["optional"]["target_mask"]["name"] = "Output track mask";
|
||||
capa["optional"]["target_mask"]["help"] = "What internal processes should have access to the ouput track(s)";
|
||||
capa["optional"]["target_mask"]["help"] = "What internal processes should have access to the output track(s)";
|
||||
capa["optional"]["target_mask"]["type"] = "select";
|
||||
capa["optional"]["target_mask"]["select"][0u][0u] = "";
|
||||
capa["optional"]["target_mask"]["select"][0u][1u] = "Keep original value";
|
||||
|
|
|
@ -571,7 +571,7 @@ int main(int argc, char *argv[]){
|
|||
capa["optional"]["source_mask"]["default"] = "";
|
||||
|
||||
capa["optional"]["target_mask"]["name"] = "Output track mask";
|
||||
capa["optional"]["target_mask"]["help"] = "What internal processes should have access to the ouput track(s)";
|
||||
capa["optional"]["target_mask"]["help"] = "What internal processes should have access to the output track(s)";
|
||||
capa["optional"]["target_mask"]["type"] = "select";
|
||||
capa["optional"]["target_mask"]["select"][0u][0u] = "";
|
||||
capa["optional"]["target_mask"]["select"][0u][1u] = "Keep original value";
|
||||
|
|
Loading…
Add table
Reference in a new issue