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

Answered the ultimate question to get mp4 working.

Browse source
This commit is contained in:
Erik Zandvliet 2013-08-21 15:51:40 +02:00
parent 830c6147ab
commit d6f91d17d2
1 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/converters/dtsc2mp4.cpp
View file

@ -127,11 +127,12 @@ namespace Converters {
MP4::MDHD mdhdBox(0);/// \todo fix constructor mdhd in lib MP4::MDHD mdhdBox(0);/// \todo fix constructor mdhd in lib
mdhdBox.setCreationTime(0); mdhdBox.setCreationTime(0);
mdhdBox.setModificationTime(0); mdhdBox.setModificationTime(0);
if(it->second["type"].asString() == "video"){ //Calculating media time based on sampledelta. Probably cheating, but it works...
timescale = it->second["fpks"].asInt()/10; int tmpParts = 0;
}else{ for (JSON::ArrIter tmpIt = it->second["keys"].ArrBegin(); tmpIt != it->second["keys"].ArrEnd(); tmpIt++){
timescale = it->second["rate"].asInt(); tmpParts += (*tmpIt)["parts"].size();
} }
timescale = ((double)(42 * tmpParts) / (it->second["lastms"].asInt() + it->second["firstms"].asInt())) * 1000;
mdhdBox.setTimeScale(timescale); mdhdBox.setTimeScale(timescale);
mdhdBox.setDuration(((it->second["lastms"].asInt() + it->second["firsms"].asInt()) * ((double)timescale / 1000))); mdhdBox.setDuration(((it->second["lastms"].asInt() + it->second["firsms"].asInt()) * ((double)timescale / 1000)));
mdiaBox.setContent(mdhdBox, 0); mdiaBox.setContent(mdhdBox, 0);
@ -199,7 +200,7 @@ namespace Converters {
esdsBox.setStreamType(5); esdsBox.setStreamType(5);
esdsBox.setReservedFlag(1); esdsBox.setReservedFlag(1);
esdsBox.setBufferSize(1250000); esdsBox.setBufferSize(1250000);
esdsBox.setMaximumBitRate(it->second["bps"].asInt() * 8); esdsBox.setMaximumBitRate(10000000);
esdsBox.setAverageBitRate(it->second["bps"].asInt() * 8); esdsBox.setAverageBitRate(it->second["bps"].asInt() * 8);
esdsBox.setConfigDescriptorTypeLength(5); esdsBox.setConfigDescriptorTypeLength(5);
esdsBox.setESHeaderStartCodes(it->second["init"].asString()); esdsBox.setESHeaderStartCodes(it->second["init"].asString());
@ -215,13 +216,10 @@ namespace Converters {
/// \todo update following stts lines /// \todo update following stts lines
MP4::STTS sttsBox;//current version probably causes problems MP4::STTS sttsBox;//current version probably causes problems
sttsBox.setVersion(0); sttsBox.setVersion(0);
int tmpParts = 0;
for (JSON::ArrIter tmpIt = it->second["keys"].ArrBegin(); tmpIt != it->second["keys"].ArrEnd(); tmpIt++){
tmpParts += (*tmpIt)["parts"].size();
}
MP4::STTSEntry newEntry; MP4::STTSEntry newEntry;
newEntry.sampleCount = tmpParts; newEntry.sampleCount = tmpParts;
newEntry.sampleDelta = (((double)it->second["lastms"].asInt() / tmpParts) * ((double)timescale / 1000)); //42, because of reasons.
newEntry.sampleDelta = 42;
sttsBox.setSTTSEntry(newEntry, 0); sttsBox.setSTTSEntry(newEntry, 0);
stblBox.setContent(sttsBox,1); stblBox.setContent(sttsBox,1);