Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5,87 +5,62 @@ package riff | |
| // https://github.com/DolbyLaboratories/dbmd-atmos-parser | ||
|
|
||
| import ( | ||
| "github.com/wader/fq/pkg/decode" | ||
| "github.com/wader/fq/pkg/scalar" | ||
| ) | ||
|
|
||
| func dbmdDecode(d *decode.D) any { | ||
| d.FieldStruct("version", func(d *decode.D) { | ||
| d.FieldU8("major") | ||
| d.FieldU8("minor") | ||
| d.FieldU8("patch") | ||
| d.FieldU8("build") | ||
| }) | ||
|
|
||
| d.FieldArray("metadata_segments", func(d *decode.D) { | ||
| seenEnd := false | ||
| for !seenEnd { | ||
| d.FieldStruct("metadata_segment", func(d *decode.D) { | ||
| segmentID := d.FieldU8("id", metadataSegmentTypeMap) | ||
| if segmentID == 0 { | ||
| seenEnd = true | ||
| return | ||
| } | ||
|
|
||
| segmentSize := d.FieldU16("size") | ||
|
|
||
| switch segmentID { | ||
| case metadataSegmentTypeDolyEMetadata: | ||
| parseDolbyE(d) | ||
| case metadataSegmentTypeDolyEDigitaletadata: | ||
| parseDolbyDigital(d) | ||
| case metadataSegmentTypeDolyDigitalPlusMetadata: | ||
| parseDolbyDigitalPlus(d) | ||
| case metadataSegmentTypeAudioInfo: | ||
| parseAudioInfo(d) | ||
| case metadataSegmentTypeDolyAtmos: | ||
| parseDolbyAtmos(d) | ||
| case metadataSegmentTypeDolbyAtmosSupplemental: | ||
| parseDolbyAtmosSupplemental(d) | ||
| default: | ||
| d.FieldRawLen("unknown", int64(segmentSize*8)) | ||
| } | ||
|
|
||
| d.FieldU8("checksum", scalar.UintHex) | ||
| }) | ||
| } | ||
| }) | ||
|
|
||
| return nil | ||
| } | ||
|
|
||
| var compressionDescMap = scalar.UintMapSymStr{ | ||
| 0: "none", | ||
| 1: "film_standard", | ||
| 2: "film_light", | ||
| 3: "music_standard", | ||
| 4: "music_light", | ||
| 5: "speech", | ||
| } | ||
|
|
||
| var bitstreamMode = scalar.UintMapDescription{ | ||
|
|
@@ -101,20 +76,20 @@ var bitstreamMode = scalar.UintMapDescription{ | |
| 0b1000: "associated service: karaoke (K)", | ||
| } | ||
|
|
||
| var binauralRenderModeMap = scalar.UintMapSymStr{ | ||
| 0: "bypass", | ||
| 1: "near", | ||
| 2: "far", | ||
| 3: "mid", | ||
| 4: "not_indicated", | ||
| } | ||
|
|
||
| var warpModeMap = scalar.UintMap{ | ||
| 0: {Sym: "normal"}, | ||
| 1: {Sym: "warping"}, | ||
| 2: {Sym: "downmix_dolby_pro_logic_iix"}, | ||
| 3: {Sym: "downmix_loro"}, | ||
| 4: {Sym: "not_indicated", Description: "Default warping will be applied"}, | ||
| } | ||
|
|
||
| var trimConfigName = scalar.UintMapDescription{ | ||
|
|
@@ -134,9 +109,35 @@ var trimType = scalar.UintMapDescription{ | |
| 1: "automatic", | ||
| } | ||
|
|
||
| const ( | ||
| metadataSegmentTypeEnd = 0 | ||
| metadataSegmentTypeDolyEMetadata = 1 | ||
| metadataSegmentTypeDolyReserved2 = 2 | ||
| metadataSegmentTypeDolyEDigitaletadata = 3 | ||
| metadataSegmentTypeDolyReserved4 = 4 | ||
| metadataSegmentTypeDolyReserved5 = 5 | ||
| metadataSegmentTypeDolyReserved6 = 6 | ||
| metadataSegmentTypeDolyDigitalPlusMetadata = 7 | ||
| metadataSegmentTypeAudioInfo = 8 | ||
| metadataSegmentTypeDolyAtmos = 9 | ||
| metadataSegmentTypeDolbyAtmosSupplemental = 10 | ||
| ) | ||
|
|
||
| var metadataSegmentTypeMap = scalar.UintMapSymStr{ | ||
| metadataSegmentTypeEnd: "end", | ||
| metadataSegmentTypeDolyEMetadata: "doly_e_metadata", | ||
| metadataSegmentTypeDolyReserved2: "reserved2", | ||
| metadataSegmentTypeDolyEDigitaletadata: "doly_e_digitale_tadata", | ||
| metadataSegmentTypeDolyReserved4: "reserved4", | ||
| metadataSegmentTypeDolyReserved5: "reserved5", | ||
| metadataSegmentTypeDolyReserved6: "reserved6", | ||
| metadataSegmentTypeDolyDigitalPlusMetadata: "doly_digital_plus_metadata", | ||
| metadataSegmentTypeAudioInfo: "audio_info", | ||
| metadataSegmentTypeDolyAtmos: "doly_atmos", | ||
| metadataSegmentTypeDolbyAtmosSupplemental: "dolby_atmos_supplemental", | ||
| } | ||
|
|
||
| func parseDolbyE(d *decode.D) { | ||
| d.FieldU8("program_config") | ||
| d.FieldU8("frame_rate_code") | ||
| d.FieldRawLen("e_SMPTE_time_code", 8*8) | ||
|
|
@@ -146,8 +147,6 @@ func parseDolbyE(d *decode.D) { | |
| } | ||
|
|
||
| func parseDolbyDigital(d *decode.D) { | ||
This comment has been minimized.
Sorry, something went wrong.
This comment has been minimized.
Sorry, something went wrong. |
||
| d.FieldU8("ac3_program_id") | ||
| d.FieldU8("program_info") | ||
| d.FieldU8("datarate_info") | ||
|
|
@@ -167,9 +166,8 @@ func parseDolbyDigital(d *decode.D) { | |
| } | ||
|
|
||
| func parseDolbyDigitalPlus(d *decode.D) { | ||
| d.FieldU8("program_id") | ||
| // TODO: make struct and read U1(?) U1 (lfeon) U3 (bsmod) U3(acmod) fields? | ||
| programInfo := d.FieldU8("program_info") | ||
| lfeon := programInfo & 0b1_000_000 | ||
| bsmod := programInfo & 0b0_111_000 | ||
|
|
@@ -192,8 +190,8 @@ func parseDolbyDigitalPlus(d *decode.D) { | |
|
|
||
| d.FieldU24LE("ddplus_reserved_b") | ||
|
|
||
| d.FieldU8("compr1", scalar.UintSym("reserved"), compressionDescMap) | ||
| d.FieldU8("dynrng1", scalar.UintSym("reserved"), compressionDescMap) | ||
|
|
||
| d.FieldU24LE("ddplus_reserved_c") | ||
|
|
||
|
|
@@ -206,8 +204,6 @@ func parseDolbyDigitalPlus(d *decode.D) { | |
| } | ||
|
|
||
| func parseAudioInfo(d *decode.D) { | ||
| d.FieldU8("program_id") | ||
| d.FieldUTF8("audio_origin", 32) | ||
| d.FieldU32LE("largest_sample_value") | ||
|
|
@@ -224,36 +220,30 @@ func parseAudioInfo(d *decode.D) { | |
| d.FieldUTF8("segment_modified_date", 32) | ||
| } | ||
|
|
||
| func parseDolbyAtmos(d *decode.D) { | ||
| // TODO: both these are fixed size null terminated strings? | ||
| d.FieldUTF8NullFixedLen("atmos_dbmd_content_creation_preamble", 32) | ||
This comment has been minimized.
Sorry, something went wrong. 
JohnnyMarnell
|
||
| d.FieldUTF8NullFixedLen("atmos_dbmd_content_creation_tool", 64) | ||
| d.FieldStruct("version", func(d *decode.D) { | ||
| d.FieldU8("major") | ||
| d.FieldU8("minor") | ||
| d.FieldU8("micro") | ||
| }) | ||
|
|
||
| // TODO: what is this? | ||
| d.FieldRawLen("unknown0", 53*8) | ||
|
|
||
| d.FieldU8("warp_mode", warpModeMap) | ||
|
|
||
| // TODO: what is this? | ||
| d.FieldRawLen("unknown1", 15*8) | ||
| d.FieldRawLen("unknown2", 80*8) | ||
| } | ||
|
|
||
| func parseDolbyAtmosSupplemental(d *decode.D) { | ||
| d.FieldU32LE("dasms_sync", d.UintAssert(0xf8726fbd), scalar.UintHex) | ||
|
|
||
| // TODO: wav.go sets LE default i think? | ||
| objectCount := int64(d.FieldU16LE("object_count")) | ||
| d.FieldU8LE("reserved") | ||
|
|
||
|
|
@@ -265,30 +255,33 @@ func parseDolbyAtmosSupplemental(d *decode.D, size uint64) { | |
| d.FieldValueStr("trim_type", trimType[autoTrim]) | ||
| d.FieldValueStr("trim_config_name", trimConfigName[uint64(i)]) | ||
|
|
||
| // TODO: this is null separted list of def strings? | ||
| d.FieldUTF8("raw", 14) | ||
| // str := d.UTF8(14) | ||
| // bytes := []byte(str) | ||
| // var nonZeroBytes []string | ||
| // for _, b := range bytes { | ||
| // if b != 0 { | ||
| // nonZeroBytes = append(nonZeroBytes, fmt.Sprintf("%d", b)) | ||
| // } | ||
| // } | ||
| // TODO(jmarnell): I think the +3dB trim settings are here. | ||
| // Would like this at least as an array of numbers, instead of this CSV string | ||
| // d.FieldValueStr("trim_defs", strings.Join(nonZeroBytes, ", ")) | ||
|
|
||
| i++ | ||
| }) | ||
|
|
||
| d.FieldArray("objects", func(d *decode.D) { | ||
| for i := int64(0); i < objectCount; i++ { | ||
| d.FieldU8("object_value") | ||
| } | ||
| }) | ||
|
|
||
| d.FieldArray("binaural_render_modes", func(d *decode.D) { | ||
| // TODO: 0x7 mask needed? | ||
| for i := int64(0); i < objectCount; i++ { | ||
| d.FieldU8("render_mode", scalar.UintActualFn(func(a uint64) uint64 { return a & 0x7 }), binauralRenderModeMap) | ||
| } | ||
| }) | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
I don't know if it would ever be needed, but, since it seems the spec can have segments of differing types in any order (kind of like how it is for riff chunk id's?), so my thinking was an explicit
typewould be nice, e.g. forselect(.type == "dolby_digital"), or for clarity just looking. Otherwise, user/reader needs to switch on which props are there/not there?