[Opalvoip-svn] SF.net SVN: opalvoip: [18709] opal/branches/PrePresenceBranch/src/opal/ connection.cxx

[<cso...@us...>]

Revision: 18709
          http://opalvoip.svn.sourceforge.net/opalvoip/?rev=18709&view=rev
Author:   csoutheren
Date:     2007-10-21 20:33:13 -0700 (Sun, 21 Oct 2007)

Log Message:
-----------
Fix problem with choosing non-symmetric codecs in some cases

Modified Paths:
--------------
    opal/branches/PrePresenceBranch/src/opal/connection.cxx

Modified: opal/branches/PrePresenceBranch/src/opal/connection.cxx
===================================================================
--- opal/branches/PrePresenceBranch/src/opal/connection.cxx	2007-10-22 00:34:24 UTC (rev 18708)
+++ opal/branches/PrePresenceBranch/src/opal/connection.cxx	2007-10-22 03:33:13 UTC (rev 18709)
@@ -887,10 +887,20 @@
 
     PTRACE(3, "OpalCon\tOpenSourceMediaStream for session " << sessionID << " on " << *this);
 
+    // see if sink stream already opened, so we can ensure symmetric codecs
+    OpalMediaFormatList toFormats = mediaFormats;
+    {
+      OpalMediaStream * sink = GetMediaStream(sessionID, FALSE);
+      if (sink != NULL) {
+        PTRACE(3, "OpalCon\tOpenSourceMediaStream reordering codec for sink stream format " << sink->GetMediaFormat());
+        toFormats.Reorder(sink->GetMediaFormat());
+      }
+    }
+
     OpalMediaFormat sourceFormat, destinationFormat;
     if (!OpalTranscoder::SelectFormats(sessionID,
                                       GetMediaFormats(),
-                                      mediaFormats,
+                                      toFormats,
                                       sourceFormat,
                                       destinationFormat)) {
       PTRACE(2, "OpalCon\tOpenSourceMediaStream session " << sessionID


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