summaryrefslogtreecommitdiff
path: root/gr-vocoder/include/gnuradio/vocoder
diff options
context:
space:
mode:
authorMarcus Müller <mmueller@gnuradio.org>2019-08-07 21:45:12 +0200
committerMarcus Müller <marcus@hostalia.de>2019-08-09 23:04:28 +0200
commitf7bbf2c1d8d780294f3e016aff239ca35eb6516e (patch)
treee09ab6112e02b2215b2d59ac24d3d6ea2edac745 /gr-vocoder/include/gnuradio/vocoder
parent78431dc6941e3acc67c858277dfe4a0ed583643c (diff)
Tree: clang-format without the include sorting
Diffstat (limited to 'gr-vocoder/include/gnuradio/vocoder')
-rw-r--r--gr-vocoder/include/gnuradio/vocoder/alaw_decode_bs.h30
-rw-r--r--gr-vocoder/include/gnuradio/vocoder/alaw_encode_sb.h30
-rw-r--r--gr-vocoder/include/gnuradio/vocoder/api.h4
-rw-r--r--gr-vocoder/include/gnuradio/vocoder/codec2.h39
-rw-r--r--gr-vocoder/include/gnuradio/vocoder/codec2_decode_ps.h44
-rw-r--r--gr-vocoder/include/gnuradio/vocoder/codec2_encode_sp.h46
-rw-r--r--gr-vocoder/include/gnuradio/vocoder/cvsd_decode_bs.h198
-rw-r--r--gr-vocoder/include/gnuradio/vocoder/cvsd_encode_sb.h190
-rw-r--r--gr-vocoder/include/gnuradio/vocoder/freedv_api.h25
-rw-r--r--gr-vocoder/include/gnuradio/vocoder/freedv_rx_ss.h54
-rw-r--r--gr-vocoder/include/gnuradio/vocoder/freedv_tx_ss.h46
-rw-r--r--gr-vocoder/include/gnuradio/vocoder/g721_decode_bs.h30
-rw-r--r--gr-vocoder/include/gnuradio/vocoder/g721_encode_sb.h30
-rw-r--r--gr-vocoder/include/gnuradio/vocoder/g723_24_decode_bs.h30
-rw-r--r--gr-vocoder/include/gnuradio/vocoder/g723_24_encode_sb.h30
-rw-r--r--gr-vocoder/include/gnuradio/vocoder/g723_40_decode_bs.h30
-rw-r--r--gr-vocoder/include/gnuradio/vocoder/g723_40_encode_sb.h30
-rw-r--r--gr-vocoder/include/gnuradio/vocoder/gsm_fr_decode_ps.h36
-rw-r--r--gr-vocoder/include/gnuradio/vocoder/gsm_fr_encode_sp.h36
-rw-r--r--gr-vocoder/include/gnuradio/vocoder/ulaw_decode_bs.h30
-rw-r--r--gr-vocoder/include/gnuradio/vocoder/ulaw_encode_sb.h30
21 files changed, 513 insertions, 505 deletions
diff --git a/gr-vocoder/include/gnuradio/vocoder/alaw_decode_bs.h b/gr-vocoder/include/gnuradio/vocoder/alaw_decode_bs.h
index d8345e034b..b16088db0d 100644
--- a/gr-vocoder/include/gnuradio/vocoder/alaw_decode_bs.h
+++ b/gr-vocoder/include/gnuradio/vocoder/alaw_decode_bs.h
@@ -27,25 +27,25 @@
#include <gnuradio/sync_block.h>
namespace gr {
- namespace vocoder {
+namespace vocoder {
+
+/*!
+ * \brief This block performs alaw audio decoding.
+ * \ingroup audio_blk
+ */
+class VOCODER_API alaw_decode_bs : virtual public sync_block
+{
+public:
+ // gr::vocoder::alaw_decode_bs::sptr
+ typedef boost::shared_ptr<alaw_decode_bs> sptr;
/*!
- * \brief This block performs alaw audio decoding.
- * \ingroup audio_blk
+ * \brief Make alaw decoder block.
*/
- class VOCODER_API alaw_decode_bs : virtual public sync_block
- {
- public:
- // gr::vocoder::alaw_decode_bs::sptr
- typedef boost::shared_ptr<alaw_decode_bs> sptr;
-
- /*!
- * \brief Make alaw decoder block.
- */
- static sptr make();
- };
+ static sptr make();
+};
- } /* namespace vocoder */
+} /* namespace vocoder */
} /* namespace gr */
#endif /* INCLUDED_VOCODER_ALAW_DECODE_BS_H */
diff --git a/gr-vocoder/include/gnuradio/vocoder/alaw_encode_sb.h b/gr-vocoder/include/gnuradio/vocoder/alaw_encode_sb.h
index 09f4221f93..045cf49cbe 100644
--- a/gr-vocoder/include/gnuradio/vocoder/alaw_encode_sb.h
+++ b/gr-vocoder/include/gnuradio/vocoder/alaw_encode_sb.h
@@ -27,25 +27,25 @@
#include <gnuradio/sync_block.h>
namespace gr {
- namespace vocoder {
+namespace vocoder {
+
+/*!
+ * \brief This block performs g.711 alaw audio encoding.
+ * \ingroup audio_blk
+ */
+class VOCODER_API alaw_encode_sb : virtual public sync_block
+{
+public:
+ // gr::vocoder::alaw_encode_sb::sptr
+ typedef boost::shared_ptr<alaw_encode_sb> sptr;
/*!
- * \brief This block performs g.711 alaw audio encoding.
- * \ingroup audio_blk
+ * \brief Make alaw encoder block.
*/
- class VOCODER_API alaw_encode_sb : virtual public sync_block
- {
- public:
- // gr::vocoder::alaw_encode_sb::sptr
- typedef boost::shared_ptr<alaw_encode_sb> sptr;
-
- /*!
- * \brief Make alaw encoder block.
- */
- static sptr make();
- };
+ static sptr make();
+};
- } /* namespace vocoder */
+} /* namespace vocoder */
} /* namespace gr */
#endif /* INCLUDED_VOCODER_ALAW_ENCODE_SB_H */
diff --git a/gr-vocoder/include/gnuradio/vocoder/api.h b/gr-vocoder/include/gnuradio/vocoder/api.h
index 425e397b9d..6b35e2e088 100644
--- a/gr-vocoder/include/gnuradio/vocoder/api.h
+++ b/gr-vocoder/include/gnuradio/vocoder/api.h
@@ -25,9 +25,9 @@
#include <gnuradio/attributes.h>
#ifdef gnuradio_vocoder_EXPORTS
-# define VOCODER_API __GR_ATTR_EXPORT
+#define VOCODER_API __GR_ATTR_EXPORT
#else
-# define VOCODER_API __GR_ATTR_IMPORT
+#define VOCODER_API __GR_ATTR_IMPORT
#endif
#endif /* INCLUDED_VOCODER_API_H */
diff --git a/gr-vocoder/include/gnuradio/vocoder/codec2.h b/gr-vocoder/include/gnuradio/vocoder/codec2.h
index cca0fc46be..3b0f9c2491 100644
--- a/gr-vocoder/include/gnuradio/vocoder/codec2.h
+++ b/gr-vocoder/include/gnuradio/vocoder/codec2.h
@@ -30,37 +30,36 @@ extern "C" {
}
namespace gr {
- namespace vocoder {
+namespace vocoder {
- class VOCODER_API codec2 {
- public:
-
- enum bit_rate {
- MODE_3200 = CODEC2_MODE_3200,
- MODE_2400 = CODEC2_MODE_2400,
- MODE_1600 = CODEC2_MODE_1600,
- MODE_1400 = CODEC2_MODE_1400,
- MODE_1300 = CODEC2_MODE_1300,
- MODE_1200 = CODEC2_MODE_1200,
+class VOCODER_API codec2
+{
+public:
+ enum bit_rate {
+ MODE_3200 = CODEC2_MODE_3200,
+ MODE_2400 = CODEC2_MODE_2400,
+ MODE_1600 = CODEC2_MODE_1600,
+ MODE_1400 = CODEC2_MODE_1400,
+ MODE_1300 = CODEC2_MODE_1300,
+ MODE_1200 = CODEC2_MODE_1200,
#ifdef CODEC2_MODE_700
- MODE_700 = CODEC2_MODE_700,
+ MODE_700 = CODEC2_MODE_700,
#endif
#ifdef CODEC2_MODE_700B
- MODE_700B = CODEC2_MODE_700B,
+ MODE_700B = CODEC2_MODE_700B,
#endif
#ifdef CODEC2_MODE_700C
- MODE_700C = CODEC2_MODE_700C,
+ MODE_700C = CODEC2_MODE_700C,
#endif
#ifdef CODEC2_MODE_WB
- MODE_WB = CODEC2_MODE_WB,
+ MODE_WB = CODEC2_MODE_WB,
#endif
- };
-
- private:
-
};
- } /* namespace vocoder */
+private:
+};
+
+} /* namespace vocoder */
} /* namespace gr */
#endif /* _VOCODER_CODEC2_H_ */
diff --git a/gr-vocoder/include/gnuradio/vocoder/codec2_decode_ps.h b/gr-vocoder/include/gnuradio/vocoder/codec2_decode_ps.h
index 49add0f9ee..38b6344fd6 100644
--- a/gr-vocoder/include/gnuradio/vocoder/codec2_decode_ps.h
+++ b/gr-vocoder/include/gnuradio/vocoder/codec2_decode_ps.h
@@ -28,33 +28,33 @@
#include <gnuradio/sync_interpolator.h>
namespace gr {
- namespace vocoder {
+namespace vocoder {
+
+/*!
+ * \brief CODEC2 Vocoder Decoder
+ * \ingroup audio_blk
+ *
+ * Input: A vector of unpacked bits forming a Codec2 frame.
+ *
+ * Output: 16-bit short values of an audio signal with sampling rate 8 kHz.
+ *
+ * See also gr::vocoder::codec2_encode_sp.
+ */
+class VOCODER_API codec2_decode_ps : virtual public sync_interpolator
+{
+public:
+ // gr::vocoder::codec2_decode_ps::sptr
+ typedef boost::shared_ptr<codec2_decode_ps> sptr;
/*!
- * \brief CODEC2 Vocoder Decoder
- * \ingroup audio_blk
- *
- * Input: A vector of unpacked bits forming a Codec2 frame.
+ * \brief Make Codec2 decoder block.
*
- * Output: 16-bit short values of an audio signal with sampling rate 8 kHz.
- *
- * See also gr::vocoder::codec2_encode_sp.
+ * \param mode Encoded bit rate/mode
*/
- class VOCODER_API codec2_decode_ps : virtual public sync_interpolator
- {
- public:
- // gr::vocoder::codec2_decode_ps::sptr
- typedef boost::shared_ptr<codec2_decode_ps> sptr;
-
- /*!
- * \brief Make Codec2 decoder block.
- *
- * \param mode Encoded bit rate/mode
- */
- static sptr make(int mode=codec2::MODE_2400);
- };
+ static sptr make(int mode = codec2::MODE_2400);
+};
- } /* namespace vocoder */
+} /* namespace vocoder */
} /* namespace gr */
#endif /* INCLUDED_VOCODER_CODEC2_DECODE_PS_H */
diff --git a/gr-vocoder/include/gnuradio/vocoder/codec2_encode_sp.h b/gr-vocoder/include/gnuradio/vocoder/codec2_encode_sp.h
index 12ec00c687..b1b800c16a 100644
--- a/gr-vocoder/include/gnuradio/vocoder/codec2_encode_sp.h
+++ b/gr-vocoder/include/gnuradio/vocoder/codec2_encode_sp.h
@@ -28,34 +28,34 @@
#include <gnuradio/sync_decimator.h>
namespace gr {
- namespace vocoder {
+namespace vocoder {
+
+/*!
+ * \brief CODEC2 Vocoder Encoder
+ * \ingroup audio_blk
+ *
+ * Input: Speech (audio) signal as 16-bit shorts, sampling rate 8 kHz.
+ *
+ * Output: Vector of unpacked bits, forming one Codec2 frame, per 160
+ * input samples (in 2400 and 3200 bps modes) or per 320 input
+ * samples (in 1200, 1300, 1400 and 1600 bps modes).
+ *
+ */
+class VOCODER_API codec2_encode_sp : virtual public sync_decimator
+{
+public:
+ // gr::vocoder::codec2_encode_sp::sptr
+ typedef boost::shared_ptr<codec2_encode_sp> sptr;
/*!
- * \brief CODEC2 Vocoder Encoder
- * \ingroup audio_blk
- *
- * Input: Speech (audio) signal as 16-bit shorts, sampling rate 8 kHz.
- *
- * Output: Vector of unpacked bits, forming one Codec2 frame, per 160
- * input samples (in 2400 and 3200 bps modes) or per 320 input
- * samples (in 1200, 1300, 1400 and 1600 bps modes).
+ * \brief Make Codec2 encoder block.
*
+ * \param mode Encoded bit rate/mode
*/
- class VOCODER_API codec2_encode_sp : virtual public sync_decimator
- {
- public:
- // gr::vocoder::codec2_encode_sp::sptr
- typedef boost::shared_ptr<codec2_encode_sp> sptr;
-
- /*!
- * \brief Make Codec2 encoder block.
- *
- * \param mode Encoded bit rate/mode
- */
- static sptr make(int mode=codec2::MODE_2400);
- };
+ static sptr make(int mode = codec2::MODE_2400);
+};
- } /* namespace vocoder */
+} /* namespace vocoder */
} /* namespace gr */
#endif /* INCLUDED_VOCODER_CODEC2_ENCODE_SP_H */
diff --git a/gr-vocoder/include/gnuradio/vocoder/cvsd_decode_bs.h b/gr-vocoder/include/gnuradio/vocoder/cvsd_decode_bs.h
index 53addc58bf..9b4e82296f 100644
--- a/gr-vocoder/include/gnuradio/vocoder/cvsd_decode_bs.h
+++ b/gr-vocoder/include/gnuradio/vocoder/cvsd_decode_bs.h
@@ -27,109 +27,113 @@
#include <gnuradio/sync_interpolator.h>
namespace gr {
- namespace vocoder {
+namespace vocoder {
+
+/*!
+ * \brief This block performs CVSD audio decoding. Its design and
+ * implementation is modeled after the CVSD encoder/decoder
+ * specifications defined in the Bluetooth standard.
+ * \ingroup audio_blk
+ *
+ * \details
+ * CVSD is a method for encoding speech that seeks to reduce the
+ * bandwidth required for digital voice transmission. CVSD takes
+ * advantage of strong correlation between samples, quantizing the
+ * difference in amplitude between two consecutive samples. This
+ * difference requires fewer quantization levels as compared to
+ * other methods that quantize the actual amplitude level,
+ * reducing the bandwidth. CVSD employs a two level quantizer
+ * (one bit) and an adaptive algorithm that allows for continuous
+ * step size adjustment.
+ *
+ * The coder can represent low amplitude signals with accuracy
+ * without sacrificing performance on large amplitude signals, a
+ * trade off that occurs in some non-adaptive modulations.
+ *
+ * The CVSD decoder effectively provides 1-to-8 decompression.
+ * More specifically, for each incoming input bit, the decoder
+ * outputs one audio sample. If the input is a "1" bit, the
+ * internal reference is increased appropriately and then
+ * outputted as the next estimated audio sample. If the input is
+ * a "0" bit, the internal reference is decreased appropriately
+ * and then likewise outputted as the next estimated audio sample.
+ * Grouping 8 input bits together, the encoder essentially
+ * produces 8 output audio samples for everyone one input byte.
+ *
+ * This decoder requires that output audio samples are 2-byte
+ * short signed integers. The result bandwidth conversion,
+ * therefore, is 1 byte of encoded audio data to 16 output bytes
+ * of raw audio data.
+ *
+ * The CVSD decoder module must be post-fixed by a down-converter
+ * to under-sample the audio data after decoding. The Bluetooth
+ * standard specifically calls for a 8-to-1 decimating
+ * down-converter. This is required so that so that output
+ * sampling rate equals the original input sampling rate present
+ * before the encoder. In all cases, the output down-converter
+ * rate must be the inverse of the input up-converter rate before
+ * the CVSD encoder.
+ *
+ * References:
+ *
+ * 1. Continuously Variable Slope Delta Modulation (CVSD) A Tutorial,
+ * Available:
+ * http://www.eetkorea.com/ARTICLES/2003AUG/A/2003AUG29_NTEK_RFD_AN02.PDF.
+ *
+ * 2. Specification of The Bluetooth System
+ * Available: http://grouper.ieee.org/groups/802/15/Bluetooth/core_10_b.pdf.
+ *
+ * 3. McGarrity, S., Bluetooth Full Duplex Voice and Data Transmission. 2002.
+ * Bluetooth Voice Simulink Model, Available:
+ * http://www.mathworks.com/company/newsletters/digest/nov01/bluetooth.html
+ */
+class VOCODER_API cvsd_decode_bs : virtual public sync_interpolator
+{
+public:
+ // gr::vocoder::cvsd_decode_bs::sptr
+ typedef boost::shared_ptr<cvsd_decode_bs> sptr;
/*!
- * \brief This block performs CVSD audio decoding. Its design and
- * implementation is modeled after the CVSD encoder/decoder
- * specifications defined in the Bluetooth standard.
- * \ingroup audio_blk
- *
- * \details
- * CVSD is a method for encoding speech that seeks to reduce the
- * bandwidth required for digital voice transmission. CVSD takes
- * advantage of strong correlation between samples, quantizing the
- * difference in amplitude between two consecutive samples. This
- * difference requires fewer quantization levels as compared to
- * other methods that quantize the actual amplitude level,
- * reducing the bandwidth. CVSD employs a two level quantizer
- * (one bit) and an adaptive algorithm that allows for continuous
- * step size adjustment.
- *
- * The coder can represent low amplitude signals with accuracy
- * without sacrificing performance on large amplitude signals, a
- * trade off that occurs in some non-adaptive modulations.
- *
- * The CVSD decoder effectively provides 1-to-8 decompression.
- * More specifically, for each incoming input bit, the decoder
- * outputs one audio sample. If the input is a "1" bit, the
- * internal reference is increased appropriately and then
- * outputted as the next estimated audio sample. If the input is
- * a "0" bit, the internal reference is decreased appropriately
- * and then likewise outputted as the next estimated audio sample.
- * Grouping 8 input bits together, the encoder essentially
- * produces 8 output audio samples for everyone one input byte.
- *
- * This decoder requires that output audio samples are 2-byte
- * short signed integers. The result bandwidth conversion,
- * therefore, is 1 byte of encoded audio data to 16 output bytes
- * of raw audio data.
+ * \brief Constructor parameters to initialize the CVSD decoder.
+ * The default values are modeled after the Bluetooth standard
+ * and should not be changed, except by an advanced user
*
- * The CVSD decoder module must be post-fixed by a down-converter
- * to under-sample the audio data after decoding. The Bluetooth
- * standard specifically calls for a 8-to-1 decimating
- * down-converter. This is required so that so that output
- * sampling rate equals the original input sampling rate present
- * before the encoder. In all cases, the output down-converter
- * rate must be the inverse of the input up-converter rate before
- * the CVSD encoder.
- *
- * References:
- *
- * 1. Continuously Variable Slope Delta Modulation (CVSD) A Tutorial,
- * Available: http://www.eetkorea.com/ARTICLES/2003AUG/A/2003AUG29_NTEK_RFD_AN02.PDF.
- *
- * 2. Specification of The Bluetooth System
- * Available: http://grouper.ieee.org/groups/802/15/Bluetooth/core_10_b.pdf.
- *
- * 3. McGarrity, S., Bluetooth Full Duplex Voice and Data Transmission. 2002.
- * Bluetooth Voice Simulink Model, Available:
- * http://www.mathworks.com/company/newsletters/digest/nov01/bluetooth.html
+ * \param min_step Minimum step size used to update the internal reference.
+ * Default: "10"
+ * \param max_step Maximum step size used to update the internal reference.
+ * Default: "1280"
+ * \param step_decay Decay factor applied to step size when there is not a run of J
+ * output 1s or 0s. Default: "0.9990234375" (i.e. 1-1/1024) \param accum_decay Decay
+ * factor applied to the internal reference during every iteration of the codec.
+ * Default: "0.96875" (i.e. 1-1/32)
+ * \param K Size of shift register; the number of output bits remembered
+ * by codec (must be <= to 32). Default: "32" \param J Number of bits in
+ * the shift register that are equal; i.e. the size of a run of 1s, 0s. Default: "4"
+ * \param pos_accum_max Maximum integer value allowed for the internal reference.
+ * Default: "32767" (2^15 - 1 or MAXSHORT)
+ * \param neg_accum_max Minimum integer value allowed for the internal reference.
+ * Default: "-32767" (-2^15 + 1 or MINSHORT+1)
*/
- class VOCODER_API cvsd_decode_bs : virtual public sync_interpolator
- {
- public:
- // gr::vocoder::cvsd_decode_bs::sptr
- typedef boost::shared_ptr<cvsd_decode_bs> sptr;
-
- /*!
- * \brief Constructor parameters to initialize the CVSD decoder.
- * The default values are modeled after the Bluetooth standard
- * and should not be changed, except by an advanced user
- *
- * \param min_step Minimum step size used to update the internal reference.
- * Default: "10"
- * \param max_step Maximum step size used to update the internal reference.
- * Default: "1280"
- * \param step_decay Decay factor applied to step size when there is not a run of J output 1s or 0s.
- * Default: "0.9990234375" (i.e. 1-1/1024)
- * \param accum_decay Decay factor applied to the internal reference during every iteration of the codec.
- * Default: "0.96875" (i.e. 1-1/32)
- * \param K Size of shift register; the number of output bits remembered by codec (must be <= to 32).
- * Default: "32"
- * \param J Number of bits in the shift register that are equal; i.e. the size of a run of 1s, 0s.
- * Default: "4"
- * \param pos_accum_max Maximum integer value allowed for the internal reference.
- * Default: "32767" (2^15 - 1 or MAXSHORT)
- * \param neg_accum_max Minimum integer value allowed for the internal reference.
- * Default: "-32767" (-2^15 + 1 or MINSHORT+1)
- */
- static sptr make(short min_step=10, short max_step=1280,
- double step_decay=0.9990234375, double accum_decay= 0.96875,
- int K=32, int J=4,
- short pos_accum_max=32767, short neg_accum_max=-32767);
+ static sptr make(short min_step = 10,
+ short max_step = 1280,
+ double step_decay = 0.9990234375,
+ double accum_decay = 0.96875,
+ int K = 32,
+ int J = 4,
+ short pos_accum_max = 32767,
+ short neg_accum_max = -32767);
- virtual short min_step() = 0;
- virtual short max_step() = 0;
- virtual double step_decay() = 0;
- virtual double accum_decay() = 0;
- virtual int K() = 0;
- virtual int J() = 0;
- virtual short pos_accum_max() = 0;
- virtual short neg_accum_max() = 0;
- };
+ virtual short min_step() = 0;
+ virtual short max_step() = 0;
+ virtual double step_decay() = 0;
+ virtual double accum_decay() = 0;
+ virtual int K() = 0;
+ virtual int J() = 0;
+ virtual short pos_accum_max() = 0;
+ virtual short neg_accum_max() = 0;
+};
- } /* namespace vocoder */
+} /* namespace vocoder */
} /* namespace gr */
#endif /* INCLUDED_VOCODER_CVSD_DECODE_BS_H */
diff --git a/gr-vocoder/include/gnuradio/vocoder/cvsd_encode_sb.h b/gr-vocoder/include/gnuradio/vocoder/cvsd_encode_sb.h
index 71883625cb..a558819f10 100644
--- a/gr-vocoder/include/gnuradio/vocoder/cvsd_encode_sb.h
+++ b/gr-vocoder/include/gnuradio/vocoder/cvsd_encode_sb.h
@@ -26,106 +26,108 @@
#include <gnuradio/sync_decimator.h>
namespace gr {
- namespace vocoder {
+namespace vocoder {
+
+/*!
+ * \brief This block performs CVSD audio encoding. Its design and
+ * implementation is modeled after the CVSD encoder/decoder
+ * specifications defined in the Bluetooth standard.
+ * \ingroup audio_blk
+ *
+ * \details
+ * CVSD is a method for encoding speech that seeks to reduce the
+ * bandwidth required for digital voice transmission. CVSD takes
+ * advantage of strong correlation between samples, quantizing the
+ * difference in amplitude between two consecutive samples. This
+ * difference requires fewer quantization levels as compared to
+ * other methods that quantize the actual amplitude level,
+ * reducing the bandwidth. CVSD employs a two level quantizer
+ * (one bit) and an adaptive algorithm that allows for continuous
+ * step size adjustment.
+ *
+ * The coder can represent low amplitude signals with accuracy
+ * without sacrificing performance on large amplitude signals, a
+ * trade off that occurs in some non-adaptive modulations.
+ *
+ * The CVSD encoder effectively provides 8-to-1 compression. More
+ * specifically, each incoming audio sample is compared to an
+ * internal reference value. If the input is greater or equal to
+ * the reference, the encoder outputs a "1" bit. If the input is
+ * less than the reference, the encoder outputs a "0" bit. The
+ * reference value is then updated accordingly based on the
+ * frequency of outputted "1" or "0" bits. By grouping 8 outputs
+ * bits together, the encoder essentially produce one output byte
+ * for every 8 input audio samples.
+ *
+ * This encoder requires that input audio samples are 2-byte short
+ * signed integers. The result bandwidth conversion, therefore,
+ * is 16 input bytes of raw audio data to 1 output byte of encoded
+ * audio data.
+ *
+ * The CVSD encoder module must be prefixed by an up-converter to
+ * over-sample the audio data prior to encoding. The Bluetooth
+ * standard specifically calls for a 1-to-8 interpolating
+ * up-converter. While this reduces the overall compression of
+ * the codec, this is required so that the encoder can accurately
+ * compute the slope between adjacent audio samples and correctly
+ * update its internal reference value.
+ *
+ * References:
+ *
+ * 1. Continuously Variable Slope Delta Modulation (CVSD) A Tutorial,
+ * Available: http://www.eetkorea.com/ARTICLES/2003AUG/A/2003AUG29_NTEK_RFD_AN02.PDF.
+ *
+ * 2. Specification of The Bluetooth System
+ * Available: http://grouper.ieee.org/groups/802/15/Bluetooth/core_10_b.pdf.
+ *
+ * 3. McGarrity, S., Bluetooth Full Duplex Voice and Data Transmission. 2002.
+ * Bluetooth Voice Simulink Model, Available:
+ * http://www.mathworks.com/company/newsletters/digest/nov01/bluetooth.html
+ */
+class VOCODER_API cvsd_encode_sb : virtual public sync_decimator
+{
+public:
+ // gr::vocoder::cvsd_encode_sb::sptr
+ typedef boost::shared_ptr<cvsd_encode_sb> sptr;
/*!
- * \brief This block performs CVSD audio encoding. Its design and
- * implementation is modeled after the CVSD encoder/decoder
- * specifications defined in the Bluetooth standard.
- * \ingroup audio_blk
- *
- * \details
- * CVSD is a method for encoding speech that seeks to reduce the
- * bandwidth required for digital voice transmission. CVSD takes
- * advantage of strong correlation between samples, quantizing the
- * difference in amplitude between two consecutive samples. This
- * difference requires fewer quantization levels as compared to
- * other methods that quantize the actual amplitude level,
- * reducing the bandwidth. CVSD employs a two level quantizer
- * (one bit) and an adaptive algorithm that allows for continuous
- * step size adjustment.
- *
- * The coder can represent low amplitude signals with accuracy
- * without sacrificing performance on large amplitude signals, a
- * trade off that occurs in some non-adaptive modulations.
- *
- * The CVSD encoder effectively provides 8-to-1 compression. More
- * specifically, each incoming audio sample is compared to an
- * internal reference value. If the input is greater or equal to
- * the reference, the encoder outputs a "1" bit. If the input is
- * less than the reference, the encoder outputs a "0" bit. The
- * reference value is then updated accordingly based on the
- * frequency of outputted "1" or "0" bits. By grouping 8 outputs
- * bits together, the encoder essentially produce one output byte
- * for every 8 input audio samples.
- *
- * This encoder requires that input audio samples are 2-byte short
- * signed integers. The result bandwidth conversion, therefore,
- * is 16 input bytes of raw audio data to 1 output byte of encoded
- * audio data.
+ * \brief Constructor parameters to initialize the CVSD encoder.
+ * The default values are modeled after the Bluetooth standard and
+ * should not be changed except by an advanced user
*
- * The CVSD encoder module must be prefixed by an up-converter to
- * over-sample the audio data prior to encoding. The Bluetooth
- * standard specifically calls for a 1-to-8 interpolating
- * up-converter. While this reduces the overall compression of
- * the codec, this is required so that the encoder can accurately
- * compute the slope between adjacent audio samples and correctly
- * update its internal reference value.
- *
- * References:
- *
- * 1. Continuously Variable Slope Delta Modulation (CVSD) A Tutorial,
- * Available: http://www.eetkorea.com/ARTICLES/2003AUG/A/2003AUG29_NTEK_RFD_AN02.PDF.
- *
- * 2. Specification of The Bluetooth System
- * Available: http://grouper.ieee.org/groups/802/15/Bluetooth/core_10_b.pdf.
- *
- * 3. McGarrity, S., Bluetooth Full Duplex Voice and Data Transmission. 2002.
- * Bluetooth Voice Simulink Model, Available:
- * http://www.mathworks.com/company/newsletters/digest/nov01/bluetooth.html
+ * \param min_step Minimum step size used to update the internal reference.
+ * Default: "10" \param max_step Maximum step size used to update the internal
+ * reference. Default: "1280" \param step_decay Decay factor applied to step size
+ * when there is not a run of J output 1s or 0s. Default: "0.9990234375" (i.e.
+ * 1-1/1024) \param accum_decay Decay factor applied to the internal reference
+ * during every iteration of the codec. Default: "0.96875" (i.e. 1-1/32) \param K
+ * Size of shift register; the number of output bits remembered by codec (must be <=
+ * to 32). Default: "32" \param J Number of bits in the shift register
+ * that are equal; i.e. the size of a run of 1s, 0s. Default: "4" \param pos_accum_max
+ * Maximum integer value allowed for the internal reference. Default: "32767" (2^15 -
+ * 1 or MAXSHORT) \param neg_accum_max Minimum integer value allowed for the internal
+ * reference. Default: "-32767" (-2^15 + 1 or MINSHORT+1)
*/
- class VOCODER_API cvsd_encode_sb : virtual public sync_decimator
- {
- public:
- // gr::vocoder::cvsd_encode_sb::sptr
- typedef boost::shared_ptr<cvsd_encode_sb> sptr;
-
- /*!
- * \brief Constructor parameters to initialize the CVSD encoder.
- * The default values are modeled after the Bluetooth standard and
- * should not be changed except by an advanced user
- *
- * \param min_step Minimum step size used to update the internal reference. Default: "10"
- * \param max_step Maximum step size used to update the internal reference. Default: "1280"
- * \param step_decay Decay factor applied to step size when there is not a run of J output 1s or 0s.
- * Default: "0.9990234375" (i.e. 1-1/1024)
- * \param accum_decay Decay factor applied to the internal reference during every iteration of the codec.
- * Default: "0.96875" (i.e. 1-1/32)
- * \param K Size of shift register; the number of output bits remembered by codec (must be <= to 32).
- * Default: "32"
- * \param J Number of bits in the shift register that are equal; i.e. the size of a run of 1s, 0s.
- * Default: "4"
- * \param pos_accum_max Maximum integer value allowed for the internal reference.
- * Default: "32767" (2^15 - 1 or MAXSHORT)
- * \param neg_accum_max Minimum integer value allowed for the internal reference.
- * Default: "-32767" (-2^15 + 1 or MINSHORT+1)
- */
- static sptr make(short min_step=10, short max_step=1280,
- double step_decay=0.9990234375, double accum_decay= 0.96875,
- int K=32, int J=4,
- short pos_accum_max=32767, short neg_accum_max=-32767);
+ static sptr make(short min_step = 10,
+ short max_step = 1280,
+ double step_decay = 0.9990234375,
+ double accum_decay = 0.96875,
+ int K = 32,
+ int J = 4,
+ short pos_accum_max = 32767,
+ short neg_accum_max = -32767);
- virtual short min_step() = 0;
- virtual short max_step() = 0;
- virtual double step_decay() = 0;
- virtual double accum_decay() = 0;
- virtual int K() = 0;
- virtual int J() = 0;
- virtual short pos_accum_max() = 0;
- virtual short neg_accum_max() = 0;
- };
+ virtual short min_step() = 0;
+ virtual short max_step() = 0;
+ virtual double step_decay() = 0;
+ virtual double accum_decay() = 0;
+ virtual int K() = 0;
+ virtual int J() = 0;
+ virtual short pos_accum_max() = 0;
+ virtual short neg_accum_max() = 0;
+};
- } /* namespace vocoder */
+} /* namespace vocoder */
} /* namespace gr */
#endif /* INCLUDED_VOCODER_CVSD_ENCODE_SB_H */
diff --git a/gr-vocoder/include/gnuradio/vocoder/freedv_api.h b/gr-vocoder/include/gnuradio/vocoder/freedv_api.h
index 7838fb4a08..b00cbbd425 100644
--- a/gr-vocoder/include/gnuradio/vocoder/freedv_api.h
+++ b/gr-vocoder/include/gnuradio/vocoder/freedv_api.h
@@ -32,12 +32,12 @@ extern "C" {
}
namespace gr {
- namespace vocoder {
+namespace vocoder {
- class VOCODER_API freedv_api {
- public:
-
- enum freedv_modes {
+class VOCODER_API freedv_api
+{
+public:
+ enum freedv_modes {
#ifdef FREEDV_MODE_1600
MODE_1600 = FREEDV_MODE_1600,
#endif
@@ -61,17 +61,16 @@ namespace gr {
#endif
#ifdef FREEDV_MODE_700D
MODE_700D = FREEDV_MODE_700D,
- SYNC_UNSYNC = FREEDV_SYNC_UNSYNC,
- SYNC_AUTO = FREEDV_SYNC_AUTO,
- SYNC_MANUAL = FREEDV_SYNC_MANUAL,
+ SYNC_UNSYNC = FREEDV_SYNC_UNSYNC,
+ SYNC_AUTO = FREEDV_SYNC_AUTO,
+ SYNC_MANUAL = FREEDV_SYNC_MANUAL,
#endif
- };
-
- private:
-
};
- } /* namespace vocoder */
+private:
+};
+
+} /* namespace vocoder */
} /* namespace gr */
#endif /* _VOCODER_FREEDV_H_ */
diff --git a/gr-vocoder/include/gnuradio/vocoder/freedv_rx_ss.h b/gr-vocoder/include/gnuradio/vocoder/freedv_rx_ss.h
index d1d1a55989..49da8973fc 100644
--- a/gr-vocoder/include/gnuradio/vocoder/freedv_rx_ss.h
+++ b/gr-vocoder/include/gnuradio/vocoder/freedv_rx_ss.h
@@ -28,38 +28,40 @@
#include <gnuradio/block.h>
namespace gr {
- namespace vocoder {
+namespace vocoder {
+
+/*!
+ * \brief FreeDV demodulator
+ * \ingroup audio_blk
+ *
+ * Input: 16-bit short values of an audio signal with sampling rate 8 kHz.
+ *
+ * Output: 16-bit short values of an audio signal with sampling rate 8 kHz.
+ *
+ * See also gr::vocoder::freedv_tx_ss.
+ */
+class VOCODER_API freedv_rx_ss : virtual public gr::block
+{
+public:
+ typedef boost::shared_ptr<freedv_rx_ss> sptr;
/*!
- * \brief FreeDV demodulator
- * \ingroup audio_blk
- *
- * Input: 16-bit short values of an audio signal with sampling rate 8 kHz.
+ * \brief Make FreeDV modem demodulator block.
*
- * Output: 16-bit short values of an audio signal with sampling rate 8 kHz.
- *
- * See also gr::vocoder::freedv_tx_ss.
+ * \param mode Operating Mode designation
+ * \param squelch_thresh FreeDV modem squelch threshold value
+ * \param interleave_frames FreeDV 700D mode number of frames to average error
*/
- class VOCODER_API freedv_rx_ss : virtual public gr::block
- {
- public:
- typedef boost::shared_ptr<freedv_rx_ss> sptr;
-
- /*!
- * \brief Make FreeDV modem demodulator block.
- *
- * \param mode Operating Mode designation
- * \param squelch_thresh FreeDV modem squelch threshold value
- * \param interleave_frames FreeDV 700D mode number of frames to average error
- */
- static sptr make(int mode=freedv_api::MODE_1600, float squelch_thresh=-100.0, int interleave_frames=1);
+ static sptr make(int mode = freedv_api::MODE_1600,
+ float squelch_thresh = -100.0,
+ int interleave_frames = 1);
- virtual void set_squelch_thresh(float squelch_thresh) = 0;
- virtual float squelch_thresh() = 0;
- virtual void set_squelch_en(bool squelch_enable) = 0;
- };
+ virtual void set_squelch_thresh(float squelch_thresh) = 0;
+ virtual float squelch_thresh() = 0;
+ virtual void set_squelch_en(bool squelch_enable) = 0;
+};
- } /* namespace vocoder */
+} /* namespace vocoder */
} /* namespace gr */
#endif /* INCLUDED_VOCODER_FREEDV_RX_H */
diff --git a/gr-vocoder/include/gnuradio/vocoder/freedv_tx_ss.h b/gr-vocoder/include/gnuradio/vocoder/freedv_tx_ss.h
index 21754c604a..32f7296d01 100644
--- a/gr-vocoder/include/gnuradio/vocoder/freedv_tx_ss.h
+++ b/gr-vocoder/include/gnuradio/vocoder/freedv_tx_ss.h
@@ -28,33 +28,35 @@
#include <gnuradio/sync_block.h>
namespace gr {
- namespace vocoder {
+namespace vocoder {
+
+/*!
+ * \brief FreeDV modulator
+ * \ingroup audio_blk
+ *
+ * Input: Speech (audio) signal as 16-bit shorts, sampling rate 8 kHz.
+ *
+ * Output: Signal (audio) as 16-bit shorts, sampling rate 8 kHz.
+ *
+ */
+class VOCODER_API freedv_tx_ss : virtual public gr::sync_block
+{
+public:
+ typedef boost::shared_ptr<freedv_tx_ss> sptr;
/*!
- * \brief FreeDV modulator
- * \ingroup audio_blk
- *
- * Input: Speech (audio) signal as 16-bit shorts, sampling rate 8 kHz.
- *
- * Output: Signal (audio) as 16-bit shorts, sampling rate 8 kHz.
+ * \brief Make FreeDV Modem modulator block.
*
+ * \param mode Operating Mode designation
+ * \param msg_txt Low Rate message text (callsign, location)
+ * \param interleave_frames FreeDV 700D mode number of frames to average error
*/
- class VOCODER_API freedv_tx_ss : virtual public gr::sync_block
- {
- public:
- typedef boost::shared_ptr<freedv_tx_ss> sptr;
-
- /*!
- * \brief Make FreeDV Modem modulator block.
- *
- * \param mode Operating Mode designation
- * \param msg_txt Low Rate message text (callsign, location)
- * \param interleave_frames FreeDV 700D mode number of frames to average error
- */
- static sptr make(int mode=freedv_api::MODE_1600,const std::string msg_txt="GNU Radio",int interleave_frames=1);
- };
+ static sptr make(int mode = freedv_api::MODE_1600,
+ const std::string msg_txt = "GNU Radio",
+ int interleave_frames = 1);
+};
- } /* namespace vocoder */
+} /* namespace vocoder */
} /* namespace gr */
#endif /* INCLUDED_VOCODER_FREEDV_TX_H */
diff --git a/gr-vocoder/include/gnuradio/vocoder/g721_decode_bs.h b/gr-vocoder/include/gnuradio/vocoder/g721_decode_bs.h
index e4629b4ba2..38feb4e9ac 100644
--- a/gr-vocoder/include/gnuradio/vocoder/g721_decode_bs.h
+++ b/gr-vocoder/include/gnuradio/vocoder/g721_decode_bs.h
@@ -27,25 +27,25 @@
#include <gnuradio/sync_block.h>
namespace gr {
- namespace vocoder {
+namespace vocoder {
+
+/*!
+ * \brief This block performs g721 audio decoding.
+ * \ingroup audio_blk
+ */
+class VOCODER_API g721_decode_bs : virtual public sync_block
+{
+public:
+ // gr::vocoder::g721_decode_bs::sptr
+ typedef boost::shared_ptr<g721_decode_bs> sptr;
/*!
- * \brief This block performs g721 audio decoding.
- * \ingroup audio_blk
+ * \brief Make G721 decoder block.
*/
- class VOCODER_API g721_decode_bs : virtual public sync_block
- {
- public:
- // gr::vocoder::g721_decode_bs::sptr
- typedef boost::shared_ptr<g721_decode_bs> sptr;
-
- /*!
- * \brief Make G721 decoder block.
- */
- static sptr make();
- };
+ static sptr make();
+};
- } /* namespace vocoder */
+} /* namespace vocoder */
} /* namespace gr */
#endif /* INCLUDED_VOCODER_G721_DECODE_BS_H */
diff --git a/gr-vocoder/include/gnuradio/vocoder/g721_encode_sb.h b/gr-vocoder/include/gnuradio/vocoder/g721_encode_sb.h
index e5afc2dece..9a4a2f69b8 100644
--- a/gr-vocoder/include/gnuradio/vocoder/g721_encode_sb.h
+++ b/gr-vocoder/include/gnuradio/vocoder/g721_encode_sb.h
@@ -27,25 +27,25 @@
#include <gnuradio/sync_block.h>
namespace gr {
- namespace vocoder {
+namespace vocoder {
+
+/*!
+ * \brief This block performs g721 audio encoding.
+ * \ingroup audio_blk
+ */
+class VOCODER_API g721_encode_sb : virtual public sync_block
+{
+public:
+ // gr::vocoder::g721_encode_sb::sptr
+ typedef boost::shared_ptr<g721_encode_sb> sptr;
/*!
- * \brief This block performs g721 audio encoding.
- * \ingroup audio_blk
+ * \brief Make G721 encoder block.
*/
- class VOCODER_API g721_encode_sb : virtual public sync_block
- {
- public:
- // gr::vocoder::g721_encode_sb::sptr
- typedef boost::shared_ptr<g721_encode_sb> sptr;
-
- /*!
- * \brief Make G721 encoder block.
- */
- static sptr make();
- };
+ static sptr make();
+};
- } /* namespace vocoder */
+} /* namespace vocoder */
} /* namespace gr */
#endif /* INCLUDED_VOCODER_G721_ENCODE_SB_H */
diff --git a/gr-vocoder/include/gnuradio/vocoder/g723_24_decode_bs.h b/gr-vocoder/include/gnuradio/vocoder/g723_24_decode_bs.h
index 1f4a686d57..b8b45caa40 100644
--- a/gr-vocoder/include/gnuradio/vocoder/g723_24_decode_bs.h
+++ b/gr-vocoder/include/gnuradio/vocoder/g723_24_decode_bs.h
@@ -27,25 +27,25 @@
#include <gnuradio/sync_block.h>
namespace gr {
- namespace vocoder {
+namespace vocoder {
+
+/*!
+ * \brief This block performs g723_24 audio decoding.
+ * \ingroup audio_blk
+ */
+class VOCODER_API g723_24_decode_bs : virtual public sync_block
+{
+public:
+ // gr::vocoder::g723_24_decode_bs::sptr
+ typedef boost::shared_ptr<g723_24_decode_bs> sptr;
/*!
- * \brief This block performs g723_24 audio decoding.
- * \ingroup audio_blk
+ * \brief Make G722_24 decoder block.
*/
- class VOCODER_API g723_24_decode_bs : virtual public sync_block
- {
- public:
- // gr::vocoder::g723_24_decode_bs::sptr
- typedef boost::shared_ptr<g723_24_decode_bs> sptr;
-
- /*!
- * \brief Make G722_24 decoder block.
- */
- static sptr make();
- };
+ static sptr make();
+};
- } /* namespace vocoder */
+} /* namespace vocoder */
} /* namespace gr */
#endif /* INCLUDED_VOCODER_G723_24_DECODE_BS_H */
diff --git a/gr-vocoder/include/gnuradio/vocoder/g723_24_encode_sb.h b/gr-vocoder/include/gnuradio/vocoder/g723_24_encode_sb.h
index 0c49749220..8e3c1ae60d 100644
--- a/gr-vocoder/include/gnuradio/vocoder/g723_24_encode_sb.h
+++ b/gr-vocoder/include/gnuradio/vocoder/g723_24_encode_sb.h
@@ -27,25 +27,25 @@
#include <gnuradio/sync_block.h>
namespace gr {
- namespace vocoder {
+namespace vocoder {
+
+/*!
+ * \brief This block performs g723_24 audio encoding.
+ * \ingroup audio_blk
+ */
+class VOCODER_API g723_24_encode_sb : virtual public sync_block
+{
+public:
+ // gr::vocoder::g723_24_encode_sb::sptr
+ typedef boost::shared_ptr<g723_24_encode_sb> sptr;
/*!
- * \brief This block performs g723_24 audio encoding.
- * \ingroup audio_blk
+ * \brief Make G722_24 encoder block.
*/
- class VOCODER_API g723_24_encode_sb : virtual public sync_block
- {
- public:
- // gr::vocoder::g723_24_encode_sb::sptr
- typedef boost::shared_ptr<g723_24_encode_sb> sptr;
-
- /*!
- * \brief Make G722_24 encoder block.
- */
- static sptr make();
- };
+ static sptr make();
+};
- } /* namespace vocoder */
+} /* namespace vocoder */
} /* namespace gr */
#endif /* INCLUDED_VOCODER_G723_24_ENCODE_SB_H */
diff --git a/gr-vocoder/include/gnuradio/vocoder/g723_40_decode_bs.h b/gr-vocoder/include/gnuradio/vocoder/g723_40_decode_bs.h
index 123d04d76b..6b89d8d5d8 100644
--- a/gr-vocoder/include/gnuradio/vocoder/g723_40_decode_bs.h
+++ b/gr-vocoder/include/gnuradio/vocoder/g723_40_decode_bs.h
@@ -27,25 +27,25 @@
#include <gnuradio/sync_block.h>
namespace gr {
- namespace vocoder {
+namespace vocoder {
+
+/*!
+ * \brief This block performs g723_40 audio decoding.
+ * \ingroup audio_blk
+ */
+class VOCODER_API g723_40_decode_bs : virtual public sync_block
+{
+public:
+ // gr::vocoder::g723_40_decode_bs::sptr
+ typedef boost::shared_ptr<g723_40_decode_bs> sptr;
/*!
- * \brief This block performs g723_40 audio decoding.
- * \ingroup audio_blk
+ * \brief Make G722_40 decoder block.
*/
- class VOCODER_API g723_40_decode_bs : virtual public sync_block
- {
- public:
- // gr::vocoder::g723_40_decode_bs::sptr
- typedef boost::shared_ptr<g723_40_decode_bs> sptr;
-
- /*!
- * \brief Make G722_40 decoder block.
- */
- static sptr make();
- };
+ static sptr make();
+};
- } /* namespace vocoder */
+} /* namespace vocoder */
} /* namespace gr */
#endif /* INCLUDED_VOCODER_G723_40_DECODE_BS_H */
diff --git a/gr-vocoder/include/gnuradio/vocoder/g723_40_encode_sb.h b/gr-vocoder/include/gnuradio/vocoder/g723_40_encode_sb.h
index 037ed8e4af..ab3820559c 100644
--- a/gr-vocoder/include/gnuradio/vocoder/g723_40_encode_sb.h
+++ b/gr-vocoder/include/gnuradio/vocoder/g723_40_encode_sb.h
@@ -27,25 +27,25 @@
#include <gnuradio/sync_block.h>
namespace gr {
- namespace vocoder {
+namespace vocoder {
+
+/*!
+ * \brief This block performs g723_40 audio encoding.
+ * \ingroup audio_blk
+ */
+class VOCODER_API g723_40_encode_sb : virtual public sync_block
+{
+public:
+ // gr::vocoder::g723_40_encode_sb::sptr
+ typedef boost::shared_ptr<g723_40_encode_sb> sptr;
/*!
- * \brief This block performs g723_40 audio encoding.
- * \ingroup audio_blk
+ * \brief Make G722_40 encoder block.
*/
- class VOCODER_API g723_40_encode_sb : virtual public sync_block
- {
- public:
- // gr::vocoder::g723_40_encode_sb::sptr
- typedef boost::shared_ptr<g723_40_encode_sb> sptr;
-
- /*!
- * \brief Make G722_40 encoder block.
- */
- static sptr make();
- };
+ static sptr make();
+};
- } /* namespace vocoder */
+} /* namespace vocoder */
} /* namespace gr */
#endif /* INCLUDED_VOCODER_G723_40_ENCODE_SB_H */
diff --git a/gr-vocoder/include/gnuradio/vocoder/gsm_fr_decode_ps.h b/gr-vocoder/include/gnuradio/vocoder/gsm_fr_decode_ps.h
index b9aa664a77..a4af270b6b 100644
--- a/gr-vocoder/include/gnuradio/vocoder/gsm_fr_decode_ps.h
+++ b/gr-vocoder/include/gnuradio/vocoder/gsm_fr_decode_ps.h
@@ -27,28 +27,28 @@
#include <gnuradio/sync_interpolator.h>
namespace gr {
- namespace vocoder {
+namespace vocoder {
+
+/*!
+ * \brief GSM 06.10 Full Rate Vocoder Decoder
+ * \ingroup audio_blk
+ *
+ * Input: Vector of 33 bytes per 160 input samples
+ * Output: 16-bit shorts representing speech samples
+ */
+class VOCODER_API gsm_fr_decode_ps : virtual public sync_interpolator
+{
+public:
+ // gr::vocoder::gsm_fr_decode_ps::sptr
+ typedef boost::shared_ptr<gsm_fr_decode_ps> sptr;
/*!
- * \brief GSM 06.10 Full Rate Vocoder Decoder
- * \ingroup audio_blk
- *
- * Input: Vector of 33 bytes per 160 input samples
- * Output: 16-bit shorts representing speech samples
+ * \brief Make GSM decoder block.
*/
- class VOCODER_API gsm_fr_decode_ps : virtual public sync_interpolator
- {
- public:
- // gr::vocoder::gsm_fr_decode_ps::sptr
- typedef boost::shared_ptr<gsm_fr_decode_ps> sptr;
-
- /*!
- * \brief Make GSM decoder block.
- */
- static sptr make();
- };
+ static sptr make();
+};
- } /* namespace vocoder */
+} /* namespace vocoder */
} /* namespace gr */
#endif /* INCLUDED_VOCODER_GSM_FR_DECODE_PS_H */
diff --git a/gr-vocoder/include/gnuradio/vocoder/gsm_fr_encode_sp.h b/gr-vocoder/include/gnuradio/vocoder/gsm_fr_encode_sp.h
index 5cfbc653cd..ba5cfbd38a 100644
--- a/gr-vocoder/include/gnuradio/vocoder/gsm_fr_encode_sp.h
+++ b/gr-vocoder/include/gnuradio/vocoder/gsm_fr_encode_sp.h
@@ -27,28 +27,28 @@
#include <gnuradio/sync_decimator.h>
namespace gr {
- namespace vocoder {
+namespace vocoder {
+
+/*!
+ * \brief GSM 06.10 Full Rate Vocoder Encoder
+ * \ingroup audio_blk
+ *
+ * Input: 16-bit shorts representing speech samples
+ * Output: Vector of 33 bytes per 160 input samples
+ */
+class VOCODER_API gsm_fr_encode_sp : virtual public sync_decimator
+{
+public:
+ // gr::vocoder::gsm_fr_encode_sp::sptr
+ typedef boost::shared_ptr<gsm_fr_encode_sp> sptr;
/*!
- * \brief GSM 06.10 Full Rate Vocoder Encoder
- * \ingroup audio_blk
- *
- * Input: 16-bit shorts representing speech samples
- * Output: Vector of 33 bytes per 160 input samples
+ * \brief Make GSM encoder block.
*/
- class VOCODER_API gsm_fr_encode_sp : virtual public sync_decimator
- {
- public:
- // gr::vocoder::gsm_fr_encode_sp::sptr
- typedef boost::shared_ptr<gsm_fr_encode_sp> sptr;
-
- /*!
- * \brief Make GSM encoder block.
- */
- static sptr make();
- };
+ static sptr make();
+};
- } /* namespace vocoder */
+} /* namespace vocoder */
} /* namespace gr */
#endif /* INCLUDED_VOCODER_GSM_FR_ENCODE_SP_H */
diff --git a/gr-vocoder/include/gnuradio/vocoder/ulaw_decode_bs.h b/gr-vocoder/include/gnuradio/vocoder/ulaw_decode_bs.h
index 68f3789216..37510452ce 100644
--- a/gr-vocoder/include/gnuradio/vocoder/ulaw_decode_bs.h
+++ b/gr-vocoder/include/gnuradio/vocoder/ulaw_decode_bs.h
@@ -27,25 +27,25 @@
#include <gnuradio/sync_block.h>
namespace gr {
- namespace vocoder {
+namespace vocoder {
+
+/*!
+ * \brief This block performs ulaw audio decoding.
+ * \ingroup audio_blk
+ */
+class VOCODER_API ulaw_decode_bs : virtual public sync_block
+{
+public:
+ // gr::vocoder::ulaw_decode_bs::sptr
+ typedef boost::shared_ptr<ulaw_decode_bs> sptr;
/*!
- * \brief This block performs ulaw audio decoding.
- * \ingroup audio_blk
+ * \brief Make ulaw decoder block.
*/
- class VOCODER_API ulaw_decode_bs : virtual public sync_block
- {
- public:
- // gr::vocoder::ulaw_decode_bs::sptr
- typedef boost::shared_ptr<ulaw_decode_bs> sptr;
-
- /*!
- * \brief Make ulaw decoder block.
- */
- static sptr make();
- };
+ static sptr make();
+};
- } /* namespace vocoder */
+} /* namespace vocoder */
} /* namespace gr */
#endif /* INCLUDED_VOCODER_ULAW_DECODE_BS_H */
diff --git a/gr-vocoder/include/gnuradio/vocoder/ulaw_encode_sb.h b/gr-vocoder/include/gnuradio/vocoder/ulaw_encode_sb.h
index ba50f8750a..635192f674 100644
--- a/gr-vocoder/include/gnuradio/vocoder/ulaw_encode_sb.h
+++ b/gr-vocoder/include/gnuradio/vocoder/ulaw_encode_sb.h
@@ -27,25 +27,25 @@
#include <gnuradio/sync_block.h>
namespace gr {
- namespace vocoder {
+namespace vocoder {
+
+/*!
+ * \brief This block performs g.711 ulaw audio encoding.
+ * \ingroup audio_blk
+ */
+class VOCODER_API ulaw_encode_sb : virtual public sync_block
+{
+public:
+ // gr::vocoder::ulaw_encode_sb::sptr
+ typedef boost::shared_ptr<ulaw_encode_sb> sptr;
/*!
- * \brief This block performs g.711 ulaw audio encoding.
- * \ingroup audio_blk
+ * \brief Make ulaw encoder block.
*/
- class VOCODER_API ulaw_encode_sb : virtual public sync_block
- {
- public:
- // gr::vocoder::ulaw_encode_sb::sptr
- typedef boost::shared_ptr<ulaw_encode_sb> sptr;
-
- /*!
- * \brief Make ulaw encoder block.
- */
- static sptr make();
- };
+ static sptr make();
+};
- } /* namespace vocoder */
+} /* namespace vocoder */
} /* namespace gr */
#endif /* INCLUDED_VOCODER_ULAW_ENCODE_SB_H */