[Commit-gnuradio] r3916 - gnuradio/trunk/gr-atsc/src/lib

[cswiger]

Author: cswiger
Date: 2006-11-01 12:05:49 -0700 (Wed, 01 Nov 2006)
New Revision: 3916

Added:
   gnuradio/trunk/gr-atsc/src/lib/atsc_pad.cc
   gnuradio/trunk/gr-atsc/src/lib/atsc_pad.h
Modified:
   gnuradio/trunk/gr-atsc/src/lib/Makefile.am
   gnuradio/trunk/gr-atsc/src/lib/atsc.i
Log:
atsc.pad() - Pads a 188 byte mpeg transport stream packet out to 256
bytes for atsc transmitter randomizer. Opposite of depad.


Modified: gnuradio/trunk/gr-atsc/src/lib/Makefile.am
===================================================================
--- gnuradio/trunk/gr-atsc/src/lib/Makefile.am  2006-11-01 06:42:27 UTC (rev 
3915)
+++ gnuradio/trunk/gr-atsc/src/lib/Makefile.am  2006-11-01 19:05:49 UTC (rev 
3916)
@@ -77,6 +77,7 @@
        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 @@
        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                \

Modified: gnuradio/trunk/gr-atsc/src/lib/atsc.i
===================================================================
--- gnuradio/trunk/gr-atsc/src/lib/atsc.i       2006-11-01 06:42:27 UTC (rev 
3915)
+++ gnuradio/trunk/gr-atsc/src/lib/atsc.i       2006-11-01 19:05:49 UTC (rev 
3916)
@@ -24,6 +24,7 @@
 #include <atsc_bit_timing_loop.h>
 #include <atsc_fpll.h>
 #include <atsc_depad.h>
+#include <atsc_pad.h>
 %}
 
 %include "atsc_consts.h"
@@ -267,3 +268,19 @@
 };
 
 // ----------------------------------------------------------------
+
+GR_SWIG_BLOCK_MAGIC(atsc,pad);
+
+atsc_pad_sptr atsc_make_pad();
+
+class atsc_pad : public gr_sync_decimator
+{
+  atsc_pad();
+
+public:
+  void reset();
+
+};
+
+// ----------------------------------------------------------------
+

Added: gnuradio/trunk/gr-atsc/src/lib/atsc_pad.cc
===================================================================
--- gnuradio/trunk/gr-atsc/src/lib/atsc_pad.cc                          (rev 0)
+++ gnuradio/trunk/gr-atsc/src/lib/atsc_pad.cc  2006-11-01 19:05:49 UTC (rev 
3916)
@@ -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 <config.h>
+#endif
+
+#include <atsc_pad.h>
+#include <gr_io_signature.h>
+#include <atsc_types.h>
+
+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;
+}
+
+
+
+

Added: gnuradio/trunk/gr-atsc/src/lib/atsc_pad.h
===================================================================
--- gnuradio/trunk/gr-atsc/src/lib/atsc_pad.h                           (rev 0)
+++ gnuradio/trunk/gr-atsc/src/lib/atsc_pad.h   2006-11-01 19:05:49 UTC (rev 
3916)
@@ -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 <gr_sync_decimator.h>
+
+class atsc_pad;
+typedef boost::shared_ptr<atsc_pad> 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 */