From 183d816afa83e83bb39b722239c1245975b8e13e Mon Sep 17 00:00:00 2001 From: Martin Braun Date: Tue, 14 Feb 2012 17:38:16 +0100 Subject: Fixed GRC bindings for vocoder (this also fixes GRC example cvsd_sweep) --- gr-vocoder/CMakeLists.txt | 1 + gr-vocoder/grc/CMakeLists.txt | 42 ++++++++++++++++++++++ gr-vocoder/grc/vocoder_alaw_decode_bs.xml | 20 +++++++++++ gr-vocoder/grc/vocoder_alaw_encode_sb.xml | 22 ++++++++++++ gr-vocoder/grc/vocoder_block_tree.xml | 53 ++++++++++++++++++++++++++++ gr-vocoder/grc/vocoder_codec2_decode_ps.xml | 20 +++++++++++ gr-vocoder/grc/vocoder_codec2_encode_sp.xml | 22 ++++++++++++ gr-vocoder/grc/vocoder_cvsd_decode.xml | 32 +++++++++++++++++ gr-vocoder/grc/vocoder_cvsd_decode_bs.xml | 21 +++++++++++ gr-vocoder/grc/vocoder_cvsd_encode.xml | 32 +++++++++++++++++ gr-vocoder/grc/vocoder_cvsd_encode_sb.xml | 22 ++++++++++++ gr-vocoder/grc/vocoder_g721_decode_bs.xml | 20 +++++++++++ gr-vocoder/grc/vocoder_g721_encode_sb.xml | 22 ++++++++++++ gr-vocoder/grc/vocoder_g723_24_decode_bs.xml | 20 +++++++++++ gr-vocoder/grc/vocoder_g723_24_encode_sb.xml | 22 ++++++++++++ gr-vocoder/grc/vocoder_g723_40_decode_bs.xml | 20 +++++++++++ gr-vocoder/grc/vocoder_g723_40_encode_sb.xml | 22 ++++++++++++ gr-vocoder/grc/vocoder_gsm_fr_decode_ps.xml | 20 +++++++++++ gr-vocoder/grc/vocoder_gsm_fr_encode_sp.xml | 22 ++++++++++++ gr-vocoder/grc/vocoder_ulaw_decode_bs.xml | 20 +++++++++++ gr-vocoder/grc/vocoder_ulaw_encode_sb.xml | 22 ++++++++++++ 21 files changed, 497 insertions(+) create mode 100644 gr-vocoder/grc/CMakeLists.txt create mode 100644 gr-vocoder/grc/vocoder_alaw_decode_bs.xml create mode 100644 gr-vocoder/grc/vocoder_alaw_encode_sb.xml create mode 100644 gr-vocoder/grc/vocoder_block_tree.xml create mode 100644 gr-vocoder/grc/vocoder_codec2_decode_ps.xml create mode 100644 gr-vocoder/grc/vocoder_codec2_encode_sp.xml create mode 100644 gr-vocoder/grc/vocoder_cvsd_decode.xml create mode 100644 gr-vocoder/grc/vocoder_cvsd_decode_bs.xml create mode 100644 gr-vocoder/grc/vocoder_cvsd_encode.xml create mode 100644 gr-vocoder/grc/vocoder_cvsd_encode_sb.xml create mode 100644 gr-vocoder/grc/vocoder_g721_decode_bs.xml create mode 100644 gr-vocoder/grc/vocoder_g721_encode_sb.xml create mode 100644 gr-vocoder/grc/vocoder_g723_24_decode_bs.xml create mode 100644 gr-vocoder/grc/vocoder_g723_24_encode_sb.xml create mode 100644 gr-vocoder/grc/vocoder_g723_40_decode_bs.xml create mode 100644 gr-vocoder/grc/vocoder_g723_40_encode_sb.xml create mode 100644 gr-vocoder/grc/vocoder_gsm_fr_decode_ps.xml create mode 100644 gr-vocoder/grc/vocoder_gsm_fr_encode_sp.xml create mode 100644 gr-vocoder/grc/vocoder_ulaw_decode_bs.xml create mode 100644 gr-vocoder/grc/vocoder_ulaw_encode_sb.xml (limited to 'gr-vocoder') 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 @@ + + + + Alaw Audio Decoder + vocoder_alaw_decode_bs + from gnuradio import vocoder + vocoder.alaw_decode_bs() + + in + byte + + + out + short + + 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 @@ + + + + g711 alaw Audio Encoder + vocoder_alaw_encode_sb + from gnuradio import vocoder + vocoder.alaw_encode_sb() + + in + short + + + out + byte + + + + 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 @@ + + + + + + + + + Vocoders + vocoder_binary_slicer_fb + vocoder_alaw_decode_bs + vocoder_alaw_encode_sb + vocoder_codec2_decode_ps + vocoder_codec2_encode_sp + vocoder_cvsd_decode_bs + vocoder_cvsd_encode_sb + vocoder_cvsd_decode_bf + vocoder_cvsd_encode_fb + vocoder_g721_decode_bs + vocoder_g721_encode_sb + vocoder_g723_24_decode_bs + vocoder_g723_24_encode_sb + vocoder_g723_40_decode_bs + vocoder_g723_40_encode_sb + vocoder_gsm_fr_decode_ps + vocoder_gsm_fr_encode_sp + vocoder_ulaw_decode_bs + vocoder_ulaw_encode_sb + + 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 @@ + + + + CODEC2 Audio Decoder + vocoder_codec2_decode_ps + from gnuradio import vocoder + vocoder.codec2_decode_ps() + + in + byte + + + out + short + + 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 @@ + + + + CODEC2 Audio Encoder + vocoder_codec2_encode_sp + from gnuradio import vocoder + vocoder.codec2_encode_sp() + + in + short + + + out + byte + + + + 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 @@ + + + + CVSD Decoder + vocoder_cvsd_decode_bf + from gnuradio import vocoder + vocoder.cvsd_decode_bf($resample,$bw) + + Resample + resample + 8 + int + + + Frac. Bandwidth + bw + 0.5 + real + + + in + byte + + + out + float + + 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 @@ + + + + CVSD Audio Decoder (Raw Bit-Level) + vocoder_cvsd_decode_bs + from gnuradio import vocoder + vocoder.cvsd_decode_bs() + + in + byte + + + out + short + + + 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 @@ + + + + CVSD Encoder + vocoder_cvsd_encode_fb + from gnuradio import vocoder + vocoder.cvsd_encode_fb($resample,$bw) + + Resample + resample + 8 + int + + + Frac. Bandwidth + bw + 0.5 + real + + + in + float + + + out + byte + + 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 @@ + + + + CVSD Audio Encoder (Raw Bit-Level) + vocoder_cvsd_encode_sb + from gnuradio import vocoder + vocoder.cvsd_encode_sb() + + in + short + + + out + byte + + + + 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 @@ + + + + g271 Audio Decoder + vocoder_g271_decode_bs + from gnuradio import vocoder + vocoder.g271_decode_bs() + + in + byte + + + out + short + + 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 @@ + + + + g721 Audio Encoder + vocoder_g721_encode_sb + from gnuradio import vocoder + vocoder.g721_encode_sb() + + in + short + + + out + byte + + + + 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 @@ + + + + g273_24 Audio Decoder + vocoder_g273_24_decode_bs + from gnuradio import vocoder + vocoder.g273_24_decode_bs() + + in + byte + + + out + short + + 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 @@ + + + + g723_24 Audio Encoder + vocoder_g723_24_encode_sb + from gnuradio import vocoder + vocoder.g723_24_encode_sb() + + in + short + + + out + byte + + + + 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 @@ + + + + g273_40 Audio Decoder + vocoder_g273_40_decode_bs + from gnuradio import vocoder + vocoder.g273_40_decode_bs() + + in + byte + + + out + short + + 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 @@ + + + + g723_40 Audio Encoder + vocoder_g723_40_encode_sb + from gnuradio import vocoder + vocoder.g723_40_encode_sb() + + in + short + + + out + byte + + + + 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 @@ + + + + GSM full-rate Audio Decoder + vocoder_gsm_fr_decode_bs + from gnuradio import vocoder + vocoder.gsm_fr_decode_bs() + + in + byte + + + out + short + + 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 @@ + + + + GSM full-rate Audio Encoder + vocoder_gsm_fr_encode_sb + from gnuradio import vocoder + vocoder.gsm_fr_encode_sb() + + in + short + + + out + byte + + + + 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 @@ + + + + Ulaw Audio Decoder + vocoder_ulaw_decode_bs + from gnuradio import vocoder + vocoder.ulaw_decode_bs() + + in + byte + + + out + short + + 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 @@ + + + + ulaw Audio Encoder + vocoder_ulaw_encode_sb + from gnuradio import vocoder + vocoder.ulaw_encode_sb() + + in + short + + + out + byte + + + + -- cgit