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

Merge branch 'development' into LTS_development

Browse source
This commit is contained in:
Erik Zandvliet 2017-02-22 14:02:24 +01:00
commit 5e29ff5bb6
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/output/output_progressive_mp4.cpp
View file

@ -14,7 +14,7 @@ namespace Mist {
capa["name"] = "MP4"; capa["name"] = "MP4";
capa["desc"] = "Enables HTTP protocol progressive streaming."; capa["desc"] = "Enables HTTP protocol progressive streaming.";
capa["url_rel"] = "/$.mp4"; capa["url_rel"] = "/$.mp4";
capa["url_match"][0u] = "/$.mp4"; capa["url_match"][0u] = "/$.mp4";
capa["url_match"][1u] = "/$.3gp"; capa["url_match"][1u] = "/$.3gp";
capa["codecs"][0u][0u].append("H264"); capa["codecs"][0u][0u].append("H264");
capa["codecs"][0u][0u].append("HEVC"); capa["codecs"][0u][0u].append("HEVC");
@ -380,17 +380,17 @@ namespace Mist {
} }
header << std::string(moovBox.asBox(), moovBox.boxedSize()); header << std::string(moovBox.asBox(), moovBox.boxedSize());
if (!fragmented) { //if we are making a non fragmented MP4 and there are parts if (!fragmented) { //if we are making a non fragmented MP4 and there are parts
char mdatHeader[8] = {0x00,0x00,0x00,0x00,'m','d','a','t'}; char mdatHeader[8] = {0x00,0x00,0x00,0x00,'m','d','a','t'};
Bit::htobl(mdatHeader, mdatSize);
if (mdatSize < 0xFFFFFFFF){
Bit::htobl(mdatHeader, mdatSize);
}
header.write(mdatHeader, 8); header.write(mdatHeader, 8);
} else { } else {
//this is a dirty fix to prevent the code from adding 0xDE to the end of the header //this is a dirty fix to prevent the code from adding 0xDE to the end of the header
header << (char)(0); header << (char)(0);
} }
size += header.str().size(); size += header.str().size();
if (fragmented) { if (fragmented) {
realBaseOffset = header.str().size(); realBaseOffset = header.str().size();