Commit 934fa5c8 authored by Hugo Beauzee-Luyssen's avatar Hugo Beauzee-Luyssen

Removing debug

parent f55dbb23
......@@ -30,7 +30,7 @@ Instance::Instance()
{
char const *argv[] =
{
"-vvvvv",
// "-vvvvv",
"--no-skip-frames",
// "--intf", "dummy",
"--text-renderer", "dummy",
......
......@@ -60,7 +60,7 @@ void* AudioClipWorkflow::getOutput( ClipWorkflow::GetMode mode )
QMutexLocker lock2( m_computedBuffersMutex );
preGetOutput();
qWarning() << "Audio. Available:" << m_availableBuffers.count() << "Computed:" << m_computedBuffers.count();
// qWarning() << "Audio. Available:" << m_availableBuffers.count() << "Computed:" << m_computedBuffers.count();
if ( isEndReached() == true )
return NULL;
if ( mode == ClipWorkflow::Get )
......@@ -72,6 +72,7 @@ void* AudioClipWorkflow::getOutput( ClipWorkflow::GetMode mode )
void AudioClipWorkflow::initVlcOutput()
{
m_vlcMedia->addOption( ":verbose 3" );
m_vlcMedia->addOption( ":no-sout-video" );
m_vlcMedia->addOption( ":no-video" );
m_vlcMedia->addOption( ":sout=#transcode{}:smem" );
......@@ -97,9 +98,8 @@ void AudioClipWorkflow::lock( AudioClipWorkflow* cw, uint8_t** pcm_buffer
QMutexLocker lock( cw->m_availableBuffersMutex );
cw->m_computedBuffersMutex->lock();
cw->m_renderLock->lock();
//If there's no buffer at all, it must be the first render
qWarning() << ">>>AudioGeneration. Available:" << cw->m_availableBuffers.count() << "Computed:" << cw->m_computedBuffers.count();
// qWarning() << ">>>AudioGeneration. Available:" << cw->m_availableBuffers.count() << "Computed:" << cw->m_computedBuffers.count();
AudioSample* as = NULL;
if ( cw->m_availableBuffers.isEmpty() == true )
{
......
......@@ -196,12 +196,13 @@ void ClipWorkflow::preGetOutput()
{
QMutexLocker lock( m_feedingCondWait->getMutex() );
//Computed buffer mutex is already locked by underlying clipworkflow getoutput method
if ( getComputedBuffers() == 0 )
{
qWarning() << "Waiting for buffer to be fed";
// qWarning() << "Waiting for buffer to be fed";
m_renderLock->unlock();
m_computedBuffersMutex->unlock();
qDebug() << "Unlocked render lock, entering cond wait";
// qDebug() << "Unlocked render lock, entering cond wait";
m_feedingCondWait->waitLocked();
m_computedBuffersMutex->lock();
m_renderLock->lock();
......@@ -238,9 +239,9 @@ void ClipWorkflow::commonUnlock()
}
if ( getComputedBuffers() == 1 )
{
qDebug() << "Waking feeding cont wait... acquiring lock. Type:" << debugType;
// qDebug() << "Waking feeding cont wait... acquiring lock. Type:" << debugType;
QMutexLocker lock( m_feedingCondWait->getMutex() );
qDebug() << "feeding cont wait mutex acquired. Type:" << debugType;
// qDebug() << "feeding cont wait mutex acquired. Type:" << debugType;
m_feedingCondWait->wake();
}
checkStateChange();
......
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