diff options
| author | ptrkrysik <ptrkrysik@gmail.com> | 2015-06-20 09:22:01 +0200 |
|---|---|---|
| committer | ptrkrysik <ptrkrysik@gmail.com> | 2015-06-20 09:22:01 +0200 |
| commit | 9ee374b53e2149d77645a64b3aa2ff5cc0c89d14 (patch) | |
| tree | d90fd01e72f1fba11a90b84a494300ca2f6688d0 /include | |
| parent | 42bbbd3ac79808a30216f68471d9656d1940e493 (diff) | |
| parent | 601dca339647251c49f6e053d9544c286e5850e1 (diff) | |
Merge remote-tracking branch 'origin/romankh-master'
with implementation of AMR decoding
Conflicts:
lib/decoding/tch_f_decoder_impl.cc
lib/decoding/tch_f_decoder_impl.h
Diffstat (limited to 'include')
| -rw-r--r-- | include/grgsm/decoding/tch_f_decoder.h | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/include/grgsm/decoding/tch_f_decoder.h b/include/grgsm/decoding/tch_f_decoder.h index 42c9107..efe082c 100644 --- a/include/grgsm/decoding/tch_f_decoder.h +++ b/include/grgsm/decoding/tch_f_decoder.h @@ -32,8 +32,16 @@ namespace gr { enum tch_mode { - MODE_SPEECH_FR, - MODE_SPEECH_EFR, + TCH_AFS12_2, + TCH_AFS10_2, + TCH_AFS7_95, + TCH_AFS7_4, + TCH_AFS6_7, + TCH_AFS5_9, + TCH_AFS5_15, + TCH_AFS4_75, + TCH_FS, + TCH_EFR }; /*! |