Conflic fixage

util/MP4/box.cpp

@@ -41,8 +41,10 @@ class Box {
     static uint8_t * uint8_to_uint8( uint8_t data );
     BoxHeader GetHeader( );
     void ResetPayload( );
-    void Parse( std::string PrintOffset = "" );
+    void Parse( std::string PrintOffset );
+    void * Parse( );
     uint8_t * Payload;
+    BoxHeader header;
     uint32_t PayloadSize;
   private:
     BoxHeader header;
@@ -175,6 +177,7 @@ void Box::ResetPayload( ) {
     Payload = NULL;
   }
 }
+<<<<<<< HEAD
 
 void Box::Parse( std::string PrintOffset ) {
   if( header.BoxType == 0x61627374 ) {
@@ -396,3 +399,5 @@ void Box::Parse( std::string PrintOffset ) {
               << "' not yet implemented!\n";
   }
 }
+=======
+>>>>>>> 7520f5799f3da3c1a89a28fd4d62358b0028d8d2

util/MP4/box_abst.cpp

@@ -1,7 +1,9 @@
+#pragma once
 #include "box.cpp"
 #include <string>
 #include <vector>
 
+
 struct abst_serverentry {
   std::string ServerBaseUrl;
 };//abst_serverentry
@@ -156,7 +158,6 @@ void Box_abst::SetVersion( bool NewVersion) {
   Version = NewVersion;
 }
 
-
 void Box_abst::SetReserved( ) {
   Container->SetPayload((uint32_t)4,Box::uint32_to_uint8(0));
 }

util/MP4/box_asrt.cpp

@@ -16,9 +16,11 @@ class Box_asrt {
     void AddQualityEntry( std::string Quality = "", uint32_t Offset = 0 );
     void AddSegmentRunEntry( uint32_t FirstSegment = 0, uint32_t FragmentsPerSegment = 100, uint32_t Offset = 0 );
     void WriteContent( );
+    void SetVersion( bool NewVersion = 0 );
   private:
     void SetDefaults( );
     bool isUpdate;
+    bool Version;
     std::vector<std::string> QualitySegmentUrlModifiers;
     std::vector<asrt_segmentrunentry> SegmentRunEntryTable;
     Box * Container;
@@ -55,6 +57,10 @@ void Box_asrt::AddSegmentRunEntry( uint32_t FirstSegment, uint32_t FragmentsPerS
   SegmentRunEntryTable[Offset].FragmentsPerSegment = FragmentsPerSegment;
 }
 
+void Box_asrt::SetVersion( bool NewVersion ) {
+  Version = NewVersion;
+}
+
 void Box_asrt::SetDefaults( ) {
   SetUpdate( );
 }

util/MP4/interface.cpp

@@ -547,22 +547,22 @@ std::string Interface::GenerateLiveBootstrap( uint32_t CurMediaTime ) {
   afrt->SetUpdate(false);
   afrt->SetTimeScale( 1000 );
   afrt->AddQualityEntry( "" );
-  afrt->AddFragmentRunEntry( 1, CurMediaTime, 4000 );
+  afrt->AddFragmentRunEntry( 1, 596458 , 4000 );
   afrt->WriteContent( );
 
   //SetUpASRT
   asrt->SetUpdate(false);
   asrt->AddQualityEntry( "" );
-  asrt->AddSegmentRunEntry( 1, 0xFFFFFFFF );
+  asrt->AddSegmentRunEntry( 1, 199 );
   asrt->WriteContent( );
 
   //SetUpABST
   abst->SetBootstrapVersion( 1 );
   abst->SetProfile( 0 );
-//  abst->SetLive( true );
+  abst->SetLive( true );
   abst->SetUpdate( false );
   abst->SetTimeScale( 1000 );
-  abst->SetMediaTime( CurMediaTime );
+  abst->SetMediaTime( 596458 );
   abst->SetSMPTE( 0 );
   abst->SetMovieIdentifier( "" );
   abst->SetDRM( "" );