Merge branch 'master' of https://github.com/iluvcapra/wavinfo

.idea/misc.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.7 (wavinfo)" project-jdk-type="Python SDK" />
+  <component name="PyPackaging">
+    <option name="earlyReleasesAsUpgrades" value="true" />
+  </component>
+</project>

.idea/wavinfo.iml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="PYTHON_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/venv" />
+    </content>
+    <orderEntry type="jdk" jdkName="Python 3.7 (wavinfo)" jdkType="Python SDK" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

.travis.yml

@@ -2,10 +2,11 @@ dist: xenial
 language: python
 python:
 #    - "2.7"
-    - "3.5"
+#    - "3.5"
     - "3.6"
     - "3.7"
     - "3.8"
+    - "3.9"
 script:
     - "gunzip tests/test_files/rf64/*.gz"
     - "python setup.py test"

requirements.txt

@@ -0,0 +1,3 @@
+lxml>=4.6.5
+setuptools~=49.6.0
+ear~=2.0.0

setup.py

@@ -26,12 +26,13 @@ setup(name='wavinfo',
           'License :: OSI Approved :: MIT License',
           'Topic :: Multimedia',
           'Topic :: Multimedia :: Sound/Audio',
-          "Programming Language :: Python :: 3.5",
+#           "Programming Language :: Python :: 3.5",
           "Programming Language :: Python :: 3.6",
           "Programming Language :: Python :: 3.7",
-          "Programming Language :: Python :: 3.8"],
+          "Programming Language :: Python :: 3.8",
+          "Programming Language :: Python :: 3.9"],
       keywords='waveform metadata audio ebu smpte avi library film tv editing editorial',
-      install_requires=['lxml'],
+      install_requires=['lxml', 'ear'],
       entry_points={
           'console_scripts': [
               'wavinfo = wavinfo.__main__:main'

wavinfo/__init__.py

@@ -7,6 +7,6 @@ Go to the documentation for wavinfo.WavInfoReader for more information.
 from .wave_reader import WavInfoReader
 from .riff_parser import WavInfoEOFError
 
-__version__ = '1.6'
+__version__ = '1.6.2'
 __author__ = 'Jamie Hardt <jamiehardt@gmail.com>'
 __license__ = "MIT"

wavinfo/dolby_parser.py

@@ -21,12 +21,15 @@ class _DPPGenericDownMixLevel(Enum):
     MUTE = 0b111
 
 
-class _DPPGenericInUseIndicator(Enum):
+class DPPDolbySurroundEncodingMode(Enum):
     RESERVED = 0b11
     IN_USE = 0b10
     NOT_IN_USE = 0b01
     NOT_INDICATED = 0b00
 
+# DPPLoRoDownMixCenterLevel
+# DPPLtRtCenterMixLevel
+# DPPLtRtSurroundMixLevel
 
 class DolbyMetadataSegmentTypes(IntEnum):
     END_MARKER = 0
@@ -88,13 +91,6 @@ class DPPSurroundDownMixLevel(Enum):
     RESERVED = 0b11
 
 
-class DPPDolbySurroundEncodingMode(_DPPGenericInUseIndicator):
-    """
-    `dsurmod` § 4.3.3.3
-    """
-    pass
-
-
 class DPPLanguageCode(Enum):
     """
     § 4.3.4.1 , 4.3.5 (always 0xFF)
@@ -122,20 +118,6 @@ class DPPRoomTime(Enum):
     RESERVED = 0b11
 
 
-class DPPLoRoDownMixCenterLevel(_DPPGenericDownMixLevel):
-    """
-    `lorocmixlev` § 4.3.7.1
-    """
-    pass
-
-
-class DPPLoRoDownMixSurroundLevel(_DPPGenericDownMixLevel):
-    """
-    `lorosurmixlev` 4.3.7.2
-    """
-    pass
-
-
 class DPPPreferredDownMixMode(Enum):
     """
     § 4.3.8.1
@@ -146,20 +128,20 @@ class DPPPreferredDownMixMode(Enum):
     PRO_LOGIC_2 = 0b11
 
 
-class DPPLtRtCenterMixLevel(_DPPGenericDownMixLevel):
-    pass
-
-
-class DPPLtRtSurroundMixLevel(_DPPGenericDownMixLevel):
-    pass
-
-
-class DPPSurroundEXMode(_DPPGenericInUseIndicator):
-    pass
-
-
-class DPPHeadphoneMode(_DPPGenericInUseIndicator):
-    pass
+# class DPPLtRtCenterMixLevel(_DPPGenericDownMixLevel):
+#     pass
+#
+#
+# class DPPLtRtSurroundMixLevel(_DPPGenericDownMixLevel):
+#     pass
+#
+#
+# class DPPSurroundEXMode(_DPPGenericInUseIndicator):
+#     pass
+#
+#
+# class DPPHeadphoneMode(_DPPGenericInUseIndicator):
+#     pass
 
 
 class DPPADConverterType(Enum):

wavinfo/wave_axml_reader.py

@@ -0,0 +1,9 @@
+from lxml import etree as ET
+from collections import namedtuple
+
+from ear.fileio.bw64 import Bw64Reader
+
+
+
+
+

wavinfo/wave_ixml_reader.py

@@ -1,4 +1,3 @@
-# import xml.etree.ElementTree as ET
 from lxml import etree as ET
 import io
 from collections import namedtuple