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

Pro side of encoding fixes.

Browse source
This commit is contained in:
Thulinma 2016-04-14 12:08:26 +02:00
parent d20c4f5ec5
commit 9896b5837e
5 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/output/output_hss.cpp
View file

@ -368,7 +368,7 @@ namespace Mist {
resGen << (char)((tmp.size()) & 0xFF);
resGen << (char)(((tmp.size()) >> 8) & 0xFF);
resGen << tmp;
return Base64::encode(resGen.str());
return Encodings::Base64::encode(resGen.str());
}
/*LTS-END*/

6
src/output/output_rtsp.cpp
View file

@ -1,6 +1,6 @@
#include <mist/defines.h>
#include <mist/auth.h>
#include <mist/base64.h>
#include <mist/encode.h>
#include <mist/stream.h>
#include "output_rtsp.h"
@ -249,9 +249,9 @@ namespace Mist {
<< std::hex << std::setw(2) << std::setfill('0') << (int)objIt->second.init.data()[1] << std::dec << "E0"
<< std::hex << std::setw(2) << std::setfill('0') << (int)objIt->second.init.data()[3] << std::dec << ";"
"sprop-parameter-sets="
<< Base64::encode(std::string(avccbox.getSPS(), avccbox.getSPSLen()))
<< Encodings::Base64::encode(std::string(avccbox.getSPS(), avccbox.getSPSLen()))
<< ","
<< Base64::encode(std::string(avccbox.getPPS(), avccbox.getPPSLen()))
<< Encodings::Base64::encode(std::string(avccbox.getPPS(), avccbox.getPPSLen()))
<< "\r\n"
"a=framerate:" << ((double)objIt->second.fpks)/1000.0 << "\r\n"
"a=control:track" << objIt->second.trackID << "\r\n";