Use dyfet github repo for libccrtp
diff --git a/jni/libccrtp/sources/demo/Makefile b/jni/libccrtp/sources/demo/Makefile
index 13e791c..0aa0a78 100644
--- a/jni/libccrtp/sources/demo/Makefile
+++ b/jni/libccrtp/sources/demo/Makefile
@@ -281,12 +281,12 @@
LIPO =
LN_S = ln -s
LTLIBOBJS =
-LT_CCXX_VERSION = -version-info 2:4:0
+LT_CCXX_VERSION = -version-info 2:5:0
LT_MAJOR = 2
LT_MINOR = 0
LT_RELEASE =
LT_SUBVER = 2.0
-LT_VERSION = -version-info 2:4:0
+LT_VERSION = -version-info 2:5:0
MAINT = #
MAKEINFO = ${SHELL} /home/lisional/git/sflphone-android/jni/libccrtp/sources/autoconf/missing makeinfo
MANIFEST_TOOL = :
@@ -300,10 +300,10 @@
PACKAGE = ccrtp
PACKAGE_BUGREPORT =
PACKAGE_NAME = ccrtp
-PACKAGE_STRING = ccrtp 2.0.7
+PACKAGE_STRING = ccrtp 2.0.8
PACKAGE_TARNAME = ccrtp
PACKAGE_URL =
-PACKAGE_VERSION = 2.0.7
+PACKAGE_VERSION = 2.0.8
PATH_SEPARATOR = :
PKG_CONFIG = /usr/bin/pkg-config
PKG_CONFIG_LIBDIR =
@@ -313,7 +313,7 @@
SET_MAKE =
SHELL = /bin/sh
STRIP = strip
-VERSION = 2.0.7
+VERSION = 2.0.8
WARN_FLAGS = -fno-strict-aliasing -Wall -ansi -pedantic
abs_builddir = /home/lisional/git/sflphone-android/jni/libccrtp/sources/demo
abs_srcdir = /home/lisional/git/sflphone-android/jni/libccrtp/sources/demo
diff --git a/jni/libccrtp/sources/demo/audiorx.cpp b/jni/libccrtp/sources/demo/audiorx.cpp
index 0eb1ae0..9013b02 100644
--- a/jni/libccrtp/sources/demo/audiorx.cpp
+++ b/jni/libccrtp/sources/demo/audiorx.cpp
@@ -41,9 +41,11 @@
* @class ccRTP_AudioReceiver
* This is the class that will do almost everything.
*/
-class ccRTP_AudioReceiver: public Thread, public TimerPort
+class ccRTP_AudioReceiver: public Thread
{
private:
+ // Used to time operations
+ TimerPort timerport;
// This is the file we will write to (/dev/audio)
int audiooutput;
// The aforementioned file will be transmitted through this socket
@@ -115,7 +117,7 @@
cout << "Waiting for audio packets..." << endl;
// This will be useful for periodic execution.
- TimerPort::setTimer(PERIOD);
+ timerport.setTimer(PERIOD);
// This is the main loop, where packets are sent and receipt.
socket->setPayloadFormat(StaticPayloadFormat(sptPCMU));
@@ -145,8 +147,8 @@
cout << "." << flush;
// Let's wait for the next cycle
- Thread::sleep(TimerPort::getTimer());
- TimerPort::incTimer(PERIOD);
+ Thread::sleep(timerport.getTimer());
+ timerport.incTimer(PERIOD);
}
} // end of run
diff --git a/jni/libccrtp/sources/demo/audiotx.cpp b/jni/libccrtp/sources/demo/audiotx.cpp
index 211954e..3c2c09a 100644
--- a/jni/libccrtp/sources/demo/audiotx.cpp
+++ b/jni/libccrtp/sources/demo/audiotx.cpp
@@ -46,9 +46,11 @@
* @class ccRTP_AudioTransmitter
* This is the class that will do almost everything.
*/
-class ccRTP_AudioTransmitter: public Thread, public TimerPort
+class ccRTP_AudioTransmitter: public Thread
{
private:
+ // Used to time operations
+ TimerPort timerport;
// This is the descriptor of the file we will read from
// (commonly, /dev/audio or a .au file)
int audioinput;
@@ -140,7 +142,7 @@
int count=PACKET_SIZE;
// This will be useful for periodic execution
- TimerPort::setTimer(PERIOD);
+ timerport.setTimer(PERIOD);
// This is the main loop, where packets are transmitted.
for( int i = 0 ; (!sendingfile || count > 0) ; i++ ) {
@@ -155,8 +157,8 @@
cout << "." << flush;
// Let's wait for the next cycle
- Thread::sleep(TimerPort::getTimer());
- TimerPort::incTimer(PERIOD);
+ Thread::sleep(timerport.getTimer());
+ timerport.incTimer(PERIOD);
}
cout << endl << "I have got no more data to send. " <<endl;
}
diff --git a/jni/libccrtp/sources/demo/ccrtptest.cpp b/jni/libccrtp/sources/demo/ccrtptest.cpp
index e544ef9..6a9a85a 100644
--- a/jni/libccrtp/sources/demo/ccrtptest.cpp
+++ b/jni/libccrtp/sources/demo/ccrtptest.cpp
@@ -226,20 +226,25 @@
bool send = false;
bool recv = false;
- RecvPacketTransmissionTest *rx;
- SendPacketTransmissionTest *tx;
-
// accept as parameter if must run as --send or --recv
+ for (int i = 1; i < argc; ++i) {
+ send |= !strcmp(argv[i], "-s") or !strcmp(argv[i], "--send");
+ if ( send )
+ break;
+ recv |= !strcmp(argv[i], "-r") or !strcmp(argv[i], "--recv");
+ if ( recv )
+ break;
+ }
// run several tests in parallel threads
if ( send ) {
- tx = new SendPacketTransmissionTest();
- tx->start();
- tx->join();
+ SendPacketTransmissionTest tx;
+ tx.start();
+ tx.join();
} else if ( recv ) {
- rx = new RecvPacketTransmissionTest();
- rx->start();
- rx->join();
+ RecvPacketTransmissionTest rx;
+ rx.start();
+ rx.join();
} else {
MiscTest m;
m.start();