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

BalderDash fixes (H264 mp4 codecs weirdness//FF)

Browse source
This commit is contained in:
Balder 2016-02-29 11:35:17 +01:00
parent b79fb8cd6b
commit 7710a7d8a7
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/output/output_dash_mp4.cpp
View file

@ -349,9 +349,9 @@ namespace Mist {
std::stringstream r; std::stringstream r;
MP4::AVCC avccBox; MP4::AVCC avccBox;
avccBox.setPayload(initData); avccBox.setPayload(initData);
r << std::hex << std::setw(2) << std::setfill('0') << (int)avccBox.getSPS()[0] << std::dec; r << std::hex << std::setw(2) << std::setfill('0') << (int)initData[1] << std::dec;
r << std::hex << std::setw(2) << std::setfill('0') << (int)avccBox.getSPS()[1] << std::dec; r << std::hex << std::setw(2) << std::setfill('0') << (int)initData[2] << std::dec;
r << std::hex << std::setw(2) << std::setfill('0') << (int)avccBox.getSPS()[2] << std::dec; r << std::hex << std::setw(2) << std::setfill('0') << (int)initData[3] << std::dec;
return r.str(); return r.str();
} }
@ -545,7 +545,7 @@ namespace Mist {
std::string url = H.url; std::string url = H.url;
if (url.find(".mpd") != std::string::npos){ if (url.find(".mpd") != std::string::npos){
H.Clean(); H.Clean();
H.SetHeader("Content-Type", "application/xml"); H.SetHeader("Content-Type", "application/dash+xml");
H.SetHeader("Cache-Control", "no-cache"); H.SetHeader("Cache-Control", "no-cache");
H.setCORSHeaders(); H.setCORSHeaders();
if(method == "OPTIONS" || method == "HEAD"){ if(method == "OPTIONS" || method == "HEAD"){