Skip to content

Commit 14a4f9e

Browse files
paulhiggspaulhiggs
committed
add AVS3 part 3 Audio
1 parent 79fa38e commit 14a4f9e

10 files changed

Lines changed: 337 additions & 83 deletions

File tree

‎metadata/DVB.zip‎

2.19 KB
Binary file not shown.

‎metadata/catalog.xml‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!DOCTYPE catalog PUBLIC "-//OASIS//DTD XML Catalogs V1.1//EN" "http://www.oasis-open.org/committees/entity/release/1.1/catalog.dtd">
33
<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
4-
<nextCatalog catalog="../3rd-party/catalog.xml"/>
5-
<nextCatalog catalog="css/catalog.xml"/>
6-
<nextCatalog catalog="cs/catalog.xml"/>
7-
<nextCatalog catalog="schema/catalog.xml"/>
8-
<nextCatalog catalog="ciplus/catalog.xml"/>
9-
<nextCatalog catalog="mhp/catalog.xml"/>
104
<nextCatalog catalog="iptv/catalog.xml"/>
5+
<nextCatalog catalog="schema/catalog.xml"/>
6+
<nextCatalog catalog="css/catalog.xml"/>
117
<nextCatalog catalog="ff/catalog.xml"/>
8+
<nextCatalog catalog="mhp/catalog.xml"/>
9+
<nextCatalog catalog="ciplus/catalog.xml"/>
10+
<nextCatalog catalog="cs/catalog.xml"/>
1211
</catalog>

‎metadata/cs/2024/AudioCodecCS.xml‎

