From 4f6036df206d9307c86287e29d8d625c67c99034 Mon Sep 17 00:00:00 2001
From: James Sinton <jksinton@gmail.com>
Date: Fri, 21 Oct 2016 22:37:56 -0500
Subject: [PATCH 1/3] Use compressed audio in ffdec

---
 audioread/__init__.py  |  50 +++++++++++++++++-----------------
 audioread/__init__.pyc | Bin 0 -> 2425 bytes
 audioread/ffdec.py     |  60 ++++++++++++++++++++++++++++++++---------
 audioread/ffdec.pyc    | Bin 0 -> 8901 bytes
 audioread/gstdec.pyc   | Bin 0 -> 12694 bytes
 audioread/rawread.pyc  | Bin 0 -> 4114 bytes
 decode.py              |   4 ++-
 7 files changed, 76 insertions(+), 38 deletions(-)
 create mode 100644 audioread/__init__.pyc
 create mode 100644 audioread/ffdec.pyc
 create mode 100644 audioread/gstdec.pyc
 create mode 100644 audioread/rawread.pyc
 mode change 100644 => 100755 decode.py

diff --git a/audioread/__init__.py b/audioread/__init__.py
index eecce32..325438d 100644
--- a/audioread/__init__.py
+++ b/audioread/__init__.py
@@ -68,45 +68,45 @@ def _mad_available():
         return True
 
 
-def audio_open(path):
+def audio_open(path=None, audio=None):
     """Open an audio file using a library that is available on this
     system.
     """
     # Standard-library WAV and AIFF readers.
-    from . import rawread
-    try:
-        return rawread.RawAudioFile(path)
-    except DecodeError:
-        pass
+    #from . import rawread
+    #try:
+    #    return rawread.RawAudioFile(path)
+    #except DecodeError:
+    #    pass
 
     # Core Audio.
-    if _ca_available():
-        from . import macca
-        try:
-            return macca.ExtAudioFile(path)
-        except DecodeError:
-            pass
+    #if _ca_available():
+    #    from . import macca
+    #    try:
+    #        return macca.ExtAudioFile(path)
+    #    except DecodeError:
+    #        pass
 
     # GStreamer.
-    if _gst_available():
-        from . import gstdec
-        try:
-            return gstdec.GstAudioFile(path)
-        except DecodeError:
-            pass
+    #if _gst_available():
+    #    from . import gstdec
+    #    try:
+    #        return gstdec.GstAudioFile(path)
+    #    except DecodeError:
+    #        pass
 
     # MAD.
-    if _mad_available():
-        from . import maddec
-        try:
-            return maddec.MadAudioFile(path)
-        except DecodeError:
-            pass
+    #if _mad_available():
+    #    from . import maddec
+    #    try:
+    #        return maddec.MadAudioFile(path)
+    #    except DecodeError:
+    #        pass
 
     # FFmpeg.
     from . import ffdec
     try:
-        return ffdec.FFmpegAudioFile(path)
+        return ffdec.FFmpegAudioFile(path,audio)
     except DecodeError:
         pass
 
