Skip to content

GitLab

Commit a9c842be authored by Hugo Beauzee-Luyssen's avatar Hugo Beauzee-Luyssen
Browse files
Options

Frame by frame mode is working :) 

However, due tu the nature of clipworkflow control, a lot of frames are
lost...
parent 9e84b9a8
Show whitespace changes
Inline Side-by-side
Showing with 78 additions and 54 deletions
src/Workflow/ClipWorkflow.cpp
View file @ a9c842be
......@@ -75,7 +75,7 @@ void ClipWorkflow::checkStateChange()
QWriteLocker lock2( m_stateLock );
if ( m_requiredState != ClipWorkflow::None )
{
// qDebug() << "Changed state from" << m_state << "to state" << m_requiredState;
qDebug() << "Changed state from" << m_state << "to state" << m_requiredState;
m_state = m_requiredState;
m_requiredState = ClipWorkflow::None;
checkSynchronisation( m_state );
......@@ -122,9 +122,9 @@ void ClipWorkflow::unlock( ClipWorkflow* cw )
// qDebug() << "Clip render completed";
cw->emit renderComplete( cw );
// qDebug() << "Entering condwait";
qDebug() << "\t\tEntering condwait";
cw->m_waitCond->wait( cw->m_condMutex );
// qDebug() << "Leaved condwait";
qDebug() << "\t\tLeaved condwait";
cw->m_stateLock->lockForWrite();
cw->m_state = Rendering;
// {
......@@ -138,11 +138,11 @@ void ClipWorkflow::unlock( ClipWorkflow* cw )
QMutexLocker lock( cw->m_condMutex );
cw->m_stateLock->unlock();
// qDebug() << "Entering forced pause condwait";
qDebug() << "Entering forced pause condwait";
cw->setState( ClipWorkflow::ThreadPaused );
cw->m_pausedThreadCondWait->wake();
cw->m_waitCond->wait( cw->m_condMutex );
// qDebug() << "Leaving forced pause condwait";
qDebug() << "Leaving forced pause condwait";
cw->setState( ClipWorkflow::Paused );
}
else
......@@ -309,6 +309,7 @@ void ClipWorkflow::setState( State state )
{
{
QWriteLocker lock( m_stateLock );
qDebug() << "Changing from state" << m_state << "to state" << state;
m_state = state;
}
checkSynchronisation( state );
......
src/Workflow/MainWorkflow.cpp
View file @ a9c842be
......@@ -153,6 +153,7 @@ void MainWorkflow::pause()
m_tracks[i]->pause();
}
}
qDebug() << "All tracks are paused";
}
void MainWorkflow::nextFrame()
......@@ -275,10 +276,11 @@ void MainWorkflow::activateOneFrameOnly()
void MainWorkflow::trackPaused()
{
qDebug() << "Track pausing finished...";
m_nbTracksToPause.fetchAndAddAcquire( -1 );
if ( m_nbTracksToPause <= 0 )
{
// qDebug() << "MainWorkflow is paused";
qDebug() << "\t\t...MainWorkflow is paused";
emit mainWorkflowPaused();
}
}
......
src/Workflow/TrackWorkflow.cpp
View file @ a9c842be
......@@ -314,6 +314,8 @@ unsigned char* TrackWorkflow::getOutput( qint64 currentFrame )
needRepositioning = ( abs( currentFrame - lastFrame ) > 1 ) ? true : false;
}
m_nbClipToRender = 0;
//If we ask for an output, then the track should'nt be paused anymore.
m_paused = false;
while ( it != end )
{
qint64 start = it.key();
......@@ -324,10 +326,10 @@ unsigned char* TrackWorkflow::getOutput( qint64 currentFrame )
{
m_nbClipToRender.fetchAndAddAcquire( 1 );
ret = renderClip( cw, currentFrame, start, needRepositioning, oneFrameOnlyFlag );
if ( oneFrameOnlyFlag == true )
{
cw->pause();
}
// if ( oneFrameOnlyFlag == true )
// {
// cw->pause();
// }
lastFrame = currentFrame;
}
//Is it about to be rendered ?
......@@ -362,12 +364,16 @@ void TrackWorkflow::pauseClipWorkflow( ClipWorkflow* cw )
cw->getStateLock()->unlock();
return ;
}
if ( cw->getState() != ClipWorkflow::Paused )
{
if ( cw->getState() == ClipWorkflow::Sleeping ||
cw->getState() == ClipWorkflow::Ready ||
cw->getState() == ClipWorkflow::EndReached )
{
cw->getStateLock()->unlock();
//Locking this mutex ensure that the thread is really asleep, and hasn't
//just changed the state, and then get pulled back by the scheduler...
QMutexLocker lock( cw->getSleepMutex() );
cw->queryStateChange( ClipWorkflow::Pausing );
cw->wake();
......@@ -375,7 +381,9 @@ void TrackWorkflow::pauseClipWorkflow( ClipWorkflow* cw )
else if ( cw->getState() == ClipWorkflow::Rendering )
{
cw->getStateLock()->unlock();
qDebug() << "Waiting for complete render";
cw->waitForCompleteRender();
qDebug() << "Render has been completed... continue pausing";
QMutexLocker lock( cw->getSleepMutex() );
cw->queryStateChange( ClipWorkflow::Pausing );
cw->wake();
......@@ -388,14 +396,17 @@ void TrackWorkflow::pauseClipWorkflow( ClipWorkflow* cw )
}
else
{
// qDebug() << "Unexpected ClipWorkflow::State when pausing:" << cw->getState();
// qDebug() << "Unexpected ClipWorkflow::State when pausing:" << cw->getState();
cw->getStateLock()->unlock();
}
cw->waitForPausingState();
cw->pause();
// qDebug() << "Wait for pausedthread state";
}
else
cw->getStateLock()->unlock();
qDebug() << "Wait for pausedthread state";
cw->waitForPausedThread();
// qDebug() << "Ok thread is paused";
qDebug() << "Ok thread is paused";
}
void TrackWorkflow::pause()
......@@ -412,27 +423,30 @@ void TrackWorkflow::pause()
ClipWorkflow* cw = it.value();
cw->getStateLock()->lockForRead();
qDebug() << "Pausing a clip in state" << cw->getState();
if ( cw->getState() == ClipWorkflow::Stopped )
{
cw->getStateLock()->unlock();
continue ;
}
if ( cw->getState() != ClipWorkflow::Paused )
else if ( cw->getState() != ClipWorkflow::ThreadPaused )
{
cw->getStateLock()->unlock();
m_nbClipToPause.fetchAndAddAcquire( 1 );
connect( cw->getMediaPlayer(), SIGNAL( paused() ), this, SLOT( clipWorkflowPaused() ) );
// connect( cw->getMediaPlayer(), SIGNAL( paused() ), this, SLOT( clipWorkflowPaused() ) );
pauseClipWorkflow( cw );
}
else
{
//This should never be used.
//TODO: remove this in a few revision (wrote on July 16 2009 )
// qDebug() << "Asking to pause in an already paused state";
qDebug() << "Asking to pause in an already paused state";
cw->getStateLock()->unlock();
}
}
m_paused = !m_paused;
qDebug() << "m_paused ==" << m_paused;
if ( m_paused == true )
emit trackPaused();
}
void TrackWorkflow::moveClip( const QUuid& id, qint64 startingFrame )
......@@ -489,14 +503,14 @@ void TrackWorkflow::activateOneFrameOnly()
m_oneFrameOnly = 1;
}
void TrackWorkflow::clipWorkflowPaused()
{
m_nbClipToPause.fetchAndAddAcquire( -1 );
if ( m_nbClipToPause == 0 )
{
emit trackPaused();
}
}
//void TrackWorkflow::clipWorkflowPaused()
//{
// m_nbClipToPause.fetchAndAddAcquire( -1 );
// if ( m_nbClipToPause == 0 )
// {
// emit trackPaused();
// }
//}
void TrackWorkflow::clipWorkflowRenderCompleted( ClipWorkflow* cw )
{
......
src/Workflow/TrackWorkflow.h
View file @ a9c842be
......@@ -52,6 +52,10 @@ class TrackWorkflow : public QObject
unsigned char* getOutput( qint64 currentFrame );
qint64 getLength() const;
void stop();
/**
* Will pause all the track's ClipWorkflow.
* This method *is synchrone*, and will not return until all of the ClipWorkflow's thread are asleep
*/
void pause();
void moveClip( const QUuid& id, qint64 startingFrame );
Clip* removeClip( const QUuid& id );
......@@ -104,7 +108,7 @@ class TrackWorkflow : public QObject
unsigned char* m_synchroneRenderBuffer;
private slots:
void clipWorkflowPaused();
// void clipWorkflowPaused();
void clipWorkflowRenderCompleted( ClipWorkflow* );
signals:
......
src/renderer/WorkflowRenderer.cpp
View file @ a9c842be
......@@ -133,9 +133,9 @@ void WorkflowRenderer::unlock( void* datas )
// qDebug() << "Workflowrenderer::unlock. m_oneFrameOnly ==" << self->m_oneFrameOnly;
if ( self->m_oneFrameOnly == 1 )
{
// qDebug() << "Pausing back";
qDebug() << "Pausing back";
self->togglePlayPause( true );
// qDebug() << "Switching m_oneFrameOnly flag to 2";
qDebug() << "Switching m_oneFrameOnly flag to 2";
self->m_oneFrameOnly = 2;
}
self->m_framePlayed = true;
......@@ -214,6 +214,8 @@ void WorkflowRenderer::frameByFramePausingProxy()
if ( nbPaused == 2 )
{
nbPaused = 0;
disconnect( m_mediaPlayer, SIGNAL( paused() ), this, SLOT( frameByFramePausingProxy() ) );
disconnect( m_mainWorkflow, SIGNAL( mainWorkflowPaused() ), this, SLOT( frameByFramePausingProxy() ) );
frameByFrameAfterPaused();
}
}
......@@ -313,6 +315,7 @@ void WorkflowRenderer::__videoPaused()
{
m_oneFrameOnly = 0;
}
qDebug() << "Pausing main workflow";
pauseMainWorkflow();
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment