Merge pull request #69 from edgeware/co64

feat: add co64 box

cmd/mp4ff-nallister/main.go

@@ -101,7 +101,12 @@ func parseProgressiveMp4(f *mp4.File, maxNrSamples int, codec string) error {
 		if err != nil {
 			return err
 		}
-		offset := int64(stbl.Stco.ChunkOffset[chunkNr-1])
+		var offset int64
+		if stbl.Stco != nil {
+			offset = int64(stbl.Stco.ChunkOffset[chunkNr-1])
+		} else if stbl.Co64 != nil {
+			offset = int64(stbl.Co64.ChunkOffset[chunkNr-1])
+		}
 		for sNr := sampleNrAtChunkStart; sNr < sampleNr; sNr++ {
 			offset += int64(stbl.Stsz.SampleSize[sNr-1])
 		}

cmd/mp4ff-wvttlister/main.go

@@ -111,7 +111,12 @@ func parseProgressiveMp4(f *mp4.File, trackID uint32, maxNrSamples int) error {
 		if err != nil {
 			return err
 		}
-		offset := int64(stbl.Stco.ChunkOffset[chunkNr-1])
+		var offset int64
+		if stbl.Stco != nil {
+			offset = int64(stbl.Stco.ChunkOffset[chunkNr-1])
+		} else if stbl.Co64 != nil {
+			offset = int64(stbl.Co64.ChunkOffset[chunkNr-1])
+		}
 		for sNr := sampleNrAtChunkStart; sNr < sampleNr; sNr++ {
 			offset += int64(stbl.Stsz.SampleSize[sNr-1])
 		}

examples/segmenter/segment.go

@@ -139,7 +139,13 @@ func (s *Segmenter) GetSamplesUntilTime(mp4f *mp4.File, tr *Track, startSampleNr
 		if err != nil {
 			return nil
 		}
-		offset := int64(stbl.Stco.ChunkOffset[chunkNr-1])
+		var offset int64
+		if stbl.Stco != nil {
+			offset = int64(stbl.Stco.ChunkOffset[chunkNr-1])
+		} else if stbl.Co64 != nil {
+			offset = int64(stbl.Co64.ChunkOffset[chunkNr-1])
+		}
+
 		for sNr := sampleNrAtChunkStart; sNr < sampleNr; sNr++ {
 			offset += int64(stbl.Stsz.SampleSize[sNr-1])
 		}

mp4/box.go

@@ -24,6 +24,7 @@ func init() {
 		"btrt": DecodeBtrt,
 		"cdat": DecodeCdat,
 		"clap": DecodeClap,
+		"co64": DecodeCo64,
 		"ctim": DecodeCtim,
 		"ctts": DecodeCtts,
 		"dinf": DecodeDinf,

mp4/co64.go

@@ -0,0 +1,77 @@
+package mp4
+
+import (
+	"io"
+	"io/ioutil"
+)
+
+// Co64Box - Chunk Large Offset Box
+//
+// Contained in : Sample Table box (stbl)
+//
+// 64-bit version of StcoBox
+type Co64Box struct {
+	Version     byte
+	Flags       uint32
+	ChunkOffset []uint64
+}
+
+// DecodeStco - box-specific decode
+func DecodeCo64(hdr *boxHeader, startPos uint64, r io.Reader) (Box, error) {
+	data, err := ioutil.ReadAll(r)
+	if err != nil {
+		return nil, err
+	}
+	sr := NewSliceReader(data)
+	versionAndFlags := sr.ReadUint32()
+	nrEntries := sr.ReadUint32()
+	b := &Co64Box{
+		Version:     byte(versionAndFlags >> 24),
+		Flags:       versionAndFlags & flagsMask,
+		ChunkOffset: make([]uint64, nrEntries),
+	}
+
+	for i := uint32(0); i < nrEntries; i++ {
+		b.ChunkOffset[i] = sr.ReadUint64()
+	}
+	return b, nil
+}
+
+// Type - box-specific type
+func (b *Co64Box) Type() string {
+	return "co64"
+}
+
+// Size - box-specific size
+func (b *Co64Box) Size() uint64 {
+	return uint64(boxHeaderSize + 8 + len(b.ChunkOffset)*8)
+}
+
+// Encode - box-specific encode
+func (b *Co64Box) Encode(w io.Writer) error {
+	err := EncodeHeader(b, w)
+	if err != nil {
+		return err
+	}
+	buf := makebuf(b)
+	sw := NewSliceWriter(buf)
+	versionAndFlags := (uint32(b.Version) << 24) + b.Flags
+	sw.WriteUint32(versionAndFlags)
+	sw.WriteUint32(uint32(len(b.ChunkOffset)))
+	for i := range b.ChunkOffset {
+		sw.WriteUint64(b.ChunkOffset[i])
+	}
+	_, err = w.Write(buf)
+	return err
+}
+
+func (b *Co64Box) Info(w io.Writer, specificBoxLevels, indent, indentStep string) error {
+	bd := newInfoDumper(w, indent, b, int(b.Version), b.Flags)
+	level := getInfoLevel(b, specificBoxLevels)
+	if level >= 1 {
+		for i := range b.ChunkOffset {
+			bd.write(" - entry[%d]: chunkOffset=%d", i+1, b.ChunkOffset[i])
+		}
+	}
+	return bd.err
+}

mp4/co64_test.go

@@ -0,0 +1,15 @@
+package mp4
+
+import (
+	"testing"
+)
+
+func TestEncDecCo64(t *testing.T) {
+
+	b := &Co64Box{
+		Version:     0,
+		Flags:       2, // Just in test
+		ChunkOffset: []uint64{1234, 8908080},
+	}
+	boxDiffAfterEncodeAndDecode(t, b)
+}

mp4/stbl.go

@@ -18,6 +18,7 @@ type StblBox struct {
 	Stsz  *StszBox
 	Stss  *StssBox
 	Stco  *StcoBox
+	Co64  *Co64Box
 	Sdtp  *SdtpBox
 	Sbgp  *SbgpBox   // The first
 	Sbgps []*SbgpBox // All
@@ -53,6 +54,8 @@ func (s *StblBox) AddChild(box Box) {
 		s.Stss = box.(*StssBox)
 	case "stco":
 		s.Stco = box.(*StcoBox)
+	case "co64":
+		s.Co64 = box.(*Co64Box)
 	case "sbgp":
 		if s.Sbgp == nil {
 			s.Sbgp = box.(*SbgpBox)