Package: gnuradio / 3.7.13.4-4

codec2-0.8-block-update Patch series | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
From 8921bbe2bc43942b9d233e4acbdb5a79dc05de3c Mon Sep 17 00:00:00 2001
From: "A. Maitland Bottoms" <bottoms@debian.org>
Date: Tue, 5 Jun 2018 15:28:30 -0400
Subject: [PATCH] codec2 0.8 block update

Update gr-vocoder codec2 and freedv blocks to support new modes
(700C, wb, 700D) available as of codec2 release 0.8 if found at
compile time.
---
 gr-vocoder/examples/grfreedv.grc                   | 40 +++++++++++++---
 gr-vocoder/grc/vocoder_codec2_decode_ps.xml        | 10 +++-
 gr-vocoder/grc/vocoder_codec2_encode_sp.xml        | 11 ++++-
 gr-vocoder/grc/vocoder_freedv_rx_ss.xml            | 33 +++++++++++++-
 gr-vocoder/grc/vocoder_freedv_tx_ss.xml            | 40 +++++++++++++++-
 gr-vocoder/include/gnuradio/vocoder/freedv_api.h   | 11 ++++-
 gr-vocoder/include/gnuradio/vocoder/freedv_rx_ss.h |  6 ++-
 gr-vocoder/include/gnuradio/vocoder/freedv_tx_ss.h |  5 +-
 gr-vocoder/lib/freedv_rx_ss_impl.cc                | 31 +++++++++++--
 gr-vocoder/lib/freedv_rx_ss_impl.h                 | 10 +++-
 gr-vocoder/lib/freedv_tx_ss_impl.cc                | 53 ++++++++++++++++++++--
 gr-vocoder/lib/freedv_tx_ss_impl.h                 | 17 +++++--
 gr-vocoder/swig/vocoder_swig.i                     |  6 ++-
 13 files changed, 241 insertions(+), 32 deletions(-)

--- a/gr-vocoder/examples/grfreedv.grc
+++ b/gr-vocoder/examples/grfreedv.grc
@@ -1,12 +1,12 @@
 <?xml version='1.0' encoding='utf-8'?>
-<?grc format='1' created='3.7.9'?>
+<?grc format='1' created='3.7.13'?>
 <flow_graph>
   <timestamp>Wed Jun 29 19:22:27 2016</timestamp>
   <block>
     <key>options</key>
     <param>
       <key>author</key>
-      <value>A. MAitland Bottoms</value>
+      <value>A. Maitland Bottoms</value>
     </param>
     <param>
       <key>window_size</key>
@@ -73,6 +73,10 @@
       <value>True</value>
     </param>
     <param>
+      <key>sizing_mode</key>
+      <value>fixed</value>
+    </param>
+    <param>
       <key>thread_safe_setters</key>
       <value></value>
     </param>
@@ -80,6 +84,10 @@
       <key>title</key>
       <value>GNU Radio FreeDV</value>
     </param>
+    <param>
+      <key>placement</key>
+      <value>(0,0)</value>
+    </param>
   </block>
   <block>
     <key>variable</key>
@@ -120,7 +128,7 @@
     </param>
     <param>
       <key>_enabled</key>
-      <value>True</value>
+      <value>1</value>
     </param>
     <param>
       <key>_coordinate</key>
@@ -187,7 +195,7 @@
     </param>
     <param>
       <key>device_name</key>
-      <value></value>
+      <value>default</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -195,7 +203,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(920, 228)</value>
+      <value>(888, 220)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -508,6 +516,10 @@
       <value>vocoder_freedv_rx_ss_0</value>
     </param>
     <param>
+      <key>interleave_frames</key>
+      <value>1</value>
+    </param>
+    <param>
       <key>maxoutbuf</key>
       <value>0</value>
     </param>
@@ -520,6 +532,10 @@
       <value>freedv_api.MODE_1600</value>
     </param>
     <param>
+      <key>squelch_enable</key>
+      <value>True</value>
+    </param>
+    <param>
       <key>squelch_thresh</key>
       <value>squelch</value>
     </param>
@@ -531,6 +547,10 @@
       <value></value>
     </param>
     <param>
