MVHD atom is now complete.

RachamimYaakobov · Mar 30, 2011 · 870cd44 · 870cd44
1 parent 77f33c0
commit 870cd44
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 2 deletions.
diff --git a/source/MP4.MVHD.cpp b/source/MP4.MVHD.cpp
@@ -49,5 +49,36 @@ std::string MVHD::description( void )
 
 void MVHD::processData( MP4::BinaryStream * stream, size_t length )
 {
-    stream->ignore( length );
+    FullBox::processData( stream, length );
+
+    if( this->_version == 1 )
+    {
+        this->_creationTime     = stream->readBigEndianUnsignedLong();
+        this->_modificationTime = stream->readBigEndianUnsignedLong();
+        this->_timeScale        = stream->readBigEndianUnsignedInteger();
+        this->_duration         = stream->readBigEndianUnsignedLong();
+        this->_rate             = stream->readBigEndianFixedPoint( 16, 16 );
+        this->_volume           = stream->readBigEndianFixedPoint( 8, 8 );
+
+        stream->ignore( 10 );
+        stream->readMatrix( &( this->_matrix ) );
+        stream->ignore( 24 );
+
+        this->_nextTrackId = stream->readBigEndianUnsignedInteger();
+    }
+    else
+    {
+        this->_creationTime     = stream->readBigEndianUnsignedInteger();
+        this->_modificationTime = stream->readBigEndianUnsignedInteger();
+        this->_timeScale        = stream->readBigEndianUnsignedInteger();
+        this->_duration         = stream->readBigEndianUnsignedInteger();
+        this->_rate             = stream->readBigEndianFixedPoint( 16, 16 );
+        this->_volume           = stream->readBigEndianFixedPoint( 8, 8 );
+
+        stream->ignore( 10 );
+        stream->readMatrix( &( this->_matrix ) );
+        stream->ignore( 24 );
+
+        this->_nextTrackId = stream->readBigEndianUnsignedInteger();
+    }
 }
diff --git a/source/include/MP4.MVHD.h b/source/include/MP4.MVHD.h
@@ -35,16 +35,25 @@
 #include "mp4.h"
 #include "MP4.DataAtom.h"
 #include "MP4.BinaryStream.h"
+#include "MP4.FullBox.h"
 
 namespace MP4
 {
-    class MVHD : DataAtom
+    class MVHD : FullBox
     {
         private:
 
 
         protected:
 
+            uint64_t _creationTime;
+            uint64_t _modificationTime;
+            uint32_t _timeScale;
+            uint64_t _duration;
+            float    _rate;
+            float    _volume;
+            matrix   _matrix;
+            uint32_t _nextTrackId;
 
         public: