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

MP4 further developed

Browse source
This commit is contained in:
Oswald Auguste de Bruin 2013-08-23 11:05:25 +02:00 • committed by Erik Zandvliet
parent 2b3c3609c8
commit 491d85d3b6
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/mp4.h
View file

@ -26,12 +26,11 @@ namespace MP4 {
void parseDTSC(JSON::Value mediaPart); void parseDTSC(JSON::Value mediaPart);
bool sendReady(); bool sendReady();
std::string sendString(); std::string sendString();
private:
std::vector <keyPart> keyParts; std::vector <keyPart> keyParts;
//std::vector<MP4::keyPart> keyParts = Conv.keyParts; private:
std::map <long long unsigned int, std::deque<JSON::Value> > trackBuffer;
long long unsigned int curKey;//the key chunk we are currently searching for in keyParts long long unsigned int curKey;//the key chunk we are currently searching for in keyParts
long long unsigned int curPart;//current part in current key long long unsigned int curPart;//current part in current key
std::map <long long unsigned int, std::deque<JSON::Value> > trackBuffer;
std::string stringBuffer; std::string stringBuffer;
}; };

2
lib/mp4_conv.cpp
View file

@ -313,7 +313,7 @@ namespace MP4{
//printf("%c%c%c%cmdat", (mdatSize>>24) & 0x000000FF,(mdatSize>>16) & 0x000000FF,(mdatSize>>8) & 0x000000FF,mdatSize & 0x000000FF); //printf("%c%c%c%cmdat", (mdatSize>>24) & 0x000000FF,(mdatSize>>16) & 0x000000FF,(mdatSize>>8) & 0x000000FF,mdatSize & 0x000000FF);
header << (char)((mdatSize>>24) & 0x000000FF) << (char)((mdatSize>>16) & 0x000000FF) << (char)((mdatSize>>8) & 0x000000FF) << (char)(mdatSize & 0x000000FF) << "mdat"; header << (char)((mdatSize>>24) & 0x000000FF) << (char)((mdatSize>>16) & 0x000000FF) << (char)((mdatSize>>8) & 0x000000FF) << (char)(mdatSize & 0x000000FF) << "mdat";
std::cerr << "Header Written" << std::endl; //std::cerr << "Header Written" << std::endl;
//end of header //end of header
std::map <long long unsigned int, std::deque<JSON::Value> > trackBuffer; std::map <long long unsigned int, std::deque<JSON::Value> > trackBuffer;
long long unsigned int curKey = 0;//the key chunk we are currently searching for in keyParts long long unsigned int curKey = 0;//the key chunk we are currently searching for in keyParts