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

Fixed OGG and MP4

Browse source
This commit is contained in:
Oswald Auguste de Bruin 2013-11-28 11:48:57 +01:00 • committed by Thulinma
parent 99353f49a0
commit 2148e9ce20
5 changed files with 157 additions and 90 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/mp4.cpp
View file

@ -2518,7 +2518,7 @@ namespace MP4 {
r << std::string(indent + 1, ' ') << "ConfigDescriptorTypeLength: 0x" << std::hex << (int)getConfigDescriptorTypeLength() << std::dec << std::endl;
r << std::string(indent + 1, ' ') << "ESHeaderStartCodes: 0x";
for (unsigned int i = 0; i<getESHeaderStartCodes().size(); i++){
r << std::hex << (int)getESHeaderStartCodes()[i] << std::dec << std::endl;
r << std::hex << (int)getESHeaderStartCodes()[i] << std::dec << ", ";
}
r << std::string(indent + 1, ' ') << "SLConfigDescriptorTypeTag: 0x" << std::hex << (int)getSLConfigDescriptorTypeTag() << std::dec << std::endl;
r << std::string(indent + 1, ' ') << "SLConfigExtendedDescriptorTypeTag: 0x" << std::hex << (int)getSLConfigExtendedDescriptorTypeTag() << std::dec << std::endl;

7
lib/mp4.h
View file

@ -10,10 +10,12 @@
#include <deque>
#include <algorithm>
#include "json.h"
#include "dtsc.h"
/// Contains all MP4 format related code.
namespace MP4 {
struct keyPart{
public:
bool operator < (const keyPart& rhs) const {
if (time < rhs.time){
return true;
@ -29,16 +31,17 @@ namespace MP4 {
long long int size;
long long int time;
long long int len;
std::string parts;
std::deque<DTSC::Part> parts;
long long int partsize;
};
class DTSC2MP4Converter{
public:
std::string DTSCMeta2MP4Header(JSON::Value metaData);
std::string DTSCMeta2MP4Header(DTSC::Meta & metaData);
void parseDTSC(JSON::Value mediaPart);
bool sendReady();
std::string sendString();
std::string purgeBuffer();
std::set <keyPart> keyParts;
private:
//long long unsigned int curKey;//the key chunk we are currently searching for in keyParts

166
lib/mp4_conv.cpp
View file

@ -6,9 +6,8 @@ namespace MP4{
return (i.time < j.time);
}*/
std::string DTSC2MP4Converter::DTSCMeta2MP4Header(JSON::Value metaData){
std::string DTSC2MP4Converter::DTSCMeta2MP4Header(DTSC::Meta & metaData){
std::stringstream header;
//ftyp box
/// \todo fill ftyp with non hardcoded values from file
MP4::FTYP ftypBox;
@ -29,7 +28,15 @@ namespace MP4{
mvhdBox.setModificationTime(0);
mvhdBox.setTimeScale(1000);
mvhdBox.setRate(0x10000);
mvhdBox.setDuration(metaData["lastms"].asInt() + metaData["firstms"].asInt());
//calculating longest duration
int fileDuration = 0;
///\TODO lastms and firstms fixen
for ( std::map<int,DTSC::Track>::iterator trackIt = metaData.tracks.begin(); trackIt != metaData.tracks.end(); trackIt ++) {
if (trackIt->second.lastms - trackIt->second.firstms > fileDuration){
fileDuration = trackIt->second.lastms - trackIt->second.firstms;
}
}
mvhdBox.setDuration(fileDuration);
mvhdBox.setTrackID(0);
mvhdBox.setVolume(256);
mvhdBox.setMatrix(0x00010000,0);
@ -44,19 +51,42 @@ namespace MP4{
moovBox.setContent(mvhdBox, 0);
//calculate interleaving
//putting all metadata in a huge vector 'keyParts'
//putting all metadata in a huge, auto-sorting vector 'keyParts'
keyParts.clear();
for (JSON::ObjIter trackIt = metaData["tracks"].ObjBegin(); trackIt != metaData["tracks"].ObjEnd(); trackIt++){
for (JSON::ArrIter keyIt = trackIt->second["keys"].ArrBegin(); keyIt != trackIt->second["keys"].ArrEnd(); keyIt++){
if ((*keyIt)["size"].asInt() > 0){
for ( std::map<int,DTSC::Track>::iterator trackIt = metaData.tracks.begin(); trackIt != metaData.tracks.end(); trackIt ++) {
if (trackIt->first>0){
std::cerr << "preparing track: " << trackIt->first << std::endl;
int partItNumber = 0;
for ( std::deque< DTSC::Key>::iterator keyIt = trackIt->second.keys.begin(); keyIt != trackIt->second.keys.end(); keyIt ++) {
//if ((*keyIt)->size > 0){
keyPart temp;
temp.trackID = trackIt->second["trackid"].asInt();
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
std::cerr << "time: " << temp.time << std::endl;
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
//calculate total size of parts
int tempSize = 0;
//std::cerr << "keyframe parts: ";
for (unsigned int di = 0; di < temp.parts.size(); di++){
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.partsize = keyIt->getParts();//amount of parts in this keyframe
keyParts.insert(temp);
//}
partItNumber += keyIt->getParts();
}
}
}
@ -65,18 +95,22 @@ namespace MP4{
//start arbitrary track addition for header
int boxOffset = 1;
for (JSON::ObjIter it = metaData["tracks"].ObjBegin(); it != metaData["tracks"].ObjEnd(); it++){
for ( std::map<int,DTSC::Track>::iterator it = metaData.tracks.begin(); it != metaData.tracks.end(); it ++) {
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;
MP4::TRAK trakBox;
MP4::TKHD tkhdBox;
tkhdBox.setVersion(0);
tkhdBox.setFlags(15);
tkhdBox.setTrackID(it->second["trackid"].asInt());
tkhdBox.setDuration(it->second["lastms"].asInt() + it->second["firsms"].asInt());
tkhdBox.setTrackID(it->second.trackID);
///\TODO duration firstms and lastms fix
tkhdBox.setDuration(it->second.lastms + it->second.firstms);
if (it->second["type"].asString() == "video"){
tkhdBox.setWidth(it->second["width"].asInt() << 16);
tkhdBox.setHeight(it->second["height"].asInt() << 16);
if (it->second.type == "video"){
tkhdBox.setWidth(it->second.width << 16);
tkhdBox.setHeight(it->second.height << 16);
tkhdBox.setVolume(0);
}else{
tkhdBox.setVolume(256);
@ -99,22 +133,24 @@ namespace MP4{
mdhdBox.setModificationTime(0);
//Calculating media time based on sampledelta. Probably cheating, but it works...
int tmpParts = 0;
for (JSON::ArrIter tmpIt = it->second["keys"].ArrBegin(); tmpIt != it->second["keys"].ArrEnd(); tmpIt++){
tmpParts += (*tmpIt)["partsize"].asInt();
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();
}
timescale = ((double)(42 * tmpParts) / (it->second["lastms"].asInt() + it->second["firstms"].asInt())) * 1000;
timescale = ((double)(42 * tmpParts) / (it->second.lastms + it->second.firstms)) * 1000;
mdhdBox.setTimeScale(timescale);
mdhdBox.setDuration(((it->second["lastms"].asInt() + it->second["firsms"].asInt()) * ((double)timescale / 1000)));
///\TODO fix lastms, firstms
mdhdBox.setDuration((it->second.lastms + it->second.firstms) * ((double)timescale / 1000));
mdiaBox.setContent(mdhdBox, 0);
std::string tmpStr = it->second["type"].asString();
std::string tmpStr = it->second.type;
MP4::HDLR hdlrBox;/// \todo fix constructor hdlr in lib
if (tmpStr == "video"){
hdlrBox.setHandlerType(0x76696465);//vide
}else if (tmpStr == "audio"){
hdlrBox.setHandlerType(0x736F756E);//soun
}
hdlrBox.setName(it->first);
hdlrBox.setName(it->second.getIdentifier());
mdiaBox.setContent(hdlrBox, 1);
MP4::MINF minfBox;
@ -140,40 +176,40 @@ namespace MP4{
stsdBox.setVersion(0);
if (tmpStr == "video"){//boxname = codec
MP4::VisualSampleEntry vse;
std::string tmpStr2 = it->second["codec"];
std::string tmpStr2 = it->second.codec;
if (tmpStr2 == "H264"){
vse.setCodec("avc1");
}
vse.setDataReferenceIndex(1);
vse.setWidth(it->second["width"].asInt());
vse.setHeight(it->second["height"].asInt());
vse.setWidth(it->second.width);
vse.setHeight(it->second.height);
MP4::AVCC avccBox;
avccBox.setPayload(it->second["init"].asString());
avccBox.setPayload(it->second.init);
vse.setCLAP(avccBox);
stsdBox.setEntry(vse,0);
}else if(tmpStr == "audio"){//boxname = codec
MP4::AudioSampleEntry ase;
std::string tmpStr2 = it->second["codec"];
std::string tmpStr2 = it->second.codec;
if (tmpStr2 == "AAC"){
ase.setCodec("mp4a");
ase.setDataReferenceIndex(1);
}
ase.setSampleRate(it->second["rate"].asInt());
ase.setChannelCount(it->second["channels"].asInt());
ase.setSampleSize(it->second["size"].asInt());
ase.setSampleRate(it->second.rate);
ase.setChannelCount(it->second.channels);
ase.setSampleSize(it->second.size);
MP4::ESDS esdsBox;
esdsBox.setESDescriptorTypeLength(32+it->second["init"].asString().size());
esdsBox.setESDescriptorTypeLength(32+it->second.init.size());
esdsBox.setESID(2);
esdsBox.setStreamPriority(0);
esdsBox.setDecoderConfigDescriptorTypeLength(18+it->second["init"].asString().size());
esdsBox.setDecoderConfigDescriptorTypeLength(18+it->second.init.size());
esdsBox.setByteObjectTypeID(0x40);
esdsBox.setStreamType(5);
esdsBox.setReservedFlag(1);
esdsBox.setBufferSize(1250000);
esdsBox.setMaximumBitRate(10000000);
esdsBox.setAverageBitRate(it->second["bps"].asInt() * 8);
esdsBox.setAverageBitRate(it->second.bps * 8);
esdsBox.setConfigDescriptorTypeLength(5);
esdsBox.setESHeaderStartCodes(it->second["init"].asString());
esdsBox.setESHeaderStartCodes(it->second.init);
esdsBox.setSLConfigDescriptorTypeTag(0x6);
esdsBox.setSLConfigExtendedDescriptorTypeTag(0x808080);
esdsBox.setSLDescriptorTypeLength(1);
@ -193,19 +229,21 @@ namespace MP4{
sttsBox.setSTTSEntry(newEntry, 0);
stblBox.setContent(sttsBox,1);
if (it->second["type"] == "video"){
if (it->second.type == "video"){
//STSS Box here
MP4::STSS stssBox;
stssBox.setVersion(0);
int tmpCount = 1;
for (int i = 0; i < it->second["keys"].size(); i++){
stssBox.setSampleNumber(tmpCount,i);
tmpCount += it->second["keys"][i]["partsize"].asInt();
int tmpItCount = 0;
for ( std::deque< DTSC::Key>::iterator tmpIt = it->second.keys.begin(); tmpIt != it->second.keys.end(); tmpIt ++) {
stssBox.setSampleNumber(tmpCount,tmpItCount);
tmpCount += tmpIt->getParts();
tmpItCount ++;
}
stblBox.setContent(stssBox,2);
}
int offset = (it->second["type"] == "video");
int offset = (it->second.type == "video");
MP4::STSC stscBox;
@ -221,38 +259,44 @@ namespace MP4{
MP4::STSZ stszBox;
stszBox.setVersion(0);
total = 0;
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 < parsedParts.size(); o++){
stszBox.setEntrySize(parsedParts[o], total);//in bytes in file
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
total++;
}
}
stblBox.setContent(stszBox,3 + offset);
MP4::STCO stcoBox;
stcoBox.setVersion(1);
total = 0;
uint64_t totalByteOffset = 0;
long long unsigned int totalByteOffset = 0;
//Inserting wrong values on purpose here, will be fixed later.
//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
if(i->trackID == it->second["trackid"].asInt()){//if keypart is of current trackID
std::deque<long long unsigned int> parsedParts;
JSON::decodeVector(i->parts, parsedParts);
for (unsigned int o = 0; o < parsedParts.size(); o++){//add all parts to STCO
if(i->trackID == it->second.trackID){//if keypart is of current trackID
//std::deque<long long unsigned int> parsedParts;
//JSON::decodeVector(i->parts, parsedParts);
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);
total++;
totalByteOffset += parsedParts[o];
totalByteOffset += onowai[o].getSize();
std::cerr << "small totalByteOffset: " << totalByteOffset << std::endl;
}
}else{
totalByteOffset += i->size;
std::cerr << "large totalByteOffset: " << totalByteOffset << std::endl;
}
}
//calculating the offset where the STCO box will be in the main MOOV box
//needed for probable optimise
mdatSize = totalByteOffset;
stblBox.setContent(stcoBox,4 + offset);
minfBox.setContent(stblBox,2);
mdiaBox.setContent(minfBox, 2);
@ -260,6 +304,7 @@ namespace MP4{
moovBox.setContent(trakBox, boxOffset);
boxOffset++;
}
}
//end arbitrary
//initial offset length ftyp, length moov + 8
unsigned long long int byteOffset = ftypBox.boxedSize() + moovBox.boxedSize() + 8;
@ -318,10 +363,12 @@ namespace MP4{
//while there are requested packets in the trackBuffer:...
while (!trackBuffer[curKey->trackID].empty()){
//output requested packages
//std::deque<DTSC::Part> onowai = curKey->parts;
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();
curPart++;
if(curPart >= curKey->partsize){
if(curPart >= curKey->parts.size()){
curPart = 0;
curKey++;
}
@ -330,8 +377,10 @@ namespace MP4{
if(curKey->trackID == mediaPart["trackid"].asInt()){
//output JSON packet
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++;
if(curPart >= curKey->partsize){
if(curPart >= curKey->parts.size()){
curPart = 0;
curKey++;
}
@ -354,5 +403,20 @@ namespace MP4{
stringBuffer = "";
return temp;
}
std::string DTSC2MP4Converter::purgeBuffer(){
std::string retval = stringBuffer;
stringBuffer = "";
for (std::map <long long unsigned int, std::deque<JSON::Value> >::iterator it = trackBuffer.begin(); it !=trackBuffer.end(); it++){
while (!it->second.empty()){
//output requested packages
if (it->second.front()["data"].asString() != ""){
retval += it->second.front()["data"].asString();
}
it->second.pop_front();
}
}
return retval;
}
}

28
lib/ogg.cpp
View file

@ -505,7 +505,7 @@ namespace OGG{
setCRCChecksum(calcChecksum());
}
void headerPages::readDTSCHeader(JSON::Value meta){
void headerPages::readDTSCHeader(DTSC::Meta & meta){
//pages.clear();
parsedPages = "";
Page curOggPage;
@ -514,19 +514,19 @@ namespace OGG{
DTSCID2OGGSerial.clear();
DTSCID2seqNum.clear();
//Creating ID headers for theora and vorbis
for ( JSON::ObjIter it = meta["tracks"].ObjBegin(); it != meta["tracks"].ObjEnd(); it ++) {
for ( std::map<int,DTSC::Track>::iterator it = meta.tracks.begin(); it != meta.tracks.end(); it ++) {
curOggPage.clear();
curOggPage.setVersion();
curOggPage.setHeaderType(2);//headertype 2 = Begin of Stream
curOggPage.setGranulePosition(0);
DTSCID2OGGSerial[it->second["trackid"].asInt()] = rand() % 0xFFFFFFFE +1; //initialising on a random not 0 number
curOggPage.setBitstreamSerialNumber(DTSCID2OGGSerial[it->second["trackid"].asInt()]);
DTSCID2seqNum[it->second["trackid"].asInt()] = 0;
curOggPage.setPageSequenceNumber(DTSCID2seqNum[it->second["trackid"].asInt()]++);
DTSCID2OGGSerial[it->second.trackID] = rand() % 0xFFFFFFFE +1; //initialising on a random not 0 number
curOggPage.setBitstreamSerialNumber(DTSCID2OGGSerial[it->second.trackID]);
DTSCID2seqNum[it->second.trackID] = 0;
curOggPage.setPageSequenceNumber(DTSCID2seqNum[it->second.trackID]++);
curSegTable.clear();
curSegTable.push_back(it->second["IDHeader"].asString().size());
curSegTable.push_back(it->second.idHeader.size());
curOggPage.setSegmentTable(curSegTable);
curOggPage.setPayload((char*)it->second["IDHeader"].asString().c_str(), it->second["IDHeader"].asString().size());
curOggPage.setPayload((char*)it->second.idHeader.c_str(), it->second.idHeader.size());
curOggPage.setCRCChecksum(curOggPage.calcChecksum());
//std::cout << std::string(curOggPage.getPage(), curOggPage.getPageSize());
//pages.push_back(curOggPage);
@ -535,18 +535,18 @@ namespace OGG{
//Creating remaining headers for theora and vorbis
//for tracks in header
//create standard page with comment (empty) en setup header(init)
for ( JSON::ObjIter it = meta["tracks"].ObjBegin(); it != meta["tracks"].ObjEnd(); it ++) {
for ( std::map<int,DTSC::Track>::iterator it = meta.tracks.begin(); it != meta.tracks.end(); it ++) {
curOggPage.clear();
curOggPage.setVersion();
curOggPage.setHeaderType(0);//headertype 0 = normal
curOggPage.setGranulePosition(0);
curOggPage.setBitstreamSerialNumber(DTSCID2OGGSerial[it->second["trackid"].asInt()]);
curOggPage.setPageSequenceNumber(DTSCID2seqNum[it->second["trackid"].asInt()]++);
curOggPage.setBitstreamSerialNumber(DTSCID2OGGSerial[it->second.trackID]);
curOggPage.setPageSequenceNumber(DTSCID2seqNum[it->second.trackID]++);
curSegTable.clear();
curSegTable.push_back(it->second["CommentHeader"].asString().size());
curSegTable.push_back(it->second["init"].asString().size());
curSegTable.push_back(it->second.commentHeader.size());
curSegTable.push_back(it->second.init.size());
curOggPage.setSegmentTable(curSegTable);
std::string fullHeader = it->second["CommentHeader"].asString() + it->second["init"].asString();
std::string fullHeader = it->second.commentHeader + it->second.init;
curOggPage.setPayload((char*)fullHeader.c_str(),fullHeader.size());
curOggPage.setCRCChecksum(curOggPage.calcChecksum());
//std::cout << std::string(curOggPage.getPage(), curOggPage.getPageSize());

2
lib/ogg.h
View file

@ -58,7 +58,7 @@ namespace OGG{
class headerPages{
public:
void readDTSCHeader(JSON::Value meta);
void readDTSCHeader(DTSC::Meta & meta);
std::map <long long unsigned int, unsigned int> DTSCID2OGGSerial;
std::map <long long unsigned int, unsigned int> DTSCID2seqNum;
std::string parsedPages;