diff --git a/audioread/__init__.pyc b/audioread/__init__.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..6a007a341416cf3ece9c57f8f0f3ed378c66e8e6
GIT binary patch
literal 2425
zcmbtWO>ZMb5UrW9o!D$3WLF_@Kz&#VBY^`F5*I-1M-p+^1jY*+av9n)?Rb*;Fw^bb
z9VvT&?2#YGf8htfs~YdvD{+9Vl_^(udaA2my?X87udTt}pM%qwmY)FM-{P^qz$8Rx
zupSwYrXD3ey(GFO`uWVKBp~C<Y^R+KDCzRxtV2mpoGv9B;`Au#%ikuw^yzGq{qb<X
zJKctPXyP(4N-vVMRMRvwcI4h_=MSo?tlAVk%-`o1--a>R4Vl6E6pn}dKl=mB<C#$t
zZH+R|V>5SYS*SSE)~ab)DV=31;T_ZBTp12-Ri#sF5;duno27Q3@R{rQQlFcV42F!1
z+k}atLgyxm9A_Uzd6_IS9&X4mDdQ*_!ljk5`xx%e%G~T<;8nYyrIUR*Yh`q@=0#Cj
zq%Mj^^E%`ZJ9w-Q(+eD*_PD%{oJ^7YPelH}yNn1UtKxEzC8{W$nwSQL=G?ld0hxp!
zse{zbOodgirW#0eg(5xGX{INL1SpM;XKORd_tg|j5Y?5-4FGDh`x=-b7c1n`g^cYA
zF7a-JSqE|U@GLPC$_RXzd%*L*!PMJKX^=T1dO`H0*rAT|=yE{SUGhB7`7}PQ@6Z*|
z1sILL4qf}?Jt_9EutTm(Q(u;k*Ozn5E@eH+H|T}O%U5x)+J#`yc-Z4q#xM_!GgY1z
zMm?Ju0sP21a3Tlvx&VGa?fcrzz}};i$%Tngv$SB^T7^;wG1J025ZWXSwCUgY96Lr7
zu`GXoKKe`=BkW=@?8D%QMCYlr*mwE7teg-ECnGx4nKkYmc$N8ekya*pYATBc62AYW
zvxR9EGa>IeSEZAMTTX3B*imKXrA=K~)v_fp1O2Ln8A`GF^i3*onzG-d*wPTuxph%X
z$PW?Ee!x*Xfw%2#d0jv7?s&JC-#l(9!Knx(m~HEP;IeykAqscxaVf8aEtf1<d=mR3
zOj|kImhM4WnR_B&DXP;p$uJ$6(I@Je`3SvJEsBCgr!1s)k94d~#_IIr*J^hQ@g>mX
zvdkvsbJ<mD6}x&4X<WE86HvwB<x{XCf~r)ys^ve&WzoRx81CjhAq5t#I_*ZdbCIK1
zuVDWI6PCB3&Mj}p6NtIDnN0%mr*QsL*CE3(8gndSYdP+};LJ@iuX7EtUh9Pw;-jVo
z8q@;Bz|xS#IoxE!={N209(#D+l!J)B0^@7MvwSlUxYuwnX0CA}Eg%ONw4BR9GRO-n
zj?cUU0l_#Z&iG03E)*vat@)BAr10nz<-I2Q9h?MM4Iv*P+{xS&(2TV!R4pu1O{*m@
zpeEX>*SHB?X>U7QTW9hm5xIN<l1RdIireyd$mu&g6u!?MOT^(}J~!t=)<Y=1Tv{PF
zNpoGYH`i_^QRKptSKknHMpuGGB@TUrk>wtsyW1YO`<B-Ujz#9=UU4jV2d{nwtTGH)
tzrtNMd}W0EGbCgMS!E~Qje2AgalUGP8GOSyNrJs#x3}Bt@Amus!9Tz)EL;Ep

literal 0
HcmV?d00001

diff --git a/audioread/ffdec.py b/audioread/ffdec.py
index 622f31d..0dfdf3e 100644
--- a/audioread/ffdec.py
+++ b/audioread/ffdec.py
@@ -22,6 +22,7 @@
 import threading
 import time
 import os
+from cStringIO import StringIO
 try:
     import queue
 except ImportError:
@@ -51,6 +52,8 @@ class NotInstalledError(FFmpegError):
 class ReadTimeoutError(FFmpegError):
     """Reading from the ffmpeg command-line tool timed out."""
 
