gr-vocoder: reimplemented gr-gsm-fr-vocoder in gr-vocoder

3 files changed, 108 insertions, 1 deletions

diff --git a/gr-vocoder/include/Makefile.am b/gr-vocoder/include/Makefile.am
index b1c7b44d5..71c56d47f 100644
--- a/gr-vocoder/include/Makefile.am
+++ b/gr-vocoder/include/Makefile.am
@@ -21,4 +21,7 @@
 
 include $(top_srcdir)/Makefile.common
 
-SUBDIRS = 
+# C/C++ headers get installed in ${prefix}/include/gnuradio
+grinclude_HEADERS = \
+	vocoder_gsm_fr_decode_ps.h \
+	vocoder_gsm_fr_encode_sp.h
diff --git a/gr-vocoder/include/vocoder_gsm_fr_decode_ps.h b/gr-vocoder/include/vocoder_gsm_fr_decode_ps.h
new file mode 100644
index 000000000..4c6248d39
--- /dev/null
+++ b/gr-vocoder/include/vocoder_gsm_fr_decode_ps.h
@@ -0,0 +1,51 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2005,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_GSM_FR_DECODE_PS_H
+#define INCLUDED_VOCODER_GSM_FR_DECODE_PS_H
+
+#include <gr_sync_interpolator.h>
+
+class vocoder_gsm_fr_decode_ps;
+typedef boost::shared_ptr<vocoder_gsm_fr_decode_ps> vocoder_gsm_fr_decode_ps_sptr;
+
+vocoder_gsm_fr_decode_ps_sptr vocoder_make_gsm_fr_decode_ps ();
+
+/*!
+ * \brief GSM 06.10 Full Rate Vocoder Decoder
+ * \ingroup vocoder_blk
+ */
+class vocoder_gsm_fr_decode_ps : public gr_sync_interpolator {
+  struct gsm_state	*d_gsm;
+
+  friend vocoder_gsm_fr_decode_ps_sptr vocoder_make_gsm_fr_decode_ps ();
+  vocoder_gsm_fr_decode_ps ();
+
+public:
+  ~vocoder_gsm_fr_decode_ps ();
+
+  int work (int noutput_items,
+	    gr_vector_const_void_star &input_items,
+	    gr_vector_void_star &output_items);
+};
+
+#endif /* INCLUDED_VOCODER_GSM_FR_DECODE_PS_H */
diff --git a/gr-vocoder/include/vocoder_gsm_fr_encode_sp.h b/gr-vocoder/include/vocoder_gsm_fr_encode_sp.h
new file mode 100644
index 000000000..d1803c82e
--- /dev/null
+++ b/gr-vocoder/include/vocoder_gsm_fr_encode_sp.h
@@ -0,0 +1,53 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2005,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_GSM_FR_ENCODE_SP_H
+#define INCLUDED_VOCODER_GSM_FR_ENCODE_SP_H
+
+#include <gr_sync_decimator.h>
+
+class vocoder_gsm_fr_encode_sp;
+typedef boost::shared_ptr<vocoder_gsm_fr_encode_sp> vocoder_gsm_fr_encode_sp_sptr;
+
+vocoder_gsm_fr_encode_sp_sptr vocoder_make_gsm_fr_encode_sp ();
+
+/*!
+ * \brief GSM 06.10 Full Rate Vocoder Encoder
+ * \ingroup vocoder_blk
+ *
+ * shorts in; 33 byte packets out
+ */
+class vocoder_gsm_fr_encode_sp : public gr_sync_decimator {
+  struct gsm_state	*d_gsm;
+
+  friend vocoder_gsm_fr_encode_sp_sptr vocoder_make_gsm_fr_encode_sp ();
+  vocoder_gsm_fr_encode_sp ();
+
+public:
+  ~vocoder_gsm_fr_encode_sp ();
+
+  int work (int noutput_items,
+	    gr_vector_const_void_star &input_items,
+	    gr_vector_void_star &output_items);
+};
+
+#endif /* INCLUDED_VOCODER_GSM_FR_ENCODE_SP_H */