diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2013-04-04 11:50:35 -0400 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2013-04-04 12:37:40 -0400 |
| commit | 8b1303bbb0bf72569a5149082796f50b6e8f9a5b (patch) | |
| tree | 5809962a19338db21f28957535529552d12992a1 /gr-vocoder/include/vocoder/cvsd_encode_sb.h | |
| parent | 2930f1b4265b794599d814e9a3d68fd03bde010f (diff) | |
docs: fixes for merge conflicts and differences between master/next.
Diffstat (limited to 'gr-vocoder/include/vocoder/cvsd_encode_sb.h')
| -rw-r--r-- | gr-vocoder/include/vocoder/cvsd_encode_sb.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/gr-vocoder/include/vocoder/cvsd_encode_sb.h b/gr-vocoder/include/vocoder/cvsd_encode_sb.h index 1fca494469..c12269562e 100644 --- a/gr-vocoder/include/vocoder/cvsd_encode_sb.h +++ b/gr-vocoder/include/vocoder/cvsd_encode_sb.h @@ -32,9 +32,9 @@ namespace gr { * \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 * - * \ingroup vocoder_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 @@ -95,8 +95,6 @@ namespace gr { * The default values are modeled after the Bluetooth standard and * should not be changed except by an advanced user * - * \ingroup vocoder_blk - * * \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. |