+class NoInputError(FFmpegError):
+    """Reading from the ffmpeg command-line tool timed out."""
 
 class QueueReaderThread(threading.Thread):
     """A thread that consumes data from a filehandle and sends the data
@@ -100,7 +103,9 @@ def popen_multiple(commands, command_args, *args, **kwargs):
 
 class FFmpegAudioFile(object):
     """An audio file decoded by the ffmpeg command-line utility."""
-    def __init__(self, filename, block_size=4096):
+    def __init__(self, filename=None, audio=None, block_size=4096):
+        self.filename=filename
+        self.audio = audio
         # On Windows, we need to disable the subprocess's crash dialog
         # in case it dies. Passing SEM_NOGPFAULTERRORBOX to SetErrorMode
         # disables this behavior.
@@ -118,14 +123,26 @@ def __init__(self, filename, block_size=4096):
             )
 
         try:
-            self.devnull = open(os.devnull)
-            self.proc = popen_multiple(
-                COMMANDS,
-                ['-i', filename, '-f', 's16le', '-'],
-                stdout=subprocess.PIPE,
-                stderr=subprocess.PIPE,
-                stdin=self.devnull,
-            )
+            if filename is not None:
+                self.devnull = open(os.devnull)
+                self.proc = popen_multiple(
+                    COMMANDS,
+                    ['-i', filename, '-f', 's16le', '-'],
+                    stdout=subprocess.PIPE,
+                    stderr=subprocess.PIPE,
+                    stdin=self.devnull,
+                )
+            elif audio is not None:
+                self.devnull = open(os.devnull)
+                self.proc = popen_multiple(
+                    COMMANDS,
+                    ['-i', '-', '-f', 's16le', '-'],
+                    stdout=subprocess.PIPE,
+                    stderr=subprocess.PIPE,
+                    stdin=subprocess.PIPE,
+                )
+            else:
+                raise NoInputError()
 
         except OSError:
             raise NotInstalledError()
@@ -143,7 +160,17 @@ def __init__(self, filename, block_size=4096):
 
         # Start another thread to consume the standard output of the
         # process, which contains raw audio data.
-        self.stdout_reader = QueueReaderThread(self.proc.stdout, block_size)
+        if filename is not None:
+            self.stdout_reader = QueueReaderThread(self.proc.stdout, block_size)
+        elif audio is not None:
+            o, e = self.proc.communicate(input=audio.read()) 
+            print e
+            self.output = StringIO(o)
+            self.error = StringIO(e)
+            self.stdout_reader = QueueReaderThread(self.output, block_size)
+        else:
+            raise NoInputError()
+
         self.stdout_reader.start()
 
         # Read relevant information from stderr.
@@ -152,7 +179,12 @@ def __init__(self, filename, block_size=4096):
         # Start a separate thread to read the rest of the data from
         # stderr. This (a) avoids filling up the OS buffer and (b)
         # collects the error output for diagnosis.
-        self.stderr_reader = QueueReaderThread(self.proc.stderr)
+        if filename is not None:
+            self.stderr_reader = QueueReaderThread(self.proc.stderr)
+        elif audio is not None:
+            self.stderr_reader = QueueReaderThread(self.error, block_size)
+        else:
+            raise NoInputError()
         self.stderr_reader.start()
 
     def read_data(self, timeout=10.0):
@@ -191,7 +223,11 @@ def _get_info(self):
         """
         out_parts = []
         while True:
-            line = self.proc.stderr.readline()
+            if self.filename is not None:
+                line = self.proc.stderr.readline()
+            else:
+                line = self.error.readline()
+
             if not line:
                 # EOF and data not found.
                 raise CommunicationError("stream info not found")
diff --git a/audioread/ffdec.pyc b/audioread/ffdec.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..fefd1c6e39424a46b55e665571b22e04ad6375e7
GIT binary patch
literal 8901
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
VW-4{}T($gh&$)}|8grBGp8!^wJ<I?A

literal 0
HcmV?d00001

diff --git a/audioread/gstdec.pyc b/audioread/gstdec.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..535f60428f680ec8bb9c1c94b65c836d626f85e5
GIT binary patch
literal 12694
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

literal 0
HcmV?d00001

diff --git a/audioread/rawread.pyc b/audioread/rawread.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..d81ab236f152ff1cf3427e4e9ccc1a96ee322b7f
GIT binary patch
literal 4114
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

literal 0
HcmV?d00001

diff --git a/decode.py b/decode.py
old mode 100644
new mode 100755
index 40d369a..b20c115
--- a/decode.py
+++ b/decode.py
@@ -1,3 +1,5 @@
+#!/usr/bin/python
+
 # This file is part of audioread.
 # Copyright 2011, Adrian Sampson.
 #
@@ -28,7 +30,7 @@ def decode(filename):
         sys.exit(1)
 
     try:
-        with audioread.audio_open(filename) as f:
+        with audioread.audio_open(audio=open(filename,"r")) as f:
             print('Input file: %i channels at %i Hz; %.1f seconds.' %
                   (f.channels, f.samplerate, f.duration),
                   file=sys.stderr)

From 045e26223e2d06c99f37d888f827bd7c89213325 Mon Sep 17 00:00:00 2001
From: James Sinton <jksinton@gmail.com>
Date: Sat, 22 Oct 2016 12:20:21 -0500
Subject: [PATCH 2/3] Updates to handling compressed audio in ffdec

---
 audioread/ffdec.py  |  39 +++++++++++++++++++++------------------
 audioread/ffdec.pyc | Bin 8901 -> 8980 bytes
 2 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/audioread/ffdec.py b/audioread/ffdec.py
index 0dfdf3e..a9c322d 100644
--- a/audioread/ffdec.py
+++ b/audioread/ffdec.py
@@ -104,8 +104,9 @@ def popen_multiple(commands, command_args, *args, **kwargs):
 class FFmpegAudioFile(object):
     """An audio file decoded by the ffmpeg command-line utility."""
     def __init__(self, filename=None, audio=None, block_size=4096):
