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

Rewrite of chink code

Browse Source 
More work on #4
This commit is contained in:
Jamie Hardt
2020-01-02 11:44:42 -08:00
parent 60e329fdb4
commit 5c90d5ff47
2 changed files with 16 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
setup.py
View File

@@ -4,7 +4,7 @@ with open("README.md", "r") as fh:
long_description = fh.read() long_description = fh.read()
setup(name='wavinfo', setup(name='wavinfo',
version='1.3', version='1.3.1',
author='Jamie Hardt', author='Jamie Hardt',
author_email='jamiehardt@me.com', author_email='jamiehardt@me.com',
description='Probe WAVE Files for iXML, Broadcast-WAVE and other metadata.', description='Probe WAVE Files for iXML, Broadcast-WAVE and other metadata.',

32
wavinfo/riff_parser.py
View File

@@ -32,43 +32,41 @@ class ChunkDescriptor(namedtuple('ChunkDescriptor', 'ident start length rf64_con
def parse_list_chunk(stream, length, rf64_context=None): def parse_list_chunk(stream, length, rf64_context=None):
start = stream.tell() start = stream.tell()
signature = stream.read(4) signature = stream.read(4)
children = [] children = []
while (stream.tell() - start) < length: while (stream.tell() - start + 8) < length:
child_chunk = parse_chunk(stream, rf64_context=rf64_context) child_chunk = parse_chunk(stream, rf64_context=rf64_context)
if child_chunk: children.append(child_chunk)
children.append(child_chunk)
else: stream.seek(start + length)
break
return ListChunkDescriptor(signature=signature, children=children) return ListChunkDescriptor(signature=signature, children=children)
def parse_chunk(stream, rf64_context=None): def parse_chunk(stream, rf64_context=None):
header_start = stream.tell()
ident = stream.read(4) ident = stream.read(4)
size_bytes = stream.read(4) size_bytes = stream.read(4)
if len(ident) != 4 or len(size_bytes) < 4: if len(ident) != 4 or len(size_bytes) != 4:
raise WavInfoEOFError(identifier=ident, chunk_start=stream.tell() - 4) raise WavInfoEOFError(identifier=ident, chunk_start=header_start)
size_bytes = stream.read(4) data_size = struct.unpack('<I', size_bytes)[0]
size = struct.unpack('<I', size_bytes)[0]
if data_size == 0xFFFFFFFF:
if size == 0xFFFFFFFF:
if rf64_context is None and ident == b'RF64': if rf64_context is None and ident == b'RF64':
rf64_context = parse_rf64(stream=stream) rf64_context = parse_rf64(stream=stream)
size = rf64_context.bigchunk_table[ident] data_size = rf64_context.bigchunk_table[ident]
displacement = size displacement = data_size
if displacement % 2 is not 0: if displacement % 2 is not 0:
displacement = displacement + 1 displacement = displacement + 1
if ident in [b'RIFF', b'LIST', b'RF64']: if ident in [b'RIFF', b'LIST', b'RF64']:
return parse_list_chunk(stream=stream, length=size, rf64_context=rf64_context) return parse_list_chunk(stream=stream, length=data_size, rf64_context=rf64_context)
else: else:
start = stream.tell() data_start = stream.tell()
stream.seek(displacement, 1) stream.seek(displacement, 1)
return ChunkDescriptor(ident=ident, start=start, length=size, rf64_context=rf64_context) return ChunkDescriptor(ident=ident, start=data_start, length=data_size, rf64_context=rf64_context)