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
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/encryption.cpp
View file

@ -9,7 +9,7 @@
#include "defines.h" #include "defines.h"
#include "bitfields.h" #include "bitfields.h"
#include "http_parser.h" #include "http_parser.h"
#include "base64.h" #include "encode.h"
#include "nal.h"/*LTS*/ #include "nal.h"/*LTS*/
#include <sstream> #include <sstream>

8
src/input/input_dtsccrypt.cpp
View file

@ -5,7 +5,7 @@
#include <cstdio> #include <cstdio>
#include <string> #include <string>
#include <mist/stream.h> #include <mist/stream.h>
#include <mist/base64.h> #include <mist/encode.h>
#include <mist/defines.h> #include <mist/defines.h>
#include <mist/encryption.h> #include <mist/encryption.h>
#include <mist/bitfields.h> #include <mist/bitfields.h>
@ -53,14 +53,14 @@ namespace Mist {
} }
bool inputDTSC::setup() { bool inputDTSC::setup() {
key = Base64::decode(config->getString("key")); key = Encodings::Base64::decode(config->getString("key"));
if (key == ""){ if (key == ""){
if (config->getString("keyseed") == "" || config->getString("keyid") == ""){ if (config->getString("keyseed") == "" || config->getString("keyid") == ""){
std::cerr << "No key given, and no keyseed/keyid geven" << std::endl; std::cerr << "No key given, and no keyseed/keyid geven" << std::endl;
return false; return false;
} }
std::string tmpSeed = Base64::decode(config->getString("keyseed")); std::string tmpSeed = Encodings::Base64::decode(config->getString("keyseed"));
std::string tmpID = Base64::decode(config->getString("keyid")); std::string tmpID = Encodings::Base64::decode(config->getString("keyid"));
std::string guid = Encryption::PR_GuidToByteArray(tmpID); std::string guid = Encryption::PR_GuidToByteArray(tmpID);
key = Encryption::PR_GenerateContentKey(tmpSeed, guid); key = Encryption::PR_GenerateContentKey(tmpSeed, guid);
} }

6
src/io.cpp
View file

@ -1,7 +1,7 @@
#include <mist/stream.h> #include <mist/stream.h>
#include <mist/json.h> #include <mist/json.h>
#include <mist/auth.h> #include <mist/auth.h>
#include <mist/base64.h> #include <mist/encode.h>
#include <mist/bitfields.h> #include <mist/bitfields.h>
#include <cstdlib> #include <cstdlib>
#include "io.h" #include "io.h"
@ -41,8 +41,8 @@ namespace Mist {
vmData.keyid = cfg.isMember("keyid")?cfg["keyid"].asString():""; vmData.keyid = cfg.isMember("keyid")?cfg["keyid"].asString():"";
vmData.keyseed = cfg.isMember("keyseed")?cfg["keyseed"].asString():""; vmData.keyseed = cfg.isMember("keyseed")?cfg["keyseed"].asString():"";
if (vmData.keyid != "" && vmData.keyseed != ""){ if (vmData.keyid != "" && vmData.keyseed != ""){
vmData.keyid = Base64::decode(vmData.keyid); vmData.keyid = Encodings::Base64::decode(vmData.keyid);
vmData.keyseed = Base64::decode(vmData.keyseed); vmData.keyseed = Encodings::Base64::decode(vmData.keyseed);
vmData.key = Encryption:: PR_GenerateContentKey(vmData.keyseed, vmData.keyid); vmData.key = Encryption:: PR_GenerateContentKey(vmData.keyseed, vmData.keyid);
vmData.laurl = cfg.isMember("la_url")?cfg["la_url"].asString():""; vmData.laurl = cfg.isMember("la_url")?cfg["la_url"].asString():"";
} }

2
src/output/output_hss.cpp
View file

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

6
src/output/output_rtsp.cpp
View file

@ -1,6 +1,6 @@
#include <mist/defines.h> #include <mist/defines.h>
#include <mist/auth.h> #include <mist/auth.h>
#include <mist/base64.h> #include <mist/encode.h>
#include <mist/stream.h> #include <mist/stream.h>
#include "output_rtsp.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()[1] << std::dec << "E0"
<< std::hex << std::setw(2) << std::setfill('0') << (int)objIt->second.init.data()[3] << std::dec << ";" << std::hex << std::setw(2) << std::setfill('0') << (int)objIt->second.init.data()[3] << std::dec << ";"
"sprop-parameter-sets=" "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" << "\r\n"
"a=framerate:" << ((double)objIt->second.fpks)/1000.0 << "\r\n" "a=framerate:" << ((double)objIt->second.fpks)/1000.0 << "\r\n"
"a=control:track" << objIt->second.trackID << "\r\n"; "a=control:track" << objIt->second.trackID << "\r\n";