int count = 0;
m_jobMutex.lock();
for (int i = 0; i < m_jobList.count(); i++) {
- if (m_jobList.at(i)->jobStatus == JOBWORKING || m_jobList.at(i)->jobStatus == JOBWAITING)
+ if (m_jobList.at(i)->status() == JOBWORKING || m_jobList.at(i)->status() == JOBWAITING)
count ++;
else {
// remove finished jobs
AbstractClipJob *job = m_jobList.takeAt(i);
- delete job;
+ job->deleteLater();
i--;
}
}
int count = 0;
m_jobMutex.lock();
for (int i = 0; i < m_jobList.count(); i++) {
- if (m_jobList.at(i)->jobStatus == JOBWAITING) {
+ if (m_jobList.at(i)->status() == JOBWAITING) {
if (job == NULL) {
- m_jobList.at(i)->jobStatus = JOBWORKING;
+ m_jobList.at(i)->setStatus(JOBWORKING);
job = m_jobList.at(i);
}
count++;
}
- else if (m_jobList.at(i)->jobStatus == JOBWORKING)
+ else if (m_jobList.at(i)->status() == JOBWORKING)
count ++;
}
// Set jobs count
connect(job, SIGNAL(gotFilterJobResults(QString,int, int, stringMap,stringMap)), this, SIGNAL(gotFilterJobResults(QString,int, int,stringMap,stringMap)));
}
job->startJob();
- if (job->jobStatus == JOBDONE) {
+ if (job->status() == JOBDONE) {
emit updateJobStatus(job->clipId(), job->jobType, JOBDONE);
//TODO: replace with more generic clip replacement framework
if (job->jobType == PROXYJOB) emit gotProxy(job->clipId());
if (job->addClipToProject()) {
emit addClip(destination, QString(), QString());
}
- } else if (job->jobStatus == JOBCRASHED || job->jobStatus == JOBABORTED) {
- emit updateJobStatus(job->clipId(), job->jobType, job->jobStatus, job->errorMessage(), QString(), job->logDetails());
+ } else if (job->status() == JOBCRASHED || job->status() == JOBABORTED) {
+ emit updateJobStatus(job->clipId(), job->jobType, job->status(), job->errorMessage(), QString(), job->logDetails());
}
}
// Thread finished, cleanup & update count
for (int i = 0; i < m_jobList.count(); i++) {
if (m_abortAllJobs) break;
job = m_jobList.at(i);
- if (job->clipId() == item->clipId() && job->jobType == type && (job->jobStatus == JOBWAITING || job->jobStatus == JOBWORKING)) return true;
+ if (job->clipId() == item->clipId() && job->jobType == type && (job->status() == JOBWAITING || job->status() == JOBWORKING)) return true;
}
return false;
QStringList result;
QMutexLocker lock(&m_jobMutex);
for (int i = 0; i < m_jobList.count(); i++) {
- if (m_jobList.at(i)->clipId() == id && (m_jobList.at(i)->jobStatus == JOBWAITING || m_jobList.at(i)->jobStatus == JOBWORKING)) {
+ if (m_jobList.at(i)->clipId() == id && (m_jobList.at(i)->status() == JOBWAITING || m_jobList.at(i)->status() == JOBWORKING)) {
// discard this job
result << m_jobList.at(i)->description;
}
// Producer params
jobParams << QString();
// Filter params, use a smaller region of the image to speed up operation
- jobParams << filterName << "bounding=\"25%x25%:15%x15\" shot_change_list=0 denoise=0";
+ // In fact, it's faster to rescale whole image than using part of it (bounding=\"25%x25%:15%x15\")
+ jobParams << filterName << "shot_change_list=0 denoise=0";
// Consumer
- jobParams << "null" << "all=1 terminate_on_pause=1 real_time=-1";
+ jobParams << "null" << "all=1 terminate_on_pause=1 real_time=-1 rescale=nearest deinterlace_method=onefield top_field_first=-1";
QMap <QString, QString> extraParams;
extraParams.insert("key", "shot_change_list");
extraParams.insert("projecttreefilter", "1");
QString keyword("%count");
extraParams.insert("resultmessage", i18n("Found %1 scenes.", keyword));
+ extraParams.insert("resize_profile", "160");
+ if (ui.store_data->isChecked()) {
+ // We want to save result as clip metadata
+ extraParams.insert("storedata", "1");
+ }
+ if (ui.zone_only->isChecked()) {
+ // We want to analyze only clip zone
+ extraParams.insert("zoneonly", "1");
+ }
if (ui.add_markers->isChecked()) {
// We want to create markers
extraParams.insert("addmarkers", QString::number(ui.marker_type->currentIndex()));
ProjectItem *item = getItemById(id);
if (!item) continue;
QStringList jobArgs;
+ if (extraParams.contains("zoneonly")) {
+ // Analyse clip zone only, remove in / out and replace with zone
+ preParams.takeFirst();
+ preParams.takeFirst();
+ QPoint zone = item->referencedClip()->zone();
+ jobArgs << QString::number(zone.x()) << QString::number(zone.y());
+ }
jobArgs << preParams;
if (ids.count() == 1) {
jobArgs << consumer + ':' + destination;
void ProjectList::slotGotFilterJobResults(QString id, int , int , stringMap results, stringMap filterInfo)
{
// Currently, only the first value of results is used
- kDebug()<<"// FILTER RES:\n"<<filterInfo<<"\n--------------\n"<<results;
+ //kDebug()<<"// FILTER RES:\n"<<filterInfo<<"\n--------------\n"<<results;
ProjectItem *clip = getItemById(id);
if (!clip) return;
// Check for return value
}
bool dataProcessed = false;
QString key = filterInfo.value("key");
+ int offset = filterInfo.value("offset").toInt();
QStringList value = results.value(key).split(';', QString::SkipEmptyParts);
kDebug()<<"// RESULT; "<<key<<" = "<<value;
if (filterInfo.contains("resultmessage")) {
int newPos = pos.section("=", 0, 0).toInt();
// Don't use scenes shorter than 1 second
if (newPos - cutPos < 24) continue;
- (void) new AddClipCutCommand(this, id, cutPos, newPos, QString(), true, false, command);
+ (void) new AddClipCutCommand(this, id, cutPos + offset, newPos + offset, QString(), true, false, command);
cutPos = newPos;
}
if (command->childCount() == 0)
int newPos = pos.section("=", 0, 0).toInt();
// Don't use scenes shorter than 1 second
if (newPos - cutPos < 24) continue;
- CommentedTime m(GenTime(newPos, m_fps), QString::number(index), markersType);
+ CommentedTime m(GenTime(newPos + offset, m_fps), QString::number(index), markersType);
markersList << m;
index++;
cutPos = newPos;