mirror of
https://github.com/signalwire/freeswitch.git
synced 2025-08-13 09:36:46 +00:00
update jrtp to 3.4.0 version with our mods. Pending: Autotools rerun on this.
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@868 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
@@ -5,6 +5,6 @@ example2_SOURCES = example2.cpp
|
||||
example3_SOURCES = example3.cpp
|
||||
example4_SOURCES = example4.cpp
|
||||
|
||||
INCLUDES = @RTP_JTHREADINCLUDES@ @RTP_GSTINCLUDES@ -I ../src/
|
||||
INCLUDES = @RTP_JTHREADINCLUDES@ -I ../src/
|
||||
LDADD = ../src/.libs/libjrtp.a @RTP_LINKLIBS@
|
||||
|
||||
|
@@ -110,10 +110,6 @@ EGREP = @EGREP@
|
||||
EXEEXT = @EXEEXT@
|
||||
F77 = @F77@
|
||||
FFLAGS = @FFLAGS@
|
||||
GST_CFLAGS = @GST_CFLAGS@
|
||||
GST_LIBS = @GST_LIBS@
|
||||
GST_PLUGINS_BASE_CFLAGS = @GST_PLUGINS_BASE_CFLAGS@
|
||||
GST_PLUGINS_BASE_LIBS = @GST_PLUGINS_BASE_LIBS@
|
||||
INSTALL_DATA = @INSTALL_DATA@
|
||||
INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
||||
INSTALL_SCRIPT = @INSTALL_SCRIPT@
|
||||
@@ -133,18 +129,15 @@ PACKAGE_STRING = @PACKAGE_STRING@
|
||||
PACKAGE_TARNAME = @PACKAGE_TARNAME@
|
||||
PACKAGE_VERSION = @PACKAGE_VERSION@
|
||||
PATH_SEPARATOR = @PATH_SEPARATOR@
|
||||
PKG_CONFIG = @PKG_CONFIG@
|
||||
RANLIB = @RANLIB@
|
||||
RTP_ENDIAN = @RTP_ENDIAN@
|
||||
RTP_FILIO = @RTP_FILIO@
|
||||
RTP_GSTINCLUDES = @RTP_GSTINCLUDES@
|
||||
RTP_HAVE_SOCKADDR_LEN = @RTP_HAVE_SOCKADDR_LEN@
|
||||
RTP_LINKLIBS = @RTP_LINKLIBS@
|
||||
RTP_SOCKIO = @RTP_SOCKIO@
|
||||
RTP_SOCKLENTYPE_UINT = @RTP_SOCKLENTYPE_UINT@
|
||||
RTP_SUPPORT_GETLOGINR = @RTP_SUPPORT_GETLOGINR@
|
||||
RTP_SUPPORT_GNUDRAND = @RTP_SUPPORT_GNUDRAND@
|
||||
RTP_SUPPORT_GST = @RTP_SUPPORT_GST@
|
||||
RTP_SUPPORT_IFADDRS = @RTP_SUPPORT_IFADDRS@
|
||||
RTP_SUPPORT_INLINETEMPLATEPARAM = @RTP_SUPPORT_INLINETEMPLATEPARAM@
|
||||
RTP_SUPPORT_IPV4MULTICAST = @RTP_SUPPORT_IPV4MULTICAST@
|
||||
@@ -206,7 +199,7 @@ example1_SOURCES = example1.cpp
|
||||
example2_SOURCES = example2.cpp
|
||||
example3_SOURCES = example3.cpp
|
||||
example4_SOURCES = example4.cpp
|
||||
INCLUDES = @RTP_JTHREADINCLUDES@ @RTP_GSTINCLUDES@ -I ../src/
|
||||
INCLUDES = @RTP_JTHREADINCLUDES@ -I ../src/
|
||||
LDADD = ../src/.libs/libjrtp.a @RTP_LINKLIBS@
|
||||
all: all-am
|
||||
|
||||
|
@@ -46,8 +46,8 @@ int main(void)
|
||||
#endif // WIN32
|
||||
|
||||
RTPSession sess;
|
||||
u_int16_t portbase,destport;
|
||||
u_int32_t destip;
|
||||
uint16_t portbase,destport;
|
||||
uint32_t destip;
|
||||
std::string ipstr;
|
||||
int status,i,num;
|
||||
|
||||
|
@@ -29,7 +29,7 @@ int main(void)
|
||||
exit(-1);
|
||||
}
|
||||
|
||||
u_int8_t localip[]={127,0,0,1};
|
||||
uint8_t localip[]={127,0,0,1};
|
||||
RTPIPv4Address addr(localip,9000);
|
||||
|
||||
status = session.AddDestination(addr);
|
||||
@@ -43,7 +43,7 @@ int main(void)
|
||||
session.SetDefaultMark(false);
|
||||
session.SetDefaultTimestampIncrement(160);
|
||||
|
||||
u_int8_t silencebuffer[160];
|
||||
uint8_t silencebuffer[160];
|
||||
for (int i = 0 ; i < 160 ; i++)
|
||||
silencebuffer[i] = 128;
|
||||
|
||||
|
@@ -47,8 +47,8 @@ protected:
|
||||
if (dat->IsOwnSSRC())
|
||||
return;
|
||||
|
||||
u_int32_t ip;
|
||||
u_int16_t port;
|
||||
uint32_t ip;
|
||||
uint16_t port;
|
||||
|
||||
if (dat->GetRTPDataAddress() != 0)
|
||||
{
|
||||
@@ -58,7 +58,7 @@ protected:
|
||||
}
|
||||
else if (dat->GetRTCPDataAddress() != 0)
|
||||
{
|
||||
const RTPIPv4Address *addr = (const RTPIPv4Address *)(dat->GetRTPDataAddress());
|
||||
const RTPIPv4Address *addr = (const RTPIPv4Address *)(dat->GetRTCPDataAddress());
|
||||
ip = addr->GetIP();
|
||||
port = addr->GetPort()-1;
|
||||
}
|
||||
@@ -78,8 +78,8 @@ protected:
|
||||
if (dat->IsOwnSSRC())
|
||||
return;
|
||||
|
||||
u_int32_t ip;
|
||||
u_int16_t port;
|
||||
uint32_t ip;
|
||||
uint16_t port;
|
||||
|
||||
if (dat->GetRTPDataAddress() != 0)
|
||||
{
|
||||
@@ -89,7 +89,7 @@ protected:
|
||||
}
|
||||
else if (dat->GetRTCPDataAddress() != 0)
|
||||
{
|
||||
const RTPIPv4Address *addr = (const RTPIPv4Address *)(dat->GetRTPDataAddress());
|
||||
const RTPIPv4Address *addr = (const RTPIPv4Address *)(dat->GetRTCPDataAddress());
|
||||
ip = addr->GetIP();
|
||||
port = addr->GetPort()-1;
|
||||
}
|
||||
@@ -111,8 +111,8 @@ protected:
|
||||
if (dat->ReceivedBYE())
|
||||
return;
|
||||
|
||||
u_int32_t ip;
|
||||
u_int16_t port;
|
||||
uint32_t ip;
|
||||
uint16_t port;
|
||||
|
||||
if (dat->GetRTPDataAddress() != 0)
|
||||
{
|
||||
@@ -122,7 +122,7 @@ protected:
|
||||
}
|
||||
else if (dat->GetRTCPDataAddress() != 0)
|
||||
{
|
||||
const RTPIPv4Address *addr = (const RTPIPv4Address *)(dat->GetRTPDataAddress());
|
||||
const RTPIPv4Address *addr = (const RTPIPv4Address *)(dat->GetRTCPDataAddress());
|
||||
ip = addr->GetIP();
|
||||
port = addr->GetPort()-1;
|
||||
}
|
||||
@@ -150,8 +150,8 @@ int main(void)
|
||||
#endif // WIN32
|
||||
|
||||
MyRTPSession sess;
|
||||
u_int16_t portbase,destport;
|
||||
u_int32_t destip;
|
||||
uint16_t portbase,destport;
|
||||
uint32_t destip;
|
||||
std::string ipstr;
|
||||
int status,i,num;
|
||||
|
||||
|
@@ -92,8 +92,8 @@ int main(void)
|
||||
#endif // WIN32
|
||||
|
||||
MyRTPSession sess;
|
||||
u_int16_t portbase,destport;
|
||||
u_int32_t destip;
|
||||
uint16_t portbase,destport;
|
||||
uint32_t destip;
|
||||
std::string ipstr;
|
||||
int status,i,num;
|
||||
|
||||
|
Reference in New Issue
Block a user