Commit de4d4617 authored by Hugo Beauzee-Luyssen's avatar Hugo Beauzee-Luyssen

Merge branch 'master' into boubak-effects-engine

Conflicts:
	src/Workflow/MainWorkflow.h
parents c18f9a71 56893065
......@@ -82,9 +82,6 @@ private:
template<typename T>
OutSlot<T>::OutSlot() : m_type( InSlot<T>::NORMAL ), m_connectedTo( NULL ), m_pipe( &m_junk )
{
qDebug() << "HAYA : " << this->m_pipe;
qDebug() << "HAYA : " << &(this->m_junk)
<< "\n" ;
}
template<typename T>
......@@ -92,19 +89,11 @@ OutSlot<T>::OutSlot(OutSlot<T> const & tocopy) : m_type( tocopy.m_type ),
m_connectedTo( NULL ),
m_pipe( &m_junk )
{
qDebug() << "copy ctor";
qDebug() << "m_pipe : " << this->m_pipe;
qDebug() << "&m_junk : " << &(this->m_junk)
<< "\n" ;
}
template<typename T>
OutSlot<T>& OutSlot<T>::operator=(OutSlot<T> const & tocopy)
{
qDebug() << "HAIE GALLE sur OutSlot";
qDebug() << "m_pipe : " << this->m_pipe;
qDebug() << "&m_junk : " << &(this->m_junk)
<< "\n" ;
m_type = tocopy.m_type;
m_connectedTo = NULL;
m_pipe = &m_junk;
......@@ -120,10 +109,6 @@ OutSlot<T>::~OutSlot()
template<typename T>
OutSlot<T>& OutSlot<T>::operator=( T const & val )
{
qDebug() << "HAIE GALLE sur type T";
qDebug() << "m_pipe : " << this->m_pipe;
qDebug() << "&m_junk : " << &(this->m_junk)
<< "\n" ;
(*m_pipe) = val;
return ( *this );
}
......@@ -131,10 +116,6 @@ OutSlot<T>& OutSlot<T>::operator=( T const & val )
template<typename T>
OutSlot<T>& OutSlot<T>::operator<<( T const & val )
{
qDebug() << "CHEUVEU ROND";
qDebug() << "m_pipe : " << this->m_pipe;
qDebug() << "&m_junk : " << &(this->m_junk)
<< "\n" ;
(*m_pipe) = val;
return (*this);
}
......@@ -150,10 +131,6 @@ bool OutSlot<T>::connect( InSlot<T>& toconnect )
{
return ( false );
}
qDebug() << "CONNECT";
qDebug() << "m_pipe : " << this->m_pipe;
qDebug() << "&m_junk : " << &(this->m_junk)
<< "\n" ;
return ( true );
}
......
......@@ -36,6 +36,8 @@ public:
void setProgressBarValue( int val );
private:
Ui::WorkflowFileRendererDialog m_ui;
friend class WorkflowFileRenderer;
};
#endif // WORKFLOWFILERENDERERDIALOG_H
......@@ -4,8 +4,10 @@ WorkflowFileRenderer::WorkflowFileRenderer( const QString& outputFileName ) :
m_outputFileName( outputFileName )
{
m_dialog = new WorkflowFileRendererDialog;
m_dialog->setModal( true );
m_dialog->setOutputFileName( outputFileName );
m_mediaPlayer = new LibVLCpp::MediaPlayer;
connect( m_dialog->m_ui.cancelButton, SIGNAL( clicked() ), this, SLOT( cancelButtonClicked() ) );
}
WorkflowFileRenderer::~WorkflowFileRenderer()
......@@ -27,6 +29,9 @@ void WorkflowFileRenderer::run()
+ m_outputFileName + "\"}";
m_media->addOption( transcodeStr.toStdString().c_str() );
sprintf( buffer, ":sout-transcode-fps=%f", (float)FPS );
m_media->addOption( buffer );
m_mediaPlayer->setMedia( m_media );
connect( m_mainWorkflow, SIGNAL( mainWorkflowEndReached() ), this, SLOT( stop() ) );
......@@ -53,7 +58,7 @@ void WorkflowFileRenderer::positionChanged( float newPos )
m_dialog->setProgressBarValue( static_cast<int>( newPos * 100 ) );
}
void WorkflowFileRenderer::on_cancelButton_clicked()
void WorkflowFileRenderer::cancelButtonClicked()
{
stop();
}
......@@ -48,7 +48,7 @@ private:
private slots:
void stop();
void positionChanged( float newPos );
void on_cancelButton_clicked();
void cancelButtonClicked();
};
#endif // WORKFLOWFILERENDERER_H
......@@ -53,6 +53,7 @@ WorkflowRenderer::WorkflowRenderer() :
m_media->addOption( buffer );
sprintf( buffer, ":height=%i", VIDEOHEIGHT );
m_media->addOption( buffer );
m_media->addOption( ":no-audio" );
m_condMutex = new QMutex;
m_waitCond = new QWaitCondition;
......
......@@ -143,9 +143,11 @@ void ClipWorkflow::setVmem()
// m_vlcMedia->addOption( ":no-sout-keep" );
if ( m_fullSpeedRender == true )
m_vlcMedia->addOption( ":sout-sync" );
{
m_vlcMedia->addOption( ":no-sout-smem-time-sync" );
}
else
m_vlcMedia->addOption( ":no-sout-sync" );
m_vlcMedia->addOption( ":sout-smem-time-sync" );
sprintf( buffer, ":sout-transcode-width=%i", VIDEOWIDTH );
m_vlcMedia->addOption( buffer );
......@@ -153,6 +155,9 @@ void ClipWorkflow::setVmem()
sprintf( buffer, ":sout-transcode-height=%i", VIDEOHEIGHT );
m_vlcMedia->addOption( buffer );
sprintf( buffer, ":sout-transcode-fps=%f", (float)FPS );
m_vlcMedia->addOption( buffer );
//sprintf( buffer, "sout-smem-video-pitch=%i", VIDEOWIDTH * 3 );
//m_vlcMedia->addOption( buffer );
}
......
......@@ -118,6 +118,7 @@ class MainWorkflow : public QObject, public Singleton<MainWorkflow>
private:
static MainWorkflow* m_instance;
static unsigned char* blackOutput;
private:
void computeLength();
......
......@@ -145,7 +145,7 @@ void TrackWorkflow::renderClip( ClipWorkflow* cw, qint64 currentFrame,
cw->getStateLock()->unlock();
cw->initialize();
cw->startRender( m_paused );
if ( start != currentFrame ) //Clip was not started as its real begining
if ( start != currentFrame || cw->getClip()->getBegin() != 0 ) //Clip was not started as its real begining
{
adjustClipTime( currentFrame, start, cw );
}
......
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