Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Multimedia
Kdenlive
Commits
5dae3017
Commit
5dae3017
authored
Oct 23, 2020
by
Jean-Baptiste Mardelle
Browse files
Fix on monitor displayed fps with high fps values
parent
93a40647
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/monitor/monitor.cpp
View file @
5dae3017
...
...
@@ -1686,7 +1686,7 @@ void Monitor::resetProfile()
m_glMonitor
->
rootObject
()
->
setProperty
(
"framesize"
,
QRect
(
0
,
0
,
m_glMonitor
->
profileSize
().
width
(),
m_glMonitor
->
profileSize
().
height
()));
// Update drop frame info
m_qmlManager
->
setProperty
(
QStringLiteral
(
"dropped"
),
false
);
m_qmlManager
->
setProperty
(
QStringLiteral
(
"fps"
),
QString
::
number
(
pCore
->
getCurrentFps
(),
'
g
'
,
2
));
m_qmlManager
->
setProperty
(
QStringLiteral
(
"fps"
),
QString
::
number
(
pCore
->
getCurrentFps
(),
'
f
'
,
2
));
}
void
Monitor
::
resetConsumer
(
bool
fullReset
)
...
...
@@ -1913,12 +1913,12 @@ void Monitor::checkDrops()
if
(
dropped
==
0
)
{
// No dropped frames since last check
m_qmlManager
->
setProperty
(
QStringLiteral
(
"dropped"
),
false
);
m_qmlManager
->
setProperty
(
QStringLiteral
(
"fps"
),
QString
::
number
(
pCore
->
getCurrentFps
(),
'
g
'
,
2
));
m_qmlManager
->
setProperty
(
QStringLiteral
(
"fps"
),
QString
::
number
(
pCore
->
getCurrentFps
(),
'
f
'
,
2
));
}
else
{
m_glMonitor
->
resetDrops
();
dropped
=
pCore
->
getCurrentFps
()
-
dropped
;
m_qmlManager
->
setProperty
(
QStringLiteral
(
"dropped"
),
true
);
m_qmlManager
->
setProperty
(
QStringLiteral
(
"fps"
),
QString
::
number
(
dropped
,
'
g
'
,
2
));
m_qmlManager
->
setProperty
(
QStringLiteral
(
"fps"
),
QString
::
number
(
dropped
,
'
f
'
,
2
));
}
}
...
...
@@ -2117,7 +2117,7 @@ void Monitor::loadQmlScene(MonitorSceneType type, QVariant sceneData)
{
if
(
m_id
==
Kdenlive
::
DvdMonitor
)
{
m_qmlManager
->
setScene
(
m_id
,
MonitorSceneDefault
,
pCore
->
getCurrentFrameSize
(),
pCore
->
getCurrentDar
(),
m_glMonitor
->
displayRect
(),
m_glMonitor
->
zoom
(),
m_timePos
->
maximum
());
m_qmlManager
->
setProperty
(
QStringLiteral
(
"fps"
),
QString
::
number
(
pCore
->
getCurrentFps
(),
'
g
'
,
2
));
m_qmlManager
->
setProperty
(
QStringLiteral
(
"fps"
),
QString
::
number
(
pCore
->
getCurrentFps
(),
'
f
'
,
2
));
return
;
}
if
(
type
==
m_qmlManager
->
sceneType
()
&&
sceneData
.
isNull
())
{
...
...
@@ -2158,7 +2158,7 @@ void Monitor::loadQmlScene(MonitorSceneType type, QVariant sceneData)
default:
break
;
}
m_qmlManager
->
setProperty
(
QStringLiteral
(
"fps"
),
QString
::
number
(
pCore
->
getCurrentFps
(),
'
g
'
,
2
));
m_qmlManager
->
setProperty
(
QStringLiteral
(
"fps"
),
QString
::
number
(
pCore
->
getCurrentFps
(),
'
f
'
,
2
));
}
void
Monitor
::
setQmlProperty
(
const
QString
&
name
,
const
QVariant
&
value
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment