summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjcorgan2008-04-09 15:26:29 +0000
committerjcorgan2008-04-09 15:26:29 +0000
commit873a61258e6e8456b5d48a264e9a28d1246bf149 (patch)
treee102c2924db544341cad88a4fbc8fe68bb96e411
parent10c5ad2192eec80b3690baa2f44e28b83a96b3b3 (diff)
downloadgnuradio-873a61258e6e8456b5d48a264e9a28d1246bf149.tar.gz
gnuradio-873a61258e6e8456b5d48a264e9a28d1246bf149.tar.bz2
gnuradio-873a61258e6e8456b5d48a264e9a28d1246bf149.zip
Fixes ticket:238. (Tim Meehan)
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@8163 221aa14e-8319-0410-a670-987f0aec2ac5
-rw-r--r--gnuradio-core/src/lib/io/gri_wavfile.cc4
-rwxr-xr-xgnuradio-core/src/python/gnuradio/gr/qa_wavefile.py3
2 files changed, 3 insertions, 4 deletions
diff --git a/gnuradio-core/src/lib/io/gri_wavfile.cc b/gnuradio-core/src/lib/io/gri_wavfile.cc
index 4a9db61d8..c1a2b7c73 100644
--- a/gnuradio-core/src/lib/io/gri_wavfile.cc
+++ b/gnuradio-core/src/lib/io/gri_wavfile.cc
@@ -71,7 +71,7 @@ host_to_wav(uint16_t x)
static inline int16_t
host_to_wav(int16_t x)
{
- return bswap_32(x);
+ return bswap_16(x);
}
static inline uint32_t
@@ -89,7 +89,7 @@ wav_to_host(uint16_t x)
static inline int16_t
wav_to_host(int16_t x)
{
- return bswap_32(x);
+ return bswap_16(x);
}
#else
diff --git a/gnuradio-core/src/python/gnuradio/gr/qa_wavefile.py b/gnuradio-core/src/python/gnuradio/gr/qa_wavefile.py
index f6359d82f..c6d376a81 100755
--- a/gnuradio-core/src/python/gnuradio/gr/qa_wavefile.py
+++ b/gnuradio-core/src/python/gnuradio/gr/qa_wavefile.py
@@ -39,8 +39,7 @@ class qa_wavefile(gr_unittest.TestCase):
wf = gr.wavfile_source(g_in_file)
self.assertEqual(wf.sample_rate(), 8000)
- # disabled. Fails on PPC
- def xtest_002_checkwavcopy (self):
+ def test_002_checkwavcopy (self):
infile = g_in_file
outfile = "test_out.wav"