hydrar/mistserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'development' into LTS_development

Browse source 
# Conflicts:
#	src/output/output_rtmp.h
This commit is contained in:
Thulinma 2016-07-21 11:41:03 +02:00
commit 2f6cd40fb3
6 changed files with 50 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lsp/mist.js
View file

@ -2824,7 +2824,7 @@ var UI = {
var embedoptions = {autoplay: true};
function embedhtml(opts) {
var open = ['div'];
var inner = "\n"+' <script src="'+embedbase+'embed_'+other+'.js"><'+'/script>'+"\n"; //don't leave the closing script tag complete
var inner = "\n"+' <script src="'+embedbase+'embed_'+encodeURIComponent(other)+'.js"><'+'/script>'+"\n"; //don't leave the closing script tag complete
if (!opts.autoplay) {
open.push('data-noautoplay');
}
@ -2844,17 +2844,17 @@ var UI = {
{
label: 'Embedable script',
type: 'str',
value: embedbase+'embed_'+other+'.js',
value: embedbase+'embed_'+encodeURIComponent(other)+'.js',
readonly: true
},{
label: 'Stream info script',
type: 'str',
value: embedbase+'info_'+other+'.js',
value: embedbase+'info_'+encodeURIComponent(other)+'.js',
readonly: true
},{
label: 'Autodetect player',
type: 'str',
value: embedbase+other+'.html',
value: embedbase+encodeURIComponent(other)+'.html',
readonly: true,
qrcode: true
},$('<h3>').text('Embed code'),{
@ -3027,7 +3027,7 @@ var UI = {
// jQuery doesn't work -> use DOM magic
var script = document.createElement('script');
script.src = embedbase+'embed_'+other+'.js';
script.src = embedbase+'embed_'+encodeURIComponent(other)+'.js';
script.onerror = function(){
$c.html('Error loading "'+script.src+'".<br>').append(
$('<button>').text('Try again').click(function(){

4
lsp/test_streamembed.html
View file

@ -14,7 +14,7 @@
var embedtype = $('input[name=force]').val();
var info = document.createElement('script');
info.src = 'http://'+(window.location.hostname == '' ? 'localhost' : window.location.hostname)+':8080/info_'+streamName+'.js?video=0';
info.src = 'http://'+(window.location.hostname == '' ? 'localhost' : window.location.hostname)+':8080/info_'+encodeURIComponent(streamName)+'.js';
document.getElementById('embedcontainer').appendChild(info);
info.onload = function(){
if (embedtype == '') {
@ -45,4 +45,4 @@
<div id=embedcontainer style="width: 100%; height: 35em;" data-forcesupportcheck data-autoplay>
</div>
</body>
</html>
</html>

2
src/embed.js
View file

@ -189,7 +189,7 @@ function mistembed(streamname) {
break;
case 'html5':
container.innerHTML += '<video width="' + videowidth + '" height="' + videoheight + '" src="' + encodeURI(src.url) + '" controls="controls" '+(autoplay ? 'autoplay="autoplay"' : '')+'><strong>No HTML5 video support</strong></video>';
container.innerHTML += '<video width="' + videowidth + '" height="' + videoheight + '" src="' + src.url + '" controls="controls" '+(autoplay ? 'autoplay="autoplay"' : '')+'><strong>No HTML5 video support</strong></video>';
break;
case 'rtsp':

3
src/output/output.cpp
View file

@ -1034,6 +1034,7 @@ namespace Mist {
}
stats();
}
onFinish();
MEDIUM_MSG("MistOut client handler shutting down: %s, %s, %s", myConn.connected() ? "conn_active" : "conn_closed", wantRequest ? "want_request" : "no_want_request", parseData ? "parsing_data" : "not_parsing_data");
/*LTS-START*/
@ -1332,11 +1333,13 @@ namespace Mist {
nProxy.userClient = IPC::sharedClient(userPageName, PLAY_EX_SIZE, true);
if (!nProxy.userClient.getData()){
WARN_MSG("Player connection failure - aborting output");
onFinish();
myConn.close();
return;
}
}
if (!nProxy.userClient.isAlive()){
onFinish();
myConn.close();
return;
}

43
src/output/output_rtmp.cpp
View file

@ -169,6 +169,38 @@ namespace Mist {
}
}
bool OutRTMP::onFinish(){
MEDIUM_MSG("Finishing stream %s, %s", streamName.c_str(), myConn?"while connected":"already disconnected");
if (myConn){
myConn.SendNow(RTMPStream::SendUSR(1, 1)); //send UCM StreamEOF (1), stream 1
AMF::Object amfreply("container", AMF::AMF0_DDV_CONTAINER);
amfreply.addContent(AMF::Object("", "onStatus")); //status reply
amfreply.addContent(AMF::Object("", (double)0)); //transaction ID
amfreply.addContent(AMF::Object("", (double)0, AMF::AMF0_NULL)); //null - command info
amfreply.addContent(AMF::Object("")); //info
amfreply.getContentP(3)->addContent(AMF::Object("level", "status"));
amfreply.getContentP(3)->addContent(AMF::Object("code", "NetStream.Play.Stop"));
amfreply.getContentP(3)->addContent(AMF::Object("description", "Stream stopped"));
amfreply.getContentP(3)->addContent(AMF::Object("details", "DDV"));
amfreply.getContentP(3)->addContent(AMF::Object("clientid", (double)1337));
sendCommand(amfreply, 20, 1);
amfreply = AMF::Object ("container", AMF::AMF0_DDV_CONTAINER);
amfreply.addContent(AMF::Object("", "onStatus")); //status reply
amfreply.addContent(AMF::Object("", (double)0)); //transaction ID
amfreply.addContent(AMF::Object("", (double)0, AMF::AMF0_NULL)); //null - command info
amfreply.addContent(AMF::Object("")); //info
amfreply.getContentP(3)->addContent(AMF::Object("level", "status"));
amfreply.getContentP(3)->addContent(AMF::Object("code", "NetStream.Play.UnpublishNotify"));
amfreply.getContentP(3)->addContent(AMF::Object("description", "Stream stopped"));
amfreply.getContentP(3)->addContent(AMF::Object("clientid", (double)1337));
sendCommand(amfreply, 20, 1);
myConn.close();
}
return false;
}
void OutRTMP::parseVars(std::string data){
std::string varname;
std::string varval;
@ -614,6 +646,7 @@ namespace Mist {
} //createStream
if ((amfData.getContentP(0)->StrValue() == "closeStream") || (amfData.getContentP(0)->StrValue() == "deleteStream")) {
stop();
onFinish();
return;
}
if ((amfData.getContentP(0)->StrValue() == "FCUnpublish") || (amfData.getContentP(0)->StrValue() == "releaseStream")) {
@ -713,7 +746,7 @@ namespace Mist {
if (streamCfg){
if (streamCfg.getMember("source").asString().substr(0, 7) != "push://"){
FAIL_MSG("Push rejected - stream %s not a push-able stream. (%s != push://*)", streamName.c_str(), streamCfg.getMember("source").asString().c_str());
myConn.close();
onFinish();
}else{
std::string source = streamCfg.getMember("source").asString().substr(7);
std::string IP = source.substr(0, source.find('@'));
@ -747,13 +780,13 @@ namespace Mist {
if (IP != ""){
if (!myConn.isAddress(IP)){
FAIL_MSG("Push from %s to %s rejected - source host not whitelisted", getConnectedHost().c_str(), streamName.c_str());
myConn.close();
onFinish();
}
}
}
}else{
FAIL_MSG("Push from %s rejected - stream '%s' not configured.", getConnectedHost().c_str(), streamName.c_str());
myConn.close();
onFinish();
}
configLock.post();
configLock.close();
@ -994,7 +1027,7 @@ namespace Mist {
inputBuffer.get().clear();
}
stop();
myConn.close();
onFinish();
break; //happens when connection breaks unexpectedly
case 1: //set chunk size
RTMPStream::chunk_rec_max = ntohl(*(int *)next.data.c_str());
@ -1067,7 +1100,7 @@ namespace Mist {
static std::map<unsigned int, AMF::Object> pushMeta;
if (!isInitialized) {
MEDIUM_MSG("Received useless media data");
myConn.close();
onFinish();
break;
}
F.ChunkLoader(next);

1
src/output/output_rtmp.h
View file

@ -16,6 +16,7 @@ namespace Mist {
bool isReadyForPlay();
static bool listenMode();
void requestHandler();
bool onFinish();
protected:
bool isPushing;
unsigned int maxbps;