Split and implement dolby metadata

format/riff/adm.go

@@ -0,0 +1,31 @@
+package riff
+
+// Audio Definition Model
+// https://adm.ebu.io/background/what_is_the_adm.html
+// https://tech.ebu.ch/publications/tech3285s7
+// https://tech.ebu.ch/publications/tech3285s5
+
+import (
+	"github.com/wader/fq/pkg/decode"
+)
+
+func chnaDecode(d *decode.D, size int64) {
+	d.FieldU16("num_tracks")
+	d.FieldU16("num_uids")
+
+	audioIdLen := (size - 4) / 40
+	d.FieldStructNArray("audio_ids", "audio_id", int64(audioIdLen), func(d *decode.D) {
+		d.FieldU16("track_index")
+		d.FieldUTF8("uid", 12)
+		d.FieldUTF8("track_format_id_reference", 14)
+		d.FieldUTF8("pack_format_id_reference", 11)
+		// Skip padding single byte
+		d.U8()
+	})
+}
+
+func axmlDecode(d *decode.D, size int64) {
+	// fmt.Println("test axml")
+	// TODO(jmarnell): this chunk is all variable xml, so leave as is?
+	d.FieldRawLen("xml", size*8)
+}

format/riff/aiff.go

@@ -54,7 +54,7 @@ func aiffDecode(d *decode.D) any {
 			}
 			return id, size
 		},
-		func(d *decode.D, id string, path path) (bool, any) {
+		func(d *decode.D, id string, path path, size int64) (bool, any) {
 			switch id {
 			case "FORM":
 				riffType = d.FieldUTF8("format", 4, d.StrAssert(aiffRiffType))

format/riff/avi.go

@@ -238,7 +238,7 @@ func aviDecodeEx(d *decode.D, ai format.AVI_In, extendedChunk bool) {
 			size := d.FieldU32("size")
 			return id, int64(size)
 		},
-		func(d *decode.D, id string, path path) (bool, any) {
+		func(d *decode.D, id string, path path, size int64) (bool, any) {
 			switch id {
 			case "RIFF":
 				foundRiffType = d.FieldUTF8("type", 4, d.StrAssert(requiredRiffType))

format/riff/common.go

@@ -19,11 +19,11 @@ func (p path) topData() any {
 	return p[len(p)-1].data
 }
 
-func riffDecode(d *decode.D, path path, headFn func(d *decode.D, path path) (string, int64), chunkFn func(d *decode.D, id string, path path) (bool, any)) {
+func riffDecode(d *decode.D, path path, headFn func(d *decode.D, path path) (string, int64), chunkFn func(d *decode.D, id string, path path, size int64) (bool, any)) {
 	id, size := headFn(d, path)
 
 	d.FramedFn(size*8, func(d *decode.D) {
-		hasChildren, data := chunkFn(d, id, path)
+		hasChildren, data := chunkFn(d, id, path, size)
 		if hasChildren {
 			np := append(path, pathEntry{id: id, data: data})
 			d.FieldArray("chunks", func(d *decode.D) {
@@ -58,6 +58,10 @@ var chunkIDDescriptions = scalar.StrMapDescription{
 
 	"dmlh": "Extended AVI header",
 
+	"chna": "<chna> Chunk, Track UIDs of Audio Definition Model",
+	"axml": "<axml> Chunk, BWF XML Metadata, e.g. for Audio Definition Model ambisonics and elements",
+	"dbmd": "Dolby Metadata",
+
 	"ISMP": "SMPTE timecode",
 	"IDIT": "Time and date digitizing commenced",
 	"IARL": "Archival Location. Indicates where the subject of the file is archived.",