jamie/wavinfo
1
0
Fork 0
mirror of https://github.com/iluvcapra/wavinfo.git synced 2026-01-02 09:50:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Changed indexing of tracks

Browse Source
This commit is contained in:
Jamie Hardt
2022-11-26 19:03:18 -08:00
parent 00728f5af3
commit f8ce7b9ad9
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
wavinfo/wave_adm_reader.py
View File

@@ -14,6 +14,7 @@ ChannelEntry = namedtuple('ChannelEntry', "track_index uid track_ref pack_ref")
class WavADMReader: class WavADMReader:
""" """
Reads XML data from an EBU ADM (Audio Definiton Model) WAV File. Reads XML data from an EBU ADM (Audio Definiton Model) WAV File.
""" """
def __init__(self, axml_data: bytes, chna_data: bytes): def __init__(self, axml_data: bytes, chna_data: bytes):
@@ -27,6 +28,11 @@ class WavADMReader:
#: A list of :class:`ChannelEntry` objects parsed from the #: A list of :class:`ChannelEntry` objects parsed from the
#: `chna` metadata chunk. #: `chna` metadata chunk.
#:
#: .. note::
#: In-file, the `chna` track indexes start at 1. However, this interface
#: numbers the first track 0, in order to maintain consistency with other
#: libraries.
self.channel_uids = [] self.channel_uids = []
offset = calcsize(header_fmt) offset = calcsize(header_fmt)
@@ -36,7 +42,7 @@ class WavADMReader:
# these values are either ascii or all null # these values are either ascii or all null
self.channel_uids.append(ChannelEntry(track_index, self.channel_uids.append(ChannelEntry(track_index - 1,
uid.decode('ascii') , track_ref.decode('ascii'), pack_ref.decode('ascii'))) uid.decode('ascii') , track_ref.decode('ascii'), pack_ref.decode('ascii')))
offset += calcsize(uid_fmt) offset += calcsize(uid_fmt)
@@ -97,7 +103,7 @@ class WavADMReader:
:returns: a dictionary with *content_name*, *content_id*, *object_name*, *object_id*, :returns: a dictionary with *content_name*, *content_id*, *object_name*, *object_id*,
*pack_format_name*, *pack_type*, *channel_format_name* *pack_format_name*, *pack_type*, *channel_format_name*
""" """
channel_info = next((x for x in self.channel_uids if x.track_index == index + 1), None) channel_info = next((x for x in self.channel_uids if x.track_index == index), None)
if channel_info is None: if channel_info is None:
return None return None
@@ -152,7 +158,7 @@ class WavADMReader:
def make_entry(channel_uid_rec): def make_entry(channel_uid_rec):
rd = channel_uid_rec._asdict() rd = channel_uid_rec._asdict()
rd.update(self.track_info(channel_uid_rec.track_index - 1)) rd.update(self.track_info(channel_uid_rec.track_index))
return rd return rd
return dict(channel_entries=list(map(lambda z: make_entry(z), self.channel_uids)), return dict(channel_entries=list(map(lambda z: make_entry(z), self.channel_uids)),