xml: don't parse ADM elements outside audioFormatExtended

CHANGELOG.md

@@ -5,6 +5,7 @@
 ### Fixed
 - Padding after data chunks in bw64 files was not written, and this error was silently ignored in the reader. This can be fixed with the new `ear-utils rewrite` command.
 - Mutable default parameters in ADMBuilder could cause unexpected extra blocks to be added when this was used from other programs.
+- ADM elements outside the `audioFormatExtended` were parsed, causing errors for some files containing non-standard ADM data.
 
 ### Changed
 - Added a warning for audioBlockFormats which have a duration but no rtime; previously these were fixed silently. See [#54].

ear/fileio/adm/test/test_xml.py

@@ -1637,3 +1637,13 @@ def test_defaults(version):
         with open(defaults_file, "w") as f:
             f.write(xml_str)
         pytest.skip("generated defaults file")
+
+
+def test_ignore_outside_audioFormatExtended(base):
+    """check that ADM-defined objects are only found in audioFormatExtended"""
+    [apr] = base.xml.xpath("//adm:audioProgramme", namespaces=nsmap)
+    adm = base.adm_after_mods(
+        add_children("//adm:format", E.notAudioFormatExtended(deepcopy(apr)))
+    )
+
+    assert len(adm.audioProgrammes) == 1

ear/fileio/adm/xml.py

@@ -1988,7 +1988,7 @@ def parse_adm_elements(self, adm, element, common_definitions=False):
         for element_t in self.main_elements:
             parse_func = element_t.handler.parse
 
-            for sub_element in xpath(element, "//{ns}" + element_t.name):
+            for sub_element in xpath(element, ".//{ns}" + element_t.name):
                 adm_element = parse_func(sub_element)
 
                 if common_definitions:
@@ -2025,7 +2025,7 @@ def default_get_main_elements_handler(version: Version) -> MainElementHandler:
 
 def find_audioFormatExtended(element: lxml.etree._Element):
     """find the audioFormatExtended tag"""
-    afe_elements = list(xpath(element, "//{ns}audioFormatExtended"))
+    afe_elements = list(xpath(element, ".//{ns}audioFormatExtended"))
     if len(afe_elements) == 0:
         raise ValueError("no audioFormatExtended elements found")
     elif len(afe_elements) > 1: