Merge branch 'next' of gnuradio.org:gnuradio into next

Conflicts:
	gr-trellis/src/lib/trellis_constellation_metrics_cf.cc

7 files changed, 270 insertions, 0 deletions

diff --git a/gr-vocoder/include/Makefile.am b/gr-vocoder/include/Makefile.am
index e25340b32..b579333a3 100644
--- a/gr-vocoder/include/Makefile.am
+++ b/gr-vocoder/include/Makefile.am
@@ -30,6 +30,12 @@ grinclude_HEADERS = \
 	vocoder_codec2_encode_sp.h \
 	vocoder_cvsd_decode_bs.h \
 	vocoder_cvsd_encode_sb.h \
+	vocoder_g721_decode_bs.h \
+	vocoder_g721_encode_sb.h \
+	vocoder_g723_24_decode_bs.h \
+	vocoder_g723_24_encode_sb.h \
+	vocoder_g723_40_decode_bs.h \
+	vocoder_g723_40_encode_sb.h \
 	vocoder_gsm_fr_decode_ps.h \
 	vocoder_gsm_fr_encode_sp.h \
 	vocoder_ulaw_decode_bs.h \
diff --git a/gr-vocoder/include/vocoder_g721_decode_bs.h b/gr-vocoder/include/vocoder_g721_decode_bs.h
new file mode 100644
index 000000000..8ce3b12e5
--- /dev/null
+++ b/gr-vocoder/include/vocoder_g721_decode_bs.h
@@ -0,0 +1,44 @@
+/* -*- 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_G721_DECODE_BS_H
+#define INCLUDED_VOCODER_G721_DECODE_BS_H
+
+#include <gr_sync_block.h>
+
+class vocoder_g721_decode_bs;
+
+typedef boost::shared_ptr<vocoder_g721_decode_bs> vocoder_g721_decode_bs_sptr;
+
+vocoder_g721_decode_bs_sptr vocoder_make_g721_decode_bs();
+
+/*!
+ * \brief This block performs g721 audio decoding. 
+ *
+ * \ingroup vocoder_blk
+ */
+
+class vocoder_g721_decode_bs : virtual public gr_sync_block
+{
+};
+
+#endif /* INCLUDED_VOCODER_G721_DECODE_BS_H */
diff --git a/gr-vocoder/include/vocoder_g721_encode_sb.h b/gr-vocoder/include/vocoder_g721_encode_sb.h
new file mode 100644
index 000000000..5af980640
--- /dev/null
+++ b/gr-vocoder/include/vocoder_g721_encode_sb.h
@@ -0,0 +1,44 @@
+/* -*- 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_G721_ENCODE_SB_H
+#define INCLUDED_VOCODER_G721_ENCODE_SB_H
+
+#include <gr_sync_block.h>
+
+class vocoder_g721_encode_sb;
+
+typedef boost::shared_ptr<vocoder_g721_encode_sb> vocoder_g721_encode_sb_sptr;
+
+vocoder_g721_encode_sb_sptr vocoder_make_g721_encode_sb();
+
+/*!
+ * \brief This block performs g721 audio encoding. 
+ *
+ * \ingroup vocoder_blk
+ */
+
+class vocoder_g721_encode_sb : virtual public gr_sync_block
+{
+};
+
+#endif /* INCLUDED_VOCODER_G721_ENCODE_SB_H */
diff --git a/gr-vocoder/include/vocoder_g723_24_decode_bs.h b/gr-vocoder/include/vocoder_g723_24_decode_bs.h
new file mode 100644
index 000000000..8ca94f253
--- /dev/null
+++ b/gr-vocoder/include/vocoder_g723_24_decode_bs.h
@@ -0,0 +1,44 @@
+/* -*- 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_G723_24_DECODE_BS_H
+#define INCLUDED_VOCODER_G723_24_DECODE_BS_H
+
+#include <gr_sync_block.h>
+
+class vocoder_g723_24_decode_bs;
+
+typedef boost::shared_ptr<vocoder_g723_24_decode_bs> vocoder_g723_24_decode_bs_sptr;
+
+vocoder_g723_24_decode_bs_sptr vocoder_make_g723_24_decode_bs();
+
+/*!
+ * \brief This block performs g723_24 audio decoding. 
+ *
+ * \ingroup vocoder_blk
+ */
+
+class vocoder_g723_24_decode_bs : virtual public gr_sync_block
+{
+};
+
+#endif /* INCLUDED_VOCODER_G723_24_DECODE_BS_H */
diff --git a/gr-vocoder/include/vocoder_g723_24_encode_sb.h b/gr-vocoder/include/vocoder_g723_24_encode_sb.h
new file mode 100644
index 000000000..b55229980
--- /dev/null
+++ b/gr-vocoder/include/vocoder_g723_24_encode_sb.h
@@ -0,0 +1,44 @@
+/* -*- 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_G723_24_ENCODE_SB_H
+#define INCLUDED_VOCODER_G723_24_ENCODE_SB_H
+
+#include <gr_sync_block.h>
+
+class vocoder_g723_24_encode_sb;
+
+typedef boost::shared_ptr<vocoder_g723_24_encode_sb> vocoder_g723_24_encode_sb_sptr;
+
+vocoder_g723_24_encode_sb_sptr vocoder_make_g723_24_encode_sb();
+
+/*!
+ * \brief This block performs g723_24 audio encoding. 
+ *
+ * \ingroup vocoder_blk
+ */
+
+class vocoder_g723_24_encode_sb : virtual public gr_sync_block
+{
+};
+
+#endif /* INCLUDED_VOCODER_G723_24_ENCODE_SB_H */
diff --git a/gr-vocoder/include/vocoder_g723_40_decode_bs.h b/gr-vocoder/include/vocoder_g723_40_decode_bs.h
new file mode 100644
index 000000000..2299b8806
--- /dev/null
+++ b/gr-vocoder/include/vocoder_g723_40_decode_bs.h
@@ -0,0 +1,44 @@
+/* -*- 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_G723_40_DECODE_BS_H
+#define INCLUDED_VOCODER_G723_40_DECODE_BS_H
+
+#include <gr_sync_block.h>
+
+class vocoder_g723_40_decode_bs;
+
+typedef boost::shared_ptr<vocoder_g723_40_decode_bs> vocoder_g723_40_decode_bs_sptr;
+
+vocoder_g723_40_decode_bs_sptr vocoder_make_g723_40_decode_bs();
+
+/*!
+ * \brief This block performs g723_40 audio decoding. 
+ *
+ * \ingroup vocoder_blk
+ */
+
+class vocoder_g723_40_decode_bs : virtual public gr_sync_block
+{
+};
+
+#endif /* INCLUDED_VOCODER_G723_40_DECODE_BS_H */
diff --git a/gr-vocoder/include/vocoder_g723_40_encode_sb.h b/gr-vocoder/include/vocoder_g723_40_encode_sb.h
new file mode 100644
index 000000000..f349cf425
--- /dev/null
+++ b/gr-vocoder/include/vocoder_g723_40_encode_sb.h
@@ -0,0 +1,44 @@
+/* -*- 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_G723_40_ENCODE_SB_H
+#define INCLUDED_VOCODER_G723_40_ENCODE_SB_H
+
+#include <gr_sync_block.h>
+
+class vocoder_g723_40_encode_sb;
+
+typedef boost::shared_ptr<vocoder_g723_40_encode_sb> vocoder_g723_40_encode_sb_sptr;
+
+vocoder_g723_40_encode_sb_sptr vocoder_make_g723_40_encode_sb();
+
+/*!
+ * \brief This block performs g723_40 audio encoding. 
+ *
+ * \ingroup vocoder_blk
+ */
+
+class vocoder_g723_40_encode_sb : virtual public gr_sync_block
+{
+};
+
+#endif /* INCLUDED_VOCODER_G723_40_ENCODE_SB_H */