From 0d79a03fb90068200fe99d19198fc1ebac41ee61 Mon Sep 17 00:00:00 2001 From: Andras Varga Date: Wed, 13 Sep 2023 23:10:17 +0200 Subject: [PATCH] examples: Remove voipstream/osudp It was in the way (as described below), and it was already redundant as it had already been written up as a showcase: "Using Simulated Applications in a Real Network" https://inet.omnetpp.org/docs/showcases/emulation/voip/doc/index.html When INET was installed in opp_env, ExtLowerUdp references in this simulation showed up as NED errors, because INET turns on the VoIPStream feature by default but not Emulation. (Worse, the Emulation feature was not listed as dependency for this simulation in oppfeatures.) --- .../osudp/VoipStreamApplications.ned | 34 ------------ examples/voipstream/osudp/receiver.ini | 8 --- examples/voipstream/osudp/sender.ini | 54 ------------------- 3 files changed, 96 deletions(-) delete mode 100644 examples/voipstream/osudp/VoipStreamApplications.ned delete mode 100644 examples/voipstream/osudp/receiver.ini delete mode 100644 examples/voipstream/osudp/sender.ini diff --git a/examples/voipstream/osudp/VoipStreamApplications.ned b/examples/voipstream/osudp/VoipStreamApplications.ned deleted file mode 100644 index 007e4cddeb7..00000000000 --- a/examples/voipstream/osudp/VoipStreamApplications.ned +++ /dev/null @@ -1,34 +0,0 @@ -// -// SPDX-License-Identifier: LGPL-3.0-or-later -// - - -package inet.examples.voipstream.osudp; - -import inet.applications.voipstream.VoipStreamReceiver; -import inet.applications.voipstream.VoipStreamSender; -import inet.emulation.transportlayer.udp.ExtLowerUdp; - -network VoipStreamSenderApplication -{ - parameters: - @networkNode; - submodules: - app: VoipStreamSender; - udp: ExtLowerUdp; - connections: - app.socketOut --> udp.appIn; - app.socketIn <-- udp.appOut; -} - -network VoipStreamReceiverApplication -{ - parameters: - @networkNode; - submodules: - app: VoipStreamReceiver; - udp: ExtLowerUdp; - connections: - app.socketOut --> udp.appIn; - app.socketIn <-- udp.appOut; -} diff --git a/examples/voipstream/osudp/receiver.ini b/examples/voipstream/osudp/receiver.ini deleted file mode 100644 index f37d669cdc7..00000000000 --- a/examples/voipstream/osudp/receiver.ini +++ /dev/null @@ -1,8 +0,0 @@ -[General] -network = VoipStreamReceiverApplication -#emulation = true -scheduler-class = "inet::RealTimeScheduler" -sim-time-limit = 1h - -*.app.localPort = 1000 -*.app.resultFile = "results/sound.wav" diff --git a/examples/voipstream/osudp/sender.ini b/examples/voipstream/osudp/sender.ini deleted file mode 100644 index 58923ac7520..00000000000 --- a/examples/voipstream/osudp/sender.ini +++ /dev/null @@ -1,54 +0,0 @@ -[General] -network = VoipStreamSenderApplication -scheduler-class = "inet::RealTimeScheduler" -#abstract-config = true (requires omnet 7) - -*.app.packetTimeLength = 20ms -*.app.voipHeaderSize = 28B -*.app.traceFileName = "results/${configname}_" + ${sound} + "_sent.wav" - -*.app.voipSilenceThreshold = 100 -*.app.repeatCount = 1 - -*.app.soundFile = "../soundFiles/" + \ - ${sound = "Beatify_Dabei_cut.mp3", \ - "Beatify_Ria_cut.mp3", \ - "husten.mp3", \ - "husten.wav", \ - "langes blabla.wav", \ - "ria_44100_stereo.mp3", \ - "ria_8000_mono.mp3", \ - "ria_8000_stereo.mp3", \ - "steuern.wav", \ - "test.wav"} - -*.app.localPort = -1 -*.app.destPort = 1000 -*.app.srcAddress = "" -*.app.destAddress = "127.0.0.1" - -[Config g726] -sim-time-limit = 1ps # TODO -*.app.codec = "g726" -*.app.sampleRate = 8000Hz -*.app.compressedBitRate = 40000bps -#*.app.compressedBitRate = 32000bps -#*.app.compressedBitRate = 24000bps - -[Config g711_aLaw] -sim-time-limit = 1ps # TODO -*.app.codec = "pcm_alaw" -*.app.sampleRate = 8000Hz -*.app.compressedBitRate = 64000bps - -[Config g711_muLaw] -sim-time-limit = 1ps # TODO -*.app.codec = "pcm_mulaw" -*.app.sampleRate = 8000Hz -*.app.compressedBitRate = 64000bps - -[Config pcm_s16le] -sim-time-limit = 1ps # TODO -*.app.codec = "pcm_s16le" -*.app.sampleRate = 8000Hz -*.app.compressedBitRate = 128000bps