traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Ehm, when we don't need to byteswap the data, don't go through an 

array object at all.
This commit is contained in:
Guido van Rossum 1999-02-05 22:32:11 +00:00
parent ebb9c922cb
commit d42e46ead5
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Lib/wave.py
View File

@ -305,7 +305,7 @@ class Wave_read:
self._data_seek_needed = 0 self._data_seek_needed = 0
if nframes == 0: if nframes == 0:
return '' return ''
if self._sampwidth > 1: if self._sampwidth > 1 and big_endian:
# unfortunately the fromfile() method does not take # unfortunately the fromfile() method does not take
# something that only looks like a file object, so # something that only looks like a file object, so
# we have to reach into the innards of the chunk object # we have to reach into the innards of the chunk object
@ -316,8 +316,7 @@ class Wave_read:
nitems = (self._data_chunk.chunksize - self._data_chunk.size_read) / self._sampwidth nitems = (self._data_chunk.chunksize - self._data_chunk.size_read) / self._sampwidth
data.fromfile(self._data_chunk.file, nitems) data.fromfile(self._data_chunk.file, nitems)
self._data_chunk.size_read = self._data_chunk.size_read + nitems * self._sampwidth self._data_chunk.size_read = self._data_chunk.size_read + nitems * self._sampwidth
if big_endian: data.byteswap()
data.byteswap()
data = data.tostring() data = data.tostring()
else: else:
data = self._data_chunk.read(nframes * self._framesize) data = self._data_chunk.read(nframes * self._framesize)
@ -487,11 +486,10 @@ class Wave_write:
nframes = len(data) / (self._sampwidth * self._nchannels) nframes = len(data) / (self._sampwidth * self._nchannels)
if self._convert: if self._convert:
data = self._convert(data) data = self._convert(data)
if self._sampwidth > 1: if self._sampwidth > 1 and big_endian:
import array import array
data = array.array(_array_fmts[self._sampwidth], data) data = array.array(_array_fmts[self._sampwidth], data)
if big_endian: data.byteswap()
data.byteswap()
data.tofile(self._file) data.tofile(self._file)
self._datawritten = self._datawritten + len(data) * self._sampwidth self._datawritten = self._datawritten + len(data) * self._sampwidth
else: else: