diff options
| author | Martin Braun <martin.braun@ettus.com> | 2018-02-03 16:58:15 +0100 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2018-02-03 16:58:43 +0100 |
| commit | db7e26bc73fd71bc88249131f57f7edef308fa63 (patch) | |
| tree | d084ad2615012d53c50a230821761349eb978d56 /gr-vocoder/include | |
| parent | 3c63f7334d6de70d655aa97fcccbfb950645f4d4 (diff) | |
| parent | a35e10870bbb9a71b3ab66b1dc58135e08c9543e (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'gr-vocoder/include')
| -rw-r--r-- | gr-vocoder/include/gnuradio/vocoder/CMakeLists.txt.orig | 53 | ||||
| -rw-r--r-- | gr-vocoder/include/gnuradio/vocoder/cvsd_decode_bs.h | 2 | ||||
| -rw-r--r-- | gr-vocoder/include/gnuradio/vocoder/cvsd_encode_sb.h | 2 |
3 files changed, 2 insertions, 55 deletions
diff --git a/gr-vocoder/include/gnuradio/vocoder/CMakeLists.txt.orig b/gr-vocoder/include/gnuradio/vocoder/CMakeLists.txt.orig deleted file mode 100644 index 172f18a730..0000000000 --- a/gr-vocoder/include/gnuradio/vocoder/CMakeLists.txt.orig +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 2012,2013,2016 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. - -######################################################################## -# Install header files -######################################################################## -install(FILES - api.h - alaw_decode_bs.h - alaw_encode_sb.h - cvsd_decode_bs.h - cvsd_encode_sb.h - g721_decode_bs.h - g721_encode_sb.h - g723_24_decode_bs.h - g723_24_encode_sb.h - g723_40_decode_bs.h - g723_40_encode_sb.h - ulaw_decode_bs.h - ulaw_encode_sb.h - DESTINATION ${GR_INCLUDE_DIR}/gnuradio/vocoder -) -if(LIBCODEC2_FOUND) -install(FILES - codec2.h - codec2_decode_ps.h - codec2_encode_sp.h - DESTINATION ${GR_INCLUDE_DIR}/gnuradio/vocoder -) -endif(LIBCODEC2_FOUND) -if(LIBGSM_FOUND) -install(FILES - gsm_fr_decode_ps.h - gsm_fr_encode_sp.h - DESTINATION ${GR_INCLUDE_DIR}/gnuradio/vocoder -) -endif(LIBGSM_FOUND) diff --git a/gr-vocoder/include/gnuradio/vocoder/cvsd_decode_bs.h b/gr-vocoder/include/gnuradio/vocoder/cvsd_decode_bs.h index bacc5ae595..53addc58bf 100644 --- a/gr-vocoder/include/gnuradio/vocoder/cvsd_decode_bs.h +++ b/gr-vocoder/include/gnuradio/vocoder/cvsd_decode_bs.h @@ -103,7 +103,7 @@ namespace gr { * 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 interation of the codec. + * \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" diff --git a/gr-vocoder/include/gnuradio/vocoder/cvsd_encode_sb.h b/gr-vocoder/include/gnuradio/vocoder/cvsd_encode_sb.h index da1e92f6ad..71883625cb 100644 --- a/gr-vocoder/include/gnuradio/vocoder/cvsd_encode_sb.h +++ b/gr-vocoder/include/gnuradio/vocoder/cvsd_encode_sb.h @@ -99,7 +99,7 @@ namespace gr { * \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 interation of the codec. + * \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" |