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

Fixed VLC-specific format RTMP URLs.

Browse source
This commit is contained in:
Thulinma 2015-02-12 12:47:00 +01:00
parent 109fa4d91f
commit 4e50f13d03
1 changed files with 17 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/output/output_rtmp.cpp
View file

@ -447,6 +447,18 @@ namespace Mist {
if ((amfData.getContentP(0)->StrValue() == "publish")) { if ((amfData.getContentP(0)->StrValue() == "publish")) {
if (amfData.getContentP(3)) { if (amfData.getContentP(3)) {
streamName = amfData.getContentP(3)->StrValue(); streamName = amfData.getContentP(3)->StrValue();
size_t colonPos = streamName.find(':');
if (colonPos != std::string::npos && colonPos < 6){
std::string oldName = streamName;
if (std::string(".")+oldName.substr(0, colonPos) == oldName.substr(oldName.size() - colonPos - 1)){
streamName = oldName.substr(colonPos + 1);
}else{
streamName = oldName.substr(colonPos + 1) + std::string(".") + oldName.substr(0, colonPos);
}
}
Util::sanitizeName(streamName); Util::sanitizeName(streamName);
//pull the server configuration //pull the server configuration
IPC::sharedPage serverCfg("!mistConfig", DEFAULT_CONF_PAGE_SIZE); ///< Contains server configuration and capabilities IPC::sharedPage serverCfg("!mistConfig", DEFAULT_CONF_PAGE_SIZE); ///< Contains server configuration and capabilities
@ -525,7 +537,11 @@ namespace Mist {
size_t colonPos = streamName.find(':'); size_t colonPos = streamName.find(':');
if (colonPos != std::string::npos && colonPos < 6){ if (colonPos != std::string::npos && colonPos < 6){
std::string oldName = streamName; std::string oldName = streamName;
streamName = oldName.substr(colonPos + 1) + std::string(".") + oldName.substr(0, colonPos); if (std::string(".")+oldName.substr(0, colonPos) == oldName.substr(oldName.size() - colonPos - 1)){
streamName = oldName.substr(colonPos + 1);
}else{
streamName = oldName.substr(colonPos + 1) + std::string(".") + oldName.substr(0, colonPos);
}
} }
Util::sanitizeName(streamName); Util::sanitizeName(streamName);
initialize(); initialize();