diff options
| author | Ben Reynwar <ben@reynwar.net> | 2013-06-04 09:03:42 -0700 |
|---|---|---|
| committer | Ben Reynwar <ben@reynwar.net> | 2013-06-04 09:03:42 -0700 |
| commit | ba0a9afedcd5451f2032004e9d583ed78d74ece2 (patch) | |
| tree | d35476960d3c35e5693e961cd2381c38980e1dfb /gr-atsc | |
| parent | ec2d40b8db3f078a8f8f7ab06dd1fcf07e907548 (diff) | |
atsc: Fix QA to work with uninstalled imports.
Diffstat (limited to 'gr-atsc')
| -rw-r--r-- | gr-atsc/python/atsc/CMakeLists.txt | 1 | ||||
| -rwxr-xr-x | gr-atsc/python/atsc/qa_atsc.py | 14 |
2 files changed, 8 insertions, 7 deletions
diff --git a/gr-atsc/python/atsc/CMakeLists.txt b/gr-atsc/python/atsc/CMakeLists.txt index 061f105572..d530a98c21 100644 --- a/gr-atsc/python/atsc/CMakeLists.txt +++ b/gr-atsc/python/atsc/CMakeLists.txt @@ -25,6 +25,7 @@ include(GrPython) GR_PYTHON_INSTALL( FILES __init__.py + atsc_utils.py DESTINATION ${GR_PYTHON_DIR}/gnuradio/atsc COMPONENT "atsc_python" ) diff --git a/gr-atsc/python/atsc/qa_atsc.py b/gr-atsc/python/atsc/qa_atsc.py index dc54051b77..e6ea81a50e 100755 --- a/gr-atsc/python/atsc/qa_atsc.py +++ b/gr-atsc/python/atsc/qa_atsc.py @@ -20,11 +20,11 @@ # Boston, MA 02110-1301, USA. # -from gnuradio import gr, gr_unittest -import atsc_swig as atsc -from atsc_utils import * import sys -import blocks_swig as blocks + +from gnuradio import gr, gr_unittest, atsc, blocks +from gnuradio.atsc import atsc_utils + class memoize(object): def __init__(self, thunk): @@ -46,7 +46,7 @@ We generate 8 full fields. This is relatively expensive. It takes about 2 seconds to execute. """ make_transport_stream = \ - memoize(lambda : tuple(make_fake_transport_stream_packet(8 * atsc.ATSC_DSEGS_PER_FIELD))) + memoize(lambda : tuple(atsc_utils.make_fake_transport_stream_packet(8 * atsc.ATSC_DSEGS_PER_FIELD))) def pad_transport_stream(src): @@ -55,7 +55,7 @@ def pad_transport_stream(src): that is 256 bytes long to help with buffer alignment. This function adds the appropriate trailing padding to convert each packet from 188 to 256 bytes. """ - return pad_stream(src, atsc.sizeof_atsc_mpeg_packet, atsc.sizeof_atsc_mpeg_packet_pad) + return atsc_utils.pad_stream(src, atsc.sizeof_atsc_mpeg_packet, atsc.sizeof_atsc_mpeg_packet_pad) def depad_transport_stream(src): @@ -64,7 +64,7 @@ def depad_transport_stream(src): that is 256 bytes long to help with buffer alignment. This function removes the trailing padding to convert each packet from 256 back to 188 bytes. """ - return depad_stream(src, atsc.sizeof_atsc_mpeg_packet, atsc.sizeof_atsc_mpeg_packet_pad) + return atsc_utils.depad_stream(src, atsc.sizeof_atsc_mpeg_packet, atsc.sizeof_atsc_mpeg_packet_pad) class vector_source_ts(gr.hier_block2): |