diff options
| author | A. Maitland Bottoms <bottoms@debian.org> | 2016-06-25 17:54:28 -0400 |
|---|---|---|
| committer | A. Maitland Bottoms <bottoms@debian.org> | 2016-06-25 18:49:56 -0400 |
| commit | 7e20b582f8fff0ad63771705eeb6a037ce9b8628 (patch) | |
| tree | 96a3acabc5a92ba493e50f5a13ef8f7144321c40 /gr-vocoder/grc | |
| parent | 45cbe43da3317d9c872672553185d36c5cdf59bd (diff) | |
gr-vocoder: codec2 subcomponent using external codec2 library
Diffstat (limited to 'gr-vocoder/grc')
| -rw-r--r-- | gr-vocoder/grc/CMakeLists.txt | 11 | ||||
| -rw-r--r-- | gr-vocoder/grc/vocoder_codec2_decode_ps.xml | 10 | ||||
| -rw-r--r-- | gr-vocoder/grc/vocoder_codec2_encode_sp.xml | 10 |
3 files changed, 27 insertions, 4 deletions
diff --git a/gr-vocoder/grc/CMakeLists.txt b/gr-vocoder/grc/CMakeLists.txt index f8cf8231b2..35a585a754 100644 --- a/gr-vocoder/grc/CMakeLists.txt +++ b/gr-vocoder/grc/CMakeLists.txt @@ -21,8 +21,6 @@ install(FILES vocoder_alaw_decode_bs.xml vocoder_alaw_encode_sb.xml vocoder_block_tree.xml - vocoder_codec2_decode_ps.xml - vocoder_codec2_encode_sp.xml vocoder_cvsd_decode_bs.xml vocoder_cvsd_decode.xml vocoder_cvsd_encode_sb.xml @@ -40,3 +38,12 @@ install(FILES DESTINATION ${GRC_BLOCKS_DIR} COMPONENT "vocoder_python" ) + +if(LIBCODEC2_FOUND) + install(FILES + vocoder_codec2_decode_ps.xml + vocoder_codec2_encode_sp.xml + DESTINATION ${GRC_BLOCKS_DIR} + COMPONENT "vocoder_python" + ) +endif(LIBCODEC2_FOUND) diff --git a/gr-vocoder/grc/vocoder_codec2_decode_ps.xml b/gr-vocoder/grc/vocoder_codec2_decode_ps.xml index b6e10ef8ba..8448dc83df 100644 --- a/gr-vocoder/grc/vocoder_codec2_decode_ps.xml +++ b/gr-vocoder/grc/vocoder_codec2_decode_ps.xml @@ -39,11 +39,19 @@ <name>1200 bps</name> <key>codec2.MODE_1200</key> </option> + <option> + <name>700 bps</name> + <key>codec2.MODE_700</key> + </option> + <option> + <name>700B bps</name> + <key>codec2.MODE_700B</key> + </option> </param> <sink> <name>in</name> <type>byte</type> - <vlen>{ 0: 64, 1: 48, 2: 64, 3: 56, 4: 52, 5: 48 }[$mode]</vlen> + <vlen>{ 0: 64, 1: 48, 2: 64, 3: 56, 4: 52, 5: 48, 6: 28, 7: 28 }[$mode]</vlen> </sink> <source> <name>out</name> diff --git a/gr-vocoder/grc/vocoder_codec2_encode_sp.xml b/gr-vocoder/grc/vocoder_codec2_encode_sp.xml index 6af54fa586..f11ad443c6 100644 --- a/gr-vocoder/grc/vocoder_codec2_encode_sp.xml +++ b/gr-vocoder/grc/vocoder_codec2_encode_sp.xml @@ -39,6 +39,14 @@ <name>1200 bps</name> <key>codec2.MODE_1200</key> </option> + <option> + <name>700 bps</name> + <key>codec2.MODE_700</key> + </option> + <option> + <name>700B bps</name> + <key>codec2.MODE_700B</key> + </option> </param> <sink> <name>in</name> @@ -47,7 +55,7 @@ <source> <name>out</name> <type>byte</type> - <vlen>{ 0: 64, 1: 48, 2: 64, 3: 56, 4: 52, 5: 48 }[$mode]</vlen> + <vlen>{ 0: 64, 1: 48, 2: 64, 3: 56, 4: 52, 5: 48, 6: 28, 7: 28 }[$mode]</vlen> </source> </block> |