}
// static
-QString ProfilesDialog::getPathFromProperties(int width, int height, double fps, bool useDisplayWidth)
+bool ProfilesDialog::matchProfile(int width, int height, double fps, double par, bool isImage, MltVideoProfile profile)
+{
+ int profileWidth;
+ if (isImage) {
+ // when using image, compare with display width
+ profileWidth = profile.height * profile.display_aspect_num / profile.display_aspect_den + 0.5;
+ } else profileWidth = profile.width;
+ if (width != profileWidth || height != profile.height || (fps > 0 && qAbs(profile.frame_rate_num / profile.frame_rate_den - fps) > 0.4) || (par > 0 && qAbs(profile.sample_aspect_num / profile.sample_aspect_den - par) > 0.1)) return false;
+ return true;
+}
+
+// static
+QMap <QString, QString> ProfilesDialog::getProfilesFromProperties(int width, int height, double fps, double par, bool useDisplayWidth)
{
QStringList profilesNames;
QStringList profilesFiles;
QStringList profilesFilter;
+ QMap <QString, QString> result;
profilesFilter << "*";
// List the Mlt profiles
profilesFiles = QDir(KdenliveSettings::mltpath()).entryList(profilesFilter, QDir::Files);
else profileWidth = values.value("width").toInt();
if (profileWidth == width && values.value("height").toInt() == height) {
double profile_fps = values.value("frame_rate_num").toDouble() / values.value("frame_rate_den").toDouble();
- if (fps <= 0 || qAbs(profile_fps - fps) < 0.5)
- return profilesFiles.at(i);
+ double profile_par = values.value("sample_aspect_num").toDouble() / values.value("sample_aspect_den").toDouble();
+ if ((fps <= 0 || qAbs(profile_fps - fps) < 0.5) && (par <= 0 || qAbs(profile_par - par) < 0.1))
+ result.insert(profilesFiles.at(i), values.value("description"));
}
}
else profileWidth = values.value("width").toInt();
if (profileWidth == width && values.value("height").toInt() == height) {
double profile_fps = values.value("frame_rate_num").toDouble() / values.value("frame_rate_den").toDouble();
- if (fps <= 0 || qAbs(profile_fps - fps) < 0.5)
- return customProfiles.at(i) + profiles.at(j);
+ double profile_par = values.value("sample_aspect_num").toDouble() / values.value("sample_aspect_den").toDouble();
+ if ((fps <= 0 || qAbs(profile_fps - fps) < 0.5) && (par <= 0 || qAbs(profile_par - par) < 0.1))
+ result.insert(profiles.at(j), values.value("description"));
}
}
}
- return QString();
+ return result;
}
// static