+      <key>clip_val</key>
+      <value>False</value>
+    </param>
+    <param>
       <key>comment</key>
       <value></value>
     </param>
@@ -544,7 +564,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(424, 221)</value>
+      <value>(424, 196)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -555,6 +575,10 @@
       <value>vocoder_freedv_tx_ss_0</value>
     </param>
     <param>
+      <key>interleave_frames</key>
+      <value>1</value>
+    </param>
+    <param>
       <key>maxoutbuf</key>
       <value>0</value>
     </param>
@@ -570,6 +594,10 @@
       <key>txt_msg</key>
       <value>'GNU Radio'</value>
     </param>
+    <param>
+      <key>tx_bpf_val</key>
+      <value>True</value>
+    </param>
   </block>
   <connection>
     <source_block_id>audio_source_0</source_block_id>
--- a/gr-vocoder/grc/vocoder_codec2_decode_ps.xml
+++ b/gr-vocoder/grc/vocoder_codec2_decode_ps.xml
@@ -47,11 +47,19 @@
 			<name>700B bps</name>
 			<key>codec2.MODE_700B</key>
 		</option>
+		<option>
+			<name>700C bps</name>
+			<key>codec2.MODE_700C</key>
+		</option>
+		<option>
+			<name>Wideband</name>
+			<key>codec2.MODE_WB</key>
+		</option>
 	</param>
 	<sink>
 		<name>in</name>
 		<type>byte</type>
-		<vlen>{ 0: 64, 1: 48, 2: 64, 3: 56, 4: 52, 5: 48, 6: 28, 7: 28 }[$mode]</vlen>
+		<vlen>{ 0: 64, 1: 48, 2: 64, 3: 56, 4: 52, 5: 48, 6: 28, 7: 28, 8: 28, 9: 64 }[$mode]</vlen>
 	</sink>
 	<source>
 		<name>out</name>
--- a/gr-vocoder/grc/vocoder_codec2_encode_sp.xml
+++ b/gr-vocoder/grc/vocoder_codec2_encode_sp.xml
@@ -47,6 +47,14 @@
 			<name>700B bps</name>
 			<key>codec2.MODE_700B</key>
 		</option>
+		<option>
+			<name>700C bps</name>
+			<key>codec2.MODE_700C</key>
+		</option>
+		<option>
+			<name>Wideband</name>
+			<key>codec2.MODE_WB</key>
+		</option>
 	</param>
 	<sink>
 		<name>in</name>
@@ -55,7 +63,6 @@
 	<source>
 		<name>out</name>
 		<type>byte</type>
-		<vlen>{ 0: 64, 1: 48, 2: 64, 3: 56, 4: 52, 5: 48, 6: 28, 7: 28 }[$mode]</vlen>
+		<vlen>{ 0: 64, 1: 48, 2: 64, 3: 56, 4: 52, 5: 48, 6: 28, 7: 28, 8: 28, 9: 64 }[$mode]</vlen>
 	</source>
 </block>
-
--- a/gr-vocoder/grc/vocoder_freedv_rx_ss.xml
+++ b/gr-vocoder/grc/vocoder_freedv_rx_ss.xml
@@ -9,7 +9,8 @@
   <key>vocoder_freedv_rx_ss</key>
   <import>from gnuradio import vocoder</import>
   <import>from gnuradio.vocoder import freedv_api</import>
-  <make>vocoder.freedv_rx_ss($mode,$squelch_thresh)</make>
+  <make>vocoder.freedv_rx_ss($mode,$squelch_thresh,$interleave_frames)</make>
+  <callback>set_squelch_en($squelch_enable)</callback>
   <callback>set_squelch_thresh($squelch_thresh)</callback>
   <param>
     <name>Operating Mode</name>
@@ -40,6 +41,20 @@
       <name>800XA</name>
       <key>freedv_api.MODE_800XA</key>
     </option>
+    <option>
+      <name>700C</name>
+      <key>freedv_api.MODE_700C</key>
+    </option>
+    <option>
+      <name>700D</name>
+      <key>freedv_api.MODE_700D</key>
+    </option>
+  </param>
+  <param>
+    <name>Interleave Frames</name>
+    <key>interleave_frames</key>
+    <value>1</value>
+    <type>int</type>
   </param>
   <param>
     <name>Squelch Threshold</name>
