[Opalvoip-svn] SF.net SVN: opalvoip:[23541] opal/branches/csoutheren/LalandeBranch1

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

Revision: 23541
          http://opalvoip.svn.sourceforge.net/opalvoip/?rev=23541&view=rev
Author:   rjongbloed
Date:     2009-09-25 12:17:18 +0000 (Fri, 25 Sep 2009)

Log Message:
-----------
Fixed changing jitter buffer size, while running, creating a second receive thread. Manifests itself eventually as an assert on simultaneous reads.

Back port from Sirius.

Modified Paths:
--------------
    opal/branches/csoutheren/LalandeBranch1/src/rtp/jitter.cxx

Property Changed:
----------------
    opal/branches/csoutheren/LalandeBranch1/


Property changes on: opal/branches/csoutheren/LalandeBranch1
___________________________________________________________________
Modified: svn:mergeinfo
   - /opal/branches/autoconf:20594-21001
/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
/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,23286
/opal/branches/v3_6:22902,22982,22994-22995,23284,23287,23294,23467,23474
/opal/trunk:22117-22118,22128,22138,22140,22142,22146,22152,22157-22158,22161,22218-22219,22222-22223,22227,22231,22262,22264,22278,22329,22341,22349,22360,22362-22363,22365,22368,22373,22385,22397,22399,22415,22420,22422,22425,22427,22466-22467,22469,22471,22492,22541-22543,22546,22554,22615,22618,22667,22795,22903,22986,23132,23135,23231,23246,23253,23275,23281,23359-23360,23380,23384,23395,23459,23464,23480,23486
/ptlib/branches/v2_4:22246
/ptlib/trunk:20820
   + /opal/branches/autoconf:20594-21001
/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
/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,23286
/opal/branches/v3_6:22902,22982,22994-22995,23284,23287,23294,23467,23474
/opal/trunk:22117-22118,22128,22138,22140,22142,22146,22152,22157-22158,22161,22218-22219,22222-22223,22227,22231,22262,22264,22278,22329,22341,22349,22360,22362-22363,22365,22368,22373,22385,22397,22399,22415,22420,22422,22425,22427,22466-22467,22469,22471,22492,22541-22543,22546,22554,22615,22618,22667,22759,22795,22903,22986,23132,23135,23231,23246,23253,23275,23281,23359-23360,23380,23384,23395,23459,23464,23480,23486
/ptlib/branches/v2_4:22246
/ptlib/trunk:20820

Modified: opal/branches/csoutheren/LalandeBranch1/src/rtp/jitter.cxx
===================================================================
--- opal/branches/csoutheren/LalandeBranch1/src/rtp/jitter.cxx	2009-09-25 12:12:00 UTC (rev 23540)
+++ opal/branches/csoutheren/LalandeBranch1/src/rtp/jitter.cxx	2009-09-25 12:17:18 UTC (rev 23541)
@@ -214,12 +214,13 @@
 {
   PWaitAndSignal m(bufferMutex);
   if (jitterThread != NULL) {
-    if (shuttingDown) {
-      jitterThread->WaitForTermination();
-      delete jitterThread;
-      jitterThread= NULL;
-    }
+    if (!shuttingDown)
+      return;
+
+    jitterThread->WaitForTermination();
+    delete jitterThread;
   }
+
   shuttingDown = false;
   jitterThread = PThread::Create(PCREATE_NOTIFIER(JitterThreadMain), "RTP Jitter");
   jitterThread->Resume();


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