[Python-checkins] cpython (2.7): Issue #19131: The aifc module now correctly reads and writes sampwidth of

[serhiy.storchaka]

http://hg.python.org/cpython/rev/567241d794bd
changeset:   86226:567241d794bd
branch:      2.7
parent:      86192:0820e8394d96
user:        Serhiy Storchaka <storchaka at gmail.com>
date:        Sat Oct 12 18:21:12 2013 +0300
summary:
  Issue #19131: The aifc module now correctly reads and writes sampwidth of
compressed streams.

files:
  Lib/aifc.py |  12 +++++++-----
  Misc/NEWS   |   3 +++
  2 files changed, 10 insertions(+), 5 deletions(-)


diff --git a/Lib/aifc.py b/Lib/aifc.py
--- a/Lib/aifc.py
+++ b/Lib/aifc.py
@@ -480,7 +480,7 @@
                         pass
                     else:
                         self._convert = self._adpcm2lin
-                        self._framesize = self._framesize // 4
+                        self._sampwidth = 2
                         return
                 # for ULAW and ALAW try Compression Library
                 try:
@@ -490,21 +490,20 @@
                         try:
                             import audioop
                             self._convert = self._ulaw2lin
-                            self._framesize = self._framesize // 2
+                            self._sampwidth = 2
                             return
                         except ImportError:
                             pass
                     raise Error, 'cannot read compressed AIFF-C files'
                 if self._comptype == 'ULAW':
                     scheme = cl.G711_ULAW
-                    self._framesize = self._framesize // 2
                 elif self._comptype == 'ALAW':
                     scheme = cl.G711_ALAW
-                    self._framesize = self._framesize // 2
                 else:
                     raise Error, 'unsupported compression type'
                 self._decomp = cl.OpenDecompressor(scheme)
                 self._convert = self._decomp_data
+                self._sampwidth = 2
         else:
             self._comptype = 'NONE'
             self._compname = 'not compressed'
@@ -867,7 +866,10 @@
         _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 ('ULAW', 'ALAW', '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
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -32,6 +32,9 @@
 Library
 -------
 
+- Issue #19131: The aifc module now correctly reads and writes sampwidth of
+  compressed streams.
+
 - Issue #19158:  a rare race in BoundedSemaphore could allow .release() too
   often.
 

-- 
Repository URL: http://hg.python.org/cpython