Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Open sidebar
VideoLAN
VLMC
Commits
d6a256cc
Commit
d6a256cc
authored
Jan 15, 2010
by
Hugo Beauzee-Luyssen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Solved bug when starting to render a clip at non zero position
parent
6f118a3d
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
4 deletions
+7
-4
src/Workflow/ClipWorkflow.cpp
src/Workflow/ClipWorkflow.cpp
+6
-2
src/Workflow/TrackWorkflow.cpp
src/Workflow/TrackWorkflow.cpp
+1
-2
No files found.
src/Workflow/ClipWorkflow.cpp
View file @
d6a256cc
...
...
@@ -86,8 +86,12 @@ void ClipWorkflow::loadingComplete()
void
ClipWorkflow
::
adjustBegin
()
{
if
(
m_clip
->
getParent
()
->
getFileType
()
==
Media
::
Video
||
m_clip
->
getParent
()
->
getFileType
()
==
Media
::
Audio
)
m_mediaPlayer
->
setTime
(
m_clip
->
getBegin
()
/
m_clip
->
getParent
()
->
getFps
()
*
1000
);
if
(
m_clip
->
getParent
()
->
getFileType
()
==
Media
::
Video
||
m_clip
->
getParent
()
->
getFileType
()
==
Media
::
Audio
)
{
m_mediaPlayer
->
setTime
(
m_clip
->
getBegin
()
/
m_clip
->
getParent
()
->
getFps
()
*
1000
);
}
}
bool
ClipWorkflow
::
isEndReached
()
const
...
...
src/Workflow/TrackWorkflow.cpp
View file @
d6a256cc
...
...
@@ -151,9 +151,9 @@ void* TrackWorkflow::renderClip( ClipWorkflow* cw, qint64 currentFrame,
{
cw
->
getStateLock
()
->
unlock
();
cw
->
initialize
();
cw
->
waitForCompleteInit
();
if
(
start
!=
currentFrame
||
cw
->
getClip
()
->
getBegin
()
!=
0
)
//Clip was not started as its real begining
adjustClipTime
(
currentFrame
,
start
,
cw
);
cw
->
waitForCompleteInit
();
return
cw
->
getOutput
(
ClipWorkflow
::
Pop
);
}
else
if
(
cw
->
getState
()
==
ClipWorkflow
::
EndReached
)
...
...
@@ -454,7 +454,6 @@ void TrackWorkflow::clear()
void
TrackWorkflow
::
adjustClipTime
(
qint64
currentFrame
,
qint64
start
,
ClipWorkflow
*
cw
)
{
qDebug
()
<<
"Adjusting clip time."
;
qint64
nbMs
=
(
currentFrame
-
start
)
/
cw
->
getClip
()
->
getParent
()
->
getFps
()
*
1000
;
qint64
beginInMs
=
cw
->
getClip
()
->
getBegin
()
/
cw
->
getClip
()
->
getParent
()
->
getFps
()
*
1000
;
qint64
startFrame
=
beginInMs
+
nbMs
;
...
...
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