Nudged version to 1.6.3

Version 1.6.2

.idea/.gitignore

@@ -1,3 +0,0 @@
-
-# Default ignored files
-/workspace.xml

.idea/dictionaries/jamiehardt.xml

@@ -1,9 +0,0 @@
-<component name="ProjectDictionaryState">
-  <dictionary name="jamiehardt">
-    <words>
-      <w>bext</w>
-      <w>ident</w>
-      <w>umid</w>
-    </words>
-  </dictionary>
-</component>

.idea/inspectionProfiles/profiles_settings.xml

@@ -1,6 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <settings>
-    <option name="USE_PROJECT_PROFILE" value="false" />
-    <version value="1.0" />
-  </settings>
-</component>

.idea/misc.xml

@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.8 (wavinfo)" project-jdk-type="Python SDK" />
+  <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/modules.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/wavinfo.iml" filepath="$PROJECT_DIR$/.idea/wavinfo.iml" />
-    </modules>
-  </component>
-</project>

.idea/vcs.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="Git" />
-  </component>
-</project>

.idea/wavinfo.iml

@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module type="PYTHON_MODULE" version="4">
   <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$" />
-    <orderEntry type="jdk" jdkName="Python 3.8 (wavinfo)" jdkType="Python SDK" />
+    <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>

.idea/workspace.xml

@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ChangeListManager">
+    <list default="true" id="fb29ad56-fffe-478f-9c0e-1718aa04342e" name="Default Changelist" comment="">
+      <change beforePath="$PROJECT_DIR$/.idea/dictionaries/jamiehardt.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dictionaries/jamiehardt.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/wavinfo.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/wavinfo.iml" afterDir="false" />
+    </list>
+    <option name="SHOW_DIALOG" value="false" />
+    <option name="HIGHLIGHT_CONFLICTS" value="true" />
+    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
+    <option name="LAST_RESOLUTION" value="IGNORE" />
+  </component>
+  <component name="FavoritesManager">
+    <favorites_list name="wavinfo" />
+  </component>
+  <component name="FileTemplateManagerImpl">
+    <option name="RECENT_TEMPLATES">
+      <list>
+        <option value="Python Script" />
+      </list>
+    </option>
+  </component>
+  <component name="Git.Settings">
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
+    <option name="UPDATE_TYPE" value="MERGE" />
+  </component>
+  <component name="ProjectId" id="1VtfP9ukGK4GNIXS2m0hRLG9d7w" />
+  <component name="ProjectViewState">
+    <option name="hideEmptyMiddlePackages" value="true" />
+    <option name="showLibraryContents" value="true" />
+    <option name="showMembers" value="true" />
+  </component>
+  <component name="PropertiesComponent">
+    <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
+    <property name="TODO_SCOPE" value="Project Files" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
+    <property name="settings.editor.selected.configurable" value="com.jetbrains.python.configuration.PyActiveSdkModuleConfigurable" />
+  </component>
+  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="project-level" UseSingleDictionary="true" transferred="true" />
+  <component name="SvnConfiguration">
+    <configuration />
+  </component>
+  <component name="TaskManager">
+    <task active="true" id="Default" summary="Default task">
+      <changelist id="fb29ad56-fffe-478f-9c0e-1718aa04342e" name="Default Changelist" comment="" />
+      <created>1578077284420</created>
+      <option name="number" value="Default" />
+      <option name="presentableId" value="Default" />
+      <updated>1578077284420</updated>
+    </task>
+    <servers />
+  </component>
+  <component name="Vcs.Log.History.Properties">
+    <option name="COLUMN_ORDER">
+      <list>
+        <option value="0" />
+        <option value="2" />
+        <option value="3" />
+        <option value="1" />
+      </list>
+    </option>
+  </component>
+  <component name="Vcs.Log.Tabs.Properties">
+    <option name="TAB_STATES">
+      <map>
+        <entry key="MAIN">
+          <value>
+            <State />
+          </value>
+        </entry>
+      </map>
+    </option>
+    <option name="oldMeFiltersMigrated" value="true" />
+  </component>
+  <component name="WindowStateProjectService">
+    <state x="655" y="287" key="#com.intellij.openapi.updateSettings.impl.PluginUpdateInfoDialog" timestamp="1598547965709">
+      <screen x="0" y="0" width="1920" height="1080" />
+    </state>
+    <state x="655" y="287" key="#com.intellij.openapi.updateSettings.impl.PluginUpdateInfoDialog/1920.0.1920.1080/0.0.1920.1080/3840.0.1920.1080@0.0.1920.1080" timestamp="1598547965709" />
+    <state x="0" y="0" key="#com.intellij.refactoring.rename.AutomaticRenamingDialog" timestamp="1598555737671">
+      <screen x="0" y="0" width="1920" height="1080" />
+    </state>
+    <state x="0" y="0" key="#com.intellij.refactoring.rename.AutomaticRenamingDialog/1920.0.1920.1080/0.0.1920.1080/3840.0.1920.1080@0.0.1920.1080" timestamp="1598555737671" />
+    <state x="476" y="183" key="SettingsEditor" timestamp="1598548365517">
+      <screen x="0" y="0" width="1920" height="1080" />
+    </state>
+    <state x="476" y="183" key="SettingsEditor/1920.0.1920.1080/0.0.1920.1080/3840.0.1920.1080@0.0.1920.1080" timestamp="1598548365517" />
+    <state x="114" y="123" width="1706" height="842" key="com.intellij.history.integration.ui.views.FileHistoryDialog" timestamp="1597689482054">
+      <screen x="0" y="0" width="1920" height="1080" />
+    </state>
+    <state x="114" y="123" width="1706" height="842" key="com.intellij.history.integration.ui.views.FileHistoryDialog/1920.0.1920.1080/0.0.1920.1080/3840.0.1920.1080@0.0.1920.1080" timestamp="1597689482054" />
+    <state x="577" y="376" key="com.intellij.ide.util.TipDialog" timestamp="1601767353495">
+      <screen x="0" y="0" width="1920" height="1080" />
+    </state>
+    <state x="577" y="376" key="com.intellij.ide.util.TipDialog/1920.0.1920.1080/0.0.1920.1080/3840.0.1920.1080@0.0.1920.1080" timestamp="1598550975228" />
+    <state x="577" y="376" key="com.intellij.ide.util.TipDialog/1920.0.1920.1080/0.0.1920.1080@0.0.1920.1080" timestamp="1601767353495" />
+    <state x="772" y="468" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2" timestamp="1598547948993">
+      <screen x="0" y="0" width="1920" height="1080" />
+    </state>
+    <state x="772" y="468" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2/1920.0.1920.1080/0.0.1920.1080/3840.0.1920.1080@0.0.1920.1080" timestamp="1598547948993" />
+    <state x="632" y="254" width="670" height="676" key="search.everywhere.popup" timestamp="1598554315633">
+      <screen x="0" y="0" width="1920" height="1080" />
+    </state>
+    <state x="632" y="254" width="670" height="676" key="search.everywhere.popup/1920.0.1920.1080/0.0.1920.1080/3840.0.1920.1080@0.0.1920.1080" timestamp="1598554315633" />
+  </component>
+</project>

