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

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

Revision: 34725
          http://sourceforge.net/p/opalvoip/code/34725
Author:   rjongbloed
Date:     2016-03-28 15:20:12 +0000 (Mon, 28 Mar 2016)
Log Message:
-----------
Tried to make sure RRFC 2833 codec (aka "telephone-event") uses payload type 101. Extra debugging added to figure out why it is not doing so, if attempted fix does not work.

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

Modified: opal/branches/v3_16/src/codec/opalpluginmgr.cxx
===================================================================
--- opal/branches/v3_16/src/codec/opalpluginmgr.cxx	2016-03-28 14:56:18 UTC (rev 34724)
+++ opal/branches/v3_16/src/codec/opalpluginmgr.cxx	2016-03-28 15:20:12 UTC (rev 34725)
@@ -1741,6 +1741,9 @@
   GetOpalYUV420P();
 #endif
 
+  // Make sure "telephone-event" payload type allocated
+  GetOpalRFC2833();
+
   for (unsigned  i = 0; i < count; i++,codecDefn++) {
 #if PTRACING
     OpalPluginControl setLogFn(codecDefn, PLUGINCODEC_CONTROL_SET_LOG_FUNCTION);

Modified: opal/branches/v3_16/src/opal/mediafmt.cxx
===================================================================
--- opal/branches/v3_16/src/opal/mediafmt.cxx	2016-03-28 14:56:18 UTC (rev 34724)
+++ opal/branches/v3_16/src/opal/mediafmt.cxx	2016-03-28 15:20:12 UTC (rev 34725)
@@ -1303,10 +1303,14 @@
 
   // If we had a conflict we change the older one, as it is assumed that the
   // application really wanted that value and internal OPAL ones can move
-  if (conflictingFormat != NULL)
+  if (conflictingFormat == NULL)
+    rtpPayloadType = (RTP_DataFrame::PayloadTypes)nextUnused;
+  else {
+    PTRACE(3, "Conflicting payload type: "
+           << *conflictingFormat << " moved to " << nextUnused
+           << " as " << fullName << " requires " << rtpPayloadType);
     conflictingFormat->SetPayloadType((RTP_DataFrame::PayloadTypes)nextUnused);
-  else
-    rtpPayloadType = (RTP_DataFrame::PayloadTypes)nextUnused;
+  }
 }
 
 

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