diff options
Diffstat (limited to 'gr-fec/python/fec/extended_encoder.py')
| -rw-r--r-- | gr-fec/python/fec/extended_encoder.py | 33 |
1 files changed, 11 insertions, 22 deletions
diff --git a/gr-fec/python/fec/extended_encoder.py b/gr-fec/python/fec/extended_encoder.py index f511b53a2b..50a8891ea5 100644 --- a/gr-fec/python/fec/extended_encoder.py +++ b/gr-fec/python/fec/extended_encoder.py @@ -28,8 +28,7 @@ from capillary_threaded_encoder import capillary_threaded_encoder from bitflip import read_bitlist class extended_encoder(gr.hier_block2): - def __init__(self, encoder_obj_list, threading, puncpat=None, - lentagname=None): + def __init__(self, encoder_obj_list, threading, puncpat=None): gr.hier_block2.__init__(self, "extended_encoder", gr.io_signature(1, 1, gr.sizeof_char), gr.io_signature(1, 1, gr.sizeof_char)) @@ -37,17 +36,13 @@ class extended_encoder(gr.hier_block2): self.blocks=[] self.puncpat=puncpat - if(type(encoder_obj_list[0]) == list): - gr.log.info("fec.extended_encoder: Parallelism must be 1.") - raise AttributeError - - if type(lentagname) == str: - if(lentagname.lower() == 'none'): - lentagname = None - - if lentagname and threading: - gr.log.info("fec.extended_decoder: Cannot use threading with tagged_stream mode.") - raise AttributeError + if(type(encoder_obj_list) == list): + if(type(encoder_obj_list[0]) == list): + gr.log.info("fec.extended_encoder: Parallelism must be 1.") + raise AttributeError + else: + # If it has parallelism of 0, force it into a list of 1 + encoder_obj_list = [encoder_obj_list,] if fec.get_encoder_input_conversion(encoder_obj_list[0]) == "pack": self.blocks.append(blocks.pack_k_bits_bb(8)) @@ -61,15 +56,9 @@ class extended_encoder(gr.hier_block2): gr.sizeof_char, gr.sizeof_char)) else: - if(not lentagname): - self.blocks.append(fec.encoder(encoder_obj_list[0], - gr.sizeof_char, - gr.sizeof_char)) - else: - self.blocks.append(fec.tagged_encoder(encoder_obj_list[0], - gr.sizeof_char, - gr.sizeof_char, - lentagname)) + self.blocks.append(fec.encoder(encoder_obj_list[0], + gr.sizeof_char, + gr.sizeof_char)) if self.puncpat != '11': self.blocks.append(fec.puncture_bb(len(puncpat), read_bitlist(puncpat), 0)) |