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_hss.cpp
#	src/output/output_rtmp.cpp
This commit is contained in:
Thulinma 2016-04-14 12:05:55 +02:00
commit d20c4f5ec5
9 changed files with 198 additions and 207 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/output/output_hss.cpp
View file

@ -4,7 +4,7 @@
#include <mist/mp4_ms.h>
#include <mist/mp4_generic.h>
#include <mist/mp4_encryption.h> /*LTS*/
#include <mist/base64.h>
#include <mist/encode.h>
#include <mist/http_parser.h>
#include <mist/stream.h>
#include <mist/bitfields.h>

37
src/output/output_rtmp.cpp
View file

@ -3,6 +3,7 @@
#include <mist/defines.h>
#include <mist/stream.h>
#include <mist/triggers.h>
#include <mist/encode.h>
#include <sys/stat.h>
#include <cstring>
#include <cstdlib>
@ -37,39 +38,6 @@ namespace Mist {
OutRTMP::~OutRTMP() {}
/// Helper function for urlunescape.
/// Takes a single char input and outputs its integer hex value.
int unhex(char c) {
return (c >= '0' && c <= '9' ? c - '0' : c >= 'A' && c <= 'F' ? c - 'A' + 10 : c - 'a' + 10);
}
/// Unescapes URLencoded std::string data.
std::string urlunescape(const std::string & in) {
std::string out;
for (unsigned int i = 0; i < in.length(); ++i) {
if (in[i] == '%') {
char tmp = 0;
++i;
if (i < in.length()) {
tmp = unhex(in[i]) << 4;
}
++i;
if (i < in.length()) {
tmp += unhex(in[i]);
}
out += tmp;
} else {
if (in[i] == '+') {
out += ' ';
} else {
out += in[i];
}
}
}
return out;
}
void OutRTMP::parseVars(std::string data){
std::string varname;
std::string varval;
@ -91,7 +59,6 @@ namespace Mist {
varname = data.substr(pos, nextpos - pos);
varval.clear();
}
//SetVar(urlunescape(varname), urlunescape(varval));
if (varname == "track"){
long long int selTrack = JSON::Value(varval).asInt();
@ -646,7 +613,7 @@ namespace Mist {
int playTransaction = amfData.getContentP(1)->NumValue();
int playMessageType = messageType;
int playStreamId = streamId;
streamName = urlunescape(amfData.getContentP(3)->StrValue());
streamName = Encodings::URL::decode(amfData.getContentP(3)->StrValue());
reqUrl += "/"+streamName;//LTS
//handle variables