Lines changed: 173 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,173 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
Classification scheme now conforms to the draft guidelines on classification schemes.
4+
-->
5+
<!-- revision information
6+
2020: add AC-4 (4), DTS (5), MPEG-H 3D (6) according to ETSI TS 101 154 v2.6.1 (2019-09)
7+
2024: add AVS3 (7) according to ETSI TS 101 154 v2.9.1
8+
-->
9+
<ClassificationScheme xml:lang="en"
10+
uri="urn:dvb:metadata:cs:AudioCodecCS:2024"
11+
xmlns="urn:dvb:metadata:schema:dvbCSschema:2007"
12+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
13+
<Term termID="1">
14+
<Name>MPEG-4 DVB Audio</Name>
15+
<Term termID="1.1">
16+
<Name>MPEG-4 Advanced Audio Profile</Name>
17+
<Term termID="1.1.1">
18+
<Name>MPEG-4 Advanced Audio Profile @ Level 1</Name>
19+
</Term>
20+
<Term termID="1.1.2">
21+
<Name>MPEG-4 Advanced Audio Profile @ Level 2</Name>
22+
</Term>
23+
<Term termID="1.1.3">
24+
<Name>MPEG-4 Advanced Audio Profile @ Level 4</Name>
25+
</Term>
26+
<Term termID="1.1.4">
27+
<Name>MPEG-4 Advanced Audio Profile @ Level 5</Name>
28+
</Term>
29+
</Term>
30+
<Term termID="1.2">
31+
<Name>MPEG-4 High Efficiency Advanced Audio Profile</Name>
32+
<Term termID="1.2.2">
33+
<Name>MPEG-4 High Efficiency Advanced Audio Profile @ Level 2</Name>
34+
</Term>
35+
<Term termID="1.2.3">
36+
<Name>MPEG-4 High Efficiency Advanced Audio Profile @ Level 3</Name>
37+
</Term>
38+
<Term termID="1.2.4">
39+
<Name>MPEG-4 High Efficiency Advanced Audio Profile @ Level 4</Name>
40+
</Term>
41+
<Term termID="1.2.5">
42+
<Name>MPEG-4 High Efficiency Advanced Audio Profile @ Level 5</Name>
43+
</Term>
44+
</Term>
45+
<Term termID="1.3">
46+
<Name>MPEG-4 High Efficiency Advanced Audio v2 Profile</Name>
47+
<Term termID="1.3.2">
48+
<Name>MPEG-4 High Efficiency Advanced Audio v2 Profile @ Level 2</Name>
49+
</Term>
50+
<Term termID="1.3.3">
51+
<Name>MPEG-4 High Efficiency Advanced Audio v2 Profile @ Level 3</Name>
52+
</Term>
53+
<Term termID="1.3.4">
54+
<Name>MPEG-4 High Efficiency Advanced Audio v2 Profile @ Level 4</Name>
55+
</Term>
56+
<Term termID="1.3.5">
57+
<Name>MPEG-4 High Efficiency Advanced Audio v2 Profile @ Level 5</Name>
58+
</Term>
59+
</Term>
60+
</Term>
61+
<Term termID="2">
62+
<Name>AMR DVB</Name>
63+
<Definition>Advanced Multi Rate</Definition>
64+
<Term termID="2.1">
65+
<Name>AMR-WB+ - Extended AMR Wideband codec</Name>
66+
<Definition>ETSI TS 126 290 Extended AMR Wideband codec</Definition>
67+
</Term>
68+
</Term>
69+
<Term termID="3">
70+
<Name>AC3</Name>
71+
<Term termID="3.1">
72+
<Name>E-AC3</Name>
73+
<Definition>Dolby Enhanced AC3</Definition>
74+
</Term>
75+
</Term>
76+
<Term termID="4">
77+
<Name>AC-4</Name>
78+
<Term termID="4.1">
79+
<Name>AC-4 CIP</Name>
80+
<Definition>AC-4 Channel-based, Immersive and Personalized audio as specified in ETSI TS 103 190-2</Definition>
81+
<Term termID="4.1.1">
82+
<Name>AC-4 CIP Level 0</Name>
83+
</Term>
84+
<Term termID="4.1.2">
85+
<Name>AC-4 CIP Level 1</Name>
86+
</Term>
87+
<Term termID="4.1.3">
88+
<Name>AC-4 CIP Level 2</Name>
89+
</Term>
90+
<Term termID="4.1.4">
91+
<Name>AC-4 CIP Level 3</Name>
92+
</Term>
93+
</Term>
94+
</Term>
95+
<Term termID="5">
96+
<Name>DTS</Name>
97+
<Term termID="5.1">
98+
<Name>DTS-HD</Name>
99+
<Term termID="5.1.1">
100+
<Name>DTS-HD Core</Name>
101+
<Definition>DTS Coherent Acoustics Core substream multichannel audio as specified in ETSI TS 102 114</Definition>
102+
</Term>
103+
<Term termID="5.1.2">
104+
<Name>DTS-HD LBR</Name>
105+
<Definition>DTS LBR Extension substream multichannel audio as specified in ETSI TS 102 114</Definition>
106+
</Term>
107+
<Term termID="5.1.3">
108+
<Name>DTS-HD Core+Extension Substream</Name>
109+
<Definition>DTS Core substream plus Extension substream as specified in ETSI TS 102 114</Definition>
110+
</Term>
111+
<Term termID="5.1.4">
112+
<Name>DTS-HD Lossless</Name>
113+
<Definition>DTS-HD Lossless substream only as specified in ETSI TS 102 114</Definition>
114+
</Term>
115+
</Term>
116+
<Term termID="5.2">
117+
<Name>DTS-UHD</Name>
118+
<Term termID="5.2.1">
119+
<Name>DTS-UHD Profile 2</Name>
120+
<Definition>DTS-UHD Profile 2 Immersive audio as specified in ETSI TS 103 491</Definition>
121+
</Term>
122+
<Term termID="5.2.2">
123+
<Name>DTS-UHD Profile 3</Name>
124+
<Definition>DTS-UHD Profile 3 Personalized and Immersive audio as specified in ETSI TS 103 491</Definition>
125+
</Term>
126+
</Term>
127+
</Term>
128+
<Term termID="6">
129+
<Name>MPEG-H 3D Audio</Name>
130+
<Term termID="6.1">
131+
<Name>MPEG-H 3D Audio Low Complexity Profile</Name>
132+
<Term termID="6.1.1">
133+
<Name>MPEG-H 3D Audio Low Complexity Profile @ Level 1</Name>
134+
<Definition>MPEG-H 3D Audio ISO/IEC 23008-3</Definition>
135+
</Term>
136+
<Term termID="6.1.2">
137+
<Name>MPEG-H 3D Audio Low Complexity Profile @ Level 2</Name>
138+
<Definition>MPEG-H 3D Audio ISO/IEC 23008-3</Definition>
139+
</Term>
140+
<Term termID="6.1.3">
141+
<Name>MPEG-H 3D Audio Low Complexity Profile @ Level 3</Name>
142+
<Definition>MPEG-H 3D Audio ISO/IEC 23008-3</Definition>
143+
</Term>
144+
</Term>
145+
</Term>
146+
<Term termID="7">
147+
<Name>AVS3 Part 3 Audio</Name>
148+
<Term termID="7.1">
149+
<Name>AVS3P3 Lossless</Name>
150+
<Definition>AVS3P3 Lossless bitstream as specified in T/AI 109.3</Definition>
151+
</Term>
152+
<Term termID="7.2">
153+
<Name>AVS3P3 General Full Rate</Name>
154+
<Definition>AVS3P3 General Full Rate bitstream as specified in T/AI 109.3</Definition>
155+
<Term id="7.2.1">
156+
<Name>AVS3P3 Channel-based</Name>
157+
<Description>AVS3P3 channel based bitstream</Description>
158+
</Term>
159+
<Term id="7.2.2">
160+
<Name> AVS3P3 Object-based </Name>
161+
<Description>AVS3P3 object based bitstream</Description>
162+
</Term>
163+
<Term id="7.2.3">
164+
<Name> AVS3P3 Channel and Object-based </Name>
165+
<Description>AVS3P3 Combined channel and object bitstream </Description>
166+
</Term>
167+
<Term id="7.2.4">
168+
<Name>AVS3P3 HOA</Name>
169+
<Description>AVS3P3 High Order Ambisonic bitstream</Description>
170+
</Term>
171+
</Term>
172+
</Term>
173+
</ClassificationScheme>

