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 /grc | |
| 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 'grc')
| -rw-r--r-- | grc/decoding/gsm_tch_f_decoder.xml | 36 |
1 files changed, 34 insertions, 2 deletions
diff --git a/grc/decoding/gsm_tch_f_decoder.xml b/grc/decoding/gsm_tch_f_decoder.xml index b8d6dbf..59ac97d 100644 --- a/grc/decoding/gsm_tch_f_decoder.xml +++ b/grc/decoding/gsm_tch_f_decoder.xml @@ -11,11 +11,43 @@ <type>enum</type> <option> <name>GSM-FR</name> - <key>grgsm.MODE_SPEECH_FR</key> + <key>grgsm.TCH_FS</key> </option> <option> <name>GSM-EFR</name> - <key>grgsm.MODE_SPEECH_EFR</key> + <key>grgsm.TCH_EFR</key> + </option> + <option> + <name>GSM-AMR 12.2</name> + <key>grgsm.TCH_AFS12_2</key> + </option> + <option> + <name>GSM-AMR 10.2</name> + <key>grgsm.TCH_AFS10_2</key> + </option> + <option> + <name>GSM-AMR 7.95</name> + <key>grgsm.TCH_AFS7_95</key> + </option> + <option> + <name>GSM-AMR 7.4</name> + <key>grgsm.TCH_AFS7_4</key> + </option> + <option> + <name>GSM-AMR 6.7</name> + <key>grgsm.TCH_AFS6_7</key> + </option> + <option> + <name>GSM-AMR 5.9</name> + <key>grgsm.TCH_AFS5_9</key> + </option> + <option> + <name>GSM-AMR 5.15</name> + <key>grgsm.TCH_AFS5_15</key> + </option> + <option> + <name>GSM-AMR 4.75</name> + <key>grgsm.TCH_AFS4_75</key> </option> </param> <param> |