Commit f51906cc authored by Hugo Beauzée-Luyssen's avatar Hugo Beauzée-Luyssen

Trying to fix potential FPS problems

parent 599b89d1
...@@ -101,8 +101,8 @@ WorkflowRenderer::setupRenderer( quint32 width, quint32 height, double fps ) ...@@ -101,8 +101,8 @@ WorkflowRenderer::setupRenderer( quint32 width, quint32 height, double fps )
m_esHandler->fps = fps; m_esHandler->fps = fps;
//Clean any previous render. //Clean any previous render.
sprintf( videoString, "width=%i:height=%i:dar=%s:fps=%s:cookie=0:codec=%s:cat=2:caching=0", sprintf( videoString, "width=%i:height=%i:dar=%s:fps=%f/1:cookie=0:codec=%s:cat=2:caching=0",
width, height, aspectRatio.toAscii().constData(), "30/1", "RV32" ); width, height, aspectRatio.toAscii().constData(), fps, "RV32" );
sprintf( audioParameters, "cookie=1:cat=1:codec=f32l:samplerate=%u:channels=%u:caching=0", sprintf( audioParameters, "cookie=1:cat=1:codec=f32l:samplerate=%u:channels=%u:caching=0",
m_rate, m_nbChannels ); m_rate, m_nbChannels );
strcpy( inputSlave, ":input-slave=imem://" ); strcpy( inputSlave, ":input-slave=imem://" );
......
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
#include "EffectInstance.h" #include "EffectInstance.h"
#include "MainWorkflow.h" #include "MainWorkflow.h"
#include "Media.h" #include "Media.h"
#include "SettingsManager.h"
#include "VideoClipWorkflow.h" #include "VideoClipWorkflow.h"
#include "VLCMedia.h" #include "VLCMedia.h"
#include "WaitCondition.hpp" #include "WaitCondition.hpp"
...@@ -93,7 +94,7 @@ VideoClipWorkflow::initVlcOutput() ...@@ -93,7 +94,7 @@ VideoClipWorkflow::initVlcOutput()
m_vlcMedia->addOption( buffer ); m_vlcMedia->addOption( buffer );
sprintf( buffer, ":sout-transcode-height=%i", m_height ); sprintf( buffer, ":sout-transcode-height=%i", m_height );
m_vlcMedia->addOption( buffer ); m_vlcMedia->addOption( buffer );
sprintf( buffer, ":sout-transcode-fps=%f", clip()->getMedia()->fps() ); sprintf( buffer, ":sout-transcode-fps=%f", VLMC_PROJECT_GET_DOUBLE( "video/VLMCOutputFPS" ) );
m_vlcMedia->addOption( buffer ); m_vlcMedia->addOption( buffer );
initFilters(); initFilters();
......
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