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
c8fb6f26
Commit
c8fb6f26
authored
Jun 25, 2009
by
Hugo Beauzee-Luyssen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Removing back buffer code.
parent
5212f16f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
24 additions
and
24 deletions
+24
-24
src/Workflow/ClipWorkflow.cpp
src/Workflow/ClipWorkflow.cpp
+21
-21
src/Workflow/ClipWorkflow.h
src/Workflow/ClipWorkflow.h
+3
-3
No files found.
src/Workflow/ClipWorkflow.cpp
View file @
c8fb6f26
...
...
@@ -30,18 +30,18 @@ int g_debugId = 0;
ClipWorkflow
::
ClipWorkflow
(
Clip
::
Clip
*
clip
)
:
m_clip
(
clip
),
m_buffer
(
NULL
),
m_usingBackBuffer
(
false
),
//
m_usingBackBuffer( false ),
m_mediaPlayer
(
NULL
),
m_state
(
ClipWorkflow
::
Stopped
),
m_requiredState
(
ClipWorkflow
::
None
)
{
m_buffer
=
new
unsigned
char
[
VIDEOHEIGHT
*
VIDEOWIDTH
*
4
];
m_backBuffer
=
new
unsigned
char
[
VIDEOHEIGHT
*
VIDEOWIDTH
*
4
];
//
m_backBuffer = new unsigned char[VIDEOHEIGHT * VIDEOWIDTH * 4];
m_stateLock
=
new
QReadWriteLock
;
m_requiredStateLock
=
new
QMutex
;
m_condMutex
=
new
QMutex
;
m_waitCond
=
new
QWaitCondition
;
m_backBufferLock
=
new
QReadWriteLock
;
//
m_backBufferLock = new QReadWriteLock;
this
->
debugId
=
g_debugId
++
;
}
...
...
@@ -49,18 +49,18 @@ ClipWorkflow::ClipWorkflow( Clip::Clip* clip ) :
ClipWorkflow
::~
ClipWorkflow
()
{
delete
[]
m_buffer
;
delete
[]
m_backBuffer
;
//
delete[] m_backBuffer;
delete
m_stateLock
;
delete
m_requiredStateLock
;
delete
m_backBufferLock
;
//
delete m_backBufferLock;
}
unsigned
char
*
ClipWorkflow
::
getOutput
()
{
QReadLocker
lock
(
m_backBufferLock
);
if
(
m_usingBackBuffer
==
true
)
//
QReadLocker lock( m_backBufferLock );
//
if ( m_usingBackBuffer == true )
return
m_buffer
;
return
m_backBuffer
;
//
return m_backBuffer;
}
void
ClipWorkflow
::
checkStateChange
()
...
...
@@ -76,16 +76,16 @@ void ClipWorkflow::checkStateChange()
void
ClipWorkflow
::
lock
(
ClipWorkflow
*
cw
,
void
**
pp_ret
)
{
QReadLocker
lock
(
cw
->
m_backBufferLock
);
if
(
cw
->
m_usingBackBuffer
)
{
*
pp_ret
=
cw
->
m_backBuffer
;
}
else
{
//
QReadLocker lock( cw->m_backBufferLock );
//
if ( cw->m_usingBackBuffer )
//
{
//
*pp_ret = cw->m_backBuffer;
//
}
//
else
//
{
*
pp_ret
=
cw
->
m_buffer
;
}
//
}
}
void
ClipWorkflow
::
unlock
(
ClipWorkflow
*
cw
)
...
...
@@ -101,10 +101,10 @@ void ClipWorkflow::unlock( ClipWorkflow* cw )
cw
->
m_waitCond
->
wait
(
cw
->
m_condMutex
);
cw
->
m_stateLock
->
lockForWrite
();
cw
->
m_state
=
Rendering
;
{
QWriteLocker
lock2
(
cw
->
m_backBufferLock
);
cw
->
m_usingBackBuffer
=
!
cw
->
m_usingBackBuffer
;
}
//
{
//
QWriteLocker lock2( cw->m_backBufferLock );
//
cw->m_usingBackBuffer = !cw->m_usingBackBuffer;
//
}
}
cw
->
m_stateLock
->
unlock
();
cw
->
checkStateChange
();
...
...
src/Workflow/ClipWorkflow.h
View file @
c8fb6f26
...
...
@@ -155,7 +155,7 @@ class ClipWorkflow : public QObject
private:
Clip
*
m_clip
;
unsigned
char
*
m_buffer
;
unsigned
char
*
m_backBuffer
;
//
unsigned char* m_backBuffer;
/**
* This allow the render procedure to know in which buffer it should render.
* If true, then the render occurs in the back buffer, which means the
...
...
@@ -164,8 +164,8 @@ class ClipWorkflow : public QObject
* - When m_usingBackBuffer == false, lock() will return m_buffer, and getOutput() m_backBuffer
* - When m_usingBackBuffer == true, lock() will return m_backBuffer, and getOutput() m_buffer
*/
bool
m_usingBackBuffer
;
QReadWriteLock
*
m_backBufferLock
;
//
bool m_usingBackBuffer;
//
QReadWriteLock* m_backBufferLock;
LibVLCpp
::
MediaPlayer
*
m_mediaPlayer
;
...
...
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