From 2655ba09c564a0d9e67be92fa4223bf15387059d Mon Sep 17 00:00:00 2001 From: Mattias Wadman Date: Mon, 12 Sep 2022 11:25:43 +0200 Subject: [PATCH] mp4: More codec names (from mp4ra.org) --- format/mp4/boxes.go | 115 ++++++++++++++++++++-- format/mp4/testdata/aac.fqtest | 4 +- format/mp4/testdata/av1.fqtest | 4 +- format/mp4/testdata/avc.fqtest | 4 +- format/mp4/testdata/dash.fqtest | 8 +- format/mp4/testdata/decode_samples.fqtest | 2 +- format/mp4/testdata/fragmented.fqtest | 8 +- format/mp4/testdata/hevc.fqtest | 4 +- format/mp4/testdata/mp3.fqtest | 4 +- format/mp4/testdata/mpeg2.fqtest | 4 +- format/mp4/testdata/opus.fqtest | 4 +- format/mp4/testdata/stz2.fqtest | 4 +- format/mp4/testdata/vorbis.fqtest | 4 +- format/mp4/testdata/vp9.fqtest | 4 +- 14 files changed, 135 insertions(+), 38 deletions(-) diff --git a/format/mp4/boxes.go b/format/mp4/boxes.go index 35dbe3d1..a419b348 100644 --- a/format/mp4/boxes.go +++ b/format/mp4/boxes.go @@ -62,21 +62,118 @@ var subTypeNames = scalar.StrToDescription{ } var dataFormatNames = scalar.StrToDescription{ + // additional codecs "apch": "Apple ProRes 422 High Quality", "apcn": "Apple ProRes 422 Standard Definition", "apcs": "Apple ProRes 422 LT", "apco": "Apple ProRes 422 Proxy", "ap4h": "Apple ProRes 4444", - "fLaC": "Fres Lossless Audio Codec", - "Opus": "Xiph Opus", - "vp09": "VP9", - "avc1": "Advanced Video Coding / H.264 / MPEG-4 Part 10", - "hev1": "High Efficiency Video Coding / H.265 / MPEG-H Part 2", - "hvc1": "High Efficiency Video Coding / H.265 / MPEG-H Part 2", - "av01": "AV1", - "mp4a": "MPEG Audio", - "mp4v": "MPEG Video", "jpeg": "JPEG Image", + + // codecs from https://mp4ra.org/ + "3gvo": "3GPP Video Orientation", + "a3d1": "Multiview Video Coding", + "a3d2": "Multiview Video Coding", + "a3d3": "Multiview Video Coding", + "a3d4": "Multiview Video Coding", + "a3ds": "Auro-Cx 3D audio", + "ac-3": "AC-3 audio", + "ac-4": "AC-4 audio", + "alac": "Apple lossless audio codec", + "alaw": "a-Law", + "av01": "AV1 video", + "avc1": "Advanced Video Coding", + "avc2": "Advanced Video Coding", + "avc3": "Advanced Video Coding", + "avc4": "Advanced Video Coding", + "avcp": "Advanced Video Coding Parameters", + "dra1": "DRA Audio", + "drac": "Dirac Video Coder", + "dts-": "Dependent base layer for DTS layered audio", + "dts+": "Enhancement layer for DTS layered audio", + "dtsc": "DTS Coherent Acoustics audio", + "dtse": "DTS Express low bit rate audio, also known as DTS LBR", + "dtsh": "DTS-HD High Resolution Audio", + "dtsl": "DTS-HD Master Audio", + "dtsx": "DTS:X", + "dvav": "AVC-based “Dolby Vision”", + "dvhe": "HEVC-based “Dolby Vision”", + "ec-3": "Enhanced AC-3 audio", + "enca": "Encrypted/Protected audio", + "encf": "Encrypted/Protected font", + "encm": "Encrypted/Protected metadata stream", + "encs": "Encrypted Systems stream", + "enct": "Encrypted Text", + "encv": "Encrypted/protected video", + "fdp ": "File delivery hints", + "fLaC": "Fres Lossless Audio Codec", + "g719": "ITU-T Recommendation G.719 (2008)", + "g726": "ITU-T Recommendation G.726 (1990)", + "hev1": "High Efficiency Video Coding", + "hvc1": "High Efficiency Video Coding", + "hvt1": "High Efficiency Video Coding", + "ixse": "DVB Track Level Index Track", + "lhe1": "Layered High Efficiency Video Coding", + "lht1": "Layered High Efficiency Video Coding", + "lhv1": "Layered High Efficiency Video Coding", + "m2ts": "MPEG-2 transport stream for DMB", + "m4ae": "MPEG-4 Audio Enhancement MP4v1/2", + "mett": "Text timed metadata that is not XML", + "metx": "XML timed metadata", + "mha1": "MPEG-H Audio (single stream, uncapsulated)", + "mha2": "MPEG-H Audio (multi-stream, unencapsulated)", + "mhm1": "MPEG-H Audio (single stream, MHAS encapsulated)", + "mhm2": "MPEG-H Audio (multi-stream, MHAS encapsulated)", + "mjp2": "Motion JPEG 2000", + "mlix": "DVB Movie level index track", + "mlpa": "MLP Audio", + "mp4a": "MPEG-4 Audio", + "mp4s": "MPEG-4 Systems", + "mp4v": "MPEG-4 Visual", + "mvc1": "Multiview coding", + "mvc2": "Multiview coding", + "mvc3": "Multiview coding", + "mvc4": "Multiview coding", + "mvd1": "Multiview coding", + "mvd2": "Multiview coding", + "mvd3": "Multiview coding", + "mvd4": "Multiview coding", + "oksd": "OMA Keys", + "Opus": "Opus audio coding", + "pm2t": "Protected MPEG-2 Transport", + "prtp": "Protected RTP Reception", + "raw ": "Uncompressed audio", + "resv": "Restricted Video", + "rm2t": "MPEG-2 Transport Reception", + "rrtp": "RTP reception", + "rsrp": "SRTP Reception", + "rtmd": "Real Time Metadata Sample Entry(XAVC Format)", + "rtp ": "RTP Hints", + "s263": "ITU H.263 video (3GPP format)", + "samr": "Narrowband AMR voice", + "sawb": "Wideband AMR voice", + "sawp": "Extended AMR-WB (AMR-WB+)", + "sevc": "EVRC Voice", + "sm2t": "MPEG-2 Transport Server", + "sqcp": "13K Voice", + "srtp": "SRTP Hints", + "ssmv": "SMV Voice", + "STGS": "Subtitle Sample Entry (HMMP)", + "stpp": "Subtitles (Timed Text)", + "svc1": "Scalable Video Coding", + "svc2": "Scalable Video Coding", + "svcM": "SVC Metadata", + "tc64": "64 bit timecode samples", + "tmcd": "32 bit timecode samples", + "twos": "Uncompressed 16-bit audio", + "tx3g": "Timed Text stream", + "ulaw": "Samples have been compressed using uLaw 2:1.", + "unid": "Dynamic Range Control (DRC) data", + "urim": "Binary timed metadata identified by URI", + "vc-1": "SMPTE VC-1", + "vp08": "VP8 video", + "vp09": "VP9 video", + "wvtt": "WebVTT", } var ( diff --git a/format/mp4/testdata/aac.fqtest b/format/mp4/testdata/aac.fqtest index cc627dbe..f897addd 100644 --- a/format/mp4/testdata/aac.fqtest +++ b/format/mp4/testdata/aac.fqtest @@ -192,7 +192,7 @@ $ fq -d mp4 dv aac.mp4 | | | boxes[0:1]: 0x437-0x490.7 (90) | | | [0]{}: box 0x437-0x490.7 (90) 0x430| 00 00 00 5a | ...Z | size: 90 0x437-0x43a.7 (4) -0x430| 6d 70 34 61 | mp4a | type: "mp4a" (MPEG Audio) 0x43b-0x43e.7 (4) +0x430| 6d 70 34 61 | mp4a | type: "mp4a" (MPEG-4 Audio) 0x43b-0x43e.7 (4) 0x430| 00| .| reserved: raw bits 0x43f-0x444.7 (6) 0x440|00 00 00 00 00 |..... | 0x440| 00 01 | .. | data_reference_index: 1 0x445-0x446.7 (2) @@ -429,4 +429,4 @@ $ fq -d mp4 dv aac.mp4 0x290|b4 |. | [1]: raw bits byte_align 0x290.6-0x290.7 (0.2) 0x290| 70 | p | [2]: raw bits data 0x291-0x291.7 (1) | | | id: 1 0x59d-NA (0) - | | | data_foramt: "mp4a" (MPEG Audio) 0x59d-NA (0) + | | | data_foramt: "mp4a" (MPEG-4 Audio) 0x59d-NA (0) diff --git a/format/mp4/testdata/av1.fqtest b/format/mp4/testdata/av1.fqtest index 27bdf410..c6bd1090 100644 --- a/format/mp4/testdata/av1.fqtest +++ b/format/mp4/testdata/av1.fqtest @@ -178,7 +178,7 @@ $ fq -d mp4 dv av1.mp4 | | | boxes[0:1]: 0x1369-0x13f3.7 (139) | | | [0]{}: box 0x1369-0x13f3.7 (139) 0x1360| 00 00 00 8b | .... | size: 139 0x1369-0x136c.7 (4) -0x1360| 61 76 30| av0| type: "av01" (AV1) 0x136d-0x1370.7 (4) +0x1360| 61 76 30| av0| type: "av01" (AV1 video) 0x136d-0x1370.7 (4) 0x1370|31 |1 | 0x1370| 00 00 00 00 00 00 | ...... | reserved: raw bits 0x1371-0x1376.7 (6) 0x1370| 00 01 | .. | data_reference_index: 1 0x1377-0x1378.7 (2) @@ -341,4 +341,4 @@ $ fq -d mp4 dv av1.mp4 0x0050|f6 0a 4f ae f3 fe ec e7 30 4f 3f 13 9c 75 c9 6a|..O.....0O?..u.j| data: raw bits 0x50-0x11bf.7 (4464) * |until 0x11bf.7 (4464) | | | | | id: 1 0x14b2-NA (0) - | | | data_foramt: "av01" (AV1) 0x14b2-NA (0) + | | | data_foramt: "av01" (AV1 video) 0x14b2-NA (0) diff --git a/format/mp4/testdata/avc.fqtest b/format/mp4/testdata/avc.fqtest index c26d5339..fd15cada 100644 --- a/format/mp4/testdata/avc.fqtest +++ b/format/mp4/testdata/avc.fqtest @@ -196,7 +196,7 @@ $ fq -d mp4 dv avc.mp4 | | | boxes[0:1]: 0xf2a-0xfd9.7 (176) | | | [0]{}: box 0xf2a-0xfd9.7 (176) 0x00f20| 00 00 00 b0 | .... | size: 176 0xf2a-0xf2d.7 (4) -0x00f20| 61 76| av| type: "avc1" (Advanced Video Coding / H.264 / MPEG-4 Part 10) 0xf2e-0xf31.7 (4) +0x00f20| 61 76| av| type: "avc1" (Advanced Video Coding) 0xf2e-0xf31.7 (4) 0x00f30|63 31 |c1 | 0x00f30| 00 00 00 00 00 00 | ...... | reserved: raw bits 0xf32-0xf37.7 (6) 0x00f30| 00 01 | .. | data_reference_index: 1 0xf38-0xf39.7 (2) @@ -514,4 +514,4 @@ $ fq -d mp4 dv avc.mp4 0x00d50|79 0a ff 01 f9 2d 04 d3 29 fe 4d 76 42 26 f6 cd|y....-..).MvB&..| * |until 0xd80.7 (51) | | | | | id: 1 0x10e0-NA (0) - | | | data_foramt: "avc1" (Advanced Video Coding / H.264 / MPEG-4 Part 10) 0x10e0-NA (0) + | | | data_foramt: "avc1" (Advanced Video Coding) 0x10e0-NA (0) diff --git a/format/mp4/testdata/dash.fqtest b/format/mp4/testdata/dash.fqtest index d27c76cb..dc6866da 100644 --- a/format/mp4/testdata/dash.fqtest +++ b/format/mp4/testdata/dash.fqtest @@ -204,7 +204,7 @@ $ fq -d mp4 dv dash_audio_init.mp4 | | | boxes[0:1]: 0x218-0x265.7 (78) | | | [0]{}: box 0x218-0x265.7 (78) 0x210| 00 00 00 4e | ...N | size: 78 0x218-0x21b.7 (4) -0x210| 6d 70 34 61| mp4a| type: "mp4a" (MPEG Audio) 0x21c-0x21f.7 (4) +0x210| 6d 70 34 61| mp4a| type: "mp4a" (MPEG-4 Audio) 0x21c-0x21f.7 (4) 0x220|00 00 00 00 00 00 |...... | reserved: raw bits 0x220-0x225.7 (6) 0x220| 00 01 | .. | data_reference_index: 1 0x226-0x227.7 (2) 0x220| 00 00 | .. | version: 0 0x228-0x229.7 (2) @@ -348,7 +348,7 @@ $ fq -d mp4 dv dash_audio_init.mp4 | | | tracks[0:1]: 0x330-NA (0) | | | [0]{}: track 0x330-NA (0) | | | id: 1 0x330-NA (0) - | | | data_foramt: "mp4a" (MPEG Audio) 0x330-NA (0) + | | | data_foramt: "mp4a" (MPEG-4 Audio) 0x330-NA (0) | | | samples[0:0]: 0x330-NA (0) $ fq -d mp4 dv dash_audio_1.m4s |00 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 0e 0f|0123456789abcdef|.{}: dash_audio_1.m4s (mp4) 0x0-0x4eb.7 (1260) @@ -696,7 +696,7 @@ $ fq -d mp4 dv dash_video_init.mp4 | | | boxes[0:1]: 0x21c-0x2a2.7 (135) | | | [0]{}: box 0x21c-0x2a2.7 (135) 0x0210| 00 00 00 87| ....| size: 135 0x21c-0x21f.7 (4) -0x0220|61 76 63 31 |avc1 | type: "avc1" (Advanced Video Coding / H.264 / MPEG-4 Part 10) 0x220-0x223.7 (4) +0x0220|61 76 63 31 |avc1 | type: "avc1" (Advanced Video Coding) 0x220-0x223.7 (4) 0x0220| 00 00 00 00 00 00 | ...... | reserved: raw bits 0x224-0x229.7 (6) 0x0220| 00 01 | .. | data_reference_index: 1 0x22a-0x22b.7 (2) 0x0220| 00 00 | .. | version: 0 0x22c-0x22d.7 (2) @@ -886,7 +886,7 @@ $ fq -d mp4 dv dash_video_init.mp4 | | | tracks[0:1]: 0x333-NA (0) | | | [0]{}: track 0x333-NA (0) | | | id: 1 0x333-NA (0) - | | | data_foramt: "avc1" (Advanced Video Coding / H.264 / MPEG-4 Part 10) 0x333-NA (0) + | | | data_foramt: "avc1" (Advanced Video Coding) 0x333-NA (0) | | | samples[0:0]: 0x333-NA (0) $ fq -d mp4 dv dash_video_1.m4s |00 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 0e 0f|0123456789abcdef|.{}: dash_video_1.m4s (mp4) 0x0-0x1fd0.7 (8145) diff --git a/format/mp4/testdata/decode_samples.fqtest b/format/mp4/testdata/decode_samples.fqtest index cea6a739..b944e860 100644 --- a/format/mp4/testdata/decode_samples.fqtest +++ b/format/mp4/testdata/decode_samples.fqtest @@ -14,4 +14,4 @@ $ fq -o decode_samples=false -d mp4 '.tracks | dv' aac.mp4 0x280| 01 18 81| ...| [3]: raw bits sample 0x28d-0x291.7 (5) 0x290|b4 70 |.p | | | | id: 1 0x59d-NA (0) - | | | data_foramt: "mp4a" (MPEG Audio) 0x59d-NA (0) + | | | data_foramt: "mp4a" (MPEG-4 Audio) 0x59d-NA (0) diff --git a/format/mp4/testdata/fragmented.fqtest b/format/mp4/testdata/fragmented.fqtest index 55cae892..e9a8f9e9 100644 --- a/format/mp4/testdata/fragmented.fqtest +++ b/format/mp4/testdata/fragmented.fqtest @@ -154,7 +154,7 @@ $ fq -d mp4 dv fragmented.mp4 | | | boxes[0:1]: 0x1a9-0x23f.7 (151) | | | [0]{}: box 0x1a9-0x23f.7 (151) 0x001a0| 00 00 00 97 | .... | size: 151 0x1a9-0x1ac.7 (4) -0x001a0| 61 76 63| avc| type: "avc1" (Advanced Video Coding / H.264 / MPEG-4 Part 10) 0x1ad-0x1b0.7 (4) +0x001a0| 61 76 63| avc| type: "avc1" (Advanced Video Coding) 0x1ad-0x1b0.7 (4) 0x001b0|31 |1 | 0x001b0| 00 00 00 00 00 00 | ...... | reserved: raw bits 0x1b1-0x1b6.7 (6) 0x001b0| 00 01 | .. | data_reference_index: 1 0x1b7-0x1b8.7 (2) @@ -411,7 +411,7 @@ $ fq -d mp4 dv fragmented.mp4 | | | boxes[0:1]: 0x391-0x3fe.7 (110) | | | [0]{}: box 0x391-0x3fe.7 (110) 0x00390| 00 00 00 6e | ...n | size: 110 0x391-0x394.7 (4) -0x00390| 6d 70 34 61 | mp4a | type: "mp4a" (MPEG Audio) 0x395-0x398.7 (4) +0x00390| 6d 70 34 61 | mp4a | type: "mp4a" (MPEG-4 Audio) 0x395-0x398.7 (4) 0x00390| 00 00 00 00 00 00 | ...... | reserved: raw bits 0x399-0x39e.7 (6) 0x00390| 00| .| data_reference_index: 1 0x39f-0x3a0.7 (2) 0x003a0|01 |. | @@ -1167,7 +1167,7 @@ $ fq -d mp4 dv fragmented.mp4 0x02240|86 f8 14 d8 53 23 af ff f2 50 06 7f 30 02 17 55|....S#...P..0..U| * |until 0x2af4.7 (2234) | | | | | id: 1 0x2bb4-NA (0) - | | | data_foramt: "avc1" (Advanced Video Coding / H.264 / MPEG-4 Part 10) 0x2bb4-NA (0) + | | | data_foramt: "avc1" (Advanced Video Coding) 0x2bb4-NA (0) | | | [1]{}: track 0x13e0-0x2bb3.7 (6100) | | | samples[0:6]: 0x13e0-0x2af9.7 (5914) |00 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 0e 0f|0123456789abcdef| [0][0:4]: sample (aac_frame) 0x13e0-0x14ad.7 (206) @@ -1270,4 +1270,4 @@ $ fq -d mp4 dv fragmented.mp4 0x02af0| b4 | . | [1]: raw bits byte_align 0x2af8.6-0x2af8.7 (0.2) 0x02af0| 70 | p | [2]: raw bits data 0x2af9-0x2af9.7 (1) | | | id: 2 0x2bb4-NA (0) - | | | data_foramt: "mp4a" (MPEG Audio) 0x2bb4-NA (0) + | | | data_foramt: "mp4a" (MPEG-4 Audio) 0x2bb4-NA (0) diff --git a/format/mp4/testdata/hevc.fqtest b/format/mp4/testdata/hevc.fqtest index 33c5216d..0d8aedc0 100644 --- a/format/mp4/testdata/hevc.fqtest +++ b/format/mp4/testdata/hevc.fqtest @@ -196,7 +196,7 @@ $ fq -d mp4 dv hevc.mp4 | | | boxes[0:1]: 0xa2a-0x13dc.7 (2483) | | | [0]{}: box 0xa2a-0x13dc.7 (2483) 0x0a20| 00 00 09 b3 | .... | size: 2483 0xa2a-0xa2d.7 (4) -0x0a20| 68 65| he| type: "hev1" (High Efficiency Video Coding / H.265 / MPEG-H Part 2) 0xa2e-0xa31.7 (4) +0x0a20| 68 65| he| type: "hev1" (High Efficiency Video Coding) 0xa2e-0xa31.7 (4) 0x0a30|76 31 |v1 | 0x0a30| 00 00 00 00 00 00 | ...... | reserved: raw bits 0xa32-0xa37.7 (6) 0x0a30| 00 01 | .. | data_reference_index: 1 0xa38-0xa39.7 (2) @@ -636,4 +636,4 @@ $ fq -d mp4 dv hevc.mp4 0x0040|fd a9 78 83 ff fb 75 6c 0b 3f ff 94 ce 7f aa fe|..x...ul.?......| * |until 0x880.7 (2127) | | | | | id: 1 0x149b-NA (0) - | | | data_foramt: "hev1" (High Efficiency Video Coding / H.265 / MPEG-H Part 2) 0x149b-NA (0) + | | | data_foramt: "hev1" (High Efficiency Video Coding) 0x149b-NA (0) diff --git a/format/mp4/testdata/mp3.fqtest b/format/mp4/testdata/mp3.fqtest index 8b13ce1d..457a6fd7 100644 --- a/format/mp4/testdata/mp3.fqtest +++ b/format/mp4/testdata/mp3.fqtest @@ -192,7 +192,7 @@ $ fq -d mp4 dv mp3.mp4 | | | boxes[0:1]: 0x443-0x492.7 (80) | | | [0]{}: box 0x443-0x492.7 (80) 0x440| 00 00 00 50 | ...P | size: 80 0x443-0x446.7 (4) -0x440| 6d 70 34 61 | mp4a | type: "mp4a" (MPEG Audio) 0x447-0x44a.7 (4) +0x440| 6d 70 34 61 | mp4a | type: "mp4a" (MPEG-4 Audio) 0x447-0x44a.7 (4) 0x440| 00 00 00 00 00| .....| reserved: raw bits 0x44b-0x450.7 (6) 0x450|00 |. | 0x450| 00 01 | .. | data_reference_index: 1 0x451-0x452.7 (2) @@ -506,4 +506,4 @@ $ fq -d mp4 dv mp3.mp4 * |until 0x29d.7 (188) | | | | | crc_calculated: "c36b" (raw bits) 0x29e-NA (0) | | | id: 1 0x565-NA (0) - | | | data_foramt: "mp4a" (MPEG Audio) 0x565-NA (0) + | | | data_foramt: "mp4a" (MPEG-4 Audio) 0x565-NA (0) diff --git a/format/mp4/testdata/mpeg2.fqtest b/format/mp4/testdata/mpeg2.fqtest index 3fd3adcd..c01bf236 100644 --- a/format/mp4/testdata/mpeg2.fqtest +++ b/format/mp4/testdata/mpeg2.fqtest @@ -195,7 +195,7 @@ $ fq -d mp4 dv mpeg2.mp4 | | | [0]{}: box 0x214f-0x21ea.7 (156) 0x2140| 00| .| size: 156 0x214f-0x2152.7 (4) 0x2150|00 00 9c |... | -0x2150| 6d 70 34 76 | mp4v | type: "mp4v" (MPEG Video) 0x2153-0x2156.7 (4) +0x2150| 6d 70 34 76 | mp4v | type: "mp4v" (MPEG-4 Visual) 0x2153-0x2156.7 (4) 0x2150| 00 00 00 00 00 00 | ...... | reserved: raw bits 0x2157-0x215c.7 (6) 0x2150| 00 01 | .. | data_reference_index: 1 0x215d-0x215e.7 (2) 0x2150| 00| .| version: 0 0x215f-0x2160.7 (2) @@ -356,4 +356,4 @@ $ fq -d mp4 dv mpeg2.mp4 0x0040|00 00 00 00 01 b8 00 08 00 40 00 00 01 00 00 0f|.........@......| * |until 0x1fa5.7 (8046) | | | | | id: 1 0x22a9-NA (0) - | | | data_foramt: "mp4v" (MPEG Video) 0x22a9-NA (0) + | | | data_foramt: "mp4v" (MPEG-4 Visual) 0x22a9-NA (0) diff --git a/format/mp4/testdata/opus.fqtest b/format/mp4/testdata/opus.fqtest index 0de721cc..53ae40c9 100644 --- a/format/mp4/testdata/opus.fqtest +++ b/format/mp4/testdata/opus.fqtest @@ -187,7 +187,7 @@ $ fq -d mp4 dv opus.mp4 | | | boxes[0:1]: 0x33c-0x372.7 (55) | | | [0]{}: box 0x33c-0x372.7 (55) 0x330| 00 00 00 37| ...7| size: 55 0x33c-0x33f.7 (4) -0x340|4f 70 75 73 |Opus | type: "Opus" (Xiph Opus) 0x340-0x343.7 (4) +0x340|4f 70 75 73 |Opus | type: "Opus" (Opus audio coding) 0x340-0x343.7 (4) 0x340| 00 00 00 00 00 00 | ...... | reserved: raw bits 0x344-0x349.7 (6) 0x340| 00 01 | .. | data_reference_index: 1 0x34a-0x34b.7 (2) 0x340| 00 00 | .. | version: 0 0x34c-0x34d.7 (2) @@ -353,4 +353,4 @@ $ fq -d mp4 dv opus.mp4 0x120|02 cc 49 57 27 d4 a3 83 e9 53 33 fe 45 62 33 33|..IW'....S3.Eb33| * |until 0x196.7 (120) | | | | | id: 1 0x439-NA (0) - | | | data_foramt: "Opus" (Xiph Opus) 0x439-NA (0) + | | | data_foramt: "Opus" (Opus audio coding) 0x439-NA (0) diff --git a/format/mp4/testdata/stz2.fqtest b/format/mp4/testdata/stz2.fqtest index 80c32b8c..2fd31e96 100644 --- a/format/mp4/testdata/stz2.fqtest +++ b/format/mp4/testdata/stz2.fqtest @@ -179,7 +179,7 @@ $ fq -d mp4 'dv' stz2.mp4 | | | [0]{}: box 0x1ce-0x214.7 (71) 0x1c0| 00 00| ..| size: 71 0x1ce-0x1d1.7 (4) 0x1d0|00 47 |.G | -0x1d0| 6d 70 34 61 | mp4a | type: "mp4a" (MPEG Audio) 0x1d2-0x1d5.7 (4) +0x1d0| 6d 70 34 61 | mp4a | type: "mp4a" (MPEG-4 Audio) 0x1d2-0x1d5.7 (4) 0x1d0| 00 00 00 00 00 00 | ...... | reserved: raw bits 0x1d6-0x1db.7 (6) 0x1d0| 00 01 | .. | data_reference_index: 1 0x1dc-0x1dd.7 (2) 0x1d0| 00 00| ..| version: 0 0x1de-0x1df.7 (2) @@ -463,4 +463,4 @@ $ fq -d mp4 'dv' stz2.mp4 * |until 0x4f5.7 (188) | | | | | crc_calculated: "c36b" (raw bits) 0x4f6-NA (0) | | | id: 1 0x530-NA (0) - | | | data_foramt: "mp4a" (MPEG Audio) 0x530-NA (0) + | | | data_foramt: "mp4a" (MPEG-4 Audio) 0x530-NA (0) diff --git a/format/mp4/testdata/vorbis.fqtest b/format/mp4/testdata/vorbis.fqtest index eaebf613..a180c106 100644 --- a/format/mp4/testdata/vorbis.fqtest +++ b/format/mp4/testdata/vorbis.fqtest @@ -194,7 +194,7 @@ $ fq -d mp4 dv vorbis.mp4 | | | boxes[0:1]: 0x382-0x10b6.7 (3381) | | | [0]{}: box 0x382-0x10b6.7 (3381) 0x0380| 00 00 0d 35 | ...5 | size: 3381 0x382-0x385.7 (4) -0x0380| 6d 70 34 61 | mp4a | type: "mp4a" (MPEG Audio) 0x386-0x389.7 (4) +0x0380| 6d 70 34 61 | mp4a | type: "mp4a" (MPEG-4 Audio) 0x386-0x389.7 (4) 0x0380| 00 00 00 00 00 00| ......| reserved: raw bits 0x38a-0x38f.7 (6) 0x0390|00 01 |.. | data_reference_index: 1 0x390-0x391.7 (2) 0x0390| 00 00 | .. | version: 0 0x392-0x393.7 (2) @@ -383,4 +383,4 @@ $ fq -d mp4 dv vorbis.mp4 0x0130|f2 81 46 bb c2 48 52 08 27 b8 83 10 ca 08 b1 a7|..F..HR.'.......| * |until 0x1dc.7 (174) | | | | | id: 1 0x1189-NA (0) - | | | data_foramt: "mp4a" (MPEG Audio) 0x1189-NA (0) + | | | data_foramt: "mp4a" (MPEG-4 Audio) 0x1189-NA (0) diff --git a/format/mp4/testdata/vp9.fqtest b/format/mp4/testdata/vp9.fqtest index 413abb8e..da7137f1 100644 --- a/format/mp4/testdata/vp9.fqtest +++ b/format/mp4/testdata/vp9.fqtest @@ -178,7 +178,7 @@ $ fq -d mp4 dv vp9.mp4 | | | [0]{}: box 0x170d-0x1790.7 (132) 0x1700| 00 00 00| ...| size: 132 0x170d-0x1710.7 (4) 0x1710|84 |. | -0x1710| 76 70 30 39 | vp09 | type: "vp09" (VP9) 0x1711-0x1714.7 (4) +0x1710| 76 70 30 39 | vp09 | type: "vp09" (VP9 video) 0x1711-0x1714.7 (4) 0x1710| 00 00 00 00 00 00 | ...... | reserved: raw bits 0x1715-0x171a.7 (6) 0x1710| 00 01 | .. | data_reference_index: 1 0x171b-0x171c.7 (2) 0x1710| 00 00 | .. | version: 0 0x171d-0x171e.7 (2) @@ -336,4 +336,4 @@ $ fq -d mp4 dv vp9.mp4 0x0040|f9 be 8f e7 71 ff 5f 97 ef c3 f9 7e 37 b0 7e ad|....q._....~7.~.| * |until 0x1563.7 (5424) | | | | | id: 1 0x184f-NA (0) - | | | data_foramt: "vp09" (VP9) 0x184f-NA (0) + | | | data_foramt: "vp09" (VP9 video) 0x184f-NA (0)