Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
VLMC
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
21
Issues
21
List
Boards
Labels
Service Desk
Milestones
Merge Requests
2
Merge Requests
2
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
VideoLAN
VLMC
Commits
1dfaf298
Commit
1dfaf298
authored
Feb 16, 2014
by
Hugo Beauzée-Luyssen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
VideoClipWorkflow: Don't wait forever when waiting for a frame.
Instead put the clip workflow in error state
parent
f3e597ee
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
1 deletion
+9
-1
src/Workflow/ClipWorkflow.h
src/Workflow/ClipWorkflow.h
+2
-0
src/Workflow/VideoClipWorkflow.cpp
src/Workflow/VideoClipWorkflow.cpp
+7
-1
No files found.
src/Workflow/ClipWorkflow.h
View file @
1dfaf298
...
...
@@ -271,6 +271,8 @@ class ClipWorkflow : public EffectUser
void
mediaPlayerPaused
();
void
mediaPlayerUnpaused
();
void
resyncClipWorkflow
();
protected
slots
:
void
errorEncountered
();
signals:
...
...
src/Workflow/VideoClipWorkflow.cpp
View file @
1dfaf298
...
...
@@ -27,6 +27,7 @@
#include "SettingsManager.h"
#include "VideoClipWorkflow.h"
#include "VLCMedia.h"
#include "VlmcDebug.h"
#include "Workflow/Types.h"
#include <QMutexLocker>
...
...
@@ -131,7 +132,12 @@ VideoClipWorkflow::getOutput( ClipWorkflow::GetMode mode, qint64 currentFrame )
return
NULL
;
if
(
getNbComputedBuffers
()
==
0
)
{
m_renderWaitCond
->
wait
(
m_renderLock
);
if
(
m_renderWaitCond
->
wait
(
m_renderLock
,
50
)
==
false
)
{
vlmcWarning
()
<<
"Clip workflow"
<<
m_clipHelper
->
uuid
()
<<
"Timed out while waiting for a frame"
;
errorEncountered
();
return
NULL
;
}
if
(
shouldRender
()
==
false
)
return
NULL
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment