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
9d19863e
Commit
9d19863e
authored
Feb 13, 2022
by
Jean-Baptiste Mardelle
Browse files
Fix adjust to original size using proxy resolution
Fixes
#1331
parent
68e0cb40
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/mltcontroller/clipcontroller.cpp
View file @
9d19863e
...
...
@@ -636,6 +636,19 @@ const QSize ClipController::getFrameSize() const
if
(
m_masterProducer
==
nullptr
)
{
return
QSize
();
}
if
(
m_usesProxy
)
{
int
width
=
m_masterProducer
->
get_int
(
"kdenlive:original.meta.media.width"
);
int
height
=
m_masterProducer
->
get_int
(
"kdenlive:original.meta.media.height"
);
if
(
width
==
0
)
{
width
=
m_masterProducer
->
get_int
(
"kdenlive:original.width"
);
}
if
(
height
==
0
)
{
width
=
m_masterProducer
->
get_int
(
"kdenlive:original.height"
);
}
if
(
width
>
0
&&
height
>
0
)
{
return
QSize
(
width
,
height
);
}
}
int
width
=
m_masterProducer
->
get_int
(
"meta.media.width"
);
if
(
width
==
0
)
{
width
=
m_masterProducer
->
get_int
(
"width"
);
...
...
src/timeline2/model/clipmodel.cpp
View file @
9d19863e
...
...
@@ -442,10 +442,11 @@ int ClipModel::getIntProperty(const QString &name) const
QSize
ClipModel
::
getFrameSize
()
const
{
READ_LOCK
();
if
(
service
()
->
parent
().
is_valid
())
{
return
QSize
(
service
()
->
parent
().
get_int
(
"meta.media.width"
),
service
()
->
parent
().
get_int
(
"meta.media.height"
));
std
::
shared_ptr
<
ProjectClip
>
binClip
=
pCore
->
projectItemModel
()
->
getClipByBinID
(
m_binClipId
);
if
(
binClip
)
{
return
binClip
->
getFrameSize
();
}
return
{
service
()
->
get_int
(
"meta.media.width"
),
service
()
->
get_int
(
"meta.media.height"
)}
;
return
QSize
()
;
}
double
ClipModel
::
getDoubleProperty
(
const
QString
&
name
)
const
...
...
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