Merge branch 'maint'

21 files changed, 497 insertions, 0 deletions

diff --git a/gr-vocoder/CMakeLists.txt b/gr-vocoder/CMakeLists.txt
index f32ecdd9c..e800cff00 100644
--- a/gr-vocoder/CMakeLists.txt
+++ b/gr-vocoder/CMakeLists.txt
@@ -90,6 +90,7 @@ add_subdirectory(doc)
 if(ENABLE_PYTHON)
     add_subdirectory(swig)
     add_subdirectory(python)
+    add_subdirectory(grc)
     add_subdirectory(examples)
 endif(ENABLE_PYTHON)
 
diff --git a/gr-vocoder/grc/CMakeLists.txt b/gr-vocoder/grc/CMakeLists.txt
new file mode 100644
index 000000000..f8cf8231b
--- /dev/null
+++ b/gr-vocoder/grc/CMakeLists.txt
@@ -0,0 +1,42 @@
+# Copyright 2011 Free Software Foundation, Inc.
+#
+# This file is part of GNU Radio
+#
+# GNU Radio is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3, or (at your option)
+# any later version.
+#
+# GNU Radio is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNU Radio; see the file COPYING.  If not, write to
+# the Free Software Foundation, Inc., 51 Franklin Street,
+# Boston, MA 02110-1301, USA.
+
+install(FILES
+    vocoder_alaw_decode_bs.xml
+    vocoder_alaw_encode_sb.xml
+    vocoder_block_tree.xml
+    vocoder_codec2_decode_ps.xml
+    vocoder_codec2_encode_sp.xml
+    vocoder_cvsd_decode_bs.xml
+    vocoder_cvsd_decode.xml
+    vocoder_cvsd_encode_sb.xml
+    vocoder_cvsd_encode.xml
+    vocoder_g721_decode_bs.xml
+    vocoder_g721_encode_sb.xml
+    vocoder_g723_24_decode_bs.xml
+    vocoder_g723_24_encode_sb.xml
+    vocoder_g723_40_decode_bs.xml
+    vocoder_g723_40_encode_sb.xml
+    vocoder_gsm_fr_decode_ps.xml
+    vocoder_gsm_fr_encode_sp.xml
+    vocoder_ulaw_decode_bs.xml
+    vocoder_ulaw_encode_sb.xml
+    DESTINATION ${GRC_BLOCKS_DIR}
+    COMPONENT "vocoder_python"
+)
diff --git a/gr-vocoder/grc/vocoder_alaw_decode_bs.xml b/gr-vocoder/grc/vocoder_alaw_decode_bs.xml
new file mode 100644
index 000000000..776187d4d
--- /dev/null
+++ b/gr-vocoder/grc/vocoder_alaw_decode_bs.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<!--
+###################################################
+## Alaw audio decoder
+###################################################
+ -->
+<block>
+	<name>Alaw Audio Decoder</name>
+	<key>vocoder_alaw_decode_bs</key>
+	<import>from gnuradio import vocoder</import>
+	<make>vocoder.alaw_decode_bs()</make>
+	<sink>
+		<name>in</name>
+		<type>byte</type>
+	</sink>
+	<source>
+		<name>out</name>
+		<type>short</type>
+	</source>
+</block>
diff --git a/gr-vocoder/grc/vocoder_alaw_encode_sb.xml b/gr-vocoder/grc/vocoder_alaw_encode_sb.xml
new file mode 100644
index 000000000..0ad8eca12
--- /dev/null
+++ b/gr-vocoder/grc/vocoder_alaw_encode_sb.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<!--
+###################################################
+## Alaw audio encoder
+###################################################
+ -->
+<block>
+	<name>g711 alaw Audio Encoder</name>
+	<key>vocoder_alaw_encode_sb</key>
+	<import>from gnuradio import vocoder</import>
+	<make>vocoder.alaw_encode_sb()</make>
+	<sink>
+		<name>in</name>
+		<type>short</type>
+	</sink>
+	<source>
+		<name>out</name>
+		<type>byte</type>
+	</source>
+</block>
+
+
diff --git a/gr-vocoder/grc/vocoder_block_tree.xml b/gr-vocoder/grc/vocoder_block_tree.xml
new file mode 100644
index 000000000..0c0fdd4a0
--- /dev/null
+++ b/gr-vocoder/grc/vocoder_block_tree.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0"?>
+
+<!--
+ Copyright 2011 Free Software Foundation, Inc.
+ 
+ This file is part of GNU Radio
+ 
+ GNU Radio is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3, or (at your option)
+ any later version.
+ 
+ GNU Radio is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ 
+ You should have received a copy of the GNU General Public License
+ along with GNU Radio; see the file COPYING.  If not, write to
+ the Free Software Foundation, Inc., 51 Franklin Street,
+ Boston, MA 02110-1301, USA.
+-->
+
+<!--
+###################################################
+##Block Tree for GR Digital blocks.
+###################################################
+ -->
+<cat>
+	<name></name> <!-- Blank for Root Name -->
+	<cat>
+		<name>Vocoders</name>
+		<block>vocoder_binary_slicer_fb</block>
+		<block>vocoder_alaw_decode_bs</block>
+		<block>vocoder_alaw_encode_sb</block>
+		<block>vocoder_codec2_decode_ps</block>
+		<block>vocoder_codec2_encode_sp</block>
+		<block>vocoder_cvsd_decode_bs</block>
+		<block>vocoder_cvsd_encode_sb</block>
+		<block>vocoder_cvsd_decode_bf</block>
+		<block>vocoder_cvsd_encode_fb</block>
+		<block>vocoder_g721_decode_bs</block>
+		<block>vocoder_g721_encode_sb</block>
+		<block>vocoder_g723_24_decode_bs</block>
+		<block>vocoder_g723_24_encode_sb</block>
+		<block>vocoder_g723_40_decode_bs</block>
+		<block>vocoder_g723_40_encode_sb</block>
+		<block>vocoder_gsm_fr_decode_ps</block>
+		<block>vocoder_gsm_fr_encode_sp</block>
+		<block>vocoder_ulaw_decode_bs</block>
+		<block>vocoder_ulaw_encode_sb</block>
+	</cat>
+</cat>
diff --git a/gr-vocoder/grc/vocoder_codec2_decode_ps.xml b/gr-vocoder/grc/vocoder_codec2_decode_ps.xml
new file mode 100644
index 000000000..708882151
--- /dev/null
+++ b/gr-vocoder/grc/vocoder_codec2_decode_ps.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<!--
+###################################################
+## CODEC2 audio decoder
+###################################################
+ -->
+<block>
+	<name>CODEC2 Audio Decoder</name>
+	<key>vocoder_codec2_decode_ps</key>
+	<import>from gnuradio import vocoder</import>
+	<make>vocoder.codec2_decode_ps()</make>
+	<sink>
+		<name>in</name>
+		<type>byte</type>
+	</sink>
+	<source>
+		<name>out</name>
+		<type>short</type>
+	</source>
+</block>
diff --git a/gr-vocoder/grc/vocoder_codec2_encode_sp.xml b/gr-vocoder/grc/vocoder_codec2_encode_sp.xml
new file mode 100644
index 000000000..7a56ac633
--- /dev/null
+++ b/gr-vocoder/grc/vocoder_codec2_encode_sp.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<!--
+###################################################
+## CODEC2 audio encoder
+###################################################
+ -->
+<block>
+	<name>CODEC2 Audio Encoder</name>
+	<key>vocoder_codec2_encode_sp</key>
+	<import>from gnuradio import vocoder</import>
+	<make>vocoder.codec2_encode_sp()</make>
+	<sink>
+		<name>in</name>
+		<type>short</type>
+	</sink>
+	<source>
+		<name>out</name>
+		<type>byte</type>
+	</source>
+</block>
+
+
diff --git a/gr-vocoder/grc/vocoder_cvsd_decode.xml b/gr-vocoder/grc/vocoder_cvsd_decode.xml
new file mode 100644
index 000000000..ce117c5d4
--- /dev/null
+++ b/gr-vocoder/grc/vocoder_cvsd_decode.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+<!--
+###################################################
+## CVSD Encoder
+###################################################
+ -->
+<block>
+	<name>CVSD Decoder</name>
+	<key>vocoder_cvsd_decode_bf</key>
+	<import>from gnuradio import vocoder</import>
+	<make>vocoder.cvsd_decode_bf($resample,$bw)</make>
+	<param>
+	  <name>Resample</name>
+	  <key>resample</key>
+	  <value>8</value>
+	  <type>int</type>
+	</param>
+	<param>
+	  <name>Frac. Bandwidth</name>
+	  <key>bw</key>
+	  <value>0.5</value>
+	  <type>real</type>
+	</param>
+	<sink>
+		<name>in</name>
+		<type>byte</type>
+	</sink>
+	<source>
+		<name>out</name>
+		<type>float</type>
+	</source>
+</block>
diff --git a/gr-vocoder/grc/vocoder_cvsd_decode_bs.xml b/gr-vocoder/grc/vocoder_cvsd_decode_bs.xml
new file mode 100644
index 000000000..40ddc04d4
--- /dev/null
+++ b/gr-vocoder/grc/vocoder_cvsd_decode_bs.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<!--
+###################################################
+## CVSD audio decoder
+###################################################
+ -->
+<block>
+	<name>CVSD Audio Decoder (Raw Bit-Level)</name>
+	<key>vocoder_cvsd_decode_bs</key>
+	<import>from gnuradio import vocoder</import>
+	<make>vocoder.cvsd_decode_bs()</make>
+	<sink>
+		<name>in</name>
+		<type>byte</type>
+	</sink>
+	<source>
+		<name>out</name>
+		<type>short</type>
+	</source>
+</block>
+
diff --git a/gr-vocoder/grc/vocoder_cvsd_encode.xml b/gr-vocoder/grc/vocoder_cvsd_encode.xml
new file mode 100644
index 000000000..12e73f602
--- /dev/null
+++ b/gr-vocoder/grc/vocoder_cvsd_encode.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+<!--
+###################################################
+## CVSD Encoder
+###################################################
+ -->
+<block>
+	<name>CVSD Encoder</name>
+	<key>vocoder_cvsd_encode_fb</key>
+	<import>from gnuradio import vocoder</import>
+	<make>vocoder.cvsd_encode_fb($resample,$bw)</make>
+	<param>
+	  <name>Resample</name>
+	  <key>resample</key>
+	  <value>8</value>
+	  <type>int</type>
+	</param>
+	<param>
+	  <name>Frac. Bandwidth</name>
+	  <key>bw</key>
+	  <value>0.5</value>
+	  <type>real</type>
+	</param>
+	<sink>
+		<name>in</name>
+		<type>float</type>
+	</sink>
+	<source>
+		<name>out</name>
+		<type>byte</type>
+	</source>
+</block>
diff --git a/gr-vocoder/grc/vocoder_cvsd_encode_sb.xml b/gr-vocoder/grc/vocoder_cvsd_encode_sb.xml
new file mode 100644
index 000000000..a92387a60
--- /dev/null
+++ b/gr-vocoder/grc/vocoder_cvsd_encode_sb.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<!--
+###################################################
+## CVSD audio encoder
+###################################################
+ -->
+<block>
+	<name>CVSD Audio Encoder (Raw Bit-Level)</name>
+	<key>vocoder_cvsd_encode_sb</key>
+	<import>from gnuradio import vocoder</import>
+	<make>vocoder.cvsd_encode_sb()</make>
+	<sink>
+		<name>in</name>
+		<type>short</type>
+	</sink>
+	<source>
+		<name>out</name>
+		<type>byte</type>
+	</source>
+</block>
+
+
diff --git a/gr-vocoder/grc/vocoder_g721_decode_bs.xml b/gr-vocoder/grc/vocoder_g721_decode_bs.xml
new file mode 100644
index 000000000..e8a64f404
--- /dev/null
+++ b/gr-vocoder/grc/vocoder_g721_decode_bs.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<!--
+###################################################
+## g271 audio decoder
+###################################################
+ -->
+<block>
+	<name>g271 Audio Decoder</name>
+	<key>vocoder_g271_decode_bs</key>
+	<import>from gnuradio import vocoder</import>
+	<make>vocoder.g271_decode_bs()</make>
+	<sink>
+		<name>in</name>
+		<type>byte</type>
+	</sink>
+	<source>
+		<name>out</name>
+		<type>short</type>
+	</source>
+</block>
diff --git a/gr-vocoder/grc/vocoder_g721_encode_sb.xml b/gr-vocoder/grc/vocoder_g721_encode_sb.xml
new file mode 100644
index 000000000..f105ff8ff
--- /dev/null
+++ b/gr-vocoder/grc/vocoder_g721_encode_sb.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<!--
+###################################################
+## g721 audio encoder
+###################################################
+ -->
+<block>
+	<name>g721 Audio Encoder</name>
+	<key>vocoder_g721_encode_sb</key>
+	<import>from gnuradio import vocoder</import>
+	<make>vocoder.g721_encode_sb()</make>
+	<sink>
+		<name>in</name>
+		<type>short</type>
+	</sink>
+	<source>
+		<name>out</name>
+		<type>byte</type>
+	</source>
+</block>
+
+
diff --git a/gr-vocoder/grc/vocoder_g723_24_decode_bs.xml b/gr-vocoder/grc/vocoder_g723_24_decode_bs.xml
new file mode 100644
index 000000000..768f82d8b
--- /dev/null
+++ b/gr-vocoder/grc/vocoder_g723_24_decode_bs.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<!--
+###################################################
+## g273_24 audio decoder
+###################################################
+ -->
+<block>
+	<name>g273_24 Audio Decoder</name>
+	<key>vocoder_g273_24_decode_bs</key>
+	<import>from gnuradio import vocoder</import>
+	<make>vocoder.g273_24_decode_bs()</make>
+	<sink>
+		<name>in</name>
+		<type>byte</type>
+	</sink>
+	<source>
+		<name>out</name>
+		<type>short</type>
+	</source>
+</block>
diff --git a/gr-vocoder/grc/vocoder_g723_24_encode_sb.xml b/gr-vocoder/grc/vocoder_g723_24_encode_sb.xml
new file mode 100644
index 000000000..0e70ddedc
--- /dev/null
+++ b/gr-vocoder/grc/vocoder_g723_24_encode_sb.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<!--
+###################################################
+## g723_24 audio encoder
+###################################################
+ -->
+<block>
+	<name>g723_24 Audio Encoder</name>
+	<key>vocoder_g723_24_encode_sb</key>
+	<import>from gnuradio import vocoder</import>
+	<make>vocoder.g723_24_encode_sb()</make>
+	<sink>
+		<name>in</name>
+		<type>short</type>
+	</sink>
+	<source>
+		<name>out</name>
+		<type>byte</type>
+	</source>
+</block>
+
+
diff --git a/gr-vocoder/grc/vocoder_g723_40_decode_bs.xml b/gr-vocoder/grc/vocoder_g723_40_decode_bs.xml
new file mode 100644
index 000000000..09e31be4c
--- /dev/null
+++ b/gr-vocoder/grc/vocoder_g723_40_decode_bs.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<!--
+###################################################
+## g273_40 audio decoder
+###################################################
+ -->
+<block>
+	<name>g273_40 Audio Decoder</name>
+	<key>vocoder_g273_40_decode_bs</key>
+	<import>from gnuradio import vocoder</import>
+	<make>vocoder.g273_40_decode_bs()</make>
+	<sink>
+		<name>in</name>
+		<type>byte</type>
+	</sink>
+	<source>
+		<name>out</name>
+		<type>short</type>
+	</source>
+</block>
diff --git a/gr-vocoder/grc/vocoder_g723_40_encode_sb.xml b/gr-vocoder/grc/vocoder_g723_40_encode_sb.xml
new file mode 100644
index 000000000..fbbf600ff
--- /dev/null
+++ b/gr-vocoder/grc/vocoder_g723_40_encode_sb.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<!--
+###################################################
+## g723_40 audio encoder
+###################################################
+ -->
+<block>
+	<name>g723_40 Audio Encoder</name>
+	<key>vocoder_g723_40_encode_sb</key>
+	<import>from gnuradio import vocoder</import>
+	<make>vocoder.g723_40_encode_sb()</make>
+	<sink>
+		<name>in</name>
+		<type>short</type>
+	</sink>
+	<source>
+		<name>out</name>
+		<type>byte</type>
+	</source>
+</block>
+
+
diff --git a/gr-vocoder/grc/vocoder_gsm_fr_decode_ps.xml b/gr-vocoder/grc/vocoder_gsm_fr_decode_ps.xml
new file mode 100644
index 000000000..f90890032
--- /dev/null
+++ b/gr-vocoder/grc/vocoder_gsm_fr_decode_ps.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<!--
+###################################################
+## GSM full-rate audio decoder
+###################################################
+ -->
+<block>
+	<name>GSM full-rate Audio Decoder</name>
+	<key>vocoder_gsm_fr_decode_bs</key>
+	<import>from gnuradio import vocoder</import>
+	<make>vocoder.gsm_fr_decode_bs()</make>
+	<sink>
+		<name>in</name>
+		<type>byte</type>
+	</sink>
+	<source>
+		<name>out</name>
+		<type>short</type>
+	</source>
+</block>
diff --git a/gr-vocoder/grc/vocoder_gsm_fr_encode_sp.xml b/gr-vocoder/grc/vocoder_gsm_fr_encode_sp.xml
new file mode 100644
index 000000000..d39994b6b
--- /dev/null
+++ b/gr-vocoder/grc/vocoder_gsm_fr_encode_sp.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<!--
+###################################################
+## GSM full-rate audio encoder
+###################################################
+ -->
+<block>
+	<name>GSM full-rate Audio Encoder</name>
+	<key>vocoder_gsm_fr_encode_sb</key>
+	<import>from gnuradio import vocoder</import>
+	<make>vocoder.gsm_fr_encode_sb()</make>
+	<sink>
+		<name>in</name>
+		<type>short</type>
+	</sink>
+	<source>
+		<name>out</name>
+		<type>byte</type>
+	</source>
+</block>
+
+
diff --git a/gr-vocoder/grc/vocoder_ulaw_decode_bs.xml b/gr-vocoder/grc/vocoder_ulaw_decode_bs.xml
new file mode 100644
index 000000000..5a7ccbb0e
--- /dev/null
+++ b/gr-vocoder/grc/vocoder_ulaw_decode_bs.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<!--
+###################################################
+## Ulaw audio decoder
+###################################################
+ -->
+<block>
+	<name>Ulaw Audio Decoder</name>
+	<key>vocoder_ulaw_decode_bs</key>
+	<import>from gnuradio import vocoder</import>
+	<make>vocoder.ulaw_decode_bs()</make>
+	<sink>
+		<name>in</name>
+		<type>byte</type>
+	</sink>
+	<source>
+		<name>out</name>
+		<type>short</type>
+	</source>
+</block>
diff --git a/gr-vocoder/grc/vocoder_ulaw_encode_sb.xml b/gr-vocoder/grc/vocoder_ulaw_encode_sb.xml
new file mode 100644
index 000000000..8e76d8d08
--- /dev/null
+++ b/gr-vocoder/grc/vocoder_ulaw_encode_sb.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<!--
+###################################################
+## ulaw audio encoder
+###################################################
+ -->
+<block>
+	<name>ulaw Audio Encoder</name>
+	<key>vocoder_ulaw_encode_sb</key>
+	<import>from gnuradio import vocoder</import>
+	<make>vocoder.ulaw_encode_sb()</make>
+	<sink>
+		<name>in</name>
+		<type>short</type>
+	</sink>
+	<source>
+		<name>out</name>
+		<type>byte</type>
+	</source>
+</block>
+
+