[Opalvoip-svn] SF.net SVN: opalvoip:[31455] opal/trunk/src/codec/vidcodec.cxx

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

Revision: 31455
          http://sourceforge.net/p/opalvoip/code/31455
Author:   rjongbloed
Date:     2014-02-13 03:34:00 +0000 (Thu, 13 Feb 2014)
Log Message:
-----------
Fixed merge error

Modified Paths:
--------------
    opal/trunk/src/codec/vidcodec.cxx

Modified: opal/trunk/src/codec/vidcodec.cxx
===================================================================
--- opal/trunk/src/codec/vidcodec.cxx	2014-02-13 02:53:01 UTC (rev 31454)
+++ opal/trunk/src/codec/vidcodec.cxx	2014-02-13 03:34:00 UTC (rev 31455)
@@ -125,8 +125,6 @@
   , m_inDataSize(10*1024)
   , m_outDataSize(10*1024)
   , m_errorConcealment(false)
-  , m_freezeTillIFrame(false)
-  , m_frozenTillIFrame(false)
   , m_forceIFrame(false)
   , m_lastFrameWasIFrame(false)
   , m_totalFrames(0)
@@ -215,8 +213,10 @@
     m_throttleSendIFrameTimer = m_throttleSendIFrameTimer*2;
   else if (timeSinceLast > MaxThrottle && m_throttleSendIFrameTimer > MinThrottle)
     m_throttleSendIFrameTimer = m_throttleSendIFrameTimer/2;
+  else if (m_throttleSendIFrameTimer > MinThrottle)
+    m_throttleSendIFrameTimer = m_throttleSendIFrameTimer;
   else
-    m_throttleSendIFrameTimer = m_throttleSendIFrameTimer;
+    m_throttleSendIFrameTimer = MinThrottle;
 
   PTRACE(3, "Media\tI-Frame forced (throttle " << m_throttleSendIFrameTimer << ") in video stream " << *this);
   m_forceIFrame = true; // Reset when I-Frame is sent
@@ -259,21 +259,6 @@
 
 ///////////////////////////////////////////////////////////////////////////////
 
-  if (m_requestIFrameTimer.IsRunning()) {
-    PTRACE(4, "Media\tI-Frame requested, but not sent due to throttling.");
-    return;
-  }
-
-  if (sequenceNumber == 0 && timestamp == 0)
-    NotifyCommand(OpalVideoUpdatePicture());
-  else
-    NotifyCommand(OpalVideoPictureLoss(sequenceNumber, timestamp));
-  m_requestIFrameTimer.SetInterval(0, 1);
-}
-
-
-///////////////////////////////////////////////////////////////////////////////
-
 PString OpalVideoUpdatePicture::GetName() const
 {
   return "Update Picture";

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