oak-team/oak-editor
3
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into cache-update

Browse Source
This commit is contained in:
itsmattkc
2022-08-18 08:12:46 -07:00
parent 6716a7173b b169ad923c
commit 54d0a94a20
183 changed files with 7520 additions and 1705 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/render/videoparams.cpp
+5 -1
View File
@@ -285,12 +285,13 @@ void VideoParams::set_defaults_for_footage()
premultiplied_alpha_ = false;
x_ = 0;
y_ = 0;
color_range_ = kColorRangeDefault;
}
void VideoParams::calculate_square_pixel_width()
{
if (pixel_aspect_ratio_.denominator() != 0) {
par_width_ = width_ * pixel_aspect_ratio_.numerator() / pixel_aspect_ratio_.denominator();
par_width_ = qRound(width_ * pixel_aspect_ratio_.toDouble());
} else {
par_width_ = width_;
}
@@ -389,6 +390,8 @@ void VideoParams::Load(QXmlStreamReader *reader)
set_premultiplied_alpha(reader->readElementText().toInt());
} else if (reader->name() == QStringLiteral("colorspace")) {
set_colorspace(reader->readElementText());
} else if (reader->name() == QStringLiteral("colorrange")) {
set_color_range(static_cast<ColorRange>(reader->readElementText().toInt()));
} else {
reader->skipCurrentElement();
}
@@ -416,6 +419,7 @@ void VideoParams::Save(QXmlStreamWriter *writer) const
writer->writeTextElement(QStringLiteral("duration"), QString::number(duration_));
writer->writeTextElement(QStringLiteral("premultipliedalpha"), QString::number(premultiplied_alpha_));
writer->writeTextElement(QStringLiteral("colorspace"), colorspace_);
writer->writeTextElement(QStringLiteral("colorrange"), QString::number(color_range_));
}
}