jamie/wavinfo
1
0
Fork 0
mirror of https://github.com/iluvcapra/wavinfo.git synced 2025-12-31 08:50:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

ADM impl

Browse Source
This commit is contained in:
Jamie Hardt
2022-11-23 06:29:07 +00:00
parent 1eca249ba4
commit 68c75fc43f
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
wavinfo/wave_axml_reader.py → wavinfo/wave_adm_reader.py
View File

@@ -4,6 +4,7 @@ ADM Reader
from struct import unpack, unpack_from, calcsize
from dataclasses import dataclass
from io import BytesIO
from lxml import etree as ET
@@ -26,7 +27,7 @@ class ChannelEntry:
"audioPackFormatID"
class WavAxmlReader:
class WavADMReader:
"""
Reads XML data from an EBU ADM (Audio Definiton Model) WAV File.
"""
@@ -35,7 +36,7 @@ class WavAxmlReader:
header_fmt = "<HH"
uid_fmt = "<H12s14s11sx"
self.axml = ET.fromstring(axml_data)
self.axml = ET.parse(BytesIO(axml_data))
self.track_count, uid_count = unpack(header_fmt, chna_data)

8
wavinfo/wave_reader.py
View File

@@ -9,7 +9,7 @@ from .riff_parser import parse_chunk, ChunkDescriptor, ListChunkDescriptor
from .wave_ixml_reader import WavIXMLFormat
from .wave_bext_reader import WavBextReader
from .wave_info_reader import WavInfoChunkReader
from .wave_axml_reader import WavAxmlReader
from .wave_adm_reader import WavADMReader
#: Calculated statistics about the audio data.
WavDataDescriptor = namedtuple('WavDataDescriptor', 'byte_count frame_count')
@@ -77,7 +77,7 @@ class WavInfoReader:
self.ixml = self._get_ixml(wavfile)
#: :class:`wavinfo.wave_axml_reader.WavAxmlReader` with ADM metadata
self.adm = self._get_axml(wavfile)
self.adm = self._get_adm(wavfile)
#: :class:`wavinfo.wave_info_reader.WavInfoChunkReader` with RIFF INFO metadata
self.info = self._get_info(wavfile, encoding=self.info_encoding)
@@ -134,10 +134,10 @@ class WavInfoReader:
bext_data = self._find_chunk_data(b'bext', f, default_none=True)
return WavBextReader(bext_data, encoding) if bext_data else None
def _get_axml(self, f):
def _get_adm(self, f):
axml = self._find_chunk_data(b'axml', f, default_none=True)
chna = self._find_chunk_data(b'chna', f, default_none=True)
return WavAxmlReader(axml_data=axml, chna_data=chna)
return WavADMReader(axml_data=axml, chna_data=chna) if axml and chna else None
def _get_ixml(self, f):
ixml_data = self._find_chunk_data(b'iXML', f, default_none=True)