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

Various fixes for HTTP Smooth Streaming

Browse source
This commit is contained in:
Erik Zandvliet 2013-10-08 14:19:21 +02:00
parent 2d50fe7da9
commit fcb89da80b
1 changed files with 19 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/connectors/conn_http_smooth.cpp
View file

@ -96,8 +96,7 @@ namespace Connector_HTTP {
for (JSON::ArrIter keyIt = allAudio.ObjBegin()->second["keys"].ArrBegin(); keyIt != allAudio.ObjBegin()->second["keys"].ArrEnd(); keyIt++){ for (JSON::ArrIter keyIt = allAudio.ObjBegin()->second["keys"].ArrBegin(); keyIt != allAudio.ObjBegin()->second["keys"].ArrEnd(); keyIt++){
Result << "<c "; Result << "<c ";
if (keyIt == allAudio.ObjBegin()->second["keys"].ArrBegin()){ if (keyIt == allAudio.ObjBegin()->second["keys"].ArrBegin()){
// ensure proper audio start time (yes, this is video :D) Result << "t=\"" << allAudio.ObjBegin()->second["firstms"].asInt() * 10000 << "\" ";
Result << "t=\"" << allVideo.ObjBegin()->second["firstms"].asInt() * 10000 << "\" ";
} }
Result << "d=\"" << (*keyIt)["len"].asInt() * 10000 << "\" />\n"; Result << "d=\"" << (*keyIt)["len"].asInt() * 10000 << "\" />\n";
} }
@ -358,12 +357,17 @@ namespace Connector_HTTP {
MP4::TFHD tfhd_box; MP4::TFHD tfhd_box;
tfhd_box.setFlags(MP4::tfhdSampleFlag); tfhd_box.setFlags(MP4::tfhdSampleFlag);
tfhd_box.setTrackID(1); tfhd_box.setTrackID(1);
tfhd_box.setDefaultSampleFlags(0x000000C0 | MP4::noIPicture | MP4::noDisposable | MP4::noKeySample); tfhd_box.setDefaultSampleFlags(0x000000C0 | MP4::isKeySample);
MP4::TRUN trun_box; MP4::TRUN trun_box;
trun_box.setFlags(MP4::trundataOffset | MP4::trunfirstSampleFlags | MP4::trunsampleDuration | MP4::trunsampleSize);
trun_box.setDataOffset(42); trun_box.setDataOffset(42);
trun_box.setFirstSampleFlags(0x00000040 | MP4::isIPicture | MP4::noDisposable | MP4::isKeySample); if (trackRef["type"].asString() == "video"){
trun_box.setFlags(MP4::trundataOffset | MP4::trunfirstSampleFlags | MP4::trunsampleDuration | MP4::trunsampleSize);
trun_box.setFirstSampleFlags(0x00000040 | MP4::noKeySample);
}else{
trun_box.setFlags(MP4::trundataOffset | MP4::trunsampleDuration | MP4::trunsampleSize);
trun_box.setFirstSampleFlags(0x00000040 | MP4::isKeySample);
}
std::deque<long long int> tmpParts; std::deque<long long int> tmpParts;
JSON::decodeVector(keyObj["parts"].asString(), tmpParts); JSON::decodeVector(keyObj["parts"].asString(), tmpParts);
for (int i = 0; i < tmpParts.size(); i++){ for (int i = 0; i < tmpParts.size(); i++){
@ -376,9 +380,16 @@ namespace Connector_HTTP {
MP4::SDTP sdtp_box; MP4::SDTP sdtp_box;
sdtp_box.setVersion(0); sdtp_box.setVersion(0);
sdtp_box.setValue(0x24, 4); if (trackRef["type"].asString() == "video"){
for (int i = 1; i < keyObj["partsize"].asInt(); i++){ sdtp_box.setValue(36, 4);
sdtp_box.setValue(0x14, 4 + i); for (int i = 1; i < keyObj["partsize"].asInt(); i++){
sdtp_box.setValue(20, 4 + i);
}
}else{
sdtp_box.setValue(40, 4);
for (int i = 1; i < keyObj["partsize"].asInt(); i++){
sdtp_box.setValue(40, 4 + i);
}
} }
MP4::TRAF traf_box; MP4::TRAF traf_box;