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/lib | |
| parent | 3c63f7334d6de70d655aa97fcccbfb950645f4d4 (diff) | |
| parent | a35e10870bbb9a71b3ab66b1dc58135e08c9543e (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'gr-vocoder/lib')
| -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 |
4 files changed, 5 insertions, 5 deletions
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. */ |