@@ -47,6 +62,12 @@
     <value>-100.0</value>
     <type>float</type>
   </param>
+  <param>
+    <name>Squelch Enable</name>
+    <key>squelch_enable</key>
+    <value>True</value>
+    <type>bool</type>
+  </param>
   <sink>
     <name>in</name>
     <type>short</type>
@@ -55,4 +76,14 @@
     <name>out</name>
     <type>short</type>
   </source>
+  <doc>
+Not all modes may be supported by the underlying codec2 library.
+
+interleave_frames is an integer between 1 and 32, and is only used in the 700D mode.
+(must be set the same on both transmitter and receiver)
+
+Squelch Enable defaults to On
+
+Squelch Threshold - cutoff level for receiver
+  </doc>
 </block>
--- a/gr-vocoder/grc/vocoder_freedv_tx_ss.xml
+++ b/gr-vocoder/grc/vocoder_freedv_tx_ss.xml
@@ -9,7 +9,9 @@
   <key>vocoder_freedv_tx_ss</key>
   <import>from gnuradio import vocoder</import>
   <import>from gnuradio.vocoder import freedv_api</import>
-  <make>vocoder.freedv_tx_ss($mode,$txt_msg)</make>
+  <make>vocoder.freedv_tx_ss($mode,$txt_msg,$interleave_frames)</make>
+  <callback>set_clip($clip_val)</callback>
+  <callback>set_tx_bpf($tx_bpf_val)</callback>
   <param>
     <name>Operating Mode</name>
     <key>mode</key>
@@ -39,6 +41,14 @@
       <name>800XA</name>
       <key>freedv_api.MODE_800XA</key>
     </option>
+    <option>
+      <name>700C</name>
+      <key>freedv_api.MODE_700C</key>
+    </option>
+    <option>
+      <name>700D</name>
+      <key>freedv_api.MODE_700D</key>
+    </option>
   </param>
   <param>
     <name>Text Message</name>
@@ -46,6 +56,24 @@
     <value>'GNU Radio'</value>
     <type>string</type>
   </param>
+  <param>
+    <name>Interleave Frames</name>
+    <key>interleave_frames</key>
+    <value>1</value>
+    <type>int</type>
+  </param>
+  <param>
+    <name>Clip</name>
+    <key>clip_val</key>
+    <value>False</value>
+    <type>bool</type>
+  </param>
+  <param>
+    <name>Tx BPF</name>
+    <key>tx_bpf_val</key>
+    <value>True</value>
+    <type>bool</type>
+  </param>
   <sink>
     <name>in</name>
     <type>short</type>
@@ -54,4 +82,14 @@
     <name>out</name>
     <type>short</type>
   </source>
+  <doc>
+Not all modes may be supported by the underlying codec2 library.
+
+interleave_frames is an integer between 1 and 32, and is only used in the 700D mode.
+(must be set the same on both transmitter and receiver)
+
+Clip reduces the Peak/Average Power Ratio from 12dB to 8dB by clipping.
+
+Tx BPF: enable a bandpass filter
+  </doc>
 </block>
--- a/gr-vocoder/include/gnuradio/vocoder/freedv_api.h
+++ b/gr-vocoder/include/gnuradio/vocoder/freedv_api.h
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2016 Free Software Foundation, Inc.
+ * Copyright 2016-2018 Free Software Foundation, Inc.
  *
  * This file is part of GNU Radio
  *
@@ -56,6 +56,15 @@
 #ifdef FREEDV_MODE_800XA
         MODE_800XA = FREEDV_MODE_800XA,
 #endif
+#ifdef FREEDV_MODE_700C
+        MODE_700C = FREEDV_MODE_700C,
+#endif
+#ifdef FREEDV_MODE_700D
+        MODE_700D = FREEDV_MODE_700D,
+	SYNC_UNSYNC = FREEDV_SYNC_UNSYNC,
+	SYNC_AUTO = FREEDV_SYNC_AUTO,
+	SYNC_MANUAL = FREEDV_SYNC_MANUAL,
+#endif
       };
 
     private:
