diff options
Diffstat (limited to 'gr-vocoder')
| -rw-r--r-- | gr-vocoder/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | gr-vocoder/docs/CMakeLists.txt (renamed from gr-vocoder/doc/CMakeLists.txt) | 0 | ||||
| -rw-r--r-- | gr-vocoder/docs/README.vocoder (renamed from gr-vocoder/doc/README.vocoder) | 0 | ||||
| -rw-r--r-- | gr-vocoder/docs/vocoder.dox (renamed from gr-vocoder/doc/vocoder.dox) | 2 | ||||
| -rw-r--r-- | gr-vocoder/grc/CMakeLists.txt.orig | 53 | ||||
| -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 | ||||
| -rw-r--r-- | gr-vocoder/lib/cvsd_decode_bs_impl.cc | 2 | ||||
| -rw-r--r-- | gr-vocoder/lib/cvsd_encode_sb_impl.cc | 4 | ||||
| -rw-r--r-- | gr-vocoder/lib/cvsd_encode_sb_impl.h | 2 | ||||
| -rw-r--r-- | gr-vocoder/lib/g7xx/g72x.h | 2 |
12 files changed, 9 insertions, 115 deletions
diff --git a/gr-vocoder/CMakeLists.txt b/gr-vocoder/CMakeLists.txt index 29798318e7..e90ba29727 100644 --- a/gr-vocoder/CMakeLists.txt +++ b/gr-vocoder/CMakeLists.txt @@ -76,7 +76,7 @@ endif(LIBGSM_FOUND) ######################################################################## add_subdirectory(include/gnuradio/vocoder) add_subdirectory(lib) -add_subdirectory(doc) +add_subdirectory(docs) if(ENABLE_PYTHON) add_subdirectory(swig) add_subdirectory(python/vocoder) diff --git a/gr-vocoder/doc/CMakeLists.txt b/gr-vocoder/docs/CMakeLists.txt index 570c504e3f..570c504e3f 100644 --- a/gr-vocoder/doc/CMakeLists.txt +++ b/gr-vocoder/docs/CMakeLists.txt diff --git a/gr-vocoder/doc/README.vocoder b/gr-vocoder/docs/README.vocoder index 2737063cce..2737063cce 100644 --- a/gr-vocoder/doc/README.vocoder +++ b/gr-vocoder/docs/README.vocoder diff --git a/gr-vocoder/doc/vocoder.dox b/gr-vocoder/docs/vocoder.dox index 214d652a8b..2e2740f0d5 100644 --- a/gr-vocoder/doc/vocoder.dox +++ b/gr-vocoder/docs/vocoder.dox @@ -27,7 +27,7 @@ must convert audio signals from float to short by using a type conversion and a scaling factor. See the examples. The format of the encoded audio is different for every encoder. See the -individual block's documention for the data format. Encoded data is usually +individual block's documentation for the data format. Encoded data is usually a vector of fixed length, and can either be packed or unpacked. */ diff --git a/gr-vocoder/grc/CMakeLists.txt.orig b/gr-vocoder/grc/CMakeLists.txt.orig deleted file mode 100644 index fb2cc5053e..0000000000 --- a/gr-vocoder/grc/CMakeLists.txt.orig +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 2011,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(FILES - vocoder_alaw_decode_bs.block.yml - vocoder_alaw_encode_sb.block.yml - vocoder_block_tree.block.yml - vocoder_cvsd_decode_bs.block.yml - vocoder_cvsd_decode.block.yml - vocoder_cvsd_encode_sb.block.yml - vocoder_cvsd_encode.block.yml - vocoder_g721_decode_bs.block.yml - vocoder_g721_encode_sb.block.yml - vocoder_g723_24_decode_bs.block.yml - vocoder_g723_24_encode_sb.block.yml - vocoder_g723_40_decode_bs.block.yml - vocoder_g723_40_encode_sb.block.yml - vocoder_ulaw_decode_bs.block.yml - vocoder_ulaw_encode_sb.block.yml - DESTINATION ${GRC_BLOCKS_DIR} -) - -if(LIBCODEC2_FOUND) - install(FILES - vocoder_codec2_decode_ps.block.yml - vocoder_codec2_encode_sp.block.yml - DESTINATION ${GRC_BLOCKS_DIR} - ) -endif(LIBCODEC2_FOUND) - -if(LIBGSM_FOUND) - install(FILES - vocoder_gsm_fr_decode_ps.block.yml - vocoder_gsm_fr_encode_sp.block.yml - DESTINATION ${GRC_BLOCKS_DIR} - ) -endif(LIBGSM_FOUND) 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" diff --git a/gr-vocoder/lib/cvsd_decode_bs_impl.cc b/gr-vocoder/lib/cvsd_decode_bs_impl.cc index b6b42cef60..f0603b78d9 100644 --- a/gr-vocoder/lib/cvsd_decode_bs_impl.cc +++ b/gr-vocoder/lib/cvsd_decode_bs_impl.cc @@ -122,7 +122,7 @@ namespace gr { // Loop through each input data point for(i = 0; i < noutput_items/8.0; i++) { input_byte = in[i]; - // Initiliaze bit counter + // Initialize bit counter bit_count=0; while(bit_count<8) { diff --git a/gr-vocoder/lib/cvsd_encode_sb_impl.cc b/gr-vocoder/lib/cvsd_encode_sb_impl.cc index 3c8d69c1d2..3c4656cf34 100644 --- a/gr-vocoder/lib/cvsd_encode_sb_impl.cc +++ b/gr-vocoder/lib/cvsd_encode_sb_impl.cc @@ -129,7 +129,7 @@ namespace gr { // Update Accum (i.e. the reference value) if(output_bit) { d_accum=d_accum+d_stepsize; - //printf("Addding %d to the accum; the result is: %d.\n", d_stepsize, d_accum); + //printf("Adding %d to the accum; the result is: %d.\n", d_stepsize, d_accum); } else { d_accum=d_accum-d_stepsize; @@ -165,7 +165,7 @@ namespace gr { // Runner is a shift-register; shift left, add on newest output bit d_runner = (d_runner<<1) | ((unsigned int) output_bit); - // Update the ouput type; shift left, add on newest output bit + // Update the output type; shift left, add on newest output bit // If you have put in 8 bits, output it as a byte output_byte = (output_byte<<1) | output_bit; bit_count++; diff --git a/gr-vocoder/lib/cvsd_encode_sb_impl.h b/gr-vocoder/lib/cvsd_encode_sb_impl.h index 546b029d19..8b9282b865 100644 --- a/gr-vocoder/lib/cvsd_encode_sb_impl.h +++ b/gr-vocoder/lib/cvsd_encode_sb_impl.h @@ -44,7 +44,7 @@ namespace gr { //! \return the number of 1s in the four bytes of an input unsigned integer unsigned char cvsd_bitwise_sum(unsigned int input); - // Members variables related to the CVSD encoder use to update interal reference value + // Members variables related to the CVSD encoder use to update internal reference value short d_min_step; short d_max_step; double d_step_decay; diff --git a/gr-vocoder/lib/g7xx/g72x.h b/gr-vocoder/lib/g7xx/g72x.h index 9d906cae75..6186788660 100644 --- a/gr-vocoder/lib/g7xx/g72x.h +++ b/gr-vocoder/lib/g7xx/g72x.h @@ -42,7 +42,7 @@ * used by the G.721/G.723 encoder and decoder to preserve their internal * state between successive calls. The meanings of the majority * of the state structure fields are explained in detail in the - * CCITT Recommendation G.721. The field names are essentially indentical + * CCITT Recommendation G.721. The field names are essentially identical * to variable names in the bit level description of the coding algorithm * included in this Recommendation. */ |