opalvoip-svn — SVN changes

[Opalvoip-svn] SF.net SVN: opalvoip:[34776] ptlib/branches/v2_16

[<rjo...@us...>]

Revision: 34776
          http://sourceforge.net/p/opalvoip/code/34776
Author:   rjongbloed
Date:     2016-04-18 12:44:31 +0000 (Mon, 18 Apr 2016)
Log Message:
-----------
Merged revision(s) 34774 from ptlib/trunk:
Removed bogus warnings on GCC 4.4.x compiler.

Modified Paths:
--------------
    ptlib/branches/v2_16/configure.ac

Property Changed:
----------------
    ptlib/branches/v2_16/

Index: ptlib/branches/v2_16
===================================================================
--- ptlib/branches/v2_16	2016-04-18 09:30:41 UTC (rev 34775)
+++ ptlib/branches/v2_16	2016-04-18 12:44:31 UTC (rev 34776)

Property changes on: ptlib/branches/v2_16
___________________________________________________________________
Modified: svn:mergeinfo
## -10,4 +10,4 ##
 /ptlib/branches/v2_4:21086,21094,21147,21160,21185,21281,21296,21305,21322,21337,21363,21467,21471-21472,21506,21508,21623,21695,21744,21746,21763,22241,22958,23045-23046,23061,23066,23712
 /ptlib/branches/v2_6:22195,22243,22295,22304,22311,22317,22320,22356,22458,22509,22587,22601-22602,22611,22629,22633,22673,22681,22729,22731-22732,22736,22742,22848,22960,22992,23161,23163,23167,23169,23177,23239,23291,23298,23336,23429,23595,23823,23827,23873,24816
 /ptlib/branches/v2_8:24034,24044,24046,24054,24060,24065,24084,24090,24113,24136,24142,24165-24166,24168,24172,24367,24372,24410,24540,24992
-/ptlib/trunk:34109-34115,34121,34140,34142-34143,34146-34149,34152-34154,34169,34171-34172,34180,34182,34184,34194,34219,34221,34231-34232,34244-34245,34254,34267-34268,34280-34284,34298-34315,34335,34344-34345,34347,34354-34356,34366,34379,34398,34405-34411,34418-34423,34493-34508,34581,34584,34722,34740-34745
+/ptlib/trunk:34109-34115,34121,34140,34142-34143,34146-34149,34152-34154,34169,34171-34172,34180,34182,34184,34194,34219,34221,34231-34232,34244-34245,34254,34267-34268,34280-34284,34298-34315,34335,34344-34345,34347,34354-34356,34366,34379,34398,34405-34411,34418-34423,34493-34508,34581,34584,34722,34740-34745,34774
\ No newline at end of property
Modified: ptlib/branches/v2_16/configure.ac
===================================================================
--- ptlib/branches/v2_16/configure.ac	2016-04-18 09:30:41 UTC (rev 34775)
+++ ptlib/branches/v2_16/configure.ac	2016-04-18 12:44:31 UTC (rev 34776)
@@ -240,19 +240,27 @@
 
 
 dnl ########################################################################
-dnl check for old gcc version
+dnl check for old gcc versions
 
-AC_MSG_CHECKING(checking if pragma implementation should be used)
-
 gcc_version=`$CC -dumpversion`
 if test "x$gcc_version" != "x" ; then
+   AC_MSG_NOTICE($CC version is $gcc_version);
+
+   AC_MSG_CHECKING(checking if pragma implementation should be used)
    if test `echo $gcc_version | sed 's/\..*$//'` -lt 4 ; then
       CPPFLAGS="$CPPFLAGS -DP_USE_PRAGMA"
       AC_MSG_RESULT(yes)
    else
       AC_MSG_RESULT(no)
+
+      AC_MSG_CHECKING(checking if bogus warning on strict aliasing)
+      if test `echo $gcc_version | sed -e 's/^4\.//' -e 's/\..*$//'` -le 4 ; then
+         CPPFLAGS="$CPPFLAGS -Wno-strict-aliasing"
+         AC_MSG_RESULT(yes)
+      else
+         AC_MSG_RESULT(no)
+      fi
    fi
-   AC_MSG_NOTICE($CC version is $gcc_version);
 fi
 
 dnl ########################################################################

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Opalvoip-svn] SF.net SVN: opalvoip:[34775] opal/trunk

[<rjo...@us...>]

Revision: 34775
          http://sourceforge.net/p/opalvoip/code/34775
Author:   rjongbloed
Date:     2016-04-18 09:30:41 +0000 (Mon, 18 Apr 2016)
Log Message:
-----------
Make sure output files are created when --disable-plugins in play so Makefile dependencies do not file all the time.

Modified Paths:
--------------
    opal/trunk/configure
    opal/trunk/configure.ac

Modified: opal/trunk/configure
===================================================================
--- opal/trunk/configure	2016-04-17 18:01:43 UTC (rev 34774)
+++ opal/trunk/configure	2016-04-18 09:30:41 UTC (rev 34775)
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for OPAL 3.17alpha1.
+# Generated by GNU Autoconf 2.69 for OPAL 3.17alpha2.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -577,8 +577,8 @@
 # Identity of this package.
 PACKAGE_NAME='OPAL'
 PACKAGE_TARNAME='opal'
-PACKAGE_VERSION='3.17alpha1'
-PACKAGE_STRING='OPAL 3.17alpha1'
+PACKAGE_VERSION='3.17alpha2'
+PACKAGE_STRING='OPAL 3.17alpha2'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -1452,7 +1452,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures OPAL 3.17alpha1 to adapt to many kinds of systems.
+\`configure' configures OPAL 3.17alpha2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1518,7 +1518,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of OPAL 3.17alpha1:";;
+     short | recursive ) echo "Configuration of OPAL 3.17alpha2:";;
    esac
   cat <<\_ACEOF
 
@@ -1699,7 +1699,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-OPAL configure 3.17alpha1
+OPAL configure 3.17alpha2
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2315,7 +2315,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by OPAL $as_me 3.17alpha1, which was
+It was created by OPAL $as_me 3.17alpha2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -11296,6 +11296,8 @@
 if test "x$OPAL_PLUGINS" = "xyes" ; then
   subdirs="$subdirs plugins"
 
+else
+  touch plugins/plugin_config.mak plugins/plugin_config.h
 fi
 
 
@@ -11855,7 +11857,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by OPAL $as_me 3.17alpha1, which was
+This file was extended by OPAL $as_me 3.17alpha2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -11921,7 +11923,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-OPAL config.status 3.17alpha1
+OPAL config.status 3.17alpha2
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

Modified: opal/trunk/configure.ac
===================================================================
--- opal/trunk/configure.ac	2016-04-17 18:01:43 UTC (rev 34774)
+++ opal/trunk/configure.ac	2016-04-18 09:30:41 UTC (rev 34775)
@@ -534,6 +534,8 @@
 OPAL_SIMPLE_OPTION([plugins],[OPAL_PLUGINS], [plugin support])
 if test "x$OPAL_PLUGINS" = "xyes" ; then
   AC_CONFIG_SUBDIRS(plugins)
+else
+  touch plugins/plugin_config.mak plugins/plugin_config.h
 fi
 
 dnl Construct the plugins install path

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Opalvoip-svn] SF.net SVN: opalvoip:[34774] ptlib/trunk

[<rjo...@us...>]

Revision: 34774
          http://sourceforge.net/p/opalvoip/code/34774
Author:   rjongbloed
Date:     2016-04-17 18:01:43 +0000 (Sun, 17 Apr 2016)
Log Message:
-----------
Removed bogus warnings on GCC 4.4.x compiler.

Modified Paths:
--------------
    ptlib/trunk/configure
    ptlib/trunk/configure.ac

Modified: ptlib/trunk/configure
===================================================================
--- ptlib/trunk/configure	2016-04-17 17:25:31 UTC (rev 34773)
+++ ptlib/trunk/configure	2016-04-17 18:01:43 UTC (rev 34774)
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for PTLib 2.17alpha0x10001.
+# Generated by GNU Autoconf 2.69 for PTLib 2.17alpha1.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -577,8 +577,8 @@
 # Identity of this package.
 PACKAGE_NAME='PTLib'
 PACKAGE_TARNAME='ptlib'
-PACKAGE_VERSION='2.17alpha0x10001'
-PACKAGE_STRING='PTLib 2.17alpha0x10001'
+PACKAGE_VERSION='2.17alpha1'
+PACKAGE_STRING='PTLib 2.17alpha1'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -1608,7 +1608,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures PTLib 2.17alpha0x10001 to adapt to many kinds of systems.
+\`configure' configures PTLib 2.17alpha1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1674,7 +1674,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of PTLib 2.17alpha0x10001:";;
+     short | recursive ) echo "Configuration of PTLib 2.17alpha1:";;
    esac
   cat <<\_ACEOF
 
@@ -1924,7 +1924,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-PTLib configure 2.17alpha0x10001
+PTLib configure 2.17alpha1
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2850,7 +2850,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by PTLib $as_me 2.17alpha0x10001, which was
+It was created by PTLib $as_me 2.17alpha1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -7396,11 +7396,13 @@
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking checking if pragma implementation should be used" >&5
-$as_echo_n "checking checking if pragma implementation should be used... " >&6; }
-
 gcc_version=`$CC -dumpversion`
 if test "x$gcc_version" != "x" ; then
+   { $as_echo "$as_me:${as_lineno-$LINENO}: $CC version is $gcc_version" >&5
+$as_echo "$as_me: $CC version is $gcc_version" >&6;};
+
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking checking if pragma implementation should be used" >&5
+$as_echo_n "checking checking if pragma implementation should be used... " >&6; }
    if test `echo $gcc_version | sed 's/\..*$//'` -lt 4 ; then
       CPPFLAGS="$CPPFLAGS -DP_USE_PRAGMA"
       { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
@@ -7408,9 +7410,18 @@
    else
       { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
+
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking checking if bogus warning on strict aliasing" >&5
+$as_echo_n "checking checking if bogus warning on strict aliasing... " >&6; }
+      if test `echo $gcc_version | sed -e 's/^4\.//' -e 's/\..*$//'` -le 4 ; then
+         CPPFLAGS="$CPPFLAGS -Wno-strict-aliasing"
+         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+      else
+         { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+      fi
    fi
-   { $as_echo "$as_me:${as_lineno-$LINENO}: $CC version is $gcc_version" >&5
-$as_echo "$as_me: $CC version is $gcc_version" >&6;};
 fi
 
 
@@ -20187,7 +20198,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by PTLib $as_me 2.17alpha0x10001, which was
+This file was extended by PTLib $as_me 2.17alpha1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -20253,7 +20264,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-PTLib config.status 2.17alpha0x10001
+PTLib config.status 2.17alpha1
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

Modified: ptlib/trunk/configure.ac
===================================================================
--- ptlib/trunk/configure.ac	2016-04-17 17:25:31 UTC (rev 34773)
+++ ptlib/trunk/configure.ac	2016-04-17 18:01:43 UTC (rev 34774)
@@ -241,19 +241,27 @@
 
 
 dnl ########################################################################
-dnl check for old gcc version
+dnl check for old gcc versions
 
-AC_MSG_CHECKING(checking if pragma implementation should be used)
-
 gcc_version=`$CC -dumpversion`
 if test "x$gcc_version" != "x" ; then
+   AC_MSG_NOTICE($CC version is $gcc_version);
+
+   AC_MSG_CHECKING(checking if pragma implementation should be used)
    if test `echo $gcc_version | sed 's/\..*$//'` -lt 4 ; then
       CPPFLAGS="$CPPFLAGS -DP_USE_PRAGMA"
       AC_MSG_RESULT(yes)
    else
       AC_MSG_RESULT(no)
+
+      AC_MSG_CHECKING(checking if bogus warning on strict aliasing)
+      if test `echo $gcc_version | sed -e 's/^4\.//' -e 's/\..*$//'` -le 4 ; then
+         CPPFLAGS="$CPPFLAGS -Wno-strict-aliasing"
+         AC_MSG_RESULT(yes)
+      else
+         AC_MSG_RESULT(no)
+      fi
    fi
-   AC_MSG_NOTICE($CC version is $gcc_version);
 fi
 
 dnl ########################################################################

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Opalvoip-svn] SF.net SVN: opalvoip:[34773] ptlib/tags/v2_16_1/src/ptclib/pssl.cxx

[<rjo...@us...>]

Revision: 34773
          http://sourceforge.net/p/opalvoip/code/34773
Author:   rjongbloed
Date:     2016-04-17 17:25:31 +0000 (Sun, 17 Apr 2016)
Log Message:
-----------
Reversed accidental check in to tag branch.

Merged revision(s) 34771 from ptlib/tags/v2_16_1:
Fixed build against older OpenSSL

Modified Paths:
--------------
    ptlib/tags/v2_16_1/src/ptclib/pssl.cxx

Modified: ptlib/tags/v2_16_1/src/ptclib/pssl.cxx
===================================================================
--- ptlib/tags/v2_16_1/src/ptclib/pssl.cxx	2016-04-17 17:20:36 UTC (rev 34772)
+++ ptlib/tags/v2_16_1/src/ptclib/pssl.cxx	2016-04-17 17:25:31 UTC (rev 34773)
@@ -1881,7 +1881,6 @@
     case TLSv1:
       meth = TLSv1_method(); 
       break;
-#if OPENSSL_VERSION_NUMBER > 0x0090819fL
     case TLSv1_1 :
       meth = TLSv1_1_method(); 
       break;
@@ -1906,7 +1905,6 @@
       meth = DTLSv1_method();
       break;
 #endif
-#endif
     default :
       PAssertAlways("Unsupported TLS/DTLS version");
       m_context = NULL;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Opalvoip-svn] SF.net SVN: opalvoip:[34772] ptlib/branches/v2_16/src/ptclib/pssl.cxx

[<rjo...@us...>]

Revision: 34772
          http://sourceforge.net/p/opalvoip/code/34772
Author:   rjongbloed
Date:     2016-04-17 17:20:36 +0000 (Sun, 17 Apr 2016)
Log Message:
-----------
Fixed build against older OpenSSL

Modified Paths:
--------------
    ptlib/branches/v2_16/src/ptclib/pssl.cxx

Modified: ptlib/branches/v2_16/src/ptclib/pssl.cxx
===================================================================
--- ptlib/branches/v2_16/src/ptclib/pssl.cxx	2016-04-17 17:01:18 UTC (rev 34771)
+++ ptlib/branches/v2_16/src/ptclib/pssl.cxx	2016-04-17 17:20:36 UTC (rev 34772)
@@ -1881,6 +1881,7 @@
     case TLSv1:
       meth = TLSv1_method(); 
       break;
+#if OPENSSL_VERSION_NUMBER > 0x0090819fL
     case TLSv1_1 :
       meth = TLSv1_1_method(); 
       break;
@@ -1905,6 +1906,7 @@
       meth = DTLSv1_method();
       break;
 #endif
+#endif
     default :
       PAssertAlways("Unsupported TLS/DTLS version");
       m_context = NULL;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Opalvoip-svn] SF.net SVN: opalvoip:[34771] ptlib/tags/v2_16_1/src/ptclib/pssl.cxx

[<rjo...@us...>]

Revision: 34771
          http://sourceforge.net/p/opalvoip/code/34771
Author:   rjongbloed
Date:     2016-04-17 17:01:18 +0000 (Sun, 17 Apr 2016)
Log Message:
-----------
Fixed build against older OpenSSL

Modified Paths:
--------------
    ptlib/tags/v2_16_1/src/ptclib/pssl.cxx

Modified: ptlib/tags/v2_16_1/src/ptclib/pssl.cxx
===================================================================
--- ptlib/tags/v2_16_1/src/ptclib/pssl.cxx	2016-04-06 13:34:33 UTC (rev 34770)
+++ ptlib/tags/v2_16_1/src/ptclib/pssl.cxx	2016-04-17 17:01:18 UTC (rev 34771)
@@ -1881,6 +1881,7 @@
     case TLSv1:
       meth = TLSv1_method(); 
       break;
+#if OPENSSL_VERSION_NUMBER > 0x0090819fL
     case TLSv1_1 :
       meth = TLSv1_1_method(); 
       break;
@@ -1905,6 +1906,7 @@
       meth = DTLSv1_method();
       break;
 #endif
+#endif
     default :
       PAssertAlways("Unsupported TLS/DTLS version");
       m_context = NULL;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Opalvoip-svn] SF.net SVN: opalvoip:[34770] opal/trunk

[<rjo...@us...>]

Revision: 34770
          http://sourceforge.net/p/opalvoip/code/34770
Author:   rjongbloed
Date:     2016-04-06 13:34:33 +0000 (Wed, 06 Apr 2016)
Log Message:
-----------
Added time that RTP packet physically was read into the system.
Also collected various items of meta data around the RTP packet into a separate struct for ease of copying. Especially as we add more in the future.

Modified Paths:
--------------
    opal/trunk/include/rtp/h235_session.h
    opal/trunk/include/rtp/rtp.h
    opal/trunk/include/rtp/rtp_session.h
    opal/trunk/src/rtp/h235_session.cxx
    opal/trunk/src/rtp/rtp.cxx
    opal/trunk/src/rtp/rtp_session.cxx

Modified: opal/trunk/include/rtp/h235_session.h
===================================================================
--- opal/trunk/include/rtp/h235_session.h	2016-04-05 20:20:41 UTC (rev 34769)
+++ opal/trunk/include/rtp/h235_session.h	2016-04-06 13:34:33 UTC (rev 34770)
@@ -124,7 +124,7 @@
 
     virtual SendReceiveStatus OnSendData(RTP_DataFrame & frame, RewriteMode rewrite);
 #if !H235_6_CODED_TO_CORRECT_SPECIFICATION
-    virtual SendReceiveStatus OnReceiveData(RTP_DataFrame & frame, PINDEX pduSize);
+    virtual SendReceiveStatus OnPreReceiveData(RTP_DataFrame & frame);
 #endif
     virtual SendReceiveStatus OnReceiveData(RTP_DataFrame & frame);
 

Modified: opal/trunk/include/rtp/rtp.h
===================================================================
--- opal/trunk/include/rtp/rtp.h	2016-04-05 20:20:41 UTC (rev 34769)
+++ opal/trunk/include/rtp/rtp.h	2016-04-06 13:34:33 UTC (rev 34770)
@@ -504,6 +504,7 @@
   public:
     RTP_DataFrame(PINDEX payloadSize = 0, PINDEX bufferSize = 0);
     RTP_DataFrame(const BYTE * data, PINDEX len, bool dynamic = true);
+    RTP_DataFrame(const PBYTEArray data);
 
     enum {
       ProtocolVersion = 2,
@@ -651,36 +652,50 @@
     // Get the packet size including headers, padding etc.
     PINDEX GetPacketSize() const;
 
+    struct MetaData
+    {
+        MetaData();
+
+        PTime    m_absoluteTime; // Wall clock time packet was sent, as calculated via RTCP and timestamp
+        PTime    m_networkTime;  // Wall clock time packet physically read from socket
+        unsigned m_discontinuity;
+        PString  m_lipSyncId;
+    };
+
+    /**Get meta data for RTP packet.
+      */
+    const MetaData & GetMetaData() const { return m_metaData; }
+
     /**Get absolute (wall clock) time of packet, if known.
       */
-    PTime GetAbsoluteTime() const { return m_absoluteTime; }
+    PTime GetAbsoluteTime() const { return m_metaData.m_absoluteTime; }
 
     /**Set absolute (wall clock) time of packet.
       */
-    void SetAbsoluteTime() { m_absoluteTime.SetCurrentTime(); }
-    void SetAbsoluteTime(const PTime & t) { m_absoluteTime = t; }
+    void SetAbsoluteTime() { m_metaData.m_absoluteTime.SetCurrentTime(); }
+    void SetAbsoluteTime(const PTime & t) { m_metaData.m_absoluteTime = t; }
 
     /** Get sequence number discontinuity.
         If non-zero this indicates the number of packets detected as missing
         before this packet.
       */
-    unsigned GetDiscontinuity() const { return m_discontinuity; }
+    unsigned GetDiscontinuity() const { return m_metaData.m_discontinuity; }
 
-    void SetDiscontinuity(unsigned lost) { m_discontinuity = lost; }
+    void SetDiscontinuity(unsigned lost) { m_metaData.m_discontinuity = lost; }
 
     /** Get the identifier that links audio and video streams for
         "lip synch" purposes.
     */
-    const PString & GetLipSyncId() const { return m_lipSyncId; }
+    const PString & GetLipSyncId() const { return m_metaData.m_lipSyncId; }
 
     /** Set the identifier that links audio and video streams for
         "lip synch" purposes.
     */
-    void SetLipSyncId(const PString & id) { m_lipSyncId = id; }
+    void SetLipSyncId(const PString & id) { m_metaData.m_lipSyncId = id; }
 
     // backward compatibility
-    P_DEPRECATED const PString & GetBundleId() const { return m_lipSyncId; }
-    P_DEPRECATED void SetBundleId(const PString & id) { m_lipSyncId = id; }
+    P_DEPRECATED const PString & GetBundleId() const { return m_metaData.m_lipSyncId; }
+    P_DEPRECATED void SetBundleId(const PString & id) { m_metaData.m_lipSyncId = id; }
 
   protected:
     bool AdjustHeaderSize(PINDEX newSize);
@@ -688,9 +703,7 @@
     PINDEX   m_headerSize;
     PINDEX   m_payloadSize;
     PINDEX   m_paddingSize;
-    PTime    m_absoluteTime;
-    unsigned m_discontinuity;
-    PString  m_lipSyncId;
+    MetaData m_metaData;
 
 #if PTRACING
     friend ostream & operator<<(ostream & o, PayloadTypes t);

Modified: opal/trunk/include/rtp/rtp_session.h
===================================================================
--- opal/trunk/include/rtp/rtp_session.h	2016-04-05 20:20:41 UTC (rev 34769)
+++ opal/trunk/include/rtp/rtp_session.h	2016-04-06 13:34:33 UTC (rev 34770)
@@ -214,7 +214,7 @@
 
     virtual SendReceiveStatus OnSendData(RTP_DataFrame & frame, RewriteMode rewrite);
     virtual SendReceiveStatus OnSendControl(RTP_ControlFrame & frame);
-    virtual SendReceiveStatus OnReceiveData(RTP_DataFrame & frame, PINDEX pduSize);
+    virtual SendReceiveStatus OnPreReceiveData(RTP_DataFrame & frame);
     virtual SendReceiveStatus OnReceiveData(RTP_DataFrame & frame);
     virtual SendReceiveStatus OnReceiveControl(RTP_ControlFrame & frame);
     virtual SendReceiveStatus OnOutOfOrderPacket(RTP_DataFrame & frame);
@@ -813,8 +813,8 @@
     P_REMOVE_VIRTUAL(SendReceiveStatus,OnReadTimeout(RTP_DataFrame&),e_AbortTransport);
     P_REMOVE_VIRTUAL(SendReceiveStatus,InternalReadData(RTP_DataFrame &),e_AbortTransport);
     P_REMOVE_VIRTUAL(SendReceiveStatus,SendReport(bool),e_AbortTransport);
+    P_REMOVE_VIRTUAL(SendReceiveStatus,OnReceiveData(RTP_DataFrame&, PINDEX),e_AbortTransport);
 
-
   friend class RTCP_XR_Metrics;
 };
 

Modified: opal/trunk/src/rtp/h235_session.cxx
===================================================================
--- opal/trunk/src/rtp/h235_session.cxx	2016-04-05 20:20:41 UTC (rev 34769)
+++ opal/trunk/src/rtp/h235_session.cxx	2016-04-06 13:34:33 UTC (rev 34770)
@@ -290,13 +290,13 @@
 
 
 #if !H235_6_CODED_TO_CORRECT_SPECIFICATION
-OpalRTPSession::SendReceiveStatus H2356_Session::OnReceiveData(RTP_DataFrame & frame, PINDEX pduSize)
+OpalRTPSession::SendReceiveStatus H2356_Session::OnPreReceiveData(RTP_DataFrame & frame)
 {
   // Allow for broken implementations that set padding bit but do not set the padding length!
   bool padding = frame.GetPadding();
   frame.SetPadding(false);
 
-  SendReceiveStatus status = OpalRTPSession::OnReceiveData(frame, pduSize);
+  SendReceiveStatus status = OpalRTPSession::OnPreReceiveData(frame);
 
   frame.SetPadding(padding);
 

Modified: opal/trunk/src/rtp/rtp.cxx
===================================================================
--- opal/trunk/src/rtp/rtp.cxx	2016-04-05 20:20:41 UTC (rev 34769)
+++ opal/trunk/src/rtp/rtp.cxx	2016-04-06 13:34:33 UTC (rev 34770)
@@ -55,13 +55,19 @@
 
 /////////////////////////////////////////////////////////////////////////////
 
+RTP_DataFrame::MetaData::MetaData()
+  : m_absoluteTime(0)
+  , m_networkTime(0)
+  , m_discontinuity(0)
+{
+}
+
+
 RTP_DataFrame::RTP_DataFrame(PINDEX payloadSz, PINDEX bufferSz)
   : PBYTEArray(max(bufferSz, MinHeaderSize+payloadSz))
   , m_headerSize(MinHeaderSize)
   , m_payloadSize(payloadSz)
   , m_paddingSize(0)
-  , m_absoluteTime(0)
-  , m_discontinuity(0)
 {
   theArray[0] = '\x80'; // Default to version 2
   theArray[1] = '\x7f'; // Default to MaxPayloadType
@@ -73,16 +79,29 @@
   , m_headerSize(MinHeaderSize)
   , m_payloadSize(0)
   , m_paddingSize(0)
-  , m_absoluteTime(0)
-  , m_discontinuity(0)
 {
   SetPacketSize(len);
 }
 
 
+RTP_DataFrame::RTP_DataFrame(const PBYTEArray data)
+  : PBYTEArray(data)
+  , m_headerSize(MinHeaderSize)
+  , m_payloadSize(0)
+  , m_paddingSize(0)
+{
+  if (SetPacketSize(data.GetSize()))
+    m_metaData.m_networkTime.SetCurrentTime();
+  else {
+    SetSize(MinHeaderSize);
+    theArray[0] = 0; // Make illegal RTP frame
+  }
+}
+
+
 bool RTP_DataFrame::SetPacketSize(PINDEX sz)
 {
-  m_discontinuity = 0;
+  m_metaData.m_discontinuity = 0;
 
   if (sz < RTP_DataFrame::MinHeaderSize) {
     PTRACE(2, "RTP\tInvalid RTP packet, "
@@ -193,9 +212,7 @@
 {
   if (AdjustHeaderSize(other.m_headerSize))
     memcpy(theArray, other.theArray, m_headerSize);
-  SetDiscontinuity(other.GetDiscontinuity());
-  SetAbsoluteTime(other.GetAbsoluteTime());
-  SetLipSyncId(other.GetLipSyncId());
+  m_metaData = other.m_metaData;
 }
 
 
@@ -207,9 +224,7 @@
     m_headerSize = other.m_headerSize;
     m_payloadSize = other.m_payloadSize;
     m_paddingSize = other.m_paddingSize;
-    SetDiscontinuity(other.GetDiscontinuity());
-    SetAbsoluteTime(other.GetAbsoluteTime());
-    SetLipSyncId(other.GetLipSyncId());
+    m_metaData    = other.m_metaData;
   }
 }
 

Modified: opal/trunk/src/rtp/rtp_session.cxx
===================================================================
--- opal/trunk/src/rtp/rtp_session.cxx	2016-04-05 20:20:41 UTC (rev 34769)
+++ opal/trunk/src/rtp/rtp_session.cxx	2016-04-06 13:34:33 UTC (rev 34770)
@@ -1207,16 +1207,13 @@
 }
 
 
-OpalRTPSession::SendReceiveStatus OpalRTPSession::OnReceiveData(RTP_DataFrame & frame, PINDEX pduSize)
+OpalRTPSession::SendReceiveStatus OpalRTPSession::OnPreReceiveData(RTP_DataFrame & frame)
 {
   for (SyncSourceMap::iterator it = m_SSRC.begin(); it != m_SSRC.end(); ++it) {
     if (!it->second->HandlePendingFrames())
       return e_AbortTransport;
   }
 
-  if (pduSize < RTP_DataFrame::MinHeaderSize)
-    return e_IgnorePacket; // Non fatal error, just ignore
-
   // Check that the PDU is the right version
   if (frame.GetVersion() != RTP_DataFrame::ProtocolVersion)
     return e_IgnorePacket; // Non fatal error, just ignore
@@ -1232,9 +1229,6 @@
     return e_IgnorePacket; // Non fatal error, just ignore
   }
 
-  if (!frame.SetPacketSize(pduSize))
-    return e_IgnorePacket; // Non fatal error, just ignore
-
   SyncSource * receiver = UseSyncSource(frame.GetSyncSource(), e_Receiver, false);
   if (receiver == NULL)
       return e_IgnorePacket;
@@ -2554,9 +2548,8 @@
       CheckMediaFailed(e_Control);
   }
   else {
-    RTP_DataFrame frame;
-    frame.PBYTEArray::operator=(data);
-    if (OnReceiveData(frame, data.GetSize()) == e_AbortTransport)
+    RTP_DataFrame frame(data);
+    if (OnPreReceiveData(frame) == e_AbortTransport)
       CheckMediaFailed(e_Data);
   }
 }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Opalvoip-svn] SF.net SVN: opalvoip:[34769] opal/trunk

[<rjo...@us...>]

Revision: 34769
          http://sourceforge.net/p/opalvoip/code/34769
Author:   rjongbloed
Date:     2016-04-05 20:20:41 +0000 (Tue, 05 Apr 2016)
Log Message:
-----------
Merged revision(s) 34767-34768 from opal/branches/v3_16:
Added missing lock when sending SIP packet response, could try and send twice, if transaction command PDU and it's retransmit arrive together due to network foo.

Modified Paths:
--------------
    opal/trunk/src/sip/sippdu.cxx

Property Changed:
----------------
    opal/trunk/

Index: opal/trunk
===================================================================
--- opal/trunk	2016-04-05 20:19:03 UTC (rev 34768)
+++ opal/trunk	2016-04-05 20:20:41 UTC (rev 34769)

Property changes on: opal/trunk
___________________________________________________________________
Modified: svn:mergeinfo
## -10,7 +10,7 ##
 /opal/branches/v3_10:25182-29485,30896,32927-32928,32933
 /opal/branches/v3_12:28489-31709
 /opal/branches/v3_14:31505-33613
-/opal/branches/v3_16:34090-34766
+/opal/branches/v3_16:34090-34768
 /opal/branches/v3_2:21143,21220,21227,21253,21455
 /opal/branches/v3_4:21060,21062,21088,21092,21111,21113,21115,21119,21143,21148,21151-21152,21155,21158,21184,21188,21253,21265-21266,21283-21284,21298,21300,21303,21307,21309,21311,21327,21331,21333,21359,21367,21369,21488,21556,21564-21565,21568,21570,21620,21625,21631,21748,21751,21756,21759,21761,21767,21770,22246,23044,23140,23143,23286
 /opal/branches/v3_6:22169,22178,22184,22186,22197,22204,22216,22251,22253,22255,22258,22260,22291,22296,22300,22306,22308,22313,22319,22336,22353,22358,22436,22447,22449,22497,22511,22517,22519-22521,22527,22536,22538,22589,22596,22599,22617,22620,22622,22630,22640,22655,22675,22682,22726-22728,22730,22733,22738,22745-22746,22800,22820-22821,22842,22844-22845,22851,22853,22889,22896,22902,22904,22906,22918,22924,22928,22946,22965,22967,22976,22978,22980,22982,22994,23028,23123,23125-23126,23128,23157,23165,23173,23175,23183,23294,23341,23465,23467,23474,23521,23829,24346,24809
\ No newline at end of property
Modified: opal/trunk/src/sip/sippdu.cxx
===================================================================
--- opal/trunk/src/sip/sippdu.cxx	2016-04-05 20:19:03 UTC (rev 34768)
+++ opal/trunk/src/sip/sippdu.cxx	2016-04-05 20:20:41 UTC (rev 34769)
@@ -3782,6 +3782,8 @@
 
 bool SIPResponse::Send()
 {
+  PSafeLockReadWrite lock(*this);
+
   if (m_state == NotStarted) {
     GetEndPoint().AddTransaction(this);
     m_state = Completed;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Opalvoip-svn] SF.net SVN: opalvoip:[34768] opal/branches/v3_16/src/sip/sippdu.cxx

[<rjo...@us...>]

Revision: 34768
          http://sourceforge.net/p/opalvoip/code/34768
Author:   rjongbloed
Date:     2016-04-05 20:19:03 +0000 (Tue, 05 Apr 2016)
Log Message:
-----------
Added missing lock when sending SIP packet response, could try and send twice, if transaction command PDU and it's retransmit arrive together due to network foo.

Modified Paths:
--------------
    opal/branches/v3_16/src/sip/sippdu.cxx

Modified: opal/branches/v3_16/src/sip/sippdu.cxx
===================================================================
--- opal/branches/v3_16/src/sip/sippdu.cxx	2016-04-05 20:06:52 UTC (rev 34767)
+++ opal/branches/v3_16/src/sip/sippdu.cxx	2016-04-05 20:19:03 UTC (rev 34768)
@@ -3775,6 +3775,8 @@
 
 bool SIPResponse::Send()
 {
+  PSafeLockReadWrite lock(*this);
+
   if (m_state == NotStarted) {
     GetEndPoint().AddTransaction(this);
     m_state = Completed;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Opalvoip-svn] SF.net SVN: opalvoip:[34767] opal/trunk

[<rjo...@us...>]

Revision: 34767
          http://sourceforge.net/p/opalvoip/code/34767
Author:   rjongbloed
Date:     2016-04-05 20:06:52 +0000 (Tue, 05 Apr 2016)
Log Message:
-----------
Merged revision(s) 34755-34766 from opal/branches/v3_16:
Make sure media timeout timer is started when no media was EVER received.

Modified Paths:
--------------
    opal/trunk/src/opal/mediasession.cxx

Property Changed:
----------------
    opal/trunk/

Index: opal/trunk
===================================================================
--- opal/trunk	2016-04-05 20:04:10 UTC (rev 34766)
+++ opal/trunk	2016-04-05 20:06:52 UTC (rev 34767)

Property changes on: opal/trunk
___________________________________________________________________
Modified: svn:mergeinfo
## -10,7 +10,7 ##
 /opal/branches/v3_10:25182-29485,30896,32927-32928,32933
 /opal/branches/v3_12:28489-31709
 /opal/branches/v3_14:31505-33613
-/opal/branches/v3_16:34090-34754
+/opal/branches/v3_16:34090-34766
 /opal/branches/v3_2:21143,21220,21227,21253,21455
 /opal/branches/v3_4:21060,21062,21088,21092,21111,21113,21115,21119,21143,21148,21151-21152,21155,21158,21184,21188,21253,21265-21266,21283-21284,21298,21300,21303,21307,21309,21311,21327,21331,21333,21359,21367,21369,21488,21556,21564-21565,21568,21570,21620,21625,21631,21748,21751,21756,21759,21761,21767,21770,22246,23044,23140,23143,23286
 /opal/branches/v3_6:22169,22178,22184,22186,22197,22204,22216,22251,22253,22255,22258,22260,22291,22296,22300,22306,22308,22313,22319,22336,22353,22358,22436,22447,22449,22497,22511,22517,22519-22521,22527,22536,22538,22589,22596,22599,22617,22620,22622,22630,22640,22655,22675,22682,22726-22728,22730,22733,22738,22745-22746,22800,22820-22821,22842,22844-22845,22851,22853,22889,22896,22902,22904,22906,22918,22924,22928,22946,22965,22967,22976,22978,22980,22982,22994,23028,23123,23125-23126,23128,23157,23165,23173,23175,23183,23294,23341,23465,23467,23474,23521,23829,24346,24809
\ No newline at end of property
Modified: opal/trunk/src/opal/mediasession.cxx
===================================================================
--- opal/trunk/src/opal/mediasession.cxx	2016-04-05 20:04:10 UTC (rev 34766)
+++ opal/trunk/src/opal/mediasession.cxx	2016-04-05 20:06:52 UTC (rev 34767)
@@ -723,7 +723,7 @@
 
   if (++m_consecutiveUnavailableErrors == 1) {
     PTRACE(2, m_owner, *m_owner << m_subchannel << " port on remote not ready: " << m_owner->GetRemoteAddress(m_subchannel));
-    m_timeForUnavailableErrors = m_channel->GetReadTimeout();
+    m_timeForUnavailableErrors = m_owner->m_maxNoTransmitTime;
     return true;
   }
 
@@ -1150,6 +1150,7 @@
     SetMinBufferSize(socket, SO_RCVBUF, session.GetMediaType() == OpalMediaType::Audio() ? 0x4000 : 0x100000);
     SetMinBufferSize(socket, SO_SNDBUF, 0x2000);
   }
+  m_mediaTimer = m_mediaTimeout;
 
   m_opened = true;
   return true;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Opalvoip-svn] SF.net SVN: opalvoip:[34766] opal/branches/v3_16/src/opal/mediasession.cxx

[<rjo...@us...>]

Revision: 34766
          http://sourceforge.net/p/opalvoip/code/34766
Author:   rjongbloed
Date:     2016-04-05 20:04:10 +0000 (Tue, 05 Apr 2016)
Log Message:
-----------
Make sure OpalMediaSession is informed when OpalMediaTransport closes a subchannel.

Modified Paths:
--------------
    opal/branches/v3_16/src/opal/mediasession.cxx

Modified: opal/branches/v3_16/src/opal/mediasession.cxx
===================================================================
--- opal/branches/v3_16/src/opal/mediasession.cxx	2016-04-05 20:00:30 UTC (rev 34765)
+++ opal/branches/v3_16/src/opal/mediasession.cxx	2016-04-05 20:04:10 UTC (rev 34766)
@@ -711,6 +711,7 @@
     }
   }
 
+  m_owner->InternalRxData(m_subchannel, PBYTEArray());
   PTRACE(4, m_owner, *m_owner << m_subchannel << " media transport read thread ended");
 }
 
@@ -1044,6 +1045,9 @@
 {
   PTRACE_CONTEXT_ID_FROM(session);
 
+  if (!PAssert(subchannelCount > 0, PInvalidParameter))
+    return false;
+
   OpalManager & manager = session.GetConnection().GetEndPoint().GetManager();
 
   m_packetSize = manager.GetMaxRtpPacketSize();
@@ -1209,13 +1213,13 @@
   , m_remoteBehindNAT(init.m_remoteBehindNAT)
 {
   PTRACE_CONTEXT_ID_FROM(init.m_connection);
-  PTRACE(5, *this << "created for " << m_mediaType);
+  PTRACE(5, *this << "created " << this << " for " << m_mediaType);
 }
 
 
 OpalMediaSession::~OpalMediaSession()
 {
-  PTRACE(5, *this << "destroyed.");
+  PTRACE(5, *this << "destroyed " << this);
 }
 
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Opalvoip-svn] SF.net SVN: opalvoip:[34765] opal/branches/v3_16/src/opal/mediasession.cxx

[<rjo...@us...>]

Revision: 34765
          http://sourceforge.net/p/opalvoip/code/34765
Author:   rjongbloed
Date:     2016-04-05 20:00:30 +0000 (Tue, 05 Apr 2016)
Log Message:
-----------
Make sure media timeout timer is started when no media was EVER received.

Modified Paths:
--------------
    opal/branches/v3_16/src/opal/mediasession.cxx

Modified: opal/branches/v3_16/src/opal/mediasession.cxx
===================================================================
--- opal/branches/v3_16/src/opal/mediasession.cxx	2016-04-05 06:39:10 UTC (rev 34764)
+++ opal/branches/v3_16/src/opal/mediasession.cxx	2016-04-05 20:00:30 UTC (rev 34765)
@@ -1145,6 +1145,7 @@
     SetMinBufferSize(socket, SO_RCVBUF, session.GetMediaType() == OpalMediaType::Audio() ? 0x4000 : 0x100000);
     SetMinBufferSize(socket, SO_SNDBUF, 0x2000);
   }
+  m_mediaTimer = m_mediaTimeout;
 
   return true;
 }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Opalvoip-svn] SF.net SVN: opalvoip:[34764] opal/trunk/src/h323/gkclient.cxx

[<rjo...@us...>]

Revision: 34764
          http://sourceforge.net/p/opalvoip/code/34764
Author:   rjongbloed
Date:     2016-04-05 06:39:10 +0000 (Tue, 05 Apr 2016)
Log Message:
-----------
Fixed timing issue in gatekeeper start delay time, again.

Modified Paths:
--------------
    opal/trunk/src/h323/gkclient.cxx

Modified: opal/trunk/src/h323/gkclient.cxx
===================================================================
--- opal/trunk/src/h323/gkclient.cxx	2016-04-04 13:46:25 UTC (rev 34763)
+++ opal/trunk/src/h323/gkclient.cxx	2016-04-05 06:39:10 UTC (rev 34764)
@@ -276,12 +276,12 @@
   PTime now;
 
   if (m_nextGatekeeperDiscovery.IsValid()) {
-    delay = now - m_nextGatekeeperDiscovery;
+    delay = m_nextGatekeeperDiscovery - now;
     if (delay < 0)
       delay = 0;
   }
 
-  m_nextGatekeeperDiscovery = now + m_gatekeeperStartDelay;
+  m_nextGatekeeperDiscovery = (delay == 0 ? now : m_nextGatekeeperDiscovery) + m_gatekeeperStartDelay;
 
   m_delayGatekeeperMutex.Signal();
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Opalvoip-svn] SF.net SVN: opalvoip:[34763] opal/trunk

[<rjo...@us...>]

Revision: 34763
          http://sourceforge.net/p/opalvoip/code/34763
Author:   rjongbloed
Date:     2016-04-04 13:46:25 +0000 (Mon, 04 Apr 2016)
Log Message:
-----------
Added support for MediaStreamTrack identifiers from SDP.

Modified Paths:
--------------
    opal/trunk/include/rtp/rtp_session.h
    opal/trunk/src/rtp/rtp_session.cxx
    opal/trunk/src/sdp/sdp.cxx

Modified: opal/trunk/include/rtp/rtp_session.h
===================================================================
--- opal/trunk/include/rtp/rtp_session.h	2016-04-04 11:15:11 UTC (rev 34762)
+++ opal/trunk/include/rtp/rtp_session.h	2016-04-04 13:46:25 UTC (rev 34763)
@@ -327,16 +327,26 @@
       */
     void SetCanonicalName(const PString & name, RTP_SyncSourceId ssrc = 0, Direction dir = e_Sender);
 
-    /**Get the "Media Stream" id for the RTP session SSRC.
-       See draft-alvestrand-mmusic-msid.
+    /**Get the "MediaStream" id for the RTP session SSRC.
+       See http://tools.ietf.org/html/draft-ietf-mmusic-msid-12
     */
     PString GetMediaStreamId(RTP_SyncSourceId ssrc, Direction dir) const;
 
-    /**Set the "Media Stream" id for the RTP session SSRC.
-       See draft-alvestrand-mmusic-msid.
+    /**Set the "MediaStream" id for the RTP session SSRC.
+       See http://tools.ietf.org/html/draft-ietf-mmusic-msid-12
     */
     void SetMediaStreamId(const PString & id, RTP_SyncSourceId ssrc, Direction dir);
 
+    /**Get the "MediaStreamTrack" id for the RTP session SSRC.
+       See http://tools.ietf.org/html/draft-ietf-mmusic-msid-12
+    */
+    PString GetMediaTrackId(RTP_SyncSourceId ssrc, Direction dir) const;
+
+    /**Set the "MediaStreamTrack" id for the RTP session SSRC.
+       See http://tools.ietf.org/html/draft-ietf-mmusic-msid-12
+    */
+    void SetMediaTrackId(const PString & id, RTP_SyncSourceId ssrc, Direction dir);
+
     /**Get the tool name for the RTP session.
       */
     PString GetToolName() const;
@@ -670,6 +680,7 @@
       RTP_SyncSourceId  m_loopbackIdentifier;
       PString           m_canonicalName;
       PString           m_mediaStreamId;
+      PString           m_mediaTrackId;
 
       NotifierMap m_notifiers;
 

Modified: opal/trunk/src/rtp/rtp_session.cxx
===================================================================
--- opal/trunk/src/rtp/rtp_session.cxx	2016-04-04 11:15:11 UTC (rev 34762)
+++ opal/trunk/src/rtp/rtp_session.cxx	2016-04-04 13:46:25 UTC (rev 34763)
@@ -952,13 +952,40 @@
   PSafeLockReadWrite lock(*this);
   SyncSource * info;
   if (GetSyncSource(ssrc, dir, info)) {
+    if (info->m_mediaTrackId.IsEmpty() || info->m_mediaTrackId.NumCompare(info->m_mediaStreamId + '+') == EqualTo)
+      info->m_mediaTrackId = PSTRSTRM(id << '+' << m_mediaType);
     info->m_mediaStreamId = id;
     info->m_mediaStreamId.MakeUnique();
-    PTRACE(4, *this << "set session id for SSRC=" << RTP_TRACE_SRC(ssrc) << " to \"" << id << '"');
+    PTRACE(4, *this << "set MediaStream id for SSRC=" << RTP_TRACE_SRC(ssrc) << " to \"" << id << '"');
   }
 }
 
 
+PString OpalRTPSession::GetMediaTrackId(RTP_SyncSourceId ssrc, Direction dir) const
+{
+  PString s;
+  PSafeLockReadOnly lock(*this);
+  SyncSource * info;
+  if (GetSyncSource(ssrc, dir, info)) {
+    s = info->m_mediaTrackId;
+    s.MakeUnique();
+  }
+  return s;
+}
+
+
+void OpalRTPSession::SetMediaTrackId(const PString & id, RTP_SyncSourceId ssrc, Direction dir)
+{
+  PSafeLockReadWrite lock(*this);
+  SyncSource * info;
+  if (GetSyncSource(ssrc, dir, info)) {
+    info->m_mediaTrackId = id;
+    info->m_mediaTrackId.MakeUnique();
+    PTRACE(4, *this << "set MediaStreamTrack id for SSRC=" << RTP_TRACE_SRC(ssrc) << " to \"" << id << '"');
+  }
+}
+
+
 PString OpalRTPSession::GetToolName() const
 {
   PSafeLockReadOnly lock(*this);

Modified: opal/trunk/src/sdp/sdp.cxx
===================================================================
--- opal/trunk/src/sdp/sdp.cxx	2016-04-04 11:15:11 UTC (rev 34762)
+++ opal/trunk/src/sdp/sdp.cxx	2016-04-04 13:46:25 UTC (rev 34763)
@@ -1780,21 +1780,10 @@
       strm << "a=rtcp:" << port << ' ' << GetConnectAddressString(m_mediaAddress) << CRLF;
   }
 
-  if (m_ssrcInfo.size() == 1) {
-    SsrcInfo::const_iterator it1 = m_ssrcInfo.begin();
-    for (PStringOptions::const_iterator it2 = it1->second.begin(); it2 != it1->second.end(); ++it2) {
-      strm << "a=";
-      if (it2->first == "cname")
-        strm << "ssrc:" << it1->first << ' ';
-      strm << it2->first << ':' << it2->second << CRLF;
-    }
+  for (SsrcInfo::const_iterator it1 = m_ssrcInfo.begin(); it1 != m_ssrcInfo.end(); ++it1) {
+    for (PStringOptions::const_iterator it2 = it1->second.begin(); it2 != it1->second.end(); ++it2)
+      strm << "a=ssrc:" << it1->first << ' ' << it2->first << ':' << it2->second << CRLF;
   }
-  else {
-    for (SsrcInfo::const_iterator it1 = m_ssrcInfo.begin(); it1 != m_ssrcInfo.end(); ++it1) {
-      for (PStringOptions::const_iterator it2 = it1->second.begin(); it2 != it1->second.end(); ++it2)
-        strm << "a=ssrc:" << it1->first << ' ' << it2->first << ':' << it2->second << CRLF;
-    }
-  }
 
   // m_rtcp_fb is set via SDPRTPAVPMediaDescription::PreEncode according to various options
   OuputRTCP_FB(strm, -1, m_rtcp_fb);
@@ -1847,6 +1836,17 @@
 #endif // OPAL_SRTP
 
 
+static void SetMediaStreamAndTrackIds(const PString & msid, PStringOptions & info)
+{
+  info.SetAt("msid", msid);
+
+  PString stream, track;
+  msid.Split(' ', stream, track);
+  info.SetAt("mslabel", stream);
+  info.SetAt("label", track);
+}
+
+
 void SDPRTPAVPMediaDescription::SetAttribute(const PString & attr, const PString & value)
 {
   /* NOTE: must make sure anything passed through to a SDPFormat isntance does
@@ -1919,8 +1919,7 @@
   if (attr *= "msid") {
     m_msid = value;
     for (SsrcInfo::iterator it = m_ssrcInfo.begin(); it != m_ssrcInfo.end(); ++it) {
-      it->second.SetAt("msid", value);
-      it->second.SetAt("mslabel", m_msid.Left(m_msid.Find(' ')));
+      SetMediaStreamAndTrackIds(value, it->second);
       PTRACE(2, "SSRC: " << RTP_TRACE_SRC(it->first) << " m level msid: \"" << m_msid << '"');
     }
     return;
@@ -1935,8 +1934,7 @@
     }
     else {
       if (!m_msid.IsEmpty()) {
-        m_ssrcInfo[ssrc].SetAt("msid", m_msid);
-        m_ssrcInfo[ssrc].SetAt("mslabel", m_msid.Left(m_msid.Find(' ')));
+        SetMediaStreamAndTrackIds(m_msid, m_ssrcInfo[ssrc]);
         PTRACE(2, "SSRC: " << RTP_TRACE_SRC(ssrc) << " m level msid: \"" << m_msid << '"');
       }
 
@@ -1947,7 +1945,7 @@
       if (key == "mslabel" && !m_temporaryFlowSSRC.empty())
         m_mediaStreams[val][0] = m_temporaryFlowSSRC;
       else if (key == "msid" && m_ssrcInfo[ssrc].GetString("mslabel").IsEmpty())
-        m_ssrcInfo[ssrc].SetAt("mslabel", val.Left(val.Find(' ')));
+        SetMediaStreamAndTrackIds(val, m_ssrcInfo[ssrc]);
     }
     return;
   }
@@ -1992,7 +1990,7 @@
         info.SetAt("cname", cname);
       PString mslabel = rtpSession->GetMediaStreamId(*it, OpalRTPSession::e_Sender);
       if (!mslabel.IsEmpty()) {
-        PString label = mslabel + '+' + session->GetMediaType();
+        PString label = rtpSession->GetMediaTrackId(*it, OpalRTPSession::e_Sender);
         info.SetAt("mslabel", mslabel);
         info.SetAt("label", label);
         info.SetAt("msid", mslabel & label);
@@ -2052,6 +2050,7 @@
           rtpSession->SetAnySyncSource(false);
           PTRACE(4, "Session " << session->GetSessionID() << ", added receiver SSRC " << RTP_TRACE_SRC(ssrc));
         }
+        rtpSession->SetMediaTrackId(it->second.GetString("label"), ssrc, OpalRTPSession::e_Receiver);
         rtpSession->SetMediaStreamId(it->second.GetString("mslabel"), ssrc, OpalRTPSession::e_Receiver);
       }
     }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Opalvoip-svn] SF.net SVN: opalvoip:[34762] opal/trunk

[<rjo...@us...>]

Revision: 34762
          http://sourceforge.net/p/opalvoip/code/34762
Author:   rjongbloed
Date:     2016-04-04 11:15:11 +0000 (Mon, 04 Apr 2016)
Log Message:
-----------
Fixed timing issue in gatekeeper start delay time.

Modified Paths:
--------------
    opal/trunk/include/h323/h323ep.h
    opal/trunk/src/h323/gkclient.cxx
    opal/trunk/src/h323/h323ep.cxx

Modified: opal/trunk/include/h323/h323ep.h
===================================================================
--- opal/trunk/include/h323/h323ep.h	2016-04-03 16:44:51 UTC (rev 34761)
+++ opal/trunk/include/h323/h323ep.h	2016-04-04 11:15:11 UTC (rev 34762)
@@ -1434,7 +1434,7 @@
     PString       gkAccessTokenOID;
     bool          m_sendGRQ;
     bool          m_oneSignalAddressInRRQ;
-    PTime         m_lastGatekeeperDiscovery;
+    PTime         m_nextGatekeeperDiscovery;
     PMutex        m_delayGatekeeperMutex;
 
     /* Protect against absence of a response to the ctIdentify reqest

Modified: opal/trunk/src/h323/gkclient.cxx
===================================================================
--- opal/trunk/src/h323/gkclient.cxx	2016-04-03 16:44:51 UTC (rev 34761)
+++ opal/trunk/src/h323/gkclient.cxx	2016-04-04 11:15:11 UTC (rev 34762)
@@ -273,13 +273,15 @@
 
   m_delayGatekeeperMutex.Wait();
 
-  if (m_lastGatekeeperDiscovery.IsValid()) {
-    PTimeInterval elapsed = m_lastGatekeeperDiscovery.GetElapsed();
-    if (elapsed < m_gatekeeperStartDelay)
-      delay = m_gatekeeperStartDelay - elapsed;
+  PTime now;
+
+  if (m_nextGatekeeperDiscovery.IsValid()) {
+    delay = now - m_nextGatekeeperDiscovery;
+    if (delay < 0)
+      delay = 0;
   }
 
-  m_lastGatekeeperDiscovery.SetCurrentTime();
+  m_nextGatekeeperDiscovery = now + m_gatekeeperStartDelay;
 
   m_delayGatekeeperMutex.Signal();
 

Modified: opal/trunk/src/h323/h323ep.cxx
===================================================================
--- opal/trunk/src/h323/h323ep.cxx	2016-04-03 16:44:51 UTC (rev 34761)
+++ opal/trunk/src/h323/h323ep.cxx	2016-04-04 11:15:11 UTC (rev 34762)
@@ -99,7 +99,7 @@
   , registrationTimeToLive(0, 0, 10)       // Minutes
   , m_sendGRQ(true)
   , m_oneSignalAddressInRRQ(true)
-  , m_lastGatekeeperDiscovery(0)
+  , m_nextGatekeeperDiscovery(0)
   , callTransferT1(0,10)                   // Seconds
   , callTransferT2(0,10)                   // Seconds
   , callTransferT3(0,10)                   // Seconds

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Opalvoip-svn] SF.net SVN: opalvoip:[34761] opal/branches/v3_16/version.h

[<rjo...@us...>]

Revision: 34761
          http://sourceforge.net/p/opalvoip/code/34761
Author:   rjongbloed
Date:     2016-04-03 16:44:51 +0000 (Sun, 03 Apr 2016)
Log Message:
-----------
Update version number for beta v3.16.2

Modified Paths:
--------------
    opal/branches/v3_16/version.h

Modified: opal/branches/v3_16/version.h
===================================================================
--- opal/branches/v3_16/version.h	2016-04-03 16:44:47 UTC (rev 34760)
+++ opal/branches/v3_16/version.h	2016-04-03 16:44:51 UTC (rev 34761)
@@ -36,8 +36,8 @@
 
 #define MAJOR_VERSION 3
 #define MINOR_VERSION 16
-#define BUILD_TYPE ReleaseCode
-#define BUILD_NUMBER 1
+#define BUILD_TYPE BetaCode
+#define BUILD_NUMBER 2
 
 
 #endif  // _OPAL_VERSION_H

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Opalvoip-svn] SF.net SVN: opalvoip:[34760] opal/tags/v3_16_1/

[<rjo...@us...>]

Revision: 34760
          http://sourceforge.net/p/opalvoip/code/34760
Author:   rjongbloed
Date:     2016-04-03 16:44:47 +0000 (Sun, 03 Apr 2016)
Log Message:
-----------
Tagging v3_16_1

Added Paths:
-----------
    opal/tags/v3_16_1/

Index: opal/tags/v3_16_1
===================================================================
--- opal/branches/v3_16	2016-04-03 16:44:42 UTC (rev 34759)
+++ opal/tags/v3_16_1	2016-04-03 16:44:47 UTC (rev 34760)

Property changes on: opal/tags/v3_16_1
___________________________________________________________________
Added: svn:ignore
## -0,0 +1,25 ##
+*.Tags.WW
+*.ncb
+*.opensdf
+*.opt
+*.plg
+*.sdf
+*.suo
+Debug
+Lib
+Release
+a.out*
+aclocal.m4
+autom4te.cache
+bin
+config.log
+config.status
+desktop.ini
+doxygen.out
+html
+ipch
+lib*
+opal.pc
+opal.spec
+opal_cfg.dxy
+revision.h
Added: svn:mergeinfo
## -0,0 +1,19 ##
+/opal/branches/Avaya:33962-33963
+/opal/branches/EpsilonEridani:27633,27638,27727,27881-27882,27905,27935,28035,28305,28308,28439,28454,28534,29419,29516,29556,29978,29991,30000,30121-30122,30141,30151,30166,30459,30708,30722,30885,30934-30937,30955,32105,32607
+/opal/branches/Luyten_A:24769-25572
+/opal/branches/ProcyonSpecial:33491-33493,33643
+/opal/branches/Sirius_A:23371,23374,23549,23560,23770
+/opal/branches/Sirius_B:24566,24579,24589,24594,24596,24601,24604,24635-24636,24639-24642,24644,24651,24653,24655-24656,24683,24685,24714-24717,24771,24777-24783,24842,24845,24858,24947,24954-24970,24980,25085
+/opal/branches/autoconf:20594-21001
+/opal/branches/csoutheren/LalandeBranch1:23412-23413,23415,23424,23510,23516,23553,23577,23607,23669,23724,23742-23744,23747-23748,23755,23758,23780,23788,23848,23850,23856
+/opal/branches/rjongbloed/BarnardPlus:20584,20656,20749,20751,20756,20762,20786,20789,20814,20820,20829,20831,20841,20843,20923,20927,20938,22016-22017,22518,22582,22941
+/opal/branches/v3_10:25182-29485,30896,32927-32928,32933
+/opal/branches/v3_12:28489-31709
+/opal/branches/v3_14:31505-33613
+/opal/branches/v3_2:21143,21220,21227,21253,21455
+/opal/branches/v3_4:21060,21062,21088,21092,21111,21113,21115,21119,21143,21148,21151-21152,21155,21158,21184,21188,21253,21265-21266,21283-21284,21298,21300,21303,21307,21309,21311,21327,21331,21333,21359,21367,21369,21488,21556,21564-21565,21568,21570,21620,21625,21631,21748,21751,21756,21759,21761,21767,21770,22246,23044,23140,23143,23286
+/opal/branches/v3_6:22169,22178,22184,22186,22197,22204,22216,22251,22253,22255,22258,22260,22291,22296,22300,22306,22308,22313,22319,22336,22353,22358,22436,22447,22449,22497,22511,22517,22519-22521,22527,22536,22538,22589,22596,22599,22617,22620,22622,22630,22640,22655,22675,22682,22726-22728,22730,22733,22738,22745-22746,22800,22820-22821,22842,22844-22845,22851,22853,22889,22896,22902,22904,22906,22918,22924,22928,22946,22965,22967,22976,22978,22980,22982,22994,23028,23123,23125-23126,23128,23157,23165,23173,23175,23183,23294,23341,23465,23467,23474,23521,23829,24346,24809
+/opal/branches/v3_8:24025,24027,24029,24036,24038,24040,24042,24048,24050,24058,24061,24068,24071,24074,24076,24080,24082,24086-24087,24092,24099,24101,24105,24107,24109,24111,24114,24116-24117,24120-24121,24125,24127,24130,24132,24134,24138,24140,24144,24146,24148,24150-24151,24154,24156,24158,24162,24170,24218,24245,24257,24261,24340,24362-24363,24365,24369,24373,24422,24440,24442,24447,24489,24504,24506,24532,24536,24545,24547,24552,24554,24614,24678,24687,24699,24705,24775,24833,24861,24903,25146
+/opal/trunk:34112-34116,34118-34120,34122,34137-34139,34155-34156,34161-34165,34168,34170,34173,34177,34187-34190,34208,34218,34222,34237-34238,34246-34252,34269-34271,34281-34288,34297,34300,34303-34316,34333,34346,34365,34375,34377,34382-34384,34390,34393-34394,34399,34417-34421,34424,34430,34432,34435-34437,34440,34442,34455-34456,34480,34483-34484,34487-34488,34490-34491,34502-34503,34506,34588-34589,34718,34735,34746
+/ptlib/branches/v2_8:24136
+/ptlib/trunk:20820
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Opalvoip-svn] SF.net SVN: opalvoip:[34759] opal/branches/v3_16/version.h

[<rjo...@us...>]

Revision: 34759
          http://sourceforge.net/p/opalvoip/code/34759
Author:   rjongbloed
Date:     2016-04-03 16:44:42 +0000 (Sun, 03 Apr 2016)
Log Message:
-----------
Update release version number to 3.16.1

Modified Paths:
--------------
    opal/branches/v3_16/version.h

Modified: opal/branches/v3_16/version.h
===================================================================
--- opal/branches/v3_16/version.h	2016-04-03 16:35:38 UTC (rev 34758)
+++ opal/branches/v3_16/version.h	2016-04-03 16:44:42 UTC (rev 34759)
@@ -36,7 +36,7 @@
 
 #define MAJOR_VERSION 3
 #define MINOR_VERSION 16
-#define BUILD_TYPE BetaCode
+#define BUILD_TYPE ReleaseCode
 #define BUILD_NUMBER 1
 
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Opalvoip-svn] SF.net SVN: opalvoip:[34758] ptlib/branches/v2_16/version.h

[<rjo...@us...>]

Revision: 34758
          http://sourceforge.net/p/opalvoip/code/34758
Author:   rjongbloed
Date:     2016-04-03 16:35:38 +0000 (Sun, 03 Apr 2016)
Log Message:
-----------
Update version number for beta v2.16.2

Modified Paths:
--------------
    ptlib/branches/v2_16/version.h

Modified: ptlib/branches/v2_16/version.h
===================================================================
--- ptlib/branches/v2_16/version.h	2016-04-03 16:35:33 UTC (rev 34757)
+++ ptlib/branches/v2_16/version.h	2016-04-03 16:35:38 UTC (rev 34758)
@@ -35,8 +35,8 @@
 
 #define MAJOR_VERSION 2
 #define MINOR_VERSION 16
-#define BUILD_TYPE ReleaseCode
-#define BUILD_NUMBER 1
+#define BUILD_TYPE BetaCode
+#define BUILD_NUMBER 2
 
 
 #endif  // _PTLib_VERSION_H

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Opalvoip-svn] SF.net SVN: opalvoip:[34757] ptlib/tags/v2_16_1/

[<rjo...@us...>]

Revision: 34757
          http://sourceforge.net/p/opalvoip/code/34757
Author:   rjongbloed
Date:     2016-04-03 16:35:33 +0000 (Sun, 03 Apr 2016)
Log Message:
-----------
Tagging v2_16_1

Added Paths:
-----------
    ptlib/tags/v2_16_1/

Index: ptlib/tags/v2_16_1
===================================================================
--- ptlib/branches/v2_16	2016-04-03 16:35:27 UTC (rev 34756)
+++ ptlib/tags/v2_16_1	2016-04-03 16:35:33 UTC (rev 34757)

Property changes on: ptlib/tags/v2_16_1
___________________________________________________________________
Added: svn:ignore
## -0,0 +1,26 ##
+Lib
+Debug
+Release
+*.suo
+*.ncb
+*.opt
+*.plg
+*.Tags.WW
+config.log
+config.status
+a.out*
+Makefile
+html
+bin
+lib*
+ptlib_cfg.dxy
+ptlib.pc
+ptlib_debug.pc
+autom4te.cache
+aclocal.m4
+doxygen.out
+revision.h
+*.opensdf
+*.sdf
+ipch
+.idea
Added: svn:mergeinfo
## -0,0 +1,13 ##
+/opal/branches/v3_6:23595
+/opal/trunk:26179
+/ptlib/branches/EpsilonEridani:27900,27903,28505,30953
+/ptlib/branches/Sirius_B:24839,24844,24968,24982
+/ptlib/branches/csoutheren/LalandeBranch1:23331-23333,23723
+/ptlib/branches/v2_10:25177-29189,32921,32947
+/ptlib/branches/v2_12:28485-31603
+/ptlib/branches/v2_14:31501-33720
+/ptlib/branches/v2_2:20746,20791,20827,22014,22942
+/ptlib/branches/v2_4:21086,21094,21147,21160,21185,21281,21296,21305,21322,21337,21363,21467,21471-21472,21506,21508,21623,21695,21744,21746,21763,22241,22958,23045-23046,23061,23066,23712
+/ptlib/branches/v2_6:22195,22243,22295,22304,22311,22317,22320,22356,22458,22509,22587,22601-22602,22611,22629,22633,22673,22681,22729,22731-22732,22736,22742,22848,22960,22992,23161,23163,23167,23169,23177,23239,23291,23298,23336,23429,23595,23823,23827,23873,24816
+/ptlib/branches/v2_8:24034,24044,24046,24054,24060,24065,24084,24090,24113,24136,24142,24165-24166,24168,24172,24367,24372,24410,24540,24992
+/ptlib/trunk:34109-34115,34121,34140,34142-34143,34146-34149,34152-34154,34169,34171-34172,34180,34182,34184,34194,34219,34221,34231-34232,34244-34245,34254,34267-34268,34280-34284,34298-34315,34335,34344-34345,34347,34354-34356,34366,34379,34398,34405-34411,34418-34423,34493-34508,34581,34584,34722,34740-34745
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Opalvoip-svn] SF.net SVN: opalvoip:[34756] ptlib/branches/v2_16/version.h

[<rjo...@us...>]

Revision: 34756
          http://sourceforge.net/p/opalvoip/code/34756
Author:   rjongbloed
Date:     2016-04-03 16:35:27 +0000 (Sun, 03 Apr 2016)
Log Message:
-----------
Update release version number to 2.16.1

Modified Paths:
--------------
    ptlib/branches/v2_16/version.h

Modified: ptlib/branches/v2_16/version.h
===================================================================
--- ptlib/branches/v2_16/version.h	2016-04-03 15:56:18 UTC (rev 34755)
+++ ptlib/branches/v2_16/version.h	2016-04-03 16:35:27 UTC (rev 34756)
@@ -35,7 +35,7 @@
 
 #define MAJOR_VERSION 2
 #define MINOR_VERSION 16
-#define BUILD_TYPE BetaCode
+#define BUILD_TYPE ReleaseCode
 #define BUILD_NUMBER 1
 
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Opalvoip-svn] SF.net SVN: opalvoip:[34755] opal/trunk

[<rjo...@us...>]

Revision: 34755
          http://sourceforge.net/p/opalvoip/code/34755
Author:   rjongbloed
Date:     2016-04-03 15:56:18 +0000 (Sun, 03 Apr 2016)
Log Message:
-----------
Merged revision(s) 34752-34754 from opal/branches/v3_16:
Changed video recording to AVI file to use slightly "safer" buffer management.
Fixed OpenPhone build on Ubuntu

Modified Paths:
--------------
    opal/trunk/samples/openphone/Makefile
    opal/trunk/src/opal/recording.cxx

Property Changed:
----------------
    opal/trunk/

Index: opal/trunk
===================================================================
--- opal/trunk	2016-04-03 15:44:16 UTC (rev 34754)
+++ opal/trunk	2016-04-03 15:56:18 UTC (rev 34755)

Property changes on: opal/trunk
___________________________________________________________________
Modified: svn:mergeinfo
## -10,7 +10,7 ##
 /opal/branches/v3_10:25182-29485,30896,32927-32928,32933
 /opal/branches/v3_12:28489-31709
 /opal/branches/v3_14:31505-33613
-/opal/branches/v3_16:34090-34751
+/opal/branches/v3_16:34090-34754
 /opal/branches/v3_2:21143,21220,21227,21253,21455
 /opal/branches/v3_4:21060,21062,21088,21092,21111,21113,21115,21119,21143,21148,21151-21152,21155,21158,21184,21188,21253,21265-21266,21283-21284,21298,21300,21303,21307,21309,21311,21327,21331,21333,21359,21367,21369,21488,21556,21564-21565,21568,21570,21620,21625,21631,21748,21751,21756,21759,21761,21767,21770,22246,23044,23140,23143,23286
 /opal/branches/v3_6:22169,22178,22184,22186,22197,22204,22216,22251,22253,22255,22258,22260,22291,22296,22300,22306,22308,22313,22319,22336,22353,22358,22436,22447,22449,22497,22511,22517,22519-22521,22527,22536,22538,22589,22596,22599,22617,22620,22622,22630,22640,22655,22675,22682,22726-22728,22730,22733,22738,22745-22746,22800,22820-22821,22842,22844-22845,22851,22853,22889,22896,22902,22904,22906,22918,22924,22928,22946,22965,22967,22976,22978,22980,22982,22994,23028,23123,23125-23126,23128,23157,23165,23173,23175,23183,23294,23341,23465,23467,23474,23521,23829,24346,24809
\ No newline at end of property
Modified: opal/trunk/samples/openphone/Makefile
===================================================================
--- opal/trunk/samples/openphone/Makefile	2016-04-03 15:44:16 UTC (rev 34754)
+++ opal/trunk/samples/openphone/Makefile	2016-04-03 15:56:18 UTC (rev 34755)
@@ -32,6 +32,15 @@
 USING_WX_WIDGETS:=yes
 
 
+ifneq (,$(DEBUG_BUILD))
+  ifneq (,$(shell $(WX_CONFIG) --list | grep debug))
+    WX_CONFIG += --debug=$(DEBUG_BUILD)
+  else
+    CPPFLAGS += -DOPAL_WX_DEBUG_HACK
+  endif
+endif
+
+
 # Need this before the include of opal.mak
 .DEFAULT_GOAL := bundle
 
@@ -43,6 +52,12 @@
 endif
 
 
+CPPFLAGS += $(shell $(WX_CONFIG) --cppflags)
+CXXFLAGS += $(shell $(WX_CONFIG) --cxxflags)
+CFLAGS   += $(shell $(WX_CONFIG) --cflags)
+LIBS     += $(shell $(WX_CONFIG) --libs)
+
+
 openphone.cxx : openphone.xrc
 	$(WXRC) openphone.xrc -c -o openphone.cxx
 

Modified: opal/trunk/src/opal/recording.cxx
===================================================================
--- opal/trunk/src/opal/recording.cxx	2016-04-03 15:44:16 UTC (rev 34754)
+++ opal/trunk/src/opal/recording.cxx	2016-04-03 15:56:18 UTC (rev 34755)
@@ -689,8 +689,12 @@
     return false;
   }
 
-  PINDEX bytesReturned = PVideoFrameInfo::CalculateFrameBytes(m_options.m_videoWidth, m_options.m_videoHeight);
-  if (m_videoConverter != NULL && !m_videoConverter->Convert(OpalVideoFrameDataPtr(header), m_videoBuffer.GetPointer(), &bytesReturned)) {
+  PINDEX bytesReturned;
+  if (m_videoConverter == NULL)
+    bytesReturned = m_videoBuffer.GetSize();
+  else if (!m_videoConverter->Convert(OPAL_VIDEO_FRAME_DATA_PTR(header),
+                                      m_videoBuffer.GetPointer(m_videoConverter->GetMaxDstFrameBytes()),
+                                      &bytesReturned)) {
     PTRACE(2, "Conversion of YUV420P to RGB24 failed!");
     return false;
   }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Opalvoip-svn] SF.net SVN: opalvoip:[34754] opal/branches/v3_16/samples/openphone/Makefile

[<rjo...@us...>]

Revision: 34754
          http://sourceforge.net/p/opalvoip/code/34754
Author:   rjongbloed
Date:     2016-04-03 15:44:16 +0000 (Sun, 03 Apr 2016)
Log Message:
-----------
Fixed OpenPhone build on Ubuntu

Modified Paths:
--------------
    opal/branches/v3_16/samples/openphone/Makefile

Modified: opal/branches/v3_16/samples/openphone/Makefile
===================================================================
--- opal/branches/v3_16/samples/openphone/Makefile	2016-04-02 14:48:18 UTC (rev 34753)
+++ opal/branches/v3_16/samples/openphone/Makefile	2016-04-03 15:44:16 UTC (rev 34754)
@@ -61,12 +61,7 @@
   endif
 endif
 
-CPPFLAGS += $(shell $(WX_CONFIG) --cppflags)
-CXXFLAGS += $(shell $(WX_CONFIG) --cxxflags)
-CFLAGS   += $(shell $(WX_CONFIG) --cflags)
-LDFLAGS  += $(shell $(WX_CONFIG) --libs)
 
-
 # Need this before the include of opal.mak
 .DEFAULT_GOAL := bundle
 
@@ -78,6 +73,12 @@
 endif
 
 
+CPPFLAGS += $(shell $(WX_CONFIG) --cppflags)
+CXXFLAGS += $(shell $(WX_CONFIG) --cxxflags)
+CFLAGS   += $(shell $(WX_CONFIG) --cflags)
+LIBS     += $(shell $(WX_CONFIG) --libs)
+
+
 openphone.cxx : openphone.xrc
 	$(WXRC) openphone.xrc -c -o openphone.cxx
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Opalvoip-svn] SF.net SVN: opalvoip:[34753] opal/branches/v3_16/src/opal/recording.cxx

[<rjo...@us...>]

Revision: 34753
          http://sourceforge.net/p/opalvoip/code/34753
Author:   rjongbloed
Date:     2016-04-02 14:48:18 +0000 (Sat, 02 Apr 2016)
Log Message:
-----------
Changed video recording to AVI file to use slightly "safer" buffer management.

Modified Paths:
--------------
    opal/branches/v3_16/src/opal/recording.cxx

Modified: opal/branches/v3_16/src/opal/recording.cxx
===================================================================
--- opal/branches/v3_16/src/opal/recording.cxx	2016-04-02 14:36:16 UTC (rev 34752)
+++ opal/branches/v3_16/src/opal/recording.cxx	2016-04-02 14:48:18 UTC (rev 34753)
@@ -689,8 +689,12 @@
     return false;
   }
 
-  PINDEX bytesReturned = m_options.m_videoWidth*m_options.m_videoHeight*3/2;
-  if (m_videoConverter != NULL && !m_videoConverter->Convert(OPAL_VIDEO_FRAME_DATA_PTR(header), m_videoBuffer.GetPointer(), &bytesReturned)) {
+  PINDEX bytesReturned;
+  if (m_videoConverter == NULL)
+    bytesReturned = m_videoBuffer.GetSize();
+  else if (!m_videoConverter->Convert(OPAL_VIDEO_FRAME_DATA_PTR(header),
+                                      m_videoBuffer.GetPointer(m_videoConverter->GetMaxDstFrameBytes()),
+                                      &bytesReturned)) {
     PTRACE(2, "Conversion of YUV420P to RGB24 failed!");
     return false;
   }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Opalvoip-svn] SF.net SVN: opalvoip:[34752] opal/trunk

[<rjo...@us...>]

Revision: 34752
          http://sourceforge.net/p/opalvoip/code/34752
Author:   rjongbloed
Date:     2016-04-02 14:36:16 +0000 (Sat, 02 Apr 2016)
Log Message:
-----------
Merged revision(s) 34750-34751 from opal/branches/v3_16:
Allow for Intra Frame request algorithm to be disabled through zero times. useful for when codec is not being used in real time environment.

Modified Paths:
--------------
    opal/trunk/src/codec/vidcodec.cxx

Property Changed:
----------------
    opal/trunk/

Index: opal/trunk
===================================================================
--- opal/trunk	2016-04-02 14:32:02 UTC (rev 34751)
+++ opal/trunk	2016-04-02 14:36:16 UTC (rev 34752)

Property changes on: opal/trunk
___________________________________________________________________
Modified: svn:mergeinfo
## -10,7 +10,7 ##
 /opal/branches/v3_10:25182-29485,30896,32927-32928,32933
 /opal/branches/v3_12:28489-31709
 /opal/branches/v3_14:31505-33613
-/opal/branches/v3_16:34090-34749
+/opal/branches/v3_16:34090-34751
 /opal/branches/v3_2:21143,21220,21227,21253,21455
 /opal/branches/v3_4:21060,21062,21088,21092,21111,21113,21115,21119,21143,21148,21151-21152,21155,21158,21184,21188,21253,21265-21266,21283-21284,21298,21300,21303,21307,21309,21311,21327,21331,21333,21359,21367,21369,21488,21556,21564-21565,21568,21570,21620,21625,21631,21748,21751,21756,21759,21761,21767,21770,22246,23044,23140,23143,23286
 /opal/branches/v3_6:22169,22178,22184,22186,22197,22204,22216,22251,22253,22255,22258,22260,22291,22296,22300,22306,22308,22313,22319,22336,22353,22358,22436,22447,22449,22497,22511,22517,22519-22521,22527,22536,22538,22589,22596,22599,22617,22620,22622,22630,22640,22655,22675,22682,22726-22728,22730,22733,22738,22745-22746,22800,22820-22821,22842,22844-22845,22851,22853,22889,22896,22902,22904,22906,22918,22924,22928,22946,22965,22967,22976,22978,22980,22982,22994,23028,23123,23125-23126,23128,23157,23165,23173,23175,23183,23294,23341,23465,23467,23474,23521,23829,24346,24809
\ No newline at end of property
Modified: opal/trunk/src/codec/vidcodec.cxx
===================================================================
--- opal/trunk/src/codec/vidcodec.cxx	2016-04-02 14:32:02 UTC (rev 34751)
+++ opal/trunk/src/codec/vidcodec.cxx	2016-04-02 14:36:16 UTC (rev 34752)
@@ -320,6 +320,10 @@
 
     switch (m_state) {
       case e_Idle :
+        if (m_maxThrottleTime == 0 || m_retryTime == 0) {
+          m_requestTimer.Stop();
+          return;
+        }
         break;
 
       case e_Throttled :
@@ -402,15 +406,19 @@
   // If idle, then this is a periodic request, restart the timer for another
   switch (m_state) {
     case e_Idle :
-      m_state = e_Periodic;
-      m_requestTimer = m_periodicTime;
-      PTRACE(4, "Periodic I-Frame request: next=" << m_periodicTime << " this=" << this);
+      if (m_periodicTime > 0) {
+        m_state = e_Periodic;
+        m_requestTimer = m_periodicTime;
+        PTRACE(4, "Periodic I-Frame request: next=" << m_periodicTime << " this=" << this);
+      }
       break;
 
     case e_Throttled :
       m_state = e_Idle;
-      m_requestTimer = m_periodicTime;
-      PTRACE(4, "End throttled I-Frames: next=" << m_periodicTime << " this=" << this);
+      if (m_periodicTime > 0) {
+        m_requestTimer = m_periodicTime;
+        PTRACE(4, "End throttled I-Frames: next=" << m_periodicTime << " this=" << this);
+      }
       break;
 
     case e_Requested :

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.