--- a/gr-vocoder/include/gnuradio/vocoder/freedv_rx_ss.h
+++ b/gr-vocoder/include/gnuradio/vocoder/freedv_rx_ss.h
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2016 Free Software Foundation, Inc.
+ * Copyright 2016-2018 Free Software Foundation, Inc.
  *
  * This file is part of GNU Radio
  *
@@ -50,11 +50,13 @@
        *
        * \param mode Operating Mode designation
        * \param squelch_thresh FreeDV modem squelch threshold value
+       * \param interleave_frames FreeDV 700D mode number of frames to average error
        */
-      static sptr make(int mode=freedv_api::MODE_1600, float squelch_thresh=-100.0);
+      static sptr make(int mode=freedv_api::MODE_1600, float squelch_thresh=-100.0, int interleave_frames=1);
 
       virtual void set_squelch_thresh(float squelch_thresh) = 0;
       virtual float squelch_thresh() = 0;
+      virtual void set_squelch_en(bool squelch_enable) = 0;
     };
 
   } /* namespace vocoder */
--- a/gr-vocoder/include/gnuradio/vocoder/freedv_tx_ss.h
+++ b/gr-vocoder/include/gnuradio/vocoder/freedv_tx_ss.h
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2016 Free Software Foundation, Inc.
+ * Copyright 2016-2018 Free Software Foundation, Inc.
  *
  * This file is part of GNU Radio
  *
@@ -49,8 +49,9 @@
        *
        * \param mode Operating Mode designation
        * \param msg_txt Low Rate message text (callsign, location)
+       * \param interleave_frames FreeDV 700D mode number of frames to average error
        */
-      static sptr make(int mode=freedv_api::MODE_1600,const std::string msg_txt="GNU Radio");
+      static sptr make(int mode=freedv_api::MODE_1600,const std::string msg_txt="GNU Radio",int interleave_frames=1);
     };
 
   } /* namespace vocoder */
--- a/gr-vocoder/lib/freedv_rx_ss_impl.cc
+++ b/gr-vocoder/lib/freedv_rx_ss_impl.cc
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2016 Free Software Foundation, Inc.
+ * Copyright 2016-2018 Free Software Foundation, Inc.
  *
  * This file is part of GNU Radio
  *
@@ -47,20 +47,31 @@
   namespace vocoder {
 
     freedv_rx_ss::sptr
-    freedv_rx_ss::make(int mode, float squelch_thresh)
+    freedv_rx_ss::make(int mode, float squelch_thresh, int interleave_frames)
     {
       return gnuradio::get_initial_sptr
-        (new freedv_rx_ss_impl(mode, squelch_thresh));
+        (new freedv_rx_ss_impl(mode, squelch_thresh, interleave_frames));
     }
 
-    freedv_rx_ss_impl::freedv_rx_ss_impl (int mode, float squelch_thresh)
+    freedv_rx_ss_impl::freedv_rx_ss_impl (int mode, float squelch_thresh, int interleave_frames)
       : gr::block("vocoder_freedv_rx_ss",
               io_signature::make(1, 1, sizeof(short)),
               io_signature::make(1, 1, sizeof(short))),
-        d_mode(mode), d_squelch_thresh(squelch_thresh)
+        d_mode(mode), d_squelch_thresh(squelch_thresh), 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_rx_ss_impl: freedv_open failed");
+#endif
       freedv_set_snr_squelch_thresh(d_freedv, d_squelch_thresh);
       freedv_set_squelch_en(d_freedv, 0);
       freedv_set_callback_txt(d_freedv, put_next_rx_char, NULL, (void *) &d_cb_state);
@@ -138,6 +149,16 @@
       freedv_set_snr_squelch_thresh(d_freedv, d_squelch_thresh);
     }
 
+    void freedv_rx_ss_impl::set_squelch_en(bool squelch_enabled)
+    {
+      gr::thread::scoped_lock l(d_setlock);
+      d_squelch_en = squelch_enabled;
+      if (squelch_enabled)
+	freedv_set_squelch_en(d_freedv, 1);
+      else
+	freedv_set_squelch_en(d_freedv, 0);
+    }
+
     float freedv_rx_ss_impl::squelch_thresh() {
       return(d_squelch_thresh);
     }
