[vlmc-devel] commit: Trying to fix potential FPS problems ( =?UTF-8?Q?Hugo=20Beauz=C3=A9e=2DLuyssen?==?UTF-8?Q?=20?=)

[git at videolan.org]

vlmc | branch: master | Hugo Beauzée-Luyssen <beauze.h at gmail.com> | Mon Nov 29 11:08:19 2010 +0100| [f51906ccbecf2720ef75795805937766c8d3546a] | committer: Hugo Beauzée-Luyssen 

Trying to fix potential FPS problems

> http://git.videolan.org/gitweb.cgi/vlmc.git/?a=commit;h=f51906ccbecf2720ef75795805937766c8d3546a
---

 src/Renderer/WorkflowRenderer.cpp  |    4 ++--
 src/Workflow/VideoClipWorkflow.cpp |    3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/Renderer/WorkflowRenderer.cpp b/src/Renderer/WorkflowRenderer.cpp
index b61d442..2e278af 100644
--- a/src/Renderer/WorkflowRenderer.cpp
+++ b/src/Renderer/WorkflowRenderer.cpp
@@ -101,8 +101,8 @@ WorkflowRenderer::setupRenderer( quint32 width, quint32 height, double fps )
     m_esHandler->fps = fps;
     //Clean any previous render.
 
-    sprintf( videoString, "width=%i:height=%i:dar=%s:fps=%s:cookie=0:codec=%s:cat=2:caching=0",
-             width, height, aspectRatio.toAscii().constData(), "30/1", "RV32" );
+    sprintf( videoString, "width=%i:height=%i:dar=%s:fps=%f/1:cookie=0:codec=%s:cat=2:caching=0",
+             width, height, aspectRatio.toAscii().constData(), fps, "RV32" );
     sprintf( audioParameters, "cookie=1:cat=1:codec=f32l:samplerate=%u:channels=%u:caching=0",
                 m_rate, m_nbChannels );
     strcpy( inputSlave, ":input-slave=imem://" );
diff --git a/src/Workflow/VideoClipWorkflow.cpp b/src/Workflow/VideoClipWorkflow.cpp
index a07c1e2..0783e36 100644
--- a/src/Workflow/VideoClipWorkflow.cpp
+++ b/src/Workflow/VideoClipWorkflow.cpp
@@ -24,6 +24,7 @@
 #include "EffectInstance.h"
 #include "MainWorkflow.h"
 #include "Media.h"
+#include "SettingsManager.h"
 #include "VideoClipWorkflow.h"
 #include "VLCMedia.h"
 #include "WaitCondition.hpp"
@@ -93,7 +94,7 @@ VideoClipWorkflow::initVlcOutput()
     m_vlcMedia->addOption( buffer );
     sprintf( buffer, ":sout-transcode-height=%i", m_height );
     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 );
 
     initFilters();