Issue #19131: The aifc module now correctly reads and writes sampwidth of

serhiy-storchaka · serhiy-storchaka · commit 4ae423ded474 · 2013-10-12T18:23:21.000+03:00
compressed streams.
diff --git a/Lib/aifc.py b/Lib/aifc.py
@@ -468,15 +468,13 @@ def _read_comm_chunk(self, chunk):
             if self._comptype != b'NONE':
                 if self._comptype == b'G722':
                     self._convert = self._adpcm2lin
-                    self._framesize = self._framesize // 4
                 elif self._comptype in (b'ulaw', b'ULAW'):
                     self._convert = self._ulaw2lin
-                    self._framesize = self._framesize // 2
                 elif self._comptype in (b'alaw', b'ALAW'):
                     self._convert = self._alaw2lin
-                    self._framesize = self._framesize // 2
                 else:
                     raise Error('unsupported compression type')
+                self._sampwidth = 2
         else:
             self._comptype = b'NONE'
             self._compname = b'not compressed'
@@ -804,7 +802,10 @@ def _write_header(self, initlength):
         _write_short(self._file, self._nchannels)
         self._nframes_pos = self._file.tell()
         _write_ulong(self._file, self._nframes)
-        _write_short(self._file, self._sampwidth * 8)
+        if self._comptype in (b'ULAW', b'ulaw', b'ALAW', b'alaw', b'G722'):
+            _write_short(self._file, 8)
+        else:
+            _write_short(self._file, self._sampwidth * 8)
         _write_float(self._file, self._framerate)
         if self._aifc:
             self._file.write(self._comptype)
diff --git a/Misc/NEWS b/Misc/NEWS
@@ -36,6 +36,9 @@ Core and Builtins
 Library
 -------
 
+- Issue #19131: The aifc module now correctly reads and writes sampwidth of
+  compressed streams.
+
 - Issue #19209: Remove import of copyreg from the os module to speed up
   interpreter startup. stat_result and statvfs_result are now hard-coded to
   reside in the os module.
