Merge pull request #25 from abema/all-box-test

Create test cases for all box types
abema · Jul 28, 2020 · 9ebcc25 · 9ebcc25
2 parents 1c1ec59 + f68508f
commit 9ebcc25
Show file tree

Hide file tree

Showing 4 changed files with 869 additions and 121 deletions.
diff --git a/box_types.go b/box_types.go
@@ -446,16 +446,13 @@ func init() {
 
 // Mdhd is ISOBMFF mdhd box type
 type Mdhd struct {
-	FullBox `mp4:"extend"`
-	// Version 0
+	FullBox            `mp4:"extend"`
 	CreationTimeV0     uint32 `mp4:"size=32,ver=0"`
 	ModificationTimeV0 uint32 `mp4:"size=32,ver=0"`
-	TimescaleV0        uint32 `mp4:"size=32,ver=0"`
-	DurationV0         uint32 `mp4:"size=32,ver=0"`
-	// Version 1
 	CreationTimeV1     uint64 `mp4:"size=64,ver=1"`
 	ModificationTimeV1 uint64 `mp4:"size=64,ver=1"`
-	TimescaleV1        uint32 `mp4:"size=32,ver=1"`
+	Timescale          uint32 `mp4:"size=32"`
+	DurationV0         uint32 `mp4:"size=32,ver=0"`
 	DurationV1         uint64 `mp4:"size=64,ver=1"`
 	//
 	Pad        bool    `mp4:"size=1"`
@@ -682,11 +679,10 @@ type Mvhd struct {
 	FullBox            `mp4:"extend"`
 	CreationTimeV0     uint32    `mp4:"size=32,ver=0"`
 	ModificationTimeV0 uint32    `mp4:"size=32,ver=0"`
-	TimescaleV0        uint32    `mp4:"size=32,ver=0"`
-	DurationV0         uint32    `mp4:"size=32,ver=0"`
 	CreationTimeV1     uint64    `mp4:"size=64,ver=1"`
 	ModificationTimeV1 uint64    `mp4:"size=64,ver=1"`
-	TimescaleV1        uint32    `mp4:"size=32,ver=1"`
+	Timescale          uint32    `mp4:"size=32"`
+	DurationV0         uint32    `mp4:"size=32,ver=0"`
 	DurationV1         uint64    `mp4:"size=64,ver=1"`
 	Rate               int32     `mp4:"size=32"` // template=0x00010000
 	Volume             int16     `mp4:"size=16"` // template=0x0100