--- a/gr-vocoder/lib/freedv_rx_ss_impl.h
+++ b/gr-vocoder/lib/freedv_rx_ss_impl.h
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2016 Free Software Foundation, Inc.
+ * Copyright 2016-2018 Free Software Foundation, Inc.
  *
  * This file is part of GNU Radio
  *
@@ -53,18 +53,24 @@
       int d_total_bit_errors;
       float d_snr_est;
       float d_squelch_thresh;
+      bool d_squelch_en;
       int d_speech_samples;
       int d_max_modem_samples;
       float d_clock_offset;
       int d_use_codecrx;
+      int d_interleave_frames;
+#ifdef FREEDV_MODE_700D
+      struct freedv_advanced d_adv;
+#endif
       struct CODEC2 *d_c2 = NULL;
 
     public:
-      freedv_rx_ss_impl(int mode, float squelch_thresh);
+      freedv_rx_ss_impl(int mode, float squelch_thresh, int interleave_frames);
       ~freedv_rx_ss_impl();
 
       void set_squelch_thresh(float squelch_thresh);
       float squelch_thresh();
+      void set_squelch_en(bool squelch_enabled);
 
       // Where all the action really happens
       void forecast(int noutput_items, gr_vector_int &ninput_items_required);
--- 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-2018 Free Software Foundation, Inc.
  *
  * This file is part of GNU Radio
  *
@@ -54,20 +54,31 @@
   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 @@
       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,
--- a/gr-vocoder/lib/freedv_tx_ss_impl.h
+++ b/gr-vocoder/lib/freedv_tx_ss_impl.h
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2016 Free Software Foundation, Inc.
+ * Copyright 2016-2018 Free Software Foundation, Inc.
  *
  * This file is part of GNU Radio
  *
@@ -48,18 +48,29 @@
       struct freedv_tx_callback_state d_cb_state;
       struct freedv *d_freedv;
       int d_mode;
+      std::string d_msg_text;
+      int d_interleave_frames;
       float d_squelch_thresh;
       int d_speech_samples;
       int d_nom_modem_samples;
       int d_use_codectx;
       int d_use_datatx;
-      std::string d_msg_text;
+      int d_clip;
+      int d_tx_bpf;
+#ifdef FREEDV_MODE_700D
+      struct freedv_advanced d_adv;
+#endif
       struct CODEC2 *d_c2;
 
     public:
-      freedv_tx_ss_impl(int mode, const std::string txt_msg);
+      freedv_tx_ss_impl(int mode, const std::string txt_msg, int interleave_frames);
       ~freedv_tx_ss_impl();
 
+      void set_clip(bool val);
+      void set_clip(int val);
+      void set_tx_bpf(bool val);
+      void set_tx_bpf(int val);
+
       // Where all the action really happens
       int work(int noutput_items,
                gr_vector_const_void_star &input_items,
--- a/gr-vocoder/swig/vocoder_swig.i
+++ b/gr-vocoder/swig/vocoder_swig.i
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2011,2013,2016 Free Software Foundation, Inc.
+ * Copyright 2011,2013,2016,2018 Free Software Foundation, Inc.
  *
  * This file is part of GNU Radio
  *
@@ -93,8 +93,12 @@
 #include "gnuradio/vocoder/freedv_tx_ss.h"
 %}
 
+#ifdef FREEDV_MODE_700D
+#else
 %ignore freedv_set_smooth_symbols;
 %ignore freedv_set_clip;
+#endif
+
 %include <codec2/freedv_api.h>
 %include "gnuradio/vocoder/freedv_api.h"
 %include "gnuradio/vocoder/freedv_rx_ss.h"
--- a/gr-vocoder/include/gnuradio/vocoder/codec2.h
+++ b/gr-vocoder/include/gnuradio/vocoder/codec2.h
@@ -48,6 +48,12 @@
 #ifdef CODEC2_MODE_700B
 	MODE_700B = CODEC2_MODE_700B,
 #endif
+#ifdef CODEC2_MODE_700C
+	MODE_700C = CODEC2_MODE_700C,
+#endif
+#ifdef CODEC2_MODE_WB
+	MODE_WB = CODEC2_MODE_WB,
+#endif
       };
 
     private: