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

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

Revision: 34749
          http://sourceforge.net/p/opalvoip/code/34749
Author:   rjongbloed
Date:     2016-04-02 09:40:21 +0000 (Sat, 02 Apr 2016)
Log Message:
-----------
Fixed using pre-assigned dynamic payload type for a media format (e.g. RFC2833 for historical reasons uses 101) when there are less than 6 plugin codecs loaded.

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

Modified: opal/branches/v3_16/src/opal/mediafmt.cxx
===================================================================
--- opal/branches/v3_16/src/opal/mediafmt.cxx	2016-04-02 09:25:21 UTC (rev 34748)
+++ opal/branches/v3_16/src/opal/mediafmt.cxx	2016-04-02 09:40:21 UTC (rev 34749)
@@ -1281,7 +1281,7 @@
     inUse[format->GetPayloadType()] = true;
 
     // A conflict is when we are after an explicit payload type, we have found one already using it
-    if (rtpPayloadType  >  RTP_DataFrame::DynamicBase && rtpPayloadType  == format->GetPayloadType()) {
+    if (rtpPayloadType > RTP_DataFrame::DynamicBase && rtpPayloadType  == format->GetPayloadType()) {
       // If it is a shared payload types, which happens when encoding name is the same, then allow it
       if (rtpEncodingName == format->GetEncodingName())
         return;
@@ -1291,6 +1291,11 @@
     }
   }
 
+  if (rtpPayloadType > RTP_DataFrame::DynamicBase && conflictingFormat == NULL) {
+    PTRACE(4, "Using assigned payload type " << rtpPayloadType << " for " << fullName);
+    return;
+  }
+
   // Determine next unused payload type, if all the dynamic ones are allocated then
   // we start downward toward the well known values.
   int nextUnused = RTP_DataFrame::DynamicBase;

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