diff options
| author | A. Maitland Bottoms <bottoms@debian.org> | 2019-03-11 22:54:21 -0400 |
|---|---|---|
| committer | Andrej Rode <mail@andrejro.de> | 2019-03-24 20:14:42 +0100 |
| commit | e02eed791069c82bd262f4b2cbe324db76326e54 (patch) | |
| tree | 8d7393cb9ef7caa8a2088d66ca19f1a285307b5f /gr-vocoder/lib/freedv_tx_ss_impl.cc | |
| parent | b9e5abc5972706f078a51b6d0bb9dbb6535c5b9c (diff) | |
gr-vocoder: update codec2 and freedv blocks.
Update to add support for newer modes in codec2 0.8.1.
Fixup grc blocks yml templates, update examples.
Diffstat (limited to 'gr-vocoder/lib/freedv_tx_ss_impl.cc')
| -rw-r--r-- | gr-vocoder/lib/freedv_tx_ss_impl.cc | 53 |
1 files changed, 48 insertions, 5 deletions
diff --git a/gr-vocoder/lib/freedv_tx_ss_impl.cc b/gr-vocoder/lib/freedv_tx_ss_impl.cc index a375510050..e56267d5ef 100644 --- a/gr-vocoder/lib/freedv_tx_ss_impl.cc +++ b/gr-vocoder/lib/freedv_tx_ss_impl.cc @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2016 Free Software Foundation, Inc. + * Copyright 2016-2019 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -54,20 +54,31 @@ namespace gr { namespace vocoder { freedv_tx_ss::sptr - freedv_tx_ss::make(int mode, const std::string msg_txt) + freedv_tx_ss::make(int mode, const std::string msg_txt, int interleave_frames) { return gnuradio::get_initial_sptr - (new freedv_tx_ss_impl(mode, msg_txt)); + (new freedv_tx_ss_impl(mode, msg_txt, interleave_frames)); } - freedv_tx_ss_impl::freedv_tx_ss_impl(int mode, const std::string msg_txt) + freedv_tx_ss_impl::freedv_tx_ss_impl(int mode, const std::string msg_txt, int interleave_frames) : sync_block("vocoder_freedv_tx_ss", io_signature::make(1, 1, sizeof(short)), io_signature::make(1, 1, sizeof(short))), - d_mode(mode), d_msg_text(msg_txt) + d_mode(mode), d_msg_text(msg_txt), d_interleave_frames(interleave_frames) { +#ifdef FREEDV_MODE_700D + if (mode == FREEDV_MODE_700D) { + d_adv.interleave_frames = interleave_frames; + if((d_freedv = freedv_open_advanced(mode, &d_adv)) ==NULL) + throw std::runtime_error("freedv_tx_ss_impl: freedv_open_advanced failed"); + } else { + if((d_freedv = freedv_open(mode)) == NULL) + throw std::runtime_error("freedv_tx_ss_impl: freedv_open failed"); + } +#else if((d_freedv = freedv_open(mode)) == NULL) throw std::runtime_error("freedv_tx_ss_impl: freedv_open failed"); +#endif snprintf(d_cb_state.tx_str,79,"%s",d_msg_text.c_str()); d_cb_state.ptx_str = d_cb_state.tx_str; freedv_set_callback_txt(d_freedv, NULL, get_next_tx_char, (void *) &d_cb_state); @@ -80,6 +91,38 @@ namespace gr { freedv_close(d_freedv); } + void freedv_tx_ss_impl::set_clip(int val) + { + d_clip = val; +#if defined(FREEDV_MODE_700C) || defined(FREEDV_MODE_700D) + freedv_set_clip(d_freedv, d_clip); +#endif + } + + void freedv_tx_ss_impl::set_clip(bool val) + { + if (val) + freedv_tx_ss_impl::set_clip(1); + else + freedv_tx_ss_impl::set_clip(0); + } + + void freedv_tx_ss_impl::set_tx_bpf(int val) + { + d_tx_bpf = val; +#ifdef FREEDV_MODE_700D + freedv_set_tx_bpf(d_freedv, d_tx_bpf); +#endif + } + + void freedv_tx_ss_impl::set_tx_bpf(bool val) + { + if (val) + freedv_tx_ss_impl::set_tx_bpf(1); + else + freedv_tx_ss_impl::set_tx_bpf(0); + } + int freedv_tx_ss_impl::work(int noutput_items, gr_vector_const_void_star &input_items, |