summaryrefslogtreecommitdiff
path: root/gr-atsc
diff options
context:
space:
mode:
authorJohnathan Corgan <jcorgan@corganenterprises.com>2012-08-28 12:52:09 -0700
committerJohnathan Corgan <jcorgan@corganenterprises.com>2012-08-28 12:52:09 -0700
commit5892c29ee0509ff8aa226f14da524f7ec30f9654 (patch)
tree759624a4c9f9b5d6c2e2da13906be99aebf25152 /gr-atsc
parent7adff515181de5cfbd7392d934cac9083a8a6a58 (diff)
parentfc4d37062c46886d3bc1fb0b6c3626d779be4ecd (diff)
Merge remote branch 'reynwar/comments_next' into next
Conflicts: gr-digital/include/digital_constellation.h gr-digital/python/bpsk.py gr-digital/python/qpsk.py
Diffstat (limited to 'gr-atsc')
-rw-r--r--gr-atsc/src/python/atsc_utils.py3
-rwxr-xr-xgr-atsc/src/python/qa_atsc.py4
2 files changed, 4 insertions, 3 deletions
diff --git a/gr-atsc/src/python/atsc_utils.py b/gr-atsc/src/python/atsc_utils.py
index fced6d1902..fc2465bed2 100644
--- a/gr-atsc/src/python/atsc_utils.py
+++ b/gr-atsc/src/python/atsc_utils.py
@@ -28,7 +28,8 @@ def make_fake_transport_stream_packet(npkts):
"""
Return a sequence of 8-bit ints that represents an MPEG Transport Stream packet.
- @param npkts: how many 188-byte packets to return
+ Args:
+ npkts: how many 188-byte packets to return
FYI, each ATSC Data Frame contains two Data Fields, each of which contains
312 data segments. Each transport stream packet maps to a data segment.
diff --git a/gr-atsc/src/python/qa_atsc.py b/gr-atsc/src/python/qa_atsc.py
index c6b8d2e957..ab3eb96d40 100755
--- a/gr-atsc/src/python/qa_atsc.py
+++ b/gr-atsc/src/python/qa_atsc.py
@@ -76,8 +76,8 @@ class vector_source_ts(gr.hier_block2):
"""
Pad tranport stream packets to 256 bytes and reformat appropriately.
- @param ts: MPEG transport stream.
- @type ts: sequence of ints in [0,255]; len(ts) % 188 == 0
+ Args:
+ ts: MPEG transport stream. (sequence of ints in [0,255]; len(ts) % 188 == 0)
"""
src = gr.vector_source_b(pad_transport_stream(ts))