-        self.filename=filename
-        self.audio = audio
+        self.openFile = True if filename is not None else False
+        self.readAudio = True if audio is not None else False
+
         # On Windows, we need to disable the subprocess's crash dialog
         # in case it dies. Passing SEM_NOGPFAULTERRORBOX to SetErrorMode
         # disables this behavior.
@@ -121,9 +122,9 @@ def __init__(self, filename=None, audio=None, block_size=4096):
             ctypes.windll.kernel32.SetErrorMode(
                 previous_error_mode | SEM_NOGPFAULTERRORBOX
             )
-
+        
         try:
-            if filename is not None:
+            if self.openFile:
                 self.devnull = open(os.devnull)
                 self.proc = popen_multiple(
                     COMMANDS,
@@ -132,7 +133,7 @@ def __init__(self, filename=None, audio=None, block_size=4096):
                     stderr=subprocess.PIPE,
                     stdin=self.devnull,
                 )
-            elif audio is not None:
+            elif self.readAudio:
                 self.devnull = open(os.devnull)
                 self.proc = popen_multiple(
                     COMMANDS,
@@ -160,18 +161,17 @@ def __init__(self, filename=None, audio=None, block_size=4096):
 
         # Start another thread to consume the standard output of the
         # process, which contains raw audio data.
-        if filename is not None:
+        if self.openFile:
             self.stdout_reader = QueueReaderThread(self.proc.stdout, block_size)
-        elif audio is not None:
+            self.stdout_reader.start()
+        elif self.readAudio:
             o, e = self.proc.communicate(input=audio.read()) 
             print e
             self.output = StringIO(o)
             self.error = StringIO(e)
-            self.stdout_reader = QueueReaderThread(self.output, block_size)
         else:
             raise NoInputError()
 
-        self.stdout_reader.start()
 
         # Read relevant information from stderr.
         self._get_info()
@@ -179,13 +179,9 @@ def __init__(self, filename=None, audio=None, block_size=4096):
         # Start a separate thread to read the rest of the data from
         # stderr. This (a) avoids filling up the OS buffer and (b)
         # collects the error output for diagnosis.
-        if filename is not None:
+        if self.openFile:
             self.stderr_reader = QueueReaderThread(self.proc.stderr)
-        elif audio is not None:
-            self.stderr_reader = QueueReaderThread(self.error, block_size)
-        else:
-            raise NoInputError()
-        self.stderr_reader.start()
+            self.stderr_reader.start()
 
     def read_data(self, timeout=10.0):
         """Read blocks of raw PCM data from the file."""
@@ -196,7 +192,12 @@ def read_data(self, timeout=10.0):
             # Wait for data to be available or a timeout.
             data = None
             try:
-                data = self.stdout_reader.queue.get(timeout=timeout)
+                if self.openFile:
+                    data = self.stdout_reader.queue.get(timeout=timeout)
+                elif self.readAudio:
+                    data = self.output.read()
+                else:
+                    raise NoInputError()
                 if data:
                     yield data
                 else:
@@ -223,10 +224,12 @@ def _get_info(self):
         """
         out_parts = []
         while True:
-            if self.filename is not None:
+            if self.openFile:
                 line = self.proc.stderr.readline()
-            else:
+            elif self.readAudio:
                 line = self.error.readline()
+            else:
+                raise NoInputError()
 
             if not line:
                 # EOF and data not found.
diff --git a/audioread/ffdec.pyc b/audioread/ffdec.pyc
index fefd1c6e39424a46b55e665571b22e04ad6375e7..2ce0c4bac807c2c22ccd9a62b04678f63c63c357 100644
GIT binary patch
delta 1675
zcmah}OKcle6g_Y3u`{;wv*S2U+$3(2QdMnL5fr2#L@1)9EUL=1N%#aSWSlgUWZH}e
z(G(j)g1Ug^>jtR{5L;BK$^z64uwadZ#HNS^g-ED~RRt0&IQQA^X90NRtM}f0_jm5O
z@0;hZor*{9btZ0KPu`4gb~PFnP*ZS$bq7Hjp@JVlXrTs_BdA$z)v-raQG_<U7`!-K
zg<XYu6tyUVj}UgibFd32*FxQf8xa>93Dje#(I5#g1+Nn|n`RBv<By(lYvUvxDj&FV
z2ispuDqaM^UkJMpcEjtDc#>Za!d`@FxQxvj7%K)hj#Vx?5N6=@!FAe;gz-aLD<Za8
z_{*p@=$cu-r2fM-J^rujX0QjY8MR+9*io4G2N4Z(SWh6>R{VtnEsd|xSePd`0^Aqs
z%GkeS6_=8g+!c892Hph%w9vxlt_lZDeOY)zs6|+%L8xF33-AsY6aQtiXSiugEVB)G
z!*G+*XKzHV>_WZ9wsoNHpyuF(*>DuKjyB*$$d=u0;(rkSLxqaNF%zbh)Z5mBq{iDe
z6DEU+Rz^|jvL5ZN961D_logQ{ae#uQ0v9h;{8MWimC)fPs4Th9>g&Dl>xp#Tv3XJr
zmx54#l0Kn-NFUD`ixuAXmo_UTD6sUVyLM4$GM^^i;0|g?4cYpuOkb~~(kj9)s~mo5
z%hCIpk%prNR1fz>WvgyEjV5e|cUHw17@t|@yg(ewf0_U4?-U_R7wk~CaQU`OO7N?&
zvL3<qtEOP`_hbuu&kPQyhMXnbyyK4>RUD0A(X84dBswCT5Z9y<`x=BI=M=efc7Cgy
z%%ZoXA=fVua^25_GZ8^`U&zJo4lvldjo^EPDR3}3fNlg{mkGz2q8H9%-i$K4%V1kS
zi75+Wl&yVzug_CG`t@v1P3o;|wy*RA>n_cT$cso(=&RXDbxz;PZWeBFTRlvHXi7O&
zj7U2Kzlroy{f{*cDS)Wf6)xu`>!7HFHbm~2$%!d4zi1287D6mw)@b>T+*c7Gjz<$9
z3)L0jP4i7+6{HuLLjVLs3&975>PhJD`ZI-;m=TF)<Kz{wupUG3IbRyBa=A0#%6rpv
zz2(T$(z@`Q^p5Wkw=$Qa>uBp3?O~l1)ho}Cm)={+^{Xe(6O%KCGn7rHPs-{!5ho}N
zgN5cBYksAP@oCYe^o@Z{^@=X!-GLu@P(4b4XpD#oKMk&X*YbZ_D$pMm2Gv{oM(i2;
z0`L62ceij!*?j46M3;wWR6~C}d`>;C{}`T9i(H@XlsPMx*TPCrE>G#5ksURy?a^u8
zoEd#bJ*~eSJvzR~JEa#zh|`j|E4?e?JrO%1uIldMoP9Pm<{Z>s@p#_`56#$y7o?&!
Sf3-BHKPyhD^ZMuFoqqtS_BU_<

delta 1663
zcmZ`(O>7%g5dLP@yUsdxoH%yu{4|N1NG-oX4F%B)6;LP~5ZXpbq##0sosdnkYBpP`
zEq0BPUJ-)Fi7P@vsH#+jNFW44NQg5xgmQuloH$fMLU7=lb(|&zVtX<(Z{GZTZ)QGt
z{<{ll`))2XwV%0@-soxFvVex50W6ZS5=IbP2y6r?)C4<%W(tiIqAQ3U1TJ;}saa?`
zsM)9i>uEGyG+YE-2s{KCG@RsG`nZy!gJ<YZLg4zZxb{6-j7<+~9-<!+XA$QR^ypnp
zs0VQ#aW85NPcw#dQA=ZmOc&xl1O?Q*4#S{G?pn6q?MJw*^&B`qEC20Wdd++Ja_e8d
z+TM2#eKAZ?>)sa3g+oZiC9Gu-EeQYOfrFD!Fh9qDiq(g5ed7P&No$Fswu)%El|VXA
zROavD@vX#_q^5oZgJ{^;X}``8!p$R<J!om&v>8UNTlK++dfS1#$|veV(?i3<3m4-P
zXmoXu9fgWsM{JGZAlB&dKu5~fC_@OwlT=lxwz<Ri3$1(kp6qy@K={a!WZ&=Dj2($H
zfx+;;Kogxn=5BAjJPG2|MY6oQUJsWx>I4l~GTVJO9lu1@xP_*9r!eKIek)#zV)JET
zD&tR6^dDCP>Hnw|kb!vOr3&IohQDm8Bw6XPZP@%@5SyQpT1dgVPquSbPWoJz7Fj7<
z`BYYh$yLRXJU<o7vvPLE$x4M<O0uHSfXVZ3aKgaE%y2Q&`igu^@brPuv~cxP#DeH^
z?eV6KYY!zao{V0=Hs>6003keL14Pd$ofY=kD|4H9c411#Q5*3yXd@mv=D^t4+S5*C
zM^xx!%|Y}r&c<nQayh3p#$adgMn>nHUv^~s%O2mnqgR<9qipUOuM|Act(m8ktZvl(
z0+|GQ|AKM@s<%m2>ap1?O^a`SD{U0Nre<rL1cb}86ugRw22QogLQ?`DxSG+lqk?EE
z?4?Yy3#O03(1t3^CrWM^E|&y6mbNtqEh$Nzd2@o;DAdR7Z41#`%Ckb&%z~+5Nwk?&
zZMS*}vIo9&$5>c%5q+Xdh|7jxC=#A-or9xq5OX;tTR`>PXYDKd`b<IIG|R(9W@+i&
zq#*7t?!&&_Tjc>cbBQ>-d^$lcAxU>?`})r+d5k3K@~FO4TVD<9{zda=Wkcr8%3!Uy
z&(p2bBuKgJ&%BhZ{O&J<e^_$a{4_EoSIlkqX=j<|fA2nZ;<7kRvZu`L(eu(YzmLwy
zl=)$7#JoN>Bny;Z%;`KWF0RJ)XmN3xXWR0mnHfJv>vzX*$T`zfeRy(#HvUUW)UmHF
x{ToVJO5Rp-)4W!lb!M`o-njXq`e;#yjNp^JsdcP|EB=i6tNMgoGG|Wy{0}Z8Dk1;?


From efbbb3795d87c401624883eb4d827d69544418c3 Mon Sep 17 00:00:00 2001
From: James Sinton <jksinton@gmail.com>
Date: Tue, 25 Oct 2016 21:26:31 -0500
Subject: [PATCH 3/3] Use compressed audio in ffdec

---
 audioread/ffdec.py  |  55 ++++++++++++++++++++++----------------------
 audioread/ffdec.pyc | Bin 8980 -> 9401 bytes
 2 files changed, 27 insertions(+), 28 deletions(-)

diff --git a/audioread/ffdec.py b/audioread/ffdec.py
index a9c322d..837ef9f 100644
--- a/audioread/ffdec.py
+++ b/audioread/ffdec.py
@@ -58,7 +58,7 @@ class NoInputError(FFmpegError):
 class QueueReaderThread(threading.Thread):
     """A thread that consumes data from a filehandle and sends the data
     over a Queue.
-    """
+     """
     def __init__(self, fh, blocksize=1024, discard=False):
         super(QueueReaderThread, self).__init__()
         self.fh = fh
@@ -70,12 +70,25 @@ def __init__(self, fh, blocksize=1024, discard=False):
     def run(self):
         while True:
             data = self.fh.read(self.blocksize)
+            #print data
             if not self.discard:
                 self.queue.put(data)
             if not data:
                 # Stream closed (EOF).
                 break
 
+class WriterThread(threading.Thread):
+    """A thread that writes data to a filehandle
+    """
+    def __init__(self, fh, audio=None):
+        super(WriterThread, self).__init__()
+        self.fh = fh
+        self.audio = audio
+        self.daemon = True
+
+    def run(self):
+        self.fh.write(self.audio.read())
+        self.fh.close()
 
 def popen_multiple(commands, command_args, *args, **kwargs):
     """Like `subprocess.Popen`, but can try multiple commands in case
@@ -159,29 +172,24 @@ def __init__(self, filename=None, audio=None, block_size=4096):
                 finally:
                     windows_error_mode_lock.release()
 
+        # Start a thread to write the compressed audio to Popen.stdin
+        if self.readAudio:
+            self.stdin_writer = WriterThread(self.proc.stdin,audio)
+            self.stdin_writer.start()
+        
         # Start another thread to consume the standard output of the
         # process, which contains raw audio data.
-        if self.openFile:
-            self.stdout_reader = QueueReaderThread(self.proc.stdout, block_size)
-            self.stdout_reader.start()
-        elif self.readAudio:
-            o, e = self.proc.communicate(input=audio.read()) 
-            print e
-            self.output = StringIO(o)
-            self.error = StringIO(e)
-        else:
-            raise NoInputError()
-
-
+        self.stdout_reader = QueueReaderThread(self.proc.stdout, block_size)
+        self.stdout_reader.start()
+        
         # Read relevant information from stderr.
         self._get_info()
 
         # Start a separate thread to read the rest of the data from
         # stderr. This (a) avoids filling up the OS buffer and (b)
         # collects the error output for diagnosis.
-        if self.openFile:
-            self.stderr_reader = QueueReaderThread(self.proc.stderr)
-            self.stderr_reader.start()
+        self.stderr_reader = QueueReaderThread(self.proc.stderr)
+        self.stderr_reader.start()
 
     def read_data(self, timeout=10.0):
         """Read blocks of raw PCM data from the file."""
@@ -192,12 +200,8 @@ def read_data(self, timeout=10.0):
             # Wait for data to be available or a timeout.
             data = None
             try:
-                if self.openFile:
-                    data = self.stdout_reader.queue.get(timeout=timeout)
-                elif self.readAudio:
-                    data = self.output.read()
-                else:
-                    raise NoInputError()
+                data = self.stdout_reader.queue.get(timeout=timeout)
+                
                 if data:
                     yield data
                 else:
@@ -224,12 +228,7 @@ def _get_info(self):
         """
         out_parts = []
         while True:
-            if self.openFile:
-                line = self.proc.stderr.readline()
-            elif self.readAudio:
-                line = self.error.readline()
-            else:
-                raise NoInputError()
+            line = self.proc.stderr.readline()
 
             if not line:
                 # EOF and data not found.
diff --git a/audioread/ffdec.pyc b/audioread/ffdec.pyc
index 2ce0c4bac807c2c22ccd9a62b04678f63c63c357..6a002ca1e387c549eca7ec324c0a082d0731aa0d 100644
GIT binary patch
delta 1902
zcmYjST}&KR6h3!mc3_rWim(g2><`0_&9rDMRT`_9{y?#`6v+iG(CBpC8DIz4g_&7f
z6X+(TiRqKp>${1uFUF8GNTM+sV@ynZ($~J3#)tZ1j7g)3F`jd`TgvYJ_S|#NJ@-53
zo_qLc{HuwK`d2*KooJgY!lS<k{+_}S+`66lgk^4j`{}E$23`^t88}^V6JQ%)exVDT
z6ipUVK+9>;E_8#F1~(&3yC0io!BJqw%I<!^eu%I+@p{w3?oQL3!W7XIy-^Eec-keu
z6uSQGvhNn0$5a$tI73wW5nS|-3=kD?RB#yFWU!!-Z=w+aK4WQQd<5aN8A@09QwYtg
z<UBB)LRc`vidirhORMg3q3o=>QM1!D&7z8X8e^2491}k_4V}Z&W-NyDDXR&Qw-V$D
z4iK~<gp{vB)hShYJLx(QEONzD1Z2W{#EyQlMq6fZ1kDJ*I+%f<B6+7lvC5MVqp%6!
z;g?B40Z*muZZlwy7Brf(C)g2*eL6B;-b1=Hf}~g!cK&=Ki_>`=0c8qUnoU`{$o1yL
zQ1omE1vX8KI)bj~ET-??ivFgsH$^4>cPr60a7dOXcdM=6v6=?{?=0+=Jd@yMU{ir@
zg{F2^Dzo6_B-t|Z$T#eIU=u^C+nG{nHtZ<EUb$o6ypLihpZ(IdzhUcO*fUm(_@`}F
zu?EEaQ$N+{@<U=e`r5^dr>Dkdct2?<-06wwvr<_1D@9I4$DbyMk^x<>@2<Lqz^z~K
zFloss2%S>dmMQgRCWElxhdho;{CP4W35_b%(Dui%d|f}JG}%jTXqU>175>5#R<7^c
zRO7C15ldMlk}s8Hxv=KSYZI*Fc=i?AM&-2byYG}L)xgHh72jT~IIg&>k3^}UuHp#h
z#GQ`GxN5KzYtvFJu0|uGIgzV<Lmp%)VYzH6aP2b)8Tem<qrsL6?+(gzs^H-Rj?jzR
zWSDt|OL#s07~vbN%wYP`#sSbUcb*O_QSiS2#@N1NjSPc5*hE2r6gpXnfPV*uF{}7G
zy=Ho^o*@s5%EPdJ@g(`Z!C>PqZAE@~%Eq2BlHQ>fVosM9mM|sqVI^_K&l7Z#UPZtR
zi@oGP+a$`Cd;;>#aq%Fzmi!)-fr$WGj2T$XDoZIM=sZ|^h`J?A2!m@6C_nz6k{ScA
z@zjtDMiLw+4wx2XiZrQ$Bcu;?s$GA9WKV{O@u3EHp$#dUsem!!dfGADs9e#(e-FYa
z3}e~WJ#HA_=#90HA#9-yln~T6HS}N8t#~o9)s;!aNQrx8ABclvfY-YFc~>VpNR4I6
zl3ht=YaHkG!lN>yid!v}UGZ<q!v?&RzLL0r>R)jL0|=n$*o)eC@24LsY+c;TcC#w=
ztjHp+{U=W3?xo1#l&o3#R+bAvAq;&!E(Y_5^-)~pz2cAjIi2^Sd`Rr%Pcc%=vLW$H
zPgY#%>1LO4J`pEAwoTpMwuf=;20I~U&6m*nee*gS5v{$?3|uCE#E=sK>5^}ebe*6^
zuq}>gV{aWrv5F%|Am~hI?H6J_M$Q;Cnhgy<szrU3OHfg=ax|4M??saO39!|Ie6scb
z8Kv?PpC$d75Br8%D6yOxG#?Wqea8l5_m^FU%5$<(T;VUHfHeV7dE0Y~AwP=LM#ay4
R?d&;mzwcQ+9XFCO^?!0AVT=F(

delta 1643
zcmYjRT})h65T3bv_vh{|umu+Ohrfj_*+8MST4RW&6k3H!5if0NQM@jDFR&Nbg}aAX
z<Kik99(*uqj*q4frb%Pcw|y}BU^MYTeNbO~A)06+iP0DnO^i>~nFFNm?)i4+%$%7s
z-^{%qO}_hd+V@vOc>le~jRG8f{PaIctFm!B{XQmde{y&DEr9uUaCC4JuuF0hY*JIO
zgkUFtth9M^J`J`8v$<6L1N_{NbFvhiuYVbw(-37Qyi*@*IM8rL=3@UehAF&3Yn;>6
z>cb~K#TFlUzoJM%6~K*yn}(`SVoRcSQ|;*Bjc7-vF0dm|)xhoMyt{xeYOo!GZ3C(X
zJToDBpc;Z*<a1UAST&B-UMLwL+W6d#a&Y@tMvhDucujkFf$ZU#6j&$K4NijFseDTS
zHc*{W>9t&q3Z|=A+Sn4ge)&bqSEmO^7a=b0xhq#LOkbQeyLm?^n3<fpq=XHxTri`w
zV`k)Mt?@tui>D>V+iD!HBJ!RP5t0h!_4Tb%v5*&znPewgAOZyCEkQX|cE|I|o?t$$
zWk*=W(o)$x!+spLB5bl-o|C8l920LQ*v2<pDy})D{JNu}<hSf%S;!mlb2uX3iKn9i
z$)&8&k>7?!11{;6Mfpd3s$DlQfiW~NgMMtnX3fyUegox1TW9Te4o`flso2)w);>@W
z?-#Ij*!IDzFDN>R?XjcIx_)p2U{gPkyGcH!tTF|`TTns>TxuckaqeH3W$qsZ5scTd
zgfKI=*#x?9C|U$o!{Gf4i1_d(I(t?Qph|)U2}-u=2k$!&QJ!130c;<*jVfOg@SXfT
z0f#?Iw)qpEq<SdJ=7CJMyJIn~lp8CG>yFt>f*EIcl;ILX8-ef<P-D!;cxQq^wUYZU
z@3&`T&ytYizN^ldSLKiG>zyByUda)F9z{b7ppV#2(;}`>E++bG{nVdj;soJVlFRfm
zYK)2MAyov`L<Q-JH|>~Gs(3<K1OGD-rNLuLHK;7{bWl5}bgG-ioo0&|W7;+F-d2xZ
z1TGV4#29T6C*;HrWR#;2liVt@Dxy~d;C%?95p2aLGiiVwV1G7!1ENW0lC8ntxczQS
zKAB9n#@I^fRY51fHo$GJuO{1Y<Qfq&oogXH<Xcfa&Z?Sto@yTTwPMLR<a?5Bit2kQ
z7w2Vj`sI$xwD$w8$|(ZS1H`I<@k4Iwd+EP5^yGF|3SW`WhtK<0$md`Aeb;`1^GxSB
z2k`~4lCR{2@XT@fb@u>{%BAS6zef85a;j$(Yw|(&M1yj)EZbSLth2J5>5vb4Qn<i2
zd8aoREDFc7tjEc+Lyz5`nGrfS)cZO<CGYp1$}UhelW%MCB}@)(zQOP&!w$oqjQKCV
zG)N-5R9XoF7{KP4XrIw*3>qOrr>`%kv9kgnNx2SIxf1gn1HYooH3Ib-5i87Lv9xSn
z=l%2YPTwODX5Qpif_Xvi_nqw?U~eA&sd8b}e1bLgURrdWf-nc=nd~(jmV4PD-H1nh
F{{h4_J$C>A