[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.