Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

voiptool/voipstream: renames in files

Renamed feature to VoIPStream.
Renamed classes, modules, messages, files:
  - VoIPPacket to VoIPStreamPacket
  - VoIPSourceApp to VoIPStreamSender
  - VoIPSinkApp to VoIPStreamReceiver
  - example folders and modules
  • Loading branch information...
commit 7ccedc7c8fdf226ee6e1a4aec12fcd63f4e07018 1 parent 4381ab3
@ZoltanBojthe ZoltanBojthe authored rhornig committed
Showing with 177 additions and 168 deletions.
  1. +4 −4 .cproject
  2. +2 −2 .nedfolders
  3. +8 −8 .oppfeatures
  4. +21 −21 examples/voipstream/VoIPStreamLargeNet/VoIPStreamLargeNet.ned
  5. +32 −32 examples/voipstream/VoIPStreamLargeNet/omnetpp.ini
  6. +2 −2 examples/voipstream/VoIPStreamTest/VoIPStreamTest.ned
  7. +3 −3 examples/voipstream/VoIPStreamTest/omnetpp.ini
  8. +1 −1  examples/voipstream/VoIPStreamTest/package.ned
  9. +2 −2 examples/voipstream/VoIPStreamTrafficTest/VoIPStreamTrafficTest.ned
  10. +3 −3 examples/voipstream/VoIPStreamTrafficTest/omnetpp.ini
  11. +1 −1  examples/voipstream/VoIPStreamTrafficTest/package.ned
  12. +3 −3 src/applications/voipstream/AudioOutFile.h
  13. +9 −0 src/applications/voipstream/ChangeLog
  14. +4 −4 src/applications/voipstream/VoIPStreamPacket.msg
  15. +24 −24 src/applications/voipstream/VoIPStreamReceiver.cc
  16. +11 −11 src/applications/voipstream/VoIPStreamReceiver.h
  17. +4 −4 src/applications/voipstream/VoIPStreamReceiver.ned
  18. +18 −18 src/applications/voipstream/VoIPStreamSender.cc
  19. +8 −8 src/applications/voipstream/VoIPStreamSender.h
  20. +3 −3 src/applications/voipstream/VoIPStreamSender.ned
  21. +2 −2 src/makefrag
  22. +6 −6 tests/fingerprint/examples.csv
  23. +6 −6 tests/smoke/examples.csv
View
8 .cproject
@@ -22,7 +22,7 @@
<folderInfo id="org.omnetpp.cdt.gnu.config.debug.1590007136." name="/" resourcePath="">
<toolChain id="org.omnetpp.cdt.gnu.toolchain.debug.561565264" name="GCC for OMNeT++" superClass="org.omnetpp.cdt.gnu.toolchain.debug">
<targetPlatform binaryParser="org.eclipse.cdt.core.ELF;org.eclipse.cdt.core.MachO64;org.eclipse.cdt.core.PE" id="org.omnetpp.cdt.targetPlatform.442367031" isAbstract="false" name="Windows, Linux, Mac" osList="win32,linux,macosx" superClass="org.omnetpp.cdt.targetPlatform"/>
- <builder id="org.omnetpp.cdt.gnu.builder.debug.1373225503" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="OMNEST Make Builder (opp_makemake)" superClass="org.omnetpp.cdt.gnu.builder.debug">
+ <builder id="org.omnetpp.cdt.gnu.builder.debug.1373225503" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="OMNeT++ Make Builder (opp_makemake)" superClass="org.omnetpp.cdt.gnu.builder.debug">
<outputEntries>
<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="outputPath" name=""/>
<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="outputPath" name=""/>
@@ -141,7 +141,7 @@
</toolChain>
</folderInfo>
<sourceEntries>
- <entry excluding="applications/voiptool|transport/tcp_nsc|transport/tcp_lwip" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="src"/>
+ <entry excluding="applications/voipstream|transport/tcp_nsc|transport/tcp_lwip" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="src"/>
</sourceEntries>
</configuration>
</storageModule>
@@ -166,7 +166,7 @@
<folderInfo id="org.omnetpp.cdt.gnu.config.release.960890479." name="/" resourcePath="">
<toolChain id="org.omnetpp.cdt.gnu.toolchain.release.1853525977" name="GCC for OMNeT++" superClass="org.omnetpp.cdt.gnu.toolchain.release">
<targetPlatform binaryParser="org.eclipse.cdt.core.ELF;org.eclipse.cdt.core.MachO64;org.eclipse.cdt.core.PE" id="org.omnetpp.cdt.targetPlatform.8638873" isAbstract="false" name="Windows, Linux, Mac" osList="win32,linux,macosx" superClass="org.omnetpp.cdt.targetPlatform"/>
- <builder id="org.omnetpp.cdt.gnu.builder.release.2101319956" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="OMNEST Make Builder (opp_makemake)" superClass="org.omnetpp.cdt.gnu.builder.release"/>
+ <builder id="org.omnetpp.cdt.gnu.builder.release.2101319956" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="OMNeT++ Make Builder (opp_makemake)" superClass="org.omnetpp.cdt.gnu.builder.release"/>
<tool id="cdt.managedbuild.tool.gnu.archiver.base.879724210" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.base"/>
<tool id="cdt.managedbuild.tool.gnu.cpp.compiler.base.209048065" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.base">
<option id="gnu.cpp.compiler.option.preprocessor.def.261743951" name="Defined symbols (-D)" superClass="gnu.cpp.compiler.option.preprocessor.def" valueType="definedSymbols">
@@ -280,7 +280,7 @@
</toolChain>
</folderInfo>
<sourceEntries>
- <entry excluding="applications/voiptool|transport/tcp_nsc|transport/tcp_lwip" flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="src"/>
+ <entry excluding="applications/voipstream|transport/tcp_nsc|transport/tcp_lwip" flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="src"/>
</sourceEntries>
</configuration>
</storageModule>
View
4 .nedfolders
@@ -1,6 +1,6 @@
examples
src
--inet.applications.voiptool
+-inet.applications.voipstream
-inet.transport.tcp_lwip
-inet.transport.tcp_nsc
--inet.examples.voiptool
+-inet.examples.voipstream
View
16 .oppfeatures
@@ -552,28 +552,28 @@
linkerFlags = ""
/>
<feature
- id="VoIPTool"
- name="VoIPTool"
+ id="VoIPStream"
+ name="VoIPStream"
description = "Voice over IP tool. Required external libraries: libavcodec, libavformat libavutil"
initiallyEnabled = "false"
requires = "UDP"
labels = ""
nedPackages = "
- inet.applications.voiptool
+ inet.applications.voipstream
"
extraSourceFolders = ""
- compileFlags = "-DWITH_VOIPTOOL"
+ compileFlags = "-DWITH_VOIPSTREAM"
linkerFlags = ""
/>
<feature
- id="VoIPTool_examples"
- name="VoIP examples"
+ id="VoIPStream_examples"
+ name="VoIPStream examples"
description = "Example VoIP simulations"
initiallyEnabled = "false"
- requires = "VoIPTool IPv4 Ethernet"
+ requires = "VoIPStream IPv4 Ethernet"
labels = "examples"
nedPackages = "
- inet.examples.voiptool
+ inet.examples.voipstream
"
extraSourceFolders = ""
compileFlags = ""
View
42 examples/voipstream/VoIPStreamLargeNet/VoIPStreamLargeNet.ned
@@ -17,7 +17,7 @@
//
-package inet.examples.voiptool.VoIPToolLargeNet;
+package inet.examples.voipstream.VoIPStreamLargeNet;
import ned.DatarateChannel;
import inet.nodes.inet.StandardHost;
@@ -39,7 +39,7 @@ channel cable extends DatarateChannel
//
// Several hosts on an Ethernet hub
//
-module VoIPToolSmallLAN
+module VoIPStreamSmallLAN
{
parameters:
int h; // number of hosts on the hub
@@ -64,7 +64,7 @@ module VoIPToolSmallLAN
//
// Several hosts and an Ethernet hub on a switch
//
-module VoIPToolMediumLAN
+module VoIPStreamMediumLAN
{
parameters:
int n; // number of hosts on the switch
@@ -105,7 +105,7 @@ module VoIPToolMediumLAN
// Several hosts and an Ethernet hub on a switch. One port of the hub
// connect to a 10Base2 segment.
//
-module VoIPToolLargeLAN
+module VoIPStreamLargeLAN
{
parameters:
int n; // number of hosts on the switch
@@ -163,7 +163,7 @@ module VoIPToolLargeLAN
// modified to add a VoIP server and a VoIP client. It can be used to test VoIP
// transmission on a LAN with high background traffic.
//
-network VoIPToolLargeNet
+network VoIPStreamLargeNet
{
parameters:
int n; // length of the "backbone" (n>5!)
@@ -186,34 +186,34 @@ network VoIPToolLargeNet
switchBB[n]: EtherSwitch {
@display("is=s");
}
- slanBB[n*bbs]: VoIPToolSmallLAN;
- mlanBB[n*bbm]: VoIPToolMediumLAN;
- llanBB[n*bbl]: VoIPToolLargeLAN;
+ slanBB[n*bbs]: VoIPStreamSmallLAN;
+ mlanBB[n*bbm]: VoIPStreamMediumLAN;
+ llanBB[n*bbl]: VoIPStreamLargeLAN;
switchA: EtherSwitch;
serverA: EtherHost;
- slanA[as]: VoIPToolSmallLAN;
- mlanA[am]: VoIPToolMediumLAN;
- llanA[al]: VoIPToolLargeLAN;
+ slanA[as]: VoIPStreamSmallLAN;
+ mlanA[am]: VoIPStreamMediumLAN;
+ llanA[al]: VoIPStreamLargeLAN;
switchB: EtherSwitch;
serverB: EtherHost;
- slanB[bs]: VoIPToolSmallLAN;
- mlanB[bm]: VoIPToolMediumLAN;
- llanB[bl]: VoIPToolLargeLAN;
+ slanB[bs]: VoIPStreamSmallLAN;
+ mlanB[bm]: VoIPStreamMediumLAN;
+ llanB[bl]: VoIPStreamLargeLAN;
switchC: EtherSwitch;
serverC: EtherHost;
- slanC[cs]: VoIPToolSmallLAN;
- mlanC[cm]: VoIPToolMediumLAN;
- llanC[cl]: VoIPToolLargeLAN;
+ slanC[cs]: VoIPStreamSmallLAN;
+ mlanC[cm]: VoIPStreamMediumLAN;
+ llanC[cl]: VoIPStreamLargeLAN;
switchD: EtherSwitch;
serverD: EtherHost;
- slanD[ds]: VoIPToolSmallLAN;
- mlanD[dm]: VoIPToolMediumLAN;
- llanD[dl]: VoIPToolLargeLAN;
+ slanD[ds]: VoIPStreamSmallLAN;
+ mlanD[dm]: VoIPStreamMediumLAN;
+ llanD[dl]: VoIPStreamLargeLAN;
voipClient: StandardHost;
voipServer: StandardHost;
configurator: IPv4NetworkConfigurator {
parameters:
- config=xml("<config><interface hosts='*' address='10.x.x.x' netmask='255.x.x.x'/></config>");
+ config = xml("<config><interface hosts='*' address='10.x.x.x' netmask='255.x.x.x'/></config>");
@display("p=495,160;i=block/cogwheel_s");
}
connections:
View
64 examples/voipstream/VoIPStreamLargeNet/omnetpp.ini
@@ -1,6 +1,6 @@
[General]
-network = VoIPToolLargeNet
+network = VoIPStreamLargeNet
warnings = true
num-rngs = 8
@@ -15,12 +15,12 @@ cmdenv-express-mode = true
#[Config config1]
# udp app
**.voipClient.numUdpApps = 1
-**.voipClient.udpApp[0].typename = "VoIPSinkApp"
+**.voipClient.udpApp[0].typename = "VoIPStreamReceiver"
**.voipClient.udpApp[0].localPort = 1000
**.voipClient.udpApp[0].resultFile = "results/results.wav"
**.voipServer.numUdpApps = 1
-**.voipServer.udpApp[0].typename = "VoIPSourceApp"
+**.voipServer.udpApp[0].typename = "VoIPStreamSender"
**.voipServer.udpApp[0].packetTimeLength = 20ms
**.voipServer.udpApp[0].voipHeaderSize = 4B
**.voipServer.udpApp[0].samplingRate = 8000Hz
@@ -117,40 +117,40 @@ cmdenv-express-mode = true
**.mac[*].promiscuous = false
**.mac[*].duplexMode = true
-VoIPToolLargeNet.n = 8 # number of switches on backbone
+VoIPStreamLargeNet.n = 8 # number of switches on backbone
-VoIPToolLargeNet.*s = 1 # uncomment for testing: one LAN of each type on each switch
-VoIPToolLargeNet.*m = 1 # uncomment for testing: one LAN of each type on each switch
-VoIPToolLargeNet.*l = 1 # uncomment for testing: one LAN of each type on each switch
+VoIPStreamLargeNet.*s = 1 # uncomment for testing: one LAN of each type on each switch
+VoIPStreamLargeNet.*m = 1 # uncomment for testing: one LAN of each type on each switch
+VoIPStreamLargeNet.*l = 1 # uncomment for testing: one LAN of each type on each switch
-#VoIPToolLargeNet.bbs=6 # number of small LANs on backbone switches
-#VoIPToolLargeNet.bbm=15 # number of medium LANs on backbone switches
-#VoIPToolLargeNet.bbl=8 # number of large LANs on backbone switches
+#VoIPStreamLargeNet.bbs=6 # number of small LANs on backbone switches
+#VoIPStreamLargeNet.bbm=15 # number of medium LANs on backbone switches
+#VoIPStreamLargeNet.bbl=8 # number of large LANs on backbone switches
-#VoIPToolLargeNet.?s=4 # sets as,bs,cs: number of small LANs on switches A,B,C,D
-#VoIPToolLargeNet.?m=8 # sets am,bm,cm: number of medium LANs on switches A,B,C,D
-#VoIPToolLargeNet.?l=3 # sets al,bl,cl: number of large LANs on switches A,B,C,D
+#VoIPStreamLargeNet.?s=4 # sets as,bs,cs: number of small LANs on switches A,B,C,D
+#VoIPStreamLargeNet.?m=8 # sets am,bm,cm: number of medium LANs on switches A,B,C,D
+#VoIPStreamLargeNet.?l=3 # sets al,bl,cl: number of large LANs on switches A,B,C,D
-#VoIPToolLargeNet.*.n=12 # number of hosts connected to a switch in each LAN
-#VoIPToolLargeNet.*.n = 4 # number of hosts connected to a switch in each LAN
-#VoIPToolLargeNet.*.h = 4 # number of hosts connected to a hub in each LAN
-#VoIPToolLargeNet.*.b = 4 # number of hosts connected to a bus in each LAN
-VoIPToolLargeNet.*.n = 8 # number of hosts connected to a switch in each LAN
-VoIPToolLargeNet.*.h = 5 # number of hosts connected to a hub in each LAN
-VoIPToolLargeNet.*.b = 7 # number of hosts connected to a bus in each LAN
+#VoIPStreamLargeNet.*.n=12 # number of hosts connected to a switch in each LAN
+#VoIPStreamLargeNet.*.n = 4 # number of hosts connected to a switch in each LAN
+#VoIPStreamLargeNet.*.h = 4 # number of hosts connected to a hub in each LAN
+#VoIPStreamLargeNet.*.b = 4 # number of hosts connected to a bus in each LAN
+VoIPStreamLargeNet.*.n = 8 # number of hosts connected to a switch in each LAN
+VoIPStreamLargeNet.*.h = 5 # number of hosts connected to a hub in each LAN
+VoIPStreamLargeNet.*.b = 7 # number of hosts connected to a bus in each LAN
-VoIPToolLargeNet.**.cli.reqLength = intuniform(50,1400)*1B
-VoIPToolLargeNet.**.cli.respLength = truncnormal(5000B,5000B)
-VoIPToolLargeNet.**.cli.sendInterval = exponential(30s)
+VoIPStreamLargeNet.**.cli.reqLength = intuniform(50,1400)*1B
+VoIPStreamLargeNet.**.cli.respLength = truncnormal(5000B,5000B)
+VoIPStreamLargeNet.**.cli.sendInterval = exponential(30s)
-VoIPToolLargeNet.*.*host[0].cli.destAddress = "serverA"
-VoIPToolLargeNet.*.*host[1].cli.destAddress = "serverB"
-VoIPToolLargeNet.*.*host[2].cli.destAddress = "serverB"
-VoIPToolLargeNet.*.*host[3].cli.destAddress = "serverC"
-VoIPToolLargeNet.*.*host[4].cli.destAddress = "serverC"
-VoIPToolLargeNet.*.*host[*].cli.destAddress = "serverD"
+VoIPStreamLargeNet.*.*host[0].cli.destAddress = "serverA"
+VoIPStreamLargeNet.*.*host[1].cli.destAddress = "serverB"
+VoIPStreamLargeNet.*.*host[2].cli.destAddress = "serverB"
+VoIPStreamLargeNet.*.*host[3].cli.destAddress = "serverC"
+VoIPStreamLargeNet.*.*host[4].cli.destAddress = "serverC"
+VoIPStreamLargeNet.*.*host[*].cli.destAddress = "serverD"
-VoIPToolLargeNet.server*.cli.destAddress = ""
+VoIPStreamLargeNet.server*.cli.destAddress = ""
-VoIPToolLargeNet.*.switch.relayUnit.numCPUs = 1
-VoIPToolLargeNet.switch*.relayUnit.numCPUs = 2
+VoIPStreamLargeNet.*.switch.relayUnit.numCPUs = 1
+VoIPStreamLargeNet.switch*.relayUnit.numCPUs = 2
View
4 examples/voipstream/VoIPStreamTest/VoIPStreamTest.ned
@@ -11,7 +11,7 @@
// See the GNU Lesser General Public License for more details.
//
-package inet.examples.voiptool.VoIPToolTest;
+package inet.examples.voipstream.VoIPStreamTest;
import inet.networklayer.autorouting.ipv4.IPv4NetworkConfigurator;
@@ -20,7 +20,7 @@ import inet.nodes.inet.Router;
import inet.nodes.inet.StandardHost;
-network VoIPToolTest
+network VoIPStreamTest
{
types:
channel line1 extends ned.DatarateChannel
View
6 examples/voipstream/VoIPStreamTest/omnetpp.ini
@@ -43,7 +43,7 @@
[General]
-network = VoIPToolTest
+network = VoIPStreamTest
tkenv-plugin-path = ../../../etc/plugins
warnings = true
@@ -59,12 +59,12 @@ cmdenv-express-mode = true
#[Config config1]
# udp app
**.client.numUdpApps = 1
-**.client.udpApp[0].typename = "VoIPSinkApp"
+**.client.udpApp[0].typename = "VoIPStreamReceiver"
**.client.udpApp[0].localPort = 1000
**.client.udpApp[0].resultFile = "results/${configname}_results.wav"
**.server.numUdpApps = 1
-**.server.udpApp[0].typename = "VoIPSourceApp"
+**.server.udpApp[0].typename = "VoIPStreamSender"
**.server.udpApp[0].packetTimeLength = 20ms
**.server.udpApp[0].voipHeaderSize = 4B
View
2  examples/voipstream/VoIPStreamTest/package.ned
@@ -1,3 +1,3 @@
-package inet.examples.voiptool.VoIPToolTest;
+package inet.examples.voipstream.VoIPStreamTest;
@license(LGPL);
View
4 examples/voipstream/VoIPStreamTrafficTest/VoIPStreamTrafficTest.ned
@@ -11,7 +11,7 @@
// See the GNU Lesser General Public License for more details.
//
-package inet.examples.voiptool.VoIPToolTrafficTest;
+package inet.examples.voipstream.VoIPStreamTrafficTest;
import inet.networklayer.autorouting.ipv4.IPv4NetworkConfigurator;
import inet.nodes.ethernet.EtherSwitch;
@@ -22,7 +22,7 @@ import ned.DatarateChannel;
-network VoIPToolTrafficTest
+network VoIPStreamTrafficTest
{
@display("bgb=750,447");
types:
View
6 examples/voipstream/VoIPStreamTrafficTest/omnetpp.ini
@@ -1,6 +1,6 @@
[General]
-network = VoIPToolTrafficTest
+network = VoIPStreamTrafficTest
tkenv-plugin-path = ../../../etc/plugins
warnings = true
@@ -16,12 +16,12 @@ cmdenv-express-mode = true
#[Config config1]
# udp app
**.client.numUdpApps = 1
-**.client.udpApp[0].typename = "VoIPSinkApp"
+**.client.udpApp[0].typename = "VoIPStreamReceiver"
**.client.udpApp[0].localPort = 1000
**.client.udpApp[0].resultFile = "results/results.wav"
**.server.numUdpApps = 1
-**.server.udpApp[0].typename = "VoIPSourceApp"
+**.server.udpApp[0].typename = "VoIPStreamSender"
**.server.udpApp[0].packetTimeLength = 20ms
**.server.udpApp[0].voipHeaderSize = 4B
**.server.udpApp[0].samplingRate = 8000Hz
View
2  examples/voipstream/VoIPStreamTrafficTest/package.ned
@@ -1,3 +1,3 @@
-package inet.examples.voiptool.VoIPToolTrafficTest;
+package inet.examples.voipstream.VoIPStreamTrafficTest;
@license(LGPL);
View
6 src/applications/voipstream/AudioOutFile.h
@@ -17,8 +17,8 @@
//
-#ifndef VOIPTOOL_AUDIOOUTFILE_H
-#define VOIPTOOL_AUDIOOUTFILE_H
+#ifndef VOIPSTREAM_AUDIOOUTFILE_H
+#define VOIPSTREAM_AUDIOOUTFILE_H
#define __STDC_CONSTANT_MACROS
@@ -54,4 +54,4 @@ class AudioOutFile
};
-#endif // VOIPTOOL_AUDIOOUTFILE_H
+#endif // VOIPSTREAM_AUDIOOUTFILE_H
View
9 src/applications/voipstream/ChangeLog
@@ -1,3 +1,12 @@
+2012-09-13 Zoltan Bojthe
+
+ Renamed feature to VoIPStream.
+ Renamed classes, modules, messages, files:
+ - VoIPPacket to VoIPStreamPacket
+ - VoIPSourceApp to VoIPStreamSender
+ - VoIPSinkApp to VoIPStreamReceiver
+ - example folders and modules
+
2012-08-07 ------ inet-2.0.0 released ------
2012-06-25 ------ inet-1.99.5 released ------
View
8 src/applications/voipstream/VoIPStreamPacket.msg
@@ -18,7 +18,7 @@
cplusplus {{
#ifndef HAVE_FFMPEG
-#error Please install libavcodec, libavformat, libavutil or disable 'VoIPTool' feature.
+#error Please install libavcodec, libavformat, libavutil or disable 'VoIPStream' feature.
#endif
#include "ByteArrayMessage.h"
@@ -29,7 +29,7 @@ class ByteArrayMessage;
//
// For the type field of VoIPPacket
//
-enum VoIPPacketType
+enum VoIPStreamPacketType
{
VOICE = 1;
SILENCE = 2;
@@ -38,9 +38,9 @@ enum VoIPPacketType
//
// Packet type used by VoIPSourceApp and VoIPSinkApp
//
-packet VoIPPacket extends ByteArrayMessage
+packet VoIPStreamPacket extends ByteArrayMessage
{
- int type @enum(VoIPPacketType);
+ int type @enum(VoIPStreamPacketType);
int codec; // FFmpeg identifier of the codec
short sampleBits;
View
48 src/applications/voipstream/VoIPStreamReceiver.cc
@@ -17,27 +17,27 @@
//
-#include "VoIPSinkApp.h"
+#include "VoIPStreamReceiver.h"
#include "INETEndians.h"
-Define_Module(VoIPSinkApp);
+Define_Module(VoIPStreamReceiver);
-simsignal_t VoIPSinkApp::rcvdPkSignal = SIMSIGNAL_NULL;
-simsignal_t VoIPSinkApp::lostSamplesSignal = SIMSIGNAL_NULL;
-simsignal_t VoIPSinkApp::lostPacketsSignal = SIMSIGNAL_NULL;
-simsignal_t VoIPSinkApp::dropPkSignal = SIMSIGNAL_NULL;
-simsignal_t VoIPSinkApp::packetHasVoiceSignal = SIMSIGNAL_NULL;
-simsignal_t VoIPSinkApp::connStateSignal = SIMSIGNAL_NULL;
-simsignal_t VoIPSinkApp::delaySignal = SIMSIGNAL_NULL;
+simsignal_t VoIPStreamReceiver::rcvdPkSignal = SIMSIGNAL_NULL;
+simsignal_t VoIPStreamReceiver::lostSamplesSignal = SIMSIGNAL_NULL;
+simsignal_t VoIPStreamReceiver::lostPacketsSignal = SIMSIGNAL_NULL;
+simsignal_t VoIPStreamReceiver::dropPkSignal = SIMSIGNAL_NULL;
+simsignal_t VoIPStreamReceiver::packetHasVoiceSignal = SIMSIGNAL_NULL;
+simsignal_t VoIPStreamReceiver::connStateSignal = SIMSIGNAL_NULL;
+simsignal_t VoIPStreamReceiver::delaySignal = SIMSIGNAL_NULL;
-VoIPSinkApp::~VoIPSinkApp()
+VoIPStreamReceiver::~VoIPStreamReceiver()
{
closeConnection();
}
-void VoIPSinkApp::initSignals()
+void VoIPStreamReceiver::initSignals()
{
rcvdPkSignal = registerSignal("rcvdPk");
lostSamplesSignal = registerSignal("lostSamples");
@@ -48,7 +48,7 @@ void VoIPSinkApp::initSignals()
delaySignal = registerSignal("delay");
}
-void VoIPSinkApp::initialize()
+void VoIPStreamReceiver::initialize()
{
initSignals();
@@ -70,7 +70,7 @@ void VoIPSinkApp::initialize()
socket.bind(localPort);
}
-void VoIPSinkApp::handleMessage(cMessage *msg)
+void VoIPStreamReceiver::handleMessage(cMessage *msg)
{
if (msg->getKind() == UDP_I_ERROR)
{
@@ -78,7 +78,7 @@ void VoIPSinkApp::handleMessage(cMessage *msg)
return;
}
- VoIPPacket *vp = check_and_cast<VoIPPacket *>(msg);
+ VoIPStreamPacket *vp = check_and_cast<VoIPStreamPacket *>(msg);
bool ok = true;
if (curConn.offline)
createConnection(vp);
@@ -98,7 +98,7 @@ void VoIPSinkApp::handleMessage(cMessage *msg)
delete msg;
}
-void VoIPSinkApp::Connection::openAudio(const char *fileName)
+void VoIPStreamReceiver::Connection::openAudio(const char *fileName)
{
/*
AVCodecContext *c;
@@ -118,7 +118,7 @@ void VoIPSinkApp::Connection::openAudio(const char *fileName)
outFile.open(fileName, sampleRate, av_get_bits_per_sample_format(decCtx->sample_fmt));
}
-void VoIPSinkApp::Connection::writeLostSamples(int sampleCount)
+void VoIPStreamReceiver::Connection::writeLostSamples(int sampleCount)
{
int pktBytes = sampleCount * av_get_bits_per_sample_format(decCtx->sample_fmt) / 8;
if (outFile.isOpen())
@@ -129,7 +129,7 @@ void VoIPSinkApp::Connection::writeLostSamples(int sampleCount)
}
}
-void VoIPSinkApp::Connection::writeAudioFrame(uint8_t *inbuf, int inbytes)
+void VoIPStreamReceiver::Connection::writeAudioFrame(uint8_t *inbuf, int inbytes)
{
AVPacket avpkt;
av_init_packet(&avpkt);
@@ -149,12 +149,12 @@ void VoIPSinkApp::Connection::writeAudioFrame(uint8_t *inbuf, int inbytes)
delete [] decBuf;
}
-void VoIPSinkApp::Connection::closeAudio()
+void VoIPStreamReceiver::Connection::closeAudio()
{
outFile.close();
}
-void VoIPSinkApp::createConnection(VoIPPacket *vp)
+void VoIPStreamReceiver::createConnection(VoIPStreamPacket *vp)
{
ASSERT(curConn.offline);
@@ -198,7 +198,7 @@ void VoIPSinkApp::createConnection(VoIPPacket *vp)
emit(connStateSignal, 1);
}
-void VoIPSinkApp::checkSourceAndParameters(VoIPPacket *vp)
+void VoIPStreamReceiver::checkSourceAndParameters(VoIPStreamPacket *vp)
{
ASSERT(!curConn.offline);
@@ -219,7 +219,7 @@ void VoIPSinkApp::checkSourceAndParameters(VoIPPacket *vp)
throw cRuntimeError("Cannot change voice encoding parameters a during session");
}
-void VoIPSinkApp::closeConnection()
+void VoIPStreamReceiver::closeConnection()
{
if (!curConn.offline)
{
@@ -230,7 +230,7 @@ void VoIPSinkApp::closeConnection()
}
}
-void VoIPSinkApp::decodePacket(VoIPPacket *vp)
+void VoIPStreamReceiver::decodePacket(VoIPStreamPacket *vp)
{
switch (vp->getType())
{
@@ -243,7 +243,7 @@ void VoIPSinkApp::decodePacket(VoIPPacket *vp)
break;
default:
- error("The received VoIPPacket has unknown type %d", vp->getType());
+ error("The received VoIPStreamPacket has unknown type %d", vp->getType());
return;
}
uint16_t newSeqNo = vp->getSeqNo();
@@ -267,7 +267,7 @@ void VoIPSinkApp::decodePacket(VoIPPacket *vp)
curConn.writeAudioFrame(buff, len);
}
-void VoIPSinkApp::finish()
+void VoIPStreamReceiver::finish()
{
ev << "Sink finish()" << endl;
closeConnection();
View
22 src/applications/voipstream/VoIPStreamReceiver.h
@@ -17,11 +17,11 @@
//
-#ifndef VOIPTOOL_VOIPSINKAPP_H
-#define VOIPTOOL_VOIPSINKAPP_H
+#ifndef VOIPSTREAM_VOIPSTREAMRECEIVER_H
+#define VOIPSTREAM_VOIPSTREAMRECEIVER_H
#ifndef HAVE_FFMPEG
-#error Please install libavcodec, libavformat, libavutil or disable 'VoIPTool' feature
+#error Please install libavcodec, libavformat, libavutil or disable 'VoIPStream' feature
#endif
@@ -41,25 +41,25 @@ extern "C" {
#include "UDPControlInfo_m.h"
#include "UDPSocket.h"
-#include "VoIPPacket_m.h"
+#include "VoIPStreamPacket_m.h"
#include "AudioOutFile.h"
-class VoIPSinkApp : public cSimpleModule
+class VoIPStreamReceiver : public cSimpleModule
{
public:
- VoIPSinkApp() { resultFile = ""; }
- ~VoIPSinkApp();
+ VoIPStreamReceiver() { resultFile = ""; }
+ ~VoIPStreamReceiver();
protected:
virtual void initialize();
virtual void handleMessage(cMessage *msg);
virtual void finish();
- virtual void createConnection(VoIPPacket *vp);
- virtual void checkSourceAndParameters(VoIPPacket *vp);
+ virtual void createConnection(VoIPStreamPacket *vp);
+ virtual void checkSourceAndParameters(VoIPStreamPacket *vp);
virtual void closeConnection();
- virtual void decodePacket(VoIPPacket *vp);
+ virtual void decodePacket(VoIPStreamPacket *vp);
static void initSignals();
class Connection
@@ -112,4 +112,4 @@ class VoIPSinkApp : public cSimpleModule
static simsignal_t delaySignal;
};
-#endif // VOIPTOOL_VOIPSINKAPP_H
+#endif // VOIPSTREAM_VOIPSTREAMRECEIVER_H
View
8 src/applications/voipstream/VoIPStreamReceiver.ned
@@ -16,13 +16,13 @@
// along with this program; if not, see <http://www.gnu.org/licenses/>.
//
-package inet.applications.voiptool;
+package inet.applications.voipstream;
import inet.applications.IUDPApp;
//
-// VoIPSinkApp listens on an UDP port, and expects to receive VoIP packets on
+// VoIPStreamReceiver listens on an UDP port, and expects to receive VoIP packets on
// it. The received voice is then saved into a result audio file that can be
// compared with the original for further evaluation. VoIP packets are
// numbered, and out-of-order packets are discarded (the corresponding voice
@@ -33,7 +33,7 @@ import inet.applications.IUDPApp;
// completes (i.e. in the OMNeT++ finish() function). Only one voice session
// ("call") may be underway at a time.
//
-simple VoIPSinkApp like IUDPApp
+simple VoIPStreamReceiver like IUDPApp
{
parameters:
int localPort;
@@ -52,7 +52,7 @@ simple VoIPSinkApp like IUDPApp
@statistic[lostPackets](title="lost packets"; interpolationmode=none; record=vector,stats);
@statistic[packetHasVoice](title="voice or silence packet"; record=mean,vector; interpolationmode=none);
@statistic[delay](title="delay"; unit=s; record=vector,histogram; interpolationmode=none);
- @statistic[numActiveSessions](title="number of active sessions"; source="sum(connState)"; record=max,timeavg,vector; interpolationmode=sample-hold;);
+ @statistic[numActiveSessions](title="number of active sessions"; source="sum(connState)"; record=max,timeavg,vector; interpolationmode=sample-hold; );
@statistic[numSessions](title="total number of sessions"; source="sum(connState+1)/2"; record=last);
@display("i=block/arrival");
gates:
View
36 src/applications/voipstream/VoIPStreamSender.cc
@@ -16,21 +16,21 @@
// along with this program; if not, see <http://www.gnu.org/licenses/>.
//
-#include "VoIPSourceApp.h"
+#include "VoIPStreamSender.h"
#include "UDPControlInfo_m.h"
-Define_Module(VoIPSourceApp);
+Define_Module(VoIPStreamSender);
-simsignal_t VoIPSourceApp::sentPkSignal = SIMSIGNAL_NULL;
+simsignal_t VoIPStreamSender::sentPkSignal = SIMSIGNAL_NULL;
-VoIPSourceApp::~VoIPSourceApp()
+VoIPStreamSender::~VoIPStreamSender()
{
cancelAndDelete(timer);
}
-VoIPSourceApp::Buffer::Buffer() :
+VoIPStreamSender::Buffer::Buffer() :
samples(NULL),
bufferSize(0),
readOffset(0),
@@ -38,12 +38,12 @@ VoIPSourceApp::Buffer::Buffer() :
{
}
-VoIPSourceApp::Buffer::~Buffer()
+VoIPStreamSender::Buffer::~Buffer()
{
delete [] samples;
}
-void VoIPSourceApp::Buffer::clear(int framesize)
+void VoIPStreamSender::Buffer::clear(int framesize)
{
delete samples;
bufferSize = BUFSIZE + framesize;
@@ -52,7 +52,7 @@ void VoIPSourceApp::Buffer::clear(int framesize)
writeOffset = 0;
}
-void VoIPSourceApp::initialize(int stage)
+void VoIPStreamSender::initialize(int stage)
{
if (stage != 3) //wait until stage 3 - The Address resolver does not work before that!
return;
@@ -111,11 +111,11 @@ void VoIPSourceApp::initialize(int stage)
sentPkSignal = registerSignal("sentPk");
}
-void VoIPSourceApp::handleMessage(cMessage *msg)
+void VoIPStreamSender::handleMessage(cMessage *msg)
{
if (msg->isSelfMessage())
{
- VoIPPacket *packet;
+ VoIPStreamPacket *packet;
if (msg == timer)
{
@@ -140,7 +140,7 @@ void VoIPSourceApp::handleMessage(cMessage *msg)
}
else
{
- packet = check_and_cast<VoIPPacket *>(msg);
+ packet = check_and_cast<VoIPStreamPacket *>(msg);
emit(sentPkSignal, packet);
socket.sendTo(packet, destAddress, destPort);
}
@@ -149,7 +149,7 @@ void VoIPSourceApp::handleMessage(cMessage *msg)
delete msg;
}
-void VoIPSourceApp::finish()
+void VoIPStreamSender::finish()
{
av_free_packet(&packet);
outFile.close();
@@ -187,7 +187,7 @@ static void choose_sample_fmt(AVStream *st, AVCodec *codec)
}
*/
-void VoIPSourceApp::openSoundFile(const char *name)
+void VoIPStreamSender::openSoundFile(const char *name)
{
int ret = av_open_input_file(&pFormatCtx, name, NULL, 0, NULL);
@@ -265,7 +265,7 @@ void VoIPSourceApp::openSoundFile(const char *name)
sampleBuffer.clear(samplesPerPacket * av_get_bits_per_sample_format(pEncoderCtx->sample_fmt) / 8);
}
-VoIPPacket* VoIPSourceApp::generatePacket()
+VoIPStreamPacket* VoIPStreamSender::generatePacket()
{
readFrame();
@@ -276,7 +276,7 @@ VoIPPacket* VoIPSourceApp::generatePacket()
short int bitsPerOutSample = av_get_bits_per_sample(pEncoderCtx->codec->id);
int samples = std::min(sampleBuffer.length() / (bitsPerInSample/8), samplesPerPacket);
bool isSilent = checkSilence(pEncoderCtx->sample_fmt, sampleBuffer.readPtr(), samples);
- VoIPPacket *vp = new VoIPPacket();
+ VoIPStreamPacket *vp = new VoIPStreamPacket();
int outByteCount = 0;
uint8_t *outBuf = NULL;
@@ -342,7 +342,7 @@ VoIPPacket* VoIPSourceApp::generatePacket()
return vp;
}
-bool VoIPSourceApp::checkSilence(enum SampleFormat sampleFormat, void* _buf, int samples)
+bool VoIPStreamSender::checkSilence(enum SampleFormat sampleFormat, void* _buf, int samples)
{
int max = 0;
int i;
@@ -394,7 +394,7 @@ bool VoIPSourceApp::checkSilence(enum SampleFormat sampleFormat, void* _buf, int
return max < voipSilenceThreshold;
}
-void VoIPSourceApp::Buffer::align()
+void VoIPStreamSender::Buffer::align()
{
if (readOffset)
{
@@ -405,7 +405,7 @@ void VoIPSourceApp::Buffer::align()
}
}
-void VoIPSourceApp::readFrame()
+void VoIPStreamSender::readFrame()
{
short int inBytesPerSample = av_get_bits_per_sample_format(pEncoderCtx->sample_fmt) / 8;
if (sampleBuffer.length() >= samplesPerPacket * inBytesPerSample)
View
16 src/applications/voipstream/VoIPStreamSender.h
@@ -17,11 +17,11 @@
//
-#ifndef VOIPTOOL_VOIPSOURCEAPP_H
-#define VOIPTOOL_VOIPSOURCEAPP_H
+#ifndef VOIPSTREAM_VOIPSTREAMSENDER_H
+#define VOIPSTREAM_VOIPSTREAMSENDER_H
#ifndef HAVE_FFMPEG
-#error Please install libavcodec, libavformat, libavutil or disable 'VoIPTool' feature
+#error Please install libavcodec, libavformat, libavutil or disable 'VoIPStream' feature
#endif
#include <fnmatch.h>
@@ -39,14 +39,14 @@ extern "C" {
#include "AudioOutFile.h"
#include "IPvXAddressResolver.h"
#include "UDPSocket.h"
-#include "VoIPPacket_m.h"
+#include "VoIPStreamPacket_m.h"
//using namespace std;
-class INET_API VoIPSourceApp : public cSimpleModule
+class INET_API VoIPStreamSender : public cSimpleModule
{
public:
- ~VoIPSourceApp();
+ ~VoIPStreamSender();
protected:
virtual void initialize(int stage);
@@ -55,7 +55,7 @@ class INET_API VoIPSourceApp : public cSimpleModule
virtual void finish();
virtual void openSoundFile(const char *name);
- virtual VoIPPacket* generatePacket();
+ virtual VoIPStreamPacket* generatePacket();
virtual bool checkSilence(enum SampleFormat sampleFormat, void* _buf, int samples);
virtual void readFrame();
@@ -124,4 +124,4 @@ class INET_API VoIPSourceApp : public cSimpleModule
static simsignal_t sentPkSignal;
};
-#endif //VOIPTOOL_VOIPSOURCEAPP_H
+#endif //VOIPSTREAM_VOIPSTREAMSENDER_H
View
6 src/applications/voipstream/VoIPStreamSender.ned
@@ -17,13 +17,13 @@
//
-package inet.applications.voiptool;
+package inet.applications.voipstream;
import inet.applications.IUDPApp;
//
-// VoIPSourceApp accepts an audio file and a destination IP address/port as
+// VoIPStreamSender accepts an audio file and a destination IP address/port as
// input, and will transmit the file's contents as voice traffic over UDP n
// times (by default once). For transmission, the audio is resampled at the
// specified frequency and depth, and encoded with the specified codec at the
@@ -34,7 +34,7 @@ import inet.applications.IUDPApp;
// does not simulate any particular VoIP protocol (e.g. RTP), but instead
// accepts a "header size" parameter that can be set accordingly.
//
-simple VoIPSourceApp like IUDPApp
+simple VoIPStreamSender like IUDPApp
{
parameters:
int localPort;
View
4 src/makefrag
@@ -34,9 +34,9 @@ else
endif
#
-# VoipTool feature:
+# VoipStream feature:
#
-ifneq (,$(findstring -DWITH_VOIPTOOL,$(COPTS)))
+ifneq (,$(findstring -DWITH_VOIPSTREAM,$(COPTS)))
ifeq ($(HAVE_PKGCFG), yes)
HAVE_FFMPEG := $(shell $(PKGCFG) --exists libavcodec libavformat libavutil && echo yes || echo no)
ifeq ($(HAVE_FFMPEG), yes)
View
12 tests/fingerprint/examples.csv
@@ -216,12 +216,12 @@
/examples/sctp/multihomed/, -f omnetpp.ini -c General -r 0, 500s, f252-459d
/examples/sctp/nclients/, -f omnetpp.ini -c General -r 0, 500s, d999-82c6
-/examples/voiptool/VoIPToolLargeNet/, -f omnetpp.ini -c General -r 0, 5s, d535-b1ff
-/examples/voiptool/VoIPToolTest/, -f omnetpp.ini -c g726 -r 0, 5s, f0e7-8839
-/examples/voiptool/VoIPToolTest/, -f omnetpp.ini -c g711_aLaw -r 0, 5s, b3f2-edae
-/examples/voiptool/VoIPToolTest/, -f omnetpp.ini -c g711_muLaw -r 0, 5s, b3f2-edae
-/examples/voiptool/VoIPToolTest/, -f omnetpp.ini -c pcm_s16le -r 0, 5s, 1a6d-102c
-/examples/voiptool/VoIPToolTrafficTest/, -f omnetpp.ini -c General -r 0, 2s, 9617-db37
+/examples/voipstream/VoIPStreamLargeNet/, -f omnetpp.ini -c General -r 0, 5s, d535-b1ff
+/examples/voipstream/VoIPStreamTest/, -f omnetpp.ini -c g726 -r 0, 5s, f0e7-8839
+/examples/voipstream/VoIPStreamTest/, -f omnetpp.ini -c g711_aLaw -r 0, 5s, b3f2-edae
+/examples/voipstream/VoIPStreamTest/, -f omnetpp.ini -c g711_muLaw -r 0, 5s, b3f2-edae
+/examples/voipstream/VoIPStreamTest/, -f omnetpp.ini -c pcm_s16le -r 0, 5s, 1a6d-102c
+/examples/voipstream/VoIPStreamTrafficTest/, -f omnetpp.ini -c General -r 0, 2s, 9617-db37
/examples/wireless/handover/, -f omnetpp.ini -c General -r 0, 1500s, 61db-0a60
/examples/wireless/hosttohost/, -f omnetpp.ini -c Throughput1 -r 0, 5s, 7bcb-0f6e
/examples/wireless/lan80211/, -f omnetpp-ftp.ini -c TwoHosts -r 0, 100s, 6c1b-1738
View
12 tests/smoke/examples.csv
@@ -245,12 +245,12 @@
/examples/rtp/unicast2/, -f omnetpp.ini -c General -r 0
/examples/sctp/multihomed/, -f omnetpp.ini -c General -r 0
/examples/sctp/nclients/, -f omnetpp.ini -c General -r 0
-/examples/voiptool/VoIPToolLargeNet/, -f omnetpp.ini -c General -r 0
-/examples/voiptool/VoIPToolTest/, -f omnetpp.ini -c g726 -r 0
-/examples/voiptool/VoIPToolTest/, -f omnetpp.ini -c g711_aLaw -r 0
-/examples/voiptool/VoIPToolTest/, -f omnetpp.ini -c g711_muLaw -r 0
-/examples/voiptool/VoIPToolTest/, -f omnetpp.ini -c pcm_s16le -r 0
-/examples/voiptool/VoIPToolTrafficTest/, -f omnetpp.ini -c General -r 0
+/examples/voipstream/VoIPStreamLargeNet/, -f omnetpp.ini -c General -r 0
+/examples/voipstream/VoIPStreamTest/, -f omnetpp.ini -c g726 -r 0
+/examples/voipstream/VoIPStreamTest/, -f omnetpp.ini -c g711_aLaw -r 0
+/examples/voipstream/VoIPStreamTest/, -f omnetpp.ini -c g711_muLaw -r 0
+/examples/voipstream/VoIPStreamTest/, -f omnetpp.ini -c pcm_s16le -r 0
+/examples/voipstream/VoIPStreamTrafficTest/, -f omnetpp.ini -c General -r 0
/examples/wireless/handover/, -f omnetpp.ini -c General -r 0
/examples/wireless/hosttohost/, -f omnetpp.ini -c Throughput1 -r 0
/examples/wireless/lan80211/, -f omnetpp-ftp.ini -c TwoHosts -r 0
Please sign in to comment.
Something went wrong with that request. Please try again.