diff --git a/src/Renderer/WorkflowFileRenderer.cpp b/src/Renderer/WorkflowFileRenderer.cpp index 6f2e7999e4cb9f07bfb424cd3594d1710e230384..2fd2b58d83be572faf90c253ef30f4e9772db07f 100644 --- a/src/Renderer/WorkflowFileRenderer.cpp +++ b/src/Renderer/WorkflowFileRenderer.cpp @@ -29,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() ) ); diff --git a/src/Workflow/ClipWorkflow.cpp b/src/Workflow/ClipWorkflow.cpp index f6c677a8906a5c87d281c47a0eb54a21207afbce..59350467a6feec83e4f4e99e98831d1740926dae 100644 --- a/src/Workflow/ClipWorkflow.cpp +++ b/src/Workflow/ClipWorkflow.cpp @@ -153,6 +153,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 ); } diff --git a/src/Workflow/MainWorkflow.h b/src/Workflow/MainWorkflow.h index 2548b2105968c3aa2cd19cc0dbc0e9e7f280155c..e14249e66c231df5235932a8949b6b5a7edd76a3 100644 --- a/src/Workflow/MainWorkflow.h +++ b/src/Workflow/MainWorkflow.h @@ -80,7 +80,6 @@ class MainWorkflow : public QObject, public Singleton void pause(); void unpause(); - static unsigned char* blackOutput; void nextFrame(); void previousFrame(); @@ -115,6 +114,7 @@ class MainWorkflow : public QObject, public Singleton private: static MainWorkflow* m_instance; + static unsigned char* blackOutput; private: void computeLength();