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

Working HTTP Smooth Streaming after Metadata Upgrade.

Browse source
This commit is contained in:
Erik Zandvliet 2013-11-29 14:30:33 +01:00
parent 5536bf89f9
commit 045fe1cd70
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/connectors/conn_http_smooth.cpp
View file

@ -350,8 +350,6 @@ namespace Connector_HTTP {
} }
ss.SendNow(sstream.str().c_str()); ss.SendNow(sstream.str().c_str());
std::cerr << "[[]]Requested " << sstream.str() << std::endl;
unsigned int myDuration; unsigned int myDuration;
//Wrap everything in mp4 boxes //Wrap everything in mp4 boxes
@ -366,18 +364,18 @@ namespace Connector_HTTP {
MP4::TRUN trun_box; MP4::TRUN trun_box;
trun_box.setDataOffset(42); trun_box.setDataOffset(42);
int keySize = 0; unsigned int keySize = 0;
if (trackRef.type == "video"){ if (trackRef.type == "video"){
trun_box.setFlags(MP4::trundataOffset | MP4::trunfirstSampleFlags | MP4::trunsampleDuration | MP4::trunsampleSize); trun_box.setFlags(MP4::trundataOffset | MP4::trunfirstSampleFlags | MP4::trunsampleDuration | MP4::trunsampleSize);
}else{ }else{
trun_box.setFlags(MP4::trundataOffset | MP4::trunsampleDuration | MP4::trunsampleSize); trun_box.setFlags(MP4::trundataOffset | MP4::trunsampleDuration | MP4::trunsampleSize);
} }
trun_box.setFirstSampleFlags(0x00000040 | MP4::isIPicture | MP4::noDisposable | MP4::isKeySample); trun_box.setFirstSampleFlags(0x00000040 | MP4::noKeySample);
//trun_box.setFirstSampleFlags(0x00000040 | MP4::isIPicture | MP4::noDisposable | MP4::isKeySample);
for (int i = 0; i < keyObj.getParts(); i++){ for (int i = 0; i < keyObj.getParts(); i++){
MP4::trunSampleInformation trunSample; MP4::trunSampleInformation trunSample;
trunSample.sampleSize = Strm.metadata.tracks[myRef.trackID].parts[i + partOffset].getSize(); trunSample.sampleSize = Strm.metadata.tracks[myRef.trackID].parts[i + partOffset].getSize();
keySize += Strm.metadata.tracks[myRef.trackID].parts[i + partOffset].getSize(); keySize += Strm.metadata.tracks[myRef.trackID].parts[i + partOffset].getSize();
//Guesstimate sample duration.
trunSample.sampleDuration = Strm.metadata.tracks[myRef.trackID].parts[i + partOffset].getDuration() * 10000; trunSample.sampleDuration = Strm.metadata.tracks[myRef.trackID].parts[i + partOffset].getDuration() * 10000;
trun_box.setSampleInformation(trunSample, i); trun_box.setSampleInformation(trunSample, i);
} }