.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,14 @@ 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",
+          "Programming Language :: Python :: 3.10"],
       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.3'
 __author__ = 'Jamie Hardt <jamiehardt@gmail.com>'
 __license__ = "MIT"

wavinfo/dolby_parser.py

@@ -0,0 +1,188 @@
+# Dolby RMU Metadata per EBU Tech 3285 Supp 6
+#
+# https://tech.ebu.ch/docs/tech/tech3285s6.pdf
+#
+
+from struct import unpack, calcsize
+from enum import (Enum, IntEnum)
+
+CHUNK_IDENT = "dbmd"
+DOLBY_VERSION = "1.0.0.6"
+
+
+class _DPPGenericDownMixLevel(Enum):
+    PLUS_3DB = 0b000
+    PLUS_1_5DB = 0b001
+    UNITY = 0b010
+    MINUS_1_5DB = 0b011
+    MINUS_3DB = 0b100
+    MINUS_4_5DB = 0b101
+    MINUS_6DB = 0b110
+    MUTE = 0b111
+
+
+class DPPDolbySurroundEncodingMode(Enum):
+    RESERVED = 0b11
+    IN_USE = 0b10
+    NOT_IN_USE = 0b01
+    NOT_INDICATED = 0b00
+
+# DPPLoRoDownMixCenterLevel
+# DPPLtRtCenterMixLevel
+# DPPLtRtSurroundMixLevel
+
+class DolbyMetadataSegmentTypes(IntEnum):
+    END_MARKER = 0
+    DOLBY_E_METADATA = 1
+    DOLBY_DIGITAL_METADATA = 3
+    DOLBY_DIGITAL_PLUS_METADATA = 7
+    AUDIO_INFO = 8
+
+
+class DDPBitStreamMode(Enum):
+    """
+    Dolby Digital Plus `bsmod` field
+    § 4.3.2.2
+    """
+    COMPLETE_MAIN = 0b000
+    MUSIC_AND_EFFECTS = 0b001
+    VISUALLY_IMPAIRED = 0b010
+    HEARING_IMPAIRED = 0b011
+    DIALOGUE_ONLY = 0b100
+    COMMENTARY = 0b101
+    EMERGENCY = 0b110
+    VOICEOVER = 0b111 # if audioconfigmode is 1_0
+    KARAOKE = 0b1000  # if audioconfigmode is not 1_0
+
+
+class DDPAudioCodingMode(Enum):
+    """
+    Dolby Digital Plus `acmod` field
+    § 4.3.2.3
+    """
+    RESERVED = 0b000
+    CH_ORD_1_0 = 0b001
+    CH_ORD_2_0 = 0b010
+    CH_ORD_3_0 = 0b011
+    CH_ORD_2_1 = 0b100
+    CH_ORD_3_1 = 0b101
+    CH_ORD_2_2 = 0b110
+    CH_ORD_3_2 = 0b111
+
+
+class DPPCenterDownMixLevel(Enum):
+    """
+    § 4.3.3.1
+    """
+    DOWN_3DB = 0b00
+    DOWN_45DB = 0b01
+    DOWN_6DB = 0b10
+    RESERVED = 0b11
+
+
+class DPPSurroundDownMixLevel(Enum):
+    """
+    Dolby Digital Plus `surmixlev` field
+    § 4.3.3.2
+    """
+    DOWN_3DB = 0b00
+    DOWN_6DB = 0b01
+    MUTE = 0b10
+    RESERVED = 0b11
+
+
+class DPPLanguageCode(Enum):
+    """
+    § 4.3.4.1 , 4.3.5 (always 0xFF)
+    """
+    # this is removed in https://www.atsc.org/wp-content/uploads/2015/03/A52-201212-17.pdf § 5.4.2.12
+    # It should just be 0xff
+    pass
+
+
+class DPPMixLevel(int):
+    pass
+
+
+class DPPDialnormLevel(int):
+    pass
+
+
+class DPPRoomTime(Enum):
+    """
+    `roomtyp` 4.3.6.3
+    """
+    NOT_INDICATED = 0b00
+    LARGE_ROOM_X_CURVE = 0b01
+    SMALL_ROOM_FLAT_CURVE = 0b10
+    RESERVED = 0b11
+
+
+class DPPPreferredDownMixMode(Enum):
+    """
+    § 4.3.8.1
+    """
+    NOT_INDICATED = 0b00
+    PRO_LOGIC = 0b01
+    STEREO = 0b10
+    PRO_LOGIC_2 = 0b11
+
+
+# class DPPLtRtCenterMixLevel(_DPPGenericDownMixLevel):
+#     pass
+#
+#
+# class DPPLtRtSurroundMixLevel(_DPPGenericDownMixLevel):
+#     pass
+#
+#
+# class DPPSurroundEXMode(_DPPGenericInUseIndicator):
+#     pass
+#
+#
+# class DPPHeadphoneMode(_DPPGenericInUseIndicator):
+#     pass
+
+
+class DPPADConverterType(Enum):
+    STANDARD = 0
+    HDCD = 1
+
+
+class DDPStreamDependency(Enum):
+    """
+    Encodes `ddplus_info1.stream_type` field § 4.3.12.1
+    """
+    INDEPENDENT = 0
+    DEPENDENT = 1
+    INDEPENDENT_FROM_DOLBY_DIGITAL = 2
+    RESERVED = 3
+
+
+class DDPDataRate(int):
+    pass
+
+
+class DPPRFCompressionProfile(Enum):
+    NONE = 0
+    FILM_STANDARD = 1
+    FILM_LIGHT = 2
+    MUSIC_STANDARD = 3
+    MUSIC_LIGHT = 4
+    SPEECH = 5
+
+
+class DolbyDigitalPlusMetadata:
+
+    @classmethod
+    def parse(cls, binary_data):
+        binary_format = "<BBxxBBBBBBBBBBBBBxxxBxxxxxH"
+        assert len(binary_data >= calcsize(binary_format))
+        fields = unpack(binary_format, binary_data)
+
+
+class WavDolbyReader:
+    def __init__(self, dolby_data):
+        version, remainder = unpack("<U", dolby_data[0]), dolby_data[1:]
+
+        ## FIXME continues...

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

wavinfo/wave_reader.py

@@ -1,7 +1,6 @@
 #-*- coding: utf-8 -*-
 import struct
 import os
-import sys
 from collections import namedtuple
 
 import pathlib