Merge pull request #122 from edgeware/v0.26.1

Version 0.26.1 bug-fix

Author: tobbee

Versions.md

@@ -2,6 +2,7 @@
 
 | Version | Highlight |
 | ------  | --------- |
+| 0.26.1 | fix: don't move trak boxes to be before mvex |
 | 0.26.0 | New example code for decrypting segment. New tool for cropping mp4 file. SEI parsing for H.264. Interpret timestamps |
 | 0.25.0 | Support sample intervals. Control first sample flags. Create subtitle init segments. Minor improvements and fixes |
 | 0.24.0 | api-change: DecodeFile lazy mode. Enhanced segmenter example with lazy read/write |

examples/decrypt-cenc/decrypt_cenc_test.go

@@ -10,8 +10,8 @@ import (
 )
 
 func TestDecodeCenc(t *testing.T) {
-	inFile := "testdata/prog_8s_enc_dashinit.mp4"
-	expectedOutFile := "testdata/prog_8s_dec_dashinit.mp4"
+	inFile := "../../mp4/testdata/prog_8s_enc_dashinit.mp4"
+	expectedOutFile := "../../mp4/testdata/prog_8s_dec_dashinit.mp4"
 	hexString := "63cb5f7184dd4b689a5c5ff11ee6a328"
 	ifh, err := os.Open(inFile)
 	if err != nil {

mp4/mediasegment_test.go

@@ -196,15 +196,25 @@ func TestMoofEncrypted(t *testing.T) {
 	}
 }
 
-func BenchmarkDecodeEncode(b *testing.B) {
-	inFile := "testdata/1.m4s"
-	raw, _ := ioutil.ReadFile(inFile)
-
-	for i := 0; i < b.N; i++ {
-		buf := bytes.NewBuffer(raw)
-		f, _ := DecodeFile(buf)
-		var bufInSeg bytes.Buffer
-		f.FragEncMode = EncModeBoxTree
-		_ = f.Encode(&bufInSeg)
+func TestDecodeEncodeCencFragmentedFile(t *testing.T) {
+	inData, err := ioutil.ReadFile("testdata/prog_8s_enc_dashinit.mp4")
+	if err != nil {
+		t.Error(err)
+	}
+	inBuf := bytes.NewBuffer(inData)
+	decFile, err := DecodeFile(inBuf)
+	if err != nil {
+		t.Error(err)
+	}
+	outSlice := make([]byte, 0, len(inData))
+	outBuf := bytes.NewBuffer(outSlice)
+	decFile.FragEncMode = EncFragFileMode(EncModeBoxTree)
+	err = decFile.Encode(outBuf)
+	if err != nil {
+		t.Error(err)
+	}
+	outData := outBuf.Bytes()
+	if !bytes.Equal(inData, outData) {
+		t.Errorf("generated bytes differ from input")
 	}
 }

mp4/moov.go

@@ -34,15 +34,19 @@ func (m *MoovBox) AddChild(box Box) {
 			m.Trak = trak
 		}
 		m.Traks = append(m.Traks, trak)
-		if m.Mvex != nil { // Need to insert before mvex box
-			for i, child := range m.Children {
-				if child == m.Mvex {
-					m.Children = append(m.Children[:i+1], m.Children[i:]...)
-					m.Children[i] = trak
-					return
-				}
+		// Possibley re-order to keep traks together on same
+		// side of mvex or similar. Put this trak after last previous trak
+		lastTrakIdx := 0
+		for i, child := range m.Children {
+			if child.Type() == "trak" {
+				lastTrakIdx = i
 			}
 		}
+		if lastTrakIdx != 0 && lastTrakIdx != len(m.Children)-1 { // last one in middle
+			m.Children = append(m.Children[:lastTrakIdx+2], m.Children[lastTrakIdx+1:]...)
+			m.Children[lastTrakIdx+1] = trak
+			return
+		}
 	case "mvex":
 		m.Mvex = box.(*MvexBox)
 	case "pssh":

mp4/senc.go

@@ -99,12 +99,12 @@ func DecodeSenc(hdr *boxHeader, startPos uint64, r io.Reader) (Box, error) {
 // if perSampleIVSize is 0, we try to find the appropriate error given data length
 func (s *SencBox) ParseReadBox(perSampleIVSize byte, saiz *SaizBox) error {
 	if !s.readButNotParsed {
-		if perSampleIVSize != 0 {
-			s.perSampleIVSize = byte(perSampleIVSize)
-		}
 		return fmt.Errorf("senc box already parsed")
 	}
 	sr := NewSliceReader(s.rawData)
+	if perSampleIVSize != 0 {
+		s.perSampleIVSize = byte(perSampleIVSize)
+	}
 	nrBytesLeft := uint32(sr.NrRemainingBytes())
 
 	if s.Flags&UseSubSampleEncryption == 0 {

mp4/testdata/golden_init_video.mp4

@@ -9,6 +9,13 @@
    - duration: 0
    - creation time: 0
    - modification time: 0
+  [mvex] size=40
+    [trex] size=32 version=0 flags=000000
+     - trackID: 1
+     - defaultSampleDescriptionIndex: 1
+     - defaultSampleDuration: 0
+     - defaultSampleSize: 0
+     - defaultSampleFlags: 00000000 (isLeading=0 dependsOn=0 isDependedOn=0 hasRedundancy=0 padding=0 isNonSync=false degradationPriority=0)
   [trak] size=493
     [tkhd] size=92 version=0 flags=000007
      - trackID: 1
@@ -47,10 +54,3 @@
           [stsc] size=16 version=0 flags=000000
           [stsz] size=20 version=0 flags=000000
           [stco] size=16 version=0 flags=000000
-  [mvex] size=40
-    [trex] size=32 version=0 flags=000000
-     - trackID: 1
-     - defaultSampleDescriptionIndex: 1
-     - defaultSampleDuration: 0
-     - defaultSampleSize: 0
-     - defaultSampleFlags: 00000000 (isLeading=0 dependsOn=0 isDependedOn=0 hasRedundancy=0 padding=0 isNonSync=false degradationPriority=0)

mp4/testdata/golden_init_video_mp4_dump.txt

@@ -7,7 +7,7 @@ import (
 )
 
 var (
-	commitVersion string = "v0.26.0" // May be updated using build flags
+	commitVersion string = "v0.26.1" // May be updated using build flags
 	commitDate    string             // commitDate in Epoch seconds (may be overridden using build flags)
 )