From: cswiger Date: Wed, 1 Nov 2006 19:05:49 +0000 (+0000) Subject: atsc.pad() - Pads a 188 byte mpeg transport stream packet out to 256 X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=206d6c926832940452d3c9ce45c9d38637a2950f;p=debian%2Fgnuradio atsc.pad() - Pads a 188 byte mpeg transport stream packet out to 256 bytes for atsc transmitter randomizer. Opposite of depad. git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@3916 221aa14e-8319-0410-a670-987f0aec2ac5 --- diff --git a/gr-atsc/src/lib/Makefile.am b/gr-atsc/src/lib/Makefile.am index 03391339..fe21d5ef 100644 --- a/gr-atsc/src/lib/Makefile.am +++ b/gr-atsc/src/lib/Makefile.am @@ -77,6 +77,7 @@ libatsc_la_SOURCES = \ atsc_bit_timing_loop.cc \ atsc_fpll.cc \ atsc_depad.cc \ + atsc_pad.cc \ atsci_basic_trellis_encoder.cc \ atsci_data_interleaver.cc \ atsci_equalizer.cc \ @@ -137,6 +138,7 @@ grinclude_HEADERS = \ atsc_bit_timing_loop.h \ atsc_fpll.h \ atsc_depad.h \ + atsc_pad.h \ atsc_types.h \ atsci_basic_trellis_encoder.h \ atsci_data_interleaver.h \ diff --git a/gr-atsc/src/lib/atsc.i b/gr-atsc/src/lib/atsc.i index 026332b2..9c2fdecb 100644 --- a/gr-atsc/src/lib/atsc.i +++ b/gr-atsc/src/lib/atsc.i @@ -24,6 +24,7 @@ #include #include #include +#include %} %include "atsc_consts.h" @@ -267,3 +268,19 @@ public: }; // ---------------------------------------------------------------- + +GR_SWIG_BLOCK_MAGIC(atsc,pad); + +atsc_pad_sptr atsc_make_pad(); + +class atsc_pad : public gr_sync_decimator +{ + atsc_pad(); + +public: + void reset(); + +}; + +// ---------------------------------------------------------------- + diff --git a/gr-atsc/src/lib/atsc_pad.cc b/gr-atsc/src/lib/atsc_pad.cc new file mode 100644 index 00000000..5c041d00 --- /dev/null +++ b/gr-atsc/src/lib/atsc_pad.cc @@ -0,0 +1,80 @@ +/* -*- c++ -*- */ +/* + * Copyright 2006 Free Software Foundation, Inc. + * + * This file is part of GNU Radio + * + * GNU Radio is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2, or (at your option) + * any later version. + * + * GNU Radio is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with GNU Radio; see the file COPYING. If not, write to + * the Free Software Foundation, Inc., 51 Franklin Street, + * Boston, MA 02110-1301, USA. + */ + +#ifdef HAVE_CONFIG_H +#include +#endif + +#include +#include +#include + +static const int INTR = ATSC_MPEG_PKT_LENGTH; + +atsc_pad_sptr +atsc_make_pad() +{ + return atsc_pad_sptr(new atsc_pad()); +} + +atsc_pad::atsc_pad() + : gr_sync_decimator("atsc_pad", + gr_make_io_signature(1, 1, sizeof(unsigned char)), + gr_make_io_signature(1, 1, sizeof(atsc_mpeg_packet)), + INTR) +{ + reset(); +} + +void +atsc_pad::forecast (int noutput_items, gr_vector_int &ninput_items_required) +{ + unsigned ninputs = ninput_items_required.size(); + for (unsigned i = 0; i < ninputs; i++) + ninput_items_required[i] = noutput_items * ATSC_MPEG_PKT_LENGTH; +} + + +int +atsc_pad::work (int noutput_items, + gr_vector_const_void_star &input_items, + gr_vector_void_star &output_items) +{ + const unsigned char *in = (const unsigned char *) input_items[0]; + atsc_mpeg_packet *out = (atsc_mpeg_packet *) output_items[0]; + + // size with padding (256) + unsigned int ATSC_MPEG_PKT = sizeof(atsc_mpeg_packet); + unsigned int i; + + for (i = 0; i < noutput_items; i++){ + for (int j = 0; j < ATSC_MPEG_PKT_LENGTH; j++) + out[i].data[j] = in[i * ATSC_MPEG_PKT_LENGTH + j]; + + } + + return noutput_items; +} + + + + diff --git a/gr-atsc/src/lib/atsc_pad.h b/gr-atsc/src/lib/atsc_pad.h new file mode 100644 index 00000000..dc06d8f3 --- /dev/null +++ b/gr-atsc/src/lib/atsc_pad.h @@ -0,0 +1,55 @@ +/* -*- c++ -*- */ +/* + * Copyright 2006 Free Software Foundation, Inc. + * + * This file is part of GNU Radio + * + * GNU Radio is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2, or (at your option) + * any later version. + * + * GNU Radio is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with GNU Radio; see the file COPYING. If not, write to + * the Free Software Foundation, Inc., 51 Franklin Street, + * Boston, MA 02110-1301, USA. + */ +#ifndef INCLUDED_ATSC_PAD_H +#define INCLUDED_ATSC_PAD_H + +#include + +class atsc_pad; +typedef boost::shared_ptr atsc_pad_sptr; + +atsc_pad_sptr atsc_make_pad(); + +/*! + * \brief pad mpeg ts packets from 188 byte char to + * to 256 byte atsc_mpeg_packet + * \ingroup atsc + * + * input: unsigned char; output: atsc_mpeg_packet + */ +class atsc_pad : public gr_sync_decimator +{ + friend atsc_pad_sptr atsc_make_pad(); + + atsc_pad(); + +public: + void forecast (int noutput_items, gr_vector_int &ninput_items_required); + int work (int noutput_items, + gr_vector_const_void_star &input_items, + gr_vector_void_star &output_items); + + void reset() { /* nop */ } +}; + + +#endif /* INCLUDED_ATSC_PAD_H */