diff options
| -rw-r--r-- | gr-vocoder/examples/Makefile.am | 3 | ||||
| -rwxr-xr-x | gr-vocoder/examples/ulaw_audio_loopback.py | 45 | ||||
| -rw-r--r-- | gr-vocoder/include/Makefile.am | 4 | ||||
| -rw-r--r-- | gr-vocoder/include/vocoder_ulaw_decode_bs.h | 55 | ||||
| -rw-r--r-- | gr-vocoder/include/vocoder_ulaw_encode_sb.h | 54 | ||||
| -rw-r--r-- | gr-vocoder/lib/Makefile.am | 4 | ||||
| -rw-r--r-- | gr-vocoder/lib/vocoder_ulaw_decode_bs.cc | 65 | ||||
| -rw-r--r-- | gr-vocoder/lib/vocoder_ulaw_encode_sb.cc | 63 | ||||
| -rw-r--r-- | gr-vocoder/python/Makefile.am | 3 | ||||
| -rwxr-xr-x | gr-vocoder/python/qa_ulaw_vocoder.py | 39 | ||||
| -rw-r--r-- | gr-vocoder/swig/Makefile.am | 4 | ||||
| -rw-r--r-- | gr-vocoder/swig/vocoder_swig.i | 2 | ||||
| -rw-r--r-- | gr-vocoder/swig/vocoder_ulaw_decode_bs.i | 35 | ||||
| -rw-r--r-- | gr-vocoder/swig/vocoder_ulaw_encode_sb.i | 35 |
14 files changed, 406 insertions, 5 deletions
diff --git a/gr-vocoder/examples/Makefile.am b/gr-vocoder/examples/Makefile.am index 69aa05e26..7cc469a99 100644 --- a/gr-vocoder/examples/Makefile.am +++ b/gr-vocoder/examples/Makefile.am @@ -26,4 +26,5 @@ ourdatadir = $(exampledir)/vocoder dist_ourdata_SCRIPTS = \ codec2_audio_loopback.py \ cvsd_audio_loopback.py \ - gsm_audio_loopback.py + gsm_audio_loopback.py \ + ulaw_audio_loopback.py diff --git a/gr-vocoder/examples/ulaw_audio_loopback.py b/gr-vocoder/examples/ulaw_audio_loopback.py new file mode 100755 index 000000000..afe0921fa --- /dev/null +++ b/gr-vocoder/examples/ulaw_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.ulaw_encode_sb() + dec = vocoder.ulaw_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 472dd4f3c..495e1a827 100644 --- a/gr-vocoder/include/Makefile.am +++ b/gr-vocoder/include/Makefile.am @@ -28,4 +28,6 @@ grinclude_HEADERS = \ vocoder_cvsd_decode_bs.h \ vocoder_cvsd_encode_sb.h \ vocoder_gsm_fr_decode_ps.h \ - vocoder_gsm_fr_encode_sp.h + vocoder_gsm_fr_encode_sp.h \ + vocoder_ulaw_decode_bs.h \ + vocoder_ulaw_encode_sb.h diff --git a/gr-vocoder/include/vocoder_ulaw_decode_bs.h b/gr-vocoder/include/vocoder_ulaw_decode_bs.h new file mode 100644 index 000000000..1126c6cb3 --- /dev/null +++ b/gr-vocoder/include/vocoder_ulaw_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_ULAW_DECODE_BS_H +#define INCLUDED_VOCODER_ULAW_DECODE_BS_H + +#include <gr_sync_block.h> + +class vocoder_ulaw_decode_bs; + +typedef boost::shared_ptr<vocoder_ulaw_decode_bs> vocoder_ulaw_decode_bs_sptr; + +vocoder_ulaw_decode_bs_sptr vocoder_make_ulaw_decode_bs(); + +/*! + * \brief This block performs ulaw audio decoding. + * + * \ingroup vocoder_blk + */ + +class vocoder_ulaw_decode_bs : public gr_sync_block +{ +private: + friend vocoder_ulaw_decode_bs_sptr vocoder_make_ulaw_decode_bs(); + + vocoder_ulaw_decode_bs(); + + public: + ~vocoder_ulaw_decode_bs(); + + int work(int noutput_items, + gr_vector_const_void_star &input_items, + gr_vector_void_star &output_items); +}; + +#endif /* INCLUDED_VOCODER_ULAW_DECODE_BS_H */ diff --git a/gr-vocoder/include/vocoder_ulaw_encode_sb.h b/gr-vocoder/include/vocoder_ulaw_encode_sb.h new file mode 100644 index 000000000..eddc4f4e5 --- /dev/null +++ b/gr-vocoder/include/vocoder_ulaw_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_ULAW_ENCODER_SB_H +#define INCLUDED_VOCODER_ULAW_ENCODER_SB_H + +#include <gr_sync_block.h> + +class vocoder_ulaw_encode_sb; + +typedef boost::shared_ptr<vocoder_ulaw_encode_sb> vocoder_ulaw_encode_sb_sptr; + +vocoder_ulaw_encode_sb_sptr vocoder_make_ulaw_encode_sb(); + +/*! + * \brief This block performs g.711 ulaw audio encoding. + * + * \ingroup vocoder_blk + */ +class vocoder_ulaw_encode_sb : public gr_sync_block +{ +private: + friend vocoder_ulaw_encode_sb_sptr vocoder_make_ulaw_encode_sb(); + + vocoder_ulaw_encode_sb(); + + public: + ~vocoder_ulaw_encode_sb(); + + int work(int noutput_items, + gr_vector_const_void_star &input_items, + gr_vector_void_star &output_items); +}; + +#endif /* INCLUDED_VOCODER_ULAW_ENCODE_SB_H */ diff --git a/gr-vocoder/lib/Makefile.am b/gr-vocoder/lib/Makefile.am index 44ad67756..f5e3e2240 100644 --- a/gr-vocoder/lib/Makefile.am +++ b/gr-vocoder/lib/Makefile.am @@ -34,7 +34,9 @@ libgnuradio_vocoder_la_SOURCES = \ vocoder_cvsd_encode_sb.cc \ vocoder_cvsd_decode_bs.cc \ vocoder_gsm_fr_decode_ps.cc \ - vocoder_gsm_fr_encode_sp.cc + vocoder_gsm_fr_encode_sp.cc \ + vocoder_ulaw_decode_bs.cc \ + vocoder_ulaw_encode_sb.cc libgnuradio_vocoder_la_LIBADD = \ $(GNURADIO_CORE_LA) \ diff --git a/gr-vocoder/lib/vocoder_ulaw_decode_bs.cc b/gr-vocoder/lib/vocoder_ulaw_decode_bs.cc new file mode 100644 index 000000000..3ade9d3f0 --- /dev/null +++ b/gr-vocoder/lib/vocoder_ulaw_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_ulaw_decode_bs.h> +#include <gr_io_signature.h> +#include <limits.h> + +extern "C" { +#include "g7xx/g72x.h" +} + +vocoder_ulaw_decode_bs_sptr vocoder_make_ulaw_decode_bs() +{ + return gnuradio::get_initial_sptr(new vocoder_ulaw_decode_bs()); +} + +vocoder_ulaw_decode_bs::vocoder_ulaw_decode_bs() + : gr_sync_block("vocoder_ulaw_decode_bs", + gr_make_io_signature (1, 1, sizeof (unsigned char)), + gr_make_io_signature (1, 1, sizeof (short))) +{ +} + +vocoder_ulaw_decode_bs::~vocoder_ulaw_decode_bs() +{ +} + + + +int +vocoder_ulaw_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] = ulaw2linear(in[i]); + + return noutput_items; +} diff --git a/gr-vocoder/lib/vocoder_ulaw_encode_sb.cc b/gr-vocoder/lib/vocoder_ulaw_encode_sb.cc new file mode 100644 index 000000000..19c53d72c --- /dev/null +++ b/gr-vocoder/lib/vocoder_ulaw_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_ulaw_encode_sb.h> +#include <gr_io_signature.h> +#include <limits.h> + +extern "C" { +#include "g7xx/g72x.h" +} + +vocoder_ulaw_encode_sb_sptr vocoder_make_ulaw_encode_sb() +{ + return gnuradio::get_initial_sptr(new vocoder_ulaw_encode_sb()); +} + +vocoder_ulaw_encode_sb::vocoder_ulaw_encode_sb() + : gr_sync_block("vocoder_ulaw_encode_sb", + gr_make_io_signature (1, 1, sizeof(short)), + gr_make_io_signature (1, 1, sizeof(unsigned char))) +{ +} + +vocoder_ulaw_encode_sb::~vocoder_ulaw_encode_sb() +{ +} + +int +vocoder_ulaw_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] = linear2ulaw(in[i]); + + return noutput_items; +} diff --git a/gr-vocoder/python/Makefile.am b/gr-vocoder/python/Makefile.am index 1afbc9232..888dfbdf9 100644 --- a/gr-vocoder/python/Makefile.am +++ b/gr-vocoder/python/Makefile.am @@ -28,7 +28,8 @@ TESTS = run_tests noinst_PYTHON = \ qa_codec2_vocoder.py \ qa_cvsd_vocoder.py \ - qa_gsm_full_rate.py + qa_gsm_full_rate.py \ + qa_ulaw_vocoder.py vocoder_PYTHON = \ __init__.py \ diff --git a/gr-vocoder/python/qa_ulaw_vocoder.py b/gr-vocoder/python/qa_ulaw_vocoder.py new file mode 100755 index 000000000..0e201638c --- /dev/null +++ b/gr-vocoder/python/qa_ulaw_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_ulaw_vocoder (gr_unittest.TestCase): + + def setUp (self): + self.tb = gr.top_block() + + def tearDown (self): + self.tb = None + + def test001_module_load (self): + enc = ulaw_encode_sb(); + dec = ulaw_decode_bs(); + +if __name__ == '__main__': + gr_unittest.run(test_ulaw_vocoder, "test_ulaw_vocoder.xml") diff --git a/gr-vocoder/swig/Makefile.am b/gr-vocoder/swig/Makefile.am index fbfd18c7c..53711656f 100644 --- a/gr-vocoder/swig/Makefile.am +++ b/gr-vocoder/swig/Makefile.am @@ -62,7 +62,9 @@ vocoder_swig_swiginclude_headers = \ vocoder_cvsd_decode_bs.i \ vocoder_cvsd_encode_sb.i \ vocoder_gsm_fr_encode_sp.i \ - vocoder_gsm_fr_decode_ps.i + vocoder_gsm_fr_decode_ps.i \ + vocoder_ulaw_decode_bs.i \ + vocoder_ulaw_encode_sb.i vocoder_swig_swig_args = \ -I$(abs_top_builddir)/gr-vocoder/lib diff --git a/gr-vocoder/swig/vocoder_swig.i b/gr-vocoder/swig/vocoder_swig.i index 9edb0dc0c..72a7eace9 100644 --- a/gr-vocoder/swig/vocoder_swig.i +++ b/gr-vocoder/swig/vocoder_swig.i @@ -28,6 +28,8 @@ %include "vocoder_cvsd_encode_sb.i" %include "vocoder_gsm_fr_encode_sp.i" %include "vocoder_gsm_fr_decode_ps.i" +%include "vocoder_ulaw_decode_bs.i" +%include "vocoder_ulaw_encode_sb.i" #if SWIGGUILE %scheme %{ diff --git a/gr-vocoder/swig/vocoder_ulaw_decode_bs.i b/gr-vocoder/swig/vocoder_ulaw_decode_bs.i new file mode 100644 index 000000000..5e8e8c9ae --- /dev/null +++ b/gr-vocoder/swig/vocoder_ulaw_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_ulaw_decode_bs.h" +%} + +GR_SWIG_BLOCK_MAGIC(vocoder,ulaw_decode_bs); + +vocoder_ulaw_decode_bs_sptr vocoder_make_ulaw_decode_bs(); + +class vocoder_ulaw_decode_bs : public gr_sync_block +{ +private: + vocoder_ulaw_decode_bs(); +}; diff --git a/gr-vocoder/swig/vocoder_ulaw_encode_sb.i b/gr-vocoder/swig/vocoder_ulaw_encode_sb.i new file mode 100644 index 000000000..1665df480 --- /dev/null +++ b/gr-vocoder/swig/vocoder_ulaw_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_ulaw_encode_sb.h" +%} + +GR_SWIG_BLOCK_MAGIC(vocoder,ulaw_encode_sb); + +vocoder_ulaw_encode_sb_sptr vocoder_make_ulaw_encode_sb(); + +class vocoder_ulaw_encode_sb : public gr_sync_block +{ +private: + vocoder_ulaw_encode_sb(); +}; |