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

Nieuwe implementatie af, backwards compatibility ruined.

Browse source
This commit is contained in:
Erik Zandvliet 2012-09-18 10:51:00 +02:00 • committed by Thulinma
parent 42ab565381
commit 70e2962d0b
2 changed files with 112 additions and 145 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

188
lib/mp4.cpp
View file

@ -388,14 +388,14 @@ namespace MP4{
return r; return r;
} }
AFTR::AFRT() : Box(0x61667274){ AFRT::AFRT() : Box("afrt"){
setVersion( 0 ); setVersion( 0 );
setUpdate( 0 ); setUpdate( 0 );
setTimeScale( 1000 ); setTimeScale( 1000 );
} }
void AFRT::setVersion( char newVersion ) { void AFRT::setVersion( char newVersion ) {
setInt8( newVersion ,0 ) setInt8( newVersion ,0 );
} }
void AFRT::setUpdate( long newUpdate ) { void AFRT::setUpdate( long newUpdate ) {
@ -408,155 +408,127 @@ namespace MP4{
void AFRT::addQualityEntry( std::string newQuality ) { void AFRT::addQualityEntry( std::string newQuality ) {
qualityModifiers.push_back( newQuality ); qualityModifiers.push_back( newQuality );
isUpdated = true;
} }
void AFRT::addFragmentRun( long firstFragment, long long int firstTimestamp, long duration, char discontinuity ) {
/* fragmentRun newRun;
newRun.firstFragment = firstFragment;
void AFRT::AddQualityEntry( std::string Quality, uint32_t Offset ) { newRun.firstTimestamp = firstTimestamp;
if(Offset >= QualitySegmentUrlModifiers.size()) { newRun.duration = duration;
QualitySegmentUrlModifiers.resize(Offset+1); newRun.discontinuity = discontinuity;
} fragmentRunTable.push_back( newRun );
QualitySegmentUrlModifiers[Offset] = Quality; isUpdated = true;
} }
void AFRT::AddFragmentRunEntry( uint32_t FirstFragment, uint32_t FirstFragmentTimestamp, uint32_t FragmentsDuration, uint8_t Discontinuity, uint32_t Offset ) { void AFRT::regenerate( ) {
if( Offset >= FragmentRunEntryTable.size() ) { int myOffset = 8;
FragmentRunEntryTable.resize(Offset+1); setInt8( qualityModifiers.size(), myOffset );
myOffset ++;
//0-terminated string for each entry
for( std::deque<std::string>::iterator it = qualityModifiers.begin();it != qualityModifiers.end(); it++ ) {
memcpy( (char*)data.c_str() + myOffset, (*it).c_str(), (*it).size() + 1);
myOffset += (*it).size() + 1;
} }
FragmentRunEntryTable[Offset].FirstFragment = FirstFragment; setInt32( fragmentRunTable.size(), myOffset );
FragmentRunEntryTable[Offset].FirstFragmentTimestamp = FirstFragmentTimestamp; myOffset += 4;
FragmentRunEntryTable[Offset].FragmentDuration = FragmentsDuration; //table values for each entry
if( FragmentsDuration == 0) { for( std::deque<fragmentRun>::iterator it = fragmentRunTable.begin();it != fragmentRunTable.end(); it++ ) {
FragmentRunEntryTable[Offset].DiscontinuityIndicator = Discontinuity; setInt32( (*it).firstFragment, myOffset );
myOffset += 4;
setInt64( (*it).firstTimestamp, myOffset );
myOffset += 8;
setInt32( (*it).duration, myOffset );
myOffset += 4;
setInt8( (*it).discontinuity, myOffset );
myOffset += 1;
} }
} isUpdated = false;
void AFRT::SetDefaults( ) {
SetUpdate( );
SetTimeScale( );
}
void AFRT::SetTimeScale( uint32_t Scale ) {
curTimeScale = Scale;
}
void AFRT::WriteContent( ) {
std::string serializedQualities = "";
std::string serializedFragmentEntries = "";
clear();
for( uint32_t i = 0; i < QualitySegmentUrlModifiers.size(); i++ ) {
serializedQualities.append(QualitySegmentUrlModifiers[i].c_str());
serializedQualities += '\0';
}
for( uint32_t i = 0; i < FragmentRunEntryTable.size(); i ++ ) {
serializedFragmentEntries.append((char*)Box::uint32_to_uint8(FragmentRunEntryTable[i].FirstFragment),4);
serializedFragmentEntries.append((char*)Box::uint32_to_uint8(0),4);
serializedFragmentEntries.append((char*)Box::uint32_to_uint8(FragmentRunEntryTable[i].FirstFragmentTimestamp),4);
serializedFragmentEntries.append((char*)Box::uint32_to_uint8(FragmentRunEntryTable[i].FragmentDuration),4);
if(FragmentRunEntryTable[i].FragmentDuration == 0) {
serializedFragmentEntries.append((char*)Box::uint8_to_uint8(FragmentRunEntryTable[i].DiscontinuityIndicator),1);
}
}
uint32_t OffsetFragmentRunEntryCount = 9 + serializedQualities.size();
SetPayload((uint32_t)serializedFragmentEntries.size(),(uint8_t*)serializedFragmentEntries.c_str(),OffsetFragmentRunEntryCount+4);
SetPayload((uint32_t)4,Box::uint32_to_uint8(FragmentRunEntryTable.size()),OffsetFragmentRunEntryCount);
SetPayload((uint32_t)serializedQualities.size(),(uint8_t*)serializedQualities.c_str(),9);
SetPayload((uint32_t)1,Box::uint8_to_uint8(QualitySegmentUrlModifiers.size()),8);
SetPayload((uint32_t)4,Box::uint32_to_uint8(curTimeScale),4);
SetPayload((uint32_t)4,Box::uint32_to_uint8((isUpdate ? 1 : 0)));
} }
std::string AFRT::toPrettyString(int indent){ std::string AFRT::toPrettyString(int indent){
std::string r; std::string r;
r += std::string(indent, ' ')+"Fragment Run Table\n"; r += std::string(indent, ' ')+"Fragment Run Table\n";
if (isUpdate){ if (getInt24(1)){
r += std::string(indent+1, ' ')+"Update\n"; r += std::string(indent+1, ' ')+"Update\n";
}else{ }else{
r += std::string(indent+1, ' ')+"Replacement or new table\n"; r += std::string(indent+1, ' ')+"Replacement or new table\n";
} }
r += std::string(indent+1, ' ')+"Timescale "+JSON::Value((long long int)curTimeScale).asString()+"\n"; r += std::string(indent+1, ' ')+"Timescale "+JSON::Value((long long int)getInt32(4)).asString()+"\n";
r += std::string(indent+1, ' ')+"Qualities "+JSON::Value((long long int)QualitySegmentUrlModifiers.size()).asString()+"\n"; r += std::string(indent+1, ' ')+"Qualities "+JSON::Value((long long int)qualityModifiers.size()).asString()+"\n";
for( uint32_t i = 0; i < QualitySegmentUrlModifiers.size(); i++ ) { for( uint32_t i = 0; i < qualityModifiers.size(); i++ ) {
r += std::string(indent+2, ' ')+"\""+QualitySegmentUrlModifiers[i]+"\"\n"; r += std::string(indent+2, ' ')+"\""+qualityModifiers[i]+"\"\n";
} }
r += std::string(indent+1, ' ')+"Fragments "+JSON::Value((long long int)FragmentRunEntryTable.size()).asString()+"\n"; r += std::string(indent+1, ' ')+"Fragments "+JSON::Value((long long int)fragmentRunTable.size()).asString()+"\n";
for( uint32_t i = 0; i < FragmentRunEntryTable.size(); i ++ ) { for( uint32_t i = 0; i < fragmentRunTable.size(); i ++ ) {
r += std::string(indent+2, ' ')+"Duration "+JSON::Value((long long int)FragmentRunEntryTable[i].FragmentDuration).asString()+", starting at "+JSON::Value((long long int)FragmentRunEntryTable[i].FirstFragment).asString()+" @ "+JSON::Value((long long int)FragmentRunEntryTable[i].FirstFragmentTimestamp).asString(); r += std::string(indent+2, ' ')+"Duration "+JSON::Value((long long int)fragmentRunTable[i].duration).asString()+", starting at "+JSON::Value((long long int)fragmentRunTable[i].firstFragment).asString()+" @ "+JSON::Value((long long int)fragmentRunTable[i].firstTimestamp).asString();
} }
return r; return r;
} }
void ASRT::SetUpdate( bool Update ) { ASRT::ASRT() : Box("asrt") {
isUpdate = Update; setVersion( 0 );
setUpdate( 0 );
} }
void ASRT::AddQualityEntry( std::string Quality, uint32_t Offset ) { void ASRT::setVersion( char newVersion ) {
if(Offset >= QualitySegmentUrlModifiers.size()) { setInt8( newVersion, 0 );
QualitySegmentUrlModifiers.resize(Offset+1);
}
QualitySegmentUrlModifiers[Offset] = Quality;
} }
void ASRT::AddSegmentRunEntry( uint32_t FirstSegment, uint32_t FragmentsPerSegment, uint32_t Offset ) { void ASRT::setUpdate( long newUpdate ) {
if( Offset >= SegmentRunEntryTable.size() ) { setInt24( newUpdate, 1 );
SegmentRunEntryTable.resize(Offset+1);
}
SegmentRunEntryTable[Offset].FirstSegment = FirstSegment;
SegmentRunEntryTable[Offset].FragmentsPerSegment = FragmentsPerSegment;
} }
void ASRT::SetVersion( bool NewVersion ) { void ASRT::addQualityEntry( std::string newQuality ) {
Version = NewVersion; qualityModifiers.push_back( newQuality );
isUpdated = true;
} }
void ASRT::SetDefaults( ) { void ASRT::addSegmentRun( long firstSegment, long fragmentsPerSegment ) {
SetUpdate( ); segmentRun newRun;
newRun.firstSegment = firstSegment;
newRun.fragmentsPerSegment = fragmentsPerSegment;
segmentRunTable.push_back( newRun );
isUpdated = true;
} }
void ASRT::WriteContent( ) { void ASRT::regenerate( ) {
std::string serializedQualities = ""; int myOffset = 4;
ResetPayload( ); setInt8( qualityModifiers.size(), myOffset );
myOffset ++;
for( uint32_t i = 0; i < QualitySegmentUrlModifiers.size(); i++ ) { //0-terminated string for each entry
serializedQualities.append(QualitySegmentUrlModifiers[i].c_str()); for( std::deque<std::string>::iterator it = qualityModifiers.begin();it != qualityModifiers.end(); it++ ) {
serializedQualities += '\0'; memcpy( (char*)data.c_str() + myOffset, (*it).c_str(), (*it).size() + 1);
myOffset += (*it).size() + 1;
} }
setInt32( segmentRunTable.size(), myOffset );
uint32_t OffsetSegmentRunEntryCount = 5 + serializedQualities.size(); myOffset += 4;
//table values for each entry
for( uint32_t i = 0; i < SegmentRunEntryTable.size(); i ++ ) { for( std::deque<segmentRun>::iterator it = segmentRunTable.begin();it != segmentRunTable.end(); it++ ) {
SetPayload((uint32_t)4,Box::uint32_to_uint8(SegmentRunEntryTable[i].FragmentsPerSegment),(8*i)+OffsetSegmentRunEntryCount+8); setInt32( (*it).firstSegment, myOffset );
SetPayload((uint32_t)4,Box::uint32_to_uint8(SegmentRunEntryTable[i].FirstSegment),(8*i)+OffsetSegmentRunEntryCount+4); myOffset += 4;
setInt32( (*it).fragmentsPerSegment, myOffset );
myOffset += 4;
} }
SetPayload((uint32_t)4,Box::uint32_to_uint8(SegmentRunEntryTable.size()),OffsetSegmentRunEntryCount); isUpdated = false;
SetPayload((uint32_t)serializedQualities.size(),(uint8_t*)serializedQualities.c_str(),5);
SetPayload((uint32_t)1,Box::uint8_to_uint8(QualitySegmentUrlModifiers.size()),4);
SetPayload((uint32_t)4,Box::uint32_to_uint8((isUpdate ? 1 : 0)));
} }
std::string ASRT::toPrettyString(int indent){ std::string ASRT::toPrettyString(int indent){
std::string r; std::string r;
r += std::string(indent, ' ')+"Segment Run Table\n"; r += std::string(indent, ' ')+"Segment Run Table\n";
if (isUpdate){ if (getInt24(1)){
r += std::string(indent+1, ' ')+"Update\n"; r += std::string(indent+1, ' ')+"Update\n";
}else{ }else{
r += std::string(indent+1, ' ')+"Replacement or new table\n"; r += std::string(indent+1, ' ')+"Replacement or new table\n";
} }
r += std::string(indent+1, ' ')+"Qualities "+JSON::Value((long long int)QualitySegmentUrlModifiers.size()).asString()+"\n"; r += std::string(indent+1, ' ')+"Qualities "+JSON::Value((long long int)qualityModifiers.size()).asString()+"\n";
for( uint32_t i = 0; i < QualitySegmentUrlModifiers.size(); i++ ) { for( uint32_t i = 0; i < qualityModifiers.size(); i++ ) {
r += std::string(indent+2, ' ')+"\""+QualitySegmentUrlModifiers[i]+"\"\n"; r += std::string(indent+2, ' ')+"\""+qualityModifiers[i]+"\"\n";
} }
r += std::string(indent+1, ' ')+"Segments "+JSON::Value((long long int)SegmentRunEntryTable.size()).asString()+"\n"; r += std::string(indent+1, ' ')+"Segments "+JSON::Value((long long int)segmentRunTable.size()).asString()+"\n";
for( uint32_t i = 0; i < SegmentRunEntryTable.size(); i ++ ) { for( uint32_t i = 0; i < segmentRunTable.size(); i ++ ) {
r += std::string(indent+2, ' ')+JSON::Value((long long int)SegmentRunEntryTable[i].FragmentsPerSegment).asString()+" fragments per, starting at "+JSON::Value((long long int)SegmentRunEntryTable[i].FirstSegment).asString(); r += std::string(indent+2, ' ')+JSON::Value((long long int)segmentRunTable[i].fragmentsPerSegment).asString()+" fragments per, starting at "+JSON::Value((long long int)segmentRunTable[i].firstSegment).asString();
} }
return r; return r;
} }
*/
}; };

47
lib/mp4.h
View file

@ -76,12 +76,12 @@ namespace MP4{
std::deque<Box *> fragmentTables; std::deque<Box *> fragmentTables;
};//ABST Box };//ABST Box
struct afrt_fragmentrunentry { struct fragmentRun {
uint32_t FirstFragment; long firstFragment;
uint32_t FirstFragmentTimestamp; //write as uint64_t long long int firstTimestamp;
uint32_t FragmentDuration; long duration;
uint8_t DiscontinuityIndicator;//if FragmentDuration == 0 char discontinuity;
};//afrt_fragmentrunentry };//fragmentRun
/// AFRT Box class /// AFRT Box class
@ -92,37 +92,32 @@ namespace MP4{
void setUpdate( long newUpdate ); void setUpdate( long newUpdate );
void setTimeScale( long newScale ); void setTimeScale( long newScale );
void addQualityEntry( std::string newQuality ); void addQualityEntry( std::string newQuality );
void addFragmentRun( long firstFragment, long long int firstTimestamp, long duration, char discontinuity );
void AddFragmentRunEntry( uint32_t FirstFragment = 0, uint32_t FirstFragmentTimestamp = 0, uint32_t FragmentsDuration = 1, uint8_t Discontinuity = 0, uint32_t Offset = 0 ); void regenerate( );
void WriteContent( );
std::string toPrettyString(int indent = 0); std::string toPrettyString(int indent = 0);
private: private:
std::deque<std::string> qualityModifiers; std::deque<std::string> qualityModifiers;
std::deque<afrt_fragmentrunentry> FragmentRunEntryTable; std::deque<fragmentRun> fragmentRunTable;
};//AFRT Box };//AFRT Box
struct asrt_segmentrunentry { struct segmentRun {
uint32_t FirstSegment; uint32_t firstSegment;
uint32_t FragmentsPerSegment; uint32_t fragmentsPerSegment;
};//abst_qualityentry };//segmentRun
/// ASRT Box class /// ASRT Box class
class ASRT : public Box { class ASRT : public Box {
public: public:
ASRT() : Box(0x61737274){}; ASRT();
void SetUpdate( bool Update = false ); void setVersion( char newVersion );
void AddQualityEntry( std::string Quality = "", uint32_t Offset = 0 ); void setUpdate( long newUpdate );
void AddSegmentRunEntry( uint32_t FirstSegment = 0, uint32_t FragmentsPerSegment = 100, uint32_t Offset = 0 ); void addQualityEntry( std::string newQuality );
void WriteContent( ); void addSegmentRun( long firstSegment, long fragmentsPerSegment );
void SetVersion( bool NewVersion = 0 ); void regenerate();
std::string toPrettyString(int indent = 0); std::string toPrettyString(int indent = 0);
private: private:
void SetDefaults( ); std::deque<std::string> qualityModifiers;
bool isUpdate; std::deque<segmentRun> segmentRunTable;
bool Version;
std::vector<std::string> QualitySegmentUrlModifiers;
std::vector<asrt_segmentrunentry> SegmentRunEntryTable;
Box * Container;
};//ASRT Box };//ASRT Box
}; };