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

Sanitised mp4 converter code

Browse source
This commit is contained in:
Oswald Auguste de Bruin 2013-12-03 14:02:13 +01:00
parent 2148e9ce20
commit 559b4cacce
1 changed files with 199 additions and 236 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
lib/mp4_conv.cpp
View file

@ -2,10 +2,6 @@
#include <sstream> #include <sstream>
namespace MP4{ namespace MP4{
/*bool keyPartSort(keyPart i, keyPart j){
return (i.time < j.time);
}*/
std::string DTSC2MP4Converter::DTSCMeta2MP4Header(DTSC::Meta & metaData){ std::string DTSC2MP4Converter::DTSCMeta2MP4Header(DTSC::Meta & metaData){
std::stringstream header; std::stringstream header;
//ftyp box //ftyp box
@ -52,53 +48,35 @@ namespace MP4{
//calculate interleaving //calculate interleaving
//putting all metadata in a huge, auto-sorting vector 'keyParts' //putting all metadata in a huge, auto-sorting vector 'keyParts'
//sort by time on keyframes for interleaving
keyParts.clear(); keyParts.clear();
for ( std::map<int,DTSC::Track>::iterator trackIt = metaData.tracks.begin(); trackIt != metaData.tracks.end(); trackIt ++) { for ( std::map<int,DTSC::Track>::iterator trackIt = metaData.tracks.begin(); trackIt != metaData.tracks.end(); trackIt ++) {
if (trackIt->first>0){ if (trackIt->first>0){
std::cerr << "preparing track: " << trackIt->first << std::endl;
int partItNumber = 0; int partItNumber = 0;
for ( std::deque< DTSC::Key>::iterator keyIt = trackIt->second.keys.begin(); keyIt != trackIt->second.keys.end(); keyIt ++) { for ( std::deque< DTSC::Key>::iterator keyIt = trackIt->second.keys.begin(); keyIt != trackIt->second.keys.end(); keyIt ++) {
//if ((*keyIt)->size > 0){
keyPart temp; keyPart temp;
temp.trackID = trackIt->second.trackID; temp.trackID = trackIt->second.trackID;
/*
temp.size = (*keyIt)["size"].asInt();
temp.time = (*keyIt)["time"].asInt();
temp.len = (*keyIt)["len"].asInt();
temp.parts = (*keyIt)["parts"].asString();
temp.partsize = (*keyIt)["partsize"].asInt();
*/
temp.time = keyIt->getTime();//timeplaats van keyframe temp.time = keyIt->getTime();//timeplaats van keyframe
std::cerr << "time: " << temp.time << std::endl;
temp.len = keyIt->getLength();//duration van keyframe temp.len = keyIt->getLength();//duration van keyframe
//std::cerr << "totalparts, partItNumber, getparts:"<< trackIt->second.parts.size() << ", " << partItNumber << ", " << keyIt->getParts() << std::endl;
temp.parts = std::deque<DTSC::Part> (trackIt->second.parts.begin() + partItNumber,trackIt->second.parts.begin() + partItNumber + keyIt->getParts() );//array met bytegrootte van elke aparte part temp.parts = std::deque<DTSC::Part> (trackIt->second.parts.begin() + partItNumber,trackIt->second.parts.begin() + partItNumber + keyIt->getParts() );//array met bytegrootte van elke aparte part
//calculate total size of parts //calculate total size of parts
int tempSize = 0; int tempSize = 0;
//std::cerr << "keyframe parts: ";
for (unsigned int di = 0; di < temp.parts.size(); di++){ for (unsigned int di = 0; di < temp.parts.size(); di++){
tempSize += temp.parts[di].getSize(); tempSize += temp.parts[di].getSize();
//std::cerr << temp.parts[di].getSize() << " ";
} }
//std::cerr << std::endl;
temp.size = tempSize;//bytegrootte van keyframe (alle parts bij elkaar) temp.size = tempSize;//bytegrootte van keyframe (alle parts bij elkaar)
temp.partsize = keyIt->getParts();//amount of parts in this keyframe temp.partsize = keyIt->getParts();//amount of parts in this keyframe
keyParts.insert(temp); keyParts.insert(temp);
//}
partItNumber += keyIt->getParts(); partItNumber += keyIt->getParts();
} }
} }
} }
//sort by time on keyframes for interleaving
//std::sort(keyParts.begin(), keyParts.end(), keyPartSort);
//start arbitrary track addition for header //start arbitrary track addition for header
int boxOffset = 1; int boxOffset = 1;
for ( std::map<int,DTSC::Track>::iterator it = metaData.tracks.begin(); it != metaData.tracks.end(); it ++) { for ( std::map<int,DTSC::Track>::iterator it = metaData.tracks.begin(); it != metaData.tracks.end(); it ++) {
if (it->first > 0){ if (it->first > 0){
std::cerr << "track " << it->second.trackID << std::endl;
//for (JSON::ObjIter it = metaData["tracks"].ObjBegin(); it != metaData["tracks"].ObjEnd(); it++){
int timescale = 0; int timescale = 0;
MP4::TRAK trakBox; MP4::TRAK trakBox;
MP4::TKHD tkhdBox; MP4::TKHD tkhdBox;
@ -134,7 +112,6 @@ namespace MP4{
//Calculating media time based on sampledelta. Probably cheating, but it works... //Calculating media time based on sampledelta. Probably cheating, but it works...
int tmpParts = 0; int tmpParts = 0;
for (std::deque< DTSC::Key>::iterator tmpIt = it->second.keys.begin(); tmpIt != it->second.keys.end(); tmpIt ++) { for (std::deque< DTSC::Key>::iterator tmpIt = it->second.keys.begin(); tmpIt != it->second.keys.end(); tmpIt ++) {
//for (JSON::ArrIter tmpIt = it->second["keys"].ArrBegin(); tmpIt != it->second["keys"].ArrEnd(); tmpIt++){
tmpParts += tmpIt->getParts(); tmpParts += tmpIt->getParts();
} }
timescale = ((double)(42 * tmpParts) / (it->second.lastms + it->second.firstms)) * 1000; timescale = ((double)(42 * tmpParts) / (it->second.lastms + it->second.firstms)) * 1000;
@ -219,7 +196,7 @@ namespace MP4{
} }
stblBox.setContent(stsdBox,0); stblBox.setContent(stsdBox,0);
/// \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);
MP4::STTSEntry newEntry; MP4::STTSEntry newEntry;
@ -260,10 +237,6 @@ namespace MP4{
stszBox.setVersion(0); stszBox.setVersion(0);
total = 0; total = 0;
for (std::deque< DTSC::Part>::iterator partIt = it->second.parts.begin(); partIt != it->second.parts.end(); partIt ++) { for (std::deque< DTSC::Part>::iterator partIt = it->second.parts.begin(); partIt != it->second.parts.end(); partIt ++) {
//for (int i = 0; i < it->second["keys"].size(); i++){
//std::deque<long long unsigned int> parsedParts;
//JSON::decodeVector(it->second["keys"][i]["parts"].asString(), parsedParts);
//for (unsigned int o = 0; o < tmpIt->parts.size(); o++){
stszBox.setEntrySize(partIt->getSize(), total);//in bytes in file stszBox.setEntrySize(partIt->getSize(), total);//in bytes in file
total++; total++;
} }
@ -275,22 +248,16 @@ namespace MP4{
long long unsigned int totalByteOffset = 0; long long unsigned int totalByteOffset = 0;
//Inserting wrong values on purpose here, will be fixed later. //Inserting wrong values on purpose here, will be fixed later.
//Current values are actual byte offset without header-sized offset //Current values are actual byte offset without header-sized offset
std::cerr << "pre-totalByteOffset: " << totalByteOffset << std::endl;
for (std::set<keyPart>::iterator i = keyParts.begin(); i != keyParts.end(); i++){//for all keypart size for (std::set<keyPart>::iterator i = keyParts.begin(); i != keyParts.end(); i++){//for all keypart size
if(i->trackID == it->second.trackID){//if keypart is of current trackID if(i->trackID == it->second.trackID){//if keypart is of current trackID
//std::deque<long long unsigned int> parsedParts; std::deque<DTSC::Part> tempArr = i->parts;
//JSON::decodeVector(i->parts, parsedParts); for (unsigned int o = 0; o < tempArr.size(); o++){//add all parts to STCO
std::deque<DTSC::Part> onowai = i->parts;
for (unsigned int o = 0; o < onowai.size(); o++){//add all parts to STCO
//for (std::deque<DTSC::Part>::iterator partIt = (*i).parts.begin(); partIt != (*i).parts.end(); partIt++){
stcoBox.setChunkOffset(totalByteOffset, total); stcoBox.setChunkOffset(totalByteOffset, total);
total++; total++;
totalByteOffset += onowai[o].getSize(); totalByteOffset += tempArr[o].getSize();
std::cerr << "small totalByteOffset: " << totalByteOffset << std::endl;
} }
}else{ }else{
totalByteOffset += i->size; totalByteOffset += i->size;
std::cerr << "large totalByteOffset: " << totalByteOffset << std::endl;
} }
} }
//calculating the offset where the STCO box will be in the main MOOV box //calculating the offset where the STCO box will be in the main MOOV box
@ -363,9 +330,7 @@ namespace MP4{
//while there are requested packets in the trackBuffer:... //while there are requested packets in the trackBuffer:...
while (!trackBuffer[curKey->trackID].empty()){ while (!trackBuffer[curKey->trackID].empty()){
//output requested packages //output requested packages
//std::deque<DTSC::Part> onowai = curKey->parts;
stringBuffer += trackBuffer[curKey->trackID].front()["data"].asString(); stringBuffer += trackBuffer[curKey->trackID].front()["data"].asString();
//std::cerr << "bufDataSize, antDataSize" << trackBuffer[curKey->trackID].front()["data"].asString().size() << ", " << onowai[curPart].getSize() << std::endl;
trackBuffer[curKey->trackID].pop_front(); trackBuffer[curKey->trackID].pop_front();
curPart++; curPart++;
if(curPart >= curKey->parts.size()){ if(curPart >= curKey->parts.size()){
@ -377,8 +342,6 @@ namespace MP4{
if(curKey->trackID == mediaPart["trackid"].asInt()){ if(curKey->trackID == mediaPart["trackid"].asInt()){
//output JSON packet //output JSON packet
stringBuffer += mediaPart["data"].asStringRef(); stringBuffer += mediaPart["data"].asStringRef();
//std::deque<DTSC::Part> onowai = curKey->parts;
//std::cerr << "dataSize, antDataSize" << mediaPart["data"].asStringRef().size() << ", " << onowai[curPart].getSize() << std::endl;
curPart++; curPart++;
if(curPart >= curKey->parts.size()){ if(curPart >= curKey->parts.size()){
curPart = 0; curPart = 0;