From 3e7f3d33cfbd4f64a90aa43c8e8505213362faee Mon Sep 17 00:00:00 2001
From: trondeau <trondeau@221aa14e-8319-0410-a670-987f0aec2ac5>
Date: Fri, 9 Feb 2007 22:49:09 +0000
Subject: merging r4318:4437 to fix ticket:131 from branche trondeau/udp udp
source/sink pairs working
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@4438 221aa14e-8319-0410-a670-987f0aec2ac5
---
.../python/hier/networking/audio_sink.py | 68 ++++++++++++++++++++++
.../python/hier/networking/audio_source.py | 68 ++++++++++++++++++++++
.../python/hier/networking/dial_tone_sink.py | 22 ++++---
.../python/hier/networking/dial_tone_source.py | 32 +++++-----
.../python/hier/networking/vector_sink.py | 19 +++---
.../python/hier/networking/vector_source.py | 29 +++++----
6 files changed, 184 insertions(+), 54 deletions(-)
create mode 100755 gnuradio-examples/python/hier/networking/audio_sink.py
create mode 100755 gnuradio-examples/python/hier/networking/audio_source.py
(limited to 'gnuradio-examples/python/hier')
diff --git a/gnuradio-examples/python/hier/networking/audio_sink.py b/gnuradio-examples/python/hier/networking/audio_sink.py
new file mode 100755
index 0000000000..1b182e97eb
--- /dev/null
+++ b/gnuradio-examples/python/hier/networking/audio_sink.py
@@ -0,0 +1,68 @@
+#!/usr/bin/env python
+#
+# 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.
+#
+
+from gnuradio import gr, audio
+from gnuradio.eng_option import eng_option
+from optparse import OptionParser
+
+class audio_sink(gr.hier_block2):
+ def __init__(self, src, port, pkt_size, sample_rate):
+ gr.hier_block2.__init__(self,
+ "audio_sink", # Block type
+ gr.io_signature(0,0,0), # Input signature
+ gr.io_signature(0,0,0)) # Output signature
+
+
+ self.define_component("src", gr.udp_source(gr.sizeof_float, src, port, pkt_size))
+ self.define_component("dst", audio.sink(sample_rate))
+
+ self.connect("src", 0, "dst", 0)
+
+if __name__ == '__main__':
+ parser = OptionParser(option_class=eng_option)
+ parser.add_option("", "--src-name", type="string", default="localhost",
+ help="local host name (domain name or IP address)")
+ parser.add_option("", "--src-port", type="int", default=65500,
+ help="port value to listen to for connection")
+ parser.add_option("", "--packet-size", type="int", default=1472,
+ help="packet size.")
+ parser.add_option("-r", "--sample-rate", type="int", default=32000,
+ help="audio signal sample rate [default=%default]")
+ (options, args) = parser.parse_args()
+ if len(args) != 0:
+ parser.print_help()
+ raise SystemExit, 1
+
+ # Create an instance of a hierarchical block
+ top_block = audio_sink(options.src_name, options.src_port,
+ options.packet_size, options.sample_rate)
+
+ # Create an instance of a runtime, passing it the top block
+ runtime = gr.runtime(top_block)
+
+ try:
+ # Run forever
+ runtime.run()
+ except KeyboardInterrupt:
+ # Ctrl-C exits
+ pass
+
diff --git a/gnuradio-examples/python/hier/networking/audio_source.py b/gnuradio-examples/python/hier/networking/audio_source.py
new file mode 100755
index 0000000000..24186895a3
--- /dev/null
+++ b/gnuradio-examples/python/hier/networking/audio_source.py
@@ -0,0 +1,68 @@
+#!/usr/bin/env python
+#
+# 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.
+#
+
+from gnuradio import gr, audio
+from gnuradio.eng_option import eng_option
+from optparse import OptionParser
+
+class audio_source(gr.hier_block2):
+ def __init__(self, src, dst, port, pkt_size, sample_rate):
+ gr.hier_block2.__init__(self,
+ "audio_source", # Block type
+ gr.io_signature(0,0,0), # Input signature
+ gr.io_signature(0,0,0)) # Output signature
+
+ self.define_component("src", audio.source(sample_rate))
+ self.define_component("dst", gr.udp_sink(gr.sizeof_float, src, 0, dst, port, pkt_size))
+ self.connect("src", 0, "dst", 0)
+
+if __name__ == '__main__':
+ parser = OptionParser(option_class=eng_option)
+ parser.add_option("", "--src-name", type="string", default="localhost",
+ help="local host name (domain name or IP address)")
+ parser.add_option("", "--dst-name", type="string", default="localhost",
+ help="Remote host name (domain name or IP address")
+ parser.add_option("", "--dst-port", type="int", default=65500,
+ help="port value to connect to")
+ parser.add_option("", "--packet-size", type="int", default=1472,
+ help="packet size.")
+ parser.add_option("-r", "--sample-rate", type="int", default=32000 ,
+ help="audio signal sample rate [default=%default]")
+ (options, args) = parser.parse_args()
+ if len(args) != 0:
+ parser.print_help()
+ raise SystemExit, 1
+
+ # Create an instance of a hierarchical block
+ top_block = audio_source(options.src_name, options.dst_name, options.dst_port,
+ options.packet_size, options.sample_rate)
+
+ # Create an instance of a runtime, passing it the top block
+ runtime = gr.runtime(top_block)
+
+ try:
+ # Run forever
+ runtime.run()
+ except KeyboardInterrupt:
+ # Ctrl-C exits
+ pass
+
diff --git a/gnuradio-examples/python/hier/networking/dial_tone_sink.py b/gnuradio-examples/python/hier/networking/dial_tone_sink.py
index e75235f789..95419fbc94 100755
--- a/gnuradio-examples/python/hier/networking/dial_tone_sink.py
+++ b/gnuradio-examples/python/hier/networking/dial_tone_sink.py
@@ -25,28 +25,26 @@ from gnuradio.eng_option import eng_option
from optparse import OptionParser
class dial_tone_sink(gr.hier_block2):
- def __init__(self, local_ipaddress, port, mtu, sample_rate):
+ def __init__(self, src, port, pkt_size, sample_rate):
gr.hier_block2.__init__(self,
"dial_tone_sink", # Block type
gr.io_signature(0,0,0), # Input signature
gr.io_signature(0,0,0)) # Output signature
- self.define_component("src", gr.udp_source(gr.sizeof_float,
- local_ipaddress, port,
- mtu))
+ self.define_component("src", gr.udp_source(gr.sizeof_float, src, port, pkt_size))
self.define_component("dst", audio.sink(sample_rate))
- self.connect("src", 0, "dst", 0)
+ self.connect("src", 0, "dst", 0)
if __name__ == '__main__':
parser = OptionParser(option_class=eng_option)
- parser.add_option("", "--local-ipaddr", type="string", default="127.0.0.1",
- help="local IP address")
- parser.add_option("", "--local-port", type="int", default=65500,
+ parser.add_option("", "--src-name", type="string", default="localhost",
+ help="local host name (domain name or IP address)")
+ parser.add_option("", "--src-port", type="int", default=65500,
help="port value to listen to for connection")
- parser.add_option("", "--mtu", type="int", default=540,
- help="packet size.")
+ parser.add_option("", "--packet-size", type="int", default=1472,
+ help="packet size.")
parser.add_option("-r", "--sample-rate", type="int", default=8000,
help="audio signal sample rate [default=%default]")
(options, args) = parser.parse_args()
@@ -55,8 +53,8 @@ if __name__ == '__main__':
raise SystemExit, 1
# Create an instance of a hierarchical block
- top_block = dial_tone_sink(options.local_ipaddr, options.local_port,
- options.mtu, options.sample_rate)
+ top_block = dial_tone_sink(options.src_name, options.src_port,
+ options.packet_size, options.sample_rate)
# Create an instance of a runtime, passing it the top block
runtime = gr.runtime(top_block)
diff --git a/gnuradio-examples/python/hier/networking/dial_tone_source.py b/gnuradio-examples/python/hier/networking/dial_tone_source.py
index 4f973ebca4..40cb935536 100755
--- a/gnuradio-examples/python/hier/networking/dial_tone_source.py
+++ b/gnuradio-examples/python/hier/networking/dial_tone_source.py
@@ -25,7 +25,7 @@ from gnuradio.eng_option import eng_option
from optparse import OptionParser
class dial_tone_source(gr.hier_block2):
- def __init__(self, local_ipaddress, remote_ipaddress, port, mtu, sample_rate):
+ def __init__(self, src, dst, port, pkt_size, sample_rate):
gr.hier_block2.__init__(self,
"dial_tone_source", # Block type
gr.io_signature(0,0,0), # Input signature
@@ -38,37 +38,37 @@ class dial_tone_source(gr.hier_block2):
440, amplitude))
self.define_component("add", gr.add_ff())
+ # Throttle needed here to account for the other side's audio card sampling rate
self.define_component("thr", gr.throttle(gr.sizeof_float, sample_rate))
- self.define_component("dst", gr.udp_sink(gr.sizeof_float,
- local_ipaddress, 0,
- remote_ipaddress, port,
- mtu))
-
+ self.define_component("dst", gr.udp_sink(gr.sizeof_float, src, 0, dst, port, pkt_size))
+
self.connect("src0", 0, "add", 0)
self.connect("src1", 0, "add", 1)
self.connect("add", 0, "thr", 0)
self.connect("thr", 0, "dst", 0)
+
+
if __name__ == '__main__':
parser = OptionParser(option_class=eng_option)
- parser.add_option("", "--local-ipaddr", type="string", default="127.0.0.1",
- help="local IP address")
- parser.add_option("", "--remote-ipaddr", type="string", default="127.0.0.1",
- help="Remote IP address")
- parser.add_option("", "--remote-port", type="int", default=65500,
+ parser.add_option("", "--src-name", type="string", default="localhost",
+ help="local host name (domain name or IP address)")
+ parser.add_option("", "--dst-name", type="string", default="localhost",
+ help="Remote host name (domain name or IP address")
+ parser.add_option("", "--dst-port", type="int", default=65500,
help="port value to connect to")
- parser.add_option("", "--mtu", type="int", default=540,
- help="packet size.")
+ parser.add_option("", "--packet-size", type="int", default=1472,
+ help="packet size.")
parser.add_option("-r", "--sample-rate", type="int", default=8000,
- help="audio signal sample rate [default=%default]")
+ help="audio signal sample rate [default=%default]")
(options, args) = parser.parse_args()
if len(args) != 0:
parser.print_help()
raise SystemExit, 1
# Create an instance of a hierarchical block
- top_block = dial_tone_source(options.local_ipaddr, options.remote_ipaddr,
- options.remote_port, options.mtu, options.sample_rate)
+ top_block = dial_tone_source(options.src_name, options.dst_name, options.dst_port,
+ options.packet_size, options.sample_rate)
# Create an instance of a runtime, passing it the top block
runtime = gr.runtime(top_block)
diff --git a/gnuradio-examples/python/hier/networking/vector_sink.py b/gnuradio-examples/python/hier/networking/vector_sink.py
index d1aa9def3c..54578078fd 100755
--- a/gnuradio-examples/python/hier/networking/vector_sink.py
+++ b/gnuradio-examples/python/hier/networking/vector_sink.py
@@ -25,35 +25,34 @@ from gnuradio.eng_option import eng_option
from optparse import OptionParser
class vector_sink(gr.hier_block2):
- def __init__(self, local_ipaddress, port, mtu):
+ def __init__(self, src, port, pkt_size):
gr.hier_block2.__init__(self,
"vector_sink", # Block type
gr.io_signature(0,0,0), # Input signature
gr.io_signature(0,0,0)) # Output signature
- udp = gr.udp_source(gr.sizeof_char, local_ipaddress, port, mtu)
+ udp = gr.udp_source(gr.sizeof_float, src, port, pkt_size)
self.define_component("src", udp)
- self.define_component("dst", gr.file_sink(gr.sizeof_char, "received.dat"))
+ self.define_component("dst", gr.file_sink(gr.sizeof_float, "received.dat"))
self.connect("src", 0, "dst", 0)
if __name__ == "__main__":
parser = OptionParser(option_class=eng_option)
- parser.add_option("", "--local-ipaddr", type="string", default="127.0.0.1",
- help="local IP address")
- parser.add_option("", "--local-port", type="int", default=65500,
+ parser.add_option("", "--src-name", type="string", default="localhost",
+ help="local host name (domain name or IP address)")
+ parser.add_option("", "--src-port", type="int", default=65500,
help="port value to listen to for connection")
- parser.add_option("", "--mtu", type="int", default=540,
- help="packet size.")
+ parser.add_option("", "--packet-size", type="int", default=1471,
+ help="packet size.")
(options, args) = parser.parse_args()
if len(args) != 0:
parser.print_help()
raise SystemExit, 1
# Create an instance of a hierarchical block
- top_block = vector_sink(options.local_ipaddr, options.local_port,
- options.mtu)
+ top_block = vector_sink(options.src_name, options.src_port, options.packet_size)
# Create an instance of a runtime, passing it the top block
runtime = gr.runtime(top_block)
diff --git a/gnuradio-examples/python/hier/networking/vector_source.py b/gnuradio-examples/python/hier/networking/vector_source.py
index 3491ad94be..d31a0baa24 100755
--- a/gnuradio-examples/python/hier/networking/vector_source.py
+++ b/gnuradio-examples/python/hier/networking/vector_source.py
@@ -25,41 +25,38 @@ from gnuradio.eng_option import eng_option
from optparse import OptionParser
class vector_source(gr.hier_block2):
- def __init__(self, local_ipaddress, remote_ipaddress, port, mtu):
+ def __init__(self, src, dst, port, pkt_size):
gr.hier_block2.__init__(self,
"vector_source", # Block type
gr.io_signature(0,0,0), # Input signature
gr.io_signature(0,0,0)) # Output signature
- data = [i*0.1 for i in range(1000)]
+ data = [i*0.01 for i in range(1000)]
self.define_component("data", gr.vector_source_f(data, True))
- self.define_component("thr", gr.throttle(gr.sizeof_float, 8000))
- udp = gr.udp_sink(gr.sizeof_float, local_ipaddress, 0,
- remote_ipaddress, port, mtu)
+ udp = gr.udp_sink(gr.sizeof_float, src, 0, dst, port, pkt_size)
self.define_component("dst", udp)
- self.connect("data", 0, "thr", 0)
- self.connect("thr", 0, "dst", 0)
+ self.connect("data", 0, "dst", 0)
if __name__ == '__main__':
parser = OptionParser(option_class=eng_option)
- parser.add_option("", "--local-ipaddr", type="string", default="127.0.0.1",
- help="local IP address")
- parser.add_option("", "--remote-ipaddr", type="string", default="127.0.0.1",
- help="Remote IP address")
- parser.add_option("", "--remote-port", type="int", default=65500,
+ parser.add_option("", "--src-name", type="string", default="localhost",
+ help="local host name (domain name or IP address)")
+ parser.add_option("", "--dst-name", type="string", default="localhost",
+ help="Remote host name (domain name or IP address")
+ parser.add_option("", "--dst-port", type="int", default=65500,
help="port value to connect to")
- parser.add_option("", "--mtu", type="int", default=540,
- help="packet size.")
+ parser.add_option("", "--packet-size", type="int", default=1471,
+ help="packet size.")
(options, args) = parser.parse_args()
if len(args) != 0:
parser.print_help()
raise SystemExit, 1
# Create an instance of a hierarchical block
- top_block = vector_source(options.local_ipaddr, options.remote_ipaddr,
- options.remote_port, options.mtu)
+ top_block = vector_source(options.src_name, options.dst_name,
+ options.dst_port, options.packet_size)
# Create an instance of a runtime, passing it the top block
runtime = gr.runtime(top_block)
--
cgit v1.2.3