diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..ba4550d --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/.idea/wavinfo.iml b/.idea/wavinfo.iml new file mode 100644 index 0000000..23b4337 --- /dev/null +++ b/.idea/wavinfo.iml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index fd3334a..1207669 100644 --- a/.travis.yml +++ b/.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" diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 0000000..d66dfb8 --- /dev/null +++ b/requirements.txt @@ -0,0 +1,3 @@ +lxml>=4.6.5 +setuptools~=49.6.0 +ear~=2.0.0 diff --git a/setup.py b/setup.py index 4913c23..d8e3987 100644 --- a/setup.py +++ b/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' diff --git a/wavinfo/__init__.py b/wavinfo/__init__.py index 571a434..44f7ace 100644 --- a/wavinfo/__init__.py +++ b/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 ' __license__ = "MIT" diff --git a/wavinfo/dolby_parser.py b/wavinfo/dolby_parser.py index f70abeb..220c0ed 100644 --- a/wavinfo/dolby_parser.py +++ b/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): diff --git a/wavinfo/wave_axml_reader.py b/wavinfo/wave_axml_reader.py new file mode 100644 index 0000000..eb07289 --- /dev/null +++ b/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 + + + + + diff --git a/wavinfo/wave_ixml_reader.py b/wavinfo/wave_ixml_reader.py index d086d50..042a17d 100644 --- a/wavinfo/wave_ixml_reader.py +++ b/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