MP4::Box rewritten
This commit is contained in:
Erik Zandvliet
Thulinma
parent
2c7edafc42
commit
07faa64075
2 changed files with 440 additions and 418 deletions
322
lib/mp4.cpp
322
lib/mp4.cpp
|
|
@ -7,155 +7,176 @@
|
|||
/// Contains all MP4 format related code.
|
||||
namespace MP4{
|
||||
|
||||
Box::Box() {
|
||||
Payload = (uint8_t *)malloc(8);
|
||||
PayloadSize = 0;
|
||||
}
|
||||
|
||||
Box::Box(uint32_t BoxType) {
|
||||
Payload = (uint8_t *)malloc(8);
|
||||
SetBoxType(BoxType);
|
||||
PayloadSize = 0;
|
||||
}
|
||||
|
||||
Box::Box(uint8_t * Content, uint32_t length) {
|
||||
PayloadSize = length-8;
|
||||
Payload = (uint8_t *)malloc(length);
|
||||
memcpy(Payload, Content, length);
|
||||
}
|
||||
|
||||
Box::~Box() {
|
||||
if (Payload) free(Payload);
|
||||
}
|
||||
|
||||
void Box::SetBoxType(uint32_t BoxType) {
|
||||
((unsigned int*)Payload)[1] = htonl(BoxType);
|
||||
}
|
||||
|
||||
uint32_t Box::GetBoxType() {
|
||||
return ntohl(((unsigned int*)Payload)[1]);
|
||||
}
|
||||
|
||||
void Box::SetPayload(uint32_t Size, uint8_t * Data, uint32_t Index) {
|
||||
if ( Index + Size > PayloadSize ) {
|
||||
PayloadSize = Index + Size;
|
||||
((unsigned int*)Payload)[0] = htonl(PayloadSize+8);
|
||||
Payload = (uint8_t *)realloc(Payload, PayloadSize + 8);
|
||||
Box::Box(size_t size) {
|
||||
data.resize( size + 8 );
|
||||
memset( (char*)data.c_str(), 0, size + 8 );
|
||||
}
|
||||
memcpy(Payload + 8 + Index, Data, Size);
|
||||
}
|
||||
|
||||
uint32_t Box::GetPayloadSize() {
|
||||
return PayloadSize;
|
||||
}
|
||||
Box::Box( char* BoxType, size_t size ) {
|
||||
data.resize( size + 8 );
|
||||
memset( (char*)data.c_str(), 0, size + 8 );
|
||||
memcpy( (char*)data.c_str() + 4, BoxType, 4 );
|
||||
}
|
||||
|
||||
uint8_t * Box::GetPayload() {
|
||||
return Payload+8;
|
||||
}
|
||||
Box::Box( std::string & newData ) {
|
||||
if( !read( newData ) ) {
|
||||
clear();
|
||||
}
|
||||
}
|
||||
|
||||
uint8_t * Box::GetPayload(uint32_t Index, uint32_t & Size) {
|
||||
if(Index > PayloadSize) {Size = 0;}
|
||||
if(Index + Size > PayloadSize) { Size = PayloadSize - Index; }
|
||||
return Payload + 8 + Index;
|
||||
}
|
||||
Box::~Box() { }
|
||||
|
||||
uint32_t Box::GetBoxedDataSize() {
|
||||
return ntohl(((unsigned int*)Payload)[0]);
|
||||
}
|
||||
std::string Box::getType() {
|
||||
return data.substr(4,4);
|
||||
}
|
||||
|
||||
uint8_t * Box::GetBoxedData( ) {
|
||||
return Payload;
|
||||
}
|
||||
bool Box::isType( char* boxType ) {
|
||||
return !memcmp( boxType, data.c_str() + 4, 4 );
|
||||
}
|
||||
|
||||
bool Box::read(std::string & newData) {
|
||||
if( newData.size() > 4 ) {
|
||||
size_t size = ntohl( ((int*)newData.c_str())[0] );
|
||||
if( newData.size() > size + 8 ) {
|
||||
data = newData.substr( 0, size + 8 );
|
||||
newData.erase( 0, size + 8 );
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
uint8_t * Box::uint32_to_uint8( uint32_t data ) {
|
||||
uint8_t * temp = new uint8_t[4];
|
||||
temp[0] = (data >> 24) & 0x000000FF;
|
||||
temp[1] = (data >> 16 ) & 0x000000FF;
|
||||
temp[2] = (data >> 8 ) & 0x000000FF;
|
||||
temp[3] = (data ) & 0x000000FF;
|
||||
return temp;
|
||||
}
|
||||
size_t Box::boxedSize() {
|
||||
return data.size();
|
||||
}
|
||||
|
||||
uint8_t * Box::uint16_to_uint8( uint16_t data ) {
|
||||
uint8_t * temp = new uint8_t[2];
|
||||
temp[0] = (data >> 8) & 0x00FF;
|
||||
temp[1] = (data ) & 0x00FF;
|
||||
return temp;
|
||||
}
|
||||
size_t Box::payloadSize() {
|
||||
return data.size() - 8;
|
||||
}
|
||||
|
||||
uint8_t * Box::uint8_to_uint8( uint8_t data ) {
|
||||
uint8_t * temp = new uint8_t[1];
|
||||
temp[0] = data;
|
||||
return temp;
|
||||
}
|
||||
std::string & Box::asBox() {
|
||||
((int*)data.c_str())[0] = htonl( data.size() );
|
||||
return data;
|
||||
}
|
||||
|
||||
void Box::ResetPayload( ) {
|
||||
PayloadSize = 0;
|
||||
Payload = (uint8_t *)realloc(Payload, PayloadSize + 8);
|
||||
((unsigned int*)Payload)[0] = htonl(0);
|
||||
}
|
||||
void Box::clear() {
|
||||
data.resize( 8 );
|
||||
}
|
||||
|
||||
std::string Box::toPrettyString(int indent){
|
||||
std::string Box::toPrettyString(int indent){
|
||||
return std::string(indent, ' ')+"Unimplemented pretty-printing for this box";
|
||||
}
|
||||
}
|
||||
|
||||
void Box::setInt8( char newData, size_t index ) {
|
||||
index += 8;
|
||||
if( index > data.size() ) {
|
||||
data.resize( index );
|
||||
}
|
||||
data[index] = newData;
|
||||
}
|
||||
|
||||
void Box::setInt16( short newData, size_t index ) {
|
||||
index += 8;
|
||||
if( index + 1 > data.size() ) {
|
||||
data.resize( index + 1 );
|
||||
}
|
||||
newData = htons( newData );
|
||||
memcpy( (char*)data.c_str() + index, (char*)newData, 2 );
|
||||
}
|
||||
|
||||
void Box::setInt32( long newData, size_t index ) {
|
||||
index += 8;
|
||||
if( index + 3 > data.size() ) {
|
||||
data.resize( index + 3 );
|
||||
}
|
||||
newData = htonl( newData );
|
||||
memcpy( (char*)data.c_str() + index, (char*)newData, 4 );
|
||||
}
|
||||
|
||||
void Box::setInt64( long long int newData, size_t index ) {
|
||||
index += 8;
|
||||
if( index + 7 > data.size() ) {
|
||||
data.resize( index + 7 );
|
||||
}
|
||||
data[index] = ( newData * 0xFF00000000000000 ) >> 56;
|
||||
data[index+1] = ( newData * 0x00FF000000000000 ) >> 48;
|
||||
data[index+2] = ( newData * 0x0000FF0000000000 ) >> 40;
|
||||
data[index+3] = ( newData * 0x000000FF00000000 ) >> 32;
|
||||
data[index+4] = ( newData * 0x00000000FF000000 ) >> 24;
|
||||
data[index+5] = ( newData * 0x0000000000FF0000 ) >> 16;
|
||||
data[index+6] = ( newData * 0x000000000000FF00 ) >> 8;
|
||||
data[index+7] = ( newData * 0x00000000000000FF );
|
||||
}
|
||||
|
||||
void Box::setString(std::string newData, size_t index ) {
|
||||
setString( (char*)newData.c_str(), newData.size(), index );
|
||||
}
|
||||
|
||||
void Box::setString(char* newData, size_t size, size_t index ) {
|
||||
index += 8;
|
||||
if( index + size > data.size() ) {
|
||||
data.resize( index + size );
|
||||
}
|
||||
memcpy( (char*)data.c_str() + index, newData, size );
|
||||
}
|
||||
|
||||
|
||||
void ABST::SetBootstrapVersion( uint32_t Version ) {
|
||||
/*
|
||||
void ABST::SetBootstrapVersion( uint32_t Version ) {
|
||||
curBootstrapInfoVersion = Version;
|
||||
}
|
||||
}
|
||||
|
||||
void ABST::SetProfile( uint8_t Profile ) {
|
||||
void ABST::SetProfile( uint8_t Profile ) {
|
||||
curProfile = Profile;
|
||||
}
|
||||
}
|
||||
|
||||
void ABST::SetLive( bool Live ) {
|
||||
void ABST::SetLive( bool Live ) {
|
||||
isLive = Live;
|
||||
}
|
||||
}
|
||||
|
||||
void ABST::SetUpdate( bool Update ) {
|
||||
void ABST::SetUpdate( bool Update ) {
|
||||
isUpdate = Update;
|
||||
}
|
||||
}
|
||||
|
||||
void ABST::SetTimeScale( uint32_t Scale ) {
|
||||
void ABST::SetTimeScale( uint32_t Scale ) {
|
||||
curTimeScale = Scale;
|
||||
}
|
||||
}
|
||||
|
||||
void ABST::SetMediaTime( uint32_t Time ) {
|
||||
void ABST::SetMediaTime( uint32_t Time ) {
|
||||
curMediatime = Time;
|
||||
}
|
||||
}
|
||||
|
||||
void ABST::SetSMPTE( uint32_t Smpte ) {
|
||||
void ABST::SetSMPTE( uint32_t Smpte ) {
|
||||
curSMPTE = Smpte;
|
||||
}
|
||||
}
|
||||
|
||||
void ABST::SetMovieIdentifier( std::string Identifier ) {
|
||||
void ABST::SetMovieIdentifier( std::string Identifier ) {
|
||||
curMovieIdentifier = Identifier;
|
||||
}
|
||||
}
|
||||
|
||||
void ABST::SetDRM( std::string Drm ) {
|
||||
void ABST::SetDRM( std::string Drm ) {
|
||||
curDRM = Drm;
|
||||
}
|
||||
}
|
||||
|
||||
void ABST::SetMetaData( std::string MetaData ) {
|
||||
void ABST::SetMetaData( std::string MetaData ) {
|
||||
curMetaData = MetaData;
|
||||
}
|
||||
}
|
||||
|
||||
void ABST::AddServerEntry( std::string Url, uint32_t Offset ) {
|
||||
void ABST::AddServerEntry( std::string Url, uint32_t Offset ) {
|
||||
if(Offset >= Servers.size()) {
|
||||
Servers.resize(Offset+1);
|
||||
}
|
||||
Servers[Offset].ServerBaseUrl = Url;
|
||||
}
|
||||
}
|
||||
|
||||
void ABST::AddQualityEntry( std::string Quality, uint32_t Offset ) {
|
||||
void ABST::AddQualityEntry( std::string Quality, uint32_t Offset ) {
|
||||
if(Offset >= Qualities.size()) {
|
||||
Qualities.resize(Offset+1);
|
||||
}
|
||||
Qualities[Offset].QualityModifier = Quality;
|
||||
}
|
||||
}
|
||||
|
||||
void ABST::AddSegmentRunTable( Box * newSegment, uint32_t Offset ) {
|
||||
void ABST::AddSegmentRunTable( Box * newSegment, uint32_t Offset ) {
|
||||
if( Offset >= SegmentRunTables.size() ) {
|
||||
SegmentRunTables.resize(Offset+1);
|
||||
}
|
||||
|
|
@ -163,9 +184,9 @@ void ABST::AddSegmentRunTable( Box * newSegment, uint32_t Offset ) {
|
|||
delete SegmentRunTables[Offset];
|
||||
}
|
||||
SegmentRunTables[Offset] = newSegment;
|
||||
}
|
||||
}
|
||||
|
||||
void ABST::AddFragmentRunTable( Box * newFragment, uint32_t Offset ) {
|
||||
void ABST::AddFragmentRunTable( Box * newFragment, uint32_t Offset ) {
|
||||
if( Offset >= FragmentRunTables.size() ) {
|
||||
FragmentRunTables.resize(Offset+1);
|
||||
}
|
||||
|
|
@ -173,9 +194,9 @@ void ABST::AddFragmentRunTable( Box * newFragment, uint32_t Offset ) {
|
|||
delete FragmentRunTables[Offset];
|
||||
}
|
||||
FragmentRunTables[Offset] = newFragment;
|
||||
}
|
||||
}
|
||||
|
||||
void ABST::SetDefaults( ) {
|
||||
void ABST::SetDefaults( ) {
|
||||
SetProfile( );
|
||||
SetLive( );
|
||||
SetUpdate( );
|
||||
|
|
@ -186,17 +207,17 @@ void ABST::SetDefaults( ) {
|
|||
SetDRM( );
|
||||
SetMetaData( );
|
||||
SetVersion( );
|
||||
}
|
||||
}
|
||||
|
||||
void ABST::SetVersion( bool NewVersion) {
|
||||
void ABST::SetVersion( bool NewVersion) {
|
||||
Version = NewVersion;
|
||||
}
|
||||
}
|
||||
|
||||
void ABST::SetReserved( ) {
|
||||
SetPayload((uint32_t)4,Box::uint32_to_uint8(0));
|
||||
}
|
||||
void ABST::SetReserved( ) {
|
||||
SetInt32(0);
|
||||
}
|
||||
|
||||
void ABST::WriteContent( ) {
|
||||
void ABST::WriteContent( ) {
|
||||
Box * current;
|
||||
std::string serializedServers = "";
|
||||
std::string serializedQualities = "";
|
||||
|
|
@ -206,7 +227,7 @@ void ABST::WriteContent( ) {
|
|||
int FragmentAmount = 0;
|
||||
uint8_t * temp = new uint8_t[1];
|
||||
|
||||
ResetPayload( );
|
||||
clear( );
|
||||
SetReserved( );
|
||||
|
||||
for( uint32_t i = 0; i < Servers.size(); i++ ) {
|
||||
|
|
@ -258,9 +279,9 @@ void ABST::WriteContent( ) {
|
|||
SetPayload((uint32_t)4,Box::uint32_to_uint8(curTimeScale),9);
|
||||
SetPayload((uint32_t)1,temp,8);
|
||||
SetPayload((uint32_t)4,Box::uint32_to_uint8(curBootstrapInfoVersion),4);
|
||||
}
|
||||
}
|
||||
|
||||
std::string ABST::toPrettyString(int indent){
|
||||
std::string ABST::toPrettyString(int indent){
|
||||
std::string r;
|
||||
r += std::string(indent, ' ')+"Bootstrap Info\n";
|
||||
if (isUpdate){
|
||||
|
|
@ -285,20 +306,20 @@ std::string ABST::toPrettyString(int indent){
|
|||
r += ((AFRT*)FragmentRunTables[i])->toPrettyString(indent+2)+"\n";
|
||||
}
|
||||
return r;
|
||||
}
|
||||
}
|
||||
|
||||
void AFRT::SetUpdate( bool Update ) {
|
||||
void AFRT::SetUpdate( bool Update ) {
|
||||
isUpdate = Update;
|
||||
}
|
||||
}
|
||||
|
||||
void AFRT::AddQualityEntry( std::string Quality, uint32_t Offset ) {
|
||||
void AFRT::AddQualityEntry( std::string Quality, uint32_t Offset ) {
|
||||
if(Offset >= QualitySegmentUrlModifiers.size()) {
|
||||
QualitySegmentUrlModifiers.resize(Offset+1);
|
||||
}
|
||||
QualitySegmentUrlModifiers[Offset] = Quality;
|
||||
}
|
||||
}
|
||||
|
||||
void AFRT::AddFragmentRunEntry( uint32_t FirstFragment, uint32_t FirstFragmentTimestamp, uint32_t FragmentsDuration, uint8_t Discontinuity, uint32_t Offset ) {
|
||||
void AFRT::AddFragmentRunEntry( uint32_t FirstFragment, uint32_t FirstFragmentTimestamp, uint32_t FragmentsDuration, uint8_t Discontinuity, uint32_t Offset ) {
|
||||
if( Offset >= FragmentRunEntryTable.size() ) {
|
||||
FragmentRunEntryTable.resize(Offset+1);
|
||||
}
|
||||
|
|
@ -308,21 +329,21 @@ void AFRT::AddFragmentRunEntry( uint32_t FirstFragment, uint32_t FirstFragmentTi
|
|||
if( FragmentsDuration == 0) {
|
||||
FragmentRunEntryTable[Offset].DiscontinuityIndicator = Discontinuity;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void AFRT::SetDefaults( ) {
|
||||
void AFRT::SetDefaults( ) {
|
||||
SetUpdate( );
|
||||
SetTimeScale( );
|
||||
}
|
||||
}
|
||||
|
||||
void AFRT::SetTimeScale( uint32_t Scale ) {
|
||||
void AFRT::SetTimeScale( uint32_t Scale ) {
|
||||
curTimeScale = Scale;
|
||||
}
|
||||
}
|
||||
|
||||
void AFRT::WriteContent( ) {
|
||||
void AFRT::WriteContent( ) {
|
||||
std::string serializedQualities = "";
|
||||
std::string serializedFragmentEntries = "";
|
||||
ResetPayload( );
|
||||
clear();
|
||||
|
||||
for( uint32_t i = 0; i < QualitySegmentUrlModifiers.size(); i++ ) {
|
||||
serializedQualities.append(QualitySegmentUrlModifiers[i].c_str());
|
||||
|
|
@ -346,9 +367,9 @@ void AFRT::WriteContent( ) {
|
|||
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;
|
||||
r += std::string(indent, ' ')+"Fragment Run Table\n";
|
||||
if (isUpdate){
|
||||
|
|
@ -366,36 +387,36 @@ std::string AFRT::toPrettyString(int indent){
|
|||
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();
|
||||
}
|
||||
return r;
|
||||
}
|
||||
}
|
||||
|
||||
void ASRT::SetUpdate( bool Update ) {
|
||||
void ASRT::SetUpdate( bool Update ) {
|
||||
isUpdate = Update;
|
||||
}
|
||||
}
|
||||
|
||||
void ASRT::AddQualityEntry( std::string Quality, uint32_t Offset ) {
|
||||
void ASRT::AddQualityEntry( std::string Quality, uint32_t Offset ) {
|
||||
if(Offset >= QualitySegmentUrlModifiers.size()) {
|
||||
QualitySegmentUrlModifiers.resize(Offset+1);
|
||||
}
|
||||
QualitySegmentUrlModifiers[Offset] = Quality;
|
||||
}
|
||||
}
|
||||
|
||||
void ASRT::AddSegmentRunEntry( uint32_t FirstSegment, uint32_t FragmentsPerSegment, uint32_t Offset ) {
|
||||
void ASRT::AddSegmentRunEntry( uint32_t FirstSegment, uint32_t FragmentsPerSegment, uint32_t Offset ) {
|
||||
if( Offset >= SegmentRunEntryTable.size() ) {
|
||||
SegmentRunEntryTable.resize(Offset+1);
|
||||
}
|
||||
SegmentRunEntryTable[Offset].FirstSegment = FirstSegment;
|
||||
SegmentRunEntryTable[Offset].FragmentsPerSegment = FragmentsPerSegment;
|
||||
}
|
||||
}
|
||||
|
||||
void ASRT::SetVersion( bool NewVersion ) {
|
||||
void ASRT::SetVersion( bool NewVersion ) {
|
||||
Version = NewVersion;
|
||||
}
|
||||
}
|
||||
|
||||
void ASRT::SetDefaults( ) {
|
||||
void ASRT::SetDefaults( ) {
|
||||
SetUpdate( );
|
||||
}
|
||||
}
|
||||
|
||||
void ASRT::WriteContent( ) {
|
||||
void ASRT::WriteContent( ) {
|
||||
std::string serializedQualities = "";
|
||||
ResetPayload( );
|
||||
|
||||
|
|
@ -414,9 +435,9 @@ void ASRT::WriteContent( ) {
|
|||
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;
|
||||
r += std::string(indent, ' ')+"Segment Run Table\n";
|
||||
if (isUpdate){
|
||||
|
|
@ -433,9 +454,9 @@ std::string ASRT::toPrettyString(int indent){
|
|||
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();
|
||||
}
|
||||
return r;
|
||||
}
|
||||
}
|
||||
|
||||
std::string mdatFold(std::string data){
|
||||
std::string mdatFold(std::string data){
|
||||
std::string Result;
|
||||
unsigned int t_int;
|
||||
t_int = htonl(data.size()+8);
|
||||
|
|
@ -444,6 +465,7 @@ std::string mdatFold(std::string data){
|
|||
Result.append((char*)&t_int, 4);
|
||||
Result.append(data);
|
||||
return Result;
|
||||
}
|
||||
}
|
||||
*/
|
||||
|
||||
};
|
||||
|
|
|
|||
16
lib/mp4.h
16
lib/mp4.h
|
|
@ -9,8 +9,8 @@ namespace MP4{
|
|||
|
||||
class Box {
|
||||
public:
|
||||
Box();
|
||||
Box(char* boxType);
|
||||
Box( size_t size = 0);
|
||||
Box(char* boxType, size_t size = 0 );
|
||||
Box(std::string & newData);
|
||||
~Box();
|
||||
std::string getType();
|
||||
|
|
@ -22,12 +22,12 @@ namespace MP4{
|
|||
void clear();
|
||||
std::string toPrettyString(int indent = 0);
|
||||
protected:
|
||||
void setInt8( char data, size_t index = 0);
|
||||
void setInt16( short data, size_t index = 0);
|
||||
void setInt32( long data, size_t index = 0);
|
||||
void setInt64( long long int data, size_t index = 0);
|
||||
void setString(std::string data, size_t index = 0);
|
||||
void setString(char* data, size_t size, size_t index = 0);
|
||||
void setInt8( char newData, size_t index = 0);
|
||||
void setInt16( short newData, size_t index = 0);
|
||||
void setInt32( long newData, size_t index = 0);
|
||||
void setInt64( long long int newData, size_t index = 0);
|
||||
void setString(std::string newData, size_t index = 0);
|
||||
void setString(char* newData, size_t size, size_t index = 0);
|
||||
std::string data;
|
||||
};//Box Class
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue