- January 19, 2006
+ March 26, 2006
JRTPLIB ChangeLog
-----------
+ 3.5.2 (March 2006)
+ * Fixed bug in the random number functions which are used with
+ MS Visual Studio 2005. Thanks to Jun Ohasi (jun@jnb.odn.ne.jp)
+ for bringing the incorrect use of rand_s to my attention.
+ * Changed types like u_int32_t to types like uint32_t in the
+ documentation.
+
+ 3.5.1 (March 2006)
+ * Fixed bug in RTCP scheduler. Due to -= operation on an RTPTime
+ instance, an incredibly large scheduling interval could be
+ calculated.
+
+ 3.5.0 (March 2006)
+ * Now, the define RTP_SNPRINTF is used instead of snprintf,
+ _snprintf or _snprintf_s.
+ * In the RTPSources member function MultipleTimeouts, I neglected
+ to call the OnRemoveSource virtual function. Thanks to Adam Love
+ (alove@exceptionalinnovation.com) for bringing this to my attention.
+ * Added a OnSendRTCPCompoundPacket member function to the RTPSession
+ class. Useful for inspecting outgoing data.
+ * Modified the templates somewhat. Should cause less compiler problems
+ this way. Thanks tot Chris Hamilton (chamilton@cs.dal.ca) for
+ providing this solution.
+ * On Win32, if possible the functions rand_s and srand_s are now used.
+
3.4.0 (January 2006)
* Changed u_int32_t like types to uint32_t like types. Thanks to
Panagiotis Issaris (takis.issaris@uhasselt.be) for informing me
------------------------------------------------------------------------------
- January 19, 2006
+ March 26, 2006
- JRTPLIB (v3.4.0)
+ JRTPLIB (v3.5.2)
Developed at the The Expertise Centre for
LIBRARY LOCATION AND CONTACT
============================
+
Normally, you should be able to download the latest version of the library
from this url:
http://research.edm.uhasselt.be/jori/jrtplib/jrtplib.html
ACKNOWLEDGMENT
==============
+
I would like thank the people at the Expertise Centre for Digital Media
for giving me the opportunity to create this rewrite of the library.
Enables support for JThread.
- RTP_SUPPORT_SDESPRIV:
Enables support for RTCP SDES private items.
- - RTP_SUPPORT_INLINETEMPLATEPARAM:
- If set, the compiler should be able to handle an inline
- function as a template parameter.
- RTP_SUPPORT_PROBATION:
If set, a few consecutive RTP packets are needed to validate
a member.
# Define the identity of the package.
PACKAGE=jrtplib
- VERSION=3.4.0
+ VERSION=3.5.2
cat >>confdefs.h <<_ACEOF
RTP_SUPPORT_IPV6MULTICAST="// No IPv6 multicasting support"
RTP_SUPPORT_THREAD="// No support for jthread"
RTP_SUPPORT_SDESPRIV="// No support for SDES PRIV items"
-RTP_SUPPORT_INLINETEMPLATEPARAM="// Compiler doesn't support inline functions as template parameter"
RTP_SUPPORT_PROBATION="// Do not wait for a number of consecutive packets to validate source"
RTP_SUPPORT_GNUDRAND="// Not using drand48_r and srand48_r"
RTP_SUPPORT_RANDR="// Not using rand_r"
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: checking if compiler supports an inline function as a template argument" >&5
-echo $ECHO_N "checking if compiler supports an inline function as a template argument... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
- #include "src/rtphashtable.h"
- inline int GetIndex(const int &elem) { return elem%10; }
-int
-main ()
-{
-
- RTPHashTable<int,GetIndex,10> table;
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_cxx_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
- RTP_SUPPORT_INLINETEMPLATEPARAM="#define RTP_SUPPORT_INLINETEMPLATEPARAM"
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-
-
echo "$as_me:$LINENO: checking if types like uint32_t exist" >&5
echo $ECHO_N "checking if types like uint32_t exist... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF
AC_INIT(configure.in)
-AM_INIT_AUTOMAKE(jrtplib,3.4.0)
+AM_INIT_AUTOMAKE(jrtplib,3.5.2)
RTP_FILIO="// Don't have <sys/filio.h>"
RTP_SOCKIO="// Don't have <sys/sockio.h>"
RTP_SUPPORT_IPV6MULTICAST="// No IPv6 multicasting support"
RTP_SUPPORT_THREAD="// No support for jthread"
RTP_SUPPORT_SDESPRIV="// No support for SDES PRIV items"
-RTP_SUPPORT_INLINETEMPLATEPARAM="// Compiler doesn't support inline functions as template parameter"
RTP_SUPPORT_PROBATION="// Do not wait for a number of consecutive packets to validate source"
RTP_SUPPORT_GNUDRAND="// Not using drand48_r and srand48_r"
RTP_SUPPORT_RANDR="// Not using rand_r"
])
dnl ---------------------------------------------------------------------------
-dnl Check if compiler can handle inline function in template argument
-dnl ---------------------------------------------------------------------------
-
-AC_MSG_CHECKING(if compiler supports an inline function as a template argument)
-AC_TRY_COMPILE([
- #include "src/rtphashtable.h"
- inline int GetIndex(const int &elem) { return elem%10; }],[
- RTPHashTable<int,GetIndex,10> table; ],
- [AC_MSG_RESULT(yes)
- RTP_SUPPORT_INLINETEMPLATEPARAM="#define RTP_SUPPORT_INLINETEMPLATEPARAM"],
- AC_MSG_RESULT(no)
- )
-
-dnl ---------------------------------------------------------------------------
-dnl Check for u_int32_t etc
+dnl Check for uint32_t etc
dnl ---------------------------------------------------------------------------
AC_MSG_CHECKING(if types like uint32_t exist)
\documentclass[12pt,a4paper]{article}
-\newcommand{\jversion}{3.4.0}
+\newcommand{\jversion}{3.5.2}
\newcommand{\headerfile}[1]{\marginpar{\scriptsize Header:\\{\tt #1}}}
\newcommand{\inherits}[1]{\marginpar{\scriptsize Inherits:\\{\tt #1}}}
\newcommand{\Paragraph}[1]{\paragraph{#1}\ \\\addcontentsline{toc}{subsection}{\ \hspace{3cm}\ {#1}}}
\begin{document}
\title{\ \vspace{3.5cm}\ \\{\bf JRTPLIB \jversion}}
\author{Jori Liesenborgs\\{\tt jori@lumumba.uhasselt.be}}
- \date{January 19, 2006\\\vspace{0.5cm}\ \\
+ \date{March 26, 2006\\\vspace{0.5cm}\ \\
{\small{\em Developed at the The Expertise Centre for \\Digital Media (EDM),
a research institute\\of the Hasselt University}\\\ \\
{\tt http://www.edm.uhasselt.be/}\\
Suppose that we want to send our data to a process running on the
same host at port $9000$, we can do the following:
\begin{lstlisting}[frame=tb]{}
-u_int8_t localip[]={127,0,0,1};
+uint8_t localip[]={127,0,0,1};
RTPIPv4Address addr(localip,9000);
status = session.AddDestination(addr);
$0.020$ seconds. We'll also store the current time so we'll know
when one minute has passed.
\begin{lstlisting}[frame=tb]{}
-u_int8_t silencebuffer[160];
+uint8_t silencebuffer[160];
for (int i = 0 ; i < 160 ; i++)
silencebuffer[i] = 128;
and least significant word (LSW) of an NTP timestamp. The
class has the following members:
\begin{itemize}
- \item {\tt RTPNTPTime(u\_int32\_t m, u\_int32\_t l)}\\
+ \item {\tt RTPNTPTime(uint32\_t m, uint32\_t l)}\\
This constructor creates and instance with MSW {\tt m}
and LSW {\tt l}.
- \item {\tt u\_int32\_t GetMSW() const}\\
+ \item {\tt uint32\_t GetMSW() const}\\
Returns the most significant word.
- \item {\tt u\_int32\_t GetLSW() const}\\
+ \item {\tt uint32\_t GetLSW() const}\\
Returns the least significant word.
\end{itemize}
etc. It stores a number of seconds and a number of microseconds and
it has the following interface:
\begin{itemize}
- \item {\tt RTPTime(u\_int32\_t seconds, u\_int32\_t microseconds)}\\
+ \item {\tt RTPTime(uint32\_t seconds, uint32\_t microseconds)}\\
Creates an instance corresponding to {\tt seconds} and
{\tt microseconds}.
\item {\tt RTPTime(double t)}\\
Creates an instance that corresponds to {\tt ntptime}. If
the conversion cannot be made, both the seconds and the
microseconds are set to zero.
- \item {\tt u\_int32\_t GetSeconds() const}\\
+ \item {\tt uint32\_t GetSeconds() const}\\
Returns the number of seconds stored in this instance.
- \item {\tt u\_int32\_t GetMicroSeconds() const}\\
+ \item {\tt uint32\_t GetMicroSeconds() const}\\
Returns the number of microseconds stored in this instance.
\item {\tt double GetDouble() const}\\
Returns the time stored in this instance, expressed in
The {\tt RTPRandom} class can be used to generate random numbers.
It has the following member functions:
\begin{itemize}
- \item {\tt u\_int8\_t GetRandom8()}\\
+ \item {\tt uint8\_t GetRandom8()}\\
Returns a random eight bit value.
- \item {\tt u\_int16\_t GetRandom16()}\\
+ \item {\tt uint16\_t GetRandom16()}\\
Returns a random sixteen bit value.
- \item {\tt u\_int32\_t GetRandom32()}\\
+ \item {\tt uint32\_t GetRandom32()}\\
Returns a random thirty-two bit value.
\item {\tt double GetRandomDouble()}\\
Returns a random number between $0.0$ and $1.0$.
\begin{itemize}
\item {\tt void Clear()}\\
Clears all SDES information.
- \item {\tt int SetCNAME(const u\_int8\_t *s, size\_t l)}\\
+ \item {\tt int SetCNAME(const uint8\_t *s, size\_t l)}\\
Sets the SDES CNAME item to {\tt s} with length {\tt l}.
- \item {\tt int SetName(const u\_int8\_t *s, size\_t l)}\\
+ \item {\tt int SetName(const uint8\_t *s, size\_t l)}\\
Sets the SDES name item to {\tt s} with length {\tt l}.
- \item {\tt int SetEMail(const u\_int8\_t *s, size\_t l)}\\
+ \item {\tt int SetEMail(const uint8\_t *s, size\_t l)}\\
Sets the SDES e-mail item to {\tt s} with length {\tt l}.
- \item {\tt int SetPhone(const u\_int8\_t *s, size\_t l)}\\
+ \item {\tt int SetPhone(const uint8\_t *s, size\_t l)}\\
Sets the SDES phone item to {\tt s} with length {\tt l}.
- \item {\tt int SetLocation(const u\_int8\_t *s, size\_t l)}\\
+ \item {\tt int SetLocation(const uint8\_t *s, size\_t l)}\\
Sets the SDES location item to {\tt s} with length {\tt l}.
- \item {\tt int SetTool(const u\_int8\_t *s, size\_t l)}\\
+ \item {\tt int SetTool(const uint8\_t *s, size\_t l)}\\
Sets the SDES tool item to {\tt s} with length {\tt l}.
- \item {\tt int SetNote(const u\_int8\_t *s, size\_t l)}\\
+ \item {\tt int SetNote(const uint8\_t *s, size\_t l)}\\
Sets the SDES note item to {\tt s} with length {\tt l}.
- \item {\tt u\_int8\_t *GetCNAME(size\_t *len) const}\\
+ \item {\tt uint8\_t *GetCNAME(size\_t *len) const}\\
Returns the SDES CNAME item and stores its length in {\tt len}.
- \item {\tt u\_int8\_t *GetName(size\_t *len) const}\\
+ \item {\tt uint8\_t *GetName(size\_t *len) const}\\
Returns the SDES name item and stores its length in {\tt len}.
- \item {\tt u\_int8\_t *GetEMail(size\_t *len) const}\\
+ \item {\tt uint8\_t *GetEMail(size\_t *len) const}\\
Returns the SDES e-mail item and stores its length in {\tt len}.
- \item {\tt u\_int8\_t *GetPhone(size\_t *len) const}\\
+ \item {\tt uint8\_t *GetPhone(size\_t *len) const}\\
Returns the SDES phone item and stores its length in {\tt len}.
- \item {\tt u\_int8\_t *GetLocation(size\_t *len) const}\\
+ \item {\tt uint8\_t *GetLocation(size\_t *len) const}\\
Returns the SDES location item and stores its length in {\tt len}.
- \item {\tt u\_int8\_t *GetTool(size\_t *len) const}\\
+ \item {\tt uint8\_t *GetTool(size\_t *len) const}\\
Returns the SDES tool item and stores its length in {\tt len}.
- \item {\tt u\_int8\_t *GetNote(size\_t *len) const }\\
+ \item {\tt uint8\_t *GetNote(size\_t *len) const }\\
Returns the SDES note item and stores its length in {\tt len}.
\end{itemize}
If SDES private item support was enabled at compile time, the following
member functions are also available:
\begin{itemize}
- \item {\tt int SetPrivateValue(const u\_int8\_t *prefix, size\_t prefixlen, const u\_int8\_t *value, size\_t valuelen)}\\
+ \item {\tt int SetPrivateValue(const uint8\_t *prefix, size\_t prefixlen, const uint8\_t *value, size\_t valuelen)}\\
Sets the entry for the prefix string specified by {\tt prefix} with
length {\tt prefixlen} to contain the value string specified by
{\tt value} with length {\tt valuelen}. If the maximum allowed
number of prefixes was reached, the error code
{\tt ERR\_\-RTP\_\-SDES\_\-MAX\-PRIV\-ITEMS} is returned.
- \item {\tt int DeletePrivatePrefix(const u\_int8\_t *s, size\_t len)}\\
+ \item {\tt int DeletePrivatePrefix(const uint8\_t *s, size\_t len)}\\
Deletes the entry for the prefix specified by {\tt s} with length
{\tt len}.
\item {\tt void GotoFirstPrivateValue()}\\
Starts the iteration over the stored SDES private item prefixes
and their associated values.
- \item {\tt bool GetNextPrivateValue(u\_int8\_t **prefix, size\_t *prefixlen, u\_int8\_t **value, size\_t *valuelen)}\\
+ \item {\tt bool GetNextPrivateValue(uint8\_t **prefix, size\_t *prefixlen, uint8\_t **value, size\_t *valuelen)}\\
If available, returns {\tt true} and stores the next SDES
private item prefix in {\tt prefix} and its length in
{\tt prefixlen}. The associated value and its length are
then stored in {\tt value} and {\tt valuelen}. Otherwise,
it returns {\tt false}.
- \item {\tt bool GetPrivateValue(const u\_int8\_t *prefix, size\_t prefixlen, u\_int8\_t **value, size\_t *valuelen) const}\\
+ \item {\tt bool GetPrivateValue(const uint8\_t *prefix, size\_t prefixlen, uint8\_t **value, size\_t *valuelen) const}\\
Looks for the entry which corresponds to the SDES private
item prefix {\tt prefix} with length {\tt prefixlen}. If found,
the function returns {\tt true} and stores the associated
an instance of {\tt RTP\-UDPv4\-Trans\-mission\-Info} or {\tt RTP\-UDPv6\-Trans\-mission\-Info}
is returned, depending on the type of the transmitter. The user
has to delete the returned instance when it is no longer needed.
- \item {\tt int GetLocalHostName(u\_int8\_t *buffer, size\_t *bufferlength)}\\
+ \item {\tt int GetLocalHostName(uint8\_t *buffer, size\_t *bufferlength)}\\
Looks up the local host name based upon internal information about
the local host's addresses. This function might take some time
since a DNS query might be done. {\tt bufferlength} should initially
\item {\tt void ResetPacketCount()}\\
The transmitter keeps track of the amount of RTP and RTCP
packets that were sent. This functions resets those counts.
- \item {\tt u\_int32\_t GetNumRTPPacketsSent()}\\
+ \item {\tt uint32\_t GetNumRTPPacketsSent()}\\
Returns the number of RTP packets sent.
- \item {\tt u\_int32\_t GetNumRTCPPacketsSent()}\\
+ \item {\tt uint32\_t GetNumRTCPPacketsSent()}\\
Returns the number of RTCP packets sent.
\item {\tt int AddDestination(const RTPAddress \&addr)}\\
Adds the address specified by {\tt addr} to the list of
By default, the multicast TTL is set to $1$ and the portbase
is set to $5000$. The interface of this class is the following:
\begin{itemize}
- \item {\tt void SetBindIP(u\_int32\_t ip)}\\
+ \item {\tt void SetBindIP(uint32\_t ip)}\\
Sets the IP address which is used to bind the sockets
to {\tt ip}.
- \item {\tt void SetPortbase(u\_int16\_t pbase)}\\
+ \item {\tt void SetPortbase(uint16\_t pbase)}\\
Sets the RTP portbase to {\tt pbase}. This has to be
an even number.
- \item {\tt void SetMulticastTTL(u\_int8\_t mcastTTL)}\\
+ \item {\tt void SetMulticastTTL(uint8\_t mcastTTL)}\\
Sets the multicast TTL to be used to {\tt mcastTTL}.
- \item {\tt void SetLocalIPList(std::list<u\_int32\_t> \&iplist)}\\
+ \item {\tt void SetLocalIPList(std::list<uint32\_t> \&iplist)}\\
Passes a list of IP addresses which will be used as
the local IP addresses.
\item {\tt void ClearLocalIPList()}\\
Clears the list of local IP addresses. An empty list
will make the transmission component itself determine the
local IP addresses.
- \item {\tt u\_int32\_t GetBindIP() const}\\
+ \item {\tt uint32\_t GetBindIP() const}\\
Returns the IP address which will be used to bind the
sockets.
- \item {\tt u\_int16\_t GetPortbase() const}\\
+ \item {\tt uint16\_t GetPortbase() const}\\
Returns the RTP portbase which will be used.
- \item {\tt u\_int8\_t GetMulticastTTL() const}\\
+ \item {\tt uint8\_t GetMulticastTTL() const}\\
Returns the multicast TTL which will be used.
- \item {\tt const std::list<u\_int32\_t> \&GetLocalIPList() const}\\
+ \item {\tt const std::list<uint32\_t> \&GetLocalIPList() const}\\
Returns the list of local IP addresses.
\end{itemize}
\item {\tt void SetBindIP(in6\_addr ip)}\\
Sets the IP address which is used to bind the sockets
to {\tt ip}.
- \item {\tt void SetPortbase(u\_int16\_t pbase)}\\
+ \item {\tt void SetPortbase(uint16\_t pbase)}\\
Sets the RTP portbase to {\tt pbase}. This has to be
an even number.
- \item {\tt void SetMulticastTTL(u\_int8\_t mcastTTL)}\\
+ \item {\tt void SetMulticastTTL(uint8\_t mcastTTL)}\\
Sets the multicast TTL to be used to {\tt mcastTTL}.
\item {\tt void SetLocalIPList(std::list<in6\_addr> \&iplist)}\\
Passes a list of IP addresses which will be used as
\item {\tt in6\_addr GetBindIP() const}\\
Returns the IP address which will be used to bind the
sockets.
- \item {\tt u\_int16\_t GetPortbase() const}\\
+ \item {\tt uint16\_t GetPortbase() const}\\
Returns the RTP portbase which will be used.
- \item {\tt u\_int8\_t GetMulticastTTL() const}\\
+ \item {\tt uint8\_t GetMulticastTTL() const}\\
Returns the multicast TTL which will be used.
\item {\tt const std::list<in6\_addr> \&GetLocalIPList() const}\\
Returns the list of local IP addresses.
information about the UDP over IPv4 transmission component. The
following member functions are available:
\begin{itemize}
- \item {\tt std::list<u\_int32\_t> GetLocalIPList() const}\\
+ \item {\tt std::list<uint32\_t> GetLocalIPList() const}\\
Returns the list of IPv4 addresses the transmitter
considers to be the local IP addresses.
\item {\tt int GetRTPSocket() const}\\
This class is used by the UDP over IPv4 transmission component.
The following member functions are defined in this class:
\begin{itemize}
- \item {\tt RTPIPv4Address(u\_int32\_t ip = 0, u\_int16\_t port = 0)}\\
+ \item {\tt RTPIPv4Address(uint32\_t ip = 0, uint16\_t port = 0)}\\
Creates an instance with IP address {\tt ip} and port number {\tt port}.
Both are interpreted in host byte order.
- \item {\tt RTPIPv4Address(const u\_int8\_t ip[4], u\_int16\_t port = 0)}\\
+ \item {\tt RTPIPv4Address(const uint8\_t ip[4], uint16\_t port = 0)}\\
Creates an instance with IP address {\tt ip} and port {\tt port}.
The port number is interpreted in host byte order.
- \item {\tt void SetIP(u\_int32\_t ip)}\\
+ \item {\tt void SetIP(uint32\_t ip)}\\
Sets the IP address for this instance to {\tt ip} which is
assumed to be in host byte order.
- \item {\tt void SetIP(const u\_int8\_t ip[4])}\\
+ \item {\tt void SetIP(const uint8\_t ip[4])}\\
Sets the IP address of this instance to {\tt ip}.
- \item {\tt void SetPort(u\_int16\_t port)}\\
+ \item {\tt void SetPort(uint16\_t port)}\\
Sets the port number for this instance to {\tt port} which
is interpreted in host byte order.
- \item {\tt u\_int32\_t GetIP() const}\\
+ \item {\tt uint32\_t GetIP() const}\\
Returns the IP address contained in this instance in
host byte order.
- \item {\tt u\_int16\_t GetPort() const}\\
+ \item {\tt uint16\_t GetPort() const}\\
Returns the port number of this instance in host byte
order.
\end{itemize}
\item {\tt RTPIPv6Address()}\\
Creates an instance with IP address and port number set to
zero.
- \item {\tt RTPIPv6Address(const u\_int8\_t ip[16], u\_int16\_t port = 0)}\\
+ \item {\tt RTPIPv6Address(const uint8\_t ip[16], uint16\_t port = 0)}\\
Creates an instance with IP address {\tt ip} and port
number {\tt port}. The port number is assumed to be in
host byte order.
- \item {\tt RTPIPv6Address(in6\_addr ip, u\_int16\_t port = 0)}\\
+ \item {\tt RTPIPv6Address(in6\_addr ip, uint16\_t port = 0)}\\
Creates an instance with IP address {\tt ip} and port
number {\tt port}. The port number is assumed to be in
host byte order.
\item {\tt void SetIP(in6\_addr ip)}\\
Sets the IP address for this instance to {\tt ip}.
- \item {\tt void SetIP(const u\_int8\_t ip[16])}\\
+ \item {\tt void SetIP(const uint8\_t ip[16])}\\
Sets the IP address for this instance to {\tt ip}.
- \item {\tt void SetPort(u\_int16\_t port)}\\
+ \item {\tt void SetPort(uint16\_t port)}\\
Sets the port number for this instance to {\tt port}, which
is interpreted in host byte order.
- \item {\tt void GetIP(u\_int8\_t ip[16]) const}\\
+ \item {\tt void GetIP(uint8\_t ip[16]) const}\\
Copies the IP address of this instance in {\tt ip}.
\item {\tt in6\_addr GetIP() const}\\
Returns the IP address of this instance.
- \item {\tt u\_int16\_t GetPort() const}\\
+ \item {\tt uint16\_t GetPort() const}\\
Returns the port number contained in this instance in
host byte order.
\end{itemize}
to store the incoming RTP and RTCP data in. It has the following
interface:
\begin{itemize}
- \item {\tt RTPRawPacket(u\_int8\_t *data, size\_t datalen, RTPAddress *address, RTPTime \&recvtime, bool rtp)}\\
+ \item {\tt RTPRawPacket(uint8\_t *data, size\_t datalen, RTPAddress *address, RTPTime \&recvtime, bool rtp)}\\
Creates an instance which stores data from {\tt data} with
length {\tt datalen}. Only the pointer to the data is stored,
no actual copy is made! The address from which this packet
the packet was received is set to {\tt recvtime}. The flag
which indicates whether this data is RTP or RTCP data is set
to {\tt rtp}.
- \item {\tt u\_int8\_t *GetData()}\\
+ \item {\tt uint8\_t *GetData()}\\
Returns the pointer to the data which is contained in this
packet.
\item {\tt size\_t GetDataLength() const}\\
\item {\tt RTPPacket(RTPRawPacket \&rawpack)}\\
Creates an RTPPacket instance based upon the data in
{\tt rawpack}.
- \item {\tt RTPPacket(u\_int8\_t payloadtype, const void *payloaddata, size\_t payloadlen, u\_int16\_t seqnr,
- u\_int32\_t timestamp, u\_int32\_t ssrc, bool gotmarker, u\_int8\_t numcsrcs, const u\_int32\_t *csrcs,
- bool gotextension, u\_int16\_t extensionid, u\_int16\_t extensionlen\_numwords, const void *extensiondata,
+ \item {\tt RTPPacket(uint8\_t payloadtype, const void *payloaddata, size\_t payloadlen, uint16\_t seqnr,
+ uint32\_t timestamp, uint32\_t ssrc, bool gotmarker, uint8\_t numcsrcs, const uint32\_t *csrcs,
+ bool gotextension, uint16\_t extensionid, uint16\_t extensionlen\_numwords, const void *extensiondata,
size\_t maxpacksize = 0)}\\
Creates an new buffer for an RTP packet and fills in the fields
according to the specified parameters. If {\tt maxpacksize} is
would exceed {\tt maxpacksize}. The arguments of the constructor
are self-explanatory. Note that the size of a header extension is
specified in a number of $32$-bit words.
- \item {\tt RTPPacket(u\_int8\_t payloadtype, const void *payloaddata, size\_t payloadlen, u\_int16\_t seqnr,
- u\_int32\_t timestamp, u\_int32\_t ssrc, bool gotmarker, u\_int8\_t numcsrcs, const u\_int32\_t *csrcs,
- bool gotextension, u\_int16\_t extensionid, u\_int16\_t extensionlen\_numwords, const void *extensiondata,
+ \item {\tt RTPPacket(uint8\_t payloadtype, const void *payloaddata, size\_t payloadlen, uint16\_t seqnr,
+ uint32\_t timestamp, uint32\_t ssrc, bool gotmarker, uint8\_t numcsrcs, const uint32\_t *csrcs,
+ bool gotextension, uint16\_t extensionid, uint16\_t extensionlen\_numwords, const void *extensiondata,
void *buffer, size\_t buffersize)}\\
Pretty much the same function as the previous one, except that data is stored
in an external buffer {\tt buffer} with buffer size {\tt buffersize}.
otherwise.
\item {\tt int GetCSRCCount() const}\\
Returns the number of CSRCs contained in this packet.
- \item {\tt u\_int32\_t GetCSRC(int num) const}\\
+ \item {\tt uint32\_t GetCSRC(int num) const}\\
Returns a specific CSRC identifier. The parameter {\tt num}
can go from $0$ to {\tt GetCSRCCount()}-$1$.
- \item {\tt u\_int8\_t GetPayloadType() const}\\
+ \item {\tt uint8\_t GetPayloadType() const}\\
Returns the payload type of the packet.
- \item {\tt u\_int32\_t GetExtendedSequenceNumber() const}\\
+ \item {\tt uint32\_t GetExtendedSequenceNumber() const}\\
Returns the extended sequence number of the packet. When
the packet is just received, only the low $16$ bits will
be set. The high $16$ bits can be filled in later.
- \item {\tt u\_int16\_t GetSequenceNumber() const}\\
+ \item {\tt uint16\_t GetSequenceNumber() const}\\
Returns the sequence number of this packet.
- \item {\tt void SetExtendedSequenceNumber(u\_int32\_t seq)}\\
+ \item {\tt void SetExtendedSequenceNumber(uint32\_t seq)}\\
Sets the extended sequence number of this packet to {\tt seq}.
- \item {\tt u\_int32\_t GetTimestamp() const}\\
+ \item {\tt uint32\_t GetTimestamp() const}\\
Returns the timestamp of this packet.
- \item {\tt u\_int32\_t GetSSRC() const}\\
+ \item {\tt uint32\_t GetSSRC() const}\\
Returns the SSRC identifier stored in this packet.
- \item {\tt u\_int8\_t *GetPacketData() const}\\
+ \item {\tt uint8\_t *GetPacketData() const}\\
Returns a pointer to the data of the entire packet.
- \item {\tt u\_int8\_t *GetPayloadData() const}\\
+ \item {\tt uint8\_t *GetPayloadData() const}\\
Returns a pointer to the actual payload data.
\item {\tt size\_t GetPacketLength() const}\\
Returns the length of the entire packet.
\item {\tt size\_t GetPayloadLength() const}\\
Returns the payload length.
- \item {\tt u\_int16\_t GetExtensionID() const}\\
+ \item {\tt uint16\_t GetExtensionID() const}\\
If a header extension is present, this function
returns the extension identifier.
- \item {\tt u\_int8\_t *GetExtensionData() const}\\
+ \item {\tt uint8\_t *GetExtensionData() const}\\
Returns a pointer to the header extension data.
\item {\tt size\_t GetExtensionLength() const}\\
Returns the length of the header extension data.
be parsed, this function returns the error code of
what went wrong. If the packet had an invalid format,
the return value is {\tt ERR\_\-RTP\_\-RTCPCOMPOUND\_\-INVALID\-PACKET}.
- \item {\tt u\_int8\_t *GetCompoundPacketData()}\\
+ \item {\tt uint8\_t *GetCompoundPacketData()}\\
Returns a pointer to the data of the entire RTCP compound packet.
\item {\tt size\_t GetCompoundPacketLength()}\\
Returns the size of the entire RTCP compound packet
\item {\tt RTCPPacket::APP}: indicates an {\tt RTCPAPPPacket} instance
\item {\tt RTCPPacket::Unknown}: indicates an {\tt RTCPUnknownPacket} instance
\end{itemize}
- \item {\tt u\_int8\_t *GetPacketData()}\\
+ \item {\tt uint8\_t *GetPacketData()}\\
Returns a pointer to the data of this RTCP packet.
\item {\tt size\_t GetPacketLength() const}\\
Returns the length of this RTCP packet.
This class describes an RTCP sender report packet. The interface
is the following:
\begin{itemize}
- \item {\tt RTCPSRPacket(u\_int8\_t *data, size\_t datalen)}\\
+ \item {\tt RTCPSRPacket(uint8\_t *data, size\_t datalen)}\\
Creates an instance based on the data in {\tt data} with
length {\tt datalen}. Since the {\tt data} pointer
is referenced inside the class (no copy of the data is
made) one must make sure that the memory it points to is
valid as long as the class instance exists.
- \item {\tt u\_int32\_t GetSenderSSRC() const}\\
+ \item {\tt uint32\_t GetSenderSSRC() const}\\
Returns the SSRC of the participant who sent this packet.
\item {\tt RTPNTPTime GetNTPTimestamp() const}\\
Returns the NTP timestamp contained in the sender report.
- \item {\tt u\_int32\_t GetRTPTimestamp() const}\\
+ \item {\tt uint32\_t GetRTPTimestamp() const}\\
Returns the RTP timestamp contained in the sender report.
- \item {\tt u\_int32\_t GetSenderPacketCount() const}\\
+ \item {\tt uint32\_t GetSenderPacketCount() const}\\
Returns the sender's packet count contained in the
sender report.
- \item {\tt u\_int32\_t GetSenderOctetCount() const}\\
+ \item {\tt uint32\_t GetSenderOctetCount() const}\\
Returns the sender's octet count contained in the sender
report.
\item {\tt int GetReceptionReportCount() const}\\
Returns the number of reception report blocks present
in this packet.
- \item {\tt u\_int32\_t GetSSRC(int index) const}\\
+ \item {\tt uint32\_t GetSSRC(int index) const}\\
Returns the SSRC of the reception report block described
by {\tt index} which may have a value from $0$ to
{\tt GetReceptionReportCount()}-$1$. Note that no
check is performed to see if {\tt index} is valid.
- \item {\tt u\_int8\_t GetFractionLost(int index) const}\\
+ \item {\tt uint8\_t GetFractionLost(int index) const}\\
Returns the `fraction lost' field of the reception
report described by {\tt index} which may have a value
from $0$ to {\tt GetReceptionReportCount()}-$1$. Note that
report block described by {\tt index} which may have a value
from $0$ to {\tt GetReceptionReportCount()}-$1$. Note that
no check is performed to see if {\tt index} is valid.
- \item {\tt u\_int32\_t GetExtendedHighestSequenceNumber(int index) const}\\
+ \item {\tt uint32\_t GetExtendedHighestSequenceNumber(int index) const}\\
Returns the extended highest sequence number of the reception
report block described by {\tt index} which may have a value
from $0$ to {\tt GetReception\-Report\-Count()}-$1$. Note that
no check is performed to see if {\tt index} is valid.
- \item {\tt u\_int32\_t GetJitter(int index) const}\\
+ \item {\tt uint32\_t GetJitter(int index) const}\\
Returns the jitter field of the reception
report block described by {\tt index} which may have a value
from $0$ to {\tt GetReceptionReportCount()}-$1$. Note that
no check is performed to see if {\tt index} is valid.
- \item {\tt u\_int32\_t GetLSR(int index) const}\\
+ \item {\tt uint32\_t GetLSR(int index) const}\\
Returns the LSR field of the reception
report block described by {\tt index} which may have a value
from $0$ to {\tt GetReceptionReportCount()}-$1$. Note that
no check is performed to see if {\tt index} is valid.
- \item {\tt u\_int32\_t GetDLSR(int index) const}\\
+ \item {\tt uint32\_t GetDLSR(int index) const}\\
Returns the DLSR field of the reception
report block described by {\tt index} which may have a value
from $0$ to {\tt GetReceptionReportCount()}-$1$. Note that
This class describes an RTCP receiver report packet. The interface
is the following:
\begin{itemize}
- \item {\tt RTCPRRPacket(u\_int8\_t *data, size\_t datalen)}\\
+ \item {\tt RTCPRRPacket(uint8\_t *data, size\_t datalen)}\\
Creates an instance based on the data in {\tt data} with
length {\tt datalen}. Since the {\tt data} pointer
is referenced inside the class (no copy of the data is
made) one must make sure that the memory it points to is
valid as long as the class instance exists.
- \item {\tt u\_int32\_t GetSenderSSRC() const}\\
+ \item {\tt uint32\_t GetSenderSSRC() const}\\
Returns the SSRC of the participant who sent this packet.
\item {\tt int GetReceptionReportCount() const}\\
Returns the number of reception report blocks present
in this packet.
- \item {\tt u\_int32\_t GetSSRC(int index) const}\\
+ \item {\tt uint32\_t GetSSRC(int index) const}\\
Returns the SSRC of the reception report block described
by {\tt index} which may have a value from $0$ to
{\tt GetReceptionReportCount()}-$1$. Note that no
check is performed to see if {\tt index} is valid.
- \item {\tt u\_int8\_t GetFractionLost(int index) const}\\
+ \item {\tt uint8\_t GetFractionLost(int index) const}\\
Returns the `fraction lost' field of the reception
report described by {\tt index} which may have a value
from $0$ to {\tt GetReceptionReportCount()}-$1$. Note that
report block described by {\tt index} which may have a value
from $0$ to {\tt GetReceptionReportCount()}-$1$. Note that
no check is performed to see if {\tt index} is valid.
- \item {\tt u\_int32\_t GetExtendedHighestSequenceNumber(int index) const}\\
+ \item {\tt uint32\_t GetExtendedHighestSequenceNumber(int index) const}\\
Returns the extended highest sequence number of the reception
report block described by {\tt index} which may have a value
from $0$ to {\tt GetReception\-Report\-Count()}-$1$. Note that
no check is performed to see if {\tt index} is valid.
- \item {\tt u\_int32\_t GetJitter(int index) const}\\
+ \item {\tt uint32\_t GetJitter(int index) const}\\
Returns the jitter field of the reception
report block described by {\tt index} which may have a value
from $0$ to {\tt GetReceptionReportCount()}-$1$. Note that
no check is performed to see if {\tt index} is valid.
- \item {\tt u\_int32\_t GetLSR(int index) const}\\
+ \item {\tt uint32\_t GetLSR(int index) const}\\
Returns the LSR field of the reception
report block described by {\tt index} which may have a value
from $0$ to {\tt GetReceptionReportCount()}-$1$. Note that
no check is performed to see if {\tt index} is valid.
- \item {\tt u\_int32\_t GetDLSR(int index) const}\\
+ \item {\tt uint32\_t GetDLSR(int index) const}\\
Returns the DLSR field of the reception
report block described by {\tt index} which may have a value
from $0$ to {\tt GetReceptionReportCount()}-$1$. Note that
The class interface is the following:
\begin{itemize}
- \item {\tt RTCPSDESPacket(u\_int8\_t *data, size\_t datalen)}\\
+ \item {\tt RTCPSDESPacket(uint8\_t *data, size\_t datalen)}\\
Creates an instance based on the data in {\tt data} with
length {\tt datalen}. Since the {\tt data} pointer
is referenced inside the class (no copy of the data is
Sets the current chunk to the next available chunk.
If no next chunk is present, this function returns
{\tt false}, otherwise it returns {\tt true}.
- \item {\tt u\_int32\_t GetChunkSSRC() const}\\
+ \item {\tt uint32\_t GetChunkSSRC() const}\\
Returns the SSRC identifier of the current chunk.
\item {\tt bool GotoFirstItem()}\\
Starts the iteration over the SDES items in the current
\item {\tt size\_t GetItemLength() const}\\
Returns the item length of the current item in the current
chunk.
- \item {\tt u\_int8\_t *GetItemData()}\\
+ \item {\tt uint8\_t *GetItemData()}\\
Returns the item data of the current item in the current
chunk.
\end{itemize}
\item {\tt size\_t GetPRIVPrefixLength()}\\
Returns the length of the prefix string of the private
item.
- \item {\tt u\_int8\_t *GetPRIVPrefixData()}\\
+ \item {\tt uint8\_t *GetPRIVPrefixData()}\\
Returns the actual data of the prefix string.
\item {\tt size\_t GetPRIVValueLength()}\\
Returns the length of the value string of the private
item.
- \item {\tt u\_int8\_t *GetPRIVValueData()}\\
+ \item {\tt uint8\_t *GetPRIVValueData()}\\
Returns the actual value data of the private item.
\end{itemize}
The class {\tt RTCPAPPPacket} describes an RTCP APP packet.
The following member functions are available:
\begin{itemize}
- \item {\tt RTCPAPPPacket(u\_int8\_t *data, size\_t datalen)}\\
+ \item {\tt RTCPAPPPacket(uint8\_t *data, size\_t datalen)}\\
Creates an instance based on the data in {\tt data} with
length {\tt datalen}. Since the {\tt data} pointer
is referenced inside the class (no copy of the data is
made) one must make sure that the memory it points to is
valid as long as the class instance exists.
- \item {\tt u\_int8\_t GetSubType() const}\\
+ \item {\tt uint8\_t GetSubType() const}\\
Returns the subtype contained in the APP packet.
- \item {\tt u\_int32\_t GetSSRC() const}\\
+ \item {\tt uint32\_t GetSSRC() const}\\
Returns the SSRC of the source which sent this packet.
- \item {\tt u\_int8\_t *GetName()}\\
+ \item {\tt uint8\_t *GetName()}\\
Returns the name contained in the APP packet. This always
consists of four bytes and is not NULL-terminated.
- \item {\tt u\_int8\_t *GetAPPData()}\\
+ \item {\tt uint8\_t *GetAPPData()}\\
Returns a pointer to the actual data.
\item {\tt size\_t GetAPPDataLength() const}\\
Returns the length of the actual data.
An RTCP BYE packet is represented by the class {\tt RTCPBYEPacket}
which has the following member functions:
\begin{itemize}
- \item {\tt RTCPBYEPacket(u\_int8\_t *data, size\_t datalen)}\\
+ \item {\tt RTCPBYEPacket(uint8\_t *data, size\_t datalen)}\\
Creates an instance based on the data in {\tt data} with
length {\tt datalen}. Since the {\tt data} pointer
is referenced inside the class (no copy of the data is
\item {\tt int GetSSRCCount() const}\\
Returns the number of SSRC identifiers present in this
BYE packet.
- \item {\tt u\_int32\_t GetSSRC(int index) const}\\
+ \item {\tt uint32\_t GetSSRC(int index) const}\\
Returns the SSRC described by {\tt index} which may have a value
from $0$ to {\tt GetSSRCCount()}-$1$. Note that
no check is performed to see if {\tt index} is valid.
\item {\tt size\_t GetReasonLength() const}\\
Returns the length of the string which describes why
the source(s) left.
- \item {\tt u\_int8\_t *GetReasonData()}\\
+ \item {\tt uint8\_t *GetReasonData()}\\
Returns the actual reason data.
\end{itemize}
function will trivially return {\tt true}. Only the following
constructor is available:
\begin{itemize}
- \item {\tt RTCPUnknownPacket(u\_int8\_t *data, size\_t datalen)}\\
+ \item {\tt RTCPUnknownPacket(uint8\_t *data, size\_t datalen)}\\
Creates an instance based on the data in {\tt data} with
length {\tt datalen}. Since the {\tt data} pointer
is referenced inside the class (no copy of the data is
\item {\tt int InitBuild(void *externalbuffer, size\_t buffersize)}\\
Starts building a packet. Data will be stored in {\tt externalbuffer} which
can contain {\tt buffersize} bytes.
- \item {\tt int StartSenderReport(u\_int32\_t senderssrc, const RTPNTPTime \&ntptimestamp, u\_int32\_t rtptimestamp,
- u\_int32\_t packetcount, u\_int32\_t octetcount)}\\
+ \item {\tt int StartSenderReport(uint32\_t senderssrc, const RTPNTPTime \&ntptimestamp, uint32\_t rtptimestamp,
+ uint32\_t packetcount, uint32\_t octetcount)}\\
Tells the packet builder that the packet should start with a sender report which
will contain the sender information specified by this function's
arguments. Once the sender report is started, report blocks can be
added using the {\tt AddReportBlock} function.
- \item {\tt int StartReceiverReport(u\_int32\_t senderssrc)}\\
+ \item {\tt int StartReceiverReport(uint32\_t senderssrc)}\\
Tells the packet builder that the packet should start with a receiver report which
will contain the sender SSRC {\tt senderssrc}. Once the sender report is started,
report blocks can be added using the {\tt AddReportBlock} function.
- \item {\tt int AddReportBlock(u\_int32\_t ssrc, u\_int8\_t fractionlost, int32\_t packetslost, u\_int32\_t exthighestseq,
- u\_int32\_t jitter, u\_int32\_t lsr, u\_int32\_t dlsr)}\\
+ \item {\tt int AddReportBlock(uint32\_t ssrc, uint8\_t fractionlost, int32\_t packetslost, uint32\_t exthighestseq,
+ uint32\_t jitter, uint32\_t lsr, uint32\_t dlsr)}\\
Adds the report block information specified by the function's
arguments. If more than 31 report blocks are added, the builder
will automatically use a new RTCP receiver report packet.
- \item {\tt int AddSDESSource(u\_int32\_t ssrc)}\\
+ \item {\tt int AddSDESSource(uint32\_t ssrc)}\\
Starts an SDES chunk for participant {\tt ssrc}.
- \item {\tt int AddSDESNormalItem(RTCPSDESPacket::ItemType t, const void *itemdata, u\_int8\_t itemlength)}\\
+ \item {\tt int AddSDESNormalItem(RTCPSDESPacket::ItemType t, const void *itemdata, uint8\_t itemlength)}\\
Adds a normal (non-private) SDES item of type {\tt t} to the current SDES
chunk. The item's value will have length {\tt itemlength} and will contain
the data {\tt itemdata}.
- \item {\tt int AddBYEPacket(u\_int32\_t *ssrcs, u\_int8\_t numssrcs, const void *reasondata, u\_int8\_t reasonlength)}\\
+ \item {\tt int AddBYEPacket(uint32\_t *ssrcs, uint8\_t numssrcs, const void *reasondata, uint8\_t reasonlength)}\\
Adds a BYE packet to the compound packet. It will contain {\tt numssrcs}
source identifiers specified in {\tt ssrcs} and will indicate
as reason for leaving the string of length {\tt reasonlength}
containing data {\tt reasondata}.
- \item {\tt int AddAPPPacket(u\_int8\_t subtype, u\_int32\_t ssrc, const u\_int8\_t name[4], const void *appdata, size\_t appdatalen)}\\
+ \item {\tt int AddAPPPacket(uint8\_t subtype, uint32\_t ssrc, const uint8\_t name[4], const void *appdata, size\_t appdatalen)}\\
Adds the APP packet specified by the arguments to the
compound packet. Note that {\tt appdatalen} has to be
a multiple of four.
If the library was compiled with SDES private item support, the
following member function is also available:
\begin{itemize}
- \item {\tt int AddSDESPrivateItem(const void *prefixdata, u\_int8\_t prefixlength, const void *valuedata,
- u\_int8\_t valuelength)}\\
+ \item {\tt int AddSDESPrivateItem(const void *prefixdata, uint8\_t prefixlength, const void *valuedata,
+ uint8\_t valuelength)}\\
Adds an SDES PRIV item described by the function's arguments
to the current SDES chunk.
\end{itemize}
enabled at compilation time.
\item {\tt void Clear()}\\
Clears the source table.
- \item {\tt int CreateOwnSSRC(u\_int32\_t ssrc)}\\
+ \item {\tt int CreateOwnSSRC(uint32\_t ssrc)}\\
Creates an entry for our own SSRC identifier.
\item {\tt int DeleteOwnSSRC()}\\
Deletes the entry for our own SSRC identifier.
which was received at time {\tt receivetime} from {\tt
senderaddress}. The {\tt senderaddress} parameter must
be NULL if the packet was sent by the local participant.
- \item {\tt int ProcessRTCPSenderInfo(u\_int32\_t ssrc, const RTPNTPTime \&ntptime, u\_int32\_t rtptime,
- u\_int32\_t packetcount, u\_int32\_t octetcount, const RTPTime \&receivetime,
+ \item {\tt int ProcessRTCPSenderInfo(uint32\_t ssrc, const RTPNTPTime \&ntptime, uint32\_t rtptime,
+ uint32\_t packetcount, uint32\_t octetcount, const RTPTime \&receivetime,
const RTPAddress *senderaddress)}\\
Process the sender information of SSRC {\tt ssrc} into
the source table. The information was received at time
{\tt receivetime} from address {\tt senderaddress}. The
{\tt senderaddress} parameter must be NULL if the packet
was sent by the local participant.
- \item {\tt int ProcessRTCPReportBlock(u\_int32\_t ssrc, u\_int8\_t fractionlost, int32\_t lostpackets,
- u\_int32\_t exthighseqnr, u\_int32\_t jitter, u\_int32\_t lsr,
- u\_int32\_t dlsr, const RTPTime \&receivetime, const RTPAddress *senderaddress)}\\
+ \item {\tt int ProcessRTCPReportBlock(uint32\_t ssrc, uint8\_t fractionlost, int32\_t lostpackets,
+ uint32\_t exthighseqnr, uint32\_t jitter, uint32\_t lsr,
+ uint32\_t dlsr, const RTPTime \&receivetime, const RTPAddress *senderaddress)}\\
Processes the report block information which was sent
by participant {\tt ssrc} into the source table. The
information was received at time {\tt receivetime} from
address {\tt senderaddress}. The {\tt senderaddress}
parameter must be NULL if the packet was sent by the
local participant.
- \item {\tt int ProcessSDESNormalItem(u\_int32\_t ssrc, RTCPSDESPacket::ItemType t, size\_t itemlength,
+ \item {\tt int ProcessSDESNormalItem(uint32\_t ssrc, RTCPSDESPacket::ItemType t, size\_t itemlength,
const void *itemdata, const RTPTime \&receivetime, const RTPAddress *senderaddress)}\\
Processes the non-private SDES item from source {\tt
ssrc} into the source table. The information was
received at time {\tt receivetime} from address {\tt
senderaddress}. The {\tt senderaddress} parameter must
be NULL if the packet was sent by the local participant.
- \item {\tt int ProcessBYE(u\_int32\_t ssrc, size\_t reasonlength, const void *reasondata, const RTPTime \&receivetime,
+ \item {\tt int ProcessBYE(uint32\_t ssrc, size\_t reasonlength, const void *reasondata, const RTPTime \&receivetime,
const RTPAddress *senderaddress)}\\
Processes the BYE message for SSRC {\tt ssrc}. The
information was received at time {\tt receivetime} from
address {\tt senderaddress}. The {\tt senderaddress}
parameter must be NULL if the packet was sent by the
local participant.
- \item {\tt int UpdateReceiveTime(u\_int32\_t ssrc, const RTPTime \&receivetime, const RTPAddress *senderaddress)}\\
+ \item {\tt int UpdateReceiveTime(uint32\_t ssrc, const RTPTime \&receivetime, const RTPAddress *senderaddress)}\\
If we heard from source {\tt ssrc}, but no actual
data was added to the source table (for example, if
no report block was meant for us), this function can
\item {\tt RTPSourceData *GetCurrentSourceInfo()}\\
Returns the {\tt RTPSourceData} instance for the currently
selected participant.
- \item {\tt RTPSourceData *GetSourceInfo(u\_int32\_t ssrc)}\\
+ \item {\tt RTPSourceData *GetSourceInfo(uint32\_t ssrc)}\\
Returns the {\tt RTPSourceData} instance for the participant
identified by {\tt ssrc}, or NULL if no such entry exists.
\item {\tt RTPPacket *GetNextPacket()}\\
Extracts the next packet from the received packets queue
of the current participant.
- \item {\tt bool GotEntry(u\_int32\_t ssrc)}\\
+ \item {\tt bool GotEntry(uint32\_t ssrc)}\\
Returns {\tt true} if an entry for participant {\tt ssrc} exists
and {\tt false} otherwise.
\item {\tt RTPSourceData *GetOwnSourceInfo()}\\
If SDES private item support was enabled at compile-time, the following
member function is also available:
\begin{itemize}
- \item {\tt int ProcessSDESPrivateItem(u\_int32\_t ssrc, size\_t prefixlen, const void *prefixdata,
+ \item {\tt int ProcessSDESPrivateItem(uint32\_t ssrc, size\_t prefixlen, const void *prefixdata,
size\_t valuelen, const void *valuedata, const RTPTime \&receivetime,
const RTPAddress *senderaddress)}\\
Processes the SDES private item from source {\tt ssrc}
addresses and {\tt isrtp} indicates against which address of
{\tt srcdat} the check failed.
\item {\tt void OnCNAMECollision(RTPSourceData *srcdat, const RTPAddress *senderaddress,
- const u\_int8\_t *cname, size\_t cnamelength)}\\
+ const uint8\_t *cname, size\_t cnamelength)}\\
Is called when another CNAME was received than the one
already present for source {\tt srcdat}.
\item {\tt void OnNewSource(RTPSourceData *srcdat)}\\
The {\tt RTPSourceData} class contains all information about a member
of the session. The interface is the following:
\begin{itemize}
- \item {\tt u\_int32\_t GetSSRC() const}\\
+ \item {\tt uint32\_t GetSSRC() const}\\
Returns the SSRC identifier for this member.
\item {\tt bool HasData() const}\\
Returns {\tt true} if there are RTP packets which can be extracted.
\item {\tt bool ReceivedBYE() const}\\
Returns {\tt true} if we received a BYE message for this participant and
{\tt false} otherwise.
- \item {\tt u\_int8\_t *GetBYEReason(size\_t *len) const}\\
+ \item {\tt uint8\_t *GetBYEReason(size\_t *len) const}\\
Returns the reason for leaving contained in the BYE packet of this participant.
The length of the reason is stored in {\tt len}.
\item {\tt RTPTime GetBYETime() const}\\
Returns {\tt true} if an RTCP sender report has been received from this participant.
\item {\tt RTPNTPTime SR\_GetNTPTimestamp() const}\\
Returns the NTP timestamp contained in the last sender report.
- \item {\tt u\_int32\_t SR\_GetRTPTimestamp() const}\\
+ \item {\tt uint32\_t SR\_GetRTPTimestamp() const}\\
Returns the RTP timestamp contained in the last sender report.
- \item {\tt u\_int32\_t SR\_GetPacketCount() const}\\
+ \item {\tt uint32\_t SR\_GetPacketCount() const}\\
Returns the packet count contained in the last sender report.
- \item {\tt u\_int32\_t SR\_GetByteCount() const}\\
+ \item {\tt uint32\_t SR\_GetByteCount() const}\\
Returns the octet count contained in the last sender report.
\item {\tt RTPTime SR\_GetReceiveTime() const}\\
Returns the time at which the last sender report was received.
Returns {\tt true} if more than one RTCP sender report has been received.
\item {\tt RTPNTPTime SR\_Prev\_GetNTPTimestamp() const}\\
Returns the NTP timestamp contained in the second to last sender report.
- \item {\tt u\_int32\_t SR\_Prev\_GetRTPTimestamp() const}\\
+ \item {\tt uint32\_t SR\_Prev\_GetRTPTimestamp() const}\\
Returns the RTP timestamp contained in the second to last sender report.
- \item {\tt u\_int32\_t SR\_Prev\_GetPacketCount() const}\\
+ \item {\tt uint32\_t SR\_Prev\_GetPacketCount() const}\\
Returns the packet count contained in the second to last sender report.
- \item {\tt u\_int32\_t SR\_Prev\_GetByteCount() const}\\
+ \item {\tt uint32\_t SR\_Prev\_GetByteCount() const}\\
Returns the octet count contained in the second to last sender report.
\item {\tt RTPTime SR\_Prev\_GetReceiveTime() const}\\
Returns the time at which the second to last sender report was received.
Returns the fraction lost value from the last report.
\item {\tt int32\_t RR\_GetPacketsLost() const}\\
Returns the number of lost packets contained in the last report.
- \item {\tt u\_int32\_t RR\_GetExtendedHighestSequenceNumber() const}\\
+ \item {\tt uint32\_t RR\_GetExtendedHighestSequenceNumber() const}\\
Returns the extended highest sequence number contained in the last report.
- \item {\tt u\_int32\_t RR\_GetJitter() const}\\
+ \item {\tt uint32\_t RR\_GetJitter() const}\\
Returns the jitter value from the last report.
- \item {\tt u\_int32\_t RR\_GetLastSRTimestamp() const}\\
+ \item {\tt uint32\_t RR\_GetLastSRTimestamp() const}\\
Returns the LSR value from the last report.
- \item {\tt u\_int32\_t RR\_GetDelaySinceLastSR() const}\\
+ \item {\tt uint32\_t RR\_GetDelaySinceLastSR() const}\\
Returns the DLSR value from the last report.
\item {\tt RTPTime RR\_GetReceiveTime() const}\\
Returns the time at which the last report was received.
Returns the fraction lost value from the second to last report.
\item {\tt int32\_t RR\_Prev\_GetPacketsLost() const}\\
Returns the number of lost packets contained in the second to last report.
- \item {\tt u\_int32\_t RR\_Prev\_GetExtendedHighestSequenceNumber() const}\\
+ \item {\tt uint32\_t RR\_Prev\_GetExtendedHighestSequenceNumber() const}\\
Returns the extended highest sequence number contained in the second to last report.
- \item {\tt u\_int32\_t RR\_Prev\_GetJitter() const}\\
+ \item {\tt uint32\_t RR\_Prev\_GetJitter() const}\\
Returns the jitter value from the second to last report.
- \item {\tt u\_int32\_t RR\_Prev\_GetLastSRTimestamp() const}\\
+ \item {\tt uint32\_t RR\_Prev\_GetLastSRTimestamp() const}\\
Returns the LSR value from the second to last report.
- \item {\tt u\_int32\_t RR\_Prev\_GetDelaySinceLastSR() const}\\
+ \item {\tt uint32\_t RR\_Prev\_GetDelaySinceLastSR() const}\\
Returns the DLSR value from the second to last report.
\item {\tt RTPTime RR\_Prev\_GetReceiveTime() const}\\
Returns the time at which the second to last report was received.
participant.
\item {\tt int32\_t INF\_GetNumPacketsReceived() const}\\
Returns the total number of received packets from this participant.
- \item {\tt u\_int32\_t INF\_GetBaseSequenceNumber() const}\\
+ \item {\tt uint32\_t INF\_GetBaseSequenceNumber() const}\\
Returns the base sequence number of this participant.
- \item {\tt u\_int32\_t INF\_GetExtendedHighestSequenceNumber() const}\\
+ \item {\tt uint32\_t INF\_GetExtendedHighestSequenceNumber() const}\\
Returns the extended highest sequence number received from this
participant.
- \item {\tt u\_int32\_t INF\_GetJitter() const}\\
+ \item {\tt uint32\_t INF\_GetJitter() const}\\
Returns the current jitter value for this participant.
\item {\tt RTPTime INF\_GetLastMessageTime() const}\\
Returns the time at which something was last heard from this member.
\item {\tt double INF\_GetEstimatedTimestampUnit() const}\\
Returns the estimated timestamp unit. The estimate is made from two
consecutive sender reports.
- \item {\tt u\_int32\_t INF\_GetNumPacketsReceivedInInterval() const}\\
+ \item {\tt uint32\_t INF\_GetNumPacketsReceivedInInterval() const}\\
Returns the number of packets received since a new interval was
started with {\tt INF\_StartNewInterval}.
- \item {\tt u\_int32\_t INF\_GetSavedExtendedSequenceNumber() const}\\
+ \item {\tt uint32\_t INF\_GetSavedExtendedSequenceNumber() const}\\
Returns the extended sequence number which was stored by the
{\tt INF\_StartNewInterval} call.
\item {\tt void INF\_StartNewInterval()}\\
last receiver report.
\item {\tt RTPTime INF\_GetLastSDESNoteTime() const}\\
Returns the time at which the last SDES NOTE item was received.
- \item {\tt u\_int8\_t *SDES\_GetCNAME(size\_t *len) const}\\
+ \item {\tt uint8\_t *SDES\_GetCNAME(size\_t *len) const}\\
Returns a pointer to the SDES CNAME item of this participant and stores
its length in {\tt len}.
- \item {\tt u\_int8\_t *SDES\_GetName(size\_t *len) const}\\
+ \item {\tt uint8\_t *SDES\_GetName(size\_t *len) const}\\
Returns a pointer to the SDES name item of this participant and stores
its length in {\tt len}.
- \item {\tt u\_int8\_t *SDES\_GetEMail(size\_t *len) const}\\
+ \item {\tt uint8\_t *SDES\_GetEMail(size\_t *len) const}\\
Returns a pointer to the SDES e-mail item of this participant and stores
its length in {\tt len}.
- \item {\tt u\_int8\_t *SDES\_GetPhone(size\_t *len) const}\\
+ \item {\tt uint8\_t *SDES\_GetPhone(size\_t *len) const}\\
Returns a pointer to the SDES phone item of this participant and stores
its length in {\tt len}.
- \item {\tt u\_int8\_t *SDES\_GetLocation(size\_t *len) const}\\
+ \item {\tt uint8\_t *SDES\_GetLocation(size\_t *len) const}\\
Returns a pointer to the SDES location item of this participant and stores
its length in {\tt len}.
- \item {\tt u\_int8\_t *SDES\_GetTool(size\_t *len) const}\\
+ \item {\tt uint8\_t *SDES\_GetTool(size\_t *len) const}\\
Returns a pointer to the SDES tool item of this participant and stores
its length in {\tt len}.
- \item {\tt u\_int8\_t *SDES\_GetNote(size\_t *len) const}\\
+ \item {\tt uint8\_t *SDES\_GetNote(size\_t *len) const}\\
Returns a pointer to the SDES note item of this participant and stores
its length in {\tt len}.
\end{itemize}
\item {\tt void SDES\_GotoFirstPrivateValue()}\\
Starts the iteration over the stored SDES private item prefixes
and their associated values.
- \item {\tt bool SDES\_GetNextPrivateValue(u\_int8\_t **prefix, size\_t *prefixlen, u\_int8\_t **value, size\_t *valuelen) }\\
+ \item {\tt bool SDES\_GetNextPrivateValue(uint8\_t **prefix, size\_t *prefixlen, uint8\_t **value, size\_t *valuelen) }\\
If available, returns {\tt true} and stores the next SDES
private item prefix in {\tt prefix} and its length in
{\tt prefixlen}. The associated value and its length are
then stored in {\tt value} and {\tt valuelen}. Otherwise,
it returns {\tt false}.
- \item {\tt bool SDES\_GetPrivateValue(u\_int8\_t *prefix, size\_t prefixlen, u\_int8\_t **value, size\_t *valuelen) const}\\
+ \item {\tt bool SDES\_GetPrivateValue(uint8\_t *prefix, size\_t prefixlen, uint8\_t **value, size\_t *valuelen) const}\\
Looks for the entry which corresponds to the SDES private
item prefix {\tt prefix} with length {\tt prefixlen}. If found,
the function returns {\tt true} and stores the associated
below {\tt maxpacksize}
\item {\tt void Destroy()}\\
Cleans up the builder.
- \item {\tt u\_int32\_t GetPacketCount()}\\
+ \item {\tt uint32\_t GetPacketCount()}\\
Returns the number of packets which have been created with
the current SSRC identifier.
- \item {\tt u\_int32\_t GetPayloadOctetCount()}\\
+ \item {\tt uint32\_t GetPayloadOctetCount()}\\
Returns the number of payload octets which have been generated
with this SSRC identifier.
\item {\tt int SetMaximumPacketSize(size\_t maxpacksize)}\\
Sets the maximum allowed packet size to {\tt maxpacksize}.
- \item {\tt int AddCSRC(u\_int32\_t csrc)}\\
+ \item {\tt int AddCSRC(uint32\_t csrc)}\\
Adds a CSRC to the CSRC list which will be stored in the
RTP packets.
- \item {\tt int DeleteCSRC(u\_int32\_t csrc)}\\
+ \item {\tt int DeleteCSRC(uint32\_t csrc)}\\
Deletes a CSRC from the list which will be stored in the
RTP packets.
\item {\tt void ClearCSRCList()}\\
used will be those that have been set using the
{\tt SetDefault} functions below.
\item {\tt int BuildPacket(const void *data, size\_t len,
- u\_int8\_t pt, bool mark, u\_int32\_t timestampinc)}\\
+ uint8\_t pt, bool mark, uint32\_t timestampinc)}\\
Builds a packet with payload {\tt data} and payload length
{\tt len}. The payload type will be set to {\tt pt}, the
marker bit to {\tt mark} and after building this packet,
the timestamp will be incremented with {\tt timestamp}.
\item {\tt int BuildPacketEx(const void *data, size\_t len,
- u\_int16\_t hdrextID, const void *hdrextdata, size\_t numhdrextwords)}\\
+ uint16\_t hdrextID, const void *hdrextdata, size\_t numhdrextwords)}\\
Builds a packet with payload {\tt data} and payload length
{\tt len}. The payload type, marker and timestamp increment
used will be those that have been set using the
is given by {\tt numhdrextwords} which expresses the length
in a number of $32$-bit words.
\item {\tt int BuildPacketEx(const void *data, size\_t len,
- u\_int8\_t pt, bool mark, u\_int32\_t timestampinc,
- u\_int16\_t hdrextID, const void *hdrextdata, size\_t numhdrextwords)}\\
+ uint8\_t pt, bool mark, uint32\_t timestampinc,
+ uint16\_t hdrextID, const void *hdrextdata, size\_t numhdrextwords)}\\
Builds a packet with payload {\tt data} and payload
length {\tt len}. The payload type will be set to {\tt
pt}, the marker bit to {\tt mark} and after building
hdrextdata}. The length of the header extension data is
given by {\tt numhdrextwords} which expresses the length
in a number of $32$-bit words.
- \item {\tt u\_int8\_t *GetPacket()}\\
+ \item {\tt uint8\_t *GetPacket()}\\
Returns a pointer to the last built RTP packet data.
\item {\tt size\_t GetPacketLength()}\\
Returns the size of the last built RTP packet.
- \item {\tt int SetDefaultPayloadType(u\_int8\_t pt)}\\
+ \item {\tt int SetDefaultPayloadType(uint8\_t pt)}\\
Sets the default payload type to {\tt pt}.
\item {\tt int SetDefaultMark(bool m)}\\
Sets the default marker bit to {\tt m}.
- \item {\tt int SetDefaultTimestampIncrement(u\_int32\_t timestampinc)}\\
+ \item {\tt int SetDefaultTimestampIncrement(uint32\_t timestampinc)}\\
Sets the default timestamp increment to {\tt timestampinc}.
- \item {\tt int IncrementTimestamp(u\_int32\_t inc)}\\
+ \item {\tt int IncrementTimestamp(uint32\_t inc)}\\
This function increments the timestamp with the amount
given by {\tt inc}. This can be useful if, for example,
a packet was not sent because it contained only silence.
timestamp with the appropriate amount so that the next
packets will still be played at the correct time at
other hosts.
- \item {\tt u\_int32\_t CreateNewSSRC()}\\
+ \item {\tt uint32\_t CreateNewSSRC()}\\
Creates a new SSRC to be used in generated packets. This
will also generate new timestamp and sequence number
offsets.
- \item {\tt u\_int32\_t CreateNewSSRC(RTPSources \&sources)}\\
+ \item {\tt uint32\_t CreateNewSSRC(RTPSources \&sources)}\\
Creates a new SSRC to be used in generated packets. This
will also generate new timestamp and sequence number
offsets. The source table {\tt sources} is used to make
sure that the chosen SSRC isn't used by another participant
yet.
- \item {\tt u\_int32\_t GetSSRC()}\\
+ \item {\tt uint32\_t GetSSRC()}\\
Returns the current SSRC identifier.
- \item {\tt u\_int32\_t GetTimestamp()}\\
+ \item {\tt uint32\_t GetTimestamp()}\\
Returns the current RTP timestamp.
- \item {\tt u\_int16\_t GetSequenceNumber()}\\
+ \item {\tt uint16\_t GetSequenceNumber()}\\
Returns the current sequence number.
\item {\tt RTPTime GetPacketTime()}\\
Returns the time at which a packet was generated. This
is not necessarily the time at which the last RTP packet
was generated: if the timestamp increment was zero, the
time is not updated.
- \item {\tt u\_int32\_t GetPacketTimestamp()}\\
+ \item {\tt uint32\_t GetPacketTimestamp()}\\
Returns the RTP timestamp which corresponds to the time
returned by the previous function.
\end{itemize}
leaving {\tt reason} with length {\tt reasonlength}.
\item {\tt bool IsActive()}\\
Returns whether the session has been created or not.
- \item {\tt u\_int32\_t GetLocalSSRC()}\\
+ \item {\tt uint32\_t GetLocalSSRC()}\\
Returns our own SSRC.
\item {\tt int AddDestination(const RTPAddress \&addr)}\\
Adds {\tt addr} to the list of destinations.
The used payload type, marker and timestamp increment will be those that
have been set using the {\tt SetDefault} member functions.
\item {\tt int SendPacket(const void *data, size\_t len,
- u\_int8\_t pt, bool mark, u\_int32\_t timestampinc)}\\
+ uint8\_t pt, bool mark, uint32\_t timestampinc)}\\
Sends the RTP packet with payload {\tt data} which has length {\tt len}.
It will use payload type {\tt pt}, marker {\tt mark} and after the packet
has been built, the timestamp will be incremented by {\tt timestampinc}.
\item {\tt int SendPacketEx(const void *data, size\_t len,
- u\_int16\_t hdrextID, const void *hdrextdata, size\_t numhdrextwords)}\\
+ uint16\_t hdrextID, const void *hdrextdata, size\_t numhdrextwords)}\\
Sends the RTP packet with payload {\tt data} which has length {\tt len}.
The packet will contain a header extension with identifier {\tt hdrextID} and
containing data {\tt hdrextdata}. The length of this data is given by
The used payload type, marker and timestamp increment will be those that
have been set using the {\tt SetDefault} member functions.
\item {\tt int SendPacketEx(const void *data, size\_t len,
- u\_int8\_t pt, bool mark, u\_int32\_t timestampinc,
- u\_int16\_t hdrextID, const void *hdrextdata, size\_t numhdrextwords)}\\
+ uint8\_t pt, bool mark, uint32\_t timestampinc,
+ uint16\_t hdrextID, const void *hdrextdata, size\_t numhdrextwords)}\\
Sends the RTP packet with payload {\tt data} which has length {\tt len}.
It will use payload type {\tt pt}, marker {\tt mark} and after the packet
has been built, the timestamp will be incremented by {\tt timestampinc}.
The packet will contain a header extension with identifier {\tt hdrextID} and
containing data {\tt hdrextdata}. The length of this data is given by
{\tt numhdrextwords} and is specified in a number of 32-bit words.
- \item {\tt int SetDefaultPayloadType(u\_int8\_t pt)}\\
+ \item {\tt int SetDefaultPayloadType(uint8\_t pt)}\\
Sets the default payload type for RTP packets to {\tt pt}.
\item {\tt int SetDefaultMark(bool m)}\\
Sets the default marker for RTP packets to {\tt m}.
- \item {\tt int SetDefaultTimestampIncrement(u\_int32\_t timestampinc)}\\
+ \item {\tt int SetDefaultTimestampIncrement(uint32\_t timestampinc)}\\
Sets the default value to increment the timestamp with to
{\tt timestampinc}.
- \item {\tt int IncrementTimestamp(u\_int32\_t inc)}\\
+ \item {\tt int IncrementTimestamp(uint32\_t inc)}\\
This function increments the timestamp with the amount
given by {\tt inc}. This can be useful if, for example,
a packet was not sent because it contained only silence.
\item {\tt RTPSourceData *GetCurrentSourceInfo()}\\
Returns the {\tt RTPSourceData} instance for the currently
selected participant.
- \item {\tt RTPSourceData *GetSourceInfo(u\_int32\_t ssrc)}\\
+ \item {\tt RTPSourceData *GetSourceInfo(uint32\_t ssrc)}\\
Returns the {\tt RTPSourceData} instance for the participant
identified by {\tt ssrc}, or NULL if no such entry exists.
\item {\tt RTPPacket *GetNextPacket()}\\
\begin{itemize}
\item {\tt void OnRTPPacket(RTPPacket *pack, const RTPTime \&receivetime,
const RTPAddress *senderaddress)}\\
- Is called when an RTP packet is about to be processed.
+ Is called when an incoming RTP packet is about to be processed.
\item {\tt void OnRTCPCompoundPacket(RTCPCompoundPacket *pack, const RTPTime \&receivetime,
const RTPAddress *senderaddress)}\\
- Is called when an RTCP packet is about to be processed.
+ Is called when an incoming RTCP packet is about to be processed.
\item {\tt void OnSSRCCollision(RTPSourceData *srcdat, const RTPAddress *senderaddress, bool isrtp)}\\
Is called when an SSRC collision was detected. The instance
{\tt srcdat} is the one present in the table, the address
addresses and {\tt isrtp} indicates against which address of
{\tt srcdat} the check failed.
\item {\tt void OnCNAMECollision(RTPSourceData *srcdat, const RTPAddress *senderaddress,
- const u\_int8\_t *cname, size\_t cnamelength)}\\
+ const uint8\_t *cname, size\_t cnamelength)}\\
Is called when another CNAME was received than the one
already present for source {\tt srcdat}.
\item {\tt void OnNewSource(RTPSourceData *srcdat)}\\
\item {\tt void OnNoteTimeout(RTPSourceData *srcdat)}\\
Is called when the SDES NOTE item for source {\tt srcdat}
has been timed out.
+ \item {\tt void OnSendRTCPCompoundPacket(RTCPCompoundPacket *pack)}\\
+ Is called when an RTCP compound packet has just been sent. Useful
+ to inspect outgoing RTCP data.
\item {\tt void OnPollThreadError(int errcode)}\\
Is called when error {\tt errcode} was detected in the
poll thread.
# PROP Intermediate_Dir "Release"\r
# PROP Target_Dir ""\r
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c\r
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\jthread-1.1.2\src" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c\r
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\jthread-1.2.0\src" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c\r
# ADD BASE RSC /l 0x813 /d "NDEBUG"\r
# ADD RSC /l 0x813 /d "NDEBUG"\r
BSC32=bscmake.exe\r
# PROP Intermediate_Dir "Debug"\r
# PROP Target_Dir ""\r
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c\r
-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\jthread-1.1.2\src" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c\r
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\jthread-1.2.0\src" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c\r
# ADD BASE RSC /l 0x813 /d "_DEBUG"\r
# ADD RSC /l 0x813 /d "_DEBUG"\r
BSC32=bscmake.exe\r
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="jrtplib_wce"
- ProjectGUID="{93374307-119F-404E-9B09-3642C6FC96C1}"
- Keyword="Win32Proj"
- SignManifests="true"
- >
- <Platforms>
- <Platform
- Name="Pocket PC 2003 (ARMV4)"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Pocket PC 2003 (ARMV4)"
- OutputDirectory="$(PlatformName)\Debug"
- IntermediateDirectory="$(PlatformName)\Debug"
- ConfigurationType="4"
- CharacterSet="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- ExecutionBucket="7"
- Optimization="0"
- AdditionalIncludeDirectories="../jthread-1.1.2/src"
- PreprocessorDefinitions="_WIN32_WCE=$(CEVER);UNDER_CE=$(CEVER);WINCE;$(PLATFORMDEFINES);_DEBUG;DEBUG;_LIB;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"
- MinimalRebuild="true"
- RuntimeLibrary="1"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG;_UNICODE;UNICODE;_WIN32_WCE;UNDER_CE"
- Culture="1033"
- AdditionalIncludeDirectories="$(IntDir)"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- AdditionalOptions=" /subsystem:windowsce,4.20 /machine:ARM"
- OutputFile="$(OutDir)/jrtplib_wce.lib"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCCodeSignTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- <DeploymentTool
- ForceDirty="-1"
- RemoteDirectory=""
- RegisterOutput="0"
- AdditionalFiles=""
- />
- <DebuggerTool
- />
- </Configuration>
- <Configuration
- Name="Release|Pocket PC 2003 (ARMV4)"
- OutputDirectory="$(PlatformName)\Release"
- IntermediateDirectory="$(PlatformName)\Release"
- ConfigurationType="4"
- CharacterSet="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- ExecutionBucket="7"
- Optimization="2"
- AdditionalIncludeDirectories="../jthread-1.1.2/src"
- PreprocessorDefinitions="_WIN32_WCE=$(CEVER);UNDER_CE=$(CEVER);WINCE;$(PLATFORMDEFINES);NDEBUG;_LIB;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"
- RuntimeLibrary="0"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;_UNICODE;UNICODE;_WIN32_WCE;UNDER_CE"
- Culture="1033"
- AdditionalIncludeDirectories="$(IntDir)"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- AdditionalOptions=" /subsystem:windowsce,4.20 /machine:ARM"
- OutputFile="$(OutDir)/jrtplib_wce.lib"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCCodeSignTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- <DeploymentTool
- ForceDirty="-1"
- RemoteDirectory=""
- RegisterOutput="0"
- AdditionalFiles=""
- />
- <DebuggerTool
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter
- Name="Source Files"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- >
- <File
- RelativePath=".\src\rtcpapppacket.cpp"
- >
- </File>
- <File
- RelativePath=".\src\rtcpbyepacket.cpp"
- >
- </File>
- <File
- RelativePath=".\src\rtcpcompoundpacket.cpp"
- >
- </File>
- <File
- RelativePath=".\src\rtcpcompoundpacketbuilder.cpp"
- >
- </File>
- <File
- RelativePath=".\src\rtcppacket.cpp"
- >
- </File>
- <File
- RelativePath=".\src\rtcppacketbuilder.cpp"
- >
- </File>
- <File
- RelativePath=".\src\rtcprrpacket.cpp"
- >
- </File>
- <File
- RelativePath=".\src\rtcpscheduler.cpp"
- >
- </File>
- <File
- RelativePath=".\src\rtcpsdesinfo.cpp"
- >
- </File>
- <File
- RelativePath=".\src\rtcpsdespacket.cpp"
- >
- </File>
- <File
- RelativePath=".\src\rtcpsrpacket.cpp"
- >
- </File>
- <File
- RelativePath=".\src\rtpcollisionlist.cpp"
- >
- </File>
- <File
- RelativePath=".\src\rtpdebug.cpp"
- >
- </File>
- <File
- RelativePath=".\src\rtperrors.cpp"
- >
- </File>
- <File
- RelativePath=".\src\rtpinternalsourcedata.cpp"
- >
- </File>
- <File
- RelativePath=".\src\rtpipv4address.cpp"
- >
- </File>
- <File
- RelativePath=".\src\rtpipv6address.cpp"
- >
- </File>
- <File
- RelativePath=".\src\rtplibraryversion.cpp"
- >
- </File>
- <File
- RelativePath=".\src\rtppacket.cpp"
- >
- </File>
- <File
- RelativePath=".\src\rtppacketbuilder.cpp"
- >
- </File>
- <File
- RelativePath=".\src\rtppollthread.cpp"
- >
- </File>
- <File
- RelativePath=".\src\rtprandom.cpp"
- >
- </File>
- <File
- RelativePath=".\src\rtpsession.cpp"
- >
- </File>
- <File
- RelativePath=".\src\rtpsessionparams.cpp"
- >
- </File>
- <File
- RelativePath=".\src\rtpsessionsources.cpp"
- >
- </File>
- <File
- RelativePath=".\src\rtpsourcedata.cpp"
- >
- </File>
- <File
- RelativePath=".\src\rtpsources.cpp"
- >
- </File>
- <File
- RelativePath=".\src\rtptimeutilities.cpp"
- >
- </File>
- <File
- RelativePath=".\src\rtpudpv4transmitter.cpp"
- >
- </File>
- <File
- RelativePath=".\src\rtpudpv6transmitter.cpp"
- >
- </File>
- </Filter>
- <Filter
- Name="Header Files"
- Filter="h;hpp;hxx;hm;inl;inc;xsd"
- UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
- >
- <File
- RelativePath=".\src\rtcpapppacket.h"
- >
- </File>
- <File
- RelativePath=".\src\rtcpbyepacket.h"
- >
- </File>
- <File
- RelativePath=".\src\rtcpcompoundpacket.h"
- >
- </File>
- <File
- RelativePath=".\src\rtcpcompoundpacketbuilder.h"
- >
- </File>
- <File
- RelativePath=".\src\rtcppacket.h"
- >
- </File>
- <File
- RelativePath=".\src\rtcppacketbuilder.h"
- >
- </File>
- <File
- RelativePath=".\src\rtcprrpacket.h"
- >
- </File>
- <File
- RelativePath=".\src\rtcpscheduler.h"
- >
- </File>
- <File
- RelativePath=".\src\rtcpsdesinfo.h"
- >
- </File>
- <File
- RelativePath=".\src\rtcpsdespacket.h"
- >
- </File>
- <File
- RelativePath=".\src\rtcpsrpacket.h"
- >
- </File>
- <File
- RelativePath=".\src\rtcpunknownpacket.h"
- >
- </File>
- <File
- RelativePath=".\src\rtpaddress.h"
- >
- </File>
- <File
- RelativePath=".\src\rtpcollisionlist.h"
- >
- </File>
- <File
- RelativePath=".\src\rtpconfig.h"
- >
- </File>
- <File
- RelativePath=".\src\rtpconfig_win.h"
- >
- </File>
- <File
- RelativePath=".\src\rtpdebug.h"
- >
- </File>
- <File
- RelativePath=".\src\rtpdefines.h"
- >
- </File>
- <File
- RelativePath=".\src\rtperrors.h"
- >
- </File>
- <File
- RelativePath=".\src\rtphashtable.h"
- >
- </File>
- <File
- RelativePath=".\src\rtpinternalsourcedata.h"
- >
- </File>
- <File
- RelativePath=".\src\rtpipv4address.h"
- >
- </File>
- <File
- RelativePath=".\src\rtpipv4destination.h"
- >
- </File>
- <File
- RelativePath=".\src\rtpipv6address.h"
- >
- </File>
- <File
- RelativePath=".\src\rtpipv6destination.h"
- >
- </File>
- <File
- RelativePath=".\src\rtpkeyhashtable.h"
- >
- </File>
- <File
- RelativePath=".\src\rtplibraryversion.h"
- >
- </File>
- <File
- RelativePath=".\src\rtppacket.h"
- >
- </File>
- <File
- RelativePath=".\src\rtppacketbuilder.h"
- >
- </File>
- <File
- RelativePath=".\src\rtppollthread.h"
- >
- </File>
- <File
- RelativePath=".\src\rtprandom.h"
- >
- </File>
- <File
- RelativePath=".\src\rtprawpacket.h"
- >
- </File>
- <File
- RelativePath=".\src\rtpsession.h"
- >
- </File>
- <File
- RelativePath=".\src\rtpsessionparams.h"
- >
- </File>
- <File
- RelativePath=".\src\rtpsessionsources.h"
- >
- </File>
- <File
- RelativePath=".\src\rtpsourcedata.h"
- >
- </File>
- <File
- RelativePath=".\src\rtpsources.h"
- >
- </File>
- <File
- RelativePath=".\src\rtpstructs.h"
- >
- </File>
- <File
- RelativePath=".\src\rtptimeutilities.h"
- >
- </File>
- <File
- RelativePath=".\src\rtptransmitter.h"
- >
- </File>
- <File
- RelativePath=".\src\rtptypes.h"
- >
- </File>
- <File
- RelativePath=".\src\rtptypes_win.h"
- >
- </File>
- <File
- RelativePath=".\src\rtpudpv4transmitter.h"
- >
- </File>
- <File
- RelativePath=".\src\rtpudpv6transmitter.h"
- >
- </File>
- </Filter>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
+<?xml version="1.0" encoding="Windows-1252"?>\r
+<VisualStudioProject\r
+ ProjectType="Visual C++"\r
+ Version="8.00"\r
+ Name="jrtplib_wce"\r
+ ProjectGUID="{93374307-119F-404E-9B09-3642C6FC96C1}"\r
+ Keyword="Win32Proj"\r
+ >\r
+ <Platforms>\r
+ <Platform\r
+ Name="Pocket PC 2003 (ARMV4)"\r
+ />\r
+ </Platforms>\r
+ <ToolFiles>\r
+ </ToolFiles>\r
+ <Configurations>\r
+ <Configuration\r
+ Name="Debug|Pocket PC 2003 (ARMV4)"\r
+ OutputDirectory="$(PlatformName)\Debug"\r
+ IntermediateDirectory="$(PlatformName)\Debug"\r
+ ConfigurationType="4"\r
+ CharacterSet="1"\r
+ >\r
+ <Tool\r
+ Name="VCPreBuildEventTool"\r
+ />\r
+ <Tool\r
+ Name="VCCustomBuildTool"\r
+ />\r
+ <Tool\r
+ Name="VCXMLDataGeneratorTool"\r
+ />\r
+ <Tool\r
+ Name="VCWebServiceProxyGeneratorTool"\r
+ />\r
+ <Tool\r
+ Name="VCMIDLTool"\r
+ />\r
+ <Tool\r
+ Name="VCCLCompilerTool"\r
+ ExecutionBucket="7"\r
+ Optimization="0"\r
+ AdditionalIncludeDirectories="../jthread-1.2.0/src"\r
+ PreprocessorDefinitions="_WIN32_WCE=$(CEVER);UNDER_CE=$(CEVER);WINCE;$(PLATFORMDEFINES);_DEBUG;DEBUG;_LIB;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"\r
+ MinimalRebuild="true"\r
+ RuntimeLibrary="3"\r
+ UsePrecompiledHeader="0"\r
+ WarningLevel="3"\r
+ DebugInformationFormat="3"\r
+ />\r
+ <Tool\r
+ Name="VCManagedResourceCompilerTool"\r
+ />\r
+ <Tool\r
+ Name="VCResourceCompilerTool"\r
+ PreprocessorDefinitions="_DEBUG;_UNICODE;UNICODE;_WIN32_WCE;UNDER_CE"\r
+ Culture="1033"\r
+ AdditionalIncludeDirectories="$(IntDir)"\r
+ />\r
+ <Tool\r
+ Name="VCPreLinkEventTool"\r
+ />\r
+ <Tool\r
+ Name="VCLibrarianTool"\r
+ AdditionalOptions=" /subsystem:windowsce,4.20 /machine:ARM"\r
+ OutputFile="$(OutDir)/jrtplib_wce.lib"\r
+ />\r
+ <Tool\r
+ Name="VCALinkTool"\r
+ />\r
+ <Tool\r
+ Name="VCXDCMakeTool"\r
+ />\r
+ <Tool\r
+ Name="VCBscMakeTool"\r
+ />\r
+ <Tool\r
+ Name="VCCodeSignTool"\r
+ />\r
+ <Tool\r
+ Name="VCPostBuildEventTool"\r
+ />\r
+ <DeploymentTool\r
+ ForceDirty="-1"\r
+ RemoteDirectory=""\r
+ RegisterOutput="0"\r
+ AdditionalFiles=""\r
+ />\r
+ <DebuggerTool\r
+ />\r
+ </Configuration>\r
+ <Configuration\r
+ Name="Release|Pocket PC 2003 (ARMV4)"\r
+ OutputDirectory="$(PlatformName)\Release"\r
+ IntermediateDirectory="$(PlatformName)\Release"\r
+ ConfigurationType="4"\r
+ CharacterSet="1"\r
+ >\r
+ <Tool\r
+ Name="VCPreBuildEventTool"\r
+ />\r
+ <Tool\r
+ Name="VCCustomBuildTool"\r
+ />\r
+ <Tool\r
+ Name="VCXMLDataGeneratorTool"\r
+ />\r
+ <Tool\r
+ Name="VCWebServiceProxyGeneratorTool"\r
+ />\r
+ <Tool\r
+ Name="VCMIDLTool"\r
+ />\r
+ <Tool\r
+ Name="VCCLCompilerTool"\r
+ ExecutionBucket="7"\r
+ Optimization="2"\r
+ AdditionalIncludeDirectories="../jthread-1.2.0/src"\r
+ PreprocessorDefinitions="_WIN32_WCE=$(CEVER);UNDER_CE=$(CEVER);WINCE;$(PLATFORMDEFINES);NDEBUG;_LIB;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"\r
+ RuntimeLibrary="2"\r
+ UsePrecompiledHeader="0"\r
+ WarningLevel="3"\r
+ DebugInformationFormat="0"\r
+ />\r
+ <Tool\r
+ Name="VCManagedResourceCompilerTool"\r
+ />\r
+ <Tool\r
+ Name="VCResourceCompilerTool"\r
+ PreprocessorDefinitions="NDEBUG;_UNICODE;UNICODE;_WIN32_WCE;UNDER_CE"\r
+ Culture="1033"\r
+ AdditionalIncludeDirectories="$(IntDir)"\r
+ />\r
+ <Tool\r
+ Name="VCPreLinkEventTool"\r
+ />\r
+ <Tool\r
+ Name="VCLibrarianTool"\r
+ AdditionalOptions=" /subsystem:windowsce,4.20 /machine:ARM"\r
+ OutputFile="$(OutDir)/jrtplib_wce.lib"\r
+ />\r
+ <Tool\r
+ Name="VCALinkTool"\r
+ />\r
+ <Tool\r
+ Name="VCXDCMakeTool"\r
+ />\r
+ <Tool\r
+ Name="VCBscMakeTool"\r
+ />\r
+ <Tool\r
+ Name="VCCodeSignTool"\r
+ />\r
+ <Tool\r
+ Name="VCPostBuildEventTool"\r
+ />\r
+ <DeploymentTool\r
+ ForceDirty="-1"\r
+ RemoteDirectory=""\r
+ RegisterOutput="0"\r
+ AdditionalFiles=""\r
+ />\r
+ <DebuggerTool\r
+ />\r
+ </Configuration>\r
+ </Configurations>\r
+ <References>\r
+ </References>\r
+ <Files>\r
+ <Filter\r
+ Name="Source Files"\r
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
+ >\r
+ <File\r
+ RelativePath=".\src\rtcpapppacket.cpp"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath=".\src\rtcpbyepacket.cpp"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath=".\src\rtcpcompoundpacket.cpp"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath=".\src\rtcpcompoundpacketbuilder.cpp"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath=".\src\rtcppacket.cpp"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath=".\src\rtcppacketbuilder.cpp"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath=".\src\rtcprrpacket.cpp"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath=".\src\rtcpscheduler.cpp"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath=".\src\rtcpsdesinfo.cpp"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath=".\src\rtcpsdespacket.cpp"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath=".\src\rtcpsrpacket.cpp"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath=".\src\rtpcollisionlist.cpp"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath=".\src\rtpdebug.cpp"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath=".\src\rtperrors.cpp"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath=".\src\rtpinternalsourcedata.cpp"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath=".\src\rtpipv4address.cpp"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath=".\src\rtpipv6address.cpp"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath=".\src\rtplibraryversion.cpp"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath=".\src\rtppacket.cpp"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath=".\src\rtppacketbuilder.cpp"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath=".\src\rtppollthread.cpp"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath=".\src\rtprandom.cpp"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath=".\src\rtpsession.cpp"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath=".\src\rtpsessionparams.cpp"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath=".\src\rtpsessionsources.cpp"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath=".\src\rtpsourcedata.cpp"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath=".\src\rtpsources.cpp"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath=".\src\rtptimeutilities.cpp"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath=".\src\rtpudpv4transmitter.cpp"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath=".\src\rtpudpv6transmitter.cpp"\r
+ >\r
+ </File>\r
+ </Filter>\r
+ <Filter\r
+ Name="Header Files"\r
+ Filter="h;hpp;hxx;hm;inl;inc;xsd"\r
+ UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"\r
+ >\r
+ <File\r
+ RelativePath=".\src\rtcpapppacket.h"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath=".\src\rtcpbyepacket.h"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath=".\src\rtcpcompoundpacket.h"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath=".\src\rtcpcompoundpacketbuilder.h"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath=".\src\rtcppacket.h"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath=".\src\rtcppacketbuilder.h"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath=".\src\rtcprrpacket.h"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath=".\src\rtcpscheduler.h"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath=".\src\rtcpsdesinfo.h"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath=".\src\rtcpsdespacket.h"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath=".\src\rtcpsrpacket.h"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath=".\src\rtcpunknownpacket.h"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath=".\src\rtpaddress.h"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath=".\src\rtpcollisionlist.h"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath=".\src\rtpconfig.h"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath=".\src\rtpconfig_win.h"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath=".\src\rtpdebug.h"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath=".\src\rtpdefines.h"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath=".\src\rtperrors.h"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath=".\src\rtphashtable.h"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath=".\src\rtpinternalsourcedata.h"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath=".\src\rtpipv4address.h"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath=".\src\rtpipv4destination.h"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath=".\src\rtpipv6address.h"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath=".\src\rtpipv6destination.h"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath=".\src\rtpkeyhashtable.h"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath=".\src\rtplibraryversion.h"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath=".\src\rtppacket.h"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath=".\src\rtppacketbuilder.h"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath=".\src\rtppollthread.h"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath=".\src\rtprandom.h"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath=".\src\rtprawpacket.h"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath=".\src\rtpsession.h"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath=".\src\rtpsessionparams.h"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath=".\src\rtpsessionsources.h"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath=".\src\rtpsourcedata.h"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath=".\src\rtpsources.h"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath=".\src\rtpstructs.h"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath=".\src\rtptimeutilities.h"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath=".\src\rtptransmitter.h"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath=".\src\rtptypes.h"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath=".\src\rtptypes_win.h"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath=".\src\rtpudpv4transmitter.h"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath=".\src\rtpudpv6transmitter.h"\r
+ >\r
+ </File>\r
+ </Filter>\r
+ </Files>\r
+ <Globals>\r
+ </Globals>\r
+</VisualStudioProject>\r
rtpudpv6transmitter.cpp rtptimeutilities.cpp \
extratransmitters/rtpfaketransmitter.cpp \
pthread/jmutex.cpp pthread/jthread.cpp
-libjrtp_la_LDFLAGS = -release 3.4.0 @RTP_LINKLIBS@
+libjrtp_la_LDFLAGS = -release 3.5.2 @RTP_LINKLIBS@
libjrtpinclude_HEADERS = rtcpapppacket.h rtcpbyepacket.h rtcpcompoundpacket.h \
rtcpcompoundpacketbuilder.h rtcppacket.h rtcppacketbuilder.h \
rtcprrpacket.h rtcpscheduler.h rtcpsdesinfo.h rtcpsdespacket.h \
rtpcollisionlist.h rtpipv6address.h rtpipv6destination.h \
rtpudpv6transmitter.h rtptypes.h rtptypes_unix.h \
extratransmitters/rtpfaketransmitter.h \
- jmutex.h jthread.h jrtp4c.h
+ jmutex.h jthread.h jrtp4c.h jmutexautolock.h
EXTRA_DIST = rtpconfig_unix.h.in win32/jthread.cpp win32/jmutex.cpp
libjrtpincludedir = ${includedir}/jrtplib3
extratransmitters/rtpfaketransmitter.cpp \
pthread/jmutex.cpp pthread/jthread.cpp
-libjrtp_la_LDFLAGS = -release 3.4.0 @RTP_LINKLIBS@
+libjrtp_la_LDFLAGS = -release 3.5.2 @RTP_LINKLIBS@
libjrtpinclude_HEADERS = rtcpapppacket.h rtcpbyepacket.h rtcpcompoundpacket.h \
rtcpcompoundpacketbuilder.h rtcppacket.h rtcppacketbuilder.h \
rtcprrpacket.h rtcpscheduler.h rtcpsdesinfo.h rtcpsdespacket.h \
rtpcollisionlist.h rtpipv6address.h rtpipv6destination.h \
rtpudpv6transmitter.h rtptypes.h rtptypes_unix.h \
extratransmitters/rtpfaketransmitter.h \
- jmutex.h jthread.h jrtp4c.h
+ jmutex.h jthread.h jrtp4c.h jmutexautolock.h
EXTRA_DIST = rtpconfig_unix.h.in win32/jthread.cpp win32/jmutex.cpp
libjrtpincludedir = ${includedir}/jrtplib3
This file is a part of the JThread package, which contains some object-
oriented thread wrappers for different thread implementations.
- Copyright (c) 2000-2005 Jori Liesenborgs (jori@lumumba.uhasselt.be)
+ Copyright (c) 2000-2006 Jori Liesenborgs (jori@lumumba.uhasselt.be)
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"),
#define JMUTEX_H
#if (defined(WIN32) || defined(_WIN32_WCE))
-
#ifndef _WIN32_WCE
#include <process.h>
#endif // _WIN32_WCE
#include <winsock2.h>
#include <windows.h>
+
+ //#define JMUTEX_CRITICALSECTION
#else // using pthread
#include <pthread.h>
#endif // WIN32
#define ERR_JMUTEX_ALREADYINIT -1
-#define ERR_JMUTEX_NOTINIT -2
+#define ERR_JMUTEX_NOTINIT -2
#define ERR_JMUTEX_CANTCREATEMUTEX -3
class JMutex
bool IsInitialized() { return initialized; }
private:
#if (defined(WIN32) || defined(_WIN32_WCE))
+#ifdef JMUTEX_CRITICALSECTION
+ CRITICAL_SECTION mutex;
+#else // Use standard mutex
HANDLE mutex;
+#endif // JMUTEX_CRITICALSECTION
#else // pthread mutex
pthread_mutex_t mutex;
#endif // WIN32
--- /dev/null
+/*
+
+ This file is a part of the JThread package, which contains some object-
+ oriented thread wrappers for different thread implementations.
+
+ Copyright (c) 2000-2006 Jori Liesenborgs (jori@lumumba.uhasselt.be)
+
+ Permission is hereby granted, free of charge, to any person obtaining a
+ copy of this software and associated documentation files (the "Software"),
+ to deal in the Software without restriction, including without limitation
+ the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ and/or sell copies of the Software, and to permit persons to whom the
+ Software is furnished to do so, subject to the following conditions:
+
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ DEALINGS IN THE SOFTWARE.
+
+*/
+
+#ifndef JMUTEXAUTOLOCK_H
+
+#define JMUTEXAUTOLOCK_H
+
+#include "jmutex.h"
+
+class JMutexAutoLock
+{
+public:
+ JMutexAutoLock(JMutex &m) : mutex(m) { mutex.Lock(); }
+ ~JMutexAutoLock() { mutex.Unlock(); }
+private:
+ JMutex &mutex;
+};
+
+#endif // JMUTEXAUTOLOCK_H
This file is a part of the JThread package, which contains some object-
oriented thread wrappers for different thread implementations.
- Copyright (c) 2000-2005 Jori Liesenborgs (jori@lumumba.uhasselt.be)
+ Copyright (c) 2000-2006 Jori Liesenborgs (jori@lumumba.uhasselt.be)
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"),
This file is a part of the JThread package, which contains some object-
oriented thread wrappers for different thread implementations.
- Copyright (c) 2000-2005 Jori Liesenborgs (jori@lumumba.uhasselt.be)
+ Copyright (c) 2000-2006 Jori Liesenborgs (jori@lumumba.uhasselt.be)
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"),
This file is a part of the JThread package, which contains some object-
oriented thread wrappers for different thread implementations.
- Copyright (c) 2000-2005 Jori Liesenborgs (jori@lumumba.uhasselt.be)
+ Copyright (c) 2000-2006 Jori Liesenborgs (jori@lumumba.uhasselt.be)
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"),
*/
#include "jthread.h"
+#include <sys/time.h>
+#include <time.h>
#include <stdlib.h>
JThread::JThread()
while (!running)
{
runningmutex.Unlock();
+
+ struct timespec req,rem;
+
+ req.tv_sec = 0;
+ req.tv_nsec = 1000000;
+ nanosleep(&req,&rem);
+
runningmutex.Lock();
}
runningmutex.Unlock();
RTCPSDESHeader *sdeshdr = (RTCPSDESHeader *)(buf);
- sdeshdr->id = itemid;
+ sdeshdr->sdesid = itemid;
sdeshdr->length = itemlength;
if (itemlength != 0)
memcpy((buf + sizeof(RTCPSDESHeader)),itemdata,(size_t)itemlength);
RTCPSDESHeader *sdeshdr = (RTCPSDESHeader *)(buf);
- sdeshdr->id = RTCP_SDES_ID_PRIVATE;
+ sdeshdr->sdesid = RTCP_SDES_ID_PRIVATE;
sdeshdr->length = itemlength;
buf[sizeof(RTCPSDESHeader)] = prefixlength;
RTPTime currenttime = RTPTime::CurrentTime();
+// // TODO: for debugging
+// double diff = nextrtcptime.GetDouble() - currenttime.GetDouble();
+//
+// std::cout << "Delay till next RTCP interval: " << diff << std::endl;
+
if (currenttime < nextrtcptime) // timer has not yet expired
return false;
else
checktime = CalculateBYETransmissionInterval();
+// std::cout << "Calculated checktime: " << checktime.GetDouble() << std::endl;
+
checktime += prevrtcptime;
if (checktime <= currenttime) // Okay
CalculateNextRTCPTime();
return true;
}
+
+// std::cout << "New delay: " << nextrtcptime.GetDouble() - currenttime.GetDouble() << std::endl;
nextrtcptime = checktime;
pmembers = sources.GetActiveMemberCount();
int numsenders = sources.GetSenderCount();
int numtotal = sources.GetActiveMemberCount();
+// std::cout << "CalculateDeterministicInterval" << std::endl;
+// std::cout << " numsenders: " << numsenders << std::endl;
+// std::cout << " numtotal: " << numtotal << std::endl;
+
// Try to avoid division by zero:
if (numtotal == 0)
numtotal++;
double ntimesC = n*C;
double Td = (tmin>ntimesC)?tmin:ntimesC;
+ // TODO: for debugging
+// std::cout << " Td: " << Td << std::endl;
+
return RTPTime(Td);
}
RTPTime Td = CalculateDeterministicInterval(sender);
double td,mul,T;
+// std::cout << "CalculateTransmissionInterval" << std::endl;
+
td = Td.GetDouble();
mul = rtprand.GetRandomDouble()+0.5; // gives random value between 0.5 and 1.5
T = (td*mul)/1.21828; // see RFC 3550 p 30
+// std::cout << " Td: " << td << std::endl;
+// std::cout << " mul: " << mul << std::endl;
+// std::cout << " T: " << T << std::endl;
+
return RTPTime(T);
}
RTPTime tc = RTPTime::CurrentTime();
RTPTime tn_min_tc = nextrtcptime;
- tn_min_tc -= tc;
+
+ if (tn_min_tc > tc)
+ tn_min_tc -= tc;
+ else
+ tn_min_tc = RTPTime(0,0);
+
+// std::cout << "+tn_min_tc0 " << nextrtcptime.GetDouble()-tc.GetDouble() << std::endl;
+// std::cout << "-tn_min_tc0 " << -nextrtcptime.GetDouble()+tc.GetDouble() << std::endl;
+// std::cout << "tn_min_tc " << tn_min_tc.GetDouble() << std::endl;
+
RTPTime tc_min_tp = tc;
- tc_min_tp -= prevrtcptime;
+
+ if (tc_min_tp > prevrtcptime)
+ tc_min_tp -= prevrtcptime;
+ else
+ tc_min_tp = 0;
if (pmembers == 0) // avoid division by zero
pmembers++;
return;
RTCPSDESHeader *sdeshdr = (RTCPSDESHeader *)(chunk+chunkoffset);
- if (sdeshdr->id == 0) // end of item list
+ if (sdeshdr->sdesid == 0) // end of item list
{
len--;
chunkoffset++;
size_t offset = sizeof(uint32_t);
RTCPSDESHeader *sdeshdr = (RTCPSDESHeader *)(currentchunk+sizeof(uint32_t));
- while (sdeshdr->id != 0)
+ while (sdeshdr->sdesid != 0)
{
offset += sizeof(RTCPSDESHeader);
offset += (size_t)(sdeshdr->length);
return false;
itemoffset = sizeof(uint32_t);
RTCPSDESHeader *sdeshdr = (RTCPSDESHeader *)(currentchunk+itemoffset);
- if (sdeshdr->id == 0)
+ if (sdeshdr->sdesid == 0)
return false;
return true;
}
return false;
RTCPSDESHeader *sdeshdr = (RTCPSDESHeader *)(currentchunk+itemoffset);
- if (sdeshdr->id == 0)
+ if (sdeshdr->sdesid == 0)
return false;
size_t offset = itemoffset;
offset += sizeof(RTCPSDESHeader);
offset += (size_t)(sdeshdr->length);
sdeshdr = (RTCPSDESHeader *)(currentchunk+offset);
- if (sdeshdr->id == 0)
+ if (sdeshdr->sdesid == 0)
return false;
itemoffset = offset;
return true;
if (currentchunk == 0)
return None;
RTCPSDESHeader *sdeshdr = (RTCPSDESHeader *)(currentchunk+itemoffset);
- switch (sdeshdr->id)
+ switch (sdeshdr->sdesid)
{
case 0:
return None;
if (currentchunk == 0)
return None;
RTCPSDESHeader *sdeshdr = (RTCPSDESHeader *)(currentchunk+itemoffset);
- if (sdeshdr->id == 0)
+ if (sdeshdr->sdesid == 0)
return 0;
return (size_t)(sdeshdr->length);
}
if (currentchunk == 0)
return 0;
RTCPSDESHeader *sdeshdr = (RTCPSDESHeader *)(currentchunk+itemoffset);
- if (sdeshdr->id == 0)
+ if (sdeshdr->sdesid == 0)
return 0;
return (currentchunk+itemoffset+sizeof(RTCPSDESHeader));
}
if (currentchunk == 0)
return 0;
RTCPSDESHeader *sdeshdr = (RTCPSDESHeader *)(currentchunk+itemoffset);
- if (sdeshdr->id != RTCP_SDES_ID_PRIVATE)
+ if (sdeshdr->sdesid != RTCP_SDES_ID_PRIVATE)
return 0;
if (sdeshdr->length == 0)
return 0;
if (currentchunk == 0)
return 0;
RTCPSDESHeader *sdeshdr = (RTCPSDESHeader *)(currentchunk+itemoffset);
- if (sdeshdr->id != RTCP_SDES_ID_PRIVATE)
+ if (sdeshdr->sdesid != RTCP_SDES_ID_PRIVATE)
return 0;
if (sdeshdr->length == 0)
return 0;
if (currentchunk == 0)
return 0;
RTCPSDESHeader *sdeshdr = (RTCPSDESHeader *)(currentchunk+itemoffset);
- if (sdeshdr->id != RTCP_SDES_ID_PRIVATE)
+ if (sdeshdr->sdesid != RTCP_SDES_ID_PRIVATE)
return 0;
if (sdeshdr->length == 0)
return 0;
if (currentchunk == 0)
return 0;
RTCPSDESHeader *sdeshdr = (RTCPSDESHeader *)(currentchunk+itemoffset);
- if (sdeshdr->id != RTCP_SDES_ID_PRIVATE)
+ if (sdeshdr->sdesid != RTCP_SDES_ID_PRIVATE)
return 0;
if (sdeshdr->length == 0)
return 0;
#define RTCP_DEFAULTIMMEDIATEBYE true
#define RTCP_DEFAULTSRBYE true
+#if (defined(WIN32) || defined(_WIN32_WCE))
+ #if (!defined(_WIN32_WCE)) && (defined(_MSC_VER) && _MSC_VER >= 1400 )
+ #define RTP_SNPRINTF _snprintf_s
+ #else
+ #define RTP_SNPRINTF _snprintf
+ #endif
+#else
+ #define RTP_SNPRINTF snprintf
+#endif // WIN32 || _WIN32_WCE
+
#endif // RTPDEFINES_H
+
*/
#include "rtperrors.h"
+#include "rtpdefines.h"
#include "rtpdebug.h"
return std::string(ErrorDescriptions[i].description);
i++;
}
+
char str[16];
-#if defined(WIN32) || defined(_WIN32_WCE)
- _snprintf(str,16,"(%d)",errcode);
-#else
- snprintf(str,16,"(%d)",errcode);
-#endif // WIN32 || _WIN32_WCE
+
+ RTP_SNPRINTF(str,16,"(%d)",errcode);
+
return std::string("Unknown error code") + std::string(str);
}
#include <iostream>
#endif // RTPDEBUG
-template<class Element,int GetIndex(const Element &k),int hashsize>
+//template<class Element,int GetIndex(const Element &k),int hashsize>
+template<class Element,class GetIndex,int hashsize>
class RTPHashTable
{
public:
HashElement *curhashelem;
};
-template<class Element,int GetIndex(const Element &e),int hashsize>
+template<class Element,class GetIndex,int hashsize>
inline RTPHashTable<Element,GetIndex,hashsize>::RTPHashTable()
{
for (int i = 0 ; i < hashsize ; i++)
lasthashelem = 0;
}
-template<class Element,int GetIndex(const Element &e),int hashsize>
+template<class Element,class GetIndex,int hashsize>
inline int RTPHashTable<Element,GetIndex,hashsize>::DeleteCurrentElement()
{
if (curhashelem)
return 0;
}
-template<class Element,int GetIndex(const Element &e),int hashsize>
+template<class Element,class GetIndex,int hashsize>
inline int RTPHashTable<Element,GetIndex,hashsize>::GotoElement(const Element &e)
{
int index;
bool found;
- index = GetIndex(e);
+ index = GetIndex::GetIndex(e);
if (index >= hashsize)
return ERR_RTP_HASHTABLE_FUNCTIONRETURNEDINVALIDHASHINDEX;
return 0;
}
-template<class Element,int GetIndex(const Element &e),int hashsize>
+template<class Element,class GetIndex,int hashsize>
inline bool RTPHashTable<Element,GetIndex,hashsize>::HasElement(const Element &e)
{
int index;
bool found;
HashElement *tmp;
- index = GetIndex(e);
+ index = GetIndex::GetIndex(e);
if (index >= hashsize)
return false;
return found;
}
-template<class Element,int GetIndex(const Element &e),int hashsize>
+template<class Element,class GetIndex,int hashsize>
inline void RTPHashTable<Element,GetIndex,hashsize>::GotoNextElement()
{
if (curhashelem)
curhashelem = curhashelem->listnext;
}
-template<class Element,int GetIndex(const Element &e),int hashsize>
+template<class Element,class GetIndex,int hashsize>
inline void RTPHashTable<Element,GetIndex,hashsize>::GotoPreviousElement()
{
if (curhashelem)
curhashelem = curhashelem->listprev;
}
-template<class Element,int GetIndex(const Element &e),int hashsize>
+template<class Element,class GetIndex,int hashsize>
inline void RTPHashTable<Element,GetIndex,hashsize>::Clear()
{
HashElement *tmp1,*tmp2;
lasthashelem = 0;
}
-template<class Element,int GetIndex(const Element &e),int hashsize>
+template<class Element,class GetIndex,int hashsize>
inline int RTPHashTable<Element,GetIndex,hashsize>::AddElement(const Element &elem)
{
int index;
bool found;
HashElement *e,*newelem;
- index = GetIndex(elem);
+ index = GetIndex::GetIndex(elem);
if (index >= hashsize)
return ERR_RTP_HASHTABLE_FUNCTIONRETURNEDINVALIDHASHINDEX;
return 0;
}
-template<class Element,int GetIndex(const Element &e),int hashsize>
+template<class Element,class GetIndex,int hashsize>
inline int RTPHashTable<Element,GetIndex,hashsize>::DeleteElement(const Element &elem)
{
int status;
}
#ifdef RTPDEBUG
-template<class Element,int GetIndex(const Element &e),int hashsize>
+template<class Element,class GetIndex,int hashsize>
inline void RTPHashTable<Element,GetIndex,hashsize>::Dump()
{
HashElement *e;
return 0;
}
-int RTPInternalSourceData::ProcessSDESItem(uint8_t id,const uint8_t *data,size_t itemlen,const RTPTime &receivetime,bool *cnamecollis)
+int RTPInternalSourceData::ProcessSDESItem(uint8_t sdesid,const uint8_t *data,size_t itemlen,const RTPTime &receivetime,bool *cnamecollis)
{
*cnamecollis = false;
stats.SetLastMessageTime(receivetime);
- switch(id)
+ switch(sdesid)
{
case RTCP_SDES_ID_CNAME:
{
uint32_t jitter,uint32_t lsr,uint32_t dlsr,
const RTPTime &receivetime) { RRprevinf = RRinf; RRinf.Set(fractionlost,lostpackets,exthighseqnr,jitter,lsr,dlsr,receivetime); stats.SetLastMessageTime(receivetime); }
void UpdateMessageTime(const RTPTime &receivetime) { stats.SetLastMessageTime(receivetime); }
- int ProcessSDESItem(uint8_t id,const uint8_t *data,size_t itemlen,const RTPTime &receivetime,bool *cnamecollis);
+ int ProcessSDESItem(uint8_t sdesid,const uint8_t *data,size_t itemlen,const RTPTime &receivetime,bool *cnamecollis);
#ifdef RTP_SUPPORT_SDESPRIV
int ProcessPrivateSDESItem(const uint8_t *prefix,size_t prefixlen,const uint8_t *value,size_t valuelen,const RTPTime &receivetime);
#endif // RTP_SUPPORT_SDESPRIV
#include "rtpipv4address.h"
#ifdef RTPDEBUG
+ #include "rtpdefines.h"
#include <stdio.h>
#endif // RTPDEBUG
{
char str[24];
- snprintf(str,24,"%d.%d.%d.%d:%d",(int)((ip>>24)&0xFF),(int)((ip>>16)&0xFF),(int)((ip>>8)&0xFF),
+ RTP_SNPRINTF(str,24,"%d.%d.%d.%d:%d",(int)((ip>>24)&0xFF),(int)((ip>>16)&0xFF),(int)((ip>>8)&0xFF),
(int)(ip&0xFF),(int)port);
return std::string(str);
}
#include <netinet/in.h>
#endif // WIN32
#ifdef RTPDEBUG
+ #include "rtpdefines.h"
#include <stdio.h>
#include <string>
#endif // RTPDEBUG
uint32_t ip = ipaddr_hbo;
uint16_t portbase = ntohs(rtpport_nbo);
- snprintf(str,24,"%d.%d.%d.%d:%d",(int)((ip>>24)&0xFF),(int)((ip>>16)&0xFF),(int)((ip>>8)&0xFF),(int)(ip&0xFF),(int)(portbase));
+ RTP_SNPRINTF(str,24,"%d.%d.%d.%d:%d",(int)((ip>>24)&0xFF),(int)((ip>>16)&0xFF),(int)((ip>>8)&0xFF),(int)(ip&0xFF),(int)(portbase));
return std::string(str);
}
#endif // RTPDEBUG
#ifdef RTP_SUPPORT_IPV6
#ifdef RTPDEBUG
+ #include "rtpdefines.h"
#include <stdio.h>
#endif // RTPDEBUG
ip16[j] |= ((uint16_t)ip.s6_addr[i+1]);
}
- snprintf(str,48,"%04X:%04X:%04X:%04X:%04X:%04X:%04X:%04X/%d",(int)ip16[0],(int)ip16[1],(int)ip16[2],(int)ip16[3],(int)ip16[4],(int)ip16[5],(int)ip16[6],(int)ip16[7],(int)port);
+ RTP_SNPRINTF(str,48,"%04X:%04X:%04X:%04X:%04X:%04X:%04X:%04X/%d",(int)ip16[0],(int)ip16[1],(int)ip16[2],(int)ip16[3],(int)ip16[4],(int)ip16[5],(int)ip16[6],(int)ip16[7],(int)port);
return std::string(str);
}
#endif // RTPDEBUG
#include <netinet/in.h>
#endif // WIN32
#ifdef RTPDEBUG
+ #include "rtpdefines.h"
#include <stdio.h>
#include <string>
#endif // RTPDEBUG
uint16_t portbase = ntohs(rtpport_nbo);
int i,j;
for (i = 0,j = 0 ; j < 8 ; j++,i += 2) { ip16[j] = (((uint16_t)ip.s6_addr[i])<<8); ip16[j] |= ((uint16_t)ip.s6_addr[i+1]); }
- snprintf(str,48,"%04X:%04X:%04X:%04X:%04X:%04X:%04X:%04X/%d",(int)ip16[0],(int)ip16[1],(int)ip16[2],(int)ip16[3],(int)ip16[4],(int)ip16[5],(int)ip16[6],(int)ip16[7],(int)portbase);
+ RTP_SNPRINTF(str,48,"%04X:%04X:%04X:%04X:%04X:%04X:%04X:%04X/%d",(int)ip16[0],(int)ip16[1],(int)ip16[2],(int)ip16[3],(int)ip16[4],(int)ip16[5],(int)ip16[6],(int)ip16[7],(int)portbase);
return std::string(str);
}
#endif // RTPDEBUG
#include <iostream>
#endif // RTPDEBUG
-template<class Key,class Element,int GetIndex(const Key &k),int hashsize>
+template<class Key,class Element,class GetIndex,int hashsize>
class RTPKeyHashTable
{
public:
HashElement *curhashelem;
};
-template<class Key,class Element,int GetIndex(const Key &k),int hashsize>
+template<class Key,class Element,class GetIndex,int hashsize>
inline RTPKeyHashTable<Key,Element,GetIndex,hashsize>::RTPKeyHashTable()
{
for (int i = 0 ; i < hashsize ; i++)
lasthashelem = 0;
}
-template<class Key,class Element,int GetIndex(const Key &k),int hashsize>
+template<class Key,class Element,class GetIndex,int hashsize>
inline int RTPKeyHashTable<Key,Element,GetIndex,hashsize>::DeleteCurrentElement()
{
if (curhashelem)
return 0;
}
-template<class Key,class Element,int GetIndex(const Key &k),int hashsize>
+template<class Key,class Element,class GetIndex,int hashsize>
inline int RTPKeyHashTable<Key,Element,GetIndex,hashsize>::GotoElement(const Key &k)
{
int index;
bool found;
- index = GetIndex(k);
+ index = GetIndex::GetIndex(k);
if (index >= hashsize)
return ERR_RTP_KEYHASHTABLE_FUNCTIONRETURNEDINVALIDHASHINDEX;
return 0;
}
-template<class Key,class Element,int GetIndex(const Key &k),int hashsize>
+template<class Key,class Element,class GetIndex,int hashsize>
inline bool RTPKeyHashTable<Key,Element,GetIndex,hashsize>::HasElement(const Key &k)
{
int index;
bool found;
HashElement *tmp;
- index = GetIndex(k);
+ index = GetIndex::GetIndex(k);
if (index >= hashsize)
return false;
return found;
}
-template<class Key,class Element,int GetIndex(const Key &k),int hashsize>
+template<class Key,class Element,class GetIndex,int hashsize>
inline void RTPKeyHashTable<Key,Element,GetIndex,hashsize>::GotoNextElement()
{
if (curhashelem)
curhashelem = curhashelem->listnext;
}
-template<class Key,class Element,int GetIndex(const Key &k),int hashsize>
+template<class Key,class Element,class GetIndex,int hashsize>
inline void RTPKeyHashTable<Key,Element,GetIndex,hashsize>::GotoPreviousElement()
{
if (curhashelem)
curhashelem = curhashelem->listprev;
}
-template<class Key,class Element,int GetIndex(const Key &k),int hashsize>
+template<class Key,class Element,class GetIndex,int hashsize>
inline void RTPKeyHashTable<Key,Element,GetIndex,hashsize>::Clear()
{
HashElement *tmp1,*tmp2;
lasthashelem = 0;
}
-template<class Key,class Element,int GetIndex(const Key &k),int hashsize>
+template<class Key,class Element,class GetIndex,int hashsize>
inline int RTPKeyHashTable<Key,Element,GetIndex,hashsize>::AddElement(const Key &k,const Element &elem)
{
int index;
bool found;
HashElement *e,*newelem;
- index = GetIndex(k);
+ index = GetIndex::GetIndex(k);
if (index >= hashsize)
return ERR_RTP_KEYHASHTABLE_FUNCTIONRETURNEDINVALIDHASHINDEX;
return 0;
}
-template<class Key,class Element,int GetIndex(const Key &k),int hashsize>
+template<class Key,class Element,class GetIndex,int hashsize>
inline int RTPKeyHashTable<Key,Element,GetIndex,hashsize>::DeleteElement(const Key &k)
{
int status;
}
#ifdef RTPDEBUG
-template<class Key,class Element,int GetIndex(const Key &k),int hashsize>
+template<class Key,class Element,class GetIndex,int hashsize>
inline void RTPKeyHashTable<Key,Element,GetIndex,hashsize>::Dump()
{
HashElement *e;
*/
#include "rtplibraryversion.h"
+#include "rtpdefines.h"
RTPLibraryVersion RTPLibraryVersion::GetVersion()
{
- return RTPLibraryVersion(3,4,0);
+ return RTPLibraryVersion(3,5,2);
}
+std::string RTPLibraryVersion::GetVersionString() const
+{
+ char str[16];
+
+ RTP_SNPRINTF(str,16,"%d.%d.%d",majornr,minornr,debugnr);
+
+ return std::string(str);
+}
+
+
int debugnr,minornr,majornr;
};
-inline std::string RTPLibraryVersion::GetVersionString() const
-{
- char str[16];
-
-#if (defined(WIN32) || defined(_WIN32_WCE))
- _snprintf(str,16,"%d.%d.%d",majornr,minornr,debugnr);
-#else
- snprintf(str,16,"%d.%d.%d",majornr,minornr,debugnr);
-#endif // WIN32 || _WIN32_WCE
- return std::string(str);
-}
-
#endif // RTPLIBRARYVERSION_H
RTPPacket::hasextension = hasextension;
if (hasextension)
{
- RTPPacket::extid = ntohs(rtpextheader->id);
+ RTPPacket::extid = ntohs(rtpextheader->extid);
RTPPacket::extensionlength = ((int)ntohs(rtpextheader->length))*sizeof(uint32_t);
RTPPacket::extension = ((uint8_t *)rtpextheader)+sizeof(RTPExtensionHeader);
}
{
RTPExtensionHeader *rtpexthdr = (RTPExtensionHeader *)payload;
- rtpexthdr->id = htons(extensionid);
+ rtpexthdr->extid = htons(extensionid);
rtpexthdr->length = htons((uint16_t)extensionlen_numwords);
payload += sizeof(RTPExtensionHeader);
*/
+#if defined(WIN32) && !defined(_WIN32_WCE)
+ #define _CRT_RAND_S
+#endif // WIN32 || _WIN32_WCE
+
#include "rtprandom.h"
#include <time.h>
#ifndef WIN32
#include "rtpdebug.h"
-#if !defined(RTP_SUPPORT_GNUDRAND) && !defined(RTP_SUPPORT_RANDR)
-bool RTPRandom::init = false;
-#endif // WIN32
+#if (!defined(_WIN32_WCE)) && (defined(_MSC_VER) && _MSC_VER >= 1400 )
+ #define RTP_SUPPORT_RANDS
+#endif
RTPRandom::RTPRandom()
{
+#ifndef RTP_SUPPORT_RANDS
+
#if defined(RTP_SUPPORT_GNUDRAND) || defined(RTP_SUPPORT_RANDR)
uint32_t x;
x = (uint32_t)getpid();
x += (uint32_t)time(0);
x -= (uint32_t)clock();
- x ^= (uint32_t)(this);
+ x ^= (uint32_t)((uint8_t *)this - (uint8_t *)0);
#ifdef RTP_SUPPORT_GNUDRAND
srand48_r(x,&drandbuffer);
#else
state = (unsigned int)x;
-#endif
+#endif // RTP_SUPPORT_GNUDRAND
#else // use simple rand and srand functions
- if (init)
- return;
-
uint32_t x;
#ifndef _WIN32_WCE
x += ft.dwLowDateTime;
#endif // _WIN32_WCE
- x ^= (uint32_t)(this);
+ x ^= (uint32_t)((uint8_t *)this - (uint8_t *)0);
srand((unsigned int)x);
+#endif // RTP_SUPPORT_GNUDRAND || RTP_SUPPORT_RANDR
- init = true;
-#endif
+#endif // RTP_SUPPORT_RANDS
+
+ // Note: the rand_s function does not require initialization of a seed
}
RTPRandom::~RTPRandom()
{
}
-#ifdef RTP_SUPPORT_GNUDRAND
+#if defined(RTP_SUPPORT_GNUDRAND)
uint8_t RTPRandom::GetRandom8()
{
return x;
}
-#else
-#ifdef RTP_SUPPORT_RANDR
+#elif defined(RTP_SUPPORT_RANDR)
uint8_t RTPRandom::GetRandom8()
{
return x;
}
-#else
+#elif defined(RTP_SUPPORT_RANDS)
+
+uint8_t RTPRandom::GetRandom8()
+{
+ uint8_t x;
+ unsigned int r;
+
+ rand_s(&r);
+ x = (uint8_t)(256.0*((double)r)/((double)UINT_MAX+1.0));
+ return x;
+}
+
+uint16_t RTPRandom::GetRandom16()
+{
+ uint16_t x;
+ unsigned int r;
+
+ rand_s(&r);
+ x = (uint16_t)(65536.0*((double)r)/((double)UINT_MAX+1.0));
+ return x;
+}
+
+uint32_t RTPRandom::GetRandom32()
+{
+ uint32_t x,y;
+ unsigned int r;
+
+ rand_s(&r);
+ x = (uint32_t)(65536.0*((double)r)/((double)UINT_MAX+1.0));
+ y = x;
+ rand_s(&r);
+ x = (uint32_t)(65536.0*((double)r)/((double)UINT_MAX+1.0));
+ y ^= (x<<8);
+ rand_s(&r);
+ x = (uint32_t)(65536.0*((double)r)/((double)UINT_MAX+1.0));
+ y ^= (x<<16);
+
+ return y;
+}
+
+double RTPRandom::GetRandomDouble()
+{
+ unsigned int r;
+
+ rand_s(&r);
+ double x = ((double)r)/((double)UINT_MAX+1.0);
+ return x;
+}
+
+#else // use rand()
uint8_t RTPRandom::GetRandom8()
{
return x;
}
-#endif // RTP_SUPPORT_RANDR
#endif // RTP_SUPPORT_GNUDRAND
uint32_t GetRandom32();
double GetRandomDouble(); // returns random value between 0.0 and 1.0
private:
-#ifdef RTP_SUPPORT_GNUDRAND
+#if defined(RTP_SUPPORT_GNUDRAND)
struct drand48_data drandbuffer;
-#else
-#ifdef RTP_SUPPORT_RANDR
+#elif defined(RTP_SUPPORT_RANDR)
unsigned int state;
-#else
- static bool init;
-#endif // RTP_SUPPORT_RANDR
#endif // RTP_SUPPORT_GNUDRAND
};
#endif // RTPRANDOM_H
+
byepackets.pop_front();
rtptrans->SendRTCPData(pack->GetCompoundPacketData(),pack->GetCompoundPacketLength());
+
+ OnSendRTCPCompoundPacket(pack); // we'll place this after the actual send to avoid tampering
+
delete pack;
if (!byepackets.empty()) // more bye packets to send, schedule them
rtcpsched.ScheduleBYEPacket((*(byepackets.begin()))->GetCompoundPacketLength());
delete pack;
return status;
}
+
+ OnSendRTCPCompoundPacket(pack); // we'll place this after the actual send to avoid tampering
}
else
{
delete pack;
return status;
}
+
+ OnSendRTCPCompoundPacket(pack); // we'll place this after the actual send to avoid tampering
if (!byepackets.empty()) // more bye packets to send, schedule them
{
#ifndef _WIN32_WCE
DWORD len = *bufferlength;
if (!GetUserName((LPTSTR)buffer,&len))
- strcpy((char *)buffer,"unknown");
+#if (defined(_MSC_VER) && _MSC_VER >= 1400 ) // Check if we can use the secure strncpy_s
+ strncpy_s((char *)buffer,*bufferlength,"unknown",_TRUNCATE);
+#else
+ strncpy((char *)buffer,"unknown",*bufferlength);
+#endif // Less secure version
+
#else
- strcpy((char *)buffer,"unknown");
+ strncpy((char *)buffer,"unknown",*bufferlength);
#endif // _WIN32_WCE
#endif // WIN32
{
char hostname[1024];
- strcpy(hostname,"localhost"); // just in case gethostname fails
+#if defined(WIN32) && !defined(_WIN32_WCE) && (defined(_MSC_VER) && _MSC_VER >= 1400 ) // Check if we can use the secure strncpy_s
+ strncpy_s(hostname,1024,"localhost",_TRUNCATE); // just in case gethostname fails
+#else
+ strncpy(hostname,"localhost",1024); // just in case gethostname fails
+#endif
gethostname(hostname,1024);
+#if defined(WIN32) && !defined(_WIN32_WCE) && (defined(_MSC_VER) && _MSC_VER >= 1400 ) // Check if we can use the secure strncpy_s
+ strncpy_s((char *)(buffer+offset),buflen2,hostname,_TRUNCATE);
+#else
strncpy((char *)(buffer+offset),hostname,buflen2);
+#endif
*bufferlength = offset+strlen(hostname);
}
if (*bufferlength > RTCP_SDES_MAXITEMLENGTH)
virtual void OnInvalidRawPacketType(RTPRawPacket *rawpacket, jrtp_socket_t socket) { }
virtual void OnNoteTimeout(RTPSourceData *srcdat) { }
virtual void OnBYEPacket(RTPSourceData *srcdat) { }
-
-
+ virtual void OnSendRTCPCompoundPacket(RTCPCompoundPacket *pack) { }
#ifdef RTP_SUPPORT_THREAD
virtual void OnPollThreadError(int errcode) { }
virtual void OnPollThreadStep() { }
friend class RTPPollThread;
#endif // RTP_SUPPORT_THREAD
friend class RTPSessionSources;
+ friend class RTCPSessionPacketBuilder;
};
#endif // RTPSESSION_H
private:
bool acceptown;
bool usepollthread;
- int maxpacksize;
+ size_t maxpacksize;
double owntsunit;
RTPTransmitter::ReceiveMode receivemode;
bool resolvehostname;
#include "rtpdebug.h"
-#ifndef RTP_SUPPORT_INLINETEMPLATEPARAM
- int RTPSources_GetHashIndex(const uint32_t &ssrc) { return ssrc%RTPSOURCES_HASHSIZE; }
-#endif // !RTP_SUPPORT_INLINETEMPLATEPARAM
-
RTPSources::RTPSources(ProbationType probtype)
{
totalcount = 0;
RTPInternalSourceData *srcdat;
bool created,cnamecollis;
int status;
- uint8_t id;
+ uint8_t sdesid;
bool prevactive;
switch(t)
{
case RTCPSDESPacket::CNAME:
- id = RTCP_SDES_ID_CNAME;
+ sdesid = RTCP_SDES_ID_CNAME;
break;
case RTCPSDESPacket::NAME:
- id = RTCP_SDES_ID_NAME;
+ sdesid = RTCP_SDES_ID_NAME;
break;
case RTCPSDESPacket::EMAIL:
- id = RTCP_SDES_ID_EMAIL;
+ sdesid = RTCP_SDES_ID_EMAIL;
break;
case RTCPSDESPacket::PHONE:
- id = RTCP_SDES_ID_PHONE;
+ sdesid = RTCP_SDES_ID_PHONE;
break;
case RTCPSDESPacket::LOC:
- id = RTCP_SDES_ID_LOCATION;
+ sdesid = RTCP_SDES_ID_LOCATION;
break;
case RTCPSDESPacket::TOOL:
- id = RTCP_SDES_ID_TOOL;
+ sdesid = RTCP_SDES_ID_TOOL;
break;
case RTCPSDESPacket::NOTE:
- id = RTCP_SDES_ID_NOTE;
+ sdesid = RTCP_SDES_ID_NOTE;
break;
default:
return ERR_RTP_SOURCES_ILLEGALSDESTYPE;
return 0;
prevactive = srcdat->IsActive();
- status = srcdat->ProcessSDESItem(id,(const uint8_t *)itemdata,itemlength,receivetime,&cnamecollis);
+ status = srcdat->ProcessSDESItem(sdesid,(const uint8_t *)itemdata,itemlength,receivetime,&cnamecollis);
if (!prevactive && srcdat->IsActive())
activecount++;
OnBYETimeout(srcdat);
if (normaltimeout)
OnTimeout(srcdat);
+ OnRemoveSource(srcdat);
delete srcdat;
}
}
#define RTPSOURCES_HASHSIZE 8317
-#ifdef RTP_SUPPORT_INLINETEMPLATEPARAM
- inline int RTPSources_GetHashIndex(const uint32_t &ssrc) { return ssrc%RTPSOURCES_HASHSIZE; }
-#else // can't use inline function as template parameter
- int RTPSources_GetHashIndex(const uint32_t &ssrc);
-#endif // RTP_SUPPORT_INLINETEMPLATEPARAM
+class RTPSources_GetHashIndex
+{
+public:
+ static int GetIndex(const uint32_t &ssrc) { return ssrc%RTPSOURCES_HASHSIZE; }
+};
class RTPNTPTime;
class RTPTransmitter;
struct RTPExtensionHeader
{
- uint16_t id;
+ uint16_t extid;
uint16_t length;
};
struct RTCPSDESHeader
{
- uint8_t id;
+ uint8_t sdesid;
uint8_t length;
};
#include "rtprawpacket.h"
#include "rtpipv4address.h"
#include "rtptimeutilities.h"
+#include "rtpdefines.h"
#include <stdio.h>
#if (defined(WIN32) || defined(_WIN32_WCE))
#define RTPSOCKERR INVALID_SOCKET
mreq.imr_interface.s_addr = htonl(mcastifaceIP);\
status = setsockopt(socket,IPPROTO_IP,type,(const char *)&mreq,sizeof(struct ip_mreq));\
}
-#ifndef RTP_SUPPORT_INLINETEMPLATEPARAM
- int RTPUDPv4Trans_GetHashIndex_IPv4Dest(const RTPIPv4Destination &d) { return d.GetIP_HBO()%RTPUDPV4TRANS_HASHSIZE; }
- int RTPUDPv4Trans_GetHashIndex_uint32_t(const uint32_t &k) { return k%RTPUDPV4TRANS_HASHSIZE; }
-#endif // !RTP_SUPPORT_INLINETEMPLATEPARAM
-
#ifdef RTP_SUPPORT_THREAD
#define MAINMUTEX_LOCK { if (threadsafe) mainmutex.Lock(); }
#define MAINMUTEX_UNLOCK { if (threadsafe) mainmutex.Unlock(); }
it = localIPs.begin();
ip = (*it);
-#if (defined(WIN32) || defined(_WIN32_WCE))
- _snprintf(str,16,"%d.%d.%d.%d",(int)((ip>>24)&0xFF),(int)((ip>>16)&0xFF),(int)((ip>>8)&0xFF),(int)(ip&0xFF));
-#else
- snprintf(str,16,"%d.%d.%d.%d",(int)((ip>>24)&0xFF),(int)((ip>>16)&0xFF),(int)((ip>>8)&0xFF),(int)(ip&0xFF));
-#endif // WIN32 || _WIN32_WCE
+ RTP_SNPRINTF(str,16,"%d.%d.%d.%d",(int)((ip>>24)&0xFF),(int)((ip>>16)&0xFF),(int)((ip>>8)&0xFF),(int)(ip&0xFF));
len = strlen(str);
localhostnamelength = len;
{
RTPTime curtime = RTPTime::CurrentTime();
fromlen = sizeof(struct sockaddr_in);
- recvlen = recvfrom(sock,packetbuffer,(int)len,0,(struct sockaddr *)&srcaddr,&fromlen);
+ recvlen = recvfrom(sock,packetbuffer,RTPUDPV4TRANS_MAXPACKSIZE,0,(struct sockaddr *)&srcaddr,&fromlen);
if (recvlen > 0)
{
bool acceptdata;
std::cout << "RTP socket descriptor: " << rtpsock << std::endl;
std::cout << "RTCP socket descriptor: " << rtcpsock << std::endl;
ip = bindIP;
- snprintf(str,16,"%d.%d.%d.%d",(int)((ip>>24)&0xFF),(int)((ip>>16)&0xFF),(int)((ip>>8)&0xFF),(int)(ip&0xFF));
+ RTP_SNPRINTF(str,16,"%d.%d.%d.%d",(int)((ip>>24)&0xFF),(int)((ip>>16)&0xFF),(int)((ip>>8)&0xFF),(int)(ip&0xFF));
std::cout << "Bind IP address: " << str << std::endl;
ip = mcastifaceIP;
- snprintf(str,16,"%d.%d.%d.%d",(int)((ip>>24)&0xFF),(int)((ip>>16)&0xFF),(int)((ip>>8)&0xFF),(int)(ip&0xFF));
+ RTP_SNPRINTF(str,16,"%d.%d.%d.%d",(int)((ip>>24)&0xFF),(int)((ip>>16)&0xFF),(int)((ip>>8)&0xFF),(int)(ip&0xFF));
std::cout << "Multicast interface IP address: " << str << std::endl;
std::cout << "Local IP addresses:" << std::endl;
for (it = localIPs.begin() ; it != localIPs.end() ; it++)
{
ip = (*it);
- snprintf(str,16,"%d.%d.%d.%d",(int)((ip>>24)&0xFF),(int)((ip>>16)&0xFF),(int)((ip>>8)&0xFF),(int)(ip&0xFF));
+ RTP_SNPRINTF(str,16,"%d.%d.%d.%d",(int)((ip>>24)&0xFF),(int)((ip>>16)&0xFF),(int)((ip>>8)&0xFF),(int)(ip&0xFF));
std::cout << " " << str << std::endl;
}
std::cout << "Multicast TTL: " << (int)multicastTTL << std::endl;
while(acceptignoreinfo.HasCurrentElement())
{
ip = acceptignoreinfo.GetCurrentKey();
- snprintf(str,16,"%d.%d.%d.%d",(int)((ip>>24)&0xFF),(int)((ip>>16)&0xFF),(int)((ip>>8)&0xFF),(int)(ip&0xFF));
+ RTP_SNPRINTF(str,16,"%d.%d.%d.%d",(int)((ip>>24)&0xFF),(int)((ip>>16)&0xFF),(int)((ip>>8)&0xFF),(int)(ip&0xFF));
PortInfo *pinfo = acceptignoreinfo.GetCurrentElement();
std::cout << " " << str << ": ";
if (pinfo->all)
do
{
ip = multicastgroups.GetCurrentElement();
- snprintf(str,16,"%d.%d.%d.%d",(int)((ip>>24)&0xFF),(int)((ip>>16)&0xFF),(int)((ip>>8)&0xFF),(int)(ip&0xFF));
+ RTP_SNPRINTF(str,16,"%d.%d.%d.%d",(int)((ip>>24)&0xFF),(int)((ip>>16)&0xFF),(int)((ip>>8)&0xFF),(int)(ip&0xFF));
std::cout << " " << str << std::endl;
multicastgroups.GotoNextElement();
} while (multicastgroups.HasCurrentElement());
jrtp_socket_t rtpsocket,rtcpsocket;
};
-#ifdef RTP_SUPPORT_INLINETEMPLATEPARAM
- inline int RTPUDPv4Trans_GetHashIndex_IPv4Dest(const RTPIPv4Destination &d) { return d.GetIP_HBO()%RTPUDPV4TRANS_HASHSIZE; }
- inline int RTPUDPv4Trans_GetHashIndex_uint32_t(const uint32_t &k) { return k%RTPUDPV4TRANS_HASHSIZE; }
-#else // No support for inline function as template parameter
- int RTPUDPv4Trans_GetHashIndex_IPv4Dest(const RTPIPv4Destination &d);
- int RTPUDPv4Trans_GetHashIndex_uint32_t(const uint32_t &k);
-#endif // RTP_SUPPORT_INLINETEMPLATEPARAM
+class RTPUDPv4Trans_GetHashIndex_IPv4Dest
+{
+public:
+ static int GetIndex(const RTPIPv4Destination &d) { return d.GetIP_HBO()%RTPUDPV4TRANS_HASHSIZE; }
+};
+
+class RTPUDPv4Trans_GetHashIndex_uint32_t
+{
+public:
+ static int GetIndex(const uint32_t &k) { return k%RTPUDPV4TRANS_HASHSIZE; }
+};
#define RTPUDPV4TRANS_HEADERSIZE (20+8)
#include "rtprawpacket.h"
#include "rtpipv6address.h"
#include "rtptimeutilities.h"
+#include "rtpdefines.h"
#include <stdio.h>
#if (defined(WIN32) || defined(_WIN32_WCE))
#define RTPSOCKERR INVALID_SOCKET
mreq.ipv6mr_interface = mcastifidx;\
status = setsockopt(socket,IPPROTO_IPV6,type,(const char *)&mreq,sizeof(struct ipv6_mreq));\
}
-#ifndef RTP_SUPPORT_INLINETEMPLATEPARAM
- int RTPUDPv6Trans_GetHashIndex_IPv6Dest(const RTPIPv6Destination &d) { in6_addr ip = d.GetIP(); return ((((uint32_t)ip.s6_addr[12])<<24)|(((uint32_t)ip.s6_addr[13])<<16)|(((uint32_t)ip.s6_addr[14])<<8)|((uint32_t)ip.s6_addr[15]))%RTPUDPV6TRANS_HASHSIZE; }
- int RTPUDPv6Trans_GetHashIndex_in6_addr(const in6_addr &ip) { return ((((uint32_t)ip.s6_addr[12])<<24)|(((uint32_t)ip.s6_addr[13])<<16)|(((uint32_t)ip.s6_addr[14])<<8)|((uint32_t)ip.s6_addr[15]))%RTPUDPV6TRANS_HASHSIZE; }
-#endif // !RTP_SUPPORT_INLINETEMPLATEPARAM
-
#ifdef RTP_SUPPORT_THREAD
#define MAINMUTEX_LOCK { if (threadsafe) mainmutex.Lock(); }
#define MAINMUTEX_UNLOCK { if (threadsafe) mainmutex.Unlock(); }
ip16[j] |= ((uint16_t)ip.s6_addr[i+1]);
}
-#if (defined(WIN32) || defined(_WIN32_WCE))
- _snprintf(str,48,"%04X:%04X:%04X:%04X:%04X:%04X:%04X:%04X",(int)ip16[0],(int)ip16[1],(int)ip16[2],(int)ip16[3],(int)ip16[4],(int)ip16[5],(int)ip16[6],(int)ip16[7]);
-#else
- snprintf(str,48,"%04X:%04X:%04X:%04X:%04X:%04X:%04X:%04X",(int)ip16[0],(int)ip16[1],(int)ip16[2],(int)ip16[3],(int)ip16[4],(int)ip16[5],(int)ip16[6],(int)ip16[7]);
-#endif // WIN32 || _WIN32_WCE
+ RTP_SNPRINTF(str,48,"%04X:%04X:%04X:%04X:%04X:%04X:%04X:%04X",(int)ip16[0],(int)ip16[1],(int)ip16[2],(int)ip16[3],(int)ip16[4],(int)ip16[5],(int)ip16[6],(int)ip16[7]);
len = strlen(str);
localhostnamelength = len;
{
RTPTime curtime = RTPTime::CurrentTime();
fromlen = sizeof(struct sockaddr_in6);
- recvlen = recvfrom(sock,packetbuffer,(int)len,0,(struct sockaddr *)&srcaddr,&fromlen);
+ recvlen = recvfrom(sock,packetbuffer,RTPUDPV6TRANS_MAXPACKSIZE,0,(struct sockaddr *)&srcaddr,&fromlen);
if (recvlen > 0)
{
bool acceptdata;
std::cout << "RTCP socket descriptor: " << rtcpsock << std::endl;
ip = bindIP;
for (i = 0,j = 0 ; j < 8 ; j++,i += 2) { ip16[j] = (((uint16_t)ip.s6_addr[i])<<8); ip16[j] |= ((uint16_t)ip.s6_addr[i+1]); }
- snprintf(str,48,"%04X:%04X:%04X:%04X:%04X:%04X:%04X:%04X",(int)ip16[0],(int)ip16[1],(int)ip16[2],(int)ip16[3],(int)ip16[4],(int)ip16[5],(int)ip16[6],(int)ip16[7]);
+ RTP_SNPRINTF(str,48,"%04X:%04X:%04X:%04X:%04X:%04X:%04X:%04X",(int)ip16[0],(int)ip16[1],(int)ip16[2],(int)ip16[3],(int)ip16[4],(int)ip16[5],(int)ip16[6],(int)ip16[7]);
std::cout << "Bind IP address: " << str << std::endl;
std::Cout << "Multicast interface index: " << mcastifidx << std::endl;
std::cout << "Local IP addresses:" << std::endl;
{
ip = (*it);
for (i = 0,j = 0 ; j < 8 ; j++,i += 2) { ip16[j] = (((uint16_t)ip.s6_addr[i])<<8); ip16[j] |= ((uint16_t)ip.s6_addr[i+1]); }
- snprintf(str,48,"%04X:%04X:%04X:%04X:%04X:%04X:%04X:%04X",(int)ip16[0],(int)ip16[1],(int)ip16[2],(int)ip16[3],(int)ip16[4],(int)ip16[5],(int)ip16[6],(int)ip16[7]);
+ RTP_SNPRINTF(str,48,"%04X:%04X:%04X:%04X:%04X:%04X:%04X:%04X",(int)ip16[0],(int)ip16[1],(int)ip16[2],(int)ip16[3],(int)ip16[4],(int)ip16[5],(int)ip16[6],(int)ip16[7]);
std::cout << " " << str << std::endl;
}
std::cout << "Multicast TTL: " << (int)multicastTTL << std::endl;
{
ip = acceptignoreinfo.GetCurrentKey();
for (i = 0,j = 0 ; j < 8 ; j++,i += 2) { ip16[j] = (((uint16_t)ip.s6_addr[i])<<8); ip16[j] |= ((uint16_t)ip.s6_addr[i+1]); }
- snprintf(str,48,"%04X:%04X:%04X:%04X:%04X:%04X:%04X:%04X",(int)ip16[0],(int)ip16[1],(int)ip16[2],(int)ip16[3],(int)ip16[4],(int)ip16[5],(int)ip16[6],(int)ip16[7]);
+ RTP_SNPRINTF(str,48,"%04X:%04X:%04X:%04X:%04X:%04X:%04X:%04X",(int)ip16[0],(int)ip16[1],(int)ip16[2],(int)ip16[3],(int)ip16[4],(int)ip16[5],(int)ip16[6],(int)ip16[7]);
PortInfo *pinfo = acceptignoreinfo.GetCurrentElement();
std::cout << " " << str << ": ";
if (pinfo->all)
{
ip = multicastgroups.GetCurrentElement();
for (i = 0,j = 0 ; j < 8 ; j++,i += 2) { ip16[j] = (((uint16_t)ip.s6_addr[i])<<8); ip16[j] |= ((uint16_t)ip.s6_addr[i+1]); }
- snprintf(str,48,"%04X:%04X:%04X:%04X:%04X:%04X:%04X:%04X",(int)ip16[0],(int)ip16[1],(int)ip16[2],(int)ip16[3],(int)ip16[4],(int)ip16[5],(int)ip16[6],(int)ip16[7]);
+ RTP_SNPRINTF(str,48,"%04X:%04X:%04X:%04X:%04X:%04X:%04X:%04X",(int)ip16[0],(int)ip16[1],(int)ip16[2],(int)ip16[3],(int)ip16[4],(int)ip16[5],(int)ip16[6],(int)ip16[7]);
std::cout << " " << str << std::endl;
multicastgroups.GotoNextElement();
} while (multicastgroups.HasCurrentElement());
jrtp_socket_t rtpsocket,rtcpsocket;
};
-#ifdef RTP_SUPPORT_INLINETEMPLATEPARAM
- inline int RTPUDPv6Trans_GetHashIndex_IPv6Dest(const RTPIPv6Destination &d) { in6_addr ip = d.GetIP(); return ((((uint32_t)ip.s6_addr[12])<<24)|(((uint32_t)ip.s6_addr[13])<<16)|(((uint32_t)ip.s6_addr[14])<<8)|((uint32_t)ip.s6_addr[15]))%RTPUDPV6TRANS_HASHSIZE; }
- inline int RTPUDPv6Trans_GetHashIndex_in6_addr(const in6_addr &ip) { return ((((uint32_t)ip.s6_addr[12])<<24)|(((uint32_t)ip.s6_addr[13])<<16)|(((uint32_t)ip.s6_addr[14])<<8)|((uint32_t)ip.s6_addr[15]))%RTPUDPV6TRANS_HASHSIZE; }
-#else // No support for inline function as template parameter
- int RTPUDPv6Trans_GetHashIndex_IPv6Dest(const RTPIPv6Destination &d);
- int RTPUDPv6Trans_GetHashIndex_in6_addr(const in6_addr &ip);
-#endif // RTP_SUPPORT_INLINETEMPLATEPARAM
+class RTPUDPv6Trans_GetHashIndex_IPv6Dest
+{
+public:
+ static int GetIndex(const RTPIPv6Destination &d) { in6_addr ip = d.GetIP(); return ((((uint32_t)ip.s6_addr[12])<<24)|(((uint32_t)ip.s6_addr[13])<<16)|(((uint32_t)ip.s6_addr[14])<<8)|((uint32_t)ip.s6_addr[15]))%RTPUDPV6TRANS_HASHSIZE; }
+};
+
+class RTPUDPv6Trans_GetHashIndex_in6_addr
+{
+public:
+ static int GetIndex(const in6_addr &ip) { return ((((uint32_t)ip.s6_addr[12])<<24)|(((uint32_t)ip.s6_addr[13])<<16)|(((uint32_t)ip.s6_addr[14])<<8)|((uint32_t)ip.s6_addr[15]))%RTPUDPV6TRANS_HASHSIZE; }
+};
#define RTPUDPV6TRANS_HEADERSIZE (40+8)
This file is a part of the JThread package, which contains some object-
oriented thread wrappers for different thread implementations.
- Copyright (c) 2000-2005 Jori Liesenborgs (jori@lumumba.uhasselt.be)
+ Copyright (c) 2000-2006 Jori Liesenborgs (jori@lumumba.uhasselt.be)
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"),
JMutex::~JMutex()
{
if (initialized)
+#ifdef JMUTEX_CRITICALSECTION
+ DeleteCriticalSection(&mutex);
+#else
CloseHandle(mutex);
+#endif // JMUTEX_CRITICALSECTION
}
int JMutex::Init()
{
if (initialized)
return ERR_JMUTEX_ALREADYINIT;
+#ifdef JMUTEX_CRITICALSECTION
+ InitializeCriticalSection(&mutex);
+#else
mutex = CreateMutex(NULL,FALSE,NULL);
if (mutex == NULL)
return ERR_JMUTEX_CANTCREATEMUTEX;
+#endif // JMUTEX_CRITICALSECTION
initialized = true;
return 0;
}
{
if (!initialized)
return ERR_JMUTEX_NOTINIT;
+#ifdef JMUTEX_CRITICALSECTION
+ EnterCriticalSection(&mutex);
+#else
WaitForSingleObject(mutex,INFINITE);
+#endif // JMUTEX_CRITICALSECTION
return 0;
}
{
if (!initialized)
return ERR_JMUTEX_NOTINIT;
+#ifdef JMUTEX_CRITICALSECTION
+ LeaveCriticalSection(&mutex);
+#else
ReleaseMutex(mutex);
+#endif // JMUTEX_CRITICALSECTION
return 0;
}
+
This file is a part of the JThread package, which contains some object-
oriented thread wrappers for different thread implementations.
- Copyright (c) 2000-2005 Jori Liesenborgs (jori@lumumba.uhasselt.be)
+ Copyright (c) 2000-2006 Jori Liesenborgs (jori@lumumba.uhasselt.be)
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"),
while (!running)
{
runningmutex.Unlock();
+ Sleep(1);
runningmutex.Lock();
}
runningmutex.Unlock();
projects / thirdparty / freeswitch.git / commitdiff
