diff options
| -rw-r--r-- | gr-vocoder/examples/Makefile.am | 1 | ||||
| -rwxr-xr-x | gr-vocoder/examples/alaw_audio_loopback.py | 45 | ||||
| -rw-r--r-- | gr-vocoder/include/Makefile.am | 2 | ||||
| -rw-r--r-- | gr-vocoder/include/vocoder_alaw_decode_bs.h | 55 | ||||
| -rw-r--r-- | gr-vocoder/include/vocoder_alaw_encode_sb.h | 54 | ||||
| -rw-r--r-- | gr-vocoder/lib/Makefile.am | 2 | ||||
| -rw-r--r-- | gr-vocoder/lib/vocoder_alaw_decode_bs.cc | 65 | ||||
| -rw-r--r-- | gr-vocoder/lib/vocoder_alaw_encode_sb.cc | 63 | ||||
| -rw-r--r-- | gr-vocoder/python/Makefile.am | 1 | ||||
| -rwxr-xr-x | gr-vocoder/python/qa_alaw_vocoder.py | 39 | ||||
| -rw-r--r-- | gr-vocoder/swig/Makefile.am | 2 | ||||
| -rw-r--r-- | gr-vocoder/swig/vocoder_alaw_decode_bs.i | 35 | ||||
| -rw-r--r-- | gr-vocoder/swig/vocoder_alaw_encode_sb.i | 35 | ||||
| -rw-r--r-- | gr-vocoder/swig/vocoder_swig.i | 2 |
14 files changed, 401 insertions, 0 deletions
diff --git a/gr-vocoder/examples/Makefile.am b/gr-vocoder/examples/Makefile.am index 7cc469a99..6d881e1a6 100644 --- a/gr-vocoder/examples/Makefile.am +++ b/gr-vocoder/examples/Makefile.am @@ -24,6 +24,7 @@ include $(top_srcdir)/Makefile.common ourdatadir = $(exampledir)/vocoder dist_ourdata_SCRIPTS = \ + alaw_audio_loopback.py \ codec2_audio_loopback.py \ cvsd_audio_loopback.py \ gsm_audio_loopback.py \ diff --git a/gr-vocoder/examples/alaw_audio_loopback.py b/gr-vocoder/examples/alaw_audio_loopback.py new file mode 100755 index 000000000..8fdd64d44 --- /dev/null +++ b/gr-vocoder/examples/alaw_audio_loopback.py @@ -0,0 +1,45 @@ +#!/usr/bin/env python +# +# 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. +# + +from gnuradio import gr +from gnuradio import audio +from gnuradio import vocoder + +def build_graph(): + tb = gr.top_block() + src = audio.source(8000) + src_scale = gr.multiply_const_ff(32767) + f2s = gr.float_to_short () + enc = vocoder.alaw_encode_sb() + dec = vocoder.alaw_decode_bs() + s2f = gr.short_to_float () + sink_scale = gr.multiply_const_ff(1.0/32767.) + sink = audio.sink(8000) + tb.connect(src, src_scale, f2s, enc, dec, s2f, sink_scale, sink) + return tb + +if __name__ == '__main__': + tb = build_graph() + tb.start() + raw_input ('Press Enter to exit: ') + tb.stop() + tb.wait() diff --git a/gr-vocoder/include/Makefile.am b/gr-vocoder/include/Makefile.am index 495e1a827..06c649680 100644 --- a/gr-vocoder/include/Makefile.am +++ b/gr-vocoder/include/Makefile.am @@ -23,6 +23,8 @@ include $(top_srcdir)/Makefile.common # C/C++ headers get installed in ${prefix}/include/gnuradio grinclude_HEADERS = \ + vocoder_alaw_decode_bs.h \ + vocoder_alaw_encode_sb.h \ vocoder_codec2_decode_ps.h \ vocoder_codec2_encode_sp.h \ vocoder_cvsd_decode_bs.h \ diff --git a/gr-vocoder/include/vocoder_alaw_decode_bs.h b/gr-vocoder/include/vocoder_alaw_decode_bs.h new file mode 100644 index 000000000..b71569439 --- /dev/null +++ b/gr-vocoder/include/vocoder_alaw_decode_bs.h @@ -0,0 +1,55 @@ +/* -*- c++ -*- */ +/* + * 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. + */ + +#ifndef INCLUDED_VOCODER_ALAW_DECODE_BS_H +#define INCLUDED_VOCODER_ALAW_DECODE_BS_H + +#include <gr_sync_block.h> + +class vocoder_alaw_decode_bs; + +typedef boost::shared_ptr<vocoder_alaw_decode_bs> vocoder_alaw_decode_bs_sptr; + +vocoder_alaw_decode_bs_sptr vocoder_make_alaw_decode_bs(); + +/*! + * \brief This block performs alaw audio decoding. + * + * \ingroup vocoder_blk + */ + +class vocoder_alaw_decode_bs : public gr_sync_block +{ +private: + friend vocoder_alaw_decode_bs_sptr vocoder_make_alaw_decode_bs(); + + vocoder_alaw_decode_bs(); + + public: + ~vocoder_alaw_decode_bs(); + + int work(int noutput_items, + gr_vector_const_void_star &input_items, + gr_vector_void_star &output_items); +}; + +#endif /* INCLUDED_VOCODER_ALAW_DECODE_BS_H */ diff --git a/gr-vocoder/include/vocoder_alaw_encode_sb.h b/gr-vocoder/include/vocoder_alaw_encode_sb.h new file mode 100644 index 000000000..d1858d048 --- /dev/null +++ b/gr-vocoder/include/vocoder_alaw_encode_sb.h @@ -0,0 +1,54 @@ +/* -*- c++ -*- */ +/* + * 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. + */ + +#ifndef INCLUDED_VOCODER_ALAW_ENCODER_SB_H +#define INCLUDED_VOCODER_ALAW_ENCODER_SB_H + +#include <gr_sync_block.h> + +class vocoder_alaw_encode_sb; + +typedef boost::shared_ptr<vocoder_alaw_encode_sb> vocoder_alaw_encode_sb_sptr; + +vocoder_alaw_encode_sb_sptr vocoder_make_alaw_encode_sb(); + +/*! + * \brief This block performs g.711 alaw audio encoding. + * + * \ingroup vocoder_blk + */ +class vocoder_alaw_encode_sb : public gr_sync_block +{ +private: + friend vocoder_alaw_encode_sb_sptr vocoder_make_alaw_encode_sb(); + + vocoder_alaw_encode_sb(); + + public: + ~vocoder_alaw_encode_sb(); + + int work(int noutput_items, + gr_vector_const_void_star &input_items, + gr_vector_void_star &output_items); +}; + +#endif /* INCLUDED_VOCODER_ALAW_ENCODE_SB_H */ diff --git a/gr-vocoder/lib/Makefile.am b/gr-vocoder/lib/Makefile.am index f5e3e2240..e05d61f3c 100644 --- a/gr-vocoder/lib/Makefile.am +++ b/gr-vocoder/lib/Makefile.am @@ -29,6 +29,8 @@ AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES) \ lib_LTLIBRARIES = libgnuradio-vocoder.la libgnuradio_vocoder_la_SOURCES = \ + vocoder_alaw_decode_bs.cc \ + vocoder_alaw_encode_sb.cc \ vocoder_codec2_decode_ps.cc \ vocoder_codec2_encode_sp.cc \ vocoder_cvsd_encode_sb.cc \ diff --git a/gr-vocoder/lib/vocoder_alaw_decode_bs.cc b/gr-vocoder/lib/vocoder_alaw_decode_bs.cc new file mode 100644 index 000000000..7ffdddd81 --- /dev/null +++ b/gr-vocoder/lib/vocoder_alaw_decode_bs.cc @@ -0,0 +1,65 @@ +/* -*- c++ -*- */ +/* + * 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. + */ + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#include <vocoder_alaw_decode_bs.h> +#include <gr_io_signature.h> +#include <limits.h> + +extern "C" { +#include "g7xx/g72x.h" +} + +vocoder_alaw_decode_bs_sptr vocoder_make_alaw_decode_bs() +{ + return gnuradio::get_initial_sptr(new vocoder_alaw_decode_bs()); +} + +vocoder_alaw_decode_bs::vocoder_alaw_decode_bs() + : gr_sync_block("vocoder_alaw_decode_bs", + gr_make_io_signature (1, 1, sizeof (unsigned char)), + gr_make_io_signature (1, 1, sizeof (short))) +{ +} + +vocoder_alaw_decode_bs::~vocoder_alaw_decode_bs() +{ +} + + + +int +vocoder_alaw_decode_bs::work(int noutput_items, + gr_vector_const_void_star &input_items, + gr_vector_void_star &output_items) +{ + const unsigned char *in = (const unsigned char *)input_items[0]; + short *out = (short *)output_items[0]; + + for(int i = 0; i < noutput_items; i++) + out[i] = alaw2linear(in[i]); + + return noutput_items; +} diff --git a/gr-vocoder/lib/vocoder_alaw_encode_sb.cc b/gr-vocoder/lib/vocoder_alaw_encode_sb.cc new file mode 100644 index 000000000..e4d975271 --- /dev/null +++ b/gr-vocoder/lib/vocoder_alaw_encode_sb.cc @@ -0,0 +1,63 @@ +/* -*- c++ -*- */ +/* + * 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. + */ + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#include <vocoder_alaw_encode_sb.h> +#include <gr_io_signature.h> +#include <limits.h> + +extern "C" { +#include "g7xx/g72x.h" +} + +vocoder_alaw_encode_sb_sptr vocoder_make_alaw_encode_sb() +{ + return gnuradio::get_initial_sptr(new vocoder_alaw_encode_sb()); +} + +vocoder_alaw_encode_sb::vocoder_alaw_encode_sb() + : gr_sync_block("vocoder_alaw_encode_sb", + gr_make_io_signature (1, 1, sizeof(short)), + gr_make_io_signature (1, 1, sizeof(unsigned char))) +{ +} + +vocoder_alaw_encode_sb::~vocoder_alaw_encode_sb() +{ +} + +int +vocoder_alaw_encode_sb::work(int noutput_items, + gr_vector_const_void_star &input_items, + gr_vector_void_star &output_items) +{ + const short *in = (const short *)input_items[0]; + unsigned char *out = (unsigned char *)output_items[0]; + + for(int i = 0; i < noutput_items; i++) + out[i] = linear2alaw(in[i]); + + return noutput_items; +} diff --git a/gr-vocoder/python/Makefile.am b/gr-vocoder/python/Makefile.am index 888dfbdf9..256b46005 100644 --- a/gr-vocoder/python/Makefile.am +++ b/gr-vocoder/python/Makefile.am @@ -26,6 +26,7 @@ vocoderdir = $(grpythondir)/vocoder TESTS = run_tests noinst_PYTHON = \ + qa_alaw_vocoder.py \ qa_codec2_vocoder.py \ qa_cvsd_vocoder.py \ qa_gsm_full_rate.py \ diff --git a/gr-vocoder/python/qa_alaw_vocoder.py b/gr-vocoder/python/qa_alaw_vocoder.py new file mode 100755 index 000000000..b7b937138 --- /dev/null +++ b/gr-vocoder/python/qa_alaw_vocoder.py @@ -0,0 +1,39 @@ +#!/usr/bin/env python +# +# 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. +# + +from gnuradio import gr, gr_unittest +from vocoder_swig import * + +class test_alaw_vocoder (gr_unittest.TestCase): + + def setUp (self): + self.tb = gr.top_block() + + def tearDown (self): + self.tb = None + + def test001_module_load (self): + enc = alaw_encode_sb(); + dec = alaw_decode_bs(); + +if __name__ == '__main__': + gr_unittest.run(test_alaw_vocoder, "test_alaw_vocoder.xml") diff --git a/gr-vocoder/swig/Makefile.am b/gr-vocoder/swig/Makefile.am index 53711656f..b2a331394 100644 --- a/gr-vocoder/swig/Makefile.am +++ b/gr-vocoder/swig/Makefile.am @@ -57,6 +57,8 @@ vocoder_swig_la_swig_libadd = \ # additional SWIG files to be installed vocoder_swig_swiginclude_headers = \ + vocoder_alaw_decode_bs.i \ + vocoder_alaw_encode_sb.i \ vocoder_codec2_decode_ps.i \ vocoder_codec2_encode_sp.i \ vocoder_cvsd_decode_bs.i \ diff --git a/gr-vocoder/swig/vocoder_alaw_decode_bs.i b/gr-vocoder/swig/vocoder_alaw_decode_bs.i new file mode 100644 index 000000000..f789c454f --- /dev/null +++ b/gr-vocoder/swig/vocoder_alaw_decode_bs.i @@ -0,0 +1,35 @@ +/* -*- c++ -*- */ +/* + * 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. + */ + +%{ +#include "vocoder_alaw_decode_bs.h" +%} + +GR_SWIG_BLOCK_MAGIC(vocoder,alaw_decode_bs); + +vocoder_alaw_decode_bs_sptr vocoder_make_alaw_decode_bs(); + +class vocoder_alaw_decode_bs : public gr_sync_block +{ +private: + vocoder_alaw_decode_bs(); +}; diff --git a/gr-vocoder/swig/vocoder_alaw_encode_sb.i b/gr-vocoder/swig/vocoder_alaw_encode_sb.i new file mode 100644 index 000000000..9fe537d55 --- /dev/null +++ b/gr-vocoder/swig/vocoder_alaw_encode_sb.i @@ -0,0 +1,35 @@ +/* -*- c++ -*- */ +/* + * 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. + */ + +%{ +#include "vocoder_alaw_encode_sb.h" +%} + +GR_SWIG_BLOCK_MAGIC(vocoder,alaw_encode_sb); + +vocoder_alaw_encode_sb_sptr vocoder_make_alaw_encode_sb(); + +class vocoder_alaw_encode_sb : public gr_sync_block +{ +private: + vocoder_alaw_encode_sb(); +}; diff --git a/gr-vocoder/swig/vocoder_swig.i b/gr-vocoder/swig/vocoder_swig.i index 72a7eace9..b339cc7a4 100644 --- a/gr-vocoder/swig/vocoder_swig.i +++ b/gr-vocoder/swig/vocoder_swig.i @@ -22,6 +22,8 @@ %include "gnuradio.i" +%include "vocoder_alaw_decode_bs.i" +%include "vocoder_alaw_encode_sb.i" %include "vocoder_codec2_encode_sp.i" %include "vocoder_codec2_decode_ps.i" %include "vocoder_cvsd_decode_bs.i" |