Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Open sidebar
VideoLAN
VLMC
Commits
d6d55f59
Commit
d6d55f59
authored
Mar 17, 2010
by
Hugo Beauzee-Luyssen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
VideoClipWorkflow: Don't keep the last rendered frame.
parent
09a34dc0
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
0 additions
and
7 deletions
+0
-7
src/Workflow/VideoClipWorkflow.cpp
src/Workflow/VideoClipWorkflow.cpp
+0
-6
src/Workflow/VideoClipWorkflow.h
src/Workflow/VideoClipWorkflow.h
+0
-1
No files found.
src/Workflow/VideoClipWorkflow.cpp
View file @
d6d55f59
...
...
@@ -31,7 +31,6 @@
VideoClipWorkflow
::
VideoClipWorkflow
(
Clip
*
clip
)
:
ClipWorkflow
(
clip
),
m_lastRenderedFrame
(
NULL
),
m_width
(
0
),
m_height
(
0
)
{
...
...
@@ -115,11 +114,7 @@ VideoClipWorkflow::getOutput( ClipWorkflow::GetMode mode )
QMutexLocker
lock2
(
m_computedBuffersMutex
);
if
(
preGetOutput
()
==
false
)
{
if
(
m_lastRenderedFrame
!=
NULL
)
return
new
StackedBuffer
(
m_lastRenderedFrame
,
NULL
,
false
);
return
NULL
;
}
if
(
isEndReached
()
==
true
)
return
NULL
;
::
StackedBuffer
<
LightVideoFrame
*>*
buff
;
...
...
@@ -128,7 +123,6 @@ VideoClipWorkflow::getOutput( ClipWorkflow::GetMode mode )
else
if
(
mode
==
ClipWorkflow
::
Get
)
buff
=
new
StackedBuffer
(
m_computedBuffers
.
head
(),
NULL
,
false
);
postGetOutput
();
m_lastRenderedFrame
=
buff
->
get
();
return
buff
;
}
...
...
src/Workflow/VideoClipWorkflow.h
View file @
d6d55f59
...
...
@@ -69,7 +69,6 @@ class VideoClipWorkflow : public ClipWorkflow
private:
QQueue
<
LightVideoFrame
*>
m_computedBuffers
;
QQueue
<
LightVideoFrame
*>
m_availableBuffers
;
LightVideoFrame
*
m_lastRenderedFrame
;
static
void
lock
(
VideoClipWorkflow
*
clipWorkflow
,
void
**
pp_ret
,
int
size
);
static
void
unlock
(
VideoClipWorkflow
*
clipWorkflow
,
void
*
buffer
,
...
...
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