ebu · tomjnixon · Dec 15, 2022 · Dec 7, 2022 · Dec 12, 2022 · Dec 14, 2022
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,7 @@
 
 ### Changed
 - Added a warning for audioBlockFormats which have a duration but no rtime; previously these were fixed silently. See [#54].
+- Removed the development config file mechanism, as it is no longer required and was not used.
 
 ## [2.1.0] - 2022-01-26
 

diff --git a/ear/cmdline/dev_config.py b/ear/cmdline/dev_config.py
diff --git a/ear/cmdline/render_file.py b/ear/cmdline/render_file.py
@@ -4,6 +4,8 @@
 import scipy.sparse
 from itertools import chain
 from ..core import bs2051, layout, Renderer
+from ..core import hoa_overloads  # noqa: F401
+from ..core.hoa_adapter import HOAFormat
 from ..core.monitor import PeakMonitor
 from ..core.metadata_processing import preprocess_rendering_items, convert_objects_to_cartesian, convert_objects_to_polar
 from ..core.select_items import select_rendering_items
@@ -12,6 +14,7 @@
 from ..fileio.bw64.chunks import FormatInfoChunk
 from ..fileio.adm import timing_fixes
 import logging
+import textwrap
 from .error_handler import error_handler
 
 
@@ -37,13 +40,34 @@ class OfflineRenderDriver(object):
 
     blocksize = 8192
 
+    @classmethod
+    def get_systems_help(cls):
+        formats_string = ", ".join(bs2051.layout_names)
+
+        from ..core import hoa
+        norm_names = ", ".join(hoa.norm_functions)
+
+        text = f"""\
+        output system, accoring to ITU-R BS.2051
+
+        available systems:
+        {formats_string}
+
+        HOA output can be specified as "hoa_norm_order_n" or "ambix_n" where:
+        - norm is the normalization style, one of {norm_names}
+        - order is the channel order, currently only ACN
+        - n is the maximum order (e.g. 1 for first-order)
+
+        ambix_n is equivalent to hoa_SN3D_ACN_n
+        """
+
+        return textwrap.dedent(text)
+
     @classmethod
     def add_args(cls, parser):
         """Add arguments to an ArgumentParser that can be used by from_args."""
-        formats_string = ", ".join(bs2051.layout_names)
         parser.add_argument("-s", "--system", required=True, metavar="target_system",
-                            help="Target output system, accoring to ITU-R BS.2051. "
-                                 "Available systems are: {}".format(formats_string))
+                            help=cls.get_systems_help())
 
         parser.add_argument("-l", "--layout", type=argparse.FileType("r"), metavar="layout_file",
                             help="Layout config file")
@@ -83,6 +107,10 @@ def load_output_layout(self):
             upmix (sparse array or None): optional matrix to apply after rendering
             n_channels (int): number of channels required in output file
         """
+        spkr_layout = HOAFormat.parse_or_none(self.target_layout)
+        if spkr_layout is not None:
+            return spkr_layout, None, spkr_layout.num_channels
+
         spkr_layout = bs2051.get_layout(self.target_layout)
 
         if self.speakers_file is not None:
@@ -215,7 +243,7 @@ def run(self, input_file, output_file):
 
 
 def make_parser():
-    parser = argparse.ArgumentParser(description="EBU ADM renderer")
+    parser = argparse.ArgumentParser(description="EBU ADM renderer", formatter_class=argparse.RawTextHelpFormatter)
 
     parser.add_argument("-d", "--debug",
                         help="print debug information when an error occurs",
@@ -245,5 +273,6 @@ def main():
     with error_handler(logger, debug=args.debug, strict=args.strict):
         OfflineRenderDriver.from_args(args).run(args.input_file, args.output_file)
 
+
 if __name__ == "__main__":
     main()
diff --git a/ear/core/allocentric.py b/ear/core/allocentric.py
@@ -39,6 +39,11 @@ def _screen_spk_position_to_cart(position):
     return pos_left * [np.sign(position.azimuth), 1.0, 1.0]
 
 
+def positions_defined(layout) -> bool:
+    """are allocentric positions defined for the given layout?"""
+    return layout.name in _allo_positions
+
+
 def positions_for_layout(layout):
     layout_positions = _allo_positions[layout.name]
 
@@ -52,6 +57,14 @@ def get_position(channel):
                      for channel in layout.channels])
 
 
+def positions_for_layout_if_defined(layout):
+    """get allocentric positions for layout if they are defined, or None
+    otherwise
+    """
+    if positions_defined(layout):
+        return positions_for_layout(layout)
+
+
 def get_excluded(channel_positions, is_excluded):
     is_excluded = np.copy(is_excluded)
 

diff --git a/ear/core/bs2051.py b/ear/core/bs2051.py
@@ -1,7 +1,7 @@
 import pkg_resources
 from ..compatibility import load_yaml
 from .geom import PolarPosition
-from .layout import Channel, Layout
+from .layout import Channel, Layout, LayoutStyle
 
 
 def _dict_to_channel(d):
@@ -23,6 +23,7 @@ def _dict_to_layout(d):
     return Layout(
         name=d["name"],
         channels=list(map(_dict_to_channel, d["channels"])),
+        style=LayoutStyle.__members__[d.get("style", "ITU")],
     )
 
 

diff --git a/ear/core/data/N003_M6_Octa.dat b/ear/core/data/N003_M6_Octa.dat
@@ -0,0 +1,8 @@
+3
+6
+1	0	0
+0	1	0
+0	0	1
+-1	0	0
+0	-1	0
+0	0	-1
diff --git a/ear/core/data/N005_M12_Ico.dat b/ear/core/data/N005_M12_Ico.dat
@@ -0,0 +1,14 @@
+3
+12
+0.8506508083520399	0.5257311121191336	0
+0.8506508083520399	-0.5257311121191336	0
+-0.8506508083520399	0.5257311121191336	0
+-0.8506508083520399	-0.5257311121191336	0
+0	0.8506508083520399	0.5257311121191336
+0	0.8506508083520399	-0.5257311121191336
+0	-0.8506508083520399	0.5257311121191336
+0	-0.8506508083520399	-0.5257311121191336
+0.5257311121191336	0	0.8506508083520399
+-0.5257311121191336	0	0.8506508083520399
+0.5257311121191336	0	-0.8506508083520399
+-0.5257311121191336	0	-0.8506508083520399
diff --git a/ear/core/data/N007_M24_Octa.dat b/ear/core/data/N007_M24_Octa.dat
@@ -0,0 +1,26 @@
+3
+24
+0.86624681811 0.42251865376 0.26663540152
+0.86624681811 0.26663540152 -0.42251865376
+-0.26663540152 0.42251865376 0.86624681811
+0.42251865376 -0.86624681811 0.26663540152
+0.86624681811 -0.26663540152 0.42251865376
+0.26663540152 0.42251865376 -0.86624681811
+-0.42251865376 0.86624681811 0.26663540152
+0.42251865376 0.26663540152 0.86624681811
+0.42251865376 -0.26663540152 -0.86624681811
+-0.42251865376 -0.26663540152 0.86624681811
+-0.42251865376 0.26663540152 -0.86624681811
+0.26663540152 0.86624681811 0.42251865376
+-0.26663540152 0.86624681811 -0.42251865376
+0.26663540152 -0.86624681811 -0.42251865376
+-0.26663540152 -0.86624681811 0.42251865376
+0.86624681811 -0.42251865376 -0.26663540152
+-0.86624681811 0.42251865376 -0.26663540152
+-0.86624681811 -0.42251865376 0.26663540152
+0.42251865376 0.86624681811 -0.26663540152
+-0.42251865376 -0.86624681811 -0.26663540152
+-0.86624681811 0.26663540152 0.42251865376
+-0.86624681811 -0.26663540152 -0.42251865376
+0.26663540152 -0.42251865376 0.86624681811
+-0.26663540152 -0.42251865376 -0.86624681811
diff --git a/ear/core/data/N009_M48_Octa.dat b/ear/core/data/N009_M48_Octa.dat
@@ -0,0 +1,50 @@
+3
+48
+0.70684169771 0.63974009862 0.30184005797
+0.35354218892 0.9333646932 0.061953774232
+0.70684169771 0.30184005797 -0.63974009862
+0.35354218892 0.061953774232 -0.9333646932
+-0.30184005797 0.63974009862 0.70684169771
+-0.061953774232 0.9333646932 0.35354218892
+0.63974009862 -0.70684169771 0.30184005797
+0.9333646932 -0.35354218892 0.061953774232
+0.70684169771 -0.30184005797 0.63974009862
+0.35354218892 -0.061953774232 0.9333646932
+0.30184005797 0.63974009862 -0.70684169771
+0.061953774232 0.9333646932 -0.35354218892
+-0.63974009862 0.70684169771 0.30184005797
+-0.9333646932 0.35354218892 0.061953774232
+0.63974009862 0.30184005797 0.70684169771
+0.9333646932 0.061953774232 0.35354218892
+0.63974009862 -0.30184005797 -0.70684169771
+0.9333646932 -0.061953774232 -0.35354218892
+-0.63974009862 -0.30184005797 0.70684169771
+-0.9333646932 -0.061953774232 0.35354218892
+-0.63974009862 0.30184005797 -0.70684169771
+-0.9333646932 0.061953774232 -0.35354218892
+0.30184005797 0.70684169771 0.63974009862
+0.061953774232 0.35354218892 0.9333646932
+-0.30184005797 0.70684169771 -0.63974009862
+-0.061953774232 0.35354218892 -0.9333646932
+0.30184005797 -0.70684169771 -0.63974009862
+0.061953774232 -0.35354218892 -0.9333646932
+-0.30184005797 -0.70684169771 0.63974009862
+-0.061953774232 -0.35354218892 0.9333646932
+0.70684169771 -0.63974009862 -0.30184005797
+0.35354218892 -0.9333646932 -0.061953774232
+-0.70684169771 0.63974009862 -0.30184005797
+-0.35354218892 0.9333646932 -0.061953774232
+-0.70684169771 -0.63974009862 0.30184005797
+-0.35354218892 -0.9333646932 0.061953774232
+0.63974009862 0.70684169771 -0.30184005797
+0.9333646932 0.35354218892 -0.061953774232
+-0.63974009862 -0.70684169771 -0.30184005797
+-0.9333646932 -0.35354218892 -0.061953774232
+-0.70684169771 0.30184005797 0.63974009862
+-0.35354218892 0.061953774232 0.9333646932
+-0.70684169771 -0.30184005797 -0.63974009862
+-0.35354218892 -0.061953774232 -0.9333646932
+0.30184005797 -0.63974009862 0.70684169771
+0.061953774232 -0.9333646932 0.35354218892
+-0.30184005797 -0.63974009862 -0.70684169771
+-0.061953774232 -0.9333646932 -0.35354218892
diff --git a/ear/core/data/N011_M70_C5.dat b/ear/core/data/N011_M70_C5.dat
@@ -0,0 +1,72 @@
+3
+70
+0.34697401547 0.92871517263 0.13075611159
+0.30826763892 0.86359439267 -0.39896840445
+0.19846719975 -0.64131193892 0.74116784038
+0.0055580704907 0.98569909422 -0.16842328672
+-0.53557664796 0.83430239928 -0.13075611159
+0.73865905916 -0.65269931117 0.16842328672
+0.87676666988 0.1789933757 0.44636484857
+0.84933311523 -0.34562620217 0.39896840445
+0.61802851007 -0.2621278183 -0.74116784038
+-0.18511501171 -0.275682451 -0.94325586065
+-0.71379207496 -0.010481253665 0.70027924219
+0.082409348656 0.70909638429 -0.70027924219
+-0.32890958018 0.045682265894 0.94325586065
+0.71771459795 0.5344568999 -0.44636484857
+0.9904814841 -0.043003127119 0.13075611159
+0.91658701382 -0.026314603177 -0.39896840445
+-0.54859416094 -0.38692981141 0.74116784038
+0.9391730849 0.2993117323 -0.16842328672
+0.62796644739 0.76717728084 -0.13075611159
+-0.39249573074 -0.90420169091 0.16842328672
+0.44116861743 -0.77854265969 0.44636484857
+-0.066251685284 -0.91456816391 0.39896840445
+-0.058317057073 -0.66878199231 -0.74116784038
+-0.31939327598 0.090864275742 -0.94325586065
+-0.23054214621 0.67561771866 0.70027924219
+0.69985662619 0.14074688535 -0.70027924219
+-0.058192233229 0.326928196 0.94325586065
+0.73008472521 -0.51743088039 -0.44636484857
+0.26517720693 -0.95529256681 0.13075611159
+0.25821428927 -0.87985771183 -0.39896840445
+-0.53751703724 0.40217616421 0.74116784038
+0.5748828173 -0.80071427043 -0.16842328672
+0.92368125624 -0.36016076432 -0.13075611159
+-0.9812347612 0.093871933508 0.16842328672
+-0.60410946954 -0.66015920108 0.44636484857
+-0.89027890855 -0.21960800816 0.39896840445
+-0.65407043346 -0.15120218401 -0.74116784038
+-0.012280888625 0.33183966177 -0.94325586065
+0.57130919276 0.4280359672 0.70027924219
+0.35012583358 -0.62211002533 -0.70027924219
+0.29294480216 0.15637047111 0.94325586065
+-0.26649742311 -0.85424677081 -0.44636484857
+-0.82659295717 -0.54740014837 0.13075611159
+-0.75700180667 -0.517467368 -0.39896840445
+0.2163903624 0.63548835036 0.74116784038
+-0.58387596426 -0.7941803667 -0.16842328672
+-0.057100036259 -0.98976887461 -0.13075611159
+-0.21394070262 0.96221773641 0.16842328672
+-0.81452880253 0.37054183544 0.44636484857
+-0.48397093966 0.77884295067 0.39896840445
+-0.34592070184 0.57533390341 -0.74116784038
+0.3118032694 0.11422391405 -0.94325586065
+0.58363064542 -0.41107694253 0.70027924219
+-0.4834669607 -0.52523202575 -0.70027924219
+0.23924207779 -0.23028593001 0.94325586065
+-0.8947891906 -0.01052265875 -0.44636484857
+-0.77603974933 0.61698066967 0.13075611159
+-0.72606713534 0.56004529034 -0.39896840445
+0.67125363604 -0.0094227642326 0.74116784038
+-0.93573800843 0.30988381061 -0.16842328672
+-0.9589710194 -0.25155004119 -0.13075611159
+0.8490121354 0.50081133217 0.16842328672
+0.10070298476 0.88916664964 0.44636484857
+0.59116841827 0.70095942357 0.39896840445
+0.44027968231 0.5067780912 -0.74116784038
+0.20498590692 -0.26124540056 -0.94325586065
+-0.21060561702 -0.68209548967 0.70027924219
+-0.64892484773 0.29749878144 -0.70027924219
+-0.14508506654 -0.29869500299 0.94325586065
+-0.28651270945 0.84774341005 -0.44636484857
-Original file line number
+Diff line change
@@ -0,0 +1,8 @@
+	0	0
+	1	0
+	0	1
+    -1	0	0
+	-1	0
+	0	-1