[vlmc-devel] VideoClipWorkflow: Don't assume a timeout means an error

Hugo Beauzée-Luyssen git at videolan.org
Thu Mar 24 13:22:33 CET 2016


vlmc | branch: master | Hugo Beauzée-Luyssen <hugo at beauzee.fr> | Tue Mar 22 00:36:35 2016 +0100| [8d660574ef3ba13c8d5b2441b0b72a960597f45d] | committer: Hugo Beauzée-Luyssen

VideoClipWorkflow: Don't assume a timeout means an error

Also increase the timeout duration

> https://code.videolan.org/videolan/vlmc/commit/8d660574ef3ba13c8d5b2441b0b72a960597f45d
---

 src/Workflow/VideoClipWorkflow.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/Workflow/VideoClipWorkflow.cpp b/src/Workflow/VideoClipWorkflow.cpp
index 704a9e6..53569d4 100644
--- a/src/Workflow/VideoClipWorkflow.cpp
+++ b/src/Workflow/VideoClipWorkflow.cpp
@@ -96,10 +96,9 @@ VideoClipWorkflow::getOutput( ClipWorkflow::GetMode mode, qint64 currentFrame )
         return NULL;
     if ( getNbComputedBuffers() == 0 )
     {
-        if ( m_renderWaitCond->wait( m_renderLock, 50 ) == false )
+        if ( m_renderWaitCond->wait( m_renderLock, 100 ) == false )
         {
             vlmcWarning() << "Clip workflow" << m_clipHelper->uuid() << "Timed out while waiting for a frame";
-            errorEncountered();
             return NULL;
         }
         if ( shouldRender() == false )



More information about the Vlmc-devel mailing list