‎metadata/cs/2024/AudioConformancePointsCS.xml‎

Lines changed: 83 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,83 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<ClassificationScheme xmlns="urn:dvb:metadata:schema:dvbCSschema:2007"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
uri="urn:dvb:metadata:cs:AudioConformancePointsCS:2024">
5+
<Term termID="1">
6+
<Name>Broadcast Conformance Points</Name>
7+
<Term termID="1.1">
8+
<Name>Broadcast Receiver Conformance Points</Name>
9+
<Term termID="1.1.1">
10+
<Name>urn:dvb:broadcast:ird:audio:MPEG-1_and_MPEG-2_backwards_compatible</Name>
11+
<Definition>MPEG-1 and MPEG-2 backwards compatible audio as defined in clause 6.1 of ETSI TS 101 154</Definition>
12+
</Term>
13+
<Term termID="1.1.2">
14+
<Name>urn:dvb:broadcast:ird:audio:AC-3_and_enhanced_AC-3</Name>
15+
<Definition>AC-3 and enhanced AC-3 audio as defined in clause 6.2 of ETSI TS 101 154</Definition>
16+
</Term>
17+
<Term termID="1.1.3">
18+
<Name>urn:dvb:broadcast:ird:audio:DTS</Name>
19+
<Definition>DTS audio as defined in clause 6.3 of ETSI TS 101 154</Definition>
20+
</Term>
21+
<Term termID="1.1.4">
22+
<Name>urn:dvb:broadcast:ird:audio:MPEG-4_AAC_family</Name>
23+
<Definition>MPEG-4 AAC, MPEG-4 HE AAC and MPEG-4 HE AAC v2 audio as defined in clause 6.4 of ETSI TS 101 154</Definition>
24+
</Term>
25+
<Term termID="1.1.5">
26+
<Name>urn:dvb:broadcast:ird:audio:AC-4_channel_based</Name>
27+
<Definition>AC-4 channel based audio as defined in clause 6.6 of ETSI TS 101 154</Definition>
28+
</Term>
29+
<Term termID="1.1.6">
30+
<Name>urn:dvb:broadcast:ird:audio:AC-4_channel_based_immersive_personalized</Name>
31+
<Definition>AC-4 for channel-based, immersive and personalized audio as defined in clause 6.7 of ETSI TS 101 154</Definition>
32+
</Term>
33+
<Term termID="1.1.7">
34+
<Name>urn:dvb:broadcast:ird:audio:MPEG-H</Name>
35+
<Definition>MPEG-H audio as defined in clause 6.8 of ETSI TS 101 154</Definition>
36+
</Term>
37+
</Term>
38+
<Term termID="1.2">
39+
<Name>Broadcast Bitstream Conformance Points</Name>
40+
<Term termID="1.2.1">
41+
<Name>urn:dvb:broadcast:bitstream:audio:MPEG-1_and_MPEG-2_backwards_compatible</Name>
42+
<Definition>MPEG-1 and MPEG-2 backwards compatible audio as defined in clause 6.1 of ETSI TS 101 154</Definition>
43+
</Term>
44+
<Term termID="1.2.2">
45+
<Name>urn:dvb:broadcast:bitstream:audio:AC-3_and_enhanced_AC-3</Name>
46+
<Definition>AC-3 and enhanced AC-3 audio as defined in clause 6.2 of ETSI TS 101 154</Definition>
47+
</Term>
48+
<Term termID="1.2.3">
49+
<Name>urn:dvb:broadcast:bitstream:audio:DTS</Name>
50+
<Definition>DTS audio as defined in clause 6.3 of ETSI TS 101 154</Definition>
51+
</Term>
52+
<Term termID="1.2.4">
53+
<Name>urn:dvb:broadcast:bitstream:audio:MPEG-4_AAC_family</Name>
54+
<Definition>MPEG-4 AAC, MPEG-4 HE AAC and MPEG-4 HE AAC v2 audio as defined in clause 6.4 of ETSI TS 101 154</Definition>
55+
</Term>
56+
<Term termID="1.2.5">
57+
<Name>urn:dvb:broadcast:bitstream:audio:AC-4_channel_based</Name>
58+
<Definition>AC-4 channel based audio as defined in clause 6.6 of ETSI TS 101 154</Definition>
59+
</Term>
60+
<Term termID="1.2.6">
61+
<Name>urn:dvb:broadcast:bitstream:audio:AC-4_channel_based_immersive_personalized</Name>
62+
<Definition>AC-4 for channel-based, immersive and personalized audio as defined in clause 6.7 of ETSI TS 101 154</Definition>
63+
</Term>
64+
<Term termID="1.2.7">
65+
<Name>urn:dvb:broadcast:bitstream:audio:MPEG-H</Name>
66+
<Definition>MPEG-H audio as defined in clause 6.8 of ETSI TS 101 154</Definition>
67+
</Term>
68+
<Term termID="1.2.8">
69+
<Name>urn:dvb:broadcast:bitstream:audio:AVS3P3</Name>
70+
<Definition>Channel, Object, Channel+Object or HOA coded audio according to AVS3 Part 3 Audio, T/AI 109.3</Definition>
71+
</Term>
72+
</Term>
73+
</Term>
74+
<Term termID="2">
75+
<Name>DASH Conformance Points</Name>
76+
<Term termID="2.1">
77+
<Name>DASH Player Conformance Points</Name>
78+
</Term>
79+
<Term termID="2.2">
80+
<Name>DASH Bitstream Conformance Points</Name>
81+
</Term>
82+
</Term>
83+
</ClassificationScheme>

‎metadata/cs/AudioCodecCS.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2020/AudioCodecCS.xml
1+
2024/AudioCodecCS.xml

‎metadata/cs/AudioConformancePointsCS.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2017/AudioConformancePointsCS.xml
1+
2024/AudioConformancePointsCS.xml

‎metadata/cs/catalog.xml‎

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -5,49 +5,50 @@
55
<!-- Classification Schemes -->
66
<uri name="urn:dvb:metadata:cs:ParentalGuidanceCS:2005" uri="ParentalGuidanceCS.xml"/>
77
</group>
8+
<group xml:base="2019/">
9+
<!-- Classification Schemes -->
10+
<uri name="urn:dvb:metadata:cs:ContentSubject:2019" uri="DVBContentSubjectCS-2019.xml"/>
11+
<uri name="urn:dvb:metadata:cs:HowRelatedCS:2019" uri="DVBHowRelatedCS-2019.xml"/>
12+
<uri name="urn:dvb:metadata:cs:LinkedApplicationCS:2019" uri="DVBLinkedApplicationCS-2019.xml"/>
13+
<uri name="urn:dvb:metadata:cs:ServiceTypeCS:2019" uri="DVBServiceTypeCS-2019.xml"/>
14+
<uri name="urn:dvb:metadata:cs:RecordingInfoCS:2019" uri="DVBRecordingInfoCS-2019.xml"/>
15+
</group>
816
<group xml:base="2007/">
917
<!-- Classification Schemes -->
10-
<uri name="urn:dvb:metadata:cs:BCGTypeCS:2007" uri="BCGTypeCS.xml"/>
1118
<uri name="urn:dvb:metadata:cs:ParentalGuidanceCS:2007" uri="ParentalGuidanceCS.xml"/>
1219
<uri name="urn:dvb:metadata:cs:AudioCodecCS:2007" uri="AudioCodecCS.xml"/>
20+
<uri name="urn:dvb:metadata:cs:BCGTypeCS:2007" uri="BCGTypeCS.xml"/>
1321
<uri name="urn:dvb:metadata:cs:VideoCodecCS:2007" uri="VideoCodecCS.xml"/>
1422
</group>
1523
<group xml:base="2017/">
1624
<!-- Classification Schemes -->
1725
<uri name="urn:dvb:metadata:cs:VideoConformancePointsCS:2017" uri="VideoConformancePointsCS.xml"/>
1826
<uri name="urn:dvb:metadata:cs:AudioConformancePointsCS:2017" uri="AudioConformancePointsCS.xml"/>
1927
</group>
20-
<group xml:base="2019/">
28+
<group xml:base="2024/">
2129
<!-- Classification Schemes -->
22-
<uri name="urn:dvb:metadata:cs:ContentSubject:2019" uri="DVBContentSubjectCS-2019.xml"/>
23-
<uri name="urn:dvb:metadata:cs:HowRelatedCS:2019" uri="DVBHowRelatedCS-2019.xml"/>
30+
<uri name="urn:dvb:metadata:cs:AudioCodecCS:2024" uri="AudioCodecCS.xml"/>
31+
<uri name="urn:dvb:metadata:cs:AudioConformancePointsCS:2024" uri="AudioConformancePointsCS.xml"/>
2432
<uri name="urn:dvb:metadata:cs:LinkedApplicationCS:2019" uri="DVBLinkedApplicationCS-2019.xml"/>
25-
<uri name="urn:dvb:metadata:cs:RecordingInfoCS:2019" uri="DVBRecordingInfoCS-2019.xml"/>
33+
<uri name="urn:dvb:metadata:cs:HowRelatedCS:2021" uri="DVBHowRelatedCS-2021.xml"/>
34+
</group>
35+
<group xml:base="2022/">
36+
<!-- Classification Schemes -->
37+
<uri name="urn:dvb:metadata:cs:VideoConformancePointsCS:2022" uri="VideoConformancePointsCS.xml"/>
38+
<uri name="urn:dvb:metadata:cs:VideoCodecCS:2022" uri="VideoCodecCS.xml"/>
2639
<uri name="urn:dvb:metadata:cs:ServiceTypeCS:2019" uri="DVBServiceTypeCS-2019.xml"/>
27-
</group>
40+
</group>
2841
<group xml:base="2020/">
2942
<!-- Classification Schemes -->
3043
<uri name="urn:dvb:metadata:cs:AudioCodecCS:2020" uri="AudioCodecCS.xml"/>
31-
<uri name="urn:dvb:metadata:cs:ColorimetryCS:2020" uri="ColorimetryCS.xml"/>
3244
<uri name="urn:dvb:metadata:cs:VideoCodecCS:2020" uri="VideoCodecCS.xml"/>
33-
<uri name="urn:dvb:metadata:cs:HowRelatedCS:2020" uri="DVBHowRelatedCS-2020.xml"/>
45+
<uri name="urn:dvb:metadata:cs:HowRelatedCS:2020" uri="DVBHowRelatedCS-2020.xml"/>
46+
<uri name="urn:dvb:metadata:cs:ColorimetryCS:2020" uri="DVBColorimetryCS-2020.xml"/>
3447
</group>
3548
<group xml:base="2021/">
3649
<!-- Classification Schemes -->
3750
<uri name="urn:dvb:metadata:cs:VideoConformancePointsCS:2021" uri="VideoConformancePointsCS.xml"/>
3851
<uri name="urn:dvb:metadata:cs:VideoCodecCS:2021" uri="VideoCodecCS.xml"/>
39-
<uri name="urn:dvb:metadata:cs:HowRelatedCS:2021" uri="DVBHowRelatedCS-2021.xml"/>
40-
</group>
41-
<group xml:base="2022/">
42-
<!-- Classification Schemes -->
43-
<uri name="urn:dvb:metadata:cs:ServiceTypeCS:2019" uri="DVBServiceTypeCS-2019.xml"/>
44-
<uri name="urn:dvb:metadata:cs:VideoConformancePointsCS:2022" uri="VideoConformancePointsCS.xml"/>
45-
<uri name="urn:dvb:metadata:cs:VideoCodecCS:2022" uri="VideoCodecCS.xml"/>
46-
</group>
47-
<group xml:base="2024/">
48-
<!-- Classification Schemes -->
49-
<uri name="urn:dvb:metadata:cs:ContentSubject:2019" uri="DVBContentSubjectCS-2019.xml"/>
50-
<uri name="urn:dvb:metadata:cs:HowRelatedCS:2022" uri="DVBHowRelatedCS-2021.xml"/>
51-
<uri name="urn:dvb:metadata:cs:LinkedApplicationCS:2022" uri="DVBLinkedApplicationCS-2019.xml"/>
52+
<uri name="urn:dvb:metadata:cs:HowRelatedCS:2021" uri="DVBHowRelatedCS-2021.xml"/>
5253
</group>
5354
</catalog>

‎metadata/ff/catalog.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!DOCTYPE catalog PUBLIC "-//OASIS//DTD XML Catalogs V1.1//EN" "http://www.oasis-open.org/committees/entity/release/1.1/catalog.dtd">
33
<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
4-
<group xml:base="ts_102833v010201p/">
4+
<group xml:base="ts_102833v010101p/">
55
<!-- W3C XML Schemas -->
66
<uri name="urn:dvb:metadata:schema:fileContentItemInformation:2007" uri="FileContentItemDescription.xsd"/>
77
<uri name="urn:dvb:metadata:schema:contentItemInformation:2007" uri="ContentItemInformation.xsd"/>
88
</group>
9-
<group xml:base="ts_102833v010101p/">
9+
<group xml:base="ts_102833v010201p/">
1010
<!-- W3C XML Schemas -->
1111
<uri name="urn:dvb:metadata:schema:fileContentItemInformation:2007" uri="FileContentItemDescription.xsd"/>
1212
<uri name="urn:dvb:metadata:schema:contentItemInformation:2007" uri="ContentItemInformation.xsd"/>

0 commit comments

Comments
 (0)