diff options
| author | Jesus Cea <jcea@jcea.es> | 2012-11-17 03:38:17 +0100 |
|---|---|---|
| committer | Jesus Cea <jcea@jcea.es> | 2012-11-17 03:38:17 +0100 |
| commit | f34e4de3f5f4ae1c695773457349386722ae0719 (patch) | |
| tree | e6c7459c190387cb37e5dba69309b7b880d12f11 /Lib/wave.py | |
| parent | 526b5536080949482e8828a9a32b4288aa3b4350 (diff) | |
| download | cpython-git-f34e4de3f5f4ae1c695773457349386722ae0719.tar.gz | |
Closes #16461: Wave library should be able to deal with 4GB wav files, and sample rate of 44100 Hz.
Diffstat (limited to 'Lib/wave.py')
| -rw-r--r-- | Lib/wave.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Lib/wave.py b/Lib/wave.py index 2016a2a697..16b11dcfcd 100644 --- a/Lib/wave.py +++ b/Lib/wave.py @@ -261,9 +261,9 @@ class Wave_read: # def _read_fmt_chunk(self, chunk): - wFormatTag, self._nchannels, self._framerate, dwAvgBytesPerSec, wBlockAlign = struct.unpack('<hhllh', chunk.read(14)) + wFormatTag, self._nchannels, self._framerate, dwAvgBytesPerSec, wBlockAlign = struct.unpack('<HHLLH', chunk.read(14)) if wFormatTag == WAVE_FORMAT_PCM: - sampwidth = struct.unpack('<h', chunk.read(2))[0] + sampwidth = struct.unpack('<H', chunk.read(2))[0] self._sampwidth = (sampwidth + 7) // 8 else: raise Error, 'unknown format: %r' % (wFormatTag,) @@ -466,14 +466,14 @@ class Wave_write: self._nframes = initlength / (self._nchannels * self._sampwidth) self._datalength = self._nframes * self._nchannels * self._sampwidth self._form_length_pos = self._file.tell() - self._file.write(struct.pack('<l4s4slhhllhh4s', + self._file.write(struct.pack('<L4s4sLHHLLHH4s', 36 + self._datalength, 'WAVE', 'fmt ', 16, WAVE_FORMAT_PCM, self._nchannels, self._framerate, self._nchannels * self._framerate * self._sampwidth, self._nchannels * self._sampwidth, self._sampwidth * 8, 'data')) self._data_length_pos = self._file.tell() - self._file.write(struct.pack('<l', self._datalength)) + self._file.write(struct.pack('<L', self._datalength)) self._headerwritten = True def _patchheader(self): @@ -482,9 +482,9 @@ class Wave_write: return curpos = self._file.tell() self._file.seek(self._form_length_pos, 0) - self._file.write(struct.pack('<l', 36 + self._datawritten)) + self._file.write(struct.pack('<L', 36 + self._datawritten)) self._file.seek(self._data_length_pos, 0) - self._file.write(struct.pack('<l', self._datawritten)) + self._file.write(struct.pack('<L', self._datawritten)) self._file.seek(curpos, 0) self._datalength = self._datawritten |