10000 Improve missing luma detection (region transition) - fixes project crash · szczk/kdenlive@637d211 · GitHub
[go: up one dir, main page]
Skip to content

Commit

Permalink
Improve missing luma detection (region transition) - fixes project crash
Browse files Browse the repository at this point in the history
  • Loading branch information
@j-b-m
j-b-m committed Oct 8, 2018
1 parent 72c6a17 commit 637d211
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 26 deletions.
56 changes: 30 additions & 26 deletions src/doc/documentchecker.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,16 @@ DocumentChecker::DocumentChecker(const QUrl &url, const QDomDocument &doc):
{
}

QMap <QString, QString> DocumentChecker::getLumaPairs() const
{
QMap <QString, QString> lumaSearchPairs;
lumaSearchPairs.insert(QStringLiteral("luma"), QStringLiteral("resource"));
lumaSearchPairs.insert(QStringLiteral("movit.luma_mix"), QStringLiteral("resource"));
lumaSearchPairs.insert(QStringLiteral("composite"), QStringLiteral("luma"));
lumaSearchPairs.insert(QStringLiteral("region"), QStringLiteral("composite.luma"));
return lumaSearchPairs;
}

bool DocumentChecker::hasErrorInClips()
{
int max;
Expand Down Expand Up @@ -220,16 +230,16 @@ bool DocumentChecker::hasErrorInClips()
QStringList missingLumas;
QStringList filesToCheck;
QString filePath;
QMap <QString, QString>lumaSearchPairs = getLumaPairs();

QDomNodeList trans = m_doc.elementsByTagName(QStringLiteral("transition"));
max = trans.count();
for (int i = 0; i < max; ++i) {
QDomElement transition = trans.at(i).toElement();
QString service = getProperty(transition, QStringLiteral("mlt_service"));
QString luma;
if (service == QLatin1String("luma")) {
luma = getProperty(transition, QStringLiteral("resource"));
} else if (service == QLatin1String("composite")) {
luma = getProperty(transition, QStringLiteral("luma"));
if (lumaSearchPairs.contains(service)) {
luma = getProperty(transition, lumaSearchPairs.value(service));
}
if (!luma.isEmpty() && !filesToCheck.contains(luma)) {
filesToCheck.append(luma);
Expand Down Expand Up @@ -286,13 +296,11 @@ bool DocumentChecker::hasErrorInClips()
QDomElement transition = trans.at(i).toElement();
QString service = getProperty(transition, QStringLiteral("mlt_service"));
QString luma;
if (service == QLatin1String("luma")) {
luma = getProperty(transition, QStringLiteral("resource"));
} else if (service == QLatin1String("composite")) {
luma = getProperty(transition, QStringLiteral("luma"));
if (lumaSearchPairs.contains(service)) {
luma = getProperty(transition, lumaSearchPairs.value(service));
}
if (!luma.isEmpty() && autoFixLuma.contains(luma)) {
setProperty(transition, service == QLatin1String("luma") ? QStringLiteral("resource") : QStringLiteral("luma"), autoFixLuma.value(luma));
setProperty(transition, lumaSearchPairs.value(service), autoFixLuma.value(luma));
}
}
}
Expand Down Expand Up @@ -931,30 +939,27 @@ void DocumentChecker::fixClipItem(QTreeWidgetItem *child, const QDomNodeList &pr
}
}*/
} else if (child->data(0, statusRole).toInt() == LUMAOK) {
QMap <QString, QString>lumaSearchPairs = getLumaPairs();
for (int i = 0; i < trans.count(); ++i) {
QString service = getProperty(trans.at(i).toElement(), QStringLiteral("mlt_service"));
QString luma;
if (service == QLatin1String("luma")) {
luma = getProperty(trans.at(i).toElement(), QStringLiteral("resource"));
} else if (service == QLatin1String("composite")) {
luma = getProperty(trans.at(i).toElement(), QStringLiteral("luma"));
if (lumaSearchPairs.contains(service)) {
luma = getProperty(trans.at(i).toElement(), lumaSearchPairs.value(service));
}
if (!luma.isEmpty() && luma == child->data(0, idRole).toString()) {
setProperty(trans.at(i).toElement(), service == QLatin1String("luma") ? QStringLiteral("resource") : QStringLiteral("luma"), child->text(1));
//qCDebug(KDENLIVE_LOG) << "replace with; " << child->text(1);
setProperty(trans.at(i).toElement(), lumaSearchPairs.value(service), child->text(1));
}
}
} else if (child->data(0, statusRole).toInt() == LUMAMISSING) {
QMap <QString, QString>lumaSearchPairs = getLumaPairs();
for (int i = 0; i < trans.count(); ++i) {
QString service = getProperty(trans.at(i).toElement(), QStringLiteral("mlt_service"));
QString luma;
if (service == QLatin1String("luma")) {
luma = getProperty(trans.at(i).toElement(), QStringLiteral("resource"));
} else if (service == QLatin1String("composite")) {
luma = getProperty(trans.at(i).toElement(), QStringLiteral("luma"));
if (lumaSearchPairs.contains(service)) {
luma = getProperty(trans.at(i).toElement(), lumaSearchPairs.value(service));
}
if (!luma.isEmpty() && luma == child->data(0, idRole).toString()) {
setProperty(trans.at(i).toElement(), service == QLatin1String("luma") ? QStringLiteral("resource") : QStringLiteral("luma"), QString());
setProperty(trans.at(i).toElement(), lumaSearchPairs.value(service), QString());
}
}
}
Expand Down Expand Up @@ -1018,18 +1023,17 @@ void DocumentChecker::slotDeleteSelected()
if (!deletedLumas.isEmpty()) {
QDomElement e;
QDomNodeList transitions = m_doc.elementsByTagName(QStringLiteral("transition"));
QMap <QString, QString>lumaSearchPairs = getLumaPairs();
foreach (const QString &lumaPath, deletedLumas) {
for (int i = 0; i < transitions.count(); ++i) {
e = transitions.item(i).toElement();
QString service = EffectsList::property(e, QStringLiteral("mlt_service"));
QString resource;
if (service == QLatin1String("luma")) {
resource = EffectsList::property(e, QStringLiteral("resource"));
} else if (service == QLatin1String("composite")) {
resource = EffectsList::property(e, QStringLiteral("luma"));
if (lumaSearchPairs.contains(service)) {
resource = getProperty(e, lumaSearchPairs.value(service));
}
if (resource == lumaPath) {
EffectsList::removeProperty(e, service == QLatin1String("luma") ? QStringLiteral("resource") : QStringLiteral("luma"));
if (!resource.isEmpty() && resource == lumaPath) {
EffectsList::removeProperty(e, lumaSearchPairs.value(service));
}
}
}
Expand Down
2 changes: 2 additions & 0 deletions src/doc/documentchecker.h
View f 6C94 ile
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,8 @@ private slots:
void fixClipItem(QTreeWidgetItem *child, const QDomNodeList &producers, const QDomNodeList &trans);
void fixSourceClipItem(QTreeWidgetItem *child, const QDomNodeList &producers);
void fixProxyClip(const QString &id, const QString &oldUrl, const QString &newUrl, const QDomNodeList &producers);
/** @brief Returns list of transitions containg luma files */
QMap <QString, QString> getLumaPairs() const;
};

#endif
Expand Down

0 comments on commit 637d211

Please sign in to comment.
0